Merge pull request #180 from ConductionNL/development

Development to main, week 47
ConductionNL · Nov 27, 2023 · da9a85a · da9a85a
2 parents eba5de4 + b5a425c
commit da9a85a
Show file tree

Hide file tree

Showing 28 changed files with 277 additions and 57 deletions.
diff --git a/pwa/src/apiService/resources/availableFilters.ts b/pwa/src/apiService/resources/availableFilters.ts
@@ -11,10 +11,10 @@ export default class AvailableFilters {
   }
 
   public getCategories = async (): Promise<any> => {
-    let endpoint = "/openWOO?_queries[]=Categorie";
+    let endpoint = "/openWOO?_queries[]=categorie";
 
     if (window.sessionStorage.getItem("OIDN_NUMBER")) {
-      endpoint += `&behandelendBestuursorgaan.oidn=${window.sessionStorage.getItem("OIDN_NUMBER")}`;
+      endpoint += `&embedded.behandelendBestuursorgaan.oidn=${window.sessionStorage.getItem("OIDN_NUMBER")}`;
     }
 
     const { data } = await this._send(this._instance, "GET", endpoint);

diff --git a/pwa/src/apiService/resources/openWoo.ts b/pwa/src/apiService/resources/openWoo.ts
@@ -17,10 +17,10 @@ export default class OpenWoo {
   public getAll = async (filters: IFiltersContext, currentPage: number, limit: number): Promise<any> => {
     let endpoint = `/openWOO?extend[]=all${filtersToQueryParams(
       filters,
-    )}&_order[Publicatiedatum]=desc&_limit=${limit}&_page=${currentPage}`;
+    )}&_order[publicatiedatum]=desc&_limit=${limit}&_page=${currentPage}`;
 
     if (window.sessionStorage.getItem("OIDN_NUMBER")) {
-      endpoint += `&behandelendBestuursorgaan.oidn=${window.sessionStorage.getItem("OIDN_NUMBER")}`;
+      endpoint += `&embedded.behandelendBestuursorgaan.oidn=${window.sessionStorage.getItem("OIDN_NUMBER")}`;
     }
 
     const { data } = await this._send(this._instance, "GET", endpoint);

diff --git a/pwa/src/context/filters.ts b/pwa/src/context/filters.ts
@@ -3,16 +3,16 @@ import { GlobalContext } from "./global";
 
 export interface IFiltersContext {
   _search: string | undefined;
-  "Publicatiedatum[after]": string | undefined;
-  "Publicatiedatum[before]": string | undefined;
-  Categorie: string | undefined;
+  "publicatiedatum[after]": string | undefined;
+  "publicatiedatum[before]": string | undefined;
+  categorie: string | undefined;
 }
 
 export const defaultFiltersContext: IFiltersContext = {
   _search: "",
-  "Publicatiedatum[after]": undefined,
-  "Publicatiedatum[before]": undefined,
-  Categorie: undefined,
+  "publicatiedatum[after]": undefined,
+  "publicatiedatum[before]": undefined,
+  categorie: undefined,
 };
 
 export const useFiltersContext = () => {

diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts
@@ -24,7 +24,12 @@ export const useEnvironment = () => {
 
   const initiateFromEnv = () => {
     window.sessionStorage.setItem("SHOW_THEME_SWITCHER", process.env.GATSBY_SHOW_THEME_SWITCHER ?? "");
-    window.sessionStorage.setItem("API_BASE_URL", process.env.GATSBY_API_BASE_URL ?? "");
+    window.sessionStorage.setItem(
+      "API_BASE_URL",
+      process.env.GATSBY_DEV_ENVIRONMENT === "true"
+        ? "https://api.gateway.commonground.nu/api"
+        : process.env.GATSBY_API_BASE_URL ?? "",
+    );
     window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", process.env.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? "");
     window.sessionStorage.setItem("FAVICON_URL", process.env.GATSBY_FAVICON_URL ?? "");
     window.sessionStorage.setItem("ORGANISATION_NAME", process.env.GATSBY_ORGANISATION_NAME ?? "");
@@ -43,7 +48,12 @@ export const useEnvironment = () => {
     if (!config) return; // no config found, nothing else to do
 
     window.sessionStorage.setItem("SHOW_THEME_SWITCHER", config.GATSBY_SHOW_THEME_SWITCHER ?? "");
-    window.sessionStorage.setItem("API_BASE_URL", config.GATSBY_API_BASE_URL ?? "");
+    window.sessionStorage.setItem(
+      "API_BASE_URL",
+      process.env.GATSBY_DEV_ENVIRONMENT === "true"
+        ? "https://api.gateway.commonground.nu/api"
+        : config.GATSBY_API_BASE_URL ?? "",
+    );
     window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", config.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? "");
     window.sessionStorage.setItem("FAVICON_URL", config.GATSBY_FAVICON_URL ?? "");
     window.sessionStorage.setItem("ORGANISATION_NAME", config.GATSBY_ORGANISATION_NAME ?? "");

diff --git a/pwa/src/services/filtersToQueryParams.ts b/pwa/src/services/filtersToQueryParams.ts
@@ -37,8 +37,8 @@ export const filtersToUrlQueryParams = (filters: Record<string, any>): string =>
         ? value.map((v: string) => v.replace(/\s+/g, "_")).join(`&${key}[]=`)
         : (value as string).replace(/\s+/g, "_");
 
-      if (key == "Publicatiedatum[after]") return;
-      if (key == "Publicatiedatum[before]")
+      if (key == "publicatiedatum[after]") return;
+      if (key == "publicatiedatum[before]")
         return `year=${
           generateYearsArray(currentYear - 1995).find((year: any) => {
             return year.before === value;

diff --git a/pwa/src/services/getConfig.ts b/pwa/src/services/getConfig.ts
@@ -7,6 +7,16 @@ import OpenWebconcept from "./../../static/configFiles/open-webconcept.json";
 import Rotterdam from "./../../static/configFiles/rotterdam.json";
 import Tubbergen from "./../../static/configFiles/tubbergen.json";
 import Xxllnc from "./../../static/configFiles/xxllnc.json";
+import Barendrecht from "./../../static/configFiles/barendrecht.json";
+import Ridderkerk from "./../../static/configFiles/ridderkerk.json";
+import Buren from "./../../static/configFiles/buren.json";
+import Albrandswaard from "./../../static/configFiles/albrandswaard.json";
+import StedeBroec from "./../../static/configFiles/stede-broec.json";
+import Lansingerland from "./../../static/configFiles/lansingerland.json";
+import Waddinxveen from "./../../static/configFiles/waddinxveen..json";
+import RijssenHolten from "./../../static/configFiles/rijssen-holten.json";
+import HoekscheWaard from "./../../static/configFiles/hoeksche-waard.json";
+import Texel from "./../../static/configFiles/texel.json";
 
 export const getConfig = (themeOrDomainName: string): Record<string, any> | undefined => {
   switch (themeOrDomainName) {
@@ -35,20 +45,55 @@ export const getConfig = (themeOrDomainName: string): Record<string, any> | unde
     case "open-webconcept-theme":
       // case "localhost": // development purposes
       return OpenWebconcept;
+
+    case "barendrecht":
+      return Barendrecht;
+    case "ridderkerk":
+      return Ridderkerk;
+    case "buren":
+      return Buren;
+    case "albrandswaard":
+      return Albrandswaard;
+    case "stedebroec":
+      return StedeBroec;
+    case "lansingerland":
+      return Lansingerland;
+    case "waddinxveen":
+      return Waddinxveen;
+    case "rijssen-holten":
+      return RijssenHolten;
+    case "hoeksche-waard":
+      return HoekscheWaard;
+    case "texel":
+      return Texel;
+
     default:
       return Conduction;
   }
 };
 
 export const availableThemes: { label: string; value: string }[] = [
   {
-    label: "Koophulpje",
+    label: "Alle organisaties",
     value: "open-webconcept-theme",
   },
   {
-    label: "Conduction",
-    value: "conduction-theme",
+    label: "Albrandswaard",
+    value: "albrandswaard",
   },
+  {
+    label: "Barendrecht",
+    value: "barendrecht",
+  },
+  {
+    label: "Buren",
+    value: "buren",
+  },
+  // {
+  //   label: "Conduction",
+  //   value: "conduction-theme",
+  // },
+  // development purposes
   {
     label: "Dinkelland",
     value: "dinkelland-theme",
@@ -57,6 +102,14 @@ export const availableThemes: { label: string; value: string }[] = [
     label: "Epe",
     value: "epe-theme",
   },
+  {
+    label: "Hoeksche Waard",
+    value: "hoeksche-waard",
+  },
+  {
+    label: "Lansingerland",
+    value: "lansingerland",
+  },
   {
     label: "Noaberkracht",
     value: "noaberkracht-theme",
@@ -65,16 +118,37 @@ export const availableThemes: { label: string; value: string }[] = [
     label: "Noordwijk",
     value: "noordwijk-theme",
   },
+  {
+    label: "Ridderkerk",
+    value: "ridderkerk",
+  },
+  {
+    label: "Rijssen-Holten",
+    value: "rijssen-holten",
+  },
   {
     label: "Rotterdam",
     value: "rotterdam-theme",
   },
+  {
+    label: "Stede Broec",
+    value: "stedebroec",
+  },
+  {
+    label: "Texel",
+    value: "texel",
+  },
   {
     label: "Tubbergen",
     value: "tubbergen-theme",
   },
   {
-    label: "XXLLNC",
-    value: "xxllnc-theme",
+    label: "Waddinxveen",
+    value: "waddinxveen",
   },
+  // {
+  //   label: "XXLLNC",
+  //   value: "xxllnc-theme",
+  // },
+  // development purposes
 ];
diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
@@ -66,16 +66,16 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
     getCategories.isSuccess &&
       setValue(
         "category",
-        categoryOptions.find((option: any) => option.value === params.Categorie?.replace(/_/g, " ")),
+        categoryOptions.find((option: any) => option.value === params.categorie?.replace(/_/g, " ")),
       );
   };
 
   const onSubmit = (data: any) => {
     setFilters({
       _search: data._search,
-      "Publicatiedatum[after]": data.year?.after,
-      "Publicatiedatum[before]": data.year?.before,
-      Categorie: data.category?.value,
+      "publicatiedatum[after]": data.year?.after,
+      "publicatiedatum[before]": data.year?.before,
+      categorie: data.category?.value,
     });
   };
 
@@ -112,9 +112,9 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
   React.useEffect(() => {
     if (!getCategories.isSuccess) return;
 
-    const categoriesWithData = getCategories.data.Categorie.map((category: any) => ({
+    const categoriesWithData = getCategories.data.categorie.map((category: any) => ({
       label: _.upperFirst(category._id.toLowerCase()),
-      value: category._id.toLowerCase(),
+      value: _.upperFirst(category._id.toLowerCase()),
     }));
 
     setCategoryOptions(_.orderBy(_.uniqBy(categoriesWithData, "value"), "label", "asc"));
@@ -138,7 +138,7 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
           isClearable
           defaultValue={generateYearsArray(currentYear - 2021).find((year: any) => {
             return (
-              year.after === filters["Publicatiedatum[after]"] && year.before === filters["Publicatiedatum[before]"]
+              year.after === filters["publicatiedatum[after]"] && year.before === filters["publicatiedatum[before]"]
             );
           })}
           {...{ register, errors, control }}
@@ -151,7 +151,7 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
             options={categoryOptions}
             name="category"
             placeholder={t("Category")}
-            defaultValue={categoryOptions && categoryOptions.find((option: any) => option.value === filters.Categorie)}
+            defaultValue={categoryOptions && categoryOptions.find((option: any) => option.value === filters.categorie)}
             isClearable
             disabled={getCategories.isLoading}
             {...{ register, errors, control }}

diff --git a/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx b/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx
@@ -38,28 +38,28 @@ export const ThemeSwitcherTopBar: React.FC = () => {
     initiateFromJSON(watchTheme.value);
   }, [watchTheme]);
 
-  if (window.sessionStorage.getItem("SHOW_THEME_SWITCHER") === "false") {
-    return <></>;
-  }
+  if (window.sessionStorage.getItem("SHOW_THEME_SWITCHER") === "true") {
+    return (
+      <section className={clsx(styles.container, "open-webconcept-theme")}>
+        <div>
+          <Heading3>Koophulpje</Heading3>
 
-  return (
-    <section className={clsx(styles.container, "open-webconcept-theme")}>
-      <div>
-        <Heading3>Koophulpje</Heading3>
+          <Paragraph>Bekijk de Woo-berichten van verschillende gemeenten</Paragraph>
+        </div>
 
-        <Paragraph>Bekijk de Woo-berichten van verschillende gemeenten</Paragraph>
-      </div>
+        <div>
+          <Paragraph className={styles.label}>Selecteer een gemeente</Paragraph>
 
-      <div>
-        <Paragraph className={styles.label}>Selecteer een gemeente</Paragraph>
+          <SelectSingle
+            options={availableThemes}
+            name="theme"
+            ariaLabel="Theme selector"
+            {...{ register, errors, control }}
+          />
+        </div>
+      </section>
+    );
+  }
 
-        <SelectSingle
-          options={availableThemes}
-          name="theme"
-          ariaLabel="Theme selector"
-          {...{ register, errors, control }}
-        />
-      </div>
-    </section>
-  );
+  return <></>;
 };
diff --git a/pwa/static/.env.development b/pwa/static/.env.development
@@ -7,10 +7,14 @@ USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX="true"
 GATSBY_API_BASE_URL=https://api.gateway.commonground.nu/api
 GATSBY_NL_DESIGN_THEME_CLASSNAME=conduction-theme
 
+# Always uses Development Gateway
+GATSBY_DEV_ENVIRONMENT="true"
+
+
 # Header
 GATSBY_FAVICON_URL="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
 
-#Jumbotron
+# Jumbotron
 GATSBY_ORGANISATION_NAME=Conduction
 GATSBY_JUMBOTRON_IMAGE_URL=https://www.conduction.nl/wp-content/uploads/2021/07/cropped-Conduction_HOME_0000_afb1-1.png
 

diff --git a/pwa/static/.env.production b/pwa/static/.env.production
@@ -7,6 +7,9 @@ USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX=
 GATSBY_API_BASE_URL=
 GATSBY_NL_DESIGN_THEME_CLASSNAME=
 
+# Always uses Development Gateway
+GATSBY_DEV_ENVIRONMENT=
+
 # Header
 GATSBY_FAVICON_URL=
 
@@ -18,5 +21,14 @@ GATSBY_JUMBOTRON_IMAGE_URL=
 GATSBY_FOOTER_LOGO_HREF=
 GATSBY_FOOTER_CONTENT=
 
+# options: "heading-1" | "heading-2" | "heading-3" | "heading-4" | "heading-5"
+GATSBY_FOOTER_CONTENT_HEADER=
+
 #OIDN
 GATSBY_OIDN_NUMBER=
+
+#Theme switcher
+GATSBY_SHOW_THEME_SWITCHER=
+
+# Deployment option, if you're using this .env file DO NOT REMOVE OR EDIT THIS
+GATSBY_ENV_VARS_SET=
diff --git a/pwa/static/configFiles/albrandswaard.json b/pwa/static/configFiles/albrandswaard.json
@@ -0,0 +1,12 @@
+{
+  "GATSBY_SHOW_THEME_SWITCHER": "false",
+  "GATSBY_API_BASE_URL": "https://api.common-gateway.commonground.nu/api",
+  "GATSBY_NL_DESIGN_THEME_CLASSNAME": "open-webconcept-theme",
+  "GATSBY_FAVICON_URL": "https://www.albrandswaard.nl/wp-content/uploads/sites/2/2022/12/cropped-favicon-1-192x192.png",
+  "GATSBY_ORGANISATION_NAME": "Gemeente Albrandswaard",
+  "GATSBY_JUMBOTRON_IMAGE_URL": "https://www.albrandswaard.nl/wp-content/uploads/sites/2/2023/11/20230828_046M.Muus_-scaled.jpg",
+  "GATSBY_FOOTER_LOGO_HREF": "https://www.albrandswaard.nl/",
+  "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/docs/FooterContent.json",
+  "GATSBY_FOOTER_CONTENT_HEADER": "",
+  "GATSBY_OIDN_NUMBER": "albrandswaard"
+}
diff --git a/pwa/static/configFiles/barendrecht.json b/pwa/static/configFiles/barendrecht.json
@@ -0,0 +1,12 @@
+{
+  "GATSBY_SHOW_THEME_SWITCHER": "false",
+  "GATSBY_API_BASE_URL": "https://api.common-gateway.commonground.nu/api",
+  "GATSBY_NL_DESIGN_THEME_CLASSNAME": "open-webconcept-theme",
+  "GATSBY_FAVICON_URL": "https://www.barendrecht.nl/wp-content/uploads/2022/08/cropped-favicon-270x270.png",
+  "GATSBY_ORGANISATION_NAME": "Gemeente Barendrecht",
+  "GATSBY_JUMBOTRON_IMAGE_URL": "https://www.barendrecht.nl/wp-content/uploads/2023/01/16-9_ITF-6421-scaled.jpg",
+  "GATSBY_FOOTER_LOGO_HREF": "https://www.barendrecht.nl/",
+  "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/docs/FooterContent.json",
+  "GATSBY_FOOTER_CONTENT_HEADER": "",
+  "GATSBY_OIDN_NUMBER": "barendrecht"
+}
diff --git a/pwa/static/configFiles/buren.json b/pwa/static/configFiles/buren.json
@@ -0,0 +1,12 @@
+{
+  "GATSBY_SHOW_THEME_SWITCHER": "false",
+  "GATSBY_API_BASE_URL": "https://api.common-gateway.commonground.nu/api",
+  "GATSBY_NL_DESIGN_THEME_CLASSNAME": "open-webconcept-theme",
+  "GATSBY_FAVICON_URL": "https://www.buren.nl/wp-content/uploads/2020/04/cropped-buren_logo-1-32x32.png",
+  "GATSBY_ORGANISATION_NAME": "Gemeente Buren",
+  "GATSBY_JUMBOTRON_IMAGE_URL": "https://www.buren.nl/wp-content/uploads/2020/04/waterberging.jpg",
+  "GATSBY_FOOTER_LOGO_HREF": "https://www.buren.nl/",
+  "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/docs/FooterContent.json",
+  "GATSBY_FOOTER_CONTENT_HEADER": "",
+  "GATSBY_OIDN_NUMBER": "buren"
+}