@oneblink/apps-react 6.4.0 → 6.5.0-beta.2

package/dist/hooks/useSignUp.d.ts

@@ -3,11 +3,13 @@
  * @returns
  * @group Hooks
  */
-export default function useSignUp({ formsAppId, username, firstName, lastName, }: {
+export default function useSignUp({ formsAppId, username, firstName, lastName, onSuccess, onError, }: {
     formsAppId: number;
     username: string;
     firstName?: string;
     lastName?: string;
+    onSuccess?: () => void;
+    onError?: () => void;
 }): {
     signUpWithUserDetails: () => Promise<void>;
     clearSignUpError: () => void;

package/dist/hooks/useSignUp.js

@@ -5,7 +5,7 @@ import { authService, Sentry } from '@oneblink/apps';
  * @returns
  * @group Hooks
  */
-export default function useSignUp({ formsAppId, username, firstName, lastName, }) {
+export default function useSignUp({ formsAppId, username, firstName, lastName, onSuccess, onError, }) {
     const usernameValidation = React.useMemo(() => {
         // regex source: https://www.w3resource.com/javascript/form/email-validation.php#:~:text=To%20get%20a%20valid%20email,%5D%2B)*%24%2F.
         return {
@@ -46,6 +46,7 @@ export default function useSignUp({ formsAppId, username, firstName, lastName, }
                 isSigningUp: false,
                 signUpComplete: true,
             }));
+            onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
         }
         catch (error) {
             Sentry.captureException(error);
@@ -54,8 +55,17 @@ export default function useSignUp({ formsAppId, username, firstName, lastName, }
                 isSigningUp: false,
                 signUpError: error,
             }));
+            onError === null || onError === void 0 ? void 0 : onError();
         }
-    }, [firstName, formsAppId, lastName, username, usernameValidation.isInvalid]);
+    }, [
+        firstName,
+        formsAppId,
+        lastName,
+        onError,
+        onSuccess,
+        username,
+        usernameValidation.isInvalid,
+    ]);
     return {
         signUpWithUserDetails,
         clearSignUpError,

package/dist/hooks/useSignUp.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSignUp.js","sourceRoot":"","sources":["../../src/hooks/useSignUp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEpD;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,UAAU,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,GAMT;IACC,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC5C,qIAAqI;QACrI,OAAO;YACL,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CACxB,sEAAsE,CACvE;SACF,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,cAAc,CAAC,GAClE,KAAK,CAAC,QAAQ,CAIX;QACD,WAAW,EAAE,KAAK;QAClB,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE,KAAK;KACtB,CAAC,CAAA;IAEJ,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,GAAG,EAAE,CACH,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,OAAO;QACV,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC,EACL,EAAE,CACH,CAAA;IAED,MAAM,qBAAqB,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QACzD,IAAI,kBAAkB,CAAC,SAAS,EAAE;YAChC,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3B,GAAG,OAAO;gBACV,WAAW,EAAE,IAAI,KAAK,CAAC,oCAAoC,CAAC;aAC7D,CAAC,CAAC,CAAA;YACH,OAAM;SACP;QAED,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,YAAY;YACf,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,CAAA;QAEH,IAAI;YACF,MAAM,WAAW,CAAC,MAAM,CAAC;gBACvB,UAAU;gBACV,KAAK,EAAE,QAAQ;gBACf,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YAEF,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAChC,GAAG,YAAY;gBACf,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC,CAAA;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YAC9B,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAChC,GAAG,YAAY;gBACf,WAAW,EAAE,KAAK;gBAClB,WAAW,EAAE,KAAc;aAC5B,CAAC,CAAC,CAAA;SACJ;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAA;IAE7E,OAAO;QACL,qBAAqB;QACrB,gBAAgB;QAChB,WAAW;QACX,WAAW;QACX,cAAc;QACd,kBAAkB;KACnB,CAAA;AACH,CAAC","sourcesContent":["import * as React from 'react'\nimport { authService, Sentry } from '@oneblink/apps'\n\n/**\n * @param options\n * @returns\n * @group Hooks\n */\nexport default function useSignUp({\n  formsAppId,\n  username,\n  firstName,\n  lastName,\n}: {\n  formsAppId: number\n  username: string\n  firstName?: string\n  lastName?: string\n}) {\n  const usernameValidation = React.useMemo(() => {\n    // regex source: https://www.w3resource.com/javascript/form/email-validation.php#:~:text=To%20get%20a%20valid%20email,%5D%2B)*%24%2F.\n    return {\n      isInvalid: !username.match(\n        /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$/,\n      ),\n    }\n  }, [username])\n\n  const [{ isSigningUp, signUpError, signUpComplete }, setSignUpState] =\n    React.useState<{\n      isSigningUp: boolean\n      signUpError: Error | null\n      signUpComplete: boolean\n    }>({\n      isSigningUp: false,\n      signUpError: null,\n      signUpComplete: false,\n    })\n\n  const clearSignUpError = React.useCallback(\n    () =>\n      setSignUpState((current) => ({\n        ...current,\n        signUpError: null,\n      })),\n    [],\n  )\n\n  const signUpWithUserDetails = React.useCallback(async () => {\n    if (usernameValidation.isInvalid) {\n      setSignUpState((current) => ({\n        ...current,\n        signUpError: new Error('Please enter a valid email address'),\n      }))\n      return\n    }\n\n    setSignUpState((currentState) => ({\n      ...currentState,\n      isSigningUp: true,\n      signUpError: null,\n    }))\n\n    try {\n      await authService.signUp({\n        formsAppId,\n        email: username,\n        firstName,\n        lastName,\n      })\n\n      setSignUpState((currentState) => ({\n        ...currentState,\n        isSigningUp: false,\n        signUpComplete: true,\n      }))\n    } catch (error) {\n      Sentry.captureException(error)\n      setSignUpState((currentState) => ({\n        ...currentState,\n        isSigningUp: false,\n        signUpError: error as Error,\n      }))\n    }\n  }, [firstName, formsAppId, lastName, username, usernameValidation.isInvalid])\n\n  return {\n    signUpWithUserDetails,\n    clearSignUpError,\n    isSigningUp,\n    signUpError,\n    signUpComplete,\n    usernameValidation,\n  }\n}\n"]}
+{"version":3,"file":"useSignUp.js","sourceRoot":"","sources":["../../src/hooks/useSignUp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEpD;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,UAAU,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,SAAS,EACT,OAAO,GAQR;IACC,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC5C,qIAAqI;QACrI,OAAO;YACL,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CACxB,sEAAsE,CACvE;SACF,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,cAAc,CAAC,GAClE,KAAK,CAAC,QAAQ,CAIX;QACD,WAAW,EAAE,KAAK;QAClB,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE,KAAK;KACtB,CAAC,CAAA;IAEJ,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,GAAG,EAAE,CACH,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,OAAO;QACV,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC,EACL,EAAE,CACH,CAAA;IAED,MAAM,qBAAqB,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QACzD,IAAI,kBAAkB,CAAC,SAAS,EAAE;YAChC,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3B,GAAG,OAAO;gBACV,WAAW,EAAE,IAAI,KAAK,CAAC,oCAAoC,CAAC;aAC7D,CAAC,CAAC,CAAA;YACH,OAAM;SACP;QAED,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,YAAY;YACf,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,CAAA;QAEH,IAAI;YACF,MAAM,WAAW,CAAC,MAAM,CAAC;gBACvB,UAAU;gBACV,KAAK,EAAE,QAAQ;gBACf,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YAEF,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAChC,GAAG,YAAY;gBACf,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC,CAAA;YACH,SAAS,aAAT,SAAS,uBAAT,SAAS,EAAI,CAAA;SACd;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YAC9B,cAAc,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAChC,GAAG,YAAY;gBACf,WAAW,EAAE,KAAK;gBAClB,WAAW,EAAE,KAAc;aAC5B,CAAC,CAAC,CAAA;YACH,OAAO,aAAP,OAAO,uBAAP,OAAO,EAAI,CAAA;SACZ;IACH,CAAC,EAAE;QACD,SAAS;QACT,UAAU;QACV,QAAQ;QACR,OAAO;QACP,SAAS;QACT,QAAQ;QACR,kBAAkB,CAAC,SAAS;KAC7B,CAAC,CAAA;IAEF,OAAO;QACL,qBAAqB;QACrB,gBAAgB;QAChB,WAAW;QACX,WAAW;QACX,cAAc;QACd,kBAAkB;KACnB,CAAA;AACH,CAAC","sourcesContent":["import * as React from 'react'\nimport { authService, Sentry } from '@oneblink/apps'\n\n/**\n * @param options\n * @returns\n * @group Hooks\n */\nexport default function useSignUp({\n  formsAppId,\n  username,\n  firstName,\n  lastName,\n  onSuccess,\n  onError,\n}: {\n  formsAppId: number\n  username: string\n  firstName?: string\n  lastName?: string\n  onSuccess?: () => void\n  onError?: () => void\n}) {\n  const usernameValidation = React.useMemo(() => {\n    // regex source: https://www.w3resource.com/javascript/form/email-validation.php#:~:text=To%20get%20a%20valid%20email,%5D%2B)*%24%2F.\n    return {\n      isInvalid: !username.match(\n        /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$/,\n      ),\n    }\n  }, [username])\n\n  const [{ isSigningUp, signUpError, signUpComplete }, setSignUpState] =\n    React.useState<{\n      isSigningUp: boolean\n      signUpError: Error | null\n      signUpComplete: boolean\n    }>({\n      isSigningUp: false,\n      signUpError: null,\n      signUpComplete: false,\n    })\n\n  const clearSignUpError = React.useCallback(\n    () =>\n      setSignUpState((current) => ({\n        ...current,\n        signUpError: null,\n      })),\n    [],\n  )\n\n  const signUpWithUserDetails = React.useCallback(async () => {\n    if (usernameValidation.isInvalid) {\n      setSignUpState((current) => ({\n        ...current,\n        signUpError: new Error('Please enter a valid email address'),\n      }))\n      return\n    }\n\n    setSignUpState((currentState) => ({\n      ...currentState,\n      isSigningUp: true,\n      signUpError: null,\n    }))\n\n    try {\n      await authService.signUp({\n        formsAppId,\n        email: username,\n        firstName,\n        lastName,\n      })\n\n      setSignUpState((currentState) => ({\n        ...currentState,\n        isSigningUp: false,\n        signUpComplete: true,\n      }))\n      onSuccess?.()\n    } catch (error) {\n      Sentry.captureException(error)\n      setSignUpState((currentState) => ({\n        ...currentState,\n        isSigningUp: false,\n        signUpError: error as Error,\n      }))\n      onError?.()\n    }\n  }, [\n    firstName,\n    formsAppId,\n    lastName,\n    onError,\n    onSuccess,\n    username,\n    usernameValidation.isInvalid,\n  ])\n\n  return {\n    signUpWithUserDetails,\n    clearSignUpError,\n    isSigningUp,\n    signUpError,\n    signUpComplete,\n    usernameValidation,\n  }\n}\n"]}

package/dist/services/injectableOptions.js

@@ -1,75 +1,46 @@
-import { formElementsService, typeCastService } from '@oneblink/sdk-core';
+import { submissionService, typeCastService } from '@oneblink/sdk-core';
 import { localisationService } from '@oneblink/apps';
 import { v4 as uuidv4 } from 'uuid';
-function processInjectableDynamicOption({ option, submission, formElements, ...params }) {
-    const newOptions = new Map();
-    // Replace root level form element values
-    const replaceableParams = {
-        ...params,
-        submission,
-        formElements,
-        task: params.taskContext.task,
-        taskGroup: params.taskContext.taskGroup,
-        taskGroupInstance: params.taskContext.taskGroupInstance,
-        excludeNestedElements: true,
-    };
-    const { text: label, hadAllInjectablesReplaced: hadAllInjectablesReplacedInLabel, } = localisationService.replaceInjectablesWithElementValues(option.label, replaceableParams);
-    if (!hadAllInjectablesReplacedInLabel) {
-        return newOptions;
-    }
-    const { text: value, hadAllInjectablesReplaced: hadAllInjectablesReplacedInValue, } = localisationService.replaceInjectablesWithElementValues(option.value, replaceableParams);
-    if (!hadAllInjectablesReplacedInValue) {
-        return newOptions;
-    }
-    // Find nested form elements
-    const matches = new Map();
-    formElementsService.matchElementsTagRegex({
-        text: label + ' ' + value,
-        excludeNestedElements: false,
-    }, ({ elementName }) => {
-        const [repeatableSetElementName, ...elementNames] = elementName.split('|');
-        matches.set(repeatableSetElementName, !!elementNames.length);
-    });
-    if (matches.size) {
-        matches.forEach((hasNestedFormElements, repeatableSetElementName) => {
-            if (hasNestedFormElements) {
-                // Attempt to create a new option for each entry in the repeatable set.
-                const entries = submission === null || submission === void 0 ? void 0 : submission[repeatableSetElementName];
-                if (Array.isArray(entries)) {
-                    const repeatableSetElement = formElementsService.findFormElement(formElements, (formElement) => {
-                        return ('name' in formElement &&
-                            formElement.name === repeatableSetElementName);
-                    });
-                    if (repeatableSetElement &&
-                        'elements' in repeatableSetElement &&
-                        Array.isArray(repeatableSetElement.elements)) {
-                        for (const entry of entries) {
-                            const nestedOptions = processInjectableDynamicOption({
-                                ...params,
-                                option: {
-                                    label: label.replaceAll(`{ELEMENT:${repeatableSetElementName}|`, '{ELEMENT:'),
-                                    value: value.replaceAll(`{ELEMENT:${repeatableSetElementName}|`, '{ELEMENT:'),
-                                },
-                                submission: entry,
-                                formElements: repeatableSetElement.elements,
-                            });
-                            if (nestedOptions.size) {
-                                nestedOptions.forEach((nestedLabel, nestedValue) => {
-                                    if (!newOptions.has(nestedValue)) {
-                                        newOptions.set(nestedValue, nestedLabel);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                }
+function processInjectableDynamicOption({ option: resource, submission: rootSubmission, formElements: rootFormElements, ...params }) {
+    return submissionService.processInjectablesInCustomResource({
+        resource,
+        submission: rootSubmission,
+        formElements: rootFormElements,
+        replaceRootInjectables(option, submission, formElements) {
+            // Replace root level form element values
+            const replaceableParams = {
+                ...params,
+                submission,
+                formElements,
+                task: params.taskContext.task,
+                taskGroup: params.taskContext.taskGroup,
+                taskGroupInstance: params.taskContext.taskGroupInstance,
+                excludeNestedElements: true,
+            };
+            const { text: label, hadAllInjectablesReplaced: hadAllInjectablesReplacedInLabel, } = localisationService.replaceInjectablesWithElementValues(option.label, replaceableParams);
+            if (!hadAllInjectablesReplacedInLabel) {
+                return;
             }
-        });
-    }
-    else {
-        newOptions.set(value, label);
-    }
-    return newOptions;
+            const { text: value, hadAllInjectablesReplaced: hadAllInjectablesReplacedInValue, } = localisationService.replaceInjectablesWithElementValues(option.value, replaceableParams);
+            if (!hadAllInjectablesReplacedInValue) {
+                return;
+            }
+            return [
+                label + ' ' + value,
+                value,
+                {
+                    value,
+                    label,
+                },
+            ];
+        },
+        prepareNestedInjectables(option, prepare) {
+            return {
+                value: prepare(option.value),
+                label: prepare(option.label),
+            };
+        },
+    });
 }
 export default function processInjectableOption({ option, submission, formElements, taskContext, userProfile, }) {
     const options = processInjectableDynamicOption({
@@ -80,7 +51,7 @@ export default function processInjectableOption({ option, submission, formElemen
         userProfile,
     });
     const generatedOptions = [];
-    options.forEach((label, value) => {
+    options.forEach(({ label, value }) => {
         generatedOptions.push({
             ...option,
             id: options.size === 1 ? option.id : uuidv4(),

package/dist/services/injectableOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectableOptions.js","sourceRoot":"","sources":["../../src/services/injectableOptions.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport { formElementsService, typeCastService } from '@oneblink/sdk-core'\nimport { localisationService } from '@oneblink/apps'\nimport { v4 as uuidv4 } from 'uuid'\nimport { MiscTypes } from '@oneblink/types'\nimport { TaskContext } from '../hooks/useTaskContext'\n\ntype Option = Pick<FormTypes.ChoiceElementOption, 'value' | 'label'>\n\nfunction processInjectableDynamicOption({\n  option,\n  submission,\n  formElements,\n  ...params\n}: {\n  option: Option\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  formElements: FormTypes.FormElement[]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): Map<string, string> {\n  const newOptions: Map<string, string> = new Map()\n\n  // Replace root level form element values\n  const replaceableParams: Parameters<\n    typeof localisationService.replaceInjectablesWithElementValues\n  >[1] = {\n    ...params,\n    submission,\n    formElements,\n    task: params.taskContext.task,\n    taskGroup: params.taskContext.taskGroup,\n    taskGroupInstance: params.taskContext.taskGroupInstance,\n    excludeNestedElements: true,\n  }\n  const {\n    text: label,\n    hadAllInjectablesReplaced: hadAllInjectablesReplacedInLabel,\n  } = localisationService.replaceInjectablesWithElementValues(\n    option.label,\n    replaceableParams,\n  )\n  if (!hadAllInjectablesReplacedInLabel) {\n    return newOptions\n  }\n\n  const {\n    text: value,\n    hadAllInjectablesReplaced: hadAllInjectablesReplacedInValue,\n  } = localisationService.replaceInjectablesWithElementValues(\n    option.value,\n    replaceableParams,\n  )\n  if (!hadAllInjectablesReplacedInValue) {\n    return newOptions\n  }\n\n  // Find nested form elements\n  const matches: Map<string, boolean> = new Map()\n  formElementsService.matchElementsTagRegex(\n    {\n      text: label + ' ' + value,\n      excludeNestedElements: false,\n    },\n    ({ elementName }) => {\n      const [repeatableSetElementName, ...elementNames] = elementName.split('|')\n      matches.set(repeatableSetElementName, !!elementNames.length)\n    },\n  )\n\n  if (matches.size) {\n    matches.forEach((hasNestedFormElements, repeatableSetElementName) => {\n      if (hasNestedFormElements) {\n        // Attempt to create a new option for each entry in the repeatable set.\n        const entries = submission?.[repeatableSetElementName]\n        if (Array.isArray(entries)) {\n          const repeatableSetElement = formElementsService.findFormElement(\n            formElements,\n            (formElement) => {\n              return (\n                'name' in formElement &&\n                formElement.name === repeatableSetElementName\n              )\n            },\n          )\n          if (\n            repeatableSetElement &&\n            'elements' in repeatableSetElement &&\n            Array.isArray(repeatableSetElement.elements)\n          ) {\n            for (const entry of entries) {\n              const nestedOptions = processInjectableDynamicOption({\n                ...params,\n                option: {\n                  label: label.replaceAll(\n                    `{ELEMENT:${repeatableSetElementName}|`,\n                    '{ELEMENT:',\n                  ),\n                  value: value.replaceAll(\n                    `{ELEMENT:${repeatableSetElementName}|`,\n                    '{ELEMENT:',\n                  ),\n                },\n                submission: entry,\n                formElements: repeatableSetElement.elements,\n              })\n              if (nestedOptions.size) {\n                nestedOptions.forEach((nestedLabel, nestedValue) => {\n                  if (!newOptions.has(nestedValue)) {\n                    newOptions.set(nestedValue, nestedLabel)\n                  }\n                })\n              }\n            }\n          }\n        }\n      }\n    })\n  } else {\n    newOptions.set(value, label)\n  }\n\n  return newOptions\n}\n\nexport default function processInjectableOption({\n  option,\n  submission,\n  formElements,\n  taskContext,\n  userProfile,\n}: {\n  option: FormTypes.ChoiceElementOption\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  formElements: FormTypes.FormElement[]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.ChoiceElementOption[] {\n  const options = processInjectableDynamicOption({\n    option,\n    submission,\n    formElements,\n    taskContext,\n    userProfile,\n  })\n\n  const generatedOptions: FormTypes.ChoiceElementOption[] = []\n\n  options.forEach((label, value) => {\n    generatedOptions.push({\n      ...option,\n      id: options.size === 1 ? option.id : uuidv4(),\n      label,\n      value,\n    })\n  })\n\n  return generatedOptions\n}\n\nfunction injectOptionsAcrossEntriesElements({\n  contextElements,\n  elements,\n  entries,\n  taskContext,\n  userProfile,\n}: {\n  contextElements: FormTypes.FormElement[]\n  elements: FormTypes.FormElement[]\n  entries: SubmissionTypes.S3SubmissionData['submission'][]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.FormElement[] {\n  return elements.map<FormTypes.FormElement>((e) => {\n    switch (e.type) {\n      case 'page':\n      case 'section': {\n        return {\n          ...e,\n          elements: injectOptionsAcrossEntriesElements({\n            // info elements on other pages/sections will need the parent definition\n            contextElements,\n            elements: e.elements,\n            entries,\n            taskContext,\n            userProfile,\n          }),\n        }\n      }\n      case 'form': {\n        if (Array.isArray(e.elements)) {\n          return {\n            ...e,\n            elements: injectOptionsAcrossEntriesElements({\n              // sub-forms do not have context of parent elements\n              contextElements: e.elements,\n              elements: e.elements,\n              entries: entries.reduce<\n                SubmissionTypes.S3SubmissionData['submission'][]\n              >((memo, entry) => {\n                if (entry[e.name]) {\n                  memo.push(\n                    entry[\n                      e.name\n                    ] as SubmissionTypes.S3SubmissionData['submission'],\n                  )\n                }\n                return memo\n              }, []),\n              taskContext,\n              userProfile,\n            }),\n          }\n        } else {\n          return e\n        }\n      }\n      case 'repeatableSet': {\n        return {\n          ...e,\n          elements: injectOptionsAcrossEntriesElements({\n            // repeatable set entries may only know about elements within entry\n            contextElements: e.elements,\n            elements: e.elements,\n            entries: entries.reduce<\n              SubmissionTypes.S3SubmissionData['submission'][]\n            >((memo, entry) => {\n              const nestedEntries = entry[e.name]\n              if (Array.isArray(nestedEntries)) {\n                memo.push(\n                  ...(nestedEntries as SubmissionTypes.S3SubmissionData['submission'][]),\n                )\n              }\n              return memo\n            }, []),\n            taskContext,\n            userProfile,\n          }),\n        }\n      }\n      default: {\n        const optionsElement = typeCastService.formElements.toOptionsElement(e)\n        if (optionsElement) {\n          return {\n            ...optionsElement,\n            options: entries.reduce<FormTypes.ChoiceElementOption[]>(\n              (newOptions, submission) => {\n                optionsElement.options?.forEach((o) => {\n                  const injected = processInjectableOption({\n                    option: o,\n                    submission,\n                    formElements: contextElements,\n                    taskContext,\n                    userProfile,\n                  })\n\n                  newOptions.push(\n                    ...injected.filter((generatedOption) => {\n                      return !newOptions.some(\n                        (addedOption) =>\n                          addedOption.value === generatedOption.value,\n                      )\n                    }),\n                  )\n                })\n                return newOptions\n              },\n              [],\n            ),\n          }\n        }\n        return e\n      }\n    }\n  })\n}\n\nexport function injectOptionsAcrossAllElements({\n  submission,\n  ...params\n}: {\n  elements: FormTypes.FormElement[]\n  contextElements: FormTypes.FormElement[]\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.FormElement[] {\n  // We iterate over entries as an array of submission objects because\n  // child elements of a repeatable set that have injected options\n  // need to include all of the injected options from the same elements\n  // in sibling entries within the set. Otherwise we will not have the\n  // labels for each available option to display the submission.\n  return injectOptionsAcrossEntriesElements({\n    ...params,\n    entries: [submission],\n  })\n}\n"]}
+{"version":3,"file":"injectableOptions.js","sourceRoot":"","sources":["../../src/services/injectableOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAA;AAMnC,SAAS,8BAA8B,CAAC,EACtC,MAAM,EAAE,QAAQ,EAChB,UAAU,EAAE,cAAc,EAC1B,YAAY,EAAE,gBAAgB,EAC9B,GAAG,MAAM,EAOV;IACC,OAAO,iBAAiB,CAAC,kCAAkC,CAAS;QAClE,QAAQ;QACR,UAAU,EAAE,cAAc;QAC1B,YAAY,EAAE,gBAAgB;QAC9B,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY;YACrD,yCAAyC;YACzC,MAAM,iBAAiB,GAEhB;gBACL,GAAG,MAAM;gBACT,UAAU;gBACV,YAAY;gBACZ,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI;gBAC7B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS;gBACvC,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB;gBACvD,qBAAqB,EAAE,IAAI;aAC5B,CAAA;YACD,MAAM,EACJ,IAAI,EAAE,KAAK,EACX,yBAAyB,EAAE,gCAAgC,GAC5D,GAAG,mBAAmB,CAAC,mCAAmC,CACzD,MAAM,CAAC,KAAK,EACZ,iBAAiB,CAClB,CAAA;YACD,IAAI,CAAC,gCAAgC,EAAE;gBACrC,OAAM;aACP;YAED,MAAM,EACJ,IAAI,EAAE,KAAK,EACX,yBAAyB,EAAE,gCAAgC,GAC5D,GAAG,mBAAmB,CAAC,mCAAmC,CACzD,MAAM,CAAC,KAAK,EACZ,iBAAiB,CAClB,CAAA;YACD,IAAI,CAAC,gCAAgC,EAAE;gBACrC,OAAM;aACP;YAED,OAAO;gBACL,KAAK,GAAG,GAAG,GAAG,KAAK;gBACnB,KAAK;gBACL;oBACE,KAAK;oBACL,KAAK;iBACN;aACF,CAAA;QACH,CAAC;QACD,wBAAwB,CAAC,MAAM,EAAE,OAAO;YACtC,OAAO;gBACL,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC5B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7B,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,MAAM,EACN,UAAU,EACV,YAAY,EACZ,WAAW,EACX,WAAW,GAOZ;IACC,MAAM,OAAO,GAAG,8BAA8B,CAAC;QAC7C,MAAM;QACN,UAAU;QACV,YAAY;QACZ,WAAW;QACX,WAAW;KACZ,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAoC,EAAE,CAAA;IAE5D,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QACnC,gBAAgB,CAAC,IAAI,CAAC;YACpB,GAAG,MAAM;YACT,EAAE,EAAE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE;YAC7C,KAAK;YACL,KAAK;SACN,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED,SAAS,kCAAkC,CAAC,EAC1C,eAAe,EACf,QAAQ,EACR,OAAO,EACP,WAAW,EACX,WAAW,GAOZ;IACC,OAAO,QAAQ,CAAC,GAAG,CAAwB,CAAC,CAAC,EAAE,EAAE;QAC/C,QAAQ,CAAC,CAAC,IAAI,EAAE;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,SAAS,CAAC,CAAC;gBACd,OAAO;oBACL,GAAG,CAAC;oBACJ,QAAQ,EAAE,kCAAkC,CAAC;wBAC3C,wEAAwE;wBACxE,eAAe;wBACf,QAAQ,EAAE,CAAC,CAAC,QAAQ;wBACpB,OAAO;wBACP,WAAW;wBACX,WAAW;qBACZ,CAAC;iBACH,CAAA;aACF;YACD,KAAK,MAAM,CAAC,CAAC;gBACX,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;oBAC7B,OAAO;wBACL,GAAG,CAAC;wBACJ,QAAQ,EAAE,kCAAkC,CAAC;4BAC3C,mDAAmD;4BACnD,eAAe,EAAE,CAAC,CAAC,QAAQ;4BAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ;4BACpB,OAAO,EAAE,OAAO,CAAC,MAAM,CAErB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gCAChB,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oCACjB,IAAI,CAAC,IAAI,CACP,KAAK,CACH,CAAC,CAAC,IAAI,CAC2C,CACpD,CAAA;iCACF;gCACD,OAAO,IAAI,CAAA;4BACb,CAAC,EAAE,EAAE,CAAC;4BACN,WAAW;4BACX,WAAW;yBACZ,CAAC;qBACH,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,CAAA;iBACT;aACF;YACD,KAAK,eAAe,CAAC,CAAC;gBACpB,OAAO;oBACL,GAAG,CAAC;oBACJ,QAAQ,EAAE,kCAAkC,CAAC;wBAC3C,mEAAmE;wBACnE,eAAe,EAAE,CAAC,CAAC,QAAQ;wBAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ;wBACpB,OAAO,EAAE,OAAO,CAAC,MAAM,CAErB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;4BAChB,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;4BACnC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;gCAChC,IAAI,CAAC,IAAI,CACP,GAAI,aAAkE,CACvE,CAAA;6BACF;4BACD,OAAO,IAAI,CAAA;wBACb,CAAC,EAAE,EAAE,CAAC;wBACN,WAAW;wBACX,WAAW;qBACZ,CAAC;iBACH,CAAA;aACF;YACD,OAAO,CAAC,CAAC;gBACP,MAAM,cAAc,GAAG,eAAe,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAA;gBACvE,IAAI,cAAc,EAAE;oBAClB,OAAO;wBACL,GAAG,cAAc;wBACjB,OAAO,EAAE,OAAO,CAAC,MAAM,CACrB,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE;;4BACzB,MAAA,cAAc,CAAC,OAAO,0CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gCACpC,MAAM,QAAQ,GAAG,uBAAuB,CAAC;oCACvC,MAAM,EAAE,CAAC;oCACT,UAAU;oCACV,YAAY,EAAE,eAAe;oCAC7B,WAAW;oCACX,WAAW;iCACZ,CAAC,CAAA;gCAEF,UAAU,CAAC,IAAI,CACb,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE;oCACrC,OAAO,CAAC,UAAU,CAAC,IAAI,CACrB,CAAC,WAAW,EAAE,EAAE,CACd,WAAW,CAAC,KAAK,KAAK,eAAe,CAAC,KAAK,CAC9C,CAAA;gCACH,CAAC,CAAC,CACH,CAAA;4BACH,CAAC,CAAC,CAAA;4BACF,OAAO,UAAU,CAAA;wBACnB,CAAC,EACD,EAAE,CACH;qBACF,CAAA;iBACF;gBACD,OAAO,CAAC,CAAA;aACT;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,EAC7C,UAAU,EACV,GAAG,MAAM,EAOV;IACC,oEAAoE;IACpE,gEAAgE;IAChE,qEAAqE;IACrE,oEAAoE;IACpE,8DAA8D;IAC9D,OAAO,kCAAkC,CAAC;QACxC,GAAG,MAAM;QACT,OAAO,EAAE,CAAC,UAAU,CAAC;KACtB,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport { submissionService, typeCastService } from '@oneblink/sdk-core'\nimport { localisationService } from '@oneblink/apps'\nimport { v4 as uuidv4 } from 'uuid'\nimport { MiscTypes } from '@oneblink/types'\nimport { TaskContext } from '../hooks/useTaskContext'\n\ntype Option = Pick<FormTypes.ChoiceElementOption, 'value' | 'label'>\n\nfunction processInjectableDynamicOption({\n  option: resource,\n  submission: rootSubmission,\n  formElements: rootFormElements,\n  ...params\n}: {\n  option: Option\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  formElements: FormTypes.FormElement[]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): Map<string, Option> {\n  return submissionService.processInjectablesInCustomResource<Option>({\n    resource,\n    submission: rootSubmission,\n    formElements: rootFormElements,\n    replaceRootInjectables(option, submission, formElements) {\n      // Replace root level form element values\n      const replaceableParams: Parameters<\n        typeof localisationService.replaceInjectablesWithElementValues\n      >[1] = {\n        ...params,\n        submission,\n        formElements,\n        task: params.taskContext.task,\n        taskGroup: params.taskContext.taskGroup,\n        taskGroupInstance: params.taskContext.taskGroupInstance,\n        excludeNestedElements: true,\n      }\n      const {\n        text: label,\n        hadAllInjectablesReplaced: hadAllInjectablesReplacedInLabel,\n      } = localisationService.replaceInjectablesWithElementValues(\n        option.label,\n        replaceableParams,\n      )\n      if (!hadAllInjectablesReplacedInLabel) {\n        return\n      }\n\n      const {\n        text: value,\n        hadAllInjectablesReplaced: hadAllInjectablesReplacedInValue,\n      } = localisationService.replaceInjectablesWithElementValues(\n        option.value,\n        replaceableParams,\n      )\n      if (!hadAllInjectablesReplacedInValue) {\n        return\n      }\n\n      return [\n        label + ' ' + value,\n        value,\n        {\n          value,\n          label,\n        },\n      ]\n    },\n    prepareNestedInjectables(option, prepare) {\n      return {\n        value: prepare(option.value),\n        label: prepare(option.label),\n      }\n    },\n  })\n}\n\nexport default function processInjectableOption({\n  option,\n  submission,\n  formElements,\n  taskContext,\n  userProfile,\n}: {\n  option: FormTypes.ChoiceElementOption\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  formElements: FormTypes.FormElement[]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.ChoiceElementOption[] {\n  const options = processInjectableDynamicOption({\n    option,\n    submission,\n    formElements,\n    taskContext,\n    userProfile,\n  })\n\n  const generatedOptions: FormTypes.ChoiceElementOption[] = []\n\n  options.forEach(({ label, value }) => {\n    generatedOptions.push({\n      ...option,\n      id: options.size === 1 ? option.id : uuidv4(),\n      label,\n      value,\n    })\n  })\n\n  return generatedOptions\n}\n\nfunction injectOptionsAcrossEntriesElements({\n  contextElements,\n  elements,\n  entries,\n  taskContext,\n  userProfile,\n}: {\n  contextElements: FormTypes.FormElement[]\n  elements: FormTypes.FormElement[]\n  entries: SubmissionTypes.S3SubmissionData['submission'][]\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.FormElement[] {\n  return elements.map<FormTypes.FormElement>((e) => {\n    switch (e.type) {\n      case 'page':\n      case 'section': {\n        return {\n          ...e,\n          elements: injectOptionsAcrossEntriesElements({\n            // info elements on other pages/sections will need the parent definition\n            contextElements,\n            elements: e.elements,\n            entries,\n            taskContext,\n            userProfile,\n          }),\n        }\n      }\n      case 'form': {\n        if (Array.isArray(e.elements)) {\n          return {\n            ...e,\n            elements: injectOptionsAcrossEntriesElements({\n              // sub-forms do not have context of parent elements\n              contextElements: e.elements,\n              elements: e.elements,\n              entries: entries.reduce<\n                SubmissionTypes.S3SubmissionData['submission'][]\n              >((memo, entry) => {\n                if (entry[e.name]) {\n                  memo.push(\n                    entry[\n                      e.name\n                    ] as SubmissionTypes.S3SubmissionData['submission'],\n                  )\n                }\n                return memo\n              }, []),\n              taskContext,\n              userProfile,\n            }),\n          }\n        } else {\n          return e\n        }\n      }\n      case 'repeatableSet': {\n        return {\n          ...e,\n          elements: injectOptionsAcrossEntriesElements({\n            // repeatable set entries may only know about elements within entry\n            contextElements: e.elements,\n            elements: e.elements,\n            entries: entries.reduce<\n              SubmissionTypes.S3SubmissionData['submission'][]\n            >((memo, entry) => {\n              const nestedEntries = entry[e.name]\n              if (Array.isArray(nestedEntries)) {\n                memo.push(\n                  ...(nestedEntries as SubmissionTypes.S3SubmissionData['submission'][]),\n                )\n              }\n              return memo\n            }, []),\n            taskContext,\n            userProfile,\n          }),\n        }\n      }\n      default: {\n        const optionsElement = typeCastService.formElements.toOptionsElement(e)\n        if (optionsElement) {\n          return {\n            ...optionsElement,\n            options: entries.reduce<FormTypes.ChoiceElementOption[]>(\n              (newOptions, submission) => {\n                optionsElement.options?.forEach((o) => {\n                  const injected = processInjectableOption({\n                    option: o,\n                    submission,\n                    formElements: contextElements,\n                    taskContext,\n                    userProfile,\n                  })\n\n                  newOptions.push(\n                    ...injected.filter((generatedOption) => {\n                      return !newOptions.some(\n                        (addedOption) =>\n                          addedOption.value === generatedOption.value,\n                      )\n                    }),\n                  )\n                })\n                return newOptions\n              },\n              [],\n            ),\n          }\n        }\n        return e\n      }\n    }\n  })\n}\n\nexport function injectOptionsAcrossAllElements({\n  submission,\n  ...params\n}: {\n  elements: FormTypes.FormElement[]\n  contextElements: FormTypes.FormElement[]\n  submission: SubmissionTypes.S3SubmissionData['submission']\n  taskContext: TaskContext\n  userProfile: MiscTypes.UserProfile | undefined\n}): FormTypes.FormElement[] {\n  // We iterate over entries as an array of submission objects because\n  // child elements of a repeatable set that have injected options\n  // need to include all of the injected options from the same elements\n  // in sibling entries within the set. Otherwise we will not have the\n  // labels for each available option to display the submission.\n  return injectOptionsAcrossEntriesElements({\n    ...params,\n    entries: [submission],\n  })\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oneblink/apps-react",
   "description": "Helper functions for OneBlink apps in ReactJS.",
-  "version": "6.4.0",
+  "version": "6.5.0-beta.2",
   "author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
   "bugs": {
     "url": "https://github.com/oneblink/apps-react/issues"
@@ -10,7 +10,7 @@
     "@arcgis/core": "~4.29.10",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@oneblink/sdk-core": "^7.0.0-beta.1",
+    "@oneblink/sdk-core": "^7.1.0-beta.1",
     "@react-google-maps/api": "2.19.2",
     "blueimp-load-image": "^5.16.0",
     "bulma": "^0.9.4",
@@ -47,7 +47,7 @@
     "@mui/material": "^5.15.6",
     "@mui/x-date-pickers": "^6.19.2",
     "@oneblink/apps": "^14.1.0-beta.1",
-    "@oneblink/release-cli": "^3.2.1",
+    "@oneblink/release-cli": "^3.2.2",
     "@oneblink/types": "github:oneblink/types",
     "@types/blueimp-load-image": "^5.16.6",
     "@types/color": "^3.0.6",