From b35a1c3b44787636acb4f387a306555f059b009b Mon Sep 17 00:00:00 2001
From: Michael Hudson Nkotagu <mnkotagu@gmail.com>
Date: Wed, 25 Sep 2024 12:50:21 +0300
Subject: [PATCH] chore: Use defined app names in app imports

---
 apps/civicsignalblog/payload.config.ts                    | 6 +++---
 .../access/applications/{civicSignal.js => main.js}       | 0
 .../access/applications/{researchBlog.js => research.js}  | 0
 .../src/payload/collections/CivicSignalBlog/Authors.js    | 2 +-
 .../src/payload/collections/CivicSignalBlog/Pages.js      | 4 ++--
 .../src/payload/collections/CivicSignalBlog/Posts.js      | 2 +-
 .../src/payload/collections/CivicSignalBlog/Tags.js       | 2 +-
 .../collections/CivicSignalTools/CivicSignalPages.js      | 2 +-
 .../src/payload/components/actions/index.tsx              | 4 ++--
 .../src/payload/globals/Publication/index.js              | 2 +-
 .../src/payload/globals/Site/{civicSignal.js => main.js}  | 8 ++++----
 .../payload/globals/Site/{researchBlog.js => research.js} | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename apps/civicsignalblog/src/payload/access/applications/{civicSignal.js => main.js} (100%)
 rename apps/civicsignalblog/src/payload/access/applications/{researchBlog.js => research.js} (100%)
 rename apps/civicsignalblog/src/payload/globals/Site/{civicSignal.js => main.js} (68%)
 rename apps/civicsignalblog/src/payload/globals/Site/{researchBlog.js => research.js} (81%)

diff --git a/apps/civicsignalblog/payload.config.ts b/apps/civicsignalblog/payload.config.ts
index 046eb7f78..71219ef24 100644
--- a/apps/civicsignalblog/payload.config.ts
+++ b/apps/civicsignalblog/payload.config.ts
@@ -19,8 +19,8 @@ import CivicSignalPages from "./src/payload/collections/CivicSignalTools/CivicSi
 
 import Posts from "./src/payload/collections/CivicSignalBlog/Posts";
 import Publication from "./src/payload/globals/Publication";
-import ResearchBlog from "./src/payload/globals/Site/researchBlog";
-import CivicSignal from "./src/payload/globals/Site/civicSignal";
+import Research from "./src/payload/globals/Site/research";
+import Main from "./src/payload/globals/Site/main";
 import Tags from "./src/payload/collections/CivicSignalBlog/Tags";
 import Users from "./src/payload/collections/Users";
 import { defaultLocale, locales } from "./src/payload/utils/locales";
