feat(ministry brands): added extra for getEkklesiaFields

added extra to updateEkklesiaFields
ThemeFuse · Mar 20, 2024 · c0206f4 · c0206f4
1 parent 7b6d5e6
commit c0206f4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/public/editor-client/src/ekklesia/index.ts b/public/editor-client/src/ekklesia/index.ts
@@ -1,6 +1,7 @@
 import { Config } from "config";
 import { ChoicesAsync, ChoicesSync } from "types/Choices";
 import {
+  EkklesiaExtra,
   EkklesiaFieldMap,
   EkklesiaFields,
   EkklesiaKeys,
@@ -14,7 +15,8 @@ export const getEkklesiaFields = (config: Config) => ({
   async handler<T extends keyof EkklesiaFields = keyof EkklesiaFields>(
     res: Response<ChoicesAsync | ChoicesSync>,
     rej: Response<string>,
-    keys: EkklesiaParams<T>
+    keys: EkklesiaParams<T>,
+    extra?: EkklesiaExtra
   ): Promise<void> {
     const { ekklesiaApiUrl } = config.api;
     if (!ekklesiaApiUrl) {
@@ -25,7 +27,7 @@ export const getEkklesiaFields = (config: Config) => ({
       return;
     }
     try {
-      const fields = await getFields(ekklesiaApiUrl, keys);
+      const fields = await getFields(ekklesiaApiUrl, keys, extra);
       res(fields);
     } catch (error) {
       if (process.env.NODE_ENV === "development") {
@@ -42,7 +44,8 @@ export const updateEkklesiaFields = (config: Config) => ({
     rej: Response<string>,
     keys: {
       fields: Array<EkklesiaFieldMap[T]>;
-    }
+    },
+    extra?: EkklesiaExtra
   ): Promise<void> {
     const { ekklesiaApiUrl } = config.api;
 
@@ -57,7 +60,11 @@ export const updateEkklesiaFields = (config: Config) => ({
     const dataToChange: EkklesiaKeys = {};
     try {
       for (const field of keys.fields) {
-        const choiches = await getFields<T>(ekklesiaApiUrl, field.module);
+        const choiches = await getFields<T>(
+          ekklesiaApiUrl,
+          field.module,
+          extra
+        );
 
         if (!choiches.length) continue;
 

diff --git a/public/editor-client/src/ekklesia/utils.ts b/public/editor-client/src/ekklesia/utils.ts
@@ -1,16 +1,16 @@
+import { Obj, Str } from "@brizy/readers";
 import { request } from "api/index";
 import { makeUrl } from "api/utils";
 import { ChoicesSync } from "types/Choices";
 import {
   EkklesiaChoiceParamsWithSubKey,
+  EkklesiaExtra,
   EkklesiaFields,
   EkklesiaParams,
   EkklesiaParentsChilds,
   EkklesiaResponse
 } from "types/Ekklesia";
 import { t } from "utils/i18n";
-import { isObject } from "utils/reader/object";
-import { read as readString } from "utils/reader/string";
 import { Literal } from "utils/types";
 
 export const requestFields = (url: string): Promise<EkklesiaResponse> => {
@@ -28,12 +28,12 @@ export const keysHaveSubkey = (
 export const getOption = (
   obj: Record<string, Literal> | undefined
 ): ChoicesSync =>
-  isObject(obj)
+  Obj.isObject(obj)
     ? [
         { title: t("None"), value: "" },
         ...Object.entries(obj).map(([key, value]) => {
           return {
-            title: readString(value) ?? "",
+            title: Str.read(value) ?? "",
             value: key
           };
         })
@@ -44,11 +44,12 @@ export const getFields = async <
   T extends keyof EkklesiaFields = keyof EkklesiaFields
 >(
   _url: string,
-  keys: EkklesiaParams<T>
+  keys: EkklesiaParams<T>,
+  extra?: EkklesiaExtra
 ): Promise<ChoicesSync> => {
   const { key } = keys;
 
-  const url = makeUrl(_url, { module: key });
+  const url = makeUrl(_url, { module: key, ...extra });
 
   const { data = {} } = await requestFields(url);
   const field = data[key];

diff --git a/public/editor-client/src/types/Ekklesia.ts b/public/editor-client/src/types/Ekklesia.ts
@@ -18,6 +18,10 @@ export interface EkklesiaFields {
   smallgroupsLvl: EkklesiaParentsChilds;
 }
 
+export interface EkklesiaExtra {
+  find_group?: string;
+}
+
 export interface EkklesiaParentsChilds {
   parents: Record<string, Literal>;
   childs: Record<string, Literal>;