@ovok/native 1.5.5 → 1.6.0

package/lib/module/modules/helpers/utils/telemetry.js

@@ -0,0 +1,131 @@
+"use strict";
+
+/* eslint-disable import/group-exports */
+/* eslint-disable max-lines */
+
+const INSTRUMENTATION_NAME = "@ovok/native";
+const INSTRUMENTATION_VERSION = "1.6.0";
+let configuredOptions = {};
+let openTelemetryApi;
+let openTelemetryLogsApi;
+const counters = new Map();
+const histograms = new Map();
+const loadOpenTelemetryApi = () => {
+  if (openTelemetryApi !== undefined) {
+    return openTelemetryApi ?? undefined;
+  }
+  try {
+    // Optional peer: apps without OpenTelemetry must not need to install it.
+    openTelemetryApi = require("@opentelemetry/api");
+  } catch {
+    openTelemetryApi = null;
+  }
+  return openTelemetryApi ?? undefined;
+};
+const loadOpenTelemetryLogsApi = () => {
+  if (openTelemetryLogsApi !== undefined) {
+    return openTelemetryLogsApi ?? undefined;
+  }
+  try {
+    // Optional peer: the stable logs API is distributed separately.
+    openTelemetryLogsApi = require("@opentelemetry/api-logs");
+  } catch {
+    openTelemetryLogsApi = null;
+  }
+  return openTelemetryLogsApi ?? undefined;
+};
+const allowedAttributeKeys = new Set(["deviceId", "deviceName", "model", "manufacturer", "measurementTypeKey", "platform", "status", "reason", "errorCode", "retryCount", "attempt", "queueDepth", "durationMs", "success", "exhausted", "willRetry", "requestedMtu", "provider", "sampleCount"]);
+
+/** Keeps identifiers useful for operations while excluding readings and patient data. */
+export const sanitizeOvokTelemetryAttributes = (attributes = {}) => {
+  const safe = {};
+  for (const [key, value] of Object.entries(attributes)) {
+    if (!allowedAttributeKeys.has(key)) {
+      continue;
+    }
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      safe[key] = value;
+    }
+  }
+  return safe;
+};
+export const configureOvokTelemetry = (options = {}) => {
+  configuredOptions = options;
+  counters.clear();
+  histograms.clear();
+};
+const getTracer = () => configuredOptions.tracerProvider?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryApi()?.trace?.getTracer(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+const getMeter = () => configuredOptions.meterProvider?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryApi()?.metrics?.getMeter(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+const getLogger = () => configuredOptions.loggerProvider?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION) ?? loadOpenTelemetryLogsApi()?.logs?.getLogger(INSTRUMENTATION_NAME, INSTRUMENTATION_VERSION);
+export const startOvokSpan = (name, attributes = {}) => getTracer()?.startSpan(name, {
+  attributes: sanitizeOvokTelemetryAttributes(attributes)
+});
+export const recordOvokMetric = (name, value, attributes = {}) => {
+  const meter = getMeter();
+  if (!meter) {
+    return;
+  }
+  const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
+  const instrument = counters.get(name) ?? meter.createCounter(name);
+  counters.set(name, instrument);
+  instrument.add(value, safeAttributes);
+};
+export const recordOvokDuration = (name, durationMs, attributes = {}) => {
+  const meter = getMeter();
+  if (!meter) {
+    return;
+  }
+  const safeAttributes = sanitizeOvokTelemetryAttributes(attributes);
+  const instrument = histograms.get(name) ?? meter.createHistogram(name);
+  histograms.set(name, instrument);
+  instrument.record(durationMs, safeAttributes);
+};
+export const addOvokSpanEvent = (name, attributes = {}) => {
+  const span = loadOpenTelemetryApi()?.trace?.getActiveSpan?.();
+  span?.addEvent?.(name, sanitizeOvokTelemetryAttributes(attributes));
+};
+export const emitOvokLog = (severityText, body, attributes = {}) => {
+  getLogger()?.emit({
+    severityText,
+    body,
+    attributes: sanitizeOvokTelemetryAttributes(attributes)
+  });
+};
+export const withOvokSpan = async (name, attributes, operation) => {
+  const tracer = getTracer();
+  const finishSpan = async span => {
+    try {
+      const result = await operation();
+      span.setStatus?.({
+        code: 1
+      });
+      return result;
+    } catch (error) {
+      const normalized = error instanceof Error ? error : new Error(String(error));
+      span.recordException?.(normalized);
+      span.setStatus?.({
+        code: 2,
+        message: normalized.message
+      });
+      recordOvokMetric("ovok.errors", 1, {
+        errorCode: normalized.name
+      });
+      throw error;
+    } finally {
+      span.end();
+    }
+  };
+  if (tracer?.startActiveSpan) {
+    return tracer.startActiveSpan(name, {
+      attributes: sanitizeOvokTelemetryAttributes(attributes)
+    }, span => finishSpan(span));
+  }
+  const span = tracer?.startSpan(name, {
+    attributes: sanitizeOvokTelemetryAttributes(attributes)
+  });
+  if (!span) {
+    return operation();
+  }
+  return finishSpan(span);
+};
+//# sourceMappingURL=telemetry.js.map

package/lib/module/modules/helpers/utils/telemetry.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["INSTRUMENTATION_NAME","INSTRUMENTATION_VERSION","configuredOptions","openTelemetryApi","openTelemetryLogsApi","counters","Map","histograms","loadOpenTelemetryApi","undefined","require","loadOpenTelemetryLogsApi","allowedAttributeKeys","Set","sanitizeOvokTelemetryAttributes","attributes","safe","key","value","Object","entries","has","configureOvokTelemetry","options","clear","getTracer","tracerProvider","trace","getMeter","meterProvider","metrics","getLogger","loggerProvider","logs","startOvokSpan","name","startSpan","recordOvokMetric","meter","safeAttributes","instrument","get","createCounter","set","add","recordOvokDuration","durationMs","createHistogram","record","addOvokSpanEvent","span","getActiveSpan","addEvent","emitOvokLog","severityText","body","emit","withOvokSpan","operation","tracer","finishSpan","result","setStatus","code","error","normalized","Error","String","recordException","message","errorCode","end","startActiveSpan"],"sourceRoot":"../../../../../src","sources":["modules/helpers/utils/telemetry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/image/components/optimized-image.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { useClient } from "@ovok/core";
-import { Image as ExpoImage } from "expo-image";
+import { Image as ExpoImage, useImage } from "expo-image";
 import * as React from "react";
 import { StyleSheet, View } from "react-native";
 import { calculateDimension } from "../utils/calculate-dimension.js";
@@ -14,11 +14,17 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
   fit = "contain",
   style,
   onLoad,
+  onError,
+  placeholder,
+  fallback,
+  maxRetries = 3,
   containerStyle,
   aspectRatio: providedAspectRatio,
   ...rest
 }) => {
   const client = useClient();
+  const retryCount = React.useRef(0);
+  const [failedUri, setFailedUri] = React.useState(null);
   const [containerSize, setContainerSize] = React.useState({
     width: 0,
     height: 0
@@ -34,6 +40,20 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     fit,
     baseUrl: client.getBaseUrl()
   }), [uri, calculatedWidth, calculatedHeight, fit, client]);
