From 990eac322283fefffb12b3e8f62b5f6c4a90fa88 Mon Sep 17 00:00:00 2001
From: Dj Walker-Morgan <dj.walker-morgan@enterprisedb.com>
Date: Mon, 18 Nov 2024 13:47:08 +0000
Subject: [PATCH] Fixes for relgen and refreshed PGD release notes (prev
 deleted)

Signed-off-by: Dj Walker-Morgan <dj.walker-morgan@enterprisedb.com>
---
 product_docs/docs/pgd/5.6/rel_notes/index.mdx |  2 ++
 .../pgd/5.6/rel_notes/pgd_5.6.0_rel_notes.mdx |  5 +---
 tools/automation/generators/relgen/relgen.js  | 26 ++++++++++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/product_docs/docs/pgd/5.6/rel_notes/index.mdx b/product_docs/docs/pgd/5.6/rel_notes/index.mdx
index c4e3fe63f11..8f59ccaf404 100644
--- a/product_docs/docs/pgd/5.6/rel_notes/index.mdx
+++ b/product_docs/docs/pgd/5.6/rel_notes/index.mdx
@@ -3,6 +3,7 @@ title: EDB Postgres Distributed 5.6+ release notes
 navTitle: Release notes
 description: Release notes for EDB Postgres Distributed 5.6 and later
 navigation:
+  - pgd_5.6.0_rel_notes
 ---
 
 
@@ -11,3 +12,4 @@ The EDB Postgres Distributed documentation describes the latest version of EDB P
 
 | Release Date | EDB Postgres Distributed | BDR extension | PGD CLI | PGD Proxy |
 |---|---|---|---|---|
+| 15 Oct 2024 | [5.6.0](./pgd_5.6.0_rel_notes) | 5.6.0 | 5.6.0 | 5.6.0 |
diff --git a/product_docs/docs/pgd/5.6/rel_notes/pgd_5.6.0_rel_notes.mdx b/product_docs/docs/pgd/5.6/rel_notes/pgd_5.6.0_rel_notes.mdx
index 2594e78b8df..5a2726e60f4 100644
--- a/product_docs/docs/pgd/5.6/rel_notes/pgd_5.6.0_rel_notes.mdx
+++ b/product_docs/docs/pgd/5.6/rel_notes/pgd_5.6.0_rel_notes.mdx
@@ -3,14 +3,12 @@ title: EDB Postgres Distributed 5.6.0 release notes
 navTitle: Version 5.6.0
 ---
 
-
 Released: 15 October 2024
 
-
 EDB Postgres Distributed 5.6.0 includes a number of enhancements and bug fixes.
 
-
 ## Highlights
+
 - Improved observability with new monitoring functions and SQL views.
 - Improvements to commit scopes including:
    - GROUP COMMIT and SYNCHRONOUS COMMIT support graceful degrading using DEGRADE ON.
@@ -26,7 +24,6 @@ EDB Postgres Distributed 5.6.0 includes a number of enhancements and bug fixes.
     - CREATE SCHEMA AUTHORIZATION
 - Streaming Transaction support with Decoding Worker.
 
-
 ## Enhancements
 
 <table class="table w-100"><thead><tr><th>Component</th><th>Version</th><th>Description</th><th width="10%">Addresses</th></tr></thead><tbody>
diff --git a/tools/automation/generators/relgen/relgen.js b/tools/automation/generators/relgen/relgen.js
index 3251991598b..91d32183682 100755
--- a/tools/automation/generators/relgen/relgen.js
+++ b/tools/automation/generators/relgen/relgen.js
@@ -93,7 +93,11 @@ let meta = load(readFileSync(path.join(basepath, "src/meta.yml"), "utf8"));
 
 let files = readdirSync(path.join(basepath, "src"), { withFileTypes: true })
   .filter((dirent) => {
-    dirent.isFile() && dirent.name !== "meta.yml";
+    return (
+      dirent.isFile() &&
+      dirent.name !== "meta.yml" &&
+      dirent.name.endsWith(".yml")
+    );
   })
   .map((dirent) => dirent.name);
 
@@ -205,6 +209,14 @@ appendFileSync(relindexfilename, "\n\n");
 appendFileSync(relindexfilename, `${meta.intro}`);
 appendFileSync(relindexfilename, "\n\n");
 
+// Before we process the table, is there a column definition. If not, we'll use a default
+if (meta.columns == undefined) {
+  meta.columns = [
+    { label: "Version", key: "version-link" },
+    { label: "Release Date", key: "shortdate" },
+  ];
+}
+
 let headers = "|";
 let headers2 = "|";
 for (let i = 0; i < meta.columns.length; i++) {
@@ -332,23 +344,23 @@ function prepareRelnote(meta, file, note) {
   );
   appendFileSync(rlout, `navTitle: Version ${note.version}\n`);
   appendFileSync(rlout, `---\n`);
-  appendFileSync(rlout, "\n\n");
+  appendFileSync(rlout, "\n");
   appendFileSync(rlout, `Released: ${note.date}\n`);
-  appendFileSync(rlout, "\n\n");
+  appendFileSync(rlout, "\n");
 
   if (note.updated !== undefined) {
     appendFileSync(rlout, `Updated: ${note.updated}\n`);
-    appendFileSync(rlout, "\n\n");
+    appendFileSync(rlout, "\n");
   }
 
   appendFileSync(rlout, `${note.intro}`);
-  appendFileSync(rlout, "\n\n");
+  appendFileSync(rlout, "\n");
 
   if (note.highlights !== undefined) {
     appendFileSync(rlout, `## Highlights`);
-    appendFileSync(rlout, "\n");
-    appendFileSync(rlout, `${note.highlights}`);
     appendFileSync(rlout, "\n\n");
+    appendFileSync(rlout, `${note.highlights}`);
+    appendFileSync(rlout, "\n");
   }
 
   for (let type of types) {