@@ -70,7 +70,7 @@ export default buildConfig({
     CivicSignalPages,
     Users,
   ] as CollectionConfig[],
-  globals: [Publication, ResearchBlog, CivicSignal] as GlobalConfig[],
+  globals: [Publication, Research, Main] as GlobalConfig[],
   ...(locales?.length
     ? {
         localization: {
diff --git a/apps/civicsignalblog/src/payload/access/applications/civicSignal.js b/apps/civicsignalblog/src/payload/access/applications/main.js
similarity index 100%
rename from apps/civicsignalblog/src/payload/access/applications/civicSignal.js
rename to apps/civicsignalblog/src/payload/access/applications/main.js
diff --git a/apps/civicsignalblog/src/payload/access/applications/researchBlog.js b/apps/civicsignalblog/src/payload/access/applications/research.js
similarity index 100%
rename from apps/civicsignalblog/src/payload/access/applications/researchBlog.js
rename to apps/civicsignalblog/src/payload/access/applications/research.js
diff --git a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Authors.js b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Authors.js
index 6c505889c..ae7479291 100644
--- a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Authors.js
+++ b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Authors.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 
 const Authors = {
   slug: "author",
diff --git a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Pages.js b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Pages.js
index ae18d8658..f65240ef4 100644
--- a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Pages.js
+++ b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Pages.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 import CustomPageHeader from "../../blocks/CustomPageHeader";
 import Error from "../../blocks/Error";
 import FeaturedStories from "../../blocks/FeaturedStories";
@@ -24,7 +24,7 @@ const Pages = pages({
     read: canRead,
   },
   adminOptions: {
-    description: "Research Blog",
+    description: "Research",
   },
 });
 
diff --git a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Posts.js b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Posts.js
index d6c20cd38..f4d88f9a2 100644
--- a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Posts.js
+++ b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Posts.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 import authors from "../../fields/authors";
 import content from "../../fields/content";
 import image from "../../fields/image";
diff --git a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Tags.js b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Tags.js
index f0bd6db06..33b027e6a 100644
--- a/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Tags.js
+++ b/apps/civicsignalblog/src/payload/collections/CivicSignalBlog/Tags.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 import slug from "../../fields/slug";
 
 const Tags = {
diff --git a/apps/civicsignalblog/src/payload/collections/CivicSignalTools/CivicSignalPages.js b/apps/civicsignalblog/src/payload/collections/CivicSignalTools/CivicSignalPages.js
index cef48735c..0eb7ce297 100644
--- a/apps/civicsignalblog/src/payload/collections/CivicSignalTools/CivicSignalPages.js
+++ b/apps/civicsignalblog/src/payload/collections/CivicSignalTools/CivicSignalPages.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/civicSignal";
+import canRead from "../../access/applications/main";
 import CustomPageHeader from "../../blocks/CustomPageHeader";
 import Error from "../../blocks/Error";
 import FeaturedStories from "../../blocks/FeaturedStories";
diff --git a/apps/civicsignalblog/src/payload/components/actions/index.tsx b/apps/civicsignalblog/src/payload/components/actions/index.tsx
index 357f27f66..0ee9957e8 100644
--- a/apps/civicsignalblog/src/payload/components/actions/index.tsx
+++ b/apps/civicsignalblog/src/payload/components/actions/index.tsx
@@ -1,7 +1,7 @@
 import { useAuth } from "payload/components/utilities";
 import React, { useEffect, useState } from "react";
 
-import applications from "../../../lib/data/json/applications";
+import applications, { RESEARCH } from "../../../lib/data/json/applications";
 
 function BeforeDashboard() {
   const { user } = useAuth();
@@ -19,7 +19,7 @@ function BeforeDashboard() {
       selectedApp !== String(user.currentApp)
     ) {
       setLoading(true);
-      fetch(`/api/users/current-app`, {
+      fetch(`/api/users/apps/current`, {
         method: "PATCH",
         headers: {
           "Content-Type": "application/json",
diff --git a/apps/civicsignalblog/src/payload/globals/Publication/index.js b/apps/civicsignalblog/src/payload/globals/Publication/index.js
index b71366bf0..51ce83255 100644
--- a/apps/civicsignalblog/src/payload/globals/Publication/index.js
+++ b/apps/civicsignalblog/src/payload/globals/Publication/index.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 
 import PostTab from "./PostTab";
 
diff --git a/apps/civicsignalblog/src/payload/globals/Site/civicSignal.js b/apps/civicsignalblog/src/payload/globals/Site/main.js
similarity index 68%
rename from apps/civicsignalblog/src/payload/globals/Site/civicSignal.js
rename to apps/civicsignalblog/src/payload/globals/Site/main.js
index 07ec734ce..cd66b70cb 100644
--- a/apps/civicsignalblog/src/payload/globals/Site/civicSignal.js
+++ b/apps/civicsignalblog/src/payload/globals/Site/main.js
@@ -1,12 +1,12 @@
-import canRead from "../../access/applications/civicSignal";
+import canRead from "../../access/applications/main";
 import settings from "../../fields/settings";
 
 import EngagementTab from "./Components/EngagementTab";
 import GeneralTab from "./Components/GeneralTab";
 import NavigationTab from "./Components/NavigationTab";
 
-const CivicSignal = settings({
-  slug: "settings-civicsignal-site",
+const Main = settings({
+  slug: "settings-main-site",
   label: "Site",
   group: "Settings",
   access: {
@@ -15,4 +15,4 @@ const CivicSignal = settings({
   tabs: [GeneralTab, NavigationTab, EngagementTab],
 });
 
-export default CivicSignal;
+export default Main;
diff --git a/apps/civicsignalblog/src/payload/globals/Site/researchBlog.js b/apps/civicsignalblog/src/payload/globals/Site/research.js
similarity index 81%
rename from apps/civicsignalblog/src/payload/globals/Site/researchBlog.js
rename to apps/civicsignalblog/src/payload/globals/Site/research.js
index 34af18e6c..b7a5bb88c 100644
--- a/apps/civicsignalblog/src/payload/globals/Site/researchBlog.js
+++ b/apps/civicsignalblog/src/payload/globals/Site/research.js
@@ -1,4 +1,4 @@
-import canRead from "../../access/applications/researchBlog";
+import canRead from "../../access/applications/research";
 import settings from "../../fields/settings";
 
 import EngagementTab from "./Components/EngagementTab";
@@ -15,4 +15,4 @@ const Research = settings({
   tabs: [GeneralTab, NavigationTab, EngagementTab],
 });
 
-export default ResearchBlog;
+export default Research;