feat: add support for mainTags item in contexts (#1329) (#8693rd6nq)

GetPublii · Feb 6, 2024 · c1969f1 · c1969f1
1 parent feb7840
commit c1969f1
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 3 deletions.
diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
@@ -1,4 +1,4 @@
 {
   "version": "0.44.4",
-  "build": 16574
+  "build": 16575
 }
diff --git a/app/back-end/modules/render-html/contexts/404.js b/app/back-end/modules/render-html/contexts/404.js
@@ -18,6 +18,7 @@ class RendererContext404 extends RendererContext {
         }
 
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -65,6 +66,7 @@ class RendererContext404 extends RendererContext {
             featuredPosts: this.featuredPosts,
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/author.js b/app/back-end/modules/render-html/contexts/author.js
@@ -59,6 +59,7 @@ class RendererContextAuthor extends RendererContext {
         }
 
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -151,6 +152,7 @@ class RendererContextAuthor extends RendererContext {
             featuredPosts: this.featuredPosts,
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/home.js b/app/back-end/modules/render-html/contexts/home.js
@@ -61,6 +61,7 @@ class RendererContextHome extends RendererContext {
         this.metaDescription = this.siteConfig.advanced.metaDescription.replace(/%sitename/g, siteName);
 
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -102,6 +103,7 @@ class RendererContextHome extends RendererContext {
             featuredPosts: this.featuredPosts,
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/post.js b/app/back-end/modules/render-html/contexts/post.js
@@ -14,6 +14,7 @@ class RendererContextPost extends RendererContext {
         let metaDataQuery = this.db.prepare(`SELECT value FROM posts_additional_data WHERE post_id = @postID AND key = '_core'`);
         this.metaData = metaDataQuery.get({ postID: this.postID});
         this.allTags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -407,6 +408,7 @@ class RendererContextPost extends RendererContext {
             hiddenPosts: this.hiddenPosts,
             relatedPosts: this.relatedPosts,
             tags: this.allTags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/search.js b/app/back-end/modules/render-html/contexts/search.js
@@ -29,6 +29,7 @@ class RendererContextSearch extends RendererContext {
         }
 
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -65,6 +66,7 @@ class RendererContextSearch extends RendererContext {
             featuredPosts: this.featuredPosts,
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/tag.js b/app/back-end/modules/render-html/contexts/tag.js
@@ -59,6 +59,7 @@ class RendererContextTag extends RendererContext {
         }
 
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -153,6 +154,7 @@ class RendererContextTag extends RendererContext {
             featuredPosts: this.featuredPosts,
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/contexts/tags.js b/app/back-end/modules/render-html/contexts/tags.js
@@ -8,6 +8,7 @@ const RendererContext = require('../renderer-context.js');
 class RendererContextTags extends RendererContext {
     loadData() {
         this.tags = this.renderer.commonData.tags.filter(tag => tag.additionalData.isHidden !== true);
+        this.mainTags = this.renderer.commonData.mainTags.filter(maintag => maintag.additionalData.isHidden !== true);
         this.menus = this.renderer.commonData.menus;
         this.unassignedMenus = this.renderer.commonData.unassignedMenus;
         this.authors = this.renderer.commonData.authors;
@@ -57,6 +58,7 @@ class RendererContextTags extends RendererContext {
             hiddenPosts: this.hiddenPosts,
             tags: this.tags,
             tagsNumber: this.tags.length,
+            mainTags: this.mainTags,
             authors: this.authors,
             metaTitleRaw: this.metaTitle,
             metaDescriptionRaw: this.metaDescription,

diff --git a/app/back-end/modules/render-html/items/tag.js b/app/back-end/modules/render-html/items/tag.js
@@ -10,13 +10,14 @@ class TagItem {
      * @param tagData
      * @param rendererInstance
      */
-    constructor(tag, rendererInstance) {
+    constructor(tag, rendererInstance, mainTagIDs = []) {
         this.tag = tag;
         this.tagID = parseInt(tag.id, 10);
         this.renderer = rendererInstance;
         this.db = this.renderer.db;
         this.themeConfig = this.renderer.themeConfig;
         this.tagData = {};
+        this.mainTagIDs = mainTagIDs;
 
         this.prepareData();
         this.storeData();
@@ -61,6 +62,10 @@ class TagItem {
 
         // Store tag data without references
         this.renderer.cachedItems.tags[this.tagID] = JSON.parse(JSON.stringify(this.tagData));
+
+        if (this.mainTagIDs.indexOf(this.tagID) > -1) {
+            this.renderer.cachedItems.mainTags[this.tagID] = JSON.parse(JSON.stringify(this.tagData));
+        }
     }
 
     /**

diff --git a/app/back-end/modules/render-html/renderer-cache.js b/app/back-end/modules/render-html/renderer-cache.js
@@ -42,6 +42,21 @@ class RendererCache {
      * Retrieves tags data
      */
     getTags() {
+        console.time('MAINTAGS - QUERY');
+        let mainTagIDs = this.db.prepare(`
+            SELECT DISTINCT 
+                json_extract(value, '$.mainTag') AS mainTagID
+            FROM 
+                posts_additional_data
+            WHERE 
+                key = '_core' AND 
+                json_extract(value, '$.mainTag') IS NOT NULL AND 
+                json_extract(value, '$.mainTag') != '';
+        `).all();
+
+        mainTagIDs = mainTagIDs.map(mainTag => mainTag.mainTagID);
+        console.timeEnd('MAINTAGS - QUERY');
+
         console.time('TAGS - QUERY');
         let tags = this.db.prepare(`
             SELECT
@@ -62,7 +77,7 @@ class RendererCache {
 
         tags = tags.map(tag => {
             let tagViewConfig = this.getViewSettings(tagViewConfigObject, tag);
-            let newTag = new Tag(tag, this.renderer);
+            let newTag = new Tag(tag, this.renderer, mainTagIDs);
             newTag.setTagViewConfig(tagViewConfig);
             return newTag;
         });

diff --git a/app/back-end/modules/render-html/renderer-context.js b/app/back-end/modules/render-html/renderer-context.js
@@ -215,6 +215,30 @@ class RendererContext {
         return tags;
     }
 
+    getAllMainTags() {
+        // Retrieve post main tags
+        let mainTags = this.db.prepare(`
+            SELECT DISTINCT 
+                json_extract(value, '$.mainTag') AS id
+            FROM 
+                posts_additional_data
+            WHERE 
+                key = '_core' AND 
+                json_extract(value, '$.mainTag') IS NOT NULL AND 
+                json_extract(value, '$.mainTag') != '';
+        `).all();
+
+        mainTags = mainTags.map(mainTag => JSON.parse(JSON.stringify(this.renderer.cachedItems.tags[mainTag.id])));
+
+        if(!this.siteConfig.advanced.displayEmptyTags) {
+            mainTags = mainTags.filter(mainTag => mainTag.postsNumber > 0);
+        }
+
+        mainTags.sort((mainTagA, mainTagB) => mainTagA.name.localeCompare(mainTagB.name));
+
+        return mainTags;
+    }
+
     getAuthors() {
         let authorData = this.db.prepare(`SELECT id FROM authors ORDER BY id ASC;`).all();
         let authors = [];

diff --git a/app/back-end/modules/render-html/renderer.js b/app/back-end/modules/render-html/renderer.js
@@ -62,6 +62,7 @@ class Renderer {
         this.contentStructure = {};
         this.commonData = {
             tags: [],
+            mainTags: [],
             authors: [],
             menus: [],
             featuredPosts: {
@@ -75,6 +76,7 @@ class Renderer {
             postTags: {},
             posts: {},
             tags: {},
+            mainTags: {},
             tagsPostCounts: {},
             authors: {},
             authorsPostCounts: {},
@@ -1753,6 +1755,7 @@ class Renderer {
             postTags: {},
             posts: {},
             tags: {},
+            mainTags: {},
             tagsPostCounts: {},
             authors: {},
             authorsPostCounts: {},
@@ -1777,6 +1780,7 @@ class Renderer {
 
         this.commonData = {
             tags: globalContextGenerator.getAllTags(),
+            mainTags: globalContextGenerator.getAllMainTags(),
             authors: globalContextGenerator.getAuthors(),
             menus: menus,
             unassignedMenus: unassignedMenus,