+  React.useEffect(() => {
+    retryCount.current = 0;
+    setFailedUri(null);
+  }, [optimizedUri]);
+  const image = useImage(optimizedUri, {
+    onError: (_error, retry) => {
+      if (retryCount.current >= maxRetries) {
+        setFailedUri(optimizedUri);
+        return;
+      }
+      retryCount.current += 1;
+      retry();
+    }
+  }, [optimizedUri]);
   const imageStyle = React.useMemo(() => [styles.base, {
     width: calculatedWidth,
     height: calculatedHeight,
@@ -56,14 +76,16 @@ export const OptimizedImage = /*#__PURE__*/React.memo(({
     style: [styles.container, containerStyle],
     onLayout: handleLayout,
     children: /*#__PURE__*/_jsx(ExpoImage, {
-      source: {
+      source: failedUri === optimizedUri ? fallback ?? placeholder ?? null : image ?? {
         uri: optimizedUri
       },
       style: imageStyle,
+      placeholder: placeholder,
       onLoad: handleLoad,
+      onError: onError,
       ...rest,
       contentFit: fit
-    })
+    }, `${optimizedUri}:${retryCount.current}`)
   });
 });
 const styles = StyleSheet.create({

package/lib/module/modules/image/components/optimized-image.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","Image","ExpoImage","React","StyleSheet","View","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","containerStyle","aspectRatio","providedAspectRatio","rest","client","containerSize","setContainerSize","useState","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","getBaseUrl","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useClient","Image","ExpoImage","useImage","React","StyleSheet","View","calculateDimension","getOptimizedImageUrl","jsx","_jsx","OptimizedImage","memo","uri","width","height","fit","style","onLoad","onError","placeholder","fallback","maxRetries","containerStyle","aspectRatio","providedAspectRatio","rest","client","retryCount","useRef","failedUri","setFailedUri","useState","containerSize","setContainerSize","calculatedAspectRatio","setCalculatedAspectRatio","useMemo","calculatedWidth","calculatedHeight","undefined","optimizedUri","baseUrl","getBaseUrl","useEffect","current","image","_error","retry","imageStyle","styles","base","contentFit","handleLayout","useCallback","event","nativeEvent","layout","handleLoad","imageWidth","imageHeight","source","container","onLayout","children","create","overflow"],"sourceRoot":"../../../../../src","sources":["modules/image/components/optimized-image.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/content/questionnaire-content-error.js

@@ -2,10 +2,10 @@
 
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { Text } from "react-native-paper";
+import { Button, Text } from "react-native-paper";
 import { useAppTheme } from "../../../theme/index.js";
 import { useQuestionnaireForm } from "../../hooks/use-questionnaire-form.js";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export const QuestionnaireContentError = /*#__PURE__*/React.memo(({
   style,
   children,
@@ -16,18 +16,27 @@ export const QuestionnaireContentError = /*#__PURE__*/React.memo(({
     t
   } = useTranslation();
   const {
-    errorMessage
+    errorMessage,
+    submissionError,
+    retrySubmit
   } = useQuestionnaireForm();
-  if (!errorMessage && !children) {
+  if (!errorMessage && !submissionError && !children) {
     return null;
   }
-  return /*#__PURE__*/_jsx(Text, {
-    variant: "bodySmall",
-    ...props,
-    style: [{
-      color: theme.colors.error
-    }, style],
-    children: children || t(errorMessage || "")
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Text, {
+      variant: "bodySmall",
+      ...props,
+      style: [{
+        color: theme.colors.error
+      }, style],
+      children: children || t(errorMessage || submissionError || "")
+    }), submissionError ? /*#__PURE__*/_jsx(Button, {
+      mode: "text",
+      compact: true,
+      onPress: retrySubmit,
+      children: t("common.try-again")
+    }) : null]
   });
 });
 //# sourceMappingURL=questionnaire-content-error.js.map

package/lib/module/modules/questionnaire-response-form/components/content/questionnaire-content-error.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useTranslation","Text","useAppTheme","useQuestionnaireForm","jsx","_jsx","QuestionnaireContentError","memo","style","children","props","theme","t","errorMessage","variant","color","colors","error"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/content/questionnaire-content-error.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAA0BC,IAAI,QAAQ,oBAAoB;AAE1D,SAASC,WAAW,QAAQ,yBAAgB;AAC5C,SAASC,oBAAoB,QAAQ,uCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG1E,OAAO,MAAMC,yBAAyB,gBAAGP,KAAK,CAACQ,IAAI,CACjD,CAAmC;EACjCC,KAAK;EACLC,QAAQ;EACR,GAAGC;AACqC,CAAC,KAAK;EAC9C,MAAMC,KAAK,GAAGT,WAAW,CAAC,CAAC;EAC3B,MAAM;IAAEU;EAAE,CAAC,GAAGZ,cAAc,CAAC,CAAC;EAE9B,MAAM;IAAEa;EAAa,CAAC,GAAGV,oBAAoB,CAAC,CAAC;EAE/C,IAAI,CAACU,YAAY,IAAI,CAACJ,QAAQ,EAAE;IAC9B,OAAO,IAAI;EACb;EAEA,oBACEJ,IAAA,CAACJ,IAAI;IACHa,OAAO,EAAC,WAAW;IAAA,GACfJ,KAAK;IACTF,KAAK,EAAE,CAAC;MAAEO,KAAK,EAAEJ,KAAK,CAACK,MAAM,CAACC;IAAM,CAAC,EAAET,KAAK,CAAE;IAAAC,QAAA,EAE7CA,QAAQ,IAAIG,CAAC,CAACC,YAAY,IAAI,EAAE;EAAC,CAC9B,CAAC;AAEX,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useTranslation","Button","Text","useAppTheme","useQuestionnaireForm","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","QuestionnaireContentError","memo","style","children","props","theme","t","errorMessage","submissionError","retrySubmit","variant","color","colors","error","mode","compact","onPress"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/content/questionnaire-content-error.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,MAAM,EAAmBC,IAAI,QAAQ,oBAAoB;AAElE,SAASC,WAAW,QAAQ,yBAAgB;AAC5C,SAASC,oBAAoB,QAAQ,uCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAG1E,OAAO,MAAMC,yBAAyB,gBAAGZ,KAAK,CAACa,IAAI,CACjD,CAAmC;EACjCC,KAAK;EACLC,QAAQ;EACR,GAAGC;AACqC,CAAC,KAAK;EAC9C,MAAMC,KAAK,GAAGb,WAAW,CAAC,CAAC;EAC3B,MAAM;IAAEc;EAAE,CAAC,GAAGjB,cAAc,CAAC,CAAC;EAE9B,MAAM;IAAEkB,YAAY;IAAEC,eAAe;IAAEC;EAAY,CAAC,GAAGhB,oBAAoB,CAAC,CAAC;EAE7E,IAAI,CAACc,YAAY,IAAI,CAACC,eAAe,IAAI,CAACL,QAAQ,EAAE;IAClD,OAAO,IAAI;EACb;EAEA,oBACEJ,KAAA,CAAAF,SAAA;IAAAM,QAAA,gBACER,IAAA,CAACJ,IAAI;MACHmB,OAAO,EAAC,WAAW;MAAA,GACfN,KAAK;MACTF,KAAK,EAAE,CAAC;QAAES,KAAK,EAAEN,KAAK,CAACO,MAAM,CAACC;MAAM,CAAC,EAAEX,KAAK,CAAE;MAAAC,QAAA,EAE7CA,QAAQ,IAAIG,CAAC,CAACC,YAAY,IAAIC,eAAe,IAAI,EAAE;IAAC,CACjD,CAAC,EACNA,eAAe,gBACdb,IAAA,CAACL,MAAM;MAACwB,IAAI,EAAC,MAAM;MAACC,OAAO;MAACC,OAAO,EAAEP,WAAY;MAAAN,QAAA,EAC9CG,CAAC,CAAC,kBAAkB;IAAC,CAChB,CAAC,GACP,IAAI;EAAA,CACR,CAAC;AAEP,CACF,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/navigation/questionnaire-navigation-next-button.js

@@ -16,7 +16,8 @@ export const QuestionnaireNavigationNextButton = /*#__PURE__*/React.memo(({
     handleNext,
     isLastItem,
     isCurrentItemRequired,
-    isCurrentItemAnswered
+    isCurrentItemAnswered,
+    isSubmitting
   } = useQuestionnaireNavigation();
   if (isLastItem) {
     return null;
@@ -25,7 +26,7 @@ export const QuestionnaireNavigationNextButton = /*#__PURE__*/React.memo(({
   return /*#__PURE__*/_jsx(Button, {
     mode: "contained",
     ...buttonProps,
-    disabled: buttonProps.disabled || isNextDisabled,
+    disabled: buttonProps.disabled || isNextDisabled || isSubmitting,
     onPress: handleNext,
     children: children || t("common.next")
   });

package/lib/module/modules/questionnaire-response-form/components/navigation/questionnaire-navigation-next-button.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useTranslation","Button","useQuestionnaireNavigation","jsx","_jsx","QuestionnaireNavigationNextButton","memo","children","buttonProps","t","handleNext","isLastItem","isCurrentItemRequired","isCurrentItemAnswered","isNextDisabled","mode","disabled","onPress"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/navigation/questionnaire-navigation-next-button.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,MAAM,QAAQ,oBAAoB;AAE3C,SAASC,0BAA0B,QAAQ,6CAA0C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtF,OAAO,MAAMC,iCAAiC,gBAAGN,KAAK,CAACO,IAAI,CACzD,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAgD,CAAC,KAAK;EACpE,MAAM;IAAEC;EAAE,CAAC,GAAGT,cAAc,CAAC,CAAC;EAE9B,MAAM;IACJU,UAAU;IACVC,UAAU;IACVC,qBAAqB;IACrBC;EACF,CAAC,GAAGX,0BAA0B,CAAC,CAAC;EAEhC,IAAIS,UAAU,EAAE;IACd,OAAO,IAAI;EACb;EAEA,MAAMG,cAAc,GAAGF,qBAAqB,IAAI,CAACC,qBAAqB;EAEtE,oBACET,IAAA,CAACH,MAAM;IACLc,IAAI,EAAC,WAAW;IAAA,GACZP,WAAW;IACfQ,QAAQ,EAAER,WAAW,CAACQ,QAAQ,IAAIF,cAAe;IACjDG,OAAO,EAAEP,UAAW;IAAAH,QAAA,EAEnBA,QAAQ,IAAIE,CAAC,CAAC,aAAa;EAAC,CACvB,CAAC;AAEb,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useTranslation","Button","useQuestionnaireNavigation","jsx","_jsx","QuestionnaireNavigationNextButton","memo","children","buttonProps","t","handleNext","isLastItem","isCurrentItemRequired","isCurrentItemAnswered","isSubmitting","isNextDisabled","mode","disabled","onPress"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/navigation/questionnaire-navigation-next-button.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,MAAM,QAAQ,oBAAoB;AAE3C,SAASC,0BAA0B,QAAQ,6CAA0C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtF,OAAO,MAAMC,iCAAiC,gBAAGN,KAAK,CAACO,IAAI,CACzD,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAgD,CAAC,KAAK;EACpE,MAAM;IAAEC;EAAE,CAAC,GAAGT,cAAc,CAAC,CAAC;EAE9B,MAAM;IACJU,UAAU;IACVC,UAAU;IACVC,qBAAqB;IACrBC,qBAAqB;IACrBC;EACF,CAAC,GAAGZ,0BAA0B,CAAC,CAAC;EAEhC,IAAIS,UAAU,EAAE;IACd,OAAO,IAAI;EACb;EAEA,MAAMI,cAAc,GAAGH,qBAAqB,IAAI,CAACC,qBAAqB;EAEtE,oBACET,IAAA,CAACH,MAAM;IACLe,IAAI,EAAC,WAAW;IAAA,GACZR,WAAW;IACfS,QAAQ,EAAET,WAAW,CAACS,QAAQ,IAAIF,cAAc,IAAID,YAAa;IACjEI,OAAO,EAAER,UAAW;IAAAH,QAAA,EAEnBA,QAAQ,IAAIE,CAAC,CAAC,aAAa;EAAC,CACvB,CAAC;AAEb,CACF,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/navigation/questionnaire-navigation-submit-button.js

@@ -15,7 +15,8 @@ export const QuestionnaireNavigationSubmitButton = /*#__PURE__*/React.memo(({
   } = useTranslation();
   const {
     paged,
-    submitForm
+    submitForm,
+    isSubmitting
   } = useQuestionnaireForm();
   const {
     isLastItem
@@ -27,7 +28,8 @@ export const QuestionnaireNavigationSubmitButton = /*#__PURE__*/React.memo(({
     mode: "contained",
     ...buttonProps,
     onPress: submitForm,
-    disabled: buttonProps.disabled,
+    disabled: buttonProps.disabled || isSubmitting,
+    loading: isSubmitting,
     children: children || t("common.submit")
   });
 });

package/lib/module/modules/questionnaire-response-form/components/navigation/questionnaire-navigation-submit-button.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useTranslation","Button","useQuestionnaireForm","useQuestionnaireNavigation","jsx","_jsx","QuestionnaireNavigationSubmitButton","memo","children","buttonProps","t","paged","submitForm","isLastItem","mode","onPress","disabled"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/navigation/questionnaire-navigation-submit-button.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,MAAM,QAAQ,oBAAoB;AAE3C,SAASC,oBAAoB,QAAQ,uCAAoC;AACzE,SAASC,0BAA0B,QAAQ,6CAA0C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtF,OAAO,MAAMC,mCAAmC,gBAAGP,KAAK,CAACQ,IAAI,CAC3D,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAgD,CAAC,KAAK;EACpE,MAAM;IAAEC;EAAE,CAAC,GAAGV,cAAc,CAAC,CAAC;EAE9B,MAAM;IAAEW,KAAK;IAAEC;EAAW,CAAC,GAAGV,oBAAoB,CAAC,CAAC;EACpD,MAAM;IAAEW;EAAW,CAAC,GAAGV,0BAA0B,CAAC,CAAC;EAEnD,IAAI,CAACU,UAAU,IAAIF,KAAK,EAAE;IACxB,OAAO,IAAI;EACb;EAEA,oBACEN,IAAA,CAACJ,MAAM;IACLa,IAAI,EAAC,WAAW;IAAA,GACZL,WAAW;IACfM,OAAO,EAAEH,UAAW;IACpBI,QAAQ,EAAEP,WAAW,CAACO,QAAS;IAAAR,QAAA,EAE9BA,QAAQ,IAAIE,CAAC,CAAC,eAAe;EAAC,CACzB,CAAC;AAEb,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useTranslation","Button","useQuestionnaireForm","useQuestionnaireNavigation","jsx","_jsx","QuestionnaireNavigationSubmitButton","memo","children","buttonProps","t","paged","submitForm","isSubmitting","isLastItem","mode","onPress","disabled","loading"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/components/navigation/questionnaire-navigation-submit-button.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,MAAM,QAAQ,oBAAoB;AAE3C,SAASC,oBAAoB,QAAQ,uCAAoC;AACzE,SAASC,0BAA0B,QAAQ,6CAA0C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGtF,OAAO,MAAMC,mCAAmC,gBAAGP,KAAK,CAACQ,IAAI,CAC3D,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAgD,CAAC,KAAK;EACpE,MAAM;IAAEC;EAAE,CAAC,GAAGV,cAAc,CAAC,CAAC;EAE9B,MAAM;IAAEW,KAAK;IAAEC,UAAU;IAAEC;EAAa,CAAC,GAAGX,oBAAoB,CAAC,CAAC;EAClE,MAAM;IAAEY;EAAW,CAAC,GAAGX,0BAA0B,CAAC,CAAC;EAEnD,IAAI,CAACW,UAAU,IAAIH,KAAK,EAAE;IACxB,OAAO,IAAI;EACb;EAEA,oBACEN,IAAA,CAACJ,MAAM;IACLc,IAAI,EAAC,WAAW;IAAA,GACZN,WAAW;IACfO,OAAO,EAAEJ,UAAW;IACpBK,QAAQ,EAAER,WAAW,CAACQ,QAAQ,IAAIJ,YAAa;IAC/CK,OAAO,EAAEL,YAAa;IAAAL,QAAA,EAErBA,QAAQ,IAAIE,CAAC,CAAC,eAAe;EAAC,CACzB,CAAC;AAEb,CACF,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/questionnaire-form-provider.js

@@ -1,5 +1,7 @@
 "use strict";
 
+/* eslint-disable max-lines */
+
 import { getReferenceString, useClient } from "@ovok/core";
 import { useFormik } from "formik";
 import React from "react";
@@ -24,26 +26,34 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
   const [currentPageIndex, setCurrentPageIndex] = React.useState(0);
   const [currentItemIndex, setCurrentItemIndex] = React.useState(0);
   const [errorMessage, setErrorMessage] = React.useState(null);
+  const [submissionError, setSubmissionError] = React.useState(null);
+  const submissionInFlight = React.useRef(false);
+  const submissionIdentifier = React.useRef(null);
   const pages = React.useMemo(() => FormUtils.extractPagesFromQuestionnaire(questionnaire), [questionnaire]);
   const initialValues = React.useMemo(() => _initialValues || FormUtils.initializeDefaultValues(pages), [_initialValues, pages]);
   const handleSubmit = React.useCallback(async (values, formikHelpers) => {
-    const validationResult = FormValidation.validateRequiredFields(pages, values);
-    if (!validationResult.isValid) {
-      const {
-        pageIndex,
-        itemIndex
-      } = validationResult.firstUnansweredLocation;
-      setCurrentPageIndex(pageIndex);
-      setCurrentItemIndex(itemIndex);
-      setErrorMessage("questionnaire-form.error.required-fields");
-      return;
-    }
-    delete values.currentLinkId;
-    if (onSubmit) {
-      onSubmit(values, formikHelpers);
+    if (submissionInFlight.current) {
       return;
     }
+    submissionInFlight.current = true;
+    setSubmissionError(null);
     try {
+      const validationResult = FormValidation.validateRequiredFields(pages, values);
+      if (!validationResult.isValid) {
+        const {
+          pageIndex,
+          itemIndex
+        } = validationResult.firstUnansweredLocation;
+        setCurrentPageIndex(pageIndex);
+        setCurrentItemIndex(itemIndex);
+        setErrorMessage("questionnaire-form.error.required-fields");
+        return;
+      }
+      delete values.currentLinkId;
+      if (onSubmit) {
+        await onSubmit(values, formikHelpers);
+        return;
+      }
       const activeProfile = await client.getProfileAsync();
       if (!activeProfile) {
         throw new Error("questionnaire-form.error.profile-not-found");
@@ -52,12 +62,21 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
       response.subject = {
         reference: getReferenceString(activeProfile)
       };
-      const createdResponse = await client.createResource(response);
+      submissionIdentifier.current ??= `${questionnaire.id ?? "unknown"}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+      const identifierValue = submissionIdentifier.current;
+      const identifierSystem = "https://sdk.ovok.com/questionnaire-response";
+      response.identifier = {
+        system: identifierSystem,
+        value: identifierValue
+      };
+      const createdResponse = await client.createResourceIfNoneExist(response, `identifier=${identifierSystem}|${identifierValue}`);
       onSuccess?.(createdResponse);
     } catch (error) {
       const typedError = error;
       onError?.(error);
-      setErrorMessage(typedError.message);
+      setSubmissionError(typedError.message || "questionnaire-form.error.submit-failed");
+    } finally {
+      submissionInFlight.current = false;
     }
   }, [onSubmit, onSuccess, onError, pages, questionnaire, client]);
   const allItems = React.useMemo(() => pages.flatMap(page => page.item ? page.item : []), [pages]);
@@ -91,6 +110,10 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
     values,
     setFieldValue
   } = formik;
+  const retrySubmit = React.useCallback(() => {
+    setSubmissionError(null);
+    void formik.submitForm();
+  }, [formik]);
   const currentPage = React.useMemo(() => pages[currentPageIndex], [pages, currentPageIndex]);
   const enabledItems = React.useMemo(() => currentPage ? ConditionUtils.getEnabledItemsForPage(currentPage, values) : [], [currentPage, values]);
   useInitialSelectedValues(pages, values, setFieldValue);
@@ -108,6 +131,8 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
     currentPageIndex,
     currentItemIndex,
     errorMessage,
+    submissionError,
+    retrySubmit,
     pages,
     allItems,
     setCurrentItemIndex,
@@ -115,7 +140,7 @@ export const QuestionnaireFormProvider = /*#__PURE__*/React.memo(({
     setErrorMessage,
     paged,
     ...formik
-  }), [questionnaire, currentItem, currentPage, currentPageIndex, currentItemIndex, errorMessage, pages, allItems, setCurrentItemIndex, setCurrentPageIndex, setErrorMessage, paged, formik]);
+  }), [questionnaire, currentItem, currentPage, currentPageIndex, currentItemIndex, errorMessage, submissionError, retrySubmit, pages, allItems, setCurrentItemIndex, setCurrentPageIndex, setErrorMessage, paged, formik]);
   return /*#__PURE__*/_jsx(QuestionnaireFormContext.Provider, {
     value: contextValue,
     children: /*#__PURE__*/_jsx(QuestionnaireNavigationProvider, {

package/lib/module/modules/questionnaire-response-form/components/questionnaire-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["getReferenceString","useClient","useFormik","React","QuestionnaireFormContext","useInitialSelectedValues","ConditionUtils","FormUtils","FormValidation","QuestionnaireSubmitUtils","QuestionnaireNavigationProvider","jsx","_jsx","QuestionnaireFormProvider","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","client","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","pages","useMemo","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","validationResult","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","currentLinkId","activeProfile","getProfileAsync","Error","response","createQuestionnaireResponse","subject","reference","createdResponse","createResource","error","typedError","message","allItems","flatMap","page","item","formik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","forEach","linkId","enableWhen","length","undefined","isItemEnabled","setValues","Object","some","value","setFieldError","setFieldValue","currentPage","enabledItems","getEnabledItemsForPage","currentItem","allEnabledItems","useEffect","contextValue","Provider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,SAAS,QAAQ,YAAY;AAC1D,SAAwBC,SAAS,QAAQ,QAAQ;AACjD,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAASC,wBAAwB,QAAQ,2CAAwC;AACjF,SAASC,wBAAwB,QAAQ,mBAAU;AAGnD,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,SAAS,QAAQ,wBAAqB;AAC/C,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,wBAAwB,QAAQ,wCAAqC;AAE9E,SAASC,+BAA+B,QAAQ,wCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtF,OAAO,MAAMC,yBAAyB,gBAAGV,KAAK,CAACW,IAAI,CACjD,CAAC;EACCC,QAAQ;EACRC,aAAa;EACbC,aAAa,EAAEC,cAAc;EAC7BC,QAAQ;EACRC,SAAS;EACTC,OAAO;EACPC,KAAK,GAAG;AAC+C,CAAC,KAAK;EAC7D,MAAMC,MAAM,GAAGtB,SAAS,CAAC,CAAC;EAE1B,MAAM,CAACuB,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGtB,KAAK,CAACuB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGzB,KAAK,CAACuB,QAAQ,CAAC,CAAC,CAAC;EACjE,MAAM,CAACG,YAAY,EAAEC,eAAe,CAAC,GAAG3B,KAAK,CAACuB,QAAQ,CAAgB,IAAI,CAAC;EAE3E,MAAMK,KAAK,GAAG5B,KAAK,CAAC6B,OAAO,CACzB,MAAMzB,SAAS,CAAC0B,6BAA6B,CAACjB,aAAa,CAAC,EAC5D,CAACA,aAAa,CAChB,CAAC;EAED,MAAMC,aAAa,GAAGd,KAAK,CAAC6B,OAAO,CACjC,MAAMd,cAAc,IAAIX,SAAS,CAAC2B,uBAAuB,CAACH,KAAK,CAAC,EAChE,CAACb,cAAc,EAAEa,KAAK,CACxB,CAAC;EAED,MAAMI,YAAY,GAAGhC,KAAK,CAACiC,WAAW,CACpC,OACEC,MAA+B,EAC/BC,aAAqD,KAClD;IACH,MAAMC,gBAAgB,GAAG/B,cAAc,CAACgC,sBAAsB,CAC5DT,KAAK,EACLM,MACF,CAAC;IAED,IAAI,CAACE,gBAAgB,CAACE,OAAO,EAAE;MAC7B,MAAM;QAAEC,SAAS;QAAEC;MAAU,CAAC,GAC5BJ,gBAAgB,CAACK,uBAAwB;MAE3CnB,mBAAmB,CAACiB,SAAS,CAAC;MAC9Bd,mBAAmB,CAACe,SAAS,CAAC;MAC9Bb,eAAe,CAAC,0CAA0C,CAAC;MAE3D;IACF;IAEA,OAAOO,MAAM,CAACQ,aAAa;IAE3B,IAAI1B,QAAQ,EAAE;MACZA,QAAQ,CAACkB,MAAM,EAAEC,aAAa,CAAC;MAE/B;IACF;IAEA,IAAI;MACF,MAAMQ,aAAa,GAAG,MAAMvB,MAAM,CAACwB,eAAe,CAAC,CAAC;MAEpD,IAAI,CAACD,aAAa,EAAE;QAClB,MAAM,IAAIE,KAAK,CAAC,4CAA4C,CAAC;MAC/D;MAEA,MAAMC,QAAQ,GAAGxC,wBAAwB,CAACyC,2BAA2B,CACnEb,MAAM,EACNN,KAAK,EACLf,aACF,CAAC;MAEDiC,QAAQ,CAACE,OAAO,GAAG;QACjBC,SAAS,EAAEpD,kBAAkB,CAAC8C,aAAa;MAC7C,CAAC;MAED,MAAMO,eAAe,GAAG,MAAM9B,MAAM,CAAC+B,cAAc,CAACL,QAAQ,CAAC;MAE7D7B,SAAS,GAAGiC,eAAe,CAAC;IAC9B,CAAC,CAAC,OAAOE,KAAK,EAAE;MACd,MAAMC,UAAU,GAAGD,KAAc;MAEjClC,OAAO,GAAGkC,KAAc,CAAC;MACzBzB,eAAe,CAAC0B,UAAU,CAACC,OAAO,CAAC;IACrC;EACF,CAAC,EACD,CAACtC,QAAQ,EAAEC,SAAS,EAAEC,OAAO,EAAEU,KAAK,EAAEf,aAAa,EAAEO,MAAM,CAC7D,CAAC;EAED,MAAMmC,QAAQ,GAAGvD,KAAK,CAAC6B,OAAO,CAC5B,MAAMD,KAAK,CAAC4B,OAAO,CAAEC,IAAI,IAAMA,IAAI,CAACC,IAAI,GAAGD,IAAI,CAACC,IAAI,GAAG,EAAG,CAAC,EAC3D,CAAC9B,KAAK,CACR,CAAC;EAED,MAAM+B,MAAM,GAAG5D,SAAS,CAA0B;IAChDe,aAAa;IACbE,QAAQ,EAAEgB,YAAY;IACtB4B,cAAc,EAAE,IAAI;IACpBC,kBAAkB,EAAE,IAAI;IACxBC,QAAQ,EAAG5B,MAAM,IAAK;MACpB,MAAM6B,aAAa,GAAG;QAAE,GAAG7B;MAAO,CAAC;MACnC,IAAI8B,UAAU,GAAG,KAAK;MAEtBT,QAAQ,CAACU,OAAO,CAAEP,IAAI,IAAK;QACzB,MAAMQ,MAAM,GAAGR,IAAI,CAACQ,MAAM,IAAI,EAAE;QAEhC,IACEA,MAAM,KAAKhC,MAAM,CAACQ,aAAa,IAC/BgB,IAAI,CAACS,UAAU,EAAEC,MAAM,IACvBL,aAAa,CAACG,MAAM,CAAC,KAAKG,SAAS,IACnC,CAAClE,cAAc,CAACmE,aAAa,CAACZ,IAAI,EAAEK,aAAa,CAAC,EAClD;UACA,OAAOA,aAAa,CAACG,MAAM,CAAC;UAC5BF,UAAU,GAAG,IAAI;QACnB;MACF,CAAC,CAAC;MAEF,IAAIA,UAAU,EAAE;QACdL,MAAM,CAACY,SAAS,CAACR,aAAa,CAAC;MACjC;MAEA,IAAI,CAAC5C,KAAK,IAAIqD,MAAM,CAACtC,MAAM,CAAC6B,aAAa,CAAC,CAACU,IAAI,CAAEC,KAAK,IAAK,CAACA,KAAK,CAAC,EAAE;QAClEf,MAAM,CAACgB,aAAa,CAClB,QAAQ,EACR,0CACF,CAAC;MACH;MAEA,OAAO,CAAC,CAAC;IACX;EACF,CAAC,CAAC;EAEF,MAAM;IAAEzC,MAAM;IAAE0C;EAAc,CAAC,GAAGjB,MAAM;EAExC,MAAMkB,WAAW,GAAG7E,KAAK,CAAC6B,OAAO,CAC/B,MAAMD,KAAK,CAACP,gBAAgB,CAAE,EAC9B,CAACO,KAAK,EAAEP,gBAAgB,CAC1B,CAAC;EAED,MAAMyD,YAAY,GAAG9E,KAAK,CAAC6B,OAAO,CAChC,MACEgD,WAAW,GACP1E,cAAc,CAAC4E,sBAAsB,CAACF,WAAW,EAAE3C,MAAM,CAAC,GAC1D,EAAE,EACR,CAAC2C,WAAW,EAAE3C,MAAM,CACtB,CAAC;EAEDhC,wBAAwB,CAAC0B,KAAK,EAAEM,MAAM,EAAE0C,aAAa,CAAC;EAEtD,MAAMI,WAAW,GAAGhF,KAAK,CAAC6B,OAAO,CAC/B,MAAMiD,YAAY,CAACtD,gBAAgB,CAAC,EACpC,CAACsD,YAAY,EAAEtD,gBAAgB,CACjC,CAAC;EAED,MAAMyD,eAAe,GAAGjF,KAAK,CAAC6B,OAAO,CACnC,MACED,KAAK,CAAC4B,OAAO,CAAEC,IAAI,IACjBtD,cAAc,CAAC4E,sBAAsB,CAACtB,IAAI,EAAEvB,MAAM,CACpD,CAAC,EACH,CAACN,KAAK,EAAEM,MAAM,CAChB,CAAC;EAEDlC,KAAK,CAACkF,SAAS,CAAC,MAAM;IACpB,IAAIF,WAAW,EAAEd,MAAM,EAAE;MACvBU,aAAa,CAAC,eAAe,EAAEI,WAAW,CAACd,MAAM,EAAE,KAAK,CAAC;IAC3D;EACF,CAAC,EAAE,CAACc,WAAW,EAAEd,MAAM,EAAEU,aAAa,CAAC,CAAC;EAExC,MAAMO,YAAY,GAAGnF,KAAK,CAAC6B,OAAO,CAChC,OAAO;IACLhB,aAAa;IACbmE,WAAW;IACXH,WAAW;IACXxD,gBAAgB;IAChBG,gBAAgB;IAChBE,YAAY;IACZE,KAAK;IACL2B,QAAQ;IACR9B,mBAAmB;IACnBH,mBAAmB;IACnBK,eAAe;IACfR,KAAK;IACL,GAAGwC;EACL,CAAC,CAAC,EACF,CACE9C,aAAa,EACbmE,WAAW,EACXH,WAAW,EACXxD,gBAAgB,EAChBG,gBAAgB,EAChBE,YAAY,EACZE,KAAK,EACL2B,QAAQ,EACR9B,mBAAmB,EACnBH,mBAAmB,EACnBK,eAAe,EACfR,KAAK,EACLwC,MAAM,CAEV,CAAC;EAED,oBACElD,IAAA,CAACR,wBAAwB,CAACmF,QAAQ;IAACV,KAAK,EAAES,YAAa;IAAAvE,QAAA,eACrDH,IAAA,CAACF,+BAA+B;MAC9ByE,WAAW,EAAEA,WAAY;MACzBH,WAAW,EAAEA,WAAY;MACzBC,YAAY,EAAEA,YAAa;MAC3BG,eAAe,EAAEA,eAAgB;MACjCrD,KAAK,EAAEA,KAAM;MACbM,MAAM,EAAEA,MAAO;MACfV,gBAAgB,EAAEA,gBAAiB;MACnCH,gBAAgB,EAAEA,gBAAiB;MACnCI,mBAAmB,EAAEA,mBAAoB;MACzCH,mBAAmB,EAAEA,mBAAoB;MACzCK,eAAe,EAAEA,eAAgB;MACjCgC,MAAM,EAAEA,MAAO;MAAA/C,QAAA,EAEdA;IAAQ,CACsB;EAAC,CACD,CAAC;AAExC,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getReferenceString","useClient","useFormik","React","QuestionnaireFormContext","useInitialSelectedValues","ConditionUtils","FormUtils","FormValidation","QuestionnaireSubmitUtils","QuestionnaireNavigationProvider","jsx","_jsx","QuestionnaireFormProvider","memo","children","questionnaire","initialValues","_initialValues","onSubmit","onSuccess","onError","paged","client","currentPageIndex","setCurrentPageIndex","useState","currentItemIndex","setCurrentItemIndex","errorMessage","setErrorMessage","submissionError","setSubmissionError","submissionInFlight","useRef","submissionIdentifier","pages","useMemo","extractPagesFromQuestionnaire","initializeDefaultValues","handleSubmit","useCallback","values","formikHelpers","current","validationResult","validateRequiredFields","isValid","pageIndex","itemIndex","firstUnansweredLocation","currentLinkId","activeProfile","getProfileAsync","Error","response","createQuestionnaireResponse","subject","reference","id","Date","now","Math","random","toString","slice","identifierValue","identifierSystem","identifier","system","value","createdResponse","createResourceIfNoneExist","error","typedError","message","allItems","flatMap","page","item","formik","validateOnBlur","enableReinitialize","validate","cleanedValues","hasChanges","forEach","linkId","enableWhen","length","undefined","isItemEnabled","setValues","Object","some","setFieldError","setFieldValue","retrySubmit","submitForm","currentPage","enabledItems","getEnabledItemsForPage","currentItem","allEnabledItems","useEffect","contextValue","Provider"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-form-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/components/questionnaire-navigation-provider.js

@@ -38,9 +38,10 @@ export const QuestionnaireNavigationProvider = ({
   });
   const contextValue = React.useMemo(() => ({
     ...navigationState,
+    isSubmitting: formik.isSubmitting,
     handleNext,
     handlePrevious
-  }), [navigationState, handleNext, handlePrevious]);
+  }), [navigationState, formik.isSubmitting, handleNext, handlePrevious]);
   return /*#__PURE__*/_jsx(QuestionnaireNavigationContext.Provider, {
     value: contextValue,
     children: children

package/lib/module/modules/questionnaire-response-form/components/questionnaire-navigation-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","QuestionnaireNavigationContext","useNavigationHandlers","useQuestionnaireNavigationState","jsx","_jsx","QuestionnaireNavigationProvider","children","currentItem","currentPage","enabledItems","allEnabledItems","pages","values","currentItemIndex","currentPageIndex","setCurrentItemIndex","setCurrentPageIndex","setErrorMessage","formik","navigationState","handleNext","handlePrevious","contextValue","useMemo","Provider","value"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-navigation-provider.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,8BAA8B,QAAQ,iDAA8C;AAC7F,SAASC,qBAAqB,QAAQ,qCAAkC;AACxE,SAASC,+BAA+B,QAAQ,gDAA6C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG9F,OAAO,MAAMC,+BAEZ,GAAGA,CAAC;EACHC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,YAAY;EACZC,eAAe;EACfC,KAAK;EACLC,MAAM;EACNC,gBAAgB;EAChBC,gBAAgB;EAChBC,mBAAmB;EACnBC,mBAAmB;EACnBC,eAAe;EACfC;AACF,CAAC,KAAK;EACJ,MAAMC,eAAe,GAAGjB,+BAA+B,CACrDK,WAAW,EACXO,gBAAgB,EAChBD,gBAAgB,EAChBJ,YAAY,EACZE,KAAK,EACLC,MAAM,EACNF,eACF,CAAC;EAED,MAAM;IAAEU,UAAU;IAAEC;EAAe,CAAC,GAAGpB,qBAAqB,CAAC;IAC3DM,WAAW;IACXC,WAAW;IACXC,YAAY;IACZS,MAAM;IACNL,gBAAgB;IAChBC,gBAAgB;IAChBH,KAAK;IACLI,mBAAmB;IACnBC,mBAAmB;IACnBC;EACF,CAAC,CAAC;EAEF,MAAMK,YAAY,GAAGvB,KAAK,CAACwB,OAAO,CAChC,OAAO;IACL,GAAGJ,eAAe;IAClBC,UAAU;IACVC;EACF,CAAC,CAAC,EACF,CAACF,eAAe,EAAEC,UAAU,EAAEC,cAAc,CAC9C,CAAC;EAED,oBACEjB,IAAA,CAACJ,8BAA8B,CAACwB,QAAQ;IAACC,KAAK,EAAEH,YAAa;IAAAhB,QAAA,EAC1DA;EAAQ,CAC8B,CAAC;AAE9C,CAAC","ignoreList":[]}
+{"version":3,"names":["React","QuestionnaireNavigationContext","useNavigationHandlers","useQuestionnaireNavigationState","jsx","_jsx","QuestionnaireNavigationProvider","children","currentItem","currentPage","enabledItems","allEnabledItems","pages","values","currentItemIndex","currentPageIndex","setCurrentItemIndex","setCurrentPageIndex","setErrorMessage","formik","navigationState","handleNext","handlePrevious","contextValue","useMemo","isSubmitting","Provider","value"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/components/questionnaire-navigation-provider.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,8BAA8B,QAAQ,iDAA8C;AAC7F,SAASC,qBAAqB,QAAQ,qCAAkC;AACxE,SAASC,+BAA+B,QAAQ,gDAA6C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG9F,OAAO,MAAMC,+BAEZ,GAAGA,CAAC;EACHC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,YAAY;EACZC,eAAe;EACfC,KAAK;EACLC,MAAM;EACNC,gBAAgB;EAChBC,gBAAgB;EAChBC,mBAAmB;EACnBC,mBAAmB;EACnBC,eAAe;EACfC;AACF,CAAC,KAAK;EACJ,MAAMC,eAAe,GAAGjB,+BAA+B,CACrDK,WAAW,EACXO,gBAAgB,EAChBD,gBAAgB,EAChBJ,YAAY,EACZE,KAAK,EACLC,MAAM,EACNF,eACF,CAAC;EAED,MAAM;IAAEU,UAAU;IAAEC;EAAe,CAAC,GAAGpB,qBAAqB,CAAC;IAC3DM,WAAW;IACXC,WAAW;IACXC,YAAY;IACZS,MAAM;IACNL,gBAAgB;IAChBC,gBAAgB;IAChBH,KAAK;IACLI,mBAAmB;IACnBC,mBAAmB;IACnBC;EACF,CAAC,CAAC;EAEF,MAAMK,YAAY,GAAGvB,KAAK,CAACwB,OAAO,CAChC,OAAO;IACL,GAAGJ,eAAe;IAClBK,YAAY,EAAEN,MAAM,CAACM,YAAY;IACjCJ,UAAU;IACVC;EACF,CAAC,CAAC,EACF,CAACF,eAAe,EAAED,MAAM,CAACM,YAAY,EAAEJ,UAAU,EAAEC,cAAc,CACnE,CAAC;EAED,oBACEjB,IAAA,CAACJ,8BAA8B,CAACyB,QAAQ;IAACC,KAAK,EAAEJ,YAAa;IAAAhB,QAAA,EAC1DA;EAAQ,CAC8B,CAAC;AAE9C,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/contexts/questionnaire-navigation-context.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","QuestionnaireNavigationContext","createContext","undefined"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/contexts/questionnaire-navigation-context.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAazB,OAAO,MAAMC,8BAA8B,gBAAGD,KAAK,CAACE,aAAa,CAE/DC,SAAS,CAAC","ignoreList":[]}
+{"version":3,"names":["React","QuestionnaireNavigationContext","createContext","undefined"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/contexts/questionnaire-navigation-context.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAczB,OAAO,MAAMC,8BAA8B,gBAAGD,KAAK,CAACE,aAAa,CAE/DC,SAAS,CAAC","ignoreList":[]}

package/lib/module/modules/tile/components/task-icon.js

@@ -11,7 +11,8 @@ export const TaskIcon = ({
 }) => {
   const theme = useAppTheme();
   const iconXML = React.useMemo(() => {
-    return measurementIconSvg[props.measurementTypeKey](props.color || theme.colors.primary);
+    const iconRenderer = measurementIconSvg[props.measurementTypeKey];
+    return iconRenderer?.(props.color || theme.colors.primary) ?? null;
   }, [props.measurementTypeKey, props.color, theme.colors.primary]);
   if (!iconXML) {
     return null;

package/lib/module/modules/tile/components/task-icon.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","SvgXml","useAppTheme","measurementIconSvg","jsx","_jsx","TaskIcon","size","props","theme","iconXML","useMemo","measurementTypeKey","color","colors","primary","testID","xml","width","height"],"sourceRoot":"../../../../../src","sources":["modules/tile/components/task-icon.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,MAAM,QAAQ,kBAAkB;AAEzC,SAASC,WAAW,QAAQ,sBAAa;AACzC,SAASC,kBAAkB,QAAQ,sCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGvE,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAE,GAAGC;AAAqB,CAAC,KAAK;EAClE,MAAMC,KAAK,GAAGP,WAAW,CAAC,CAAC;EAE3B,MAAMQ,OAAO,GAAGV,KAAK,CAACW,OAAO,CAAC,MAAM;IAClC,OAAOR,kBAAkB,CAACK,KAAK,CAACI,kBAAkB,CAAC,CACjDJ,KAAK,CAACK,KAAK,IAAIJ,KAAK,CAACK,MAAM,CAACC,OAC9B,CAAC;EACH,CAAC,EAAE,CAACP,KAAK,CAACI,kBAAkB,EAAEJ,KAAK,CAACK,KAAK,EAAEJ,KAAK,CAACK,MAAM,CAACC,OAAO,CAAC,CAAC;EAEjE,IAAI,CAACL,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEA,oBACEL,IAAA,CAACJ,MAAM;IAACe,MAAM,EAAER,KAAK,CAACQ,MAAO;IAACC,GAAG,EAAEP,OAAQ;IAACQ,KAAK,EAAEX,IAAK;IAACY,MAAM,EAAEZ;EAAK,CAAE,CAAC;AAE7E,CAAC","ignoreList":[]}
+{"version":3,"names":["React","SvgXml","useAppTheme","measurementIconSvg","jsx","_jsx","TaskIcon","size","props","theme","iconXML","useMemo","iconRenderer","measurementTypeKey","color","colors","primary","testID","xml","width","height"],"sourceRoot":"../../../../../src","sources":["modules/tile/components/task-icon.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,MAAM,QAAQ,kBAAkB;AAEzC,SAASC,WAAW,QAAQ,sBAAa;AACzC,SAASC,kBAAkB,QAAQ,sCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGvE,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,IAAI,GAAG,EAAE;EAAE,GAAGC;AAAqB,CAAC,KAAK;EAClE,MAAMC,KAAK,GAAGP,WAAW,CAAC,CAAC;EAE3B,MAAMQ,OAAO,GAAGV,KAAK,CAACW,OAAO,CAAC,MAAM;IAClC,MAAMC,YAAY,GAChBT,kBAAkB,CAChBK,KAAK,CAACK,kBAAkB,CACzB;IAEH,OAAOD,YAAY,GAAGJ,KAAK,CAACM,KAAK,IAAIL,KAAK,CAACM,MAAM,CAACC,OAAO,CAAC,IAAI,IAAI;EACpE,CAAC,EAAE,CAACR,KAAK,CAACK,kBAAkB,EAAEL,KAAK,CAACM,KAAK,EAAEL,KAAK,CAACM,MAAM,CAACC,OAAO,CAAC,CAAC;EAEjE,IAAI,CAACN,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EAEA,oBACEL,IAAA,CAACJ,MAAM;IAACgB,MAAM,EAAET,KAAK,CAACS,MAAO;IAACC,GAAG,EAAER,OAAQ;IAACS,KAAK,EAAEZ,IAAK;IAACa,MAAM,EAAEb;EAAK,CAAE,CAAC;AAE7E,CAAC","ignoreList":[]}