@m4l/components 9.5.2 → 9.5.3-beta-feature-671-shared-reports-viewer-mf.0

package/components/DynamicForm/helpers/resolveInitialValue/resolveInitialValue.js

@@ -1,64 +1,48 @@
-function s(r) {
-  if (r.currentValue && r.currentValue.isVisible) {
-    const e = r.currentValue, t = r.fieldType.rhfComponent === "RHFCheckableList", a = r.fieldType.rhfComponent === "RHFDaysOfWeekPicker", i = r.fieldType.rhfComponent === "RHFAutoComplete", o = r.fieldType.rhfComponent === "RHFSelect" && r.fieldType.rhfComponentProps?.isMultiple === !0;
-    if (i)
+function c(e) {
+  if (e.currentValue !== null && e.isVisible) {
+    const r = e.currentValue, n = e.fieldType.rhfComponent === "RHFCheckableList", l = e.fieldType.rhfComponent === "RHFDaysOfWeekPicker", f = n || l, s = e.fieldType.rhfComponent === "RHFAutoComplete", p = e.fieldType.rhfComponent === "RHFSelect" && e.fieldType.rhfComponentProps?.isMultiple === !0;
+    if (s)
       return;
-    if (o)
-      return [];
-    if (t || a) {
-      if (e.valueInteger !== null && e.valueInteger !== void 0)
-        return [e.valueInteger];
-      if (e.valueString !== null && e.valueString !== void 0)
+    if (f || p) {
+      if (Array.isArray(r))
+        return r;
+      if (typeof r == "string")
         try {
-          const u = JSON.parse(e.valueString);
-          if (Array.isArray(u))
-            return u;
+          const t = JSON.parse(r);
+          if (Array.isArray(t))
+            return t;
         } catch {
-          const u = Number(e.valueString);
-          return !isNaN(u) && e.valueString.trim() !== "" ? [u] : [e.valueString];
+          const t = Number(r);
+          return !isNaN(t) && r.trim() !== "" ? [t] : [r];
         }
-      if (e.value)
-        try {
-          const u = JSON.parse(e.value);
-          if (Array.isArray(u))
-            return u;
-        } catch {
-          const u = Number(e.value);
-          return !isNaN(u) && e.value.trim() !== "" ? [u] : [e.value];
-        }
-      return [];
+      return [r];
     }
-    if (e.valueString !== null && e.valueString !== void 0)
-      return e.valueString;
-    if (e.valueInteger !== null && e.valueInteger !== void 0)
-      return e.valueInteger;
-    if (e.valueDouble !== null && e.valueDouble !== void 0)
-      return e.valueDouble;
-    if (e.valueBoolean !== null && e.valueBoolean !== void 0)
-      return e.valueBoolean;
-    if (e.valueTimestamp !== null && e.valueTimestamp !== void 0)
-      return e.valueTimestamp;
-    if (e.value) {
-      const u = Number(e.value);
-      return !isNaN(u) && e.value.trim() !== "" ? u : e.value;
+    if (typeof r == "number" || Array.isArray(r))
+      return r;
+    const a = e.fieldType.id;
+    if (a === "fft_boolean" || a === "fft_checkbox") {
+      const t = r.trim().toLowerCase();
+      return t === "true" ? !0 : t === "false" ? !1 : !!r;
     }
+    const i = Number(r);
+    return !isNaN(i) && r.trim() !== "" ? i : r;
   }
-  if (r.defaultValue !== null && r.defaultValue !== void 0) {
-    if (r.fieldType.rhfComponent === "RHFCheckableList" || r.fieldType.rhfComponent === "RHFDaysOfWeekPicker")
+  if (e.defaultValue !== null && e.defaultValue !== void 0) {
+    if (e.fieldType.rhfComponent === "RHFCheckableList" || e.fieldType.rhfComponent === "RHFDaysOfWeekPicker")
       try {
-        const t = JSON.parse(r.defaultValue);
-        if (Array.isArray(t))
-          return t;
+        const n = JSON.parse(e.defaultValue);
+        if (Array.isArray(n))
+          return n;
       } catch {
-        const t = Number(r.defaultValue);
-        return !isNaN(t) && r.defaultValue.trim() !== "" ? [t] : [r.defaultValue];
+        const n = Number(e.defaultValue);
+        return !isNaN(n) && e.defaultValue.trim() !== "" ? [n] : [e.defaultValue];
       }
-    const e = Number(r.defaultValue);
-    return !isNaN(e) && r.defaultValue.trim() !== "" ? e : r.defaultValue;
+    const r = Number(e.defaultValue);
+    return !isNaN(r) && e.defaultValue.trim() !== "" ? r : e.defaultValue;
   }
-  const n = r.fieldType.id, l = r.fieldType.rhfComponent;
-  return l === "RHFCheckableList" || l === "RHFDaysOfWeekPicker" ? [] : l === "RHFAutoComplete" ? r.fieldType.rhfComponentProps?.isMultiple === !0 ? [] : null : l === "RHFRadioGroup" ? null : n === "fft_boolean" || n === "fft_checkbox" ? !1 : null;
+  const u = e.fieldType.id, o = e.fieldType.rhfComponent;
+  return o === "RHFCheckableList" || o === "RHFDaysOfWeekPicker" ? [] : o === "RHFAutoComplete" ? e.fieldType.rhfComponentProps?.isMultiple === !0 ? [] : null : o === "RHFRadioGroup" ? null : u === "fft_boolean" || u === "fft_checkbox" ? !1 : null;
 }
 export {
-  s as resolveInitialValue
+  c as resolveInitialValue
 };

package/components/DynamicForm/helpers/resolveValidationErrorMessage/index.d.ts

@@ -0,0 +1,2 @@
+export * from './resolveValidationErrorMessage';
+//# sourceMappingURL=index.d.ts.map

package/components/DynamicForm/helpers/resolveValidationErrorMessage/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/resolveValidationErrorMessage/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC"}

package/components/DynamicForm/helpers/resolveValidationErrorMessage/resolveValidationErrorMessage.d.ts

@@ -0,0 +1,10 @@
+import { GetLabelType } from '@m4l/core';
+import { FieldValidation } from '../../types';
+/**
+ * Resolves the user-visible validation error string.
+ * Looks up `validationType.errorMessageForm` (or `type.errorMessageForm`) with `getLabel` when it is a
+ * dictionary key. If the dictionary does not resolve the value, a **numeric-only** id uses
+ * `fallbackMessage`; otherwise the API may have sent **display-ready text**, which is returned as-is.
+ */
+export declare function resolveValidationErrorMessage(validation: FieldValidation, getLabel: GetLabelType, fallbackMessage: string): string;
+//# sourceMappingURL=resolveValidationErrorMessage.d.ts.map

package/components/DynamicForm/helpers/resolveValidationErrorMessage/resolveValidationErrorMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveValidationErrorMessage.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/resolveValidationErrorMessage/resolveValidationErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAInD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,eAAe,EAC3B,QAAQ,EAAE,YAAY,EACtB,eAAe,EAAE,MAAM,GACtB,MAAM,CAcR"}

package/components/DynamicForm/helpers/resolveValidationErrorMessage/resolveValidationErrorMessage.js

@@ -0,0 +1,11 @@
+const s = "N_D:[";
+function u(e, n, o) {
+  const r = (e.validationType || e.type)?.errorMessageForm?.trim();
+  if (r == null || r === "")
+    return o;
+  const t = n(r);
+  return t && !t.startsWith(s) ? t : /^\d+$/.test(r) ? o : r;
+}
+export {
+  u as resolveValidationErrorMessage
+};

package/components/DynamicForm/hooks/useDynamicForm/useDynamicForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDynamicForm.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useDynamicForm/useDynamicForm.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,MAAM,aAAa,CAAC;AAUxE;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;;EAyF1D"}
+{"version":3,"file":"useDynamicForm.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useDynamicForm/useDynamicForm.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAqB,MAAM,aAAa,CAAC;AAUxE;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;;EA4F1D"}

package/components/DynamicForm/hooks/useDynamicForm/useDynamicForm.js

@@ -1,57 +1,58 @@
-import { useMemo as u } from "react";
-import { createValidationPartialObject as S, createValidationSchema as b, createValidationFullObject as N } from "../../../hook-form/RHFormProvider/schema.js";
-import { useModuleDictionary as g } from "@m4l/core";
-import { resolveInitialValue as w } from "../../helpers/resolveInitialValue/resolveInitialValue.js";
-import { createFieldValidationSchema as A } from "../../helpers/createFieldValidationSchema/createFieldValidationSchema.js";
-import { evaluateConditionalRule as h } from "../../helpers/evaluateConditionalRule/evaluateConditionalRule.js";
-function O(p) {
-  const { fields: n, conditionalRules: c } = p, { getLabel: l } = g(), d = u(() => {
+import { useMemo as d } from "react";
+import { EMPTY_DATA as h } from "../../constants.js";
+import { createValidationPartialObject as b, createValidationSchema as A, createValidationFullObject as N } from "../../../hook-form/RHFormProvider/schema.js";
+import { useModuleDictionary as T } from "@m4l/core";
+import { resolveInitialValue as g } from "../../helpers/resolveInitialValue/resolveInitialValue.js";
+import { createFieldValidationSchema as w } from "../../helpers/createFieldValidationSchema/createFieldValidationSchema.js";
+import { evaluateConditionalRule as p } from "../../helpers/evaluateConditionalRule/evaluateConditionalRule.js";
+function P(c) {
+  const n = c.fields ?? h.fields, l = c.conditionalRules ?? h.conditionalRules, { getLabel: m } = T(), f = d(() => {
     const t = {};
-    return n.forEach((e) => {
-      e.currentValue?.isVisible !== !1 && (t[e.name] = w(e));
+    return n.forEach((o) => {
+      o.isVisible !== !1 && (t[o.name] = g(o));
     }), t;
-  }, [n]), f = u(() => {
-    const t = S({});
-    return n.forEach((e) => {
-      const i = A(e, l);
-      if (!i)
+  }, [n]), y = d(() => {
+    const t = b({});
+    return n.forEach((o) => {
+      const a = w(o, m);
+      if (!a)
         return;
-      const V = !e.isConditional && e.currentValue?.isVisible !== !1;
-      if (e.isConditional === !1) {
-        t[e.name] = V ? i : i.optional();
+      const F = !o.isConditional && o.isVisible !== !1;
+      if (o.isConditional === !1) {
+        t[o.name] = F ? a : a.optional();
         return;
       }
-      const m = (c || []).filter(
-        (a) => a.isActive && a.targetFieldName === e.name
-      ), r = [...new Set(m.map((a) => a.sourceFieldName))];
+      const u = l.filter(
+        (e) => e.isActive && e.targetFieldName === o.name
+      ), r = [...new Set(u.map((e) => e.sourceFieldName))];
       if (r.length === 0) {
-        t[e.name] = i.optional();
+        t[o.name] = a.optional();
         return;
       }
-      const y = i.when(
+      const V = a.when(
         r,
         {
           /** Returns true when the field is visible (any show rule met or any hide rule not met). */
-          is: (a) => {
-            const F = Array.isArray(a) ? a : [a], s = {};
-            return r.forEach((o, v) => {
-              s[o] = F[v];
-            }), m.some(
-              (o) => o.actionType === "show" && h(o, s[o.sourceFieldName]) || o.actionType === "hide" && !h(o, s[o.sourceFieldName])
+          is: (e) => {
+            const v = Array.isArray(e) ? e : [e], s = {};
+            return r.forEach((i, S) => {
+              s[i] = v[S];
+            }), u.some(
+              (i) => i.actionType === "show" && p(i, s[i.sourceFieldName]) || i.actionType === "hide" && !p(i, s[i.sourceFieldName])
             );
           },
-          then: (a) => a,
-          otherwise: (a) => a.optional()
+          then: (e) => e,
+          otherwise: (e) => e.optional()
         }
       );
-      t[e.name] = y;
-    }), b(N(t));
-  }, [n, c, l]);
+      t[o.name] = V;
+    }), A(N(t));
+  }, [n, l, m]);
   return {
-    initialValues: d,
-    validationSchema: f
+    initialValues: f,
+    validationSchema: y
   };
 }
 export {
-  O as useDynamicForm
+  P as useDynamicForm
 };

package/components/DynamicForm/hooks/useDynamicFormConditionals/useDynamicFormConditionals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDynamicFormConditionals.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useDynamicFormConditionals/useDynamicFormConditionals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAsC,MAAM,aAAa,CAAC;AAGzF;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,sBAAsB;;EA8DtE"}
+{"version":3,"file":"useDynamicFormConditionals.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useDynamicFormConditionals/useDynamicFormConditionals.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAsC,MAAM,aAAa,CAAC;AAGzF;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,sBAAsB;;EA+DtE"}

package/components/DynamicForm/hooks/useDynamicFormConditionals/useDynamicFormConditionals.js

@@ -1,25 +1,26 @@
-import { useState as f, useEffect as m, useMemo as u } from "react";
+import { useState as m, useEffect as u, useMemo as p } from "react";
 import { useFormContext as F, useWatch as h } from "react-hook-form";
-import { evaluateConditionalRule as p } from "../../helpers/evaluateConditionalRule/evaluateConditionalRule.js";
-function v(l) {
-  const { fields: s, conditionalRules: o } = l, { control: c } = F(), [n, r] = f(() => {
+import { EMPTY_DATA as d } from "../../constants.js";
+import { evaluateConditionalRule as b } from "../../helpers/evaluateConditionalRule/evaluateConditionalRule.js";
+function C(t) {
+  const s = t.fields ?? d.fields, n = t.conditionalRules ?? d.conditionalRules, { control: c } = F(), [a, r] = m(() => {
     const i = /* @__PURE__ */ new Set();
     return s.forEach((e) => {
-      !e.isConditional && e.currentValue?.isVisible !== !1 && i.add(e.name);
+      !e.isConditional && e.isVisible !== !1 && i.add(e.name);
     }), i;
-  }), a = h({ control: c });
-  return m(() => {
+  }), l = h({ control: c });
+  return u(() => {
     const i = /* @__PURE__ */ new Set();
     s.forEach((e) => {
-      !e.isConditional && e.currentValue?.isVisible !== !1 && i.add(e.name);
-    }), o.filter((e) => e.isActive).forEach((e) => {
-      const d = a[e.sourceFieldName], t = p(e, d);
-      t && e.actionType === "show" ? i.add(e.targetFieldName) : !t && e.actionType === "show" || t && e.actionType === "hide" || !t && e.actionType === "hide" && i.add(e.targetFieldName);
+      !e.isConditional && e.isVisible !== !1 && i.add(e.name);
+    }), n.filter((e) => e.isActive).forEach((e) => {
+      const f = l[e.sourceFieldName], o = b(e, f);
+      o && e.actionType === "show" ? i.add(e.targetFieldName) : !o && e.actionType === "show" || o && e.actionType === "hide" || !o && e.actionType === "hide" && i.add(e.targetFieldName);
     }), r(i);
-  }, [a, o, s]), {
-    visibleFields: u(() => s.filter((i) => n.has(i.name)).sort((i, e) => i.displayOrder - e.displayOrder), [s, n])
+  }, [l, n, s]), {
+    visibleFields: p(() => s.filter((i) => a.has(i.name)).sort((i, e) => i.displayOrder - e.displayOrder), [s, a])
   };
 }
 export {
-  v as useDynamicFormConditionals
+  C as useDynamicFormConditionals
 };

package/components/DynamicForm/hooks/useDynamicFormCoupled/useDynamicFormCoupled.d.ts

@@ -8,7 +8,7 @@ import { UseDynamicFormCoupledProps, UseDynamicFormCoupledReturn } from './types
  *    inputEndpoint, outputEndpoint, initialData, formatInputData, formatOutputData, onSubmit).
  * 2. Derives initialValues and validationSchema from the form data (same as useDynamicForm).
  *
- * Fields with endpoint/params (RHFSelect, RHFCheckableList with empty options) have their
+ * Fields with endpoint/endpointParams (RHFSelect, RHFCheckableList with empty options) have their
  * options fetched inside DynamicFormContent via useFieldsWithFetchedOptions; no extra
  * setup is needed when using this hook in coupled mode.
  *

package/components/DynamicForm/hooks/useFieldsWithFetchedOptions/normalizeOptionsResponse.d.ts

@@ -1,7 +1,8 @@
 import { FieldOption } from '../../types';
 /**
- * Normalizes API response to FieldOption[].
- * Supports array or { data: array } and snake_case or camelCase keys.
+ * Extracts the options list from a GET response without mutating item shape.
+ * Accepts a plain array or `{ data: array }` (same envelope pattern as elsewhere).
+ * Items are expected to match `FieldOption` per API contract (e.g. after `responseToCamelCase`).
  */
 export declare function normalizeOptionsResponse(response: unknown): FieldOption[];
 //# sourceMappingURL=normalizeOptionsResponse.d.ts.map

package/components/DynamicForm/hooks/useFieldsWithFetchedOptions/normalizeOptionsResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeOptionsResponse.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useFieldsWithFetchedOptions/normalizeOptionsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAe1C;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,WAAW,EAAE,CAgBzE"}
+{"version":3,"file":"normalizeOptionsResponse.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/hooks/useFieldsWithFetchedOptions/normalizeOptionsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,WAAW,EAAE,CASzE"}

package/components/DynamicForm/hooks/useFieldsWithFetchedOptions/normalizeOptionsResponse.js

@@ -1,20 +1,13 @@
-function l(r) {
-  let d = [];
-  if (Array.isArray(r))
-    d = r;
-  else if (r && typeof r == "object" && "data" in r) {
-    const a = r.data;
-    d = Array.isArray(a) ? a : [];
+function r(a) {
+  let t = [];
+  if (Array.isArray(a))
+    t = a;
+  else if (a && typeof a == "object" && "data" in a) {
+    const i = a.data;
+    t = Array.isArray(i) ? i : [];
   }
-  return d.map((a, i) => ({
-    id: a.id ?? i,
-    name: a.name ?? a.value ?? null,
-    value: String(a.value ?? a.id ?? ""),
-    isDefault: a.isDefault ?? a.is_default ?? !1,
-    displayOrder: a.displayOrder ?? a.display_order ?? i,
-    nameDictionaryId: a.nameDictionaryId ?? a.name_dictionary_id ?? 0
-  }));
+  return t;
 }
 export {
-  l as normalizeOptionsResponse
+  r as normalizeOptionsResponse
 };

package/components/DynamicForm/hooks/useFieldsWithFetchedOptions/useFieldsWithFetchedOptions.d.ts

@@ -1,6 +1,6 @@
 import { UseFieldsWithFetchedOptionsProps, UseFieldsWithFetchedOptionsReturn } from './types';
 /**
- * Fetches options from fieldType.endpoint when options are empty.
+ * Fetches options from `field.endpoint` when options are empty.
  * Returns fields with options populated from the network when applicable.
  */
 export declare function useFieldsWithFetchedOptions(props: UseFieldsWithFetchedOptionsProps): UseFieldsWithFetchedOptionsReturn;

package/components/DynamicForm/hooks/useFieldsWithFetchedOptions/useFieldsWithFetchedOptions.js

@@ -1,51 +1,51 @@
-import { useState as h, useRef as f, useEffect as m } from "react";
+import { useState as f, useRef as m, useEffect as O } from "react";
 import { useNetwork as S } from "@m4l/core";
-import { normalizeOptionsResponse as T } from "./normalizeOptionsResponse.js";
-const w = /* @__PURE__ */ new Set(["RHFSelect", "RHFCheckableList", "RHFRadioGroup"]);
-function E(i) {
-  const { fieldType: n, options: s } = i;
-  return !w.has(n.rhfComponent) || !n.endpoint ? !1 : !s?.length;
+import { normalizeOptionsResponse as w } from "./normalizeOptionsResponse.js";
+const E = /* @__PURE__ */ new Set(["RHFSelect", "RHFCheckableList", "RHFRadioGroup"]);
+function T(i) {
+  const { fieldType: n, options: s, endpoint: c } = i;
+  return !E.has(n.rhfComponent) || !c ? !1 : !s?.length;
 }
 function k(i) {
-  const { fields: n } = i, { networkOperation: s } = S(), [O, c] = h({}), [g, p] = h(0), a = f(/* @__PURE__ */ new Map()), d = f(/* @__PURE__ */ new Set()), u = n.map((t) => t.id).join(",");
-  return m(() => {
+  const { fields: n } = i, { networkOperation: s } = S(), [c, a] = f({}), [g, p] = f(0), d = m(/* @__PURE__ */ new Map()), u = m(/* @__PURE__ */ new Set()), h = n.map((t) => t.id).join(",");
+  return O(() => {
     const t = n.filter(
-      (e) => E(e) && !d.current.has(e.id)
+      (e) => T(e) && !u.current.has(e.id)
     );
     if (t.length === 0)
       return;
-    t.forEach((e) => d.current.add(e.id)), p((e) => e + t.length), t.forEach((e) => {
+    t.forEach((e) => u.current.add(e.id)), p((e) => e + t.length), t.forEach((e) => {
       const l = new AbortController();
-      a.current.set(e.id, l);
-      const F = { ...e.fieldType.params ?? {} };
+      d.current.set(e.id, l);
+      const F = { ...e.endpointParams ?? {} };
       s({
         method: "GET",
-        endPoint: e.fieldType.endpoint,
+        endPoint: e.endpoint,
         parms: F,
         timeout: 3e4,
         isRemote: !0,
         responseToCamelCase: !0,
         signal: l.signal
       }).then((r) => {
-        const C = T(r);
-        c((R) => ({ ...R, [e.id]: C }));
+        const C = w(r);
+        a((R) => ({ ...R, [e.id]: C }));
       }).catch(() => {
-        c((r) => ({ ...r, [e.id]: [] }));
+        a((r) => ({ ...r, [e.id]: [] }));
       }).finally(() => {
-        p((r) => Math.max(0, r - 1)), a.current.delete(e.id);
+        p((r) => Math.max(0, r - 1)), d.current.delete(e.id);
       });
     });
-    const o = a.current;
+    const o = d.current;
     return () => {
       t.forEach((e) => {
         o.get(e.id)?.abort(), o.delete(e.id);
       });
     };
-  }, [u, n, s]), m(() => {
-    d.current.clear(), c({});
-  }, [u]), {
+  }, [h, n, s]), O(() => {
+    u.current.clear(), a({});
+  }, [h]), {
     fields: n.map((t) => {
-      const o = O[t.id];
+      const o = c[t.id];
       return o === void 0 ? t : { ...t, options: o };
     }),
     isLoadingOptions: g > 0

package/components/DynamicForm/subcomponents/DynamicFormContent/DynamicFormContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicFormContent.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/subcomponents/DynamicFormContent/DynamicFormContent.tsx"],"names":[],"mappings":"AAQA,OAAO,EACL,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAOrB,eAAO,MAAM,kBAAkB,oHAyD7B,CAAC"}
+{"version":3,"file":"DynamicFormContent.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/subcomponents/DynamicFormContent/DynamicFormContent.tsx"],"names":[],"mappings":"AASA,OAAO,EACL,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAOrB,eAAO,MAAM,kBAAkB,oHAkE7B,CAAC"}

package/components/DynamicForm/subcomponents/DynamicFormContent/DynamicFormContent.js

@@ -1,48 +1,54 @@
-import { jsxs as y, jsx as o } from "@emotion/react/jsx-runtime";
-import { forwardRef as D } from "react";
+import { jsxs as N, jsx as o } from "@emotion/react/jsx-runtime";
+import { forwardRef as A } from "react";
 import n from "clsx";
-import { TEST_PROP_ID as S } from "../../../../test/constants_no_mock.js";
-import { ActionsContainer as N } from "../../../CommonActions/components/ActionsContainer/ActionsContainer.js";
-import { ActionFormIntro as h } from "../../../CommonActions/components/ActionFormIntro/ActionFormIntro.js";
-import { useDynamicFormConditionals as A } from "../../hooks/useDynamicFormConditionals/useDynamicFormConditionals.js";
-import { DYNAMIC_FORM_CLASSES as m } from "../../constants.js";
-import { DynamicFormContentRootStyled as I, DynamicFormFieldWrapperStyled as O } from "../../slots/DynamicFormSlots.js";
-import { useFieldsWithFetchedOptions as R } from "../../hooks/useFieldsWithFetchedOptions/useFieldsWithFetchedOptions.js";
-import { resolveFieldComponent as W } from "../../helpers/resolveFieldComponent/resolveFieldComponent.js";
-const _ = D((s, p) => {
+import { useModuleDictionary as R, useEnvironment as v } from "@m4l/core";
+import { TEST_PROP_ID as E } from "../../../../test/constants_no_mock.js";
+import { ActionsContainer as I } from "../../../CommonActions/components/ActionsContainer/ActionsContainer.js";
+import { ActionFormIntro as O } from "../../../CommonActions/components/ActionFormIntro/ActionFormIntro.js";
+import { useDynamicFormConditionals as W } from "../../hooks/useDynamicFormConditionals/useDynamicFormConditionals.js";
+import { DYNAMIC_FORM_CLASSES as s } from "../../constants.js";
+import { DynamicFormContentRootStyled as x, DynamicFormFieldWrapperStyled as P } from "../../slots/DynamicFormSlots.js";
+import { useFieldsWithFetchedOptions as z } from "../../hooks/useFieldsWithFetchedOptions/useFieldsWithFetchedOptions.js";
+import { resolveFieldComponent as M } from "../../helpers/resolveFieldComponent/resolveFieldComponent.js";
+const T = A((m, a) => {
   const {
-    data: a,
-    ownerState: c,
-    currentSize: r,
+    data: c,
+    ownerState: p,
+    currentSize: t,
     fieldWrapperClassName: l,
     dataTestId: d,
     coupled: f = !1,
     actionFormIntroProps: F,
-    renderActions: t
-  } = s, { visibleFields: C } = A(a), { fields: u } = R({ fields: C });
-  return /* @__PURE__ */ y(
-    I,
+    renderActions: e
+  } = m, { getLabel: u } = R(), { host_static_assets: h, environment_assets: C, host_api_remote: _ } = v(), y = `${h}/${C}`, { visibleFields: D } = W(c), { fields: S } = z({ fields: D });
+  return /* @__PURE__ */ N(
+    x,
     {
-      ref: p,
-      className: n(m.contentRoot),
-      ...process.env.NODE_ENV !== "production" ? { [S]: d } : {},
+      ref: a,
+      className: n(s.contentRoot),
+      ...process.env.NODE_ENV !== "production" ? { [E]: d } : {},
       children: [
-        u.map((e) => {
-          const i = W(e, { size: r });
+        S.map((r) => {
+          const i = M(r, {
+            size: t,
+            getLabel: u,
+            assetBasePath: y,
+            hostApiRemote: _
+          });
           return i ? /* @__PURE__ */ o(
-            O,
+            P,
             {
-              ownerState: c,
-              className: n(l, m.fieldWrapper),
+              ownerState: p,
+              className: n(l, s.fieldWrapper),
               children: i
             },
-            e.id
+            r.id
           ) : null;
         }),
-        !f && /* @__PURE__ */ o(N, { children: t ? t() : /* @__PURE__ */ o(
-          h,
+        !f && /* @__PURE__ */ o(I, { children: e ? e() : /* @__PURE__ */ o(
+          O,
           {
-            size: r,
+            size: t,
             ...F
           }
         ) })
@@ -50,7 +56,7 @@ const _ = D((s, p) => {
     }
   );
 });
-_.displayName = "DynamicFormContent";
+T.displayName = "DynamicFormContent";
 export {
-  _ as DynamicFormContent
+  T as DynamicFormContent
 };