From b5123931eb5db1973243e936aaee1d97bd904cf0 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Thu, 21 Nov 2024 19:23:32 +0300
Subject: [PATCH 01/11] fix: Restrict the display of Stories heading and list
 of stories when there is more than one story

---
 apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
index d4240a66a..fe6218709 100644
--- a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
+++ b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
@@ -30,6 +30,7 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
           sx={{
             order: { xs: 0, md: 1 },
             width: "100%",
+            display: articles?.length > 1 ? "block" : "none",
           }}
         >
           {/* title is below featuredArticle in md and above hence needs margin-top */}
@@ -71,7 +72,7 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
             />
           </Grid>
         ) : null}
-        {articles?.length > 0 ? (
+        {articles?.length > 1 ? (
           <Grid item xs={12} sx={{ order: { xs: 2 } }}>
             <ArticleCardList
               sx={{ pt: { xs: "28px", md: 0 } }}

From 80845fe203a50ffc0b2e6817509451d0203c6ba4 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Thu, 21 Nov 2024 19:24:32 +0300
Subject: [PATCH 02/11] chore: Update ArticleGrid and Articles snapshots

---
 .../ArticleGrid/ArticleGrid.snap.js           |  2 +-
 .../src/components/Articles/Articles.snap.js  | 45 +------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
index e49f8ec98..5dcaab527 100644
--- a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
+++ b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
@@ -9,7 +9,7 @@ exports[`<ArticleGrid /> renders unchanged 1`] = `
       class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
     >
       <div
-        class="MuiBox-root css-1xugy04"
+        class="MuiBox-root css-xvmbfl"
       >
         <div
           class="MuiStack-root css-kbcct1-MuiStack-root"
diff --git a/apps/civicsignalblog/src/components/Articles/Articles.snap.js b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
index dd02cb193..4bab1063a 100644
--- a/apps/civicsignalblog/src/components/Articles/Articles.snap.js
+++ b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
@@ -10,7 +10,7 @@ exports[`<Articles /> renders unchanged 1`] = `
         class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
       >
         <div
-          class="MuiBox-root css-1xugy04"
+          class="MuiBox-root css-xvmbfl"
         >
           <div
             class="MuiTypography-root MuiTypography-h4 css-7yxv5i-MuiTypography-root"
@@ -190,49 +190,6 @@ exports[`<Articles /> renders unchanged 1`] = `
             </a>
           </div>
         </div>
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-1nco2t7-MuiGrid-root"
-        >
-          <div
-            class="MuiGrid-root MuiGrid-container css-mxdmwy-MuiGrid-root"
-          >
-            <div
-              class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1dte7n6-MuiGrid-root"
-            >
-              <div
-                class="MuiPaper-root MuiPaper-outlined MuiCard-root css-1u025w9-MuiPaper-root-MuiCard-root"
-              >
-                <a
-                  class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiCardActionArea-root css-1nkr5oe-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiCardActionArea-root"
-                  href="/stories/article-1"
-                  tabindex="0"
-                >
-                  <img
-                    class="MuiCardMedia-root MuiCardMedia-media MuiCardMedia-img css-qxudtl-MuiCardMedia-root"
-                    src="https://res.cloudinary.com/code-for-africa/image/upload/v1650885664/codeforafrica/unsplash_L6hr1BptcNc_of23p3.png"
-                  />
-                  <div
-                    class="MuiCardContent-root css-q7lov9-MuiCardContent-root"
-                  >
-                    <h6
-                      class="MuiTypography-root MuiTypography-subtitle1 css-t0ku10-MuiTypography-root"
-                    >
-                      Battle for gender equality in African media continues
-                    </h6>
-                    <span
-                      class="MuiTypography-root MuiTypography-caption css-1xdk20n-MuiTypography-root"
-                    >
-                      Jan 6, 2022
-                    </span>
-                  </div>
-                  <span
-                    class="MuiCardActionArea-focusHighlight css-1v2exvi-MuiCardActionArea-focusHighlight"
-                  />
-                </a>
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
     <nav

From 097555c5368d9b51f6e01dec8e36b78d51808854 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Fri, 22 Nov 2024 10:44:02 +0300
Subject: [PATCH 03/11] feat: Implement migration for global site settings

---
 .../migrations/20241122_054517_migration.ts   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 apps/civicsignalblog/migrations/20241122_054517_migration.ts

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
new file mode 100644
index 000000000..f4c0fac28
--- /dev/null
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -0,0 +1,50 @@
+import { MigrateUpArgs, MigrateDownArgs } from "@payloadcms/db-mongodb";
+import mongoose from "mongoose";
+
+const mongoURL = process.env.MONGO_URL;
+const oldGlobalConfigType = "settings-site";
+const newGlobalConfigType = "settings-research-site";
+
+export async function up({ payload }: MigrateUpArgs): Promise<void> {
+  await mongoose.connect(mongoURL);
+  const db = mongoose.connection.db;
+
+  const existingGlobalConfig = await db.collection("globals").findOne({
+    globalType: oldGlobalConfigType,
+  });
+
+  if (!existingGlobalConfig) {
+    payload.logger.error(
+      `No existing global settings [${oldGlobalConfigType}] config found, exiting...`,
+    );
+    return;
+  }
+
+  let newGlobalConfig = await db.collection("globals").findOne({
+    globalType: newGlobalConfigType,
+  });
+
+  if (newGlobalConfig) {
+    payload.logger.error(
+      `Migration failed: Unable to migrate [${oldGlobalConfigType}] to [${newGlobalConfigType}] because a global configuration with this name already exists.`,
+    );
+    return;
+  }
+
+  try {
+    newGlobalConfig = {
+      ...existingGlobalConfig,
+      globalType: newGlobalConfigType,
+    };
+
+    delete newGlobalConfig._id;
+    await db.collection("globals").insertOne(newGlobalConfig);
+    payload.logger.info(
+      `✓ Successfully migrated global config [${oldGlobalConfigType}] to [${newGlobalConfigType}]`,
+    );
+  } catch (error) {
+    payload.logger.error("Error: Migration failed.");
+    throw error;
+  }
+}
+export async function down({ payload }: MigrateDownArgs): Promise<void> {}

From c45b196fc668b0f6b61a17e874be08db3bcd314a Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Fri, 22 Nov 2024 11:33:53 +0300
Subject: [PATCH 04/11] fix: Set proper logic to control rendering of the
 Filterbar

---
 .../src/components/ArticleGrid/ArticleGrid.js | 64 ++++++++++---------
 .../ArticleGrid/ArticleGrid.snap.js           | 53 +--------------
 .../src/components/Articles/Articles.snap.js  | 45 ++++++++++++-
 3 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
index fe6218709..2b46feb64 100644
--- a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
+++ b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
@@ -26,39 +26,41 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
   return (
     <Section sx={{ px: { xs: "20px", sm: 0 }, ...sx }} {...other} ref={ref}>
       <Grid container sx={{ py: { xs: "28px", md: 8, lg: "105.29px" } }}>
-        <Box
-          sx={{
-            order: { xs: 0, md: 1 },
-            width: "100%",
-            display: articles?.length > 1 ? "block" : "none",
-          }}
-        >
-          {/* title is below featuredArticle in md and above hence needs margin-top */}
-          <RichTypography
-            variant="h4"
+        {articles?.length > 0 && (
+          <Box
             sx={{
-              mb: "10px",
-              mt: {
-                md: featuredArticle?.id ? 5 : 0,
-              },
+              order: { xs: 0, md: 1 },
+              width: "100%",
+              display: "block",
             }}
           >
-            {title}
-          </RichTypography>
-          <FilterBar
-            onChangeQ={onChangeQ}
-            onChangeTag={onChangeTag}
-            q={q}
-            tag={selectedTag}
-            tags={tags}
-            SearchInputProps={{
-              placeholder: searchLabel,
-            }}
-            sx={{
-              mb: { xs: 2.5, md: 5 },
-            }}
-          />
-        </Box>
+            {/* title is below featuredArticle in md and above hence needs margin-top */}
+            <RichTypography
+              variant="h4"
+              sx={{
+                mb: "10px",
+                mt: {
+                  md: featuredArticle?.id ? 5 : 0,
+                },
+              }}
+            >
+              {title}
+            </RichTypography>
+            <FilterBar
+              onChangeQ={onChangeQ}
+              onChangeTag={onChangeTag}
+              q={q}
+              tag={selectedTag}
+              tags={tags}
+              SearchInputProps={{
+                placeholder: searchLabel,
+              }}
+              sx={{
+                mb: { xs: 2.5, md: 5 },
+              }}
+            />
+          </Box>
+        )}
         {featuredArticle ? (
           <Grid
             item
@@ -72,7 +74,7 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
             />
           </Grid>
         ) : null}
-        {articles?.length > 1 ? (
+        {articles?.length > 0 ? (
           <Grid item xs={12} sx={{ order: { xs: 2 } }}>
             <ArticleCardList
               sx={{ pt: { xs: "28px", md: 0 } }}
diff --git a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
index 5dcaab527..97818fb0d 100644
--- a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
+++ b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.snap.js
@@ -7,58 +7,7 @@ exports[`<ArticleGrid /> renders unchanged 1`] = `
   >
     <div
       class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
-    >
-      <div
-        class="MuiBox-root css-xvmbfl"
-      >
-        <div
-          class="MuiStack-root css-kbcct1-MuiStack-root"
-        >
-          <div
-            class="MuiFormControl-root MuiTextField-root css-1w88xu6-MuiFormControl-root-MuiTextField-root"
-          >
-            <div
-              class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedEnd css-1wq2s8-MuiInputBase-root-MuiOutlinedInput-root"
-            >
-              <input
-                aria-invalid="false"
-                class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputTypeSearch MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedEnd css-uotzle-MuiInputBase-input-MuiOutlinedInput-input"
-                id=":r0:"
-                type="search"
-                value=""
-              />
-              <button
-                aria-label="search"
-                class="MuiButtonBase-root MuiIconButton-root MuiIconButton-edgeEnd MuiIconButton-sizeMedium css-k4oz44-MuiButtonBase-root-MuiIconButton-root"
-                tabindex="0"
-                type="button"
-              >
-                <div
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-iusnk6-MuiSvgIcon-root"
-                  focusable="false"
-                  viewbox="0 0 16 16"
-                />
-              </button>
-              <fieldset
-                aria-hidden="true"
-                class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
-              >
-                <legend
-                  class="css-ihdtdm"
-                >
-                  <span
-                    class="notranslate"
-                  >
-                    ​
-                  </span>
-                </legend>
-              </fieldset>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+    />
   </div>
 </div>
 `;
diff --git a/apps/civicsignalblog/src/components/Articles/Articles.snap.js b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
index 4bab1063a..9a17d164c 100644
--- a/apps/civicsignalblog/src/components/Articles/Articles.snap.js
+++ b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
@@ -10,7 +10,7 @@ exports[`<Articles /> renders unchanged 1`] = `
         class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
       >
         <div
-          class="MuiBox-root css-xvmbfl"
+          class="MuiBox-root css-rumcnl"
         >
           <div
             class="MuiTypography-root MuiTypography-h4 css-7yxv5i-MuiTypography-root"
@@ -190,6 +190,49 @@ exports[`<Articles /> renders unchanged 1`] = `
             </a>
           </div>
         </div>
+        <div
+          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-1nco2t7-MuiGrid-root"
+        >
+          <div
+            class="MuiGrid-root MuiGrid-container css-mxdmwy-MuiGrid-root"
+          >
+            <div
+              class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1dte7n6-MuiGrid-root"
+            >
+              <div
+                class="MuiPaper-root MuiPaper-outlined MuiCard-root css-1u025w9-MuiPaper-root-MuiCard-root"
+              >
+                <a
+                  class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiCardActionArea-root css-1nkr5oe-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiCardActionArea-root"
+                  href="/stories/article-1"
+                  tabindex="0"
+                >
+                  <img
+                    class="MuiCardMedia-root MuiCardMedia-media MuiCardMedia-img css-qxudtl-MuiCardMedia-root"
+                    src="https://res.cloudinary.com/code-for-africa/image/upload/v1650885664/codeforafrica/unsplash_L6hr1BptcNc_of23p3.png"
+                  />
+                  <div
+                    class="MuiCardContent-root css-q7lov9-MuiCardContent-root"
+                  >
+                    <h6
+                      class="MuiTypography-root MuiTypography-subtitle1 css-t0ku10-MuiTypography-root"
+                    >
+                      Battle for gender equality in African media continues
+                    </h6>
+                    <span
+                      class="MuiTypography-root MuiTypography-caption css-1xdk20n-MuiTypography-root"
+                    >
+                      Jan 6, 2022
+                    </span>
+                  </div>
+                  <span
+                    class="MuiCardActionArea-focusHighlight css-1v2exvi-MuiCardActionArea-focusHighlight"
+                  />
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <nav

From 872e7d1432ff1110e76220a921f7179a578fa8d6 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Fri, 22 Nov 2024 12:24:44 +0300
Subject: [PATCH 05/11] chore: Fix resolve posts API case issue when acessing
 author name as fullName instead of fullname

---
 apps/civicsignalblog/src/lib/data/utils/posts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/civicsignalblog/src/lib/data/utils/posts.js b/apps/civicsignalblog/src/lib/data/utils/posts.js
index ad7aeea73..d68ca42b3 100644
--- a/apps/civicsignalblog/src/lib/data/utils/posts.js
+++ b/apps/civicsignalblog/src/lib/data/utils/posts.js
@@ -121,7 +121,7 @@ export async function getPost(api, slug, primaryTag, options) {
     description: excerpt,
     image: coverImage ?? null,
     article: {
-      authors: authors?.map((a) => a.fullname || a.bio) ?? null,
+      authors: authors?.map((a) => a.fullName || a.bio) ?? null,
       publishedAt: publishedOn,
       tags: tags.length ? tags.map((t) => t.name) : null,
       updatedAt,

From c82f531185d1f563e3ddd8841e336b701001a260 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <m453h@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:32:42 +0300
Subject: [PATCH 06/11] Update
 apps/civicsignalblog/migrations/20241122_054517_migration.ts

Co-authored-by: Clemence Kyara <kilemensi@users.noreply.github.com>
---
 apps/civicsignalblog/migrations/20241122_054517_migration.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
index f4c0fac28..5cd7b6ea2 100644
--- a/apps/civicsignalblog/migrations/20241122_054517_migration.ts
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -9,11 +9,11 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
   await mongoose.connect(mongoURL);
   const db = mongoose.connection.db;
 
-  const existingGlobalConfig = await db.collection("globals").findOne({
+  const existingOldGlobalConfig = await db.collection("globals").findOne({
     globalType: oldGlobalConfigType,
   });
 
-  if (!existingGlobalConfig) {
+  if (!existingOldGlobalConfig) {
     payload.logger.error(
       `No existing global settings [${oldGlobalConfigType}] config found, exiting...`,
     );

From 10b5ae15e03e6ab87fb06a8278b359336b3084de Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <m453h@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:33:40 +0300
Subject: [PATCH 07/11] Update
 apps/civicsignalblog/migrations/20241122_054517_migration.ts

Co-authored-by: Clemence Kyara <kilemensi@users.noreply.github.com>
---
 .../civicsignalblog/migrations/20241122_054517_migration.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
index 5cd7b6ea2..f866d76a1 100644
--- a/apps/civicsignalblog/migrations/20241122_054517_migration.ts
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -20,13 +20,13 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
     return;
   }
 
-  let newGlobalConfig = await db.collection("globals").findOne({
+  const existingNewGlobalConfig = await db.collection("globals").findOne({
     globalType: newGlobalConfigType,
   });
 
-  if (newGlobalConfig) {
+  if (existingNewGlobalConfig) {
     payload.logger.error(
-      `Migration failed: Unable to migrate [${oldGlobalConfigType}] to [${newGlobalConfigType}] because a global configuration with this name already exists.`,
+      `Migration 20241122_054517 failed: Global type [${newGlobalConfigType}] already exists.`,
     );
     return;
   }

From 5aa13af368f57c348f502fe9b4d4bd7c22402a4c Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <m453h@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:34:01 +0300
Subject: [PATCH 08/11] Update
 apps/civicsignalblog/migrations/20241122_054517_migration.ts

Co-authored-by: Clemence Kyara <kilemensi@users.noreply.github.com>
---
 .../migrations/20241122_054517_migration.ts               | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
index f866d76a1..6061f2afa 100644
--- a/apps/civicsignalblog/migrations/20241122_054517_migration.ts
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -32,12 +32,8 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
   }
 
   try {
-    newGlobalConfig = {
-      ...existingGlobalConfig,
-      globalType: newGlobalConfigType,
-    };
-
-    delete newGlobalConfig._id;
+    const { _id, globalType, ...newGlobalConfig } = existingOldConfig;
+    newGlobalConfig.globalType = newGlobalConfigType;
     await db.collection("globals").insertOne(newGlobalConfig);
     payload.logger.info(
       `✓ Successfully migrated global config [${oldGlobalConfigType}] to [${newGlobalConfigType}]`,

From dd0e5480c0ced69b44de0bd3e9cdea0a21758c23 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Fri, 22 Nov 2024 13:52:44 +0300
Subject: [PATCH 09/11] chore: Improve migrations after review

---
 apps/civicsignalblog/migrations/20241122_054517_migration.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
index 6061f2afa..c90088592 100644
--- a/apps/civicsignalblog/migrations/20241122_054517_migration.ts
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -14,7 +14,7 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
   });
 
   if (!existingOldGlobalConfig) {
-    payload.logger.error(
+    payload.logger.info(
       `No existing global settings [${oldGlobalConfigType}] config found, exiting...`,
     );
     return;
@@ -32,7 +32,7 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
   }
 
   try {
-    const { _id, globalType, ...newGlobalConfig } = existingOldConfig;
+    const { _id, globalType, ...newGlobalConfig } = existingOldGlobalConfig;
     newGlobalConfig.globalType = newGlobalConfigType;
     await db.collection("globals").insertOne(newGlobalConfig);
     payload.logger.info(

From 5c6cb6101127f057f877948486fc22a75b438a77 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Fri, 22 Nov 2024 13:57:41 +0300
Subject: [PATCH 10/11] fix: Implement consistent behaviour for ArticleGrid
 Component in codeforafrica and civicsignalblog sites

---
 .../src/components/ArticleGrid/ArticleGrid.js | 12 +---
 .../src/components/Articles/Articles.snap.js  |  2 +-
 .../src/components/ArticleGrid/ArticleGrid.js | 56 ++++++++++---------
 .../ArticleGrid/ArticleGrid.snap.js           | 53 +-----------------
 4 files changed, 34 insertions(+), 89 deletions(-)

diff --git a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
index 2b46feb64..2a1414fef 100644
--- a/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
+++ b/apps/civicsignalblog/src/components/ArticleGrid/ArticleGrid.js
@@ -1,6 +1,6 @@
 import { Section } from "@commons-ui/core";
 import { RichTypography } from "@commons-ui/next";
-import { Box, Grid } from "@mui/material";
+import { Grid } from "@mui/material";
 import React from "react";
 
 import ArticleCardList from "@/civicsignalblog/components/ArticleCardList";
@@ -27,13 +27,7 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
     <Section sx={{ px: { xs: "20px", sm: 0 }, ...sx }} {...other} ref={ref}>
       <Grid container sx={{ py: { xs: "28px", md: 8, lg: "105.29px" } }}>
         {articles?.length > 0 && (
-          <Box
-            sx={{
-              order: { xs: 0, md: 1 },
-              width: "100%",
-              display: "block",
-            }}
-          >
+          <Grid item xs={12} sx={{ order: { xs: 0, md: 1 } }}>
             {/* title is below featuredArticle in md and above hence needs margin-top */}
             <RichTypography
               variant="h4"
@@ -59,7 +53,7 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
                 mb: { xs: 2.5, md: 5 },
               }}
             />
-          </Box>
+          </Grid>
         )}
         {featuredArticle ? (
           <Grid
diff --git a/apps/civicsignalblog/src/components/Articles/Articles.snap.js b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
index 9a17d164c..5d513f3a3 100644
--- a/apps/civicsignalblog/src/components/Articles/Articles.snap.js
+++ b/apps/civicsignalblog/src/components/Articles/Articles.snap.js
@@ -10,7 +10,7 @@ exports[`<Articles /> renders unchanged 1`] = `
         class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
       >
         <div
-          class="MuiBox-root css-rumcnl"
+          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-17kpph-MuiGrid-root"
         >
           <div
             class="MuiTypography-root MuiTypography-h4 css-7yxv5i-MuiTypography-root"
diff --git a/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.js b/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.js
index 6259a9d54..0d20f5661 100644
--- a/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.js
+++ b/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.js
@@ -26,33 +26,35 @@ const ArticleGrid = React.forwardRef(function ArticleGrid(props, ref) {
   return (
     <Section sx={{ px: { xs: "20px", sm: 0 }, ...sx }} {...other} ref={ref}>
       <Grid container sx={{ py: { xs: "28px", md: 8, lg: "105.29px" } }}>
-        <Grid item xs={12} sx={{ order: { xs: 0, md: 1 } }}>
-          {/* title is below featuredArticle in md and above hence needs margin-top */}
-          <RichTypography
-            variant="h4"
-            sx={{
-              mb: "10px",
-              mt: {
-                md: featuredArticle?.id ? 5 : 0,
-              },
-            }}
-          >
-            {title}
-          </RichTypography>
-          <FilterBar
-            onChangeQ={onChangeQ}
-            onChangeTag={onChangeTag}
-            q={q}
-            tag={selectedTag}
-            tags={tags}
-            SearchInputProps={{
-              placeholder: searchLabel,
-            }}
-            sx={{
-              mb: { xs: 2.5, md: 5 },
-            }}
-          />
-        </Grid>
+        {articles?.length > 0 && (
+          <Grid item xs={12} sx={{ order: { xs: 0, md: 1 } }}>
+            {/* title is below featuredArticle in md and above hence needs margin-top */}
+            <RichTypography
+              variant="h4"
+              sx={{
+                mb: "10px",
+                mt: {
+                  md: featuredArticle?.id ? 5 : 0,
+                },
+              }}
+            >
+              {title}
+            </RichTypography>
+            <FilterBar
+              onChangeQ={onChangeQ}
+              onChangeTag={onChangeTag}
+              q={q}
+              tag={selectedTag}
+              tags={tags}
+              SearchInputProps={{
+                placeholder: searchLabel,
+              }}
+              sx={{
+                mb: { xs: 2.5, md: 5 },
+              }}
+            />
+          </Grid>
+        )}
         {featuredArticle ? (
           <Grid
             item
diff --git a/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.snap.js b/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.snap.js
index ffff3a77a..97818fb0d 100644
--- a/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.snap.js
+++ b/apps/codeforafrica/src/components/ArticleGrid/ArticleGrid.snap.js
@@ -7,58 +7,7 @@ exports[`<ArticleGrid /> renders unchanged 1`] = `
   >
     <div
       class="MuiGrid-root MuiGrid-container css-teoma9-MuiGrid-root"
-    >
-      <div
-        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-17kpph-MuiGrid-root"
-      >
-        <div
-          class="MuiStack-root css-kbcct1-MuiStack-root"
-        >
-          <div
-            class="MuiFormControl-root MuiTextField-root css-1p0a819-MuiFormControl-root-MuiTextField-root"
-          >
-            <div
-              class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedEnd css-1avksc5-MuiInputBase-root-MuiOutlinedInput-root"
-            >
-              <input
-                aria-invalid="false"
-                class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputTypeSearch MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedEnd css-uotzle-MuiInputBase-input-MuiOutlinedInput-input"
-                id=":r0:"
-                type="search"
-                value=""
-              />
-              <button
-                aria-label="search"
-                class="MuiButtonBase-root MuiIconButton-root MuiIconButton-edgeEnd MuiIconButton-sizeMedium css-k4oz44-MuiButtonBase-root-MuiIconButton-root"
-                tabindex="0"
-                type="button"
-              >
-                <div
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-iusnk6-MuiSvgIcon-root"
-                  focusable="false"
-                  viewbox="0 0 16 16"
-                />
-              </button>
-              <fieldset
-                aria-hidden="true"
-                class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
-              >
-                <legend
-                  class="css-ihdtdm"
-                >
-                  <span
-                    class="notranslate"
-                  >
-                    ​
-                  </span>
-                </legend>
-              </fieldset>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+    />
   </div>
 </div>
 `;

From e496b966cb280b2d69070b8ba24d6c20d1425a14 Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <m453h@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:16:33 +0300
Subject: [PATCH 11/11] Update
 apps/civicsignalblog/migrations/20241122_054517_migration.ts

Co-authored-by: Clemence Kyara <kilemensi@users.noreply.github.com>
---
 apps/civicsignalblog/migrations/20241122_054517_migration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/civicsignalblog/migrations/20241122_054517_migration.ts b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
index c90088592..c4f0abeed 100644
--- a/apps/civicsignalblog/migrations/20241122_054517_migration.ts
+++ b/apps/civicsignalblog/migrations/20241122_054517_migration.ts
@@ -39,7 +39,7 @@ export async function up({ payload }: MigrateUpArgs): Promise<void> {
       `✓ Successfully migrated global config [${oldGlobalConfigType}] to [${newGlobalConfigType}]`,
     );
   } catch (error) {
-    payload.logger.error("Error: Migration failed.");
+    payload.logger.error("Error: Migration 20241122_054517 failed.");
     throw error;
   }
 }