Remove unncessary fields from docs templates and add category article order

2025-11-22 02:41:35 +01:00 · 2024-08-29 20:09:37 +02:00
parent e5b55baaef
commit 042ae24130
9 changed files with 169 additions and 40 deletions
--- 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;
-
--- 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
@@ -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;
+
--- a/web-app/src/lib/templates/common/Nav.svelte
+++ b/web-app/src/lib/templates/common/Nav.svelte
@@ -16,7 +16,7 @@

 <nav>
  <div class="container">
-    {#if isDocsTemplate}
+    {#if isDocsTemplate && Object.keys(categorizedArticles).length > 0}
      <input type="checkbox" id="toggle-sidebar" hidden />
      <label for="toggle-sidebar">
        <svg
--- a/web-app/src/lib/templates/docs/DocsArticle.svelte
+++ b/web-app/src/lib/templates/docs/DocsArticle.svelte
@@ -10,8 +10,6 @@
    logo,
    mainContent,
    categorizedArticles,
-    coverImage,
-    publicationDate,
    footerAdditionalText
  }: {
    favicon: string;
@@ -20,8 +18,6 @@
    logo: string;
    mainContent: string;
    categorizedArticles: { [key: string]: { title: string }[] };
-    coverImage: string;
-    publicationDate: string;
    footerAdditionalText: string;
  } = $props();
 </script>
@@ -32,13 +28,7 @@

 <header>
  <div class="container">
-    <hgroup>
-      <p>{publicationDate}</p>
    <h1>{title}</h1>
-    </hgroup>
-    {#if coverImage}
-      <img src={coverImage} alt="" />
-    {/if}
  </div>
 </header>

--- a/web-app/src/lib/templates/docs/DocsIndex.svelte
+++ b/web-app/src/lib/templates/docs/DocsIndex.svelte
@@ -9,7 +9,6 @@
    logoType,
    logo,
    mainContent,
-    articles,
    categorizedArticles,
    footerAdditionalText
  }: {
@@ -18,7 +17,6 @@
    logoType: "text" | "image";
    logo: string;
    mainContent: string;
-    articles: { title: string; publication_date: string; meta_description: string }[];
    categorizedArticles: { [key: string]: { title: string }[] };
    footerAdditionalText: string;
  } = $props();
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/articles/+page.server.ts
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/articles/+page.server.ts
@@ -10,7 +10,7 @@ export const load: PageServerLoad = async ({ params, fetch, cookies, url, parent
  let baseFetchUrl = `${API_BASE_PREFIX}/article?website_id=eq.${params.websiteId}&select=id,title`;
  if (website.content_type === "Docs") {
    baseFetchUrl +=
-      ",docs_category(category_name,category_weight)&order=docs_category(category_weight).desc.nullslast,article_weight.desc.nullslast";
+      ",article_weight,docs_category(category_name,category_weight)&order=docs_category(category_weight).desc.nullslast,article_weight.desc.nullslast";
  }

  const parameters = new URLSearchParams();
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/articles/+page.svelte
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/articles/+page.svelte
@@ -76,10 +76,10 @@
      </details>

      <ul class="unpadded">
-        {#each data.articles as { id, title, docs_category } (id)}
+        {#each data.articles as { id, title, article_weight, docs_category } (id)}
          <li class="article-card">
            <p>
-              <strong>{title}</strong>
+              <strong>{title} {article_weight ? `(${article_weight})` : ""}</strong>
              {#if docs_category?.category_name}
                <br />
                <small>
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.svelte
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.svelte
@@ -95,10 +95,18 @@
          required
        />
      </label>
+
+      {#if data.website.content_type === "Blog"}
        <label>
          Publication date:
-        <input type="date" name="publication-date" value={data.article.publication_date} required />
+          <input
+            type="date"
+            name="publication-date"
+            value={data.article.publication_date}
+            required
+          />
        </label>
+
        <div class="file-field">
          <label>
            Cover image:
@@ -113,6 +121,8 @@
            </Modal>
          {/if}
        </div>
+      {/if}
+
      <label>
        Main content:
        <textarea
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
@@ -97,7 +97,6 @@ const generateStaticFiles = async (websiteData: any, isPreview: boolean = true)
                ? websiteData.logo_text
                : `${API_BASE_PREFIX}/rpc/retrieve_file?id=${websiteData.logo_image}`,
            mainContent: md(websiteData.main_content ?? "", false),
-            articles: websiteData.articles ?? [],
            categorizedArticles: websiteData.categorized_articles ?? [],
            footerAdditionalText: md(websiteData.additional_text ?? "")
          }
@@ -165,10 +164,6 @@ const generateStaticFiles = async (websiteData: any, isPreview: boolean = true)
                websiteData.logo_type === "text"
                  ? websiteData.logo_text
                  : `${API_BASE_PREFIX}/rpc/retrieve_file?id=${websiteData.logo_image}`,
-              coverImage: article.cover_image
-                ? `${API_BASE_PREFIX}/rpc/retrieve_file?id=${article.cover_image}`
-                : "",
-              publicationDate: article.publication_date,
              mainContent: md(article.main_content ?? ""),
              categorizedArticles: websiteData.categorized_articles ?? [],
              footerAdditionalText: md(websiteData.additional_text ?? "")