From 042ae24130d90863ff156f1ef8311f6dd40c15e1 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Thu, 29 Aug 2024 20:09:37 +0200 Subject: [PATCH] Remove unncessary fields from docs templates and add category article order --- ...20240829095918_adjust_website_overview.sql | 2 - ...ite_overview_categorized_articles_sort.sql | 138 ++++++++++++++++++ web-app/src/lib/templates/common/Nav.svelte | 2 +- .../src/lib/templates/docs/DocsArticle.svelte | 12 +- .../src/lib/templates/docs/DocsIndex.svelte | 2 - .../[websiteId]/articles/+page.server.ts | 2 +- .../website/[websiteId]/articles/+page.svelte | 4 +- .../articles/[articleId]/+page.svelte | 42 ++++-- .../[websiteId]/publish/+page.server.ts | 5 - 9 files changed, 169 insertions(+), 40 deletions(-) create mode 100644 rest-api/db/migrations/20240829180521_adjust_website_overview_categorized_articles_sort.sql diff --git a/rest-api/db/migrations/20240829095918_adjust_website_overview.sql b/rest-api/db/migrations/20240829095918_adjust_website_overview.sql index 27583fd..3b98031 100644 --- a/rest-api/db/migrations/20240829095918_adjust_website_overview.sql +++ b/rest-api/db/migrations/20240829095918_adjust_website_overview.sql @@ -136,5 +136,3 @@ FROM JOIN internal.home ho ON w.id = ho.website_id JOIN internal.footer f ON w.id = f.website_id; -GRANT SELECT ON api.website_overview TO authenticated_user; - diff --git a/rest-api/db/migrations/20240829180521_adjust_website_overview_categorized_articles_sort.sql b/rest-api/db/migrations/20240829180521_adjust_website_overview_categorized_articles_sort.sql new file mode 100644 index 0000000..5148839 --- /dev/null +++ b/rest-api/db/migrations/20240829180521_adjust_website_overview_categorized_articles_sort.sql @@ -0,0 +1,138 @@ +-- migrate:up +CREATE OR REPLACE VIEW api.website_overview WITH ( security_invoker = ON +) AS +SELECT + w.id, + w.user_id, + w.content_type, + w.title, + s.accent_color_light_theme, + s.accent_color_dark_theme, + s.favicon_image, + h.logo_type, + h.logo_text, + h.logo_image, + ho.main_content, + f.additional_text, + ( + SELECT + JSON_AGG( + JSON_BUILD_OBJECT( + 'id', a.id, 'title', a.title, 'meta_description', a.meta_description, 'meta_author', a.meta_author, 'cover_image', a.cover_image, 'publication_date', a.publication_date, 'main_content', a.main_content, 'created_at', a.created_at, 'last_modified_at', a.last_modified_at +) +) + FROM + internal.article a + WHERE + a.website_id = w.id +) AS articles, + CASE WHEN w.content_type = 'Docs' THEN + ( + SELECT + JSON_OBJECT_AGG( + COALESCE( + category_name, 'Uncategorized' +), articles +) + FROM ( + SELECT + dc.category_name, + dc.category_weight AS category_weight, + JSON_AGG( + JSON_BUILD_OBJECT( + 'id', a.id, 'title', a.title, 'meta_description', a.meta_description, 'meta_author', a.meta_author, 'cover_image', a.cover_image, 'publication_date', a.publication_date, 'main_content', a.main_content, 'created_at', a.created_at, 'last_modified_at', a.last_modified_at +) ORDER BY a.article_weight DESC NULLS LAST +) AS articles + FROM + internal.article a + LEFT JOIN internal.docs_category dc ON a.category = dc.id + WHERE + a.website_id = w.id + GROUP BY + dc.id, + dc.category_name, + dc.category_weight + ORDER BY + category_weight DESC NULLS LAST +) AS categorized_articles) +ELSE + NULL + END AS categorized_articles +FROM + internal.website w + JOIN internal.settings s ON w.id = s.website_id + JOIN internal.header h ON w.id = h.website_id + JOIN internal.home ho ON w.id = ho.website_id + JOIN internal.footer f ON w.id = f.website_id; + +GRANT SELECT ON api.website_overview TO authenticated_user; + +-- migrate:down +DROP VIEW api.website_overview; + +CREATE VIEW api.website_overview WITH ( security_invoker = ON +) AS +SELECT + w.id, + w.user_id, + w.content_type, + w.title, + s.accent_color_light_theme, + s.accent_color_dark_theme, + s.favicon_image, + h.logo_type, + h.logo_text, + h.logo_image, + ho.main_content, + f.additional_text, + ( + SELECT + JSON_AGG( + JSON_BUILD_OBJECT( + 'id', a.id, 'title', a.title, 'meta_description', a.meta_description, 'meta_author', a.meta_author, 'cover_image', a.cover_image, 'publication_date', a.publication_date, 'main_content', a.main_content, 'created_at', a.created_at, 'last_modified_at', a.last_modified_at +) +) + FROM + internal.article a + WHERE + a.website_id = w.id +) AS articles, + CASE WHEN w.content_type = 'Docs' THEN + ( + SELECT + JSON_OBJECT_AGG( + COALESCE( + category_name, 'Uncategorized' +), articles +) + FROM ( + SELECT + dc.category_name, + dc.category_weight AS category_weight, + JSON_AGG( + JSON_BUILD_OBJECT( + 'id', a.id, 'title', a.title, 'meta_description', a.meta_description, 'meta_author', a.meta_author, 'cover_image', a.cover_image, 'publication_date', a.publication_date, 'main_content', a.main_content, 'created_at', a.created_at, 'last_modified_at', a.last_modified_at +) +) AS articles + FROM + internal.article a + LEFT JOIN internal.docs_category dc ON a.category = dc.id + WHERE + a.website_id = w.id + GROUP BY + dc.id, + dc.category_name, + dc.category_weight + ORDER BY + category_weight DESC NULLS LAST +) AS categorized_articles) +ELSE + NULL + END AS categorized_articles +FROM + internal.website w + JOIN internal.settings s ON w.id = s.website_id + JOIN internal.header h ON w.id = h.website_id + JOIN internal.home ho ON w.id = ho.website_id + JOIN internal.footer f ON w.id = f.website_id; + diff --git a/web-app/src/lib/templates/common/Nav.svelte b/web-app/src/lib/templates/common/Nav.svelte index 05cb11d..d73995c 100644 --- a/web-app/src/lib/templates/common/Nav.svelte +++ b/web-app/src/lib/templates/common/Nav.svelte @@ -16,7 +16,7 @@