@redpanda-data/docs-extensions-and-macros 3.2.1 → 3.2.3

package/extensions/algolia-indexer/generate-index.js

@@ -77,7 +77,7 @@ function generateIndex (playbook, contentCatalog, { indexLatestOnly = false, exc
 
     // capture the component name and version
     const cname = component.name
-    const version = page.src.version
+    const version = page.src.prerelease ? page.src.displayVersion : page.src.version;
 
     // handle the page keywords
     const kw = root.querySelector('meta[name=keywords]')
@@ -175,7 +175,7 @@ function generateIndex (playbook, contentCatalog, { indexLatestOnly = false, exc
       .replace(/\s+/g, ' ')
       .trim();
 
-    var tag = `${component.title}${version ? '-' + version : ''}`
+    var tag = `${component.title} ${version ? 'v' + version : ''}`
     var indexItem;
     const deployment = page.asciidoc?.attributes['env-kubernetes'] ? 'Kubernetes' : page.asciidoc?.attributes['env-linux'] ? 'Linux' : page.asciidoc?.attributes['env-docker'] ? 'Docker' : page.asciidoc?.attributes['page-cloud'] ? 'Redpanda Cloud' : ''
 
@@ -198,7 +198,7 @@ function generateIndex (playbook, contentCatalog, { indexLatestOnly = false, exc
       indexItem.product = component.title;
       indexItem.breadcrumbs = breadcrumbs;
       indexItem.type = 'Doc';
-      indexItem._tags = [tag, 'docs'];
+      indexItem._tags = [tag];
     } else {
       indexItem.deployment = deployment;
       indexItem.type = 'Lab';

package/extensions/algolia-indexer/index.js

@@ -114,7 +114,7 @@ function register({
     }
 
     for (const [objectID, obj] of existingObjectsMap) {
-      if ((obj.type === 'Doc' && !obj._tags.includes('apis')) || (!obj.type) || (obj.type === 'Lab' && !obj.interactive)) {
+      if ((obj.type === 'Doc' && !obj.objectID.includes('/api/')) || (!obj.type) || (obj.type === 'Lab' && !obj.interactive)) {
         objectsToDelete.push(objectID)
       }
     }

package/extensions/version-fetcher/get-latest-console-version.js

@@ -1,6 +1,6 @@
-// Fetch the latest release version from GitHub
 const { Octokit } = require("@octokit/rest");
 const { retry } = require("@octokit/plugin-retry");
+const semver = require("semver");
 const OctokitWithRetries = Octokit.plugin(retry);
 const owner = 'redpanda-data';
 const repo = 'console';
@@ -16,15 +16,31 @@ if (process.env.REDPANDA_GITHUB_TOKEN) {
 
 const github = new OctokitWithRetries(githubOptions);
 
-var latestConsoleReleaseVersion;
-
 module.exports = async () => {
   try {
-    const release = await github.rest.repos.getLatestRelease({ owner, repo });
-    latestConsoleReleaseVersion = release.data.tag_name.replace('v','');
-    return latestConsoleReleaseVersion;
+    // Fetch the latest 10 releases
+    const releases = await github.rest.repos.listReleases({
+      owner,
+      repo,
+      per_page: 10,
+    });
+
+    // Filter valid semver tags and sort them
+    const sortedReleases = releases.data
+      .map(release => release.tag_name.replace(/^v/, ''))
+      .filter(tag => semver.valid(tag))
+      // Sort in descending order to get the highest version first
+      .sort(semver.rcompare);
+
+    if (sortedReleases.length > 0) {
+      // Return the highest version
+      return sortedReleases[0];
+    } else {
+      console.log("No valid semver releases found.");
+      return null;
+    }
   } catch (error) {
     console.error(error);
     return null;
   }
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redpanda-data/docs-extensions-and-macros",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Antora extensions and macros developed for Redpanda documentation.",
   "keywords": [
     "antora",
@@ -52,8 +52,8 @@
     "url": "git+https://github.com/redpanda-data/docs-extensions-and-macros"
   },
   "dependencies": {
-    "@octokit/plugin-retry": "^4.1.3",
-    "@octokit/rest": "^19.0.7",
+    "@octokit/plugin-retry": "~4.1.3",
+    "@octokit/rest": "~19.0.7",
     "algoliasearch": "^4.17.0",
     "chalk": "4.1.2",
     "gulp": "^4.0.2",
@@ -61,7 +61,8 @@
     "html-entities": "2.3",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "node-html-parser": "5.4.2-0"
+    "node-html-parser": "5.4.2-0",
+    "semver": "^7.6.0"
   },
   "devDependencies": {
     "@antora/cli": "3.1.4",