Skip to content

Commit

Permalink
feat(ministry brands): added extra for getEkklesiaFields
Browse files Browse the repository at this point in the history
  • Loading branch information
zeleniucvladislav authored and DanielGherjavca committed Mar 6, 2024
1 parent 223e445 commit 4285f11
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 4 additions & 2 deletions public/editor-client/src/ekklesia/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Config } from "config";
import { ChoicesAsync, ChoicesSync } from "types/Choices";
import {
EkklesiaExtra,
EkklesiaFieldMap,
EkklesiaFields,
EkklesiaKeys,
Expand All @@ -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) {
Expand All @@ -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") {
Expand Down
6 changes: 4 additions & 2 deletions public/editor-client/src/ekklesia/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { makeUrl } from "api/utils";
import { ChoicesSync } from "types/Choices";
import {
EkklesiaChoiceParamsWithSubKey,
EkklesiaExtra,
EkklesiaFields,
EkklesiaParams,
EkklesiaParentsChilds,
Expand Down Expand Up @@ -44,11 +45,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];
Expand Down
4 changes: 4 additions & 0 deletions public/editor-client/src/types/Ekklesia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit 4285f11

Please sign in to comment.