Merge pull request #36 from archtika/devel

Thilo Hohlt · web-flow · commit 10b713d72554 · 2025-04-10T21:40:24.000+02:00
Replace diff-match-patch with js-diff and fix missing filesystem deletion
diff --git a/nix/package.nix b/nix/package.nix
@@ -10,7 +10,7 @@ let
   web = buildNpmPackage {
     name = "web-app";
     src = ../web-app;
-    npmDepsHash = "sha256-J58LwSEQa0p6J6h/wPhpGY/60n9a7TOV5WfNm4K1NH0=";
+    npmDepsHash = "sha256-ab7MJ5vl6XNaAHTyzRxj/Zpk1nEKQLzGmPGJdDrdemg=";
     npmFlags = [ "--legacy-peer-deps" ];
     installPhase = ''
       mkdir -p $out/web-app
diff --git a/rest-api/db/migrations/20240719071602_main_tables.sql b/rest-api/db/migrations/20240719071602_main_tables.sql
@@ -157,41 +157,3 @@ CREATE TABLE internal.collab (
 );
 
 -- migrate:down
-DROP TABLE internal.collab;
-
-DROP TABLE internal.footer;
-
-DROP TABLE internal.article;
-
-DROP TABLE internal.docs_category;
-
-DROP TABLE internal.home;
-
-DROP TABLE internal.header;
-
-DROP TABLE internal.settings;
-
-DROP TABLE internal.media;
-
-DROP TABLE internal.website;
-
-DROP TABLE internal.user;
-
-DROP SCHEMA api;
-
-DROP FUNCTION internal.generate_slug;
-
-DROP SCHEMA internal;
-
-DROP ROLE anon;
-
-DROP ROLE authenticated_user;
-
-DROP ROLE administrator;
-
-DROP ROLE authenticator;
-
-ALTER DEFAULT PRIVILEGES GRANT EXECUTE ON FUNCTIONS TO PUBLIC;
-
-DROP EXTENSION unaccent;
-
diff --git a/rest-api/db/migrations/20240720073454_automatic_schema_cache_reloading.sql b/rest-api/db/migrations/20240720073454_automatic_schema_cache_reloading.sql
@@ -13,7 +13,3 @@ CREATE EVENT TRIGGER pgrst_watch ON ddl_command_end
   EXECUTE FUNCTION internal.pgrst_watch ();
 
 -- migrate:down
-DROP EVENT TRIGGER pgrst_watch;
-
-DROP FUNCTION internal.pgrst_watch;
-
diff --git a/rest-api/db/migrations/20240720074103_user_management_roles_jwt.sql b/rest-api/db/migrations/20240720074103_user_management_roles_jwt.sql
@@ -170,23 +170,3 @@ GRANT EXECUTE ON FUNCTION api.login TO anon;
 GRANT EXECUTE ON FUNCTION api.delete_account TO authenticated_user;
 
 -- migrate:down
-DROP TRIGGER encrypt_pass ON internal.user;
-
-DROP TRIGGER ensure_user_role_exists ON internal.user;
-
-DROP FUNCTION api.register;
-
-DROP FUNCTION api.login;
-
-DROP FUNCTION api.delete_account;
-
-DROP FUNCTION internal.user_role;
-
-DROP FUNCTION internal.encrypt_pass;
-
-DROP FUNCTION internal.check_role_exists;
-
-DROP EXTENSION pgjwt;
-
-DROP EXTENSION pgcrypto;
-
diff --git a/rest-api/db/migrations/20240720132802_exposed_views_functions.sql b/rest-api/db/migrations/20240720132802_exposed_views_functions.sql
@@ -163,25 +163,3 @@ GRANT SELECT, INSERT (website_id, user_id, permission_level), UPDATE (permission
 GRANT SELECT, INSERT, UPDATE, DELETE ON api.collab TO authenticated_user;
 
 -- migrate:down
-DROP FUNCTION api.create_website;
-
-DROP VIEW api.collab;
-
-DROP VIEW api.footer;
-
-DROP VIEW api.home;
-
-DROP VIEW api.docs_category;
-
-DROP VIEW api.article;
-
-DROP VIEW api.header;
-
-DROP VIEW api.settings;
-
-DROP VIEW api.website;
-
-DROP VIEW api.user;
-
-DROP VIEW api.account;
-
diff --git a/rest-api/db/migrations/20240724191017_row_level_security.sql b/rest-api/db/migrations/20240724191017_row_level_security.sql
@@ -170,77 +170,3 @@ CREATE POLICY delete_collaborations ON internal.collab
     USING (internal.user_has_website_access (website_id, 30, collaborator_permission_level => permission_level, collaborator_user_id => user_id));
 
 -- migrate:down
-DROP POLICY view_user ON internal.user;
-
-DROP POLICY update_user ON internal.user;
-
-DROP POLICY delete_user ON internal.user;
-
-DROP POLICY view_websites ON internal.website;
-
-DROP POLICY delete_website ON internal.website;
-
-DROP POLICY update_website ON internal.website;
-
-DROP POLICY view_settings ON internal.settings;
-
-DROP POLICY update_settings ON internal.settings;
-
-DROP POLICY view_header ON internal.header;
-
-DROP POLICY update_header ON internal.header;
-
-DROP POLICY view_home ON internal.home;
-
-DROP POLICY update_home ON internal.home;
-
-DROP POLICY view_articles ON internal.article;
-
-DROP POLICY update_article ON internal.article;
-
-DROP POLICY delete_article ON internal.article;
-
-DROP POLICY insert_article ON internal.article;
-
-DROP POLICY view_categories ON internal.docs_category;
-
-DROP POLICY update_category ON internal.docs_category;
-
-DROP POLICY delete_category ON internal.docs_category;
-
-DROP POLICY insert_category ON internal.docs_category;
-
-DROP POLICY view_footer ON internal.footer;
-
-DROP POLICY update_footer ON internal.footer;
-
-DROP POLICY view_collaborations ON internal.collab;
-
-DROP POLICY insert_collaborations ON internal.collab;
-
-DROP POLICY update_collaborations ON internal.collab;
-
-DROP POLICY delete_collaborations ON internal.collab;
-
-DROP FUNCTION internal.user_has_website_access;
-
-ALTER TABLE internal.user DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.website DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.media DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.settings DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.header DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.home DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.article DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.docs_category DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.footer DISABLE ROW LEVEL SECURITY;
-
-ALTER TABLE internal.collab DISABLE ROW LEVEL SECURITY;
-
diff --git a/rest-api/db/migrations/20240805132306_last_modified_triggers.sql b/rest-api/db/migrations/20240805132306_last_modified_triggers.sql
@@ -74,21 +74,3 @@ CREATE TRIGGER update_collab_last_modified
   EXECUTE FUNCTION internal.update_last_modified ();
 
 -- migrate:down
-DROP TRIGGER update_website_last_modified ON internal.website;
-
-DROP TRIGGER update_settings_last_modified ON internal.settings;
-
-DROP TRIGGER update_header_last_modified ON internal.header;
-
-DROP TRIGGER update_home_last_modified ON internal.home;
-
-DROP TRIGGER update_article_last_modified ON internal.article;
-
-DROP TRIGGER update_docs_category_modified ON internal.docs_category;
-
-DROP TRIGGER update_footer_last_modified ON internal.footer;
-
-DROP TRIGGER update_collab_last_modified ON internal.collab;
-
-DROP FUNCTION internal.update_last_modified;
-
diff --git a/rest-api/db/migrations/20240808141708_collaborator_not_owner.sql b/rest-api/db/migrations/20240808141708_collaborator_not_owner.sql
@@ -24,7 +24,3 @@ CREATE CONSTRAINT TRIGGER check_user_not_website_owner
   EXECUTE FUNCTION internal.check_user_not_website_owner ();
 
 -- migrate:down
-DROP TRIGGER check_user_not_website_owner ON internal.collab;
-
-DROP FUNCTION internal.check_user_not_website_owner;
-
diff --git a/rest-api/db/migrations/20240810115846_image_upload_function.sql b/rest-api/db/migrations/20240810115846_image_upload_function.sql
@@ -95,9 +95,3 @@ GRANT EXECUTE ON FUNCTION api.retrieve_file TO anon;
 GRANT EXECUTE ON FUNCTION api.retrieve_file TO authenticated_user;
 
 -- migrate:down
-DROP FUNCTION api.upload_file;
-
-DROP FUNCTION api.retrieve_file;
-
-DROP DOMAIN "*/*";
-
diff --git a/rest-api/db/migrations/20240911070907_change_log.sql b/rest-api/db/migrations/20240911070907_change_log.sql
@@ -133,29 +133,3 @@ CREATE TRIGGER track_changes_collab
   EXECUTE FUNCTION internal.track_changes ();
 
 -- migrate:down
-DROP TRIGGER track_changes_website ON internal.website;
-
-DROP TRIGGER track_changes_media ON internal.media;
-
-DROP TRIGGER track_changes_settings ON internal.settings;
-
-DROP TRIGGER track_changes_header ON internal.header;
-
-DROP TRIGGER track_changes_home ON internal.home;
-
-DROP TRIGGER track_changes_article ON internal.article;
-
-DROP TRIGGER track_changes_docs_category ON internal.docs_category;
-
-DROP TRIGGER track_changes_footer ON internal.footer;
-
-DROP TRIGGER track_changes_collab ON internal.collab;
-
-DROP FUNCTION internal.track_changes;
-
-DROP VIEW api.change_log;
-
-DROP TABLE internal.change_log;
-
-DROP EXTENSION hstore;
-
diff --git a/rest-api/db/migrations/20241006165029_administrator.sql b/rest-api/db/migrations/20241006165029_administrator.sql
@@ -141,29 +141,3 @@ GRANT UPDATE, DELETE ON internal.user TO administrator;
 GRANT UPDATE, DELETE ON api.user TO administrator;
 
 -- migrate:down
-DROP FUNCTION api.user_websites_storage_size;
-
-DROP TRIGGER _prevent_storage_excess_article ON internal.article;
-
-DROP TRIGGER _prevent_storage_excess_collab ON internal.collab;
-
-DROP TRIGGER _prevent_storage_excess_docs_category ON internal.docs_category;
-
-DROP TRIGGER _prevent_storage_excess_footer ON internal.footer;
-
-DROP TRIGGER _prevent_storage_excess_header ON internal.header;
-
-DROP TRIGGER _prevent_storage_excess_home ON internal.home;
-
-DROP TRIGGER _prevent_storage_excess_media ON internal.media;
-
-DROP TRIGGER _prevent_storage_excess_settings ON internal.settings;
-
-DROP FUNCTION internal.prevent_website_storage_size_excess;
-
-REVOKE UPDATE (max_storage_size) ON internal.website FROM administrator;
-
-REVOKE UPDATE, DELETE ON internal.user FROM administrator;
-
-REVOKE UPDATE, DELETE ON api.user FROM administrator;
-
diff --git a/rest-api/db/migrations/20241011092744_filesystem_triggers.sql b/rest-api/db/migrations/20241011092744_filesystem_triggers.sql
@@ -56,9 +56,3 @@ CREATE TRIGGER _cleanup_filesystem_article
   EXECUTE FUNCTION internal.cleanup_filesystem ();
 
 -- migrate:down
-DROP TRIGGER _cleanup_filesystem_website ON internal.website;
-
-DROP TRIGGER _cleanup_filesystem_article ON internal.article;
-
-DROP FUNCTION internal.cleanup_filesystem;
-
diff --git a/rest-api/db/migrations/20241029160539_export_articles.sql b/rest-api/db/migrations/20241029160539_export_articles.sql
@@ -39,5 +39,3 @@ SECURITY DEFINER;
 GRANT EXECUTE ON FUNCTION api.export_articles_zip TO authenticated_user;
 
 -- migrate:down
-DROP FUNCTION api.export_articles_zip;
-
diff --git a/rest-api/db/migrations/20241206191942_username_blocklist.sql b/rest-api/db/migrations/20241206191942_username_blocklist.sql
@@ -3,6 +3,3 @@ ALTER TABLE internal.user
   ADD CONSTRAINT username_not_blocked CHECK (LOWER(username) NOT IN ('admin', 'administrator', 'api', 'auth', 'blog', 'cdn', 'docs', 'help', 'login', 'logout', 'profile', 'register', 'settings', 'setup', 'signin', 'signup', 'support', 'test', 'www'));
 
 -- migrate:down
-ALTER TABLE internal.user
-  DROP CONSTRAINT username_not_blocked;
-
diff --git a/rest-api/db/migrations/20250323134405_username_blocklist.sql b/rest-api/db/migrations/20250323134405_username_blocklist.sql
@@ -6,9 +6,3 @@ ALTER TABLE internal.user
   ADD CONSTRAINT username_not_blocked CHECK (LOWER(username) NOT IN ('admin', 'administrator', 'api', 'auth', 'blog', 'cdn', 'docs', 'help', 'login', 'logout', 'profile', 'preview', 'previews', 'register', 'settings', 'setup', 'signin', 'signup', 'support', 'test', 'www'));
 
 -- migrate:down
-ALTER TABLE internal.user
-  DROP CONSTRAINT username_not_blocked;
-
-ALTER TABLE internal.user
-  ADD CONSTRAINT username_not_blocked CHECK (LOWER(username) NOT IN ('admin', 'administrator', 'api', 'auth', 'blog', 'cdn', 'docs', 'help', 'login', 'logout', 'profile', 'register', 'settings', 'setup', 'signin', 'signup', 'support', 'test', 'www'));
-
diff --git a/rest-api/db/migrations/20250410150518_filesystem_triggers.sql b/rest-api/db/migrations/20250410150518_filesystem_triggers.sql
diff --git a/web-app/package-lock.json b/web-app/package-lock.json
diff --git a/web-app/package.json b/web-app/package.json
diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts
diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte b/web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte
