npm - datastake-daf - Versions diffs - 0.6.831 → 0.6.833 - Mend

datastake-daf 0.6.831 → 0.6.833

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

package/dist/components/index.js CHANGED Viewed

@@ -30797,7 +30797,6 @@ function Repeatable({
   });
 }
-/* eslint-disable no-eval */
 const isRiskComment = inputData => {
   if (inputData) {
     if (inputData.name === 'assessment') {
@@ -30810,7 +30809,10 @@ const isRiskComment = inputData => {
 };
 // options, k, setValues, values, excludedKeys, i, formTitles, getData, MainForm, plainForms, setAddress, onValuesChange, data, allData, changeLinking, changeInputMeta, t, highlightMandatory
-function renderNestedInputs$1(options, k, ...args) {
+function renderNestedInputs$1(options, k) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
+  }
   if (options[k].repeatable) {
     return renderRepeatable$1(options, k, ...args);
   } else {
@@ -30838,10 +30840,11 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
     children: [getFormTitles$1(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines$1(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: formId,
-        children: (fields, {
-          add,
-          remove
-        }) => {
+        children: (fields, _ref) => {
+          let {
+            add,
+            remove
+          } = _ref;
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -30891,14 +30894,10 @@ function renderRepeatable$1(options, k, setValues, values, excludedKeys, i, form
             const _val = {
               [formId]: formData.map((d, j) => i === j ? val : d)
             };
-            onValuesChange(_val, {
-              ...values,
-              ..._val
-            });
-            setValues({
-              ...values,
+            onValuesChange(_val, _objectSpread2(_objectSpread2({}, values), _val));
+            setValues(_objectSpread2(_objectSpread2({}, values), {}, {
               [formId]: formData.map((d, j) => i === j ? val : d)
-            });
+            }));
           };
           return /*#__PURE__*/jsxRuntime.jsx(Repeatable, {
             form: form,
@@ -30954,154 +30953,156 @@ const getGroupContent = (form, values, i, formId, excludedKeys, getData, setValu
     highlightMandatory
   });
 };
-const GroupContent = ({
-  form,
-  values = {},
-  i,
-  formId,
-  excludedKeys,
-  getData,
-  setValues,
-  MainForm,
-  options,
-  plainForms,
-  setAddress,
-  onValuesChange,
-  allData,
-  changeInputMeta,
-  highlightMandatory
-}) => {
+const GroupContent = _ref2 => {
+  var _form$meta;
+  let {
+    form,
+    values = {},
+    i,
+    formId,
+    excludedKeys,
+    getData,
+    setValues,
+    MainForm,
+    options,
+    plainForms,
+    setAddress,
+    onValuesChange,
+    allData,
+    changeInputMeta,
+    highlightMandatory
+  } = _ref2;
   const {
     user,
     t
   } = useEditContext();
   const label = getInputLabel$1(form, values);
-  const notPartOfTheForm = form?.type === 'ajaxSubGroup' ? true : !!form?.meta?.isSubGroup;
+  const notPartOfTheForm = (form === null || form === void 0 ? void 0 : form.type) === 'ajaxSubGroup' ? true : !!(form !== null && form !== void 0 && (_form$meta = form.meta) !== null && _form$meta !== void 0 && _form$meta.isSubGroup);
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   const formValues = values[form.dataId];
-  const renderInputs = () => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [form?.meta?.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
-      config: form.meta.groupInfo,
-      user: user,
-      t: t
-    }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
-      const isAjaxSubGroup = form?.type === "ajaxSubGroup";
-      const input = form.inputs[inp];
-      const inputId = input.dataId || inp;
-      const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
-      const value = inputValues[inputId];
-      const commentValue = inputValues[`${inputId}Comment`];
-      const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
-      const subtitles = form.subtitles || null;
-      const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? (values[formId] || {})?.meta?.inputs?.[inputId] || {} : ((values?.meta?.inputs || {})[formId] || {})[inputId] || {} : (values?.meta?.inputs || {})[inputId] || {};
-      inputData.repeatIndex = undefined;
-      inputData.inputName = inputId;
-      inputData.repeatValues = inputValues;
-      if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
-        inputData.groupInputs = inputData.groupInputs.map(gpI => {
-          gpI.data.inputName = gpI.data.name;
-          gpI.data.repeatIndex = undefined;
-          gpI.data.name = formId;
-          return gpI;
-        });
-      }
-      const isRisk = isRiskComment(inputData);
-      const isHighlighted = highlightMandatory && input?.meta?.mandatory && inputIsEmpty(input, inputValues, inputMeta);
-      const btnOnClick = () => {
-        if (typeof inputData.commentValue === 'string') {
-          onValuesChange({}, {
-            ...values,
-            [`${inputData.inputName}`]: null
+  const renderInputs = () => {
+    var _form$meta2;
+    return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [form !== null && form !== void 0 && (_form$meta2 = form.meta) !== null && _form$meta2 !== void 0 && _form$meta2.groupInfo ? /*#__PURE__*/jsxRuntime.jsx(GroupInfos, {
+        config: form.meta.groupInfo,
+        user: user,
+        t: t
+      }) : null, Object.keys(form.inputs || {}).filter(i => !excludedKeys.includes(i)).map((inp, ii) => {
+        var _ref3, _values$meta, _values$meta2, _input$meta, _inputData$rules, _input$meta2;
+        const isAjaxSubGroup = (form === null || form === void 0 ? void 0 : form.type) === "ajaxSubGroup";
+        const input = form.inputs[inp];
+        const inputId = input.dataId || inp;
+        const inputValues = notPartOfTheForm ? Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {} : values;
+        const value = inputValues[inputId];
+        const commentValue = inputValues["".concat(inputId, "Comment")];
+        const inputData = getData(formId, input, value, commentValue, "".concat(formId, ".").concat(inputId), "".concat(formId, ".").concat(inputId));
+        const subtitles = form.subtitles || null;
+        const inputMeta = notPartOfTheForm ? isAjaxSubGroup ? ((_ref3 = values[formId] || {}) === null || _ref3 === void 0 || (_ref3 = _ref3.meta) === null || _ref3 === void 0 || (_ref3 = _ref3.inputs) === null || _ref3 === void 0 ? void 0 : _ref3[inputId]) || {} : (((values === null || values === void 0 || (_values$meta = values.meta) === null || _values$meta === void 0 ? void 0 : _values$meta.inputs) || {})[formId] || {})[inputId] || {} : ((values === null || values === void 0 || (_values$meta2 = values.meta) === null || _values$meta2 === void 0 ? void 0 : _values$meta2.inputs) || {})[inputId] || {};
+        inputData.repeatIndex = undefined;
+        inputData.inputName = inputId;
+        inputData.repeatValues = inputValues;
+        if (inputData.groupInputs && Array.isArray(inputData.groupInputs)) {
+          inputData.groupInputs = inputData.groupInputs.map(gpI => {
+            gpI.data.inputName = gpI.data.name;
+            gpI.data.repeatIndex = undefined;
+            gpI.data.name = formId;
+            return gpI;
           });
         }
-        const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-        inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
-        if (Array.isArray(values[formId])) {
-          values[formId] = inputValues;
-        } else {
-          values[formId] = inputValues;
-        }
-        setValues({
-          ...values
-        });
-      };
-      const btnOnClick2 = () => {
-        if (typeof inputData.commentValue !== 'string') {
+        const isRisk = isRiskComment(inputData);
+        const isHighlighted = highlightMandatory && (input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.mandatory) && inputIsEmpty(input, inputValues, inputMeta);
+        const btnOnClick = () => {
+          if (typeof inputData.commentValue === 'string') {
+            onValuesChange({}, _objectSpread2(_objectSpread2({}, values), {}, {
+              ["".concat(inputData.inputName)]: null
+            }));
+          }
           const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-          inputValues[`${inputData.inputName}Comment`] = typeof inputData.commentValue !== 'string' ? '' : null;
+          inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
           if (Array.isArray(values[formId])) {
             values[formId] = inputValues;
           } else {
             values[formId] = inputValues;
           }
-          setValues({
-            ...values
-          });
-        }
-      };
-      const rules = inputData?.rules?.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : (input?.meta?.rules || []).filter(rule => {
-        if (rule.metaIf && typeof rule.metaIf === 'string') {
-          const [name, cond, value] = rule.metaIf.split(' ');
-          const val = name.includes('./') ? values?.meta?.inputs?.[formId]?.[name.split('./')[1]] : values?.meta?.inputs?.[name.split('./')[1]];
-          if (cond === 'is') {
-            return !!val?.[value];
+          setValues(_objectSpread2({}, values));
+        };
+        const btnOnClick2 = () => {
+          if (typeof inputData.commentValue !== 'string') {
+            const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
+            inputValues["".concat(inputData.inputName, "Comment")] = typeof inputData.commentValue !== 'string' ? '' : null;
+            if (Array.isArray(values[formId])) {
+              values[formId] = inputValues;
+            } else {
+              values[formId] = inputValues;
+            }
+            setValues(_objectSpread2({}, values));
           }
-        }
-        return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
-      });
-      const requiredRule = rules.find(r => r.required);
-      if (requiredRule && input.type === 'text') {
-        rules.push({
-          whitespace: true,
-          message: requiredRule.message || ''
+        };
+        const rules = inputData !== null && inputData !== void 0 && (_inputData$rules = inputData.rules) !== null && _inputData$rules !== void 0 && _inputData$rules.length ? inputData.rules.filter(rule => !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max')) : ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.rules) || []).filter(rule => {
+          if (rule.metaIf && typeof rule.metaIf === 'string') {
+            var _values$meta3, _values$meta4;
+            const [name, cond, value] = rule.metaIf.split(' ');
+            const val = name.includes('./') ? values === null || values === void 0 || (_values$meta3 = values.meta) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3.inputs) === null || _values$meta3 === void 0 || (_values$meta3 = _values$meta3[formId]) === null || _values$meta3 === void 0 ? void 0 : _values$meta3[name.split('./')[1]] : values === null || values === void 0 || (_values$meta4 = values.meta) === null || _values$meta4 === void 0 || (_values$meta4 = _values$meta4.inputs) === null || _values$meta4 === void 0 ? void 0 : _values$meta4[name.split('./')[1]];
+            if (cond === 'is') {
+              return !!(val !== null && val !== void 0 && val[value]);
+            }
+          }
+          return !Object.keys(rule || {}).includes('accept') && !Object.keys(rule || {}).includes('max');
         });
-      }
-      return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
-        children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-          style: {
-            position: 'relative'
-          },
-          children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
-            input: input,
-            inputTypeComponent: inputTypeComponent$1,
-            inputData: inputData,
-            MainForm: MainForm,
-            options: options,
-            setValues: setValues,
-            formId: formId,
-            inputId: inputId,
-            inputOnBlur: inputOnBlur,
-            values: values,
-            getInputLabel: getInputLabel$1,
-            plainForms: plainForms,
-            setAddress: setAddress,
-            btnOnClick: btnOnClick,
-            btnOnClick2: btnOnClick2,
-            locationName: (allData || {}).locationName,
-            subGroupTitle: (allData || {}).subGroupTitle
-          }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
-            values,
-            formId,
-            setValues,
-            MainForm,
-            options,
-            plainForms,
-            setAddress,
-            inputData,
-            inputId,
-            input,
-            rules,
-            inputMeta,
-            changeInputMeta,
-            notPartOfTheForm,
-            isAjaxSubGroup,
-            isHighlighted
-          })]
-        }, ii)
-      }, `${i}${ii}`) : null;
-    })]
-  });
-  const isNa = formValues?.valuation === 'na';
+        const requiredRule = rules.find(r => r.required);
+        if (requiredRule && input.type === 'text') {
+          rules.push({
+            whitespace: true,
+            message: requiredRule.message || ''
+          });
+        }
+        return showHideInput$1(input, values, undefined, inputValues, setValues) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+          children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+            style: {
+              position: 'relative'
+            },
+            children: [getSubtitles$1(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines$1(input.type, i, input, values) : isRisk ? /*#__PURE__*/jsxRuntime.jsx(RiskGroup, {
+              input: input,
+              inputTypeComponent: inputTypeComponent$1,
+              inputData: inputData,
+              MainForm: MainForm,
+              options: options,
+              setValues: setValues,
+              formId: formId,
+              inputId: inputId,
+              inputOnBlur: inputOnBlur,
+              values: values,
+              getInputLabel: getInputLabel$1,
+              plainForms: plainForms,
+              setAddress: setAddress,
+              btnOnClick: btnOnClick,
+              btnOnClick2: btnOnClick2,
+              locationName: (allData || {}).locationName,
+              subGroupTitle: (allData || {}).subGroupTitle
+            }) : /*#__PURE__*/jsxRuntime.jsx(GroupContentFormItem, {
+              values,
+              formId,
+              setValues,
+              MainForm,
+              options,
+              plainForms,
+              setAddress,
+              inputData,
+              inputId,
+              input,
+              rules,
+              inputMeta,
+              changeInputMeta,
+              notPartOfTheForm,
+              isAjaxSubGroup,
+              isHighlighted
+            })]
+          }, ii)
+        }, "".concat(i).concat(ii)) : null;
+      })]
+    });
+  };
+  const isNa = (formValues === null || formValues === void 0 ? void 0 : formValues.valuation) === 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? options.isRisk && options.dontShowTitle ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "risk-header",
@@ -31109,44 +31110,46 @@ const GroupContent = ({
         children: label
       })
     }) : /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
+      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: `repeatable ${hasLabel ? "mb-4" : ""}`,
+      className: "repeatable ".concat(hasLabel ? "mb-4" : ""),
       children: [form.titleLabel ? /*#__PURE__*/jsxRuntime.jsx("label", {
         children: getInputProp(form.titleLabel, values)
-      }) : null, formValues?.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
+      }) : null, formValues !== null && formValues !== void 0 && formValues.noPlanningRequired ? /*#__PURE__*/jsxRuntime.jsx(GroupInfoHOC, {
         t: t,
         isNa: isNa,
         isSuccess: !isNa
         // TODO: translate
         ,
         config: {
-          title: t(`No ${formValues?.stage || 'planning'} required`)
+          title: t("No ".concat((formValues === null || formValues === void 0 ? void 0 : formValues.stage) || 'planning', " required"))
         },
         children: renderInputs()
       }) : renderInputs()]
     })]
   });
 };
-const GroupContentFormItem = ({
-  values,
-  formId,
-  setValues,
-  MainForm,
-  options,
-  plainForms,
-  setAddress,
-  inputData,
-  inputId,
-  input,
-  rules,
-  inputMeta,
-  changeInputMeta,
-  notPartOfTheForm = true,
-  isAjaxSubGroup,
-  isHighlighted
-}) => {
+const GroupContentFormItem = _ref4 => {
+  var _rules$find, _inputMeta$reviews, _input$meta3, _values$formId, _input$meta4, _input$meta7, _input$meta8, _input$meta9, _values$meta10, _values$meta11, _values$parent, _input$meta10, _input$meta11, _inputData$value, _input$meta12, _input$meta13, _inputMeta$comment, _lastReview$comment, _lastReview$reviewer, _lastReview$reviewer2;
+  let {
+    values,
+    formId,
+    setValues,
+    MainForm,
+    options,
+    plainForms,
+    setAddress,
+    inputData,
+    inputId,
+    input,
+    rules,
+    inputMeta,
+    changeInputMeta,
+    notPartOfTheForm = true,
+    isAjaxSubGroup,
+    isHighlighted
+  } = _ref4;
   const {
     t,
     user,
@@ -31160,10 +31163,10 @@ const GroupContentFormItem = ({
     staticWidth,
     fullWidth
   } = useEditContext();
-  const [isShown, setIsShown] = React.useState(!!inputMeta?.comment);
-  let maxRule = rules.find(rule => rule.max)?.max;
+  const [isShown, setIsShown] = React.useState(!!(inputMeta !== null && inputMeta !== void 0 && inputMeta.comment));
+  let maxRule = (_rules$find = rules.find(rule => rule.max)) === null || _rules$find === void 0 ? void 0 : _rules$find.max;
   const requiredRule = rules.find(r => r.required);
-  const lastReview = (inputMeta?.reviews || [])[(inputMeta?.reviews?.length || 0) - 1];
+  const lastReview = ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || [])[((inputMeta === null || inputMeta === void 0 || (_inputMeta$reviews = inputMeta.reviews) === null || _inputMeta$reviews === void 0 ? void 0 : _inputMeta$reviews.length) || 0) - 1];
   if (!maxRule && input.type === 'textarea') {
     maxRule = MAX_TEXT_AREA_LENGTH;
   }
@@ -31182,38 +31185,35 @@ const GroupContentFormItem = ({
     }
     setIsShown(true);
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      var _values$meta5;
+      const _defaultMeta = ((values === null || values === void 0 || (_values$meta5 = values.meta) === null || _values$meta5 === void 0 ? void 0 : _values$meta5.inputs) || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta, _defaultData$meta2;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                inputs: {
-                  ...(_defaultData?.meta?.inputs || {}),
-                  [inputId]: {
-                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta = _defaultData.meta) === null || _defaultData$meta === void 0 ? void 0 : _defaultData$meta.inputs) || {}), {}, {
+                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta2 = _defaultData.meta) === null || _defaultData$meta2 === void 0 ? void 0 : _defaultData$meta2.inputs) || {})[inputId] || {}), {}, {
                     comment: ''
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
               comment: ''
-            }
-          }
+            })
+          })
         });
       }
     } else {
@@ -31230,62 +31230,58 @@ const GroupContentFormItem = ({
     if (!isReview) {
       return;
     }
-    const reviewSuccess = lastReview?.reviewSuccess;
+    const reviewSuccess = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      var _values$meta6;
+      const _defaultMeta = ((values === null || values === void 0 || (_values$meta6 = values.meta) === null || _values$meta6 === void 0 ? void 0 : _values$meta6.inputs) || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta3, _defaultData$meta4, _defaultData$meta5, _defaultData$meta6;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                inputs: {
-                  ...(_defaultData?.meta?.inputs || {}),
-                  [inputId]: {
-                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
-                    reviews: reviewSuccess ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
+                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta3 = _defaultData.meta) === null || _defaultData$meta3 === void 0 ? void 0 : _defaultData$meta3.inputs) || {}), {}, {
+                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta4 = _defaultData.meta) === null || _defaultData$meta4 === void 0 ? void 0 : _defaultData$meta4.inputs) || {})[inputId] || {}), {}, {
+                    reviews: reviewSuccess ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta5 = _defaultData.meta) === null || _defaultData$meta5 === void 0 ? void 0 : _defaultData$meta5.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta6 = _defaultData.meta) === null || _defaultData$meta6 === void 0 ? void 0 : _defaultData$meta6.inputs) || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewSuccess: true
                     }]
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
               reviews: reviewSuccess ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewSuccess: true
               }]
-            }
-          }
+            })
+          })
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: {
-          ...inputMeta,
+        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
           reviews: reviewSuccess ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewSuccess: true
           }]
-        }
+        })
       });
     }
   };
@@ -31293,118 +31289,111 @@ const GroupContentFormItem = ({
     if (!isReview) {
       return;
     }
-    const reviewError = lastReview?.reviewError;
+    const reviewError = lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError;
     if (notPartOfTheForm || isAjaxSubGroup) {
-      const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+      var _values$meta7;
+      const _defaultMeta = ((values === null || values === void 0 || (_values$meta7 = values.meta) === null || _values$meta7 === void 0 ? void 0 : _values$meta7.inputs) || {})[formId] || {};
       const _defaultData = MainForm.getFieldValue(formId);
       if (isAjaxSubGroup) {
+        var _defaultData$meta7, _defaultData$meta8, _defaultData$meta9, _defaultData$meta10;
         changeInputMeta({
           key: formId,
           type: input.type,
           otherValues: {
-            [formId]: {
-              ..._defaultData,
+            [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
               meta: {
-                inputs: {
-                  ...(_defaultData?.meta?.inputs || {}),
-                  [inputId]: {
-                    ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
-                    reviews: reviewError ? (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []), {
+                inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta7 = _defaultData.meta) === null || _defaultData$meta7 === void 0 ? void 0 : _defaultData$meta7.inputs) || {}), {}, {
+                  [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta8 = _defaultData.meta) === null || _defaultData$meta8 === void 0 ? void 0 : _defaultData$meta8.inputs) || {})[inputId] || {}), {}, {
+                    reviews: reviewError ? ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta9 = _defaultData.meta) === null || _defaultData$meta9 === void 0 ? void 0 : _defaultData$meta9.inputs) || {})[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta10 = _defaultData.meta) === null || _defaultData$meta10 === void 0 ? void 0 : _defaultData$meta10.inputs) || {})[inputId] || {}).reviews || []), {
                       reviewer: user,
                       createdAt: new Date().toISOString(),
                       reviewError: true,
                       comment: ''
                     }]
-                  }
-                }
+                  })
+                })
               }
-            }
+            })
           }
         });
       } else {
         changeInputMeta({
           key: formId,
           type: input.type,
-          value: {
-            ..._defaultMeta,
-            [inputId]: {
-              ...(_defaultMeta[inputId] || {}),
+          value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+            [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
               reviews: reviewError ? ((_defaultMeta[inputId] || {}).reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...((_defaultMeta[inputId] || {}).reviews || []), {
                 reviewer: user,
                 createdAt: new Date().toISOString(),
                 reviewError: true,
                 comment: ''
               }]
-            }
-          }
+            })
+          })
         });
       }
     } else {
       changeInputMeta({
         key: inputId,
         type: input.type,
-        value: {
-          ...inputMeta,
+        value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
           reviews: reviewError ? (inputMeta.reviews || []).filter(v => v.createdAt !== lastReview.createdAt) : [...(inputMeta.reviews || []), {
             reviewer: user,
             createdAt: new Date().toISOString(),
             reviewError: true,
             comment: ''
           }]
-        }
+        })
       });
     }
   };
-  const requiredComment = inputMeta?.notApplicable && input?.meta?.requiredCommentOnNotApplicable && values?.[formId]?.valuation !== 'na';
+  const requiredComment = (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.notApplicable) && (input === null || input === void 0 || (_input$meta3 = input.meta) === null || _input$meta3 === void 0 ? void 0 : _input$meta3.requiredCommentOnNotApplicable) && (values === null || values === void 0 || (_values$formId = values[formId]) === null || _values$formId === void 0 ? void 0 : _values$formId.valuation) !== 'na';
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex input-cont",
-      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
-        ...(['total100', 'group'].includes(input.type) ? {} : {
-          name: notPartOfTheForm ? [formId, inputId] : inputId,
-          fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
-          initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
-        }),
-        ...(['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
-          valuePropName: "fileList",
-          getValueFromEvent: e => {
-            if (Array.isArray(e)) {
-              return e;
-            }
-            return e && e.fileList && e.fileList.map(f => {
-              if (f.response) {
-                return f.response;
-              }
-              return f;
-            });
+      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+        required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
+      }, ['total100', 'group'].includes(input.type) ? {} : {
+        name: notPartOfTheForm ? [formId, inputId] : inputId,
+        fieldKey: notPartOfTheForm ? [formId, inputId] : inputId,
+        initialValue: notPartOfTheForm ? (values[formId] || {})[inputId] : values[inputId]
+      }), ['upload', 'imageUpload', 'videoUpload'].includes(input.type) ? {
+        valuePropName: "fileList",
+        getValueFromEvent: e => {
+          if (Array.isArray(e)) {
+            return e;
           }
-        } : {}),
-        ...(inputOnBlur.includes(input.type) ? {
-          trigger: "onBlur"
-        } : {}),
+          return e && e.fileList && e.fileList.map(f => {
+            if (f.response) {
+              return f.response;
+            }
+            return f;
+          });
+        }
+      } : {}), inputOnBlur.includes(input.type) ? {
+        trigger: "onBlur"
+      } : {}), {}, {
         style: input.showOnView === false ? {
           display: 'none'
-        } : {},
-        ...(['switch'].includes(input.type) ? {
-          labelCol: {
-            span: 20
-          },
-          style: {
-            ...(input.showOnView === false ? {
-              display: 'none'
-            } : {}),
-            flexDirection: 'row',
-            justifyContent: 'space-between'
-          }
-        } : {}),
+        } : {}
+      }, ['switch'].includes(input.type) ? {
+        labelCol: {
+          span: 20
+        },
+        style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
+          display: 'none'
+        } : {}), {}, {
+          flexDirection: 'row',
+          justifyContent: 'space-between'
+        })
+      } : {}), {}, {
         label: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: input?.meta?.code && "mr-10",
+          className: (input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.code) && "mr-10",
           children: getInputLabel$1(input, values)
         }) : null,
         rules: rules,
-        className: formatClassname([input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1 `, noActionsInputs.includes(input.type) && 'no-actions-input']),
-        "data-id": `${formId}.${inputId}`,
+        className: formatClassname([input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1 "), noActionsInputs.includes(input.type) && 'no-actions-input']),
+        "data-id": "".concat(formId, ".").concat(inputId),
         extra: /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
           children: !noActionsInputs.includes(input.type) ? /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: formatClassname(["ml-4 input-actions"]),
@@ -31414,7 +31403,7 @@ const GroupContentFormItem = ({
                 title: t('Add review note'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                    className: formatClassname(["review-btn review-error-btn", lastReview?.reviewError && 'primary']),
+                    className: formatClassname(["review-btn review-error-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewError) && 'primary']),
                     type: "link",
                     onClick: onClickReviewError,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -31430,7 +31419,7 @@ const GroupContentFormItem = ({
                   children: /*#__PURE__*/jsxRuntime.jsx("div", {
                     type: "link",
                     onClick: onClickReviewSuccess,
-                    className: formatClassname(["review-btn review-success-btn", lastReview?.reviewSuccess && 'primary']),
+                    className: formatClassname(["review-btn review-success-btn", (lastReview === null || lastReview === void 0 ? void 0 : lastReview.reviewSuccess) && 'primary']),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "CheckSquare",
                       width: 16,
@@ -31447,65 +31436,59 @@ const GroupContentFormItem = ({
                     className: formatClassname(["default p-0", inputMeta.notApplicable && 'primary']),
                     type: "link",
                     onClick: () => {
+                      var _input$meta5, _input$meta6;
                       const value = getDefaultInputValue(input);
-                      const commentMeta = input?.meta?.requiredCommentOnNotApplicable ? {
+                      const commentMeta = input !== null && input !== void 0 && (_input$meta5 = input.meta) !== null && _input$meta5 !== void 0 && _input$meta5.requiredCommentOnNotApplicable ? {
                         comment: ''
                       } : {};
-                      if (input?.meta?.requiredCommentOnNotApplicable) {
+                      if (input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.requiredCommentOnNotApplicable) {
                         setIsShown(true);
                       }
                       if (notPartOfTheForm || isAjaxSubGroup) {
+                        var _values$meta8;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta8 = values.meta) === null || _values$meta8 === void 0 ? void 0 : _values$meta8.inputs) || {})[formId] || {};
                         if (isAjaxSubGroup) {
+                          var _defaultData$meta11;
                           changeInputMeta({
                             key: formId,
                             type: input.type,
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value,
                                 meta: {
-                                  inputs: {
-                                    ...(_defaultData?.meta?.inputs || {}),
-                                    [inputId]: inputMeta.notApplicable ? {
+                                  inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta11 = _defaultData.meta) === null || _defaultData$meta11 === void 0 ? void 0 : _defaultData$meta11.inputs) || {}), {}, {
+                                    [inputId]: inputMeta.notApplicable ? _objectSpread2({
                                       notApplicable: false,
-                                      notAvailable: false,
-                                      ...commentMeta
-                                    } : {
+                                      notAvailable: false
+                                    }, commentMeta) : _objectSpread2({
                                       notApplicable: true,
-                                      notAvailable: false,
-                                      ...commentMeta
-                                    }
-                                  }
+                                      notAvailable: false
+                                    }, commentMeta)
+                                  })
                                 }
-                              }
+                              })
                             }
                           });
                         } else {
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notApplicable ? {
-                              ..._defaultMeta,
-                              [inputId]: {
+                            value: inputMeta.notApplicable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                              [inputId]: _objectSpread2({
                                 notApplicable: false,
-                                notAvailable: false,
-                                ...commentMeta
-                              }
-                            } : {
-                              ..._defaultMeta,
-                              [inputId]: {
+                                notAvailable: false
+                              }, commentMeta)
+                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                              [inputId]: _objectSpread2({
                                 notApplicable: true,
-                                notAvailable: false,
-                                ...commentMeta
-                              }
-                            },
+                                notAvailable: false
+                              }, commentMeta)
+                            }),
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value
-                              }
+                              })
                             }
                           });
                         }
@@ -31526,7 +31509,7 @@ const GroupContentFormItem = ({
                         });
                       }
                     },
-                    disabled: !input.meta?.notApplicable,
+                    disabled: !((_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.notApplicable),
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "NotApplicable",
                       width: 16,
@@ -31540,24 +31523,24 @@ const GroupContentFormItem = ({
                   children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                     className: formatClassname(["default p-0", inputMeta.notAvailable && 'primary']),
                     type: "link",
-                    disabled: !input.meta?.notAvailable,
+                    disabled: !((_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.notAvailable),
                     onClick: () => {
                       const value = getDefaultInputValue(input);
                       if (notPartOfTheForm || isAjaxSubGroup) {
+                        var _values$meta9;
                         const _defaultData = MainForm.getFieldValue(formId);
-                        const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                        const _defaultMeta = ((values === null || values === void 0 || (_values$meta9 = values.meta) === null || _values$meta9 === void 0 ? void 0 : _values$meta9.inputs) || {})[formId] || {};
                         if (isAjaxSubGroup) {
                           if (isAjaxSubGroup) {
+                            var _defaultData$meta12;
                             changeInputMeta({
                               key: formId,
                               type: input.type,
                               otherValues: {
-                                [formId]: {
-                                  ..._defaultData,
+                                [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                   [inputId]: value,
                                   meta: {
-                                    inputs: {
-                                      ...(_defaultData?.meta?.inputs || {}),
+                                    inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta12 = _defaultData.meta) === null || _defaultData$meta12 === void 0 ? void 0 : _defaultData$meta12.inputs) || {}), {}, {
                                       [inputId]: inputMeta.notAvailable ? {
                                         notApplicable: false,
                                         notAvailable: false
@@ -31565,9 +31548,9 @@ const GroupContentFormItem = ({
                                         notApplicable: false,
                                         notAvailable: true
                                       }
-                                    }
+                                    })
                                   }
-                                }
+                                })
                               }
                             });
                           }
@@ -31575,24 +31558,21 @@ const GroupContentFormItem = ({
                           changeInputMeta({
                             key: formId,
                             type: input.type,
-                            value: inputMeta.notAvailable ? {
-                              ..._defaultMeta,
+                            value: inputMeta.notAvailable ? _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: false
                               }
-                            } : {
-                              ..._defaultMeta,
+                            }) : _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
                               [inputId]: {
                                 notApplicable: false,
                                 notAvailable: true
                               }
-                            },
+                            }),
                             otherValues: {
-                              [formId]: {
-                                ..._defaultData,
+                              [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                                 [inputId]: value
-                              }
+                              })
                             }
                           });
                         }
@@ -31623,38 +31603,33 @@ const GroupContentFormItem = ({
               }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                 title: t('Add comment'),
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
                     type: "link",
-                    disabled: !input.meta?.comment,
-                    ...(!isShown ? {
-                      className: 'default p-0'
-                    } : {
-                      className: 'p-0 primary'
-                    }),
+                    disabled: !((_input$meta9 = input.meta) !== null && _input$meta9 !== void 0 && _input$meta9.comment)
+                  }, !isShown ? {
+                    className: 'default p-0'
+                  } : {
+                    className: 'p-0 primary'
+                  }), {}, {
                     onClick: onClickComment,
                     children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
                       name: "AddComment",
                       width: 16,
                       height: 16
                     })
-                  })
+                  }))
                 })
               })]
             }) : null]
           }) : null
         }),
         children: isReview ? /*#__PURE__*/jsxRuntime.jsx(BasicInput, {
-          data: {
-            ...(values[formId] || {}),
-            meta: {
-              ...(values?.meta || {}),
-              inputs: {
-                ...(values?.meta?.inputs || {}),
-                ...((values?.meta?.inputs || {})[formId] || {})
-              }
-            }
-          },
-          linkingData: values?.linking || values?.parent?.linking,
+          data: _objectSpread2(_objectSpread2({}, values[formId] || {}), {}, {
+            meta: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 ? void 0 : values.meta) || {}), {}, {
+              inputs: _objectSpread2(_objectSpread2({}, (values === null || values === void 0 || (_values$meta10 = values.meta) === null || _values$meta10 === void 0 ? void 0 : _values$meta10.inputs) || {}), ((values === null || values === void 0 || (_values$meta11 = values.meta) === null || _values$meta11 === void 0 ? void 0 : _values$meta11.inputs) || {})[formId] || {})
+            })
+          }),
+          linkingData: (values === null || values === void 0 ? void 0 : values.linking) || (values === null || values === void 0 || (_values$parent = values.parent) === null || _values$parent === void 0 ? void 0 : _values$parent.linking),
           name: input.dataId,
           config: input,
           t: t,
@@ -31666,13 +31641,12 @@ const GroupContentFormItem = ({
           getToken: getToken,
           app: app,
           valueOnlyString: true
-        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type]({
-          ...inputData,
+        }) : inputTypeComponent$1[input.type] ? inputTypeComponent$1[input.type](_objectSpread2(_objectSpread2({}, inputData), {}, {
           name: inputId,
           maxWidth,
           staticWidth,
           fullWidth
-        }, {
+        }), {
           form: MainForm,
           forms: options,
           allForms: plainForms,
@@ -31690,10 +31664,10 @@ const GroupContentFormItem = ({
           staticWidth,
           fullWidth
         }) : console.log(input)
-      }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+      })), (_input$meta10 = input.meta) !== null && _input$meta10 !== void 0 && _input$meta10.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "code",
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
-          children: input.meta?.code
+          children: (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.code
         })
       }) : null]
     }), maxRule ? ['imageUpload', 'videoUpload', 'upload'].includes(input.type) ? /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31713,16 +31687,16 @@ const GroupContentFormItem = ({
         className: "max-char-span",
         children: t('max-char', {
           chars: maxRule,
-          filled: inputData?.value?.length || 0
+          filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
         })
       })
-    }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+    }) : null, (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "input-content",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         className: "comment-textarea",
-        initialValue: inputMeta?.comment || '',
+        initialValue: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
         hidden: !isShown,
-        name: `${formId}-${inputId}-comment`,
+        name: "".concat(formId, "-").concat(inputId, "-comment"),
         required: requiredComment,
         rules: requiredComment ? [{
           required: true,
@@ -31739,38 +31713,35 @@ const GroupContentFormItem = ({
             onConfirm: () => {
               setIsShown(false);
               if (notPartOfTheForm) {
-                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                var _values$meta12;
+                const _defaultMeta = ((values === null || values === void 0 || (_values$meta12 = values.meta) === null || _values$meta12 === void 0 ? void 0 : _values$meta12.inputs) || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
+                  var _defaultData$meta13, _defaultData$meta14;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: {
-                        ..._defaultData,
+                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                         meta: {
-                          inputs: {
-                            ...(_defaultData?.meta?.inputs || {}),
-                            [inputId]: {
-                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta13 = _defaultData.meta) === null || _defaultData$meta13 === void 0 ? void 0 : _defaultData$meta13.inputs) || {}), {}, {
+                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta14 = _defaultData.meta) === null || _defaultData$meta14 === void 0 ? void 0 : _defaultData$meta14.inputs) || {})[inputId] || {}), {}, {
                               comment: null
-                            }
-                          }
+                            })
+                          })
                         }
-                      }
+                      })
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: {
-                      ..._defaultMeta,
-                      [inputId]: {
-                        ...(_defaultMeta[inputId] || {}),
+                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                         comment: null
-                      }
-                    }
+                      })
+                    })
                   });
                 }
               } else {
@@ -31785,7 +31756,7 @@ const GroupContentFormItem = ({
             },
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
               type: "link",
-              disabled: !input.meta?.comment,
+              disabled: !((_input$meta13 = input.meta) !== null && _input$meta13 !== void 0 && _input$meta13.comment),
               className: "p-0",
               children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                 width: 16,
@@ -31797,44 +31768,41 @@ const GroupContentFormItem = ({
         children: inputTypeComponent$1.comment(inputData, {
           form: MainForm,
           forms: options,
-          value: inputMeta?.comment || '',
+          value: (inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.comment) || '',
           maxWidth,
           staticWidth,
           fullWidth,
           onChange: val => {
             if (notPartOfTheForm) {
-              const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+              var _values$meta13;
+              const _defaultMeta = ((values === null || values === void 0 || (_values$meta13 = values.meta) === null || _values$meta13 === void 0 ? void 0 : _values$meta13.inputs) || {})[formId] || {};
               const _defaultData = MainForm.getFieldValue(formId);
               if (isAjaxSubGroup) {
+                var _defaultData$meta15, _defaultData$meta16;
                 changeInputMeta({
                   key: formId,
                   type: input.type,
                   otherValues: {
-                    [formId]: {
-                      ..._defaultData,
+                    [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                       meta: {
-                        inputs: {
-                          ...(_defaultData?.meta?.inputs || {}),
-                          [inputId]: {
-                            ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
+                        inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta15 = _defaultData.meta) === null || _defaultData$meta15 === void 0 ? void 0 : _defaultData$meta15.inputs) || {}), {}, {
+                          [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta16 = _defaultData.meta) === null || _defaultData$meta16 === void 0 ? void 0 : _defaultData$meta16.inputs) || {})[inputId] || {}), {}, {
                             comment: val
-                          }
-                        }
+                          })
+                        })
                       }
-                    }
+                    })
                   }
                 });
               } else {
                 changeInputMeta({
                   key: formId,
                   type: input.type,
-                  value: {
-                    ..._defaultMeta,
-                    [inputId]: {
-                      ...(_defaultMeta[inputId] || {}),
+                  value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                    [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                       comment: val
-                    }
-                  }
+                    })
+                  })
                 });
               }
             } else {
@@ -31855,16 +31823,16 @@ const GroupContentFormItem = ({
         className: "max-char-span",
         children: t('max-char', {
           chars: MAX_COMMENTS_LENGTH,
-          filled: inputMeta?.comment?.length || 0
+          filled: (inputMeta === null || inputMeta === void 0 || (_inputMeta$comment = inputMeta.comment) === null || _inputMeta$comment === void 0 ? void 0 : _inputMeta$comment.length) || 0
         })
       })]
-    }) : null, lastReview?.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
+    }) : null, lastReview !== null && lastReview !== void 0 && lastReview.reviewError ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "input-content",
       children: isReview ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "comment-textarea",
-          initialValue: lastReview?.comment || '',
-          name: `${formId}-${inputId}-reviewErrorComment`,
+          initialValue: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
+          name: "".concat(formId, "-").concat(inputId, "-reviewErrorComment"),
           label: /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex w-100",
             children: /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -31875,78 +31843,71 @@ const GroupContentFormItem = ({
           children: inputTypeComponent$1.comment(inputData, {
             form: MainForm,
             forms: options,
-            value: lastReview?.comment || '',
+            value: (lastReview === null || lastReview === void 0 ? void 0 : lastReview.comment) || '',
             maxWidth,
             staticWidth,
             fullWidth,
             onChange: val => {
               if (notPartOfTheForm) {
-                const _defaultMeta = (values?.meta?.inputs || {})[formId] || {};
+                var _values$meta14;
+                const _defaultMeta = ((values === null || values === void 0 || (_values$meta14 = values.meta) === null || _values$meta14 === void 0 ? void 0 : _values$meta14.inputs) || {})[formId] || {};
                 const _defaultData = MainForm.getFieldValue(formId);
                 if (isAjaxSubGroup) {
+                  var _defaultData$meta17, _defaultData$meta18, _defaultData$meta19;
                   changeInputMeta({
                     key: formId,
                     type: input.type,
                     otherValues: {
-                      [formId]: {
-                        ..._defaultData,
+                      [formId]: _objectSpread2(_objectSpread2({}, _defaultData), {}, {
                         meta: {
-                          inputs: {
-                            ...(_defaultData?.meta?.inputs || {}),
-                            [inputId]: {
-                              ...((_defaultData?.meta?.inputs || {})[inputId] || {}),
-                              reviews: (((_defaultData?.meta?.inputs || {})[inputId] || {}).reviews || []).map(v => {
+                          inputs: _objectSpread2(_objectSpread2({}, (_defaultData === null || _defaultData === void 0 || (_defaultData$meta17 = _defaultData.meta) === null || _defaultData$meta17 === void 0 ? void 0 : _defaultData$meta17.inputs) || {}), {}, {
+                            [inputId]: _objectSpread2(_objectSpread2({}, ((_defaultData === null || _defaultData === void 0 || (_defaultData$meta18 = _defaultData.meta) === null || _defaultData$meta18 === void 0 ? void 0 : _defaultData$meta18.inputs) || {})[inputId] || {}), {}, {
+                              reviews: ((((_defaultData === null || _defaultData === void 0 || (_defaultData$meta19 = _defaultData.meta) === null || _defaultData$meta19 === void 0 ? void 0 : _defaultData$meta19.inputs) || {})[inputId] || {}).reviews || []).map(v => {
                                 if (v.createdAt === lastReview.createdAt) {
-                                  return {
-                                    ...v,
+                                  return _objectSpread2(_objectSpread2({}, v), {}, {
                                     comment: val
-                                  };
+                                  });
                                 }
                                 return v;
                               })
-                            }
-                          }
+                            })
+                          })
                         }
-                      }
+                      })
                     }
                   });
                 } else {
                   changeInputMeta({
                     key: formId,
                     type: input.type,
-                    value: {
-                      ..._defaultMeta,
-                      [inputId]: {
-                        ...(_defaultMeta[inputId] || {}),
+                    value: _objectSpread2(_objectSpread2({}, _defaultMeta), {}, {
+                      [inputId]: _objectSpread2(_objectSpread2({}, _defaultMeta[inputId] || {}), {}, {
                         reviews: ((_defaultMeta[inputId] || {}).reviews || []).map(v => {
                           if (v.createdAt === lastReview.createdAt) {
-                            return {
-                              ...v,
+                            return _objectSpread2(_objectSpread2({}, v), {}, {
                               comment: val
-                            };
+                            });
                           }
                           return v;
                         })
-                      }
-                    }
+                      })
+                    })
                   });
                 }
               } else {
                 changeInputMeta({
                   key: inputId,
                   type: input.type,
-                  value: {
-                    ...inputMeta,
-                    reviews: (inputMeta?.reviews || []).map(v => {
+                  value: _objectSpread2(_objectSpread2({}, inputMeta), {}, {
+                    reviews: ((inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.reviews) || []).map(v => {
                       if (v.createdAt === lastReview.createdAt) {
-                        return {
-                          ...v,
+                        return _objectSpread2(_objectSpread2({}, v), {}, {
                           comment: val
-                        };
+                        });
                       }
                       return v;
                     })
-                  }
+                  })
                 });
               }
             },
@@ -31958,7 +31919,7 @@ const GroupContentFormItem = ({
           className: "max-char-span",
           children: t('max-char', {
             chars: MAX_COMMENTS_LENGTH,
-            filled: lastReview.comment?.length || 0
+            filled: ((_lastReview$comment = lastReview.comment) === null || _lastReview$comment === void 0 ? void 0 : _lastReview$comment.length) || 0
           })
         })]
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -31979,7 +31940,7 @@ const GroupContentFormItem = ({
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column justify-center mr-1",
             children: /*#__PURE__*/jsxRuntime.jsx("span", {
-              children: lastReview?.reviewer?.firstName + ' ' + lastReview?.reviewer?.lastName + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
+              children: (lastReview === null || lastReview === void 0 || (_lastReview$reviewer = lastReview.reviewer) === null || _lastReview$reviewer === void 0 ? void 0 : _lastReview$reviewer.firstName) + ' ' + (lastReview === null || lastReview === void 0 || (_lastReview$reviewer2 = lastReview.reviewer) === null || _lastReview$reviewer2 === void 0 ? void 0 : _lastReview$reviewer2.lastName) + ' - ' + moment__default["default"](lastReview.createdAt).format('DD MMM YYYY')
             })
           })]
         })]
@@ -45178,7 +45139,7 @@ const filtersConfig$e = {
   datastakeId: '',
   name: ''
 };
-const selectFiltersConfig$d = {
+const selectFiltersConfig$a = {
   country: {
     type: 'select',
     label: 'Country',
@@ -45955,7 +45916,7 @@ function DataStoreTable$1(_ref) {
     goNext,
     setPagination
   } = useFilters({
-    selectFiltersConfig: selectFiltersConfig$d,
+    selectFiltersConfig: selectFiltersConfig$a,
     view,
     goTo,
     location,
@@ -46049,7 +46010,7 @@ function DataStoreTable$1(_ref) {
           rowKey: "key",
           doEmptyRows: true,
           selectOptions,
-          filtersConfig: selectFiltersConfig$d,
+          filtersConfig: selectFiltersConfig$a,
           onFilterChange: onFiltersChange,
           showFilters,
           defaultFilters,
@@ -53835,7 +53796,7 @@ const checkboxConfig$d = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$c = {
+const selectFiltersConfig$9 = {
   account: {
     type: "select",
     label: "Account",
@@ -54073,7 +54034,10 @@ const useGetParams = ({
       ...(Object.keys(cleanSearchParams)?.length > 0 && {
         search: cleanSearchParams
       }),
-      tab: activeTab
+      tab: activeTab,
+      ...(activeTab === "deleted" && {
+        status: 'deleted'
+      })
     };
   }, [location.search]);
   return params;
@@ -54179,7 +54143,7 @@ function UserTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$c,
+    selectFiltersConfig: selectFiltersConfig$9,
     view: view$2,
     defaultUrlParams: defaultUrlParams$6,
     module,
@@ -54261,7 +54225,7 @@ function UserTable(_ref) {
         pagination: filter.pagination,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$c,
+        filtersConfig: selectFiltersConfig$9,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -54589,7 +54553,7 @@ const checkboxConfig$c = {
   name: "Name",
   datastakeId: "ID"
 };
-const selectFiltersConfig$b = {
+const selectFiltersConfig$8 = {
   type: {
     type: "select",
     label: "Type",
@@ -54928,7 +54892,7 @@ function AccountTable(_ref) {
   } = useAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$b,
+    selectFiltersConfig: selectFiltersConfig$8,
     view: view$1,
     defaultUrlParams: defaultUrlParams$5,
     module,
@@ -55056,7 +55020,7 @@ function AccountTable(_ref) {
         doEmptyRows: true,
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$b,
+        filtersConfig: selectFiltersConfig$8,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
@@ -55092,46 +55056,150 @@ function AccountTable(_ref) {
   });
 }
-const selectFiltersConfig$a = {
-  category: {
-    type: "select",
-    label: "Category",
-    placeholder: t => t("Category"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  country: {
-    type: "select",
-    label: "Country",
-    placeholder: t => t("Country"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
+const getFiltersConfig$3 = ({
+  t
+}) => {
+  return {
+    category: {
+      type: 'select',
+      label: 'Category',
+      placeholder: t => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
     },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  sources: {
-    type: "select",
-    label: "Sources",
-    placeholder: t => t("Sources"),
-    style: {
-      flex: 1
+    country: {
+      type: 'select',
+      label: 'Country',
+      placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
     },
-    labelStyle: {
-      flex: 1
+    administrativeLevel1: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel1
+        } = options;
+        if (administrativeLevel1) {
+          if (options.country) {
+            const _item = administrativeLevel1[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_1'
+      }),
+      show: data => !data.country,
+      disabled: data => !data.country,
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
     },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  }
+    administrativeLevel2: {
+      type: 'ajaxSelect',
+      label: ({
+        t = s => s,
+        options = {},
+        filters = {},
+        language = 'en'
+      }) => {
+        const {
+          administrativeLevel2
+        } = options;
+        if (administrativeLevel2) {
+          if (options.country) {
+            const _item = administrativeLevel2[filters.country];
+            if (_item) {
+              if (_item[language]) {
+                return _item[language];
+              }
+            }
+          }
+        }
+        return t('Province');
+      },
+      show: data => !(data.country && data.administrativeLevel1),
+      placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+      filters: data => ({
+        country: data.country,
+        level: 'level_2',
+        administrativeLevel1: data.administrativeLevel1
+      }),
+      disabled: data => !(data.country && data.administrativeLevel1),
+      mapper: {
+        label: "name",
+        value: "id"
+      },
+      method: 'getOptions',
+      entity: 'AdministrativeLevel',
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    }
+  };
+};
+const getFilterOptions$3 = (options, t) => {
+  const {
+    statusOptions = [],
+    categoryOptions = [],
+    countries = [],
+    product = [],
+    subCategory = [],
+    subCategoriesOptions,
+    stakeholderCategoryOptions,
+    stakeholderSubCategoriesOptions,
+    administrativeLevel1,
+    administrativeLevel2,
+    mineralOptions,
+    minerals,
+    productionSiteCategories,
+    locationCategories = []
+  } = options || {};
+  const _default = {
+    // category: stakeholderCategoryOptions || categoryOptions,
+    country: countries || [],
+    administrativeLevel1,
+    administrativeLevel2,
+    category: locationCategories || []
+  };
+  return _default;
 };
 const filtersConfig$b = {
   name: "",
@@ -55735,7 +55803,9 @@ function LocationTable(_ref) {
     mergeLocationsFunction,
     refetchTrigger,
     user,
-    options
+    options,
+    APP,
+    apiUrl
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -55744,6 +55814,14 @@ function LocationTable(_ref) {
     token
   } = useToken$4();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
+  const selectFiltersConfig = React.useMemo(() => {
+    return getFiltersConfig$3({
+      t
+    });
+  }, [t]);
+  const filterOptions = React.useMemo(() => {
+    return getFilterOptions$3(options);
+  }, [options, t]);
   const {
     filter,
     activeTab,
@@ -55756,7 +55834,7 @@ function LocationTable(_ref) {
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$a,
+    selectFiltersConfig,
     view,
     defaultUrlParams: defaultUrlParams$4,
     module,
@@ -55805,7 +55883,7 @@ function LocationTable(_ref) {
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      selectOptions: selectOptions,
+      selectOptions: filterOptions,
       checkboxConfig: checkboxConfig$b,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
@@ -55835,14 +55913,16 @@ function LocationTable(_ref) {
         hideOnLoading: false,
         pagination: filter.pagination,
         rowKey: "id",
-        selectOptions: selectOptions,
+        selectOptions: filterOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$a,
+        filtersConfig: selectFiltersConfig,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
-        onChange: filter.onTableChange
+        onChange: filter.onTableChange,
+        app: APP,
+        apiUrl: apiUrl
       })]
     }), /*#__PURE__*/jsxRuntime.jsx(CombineLocationModal, {
       isOpen: isCombineModalOpen,
@@ -55868,46 +55948,47 @@ function LocationTable(_ref) {
   });
 }
-const selectFiltersConfig$9 = {
-  category: {
-    type: "select",
-    label: "Category",
-    placeholder: t => t("Category"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  country: {
-    type: "select",
-    label: "Country",
-    placeholder: t => t("Country"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  sources: {
-    type: "select",
-    label: "Sources",
-    placeholder: t => t("Sources"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
+const getFiltersConfig$2 = ({
+  t
+}) => {
+  return {
+    country: {
+      type: 'select',
+      placeholder: t('Country'),
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
     },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  }
+    category: {
+      type: 'select',
+      label: 'Category',
+      placeholder: t => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
+};
+const getFilterOptions$2 = (options, t) => {
+  const {
+    countries,
+    category,
+    categoriesOptions
+  } = options || {};
+  return {
+    country: countries || [],
+    category: categoriesOptions || category || []
+  };
 };
 const filtersConfig$a = {
   name: "",
@@ -56412,7 +56493,9 @@ function SubjectsTable(_ref) {
     mergeSubjectsFunction,
     refetchTrigger,
     user,
-    options
+    options,
+    APP,
+    apiUrl
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -56421,6 +56504,14 @@ function SubjectsTable(_ref) {
     token
   } = useToken$2();
   const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
+  const selectFiltersConfig = React.useMemo(() => {
+    return getFiltersConfig$2({
+      t
+    });
+  }, [t]);
+  const filterOptions = React.useMemo(() => {
+    return getFilterOptions$2(options);
+  }, [options, t]);
   const {
     filter,
     activeTab,
@@ -56433,7 +56524,7 @@ function SubjectsTable(_ref) {
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$9,
+    selectFiltersConfig,
     view,
     defaultUrlParams: defaultUrlParams$3,
     module,
@@ -56481,7 +56572,7 @@ function SubjectsTable(_ref) {
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      selectOptions: selectOptions,
+      selectOptions: filterOptions,
       checkboxConfig: checkboxConfig$a,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
@@ -56511,14 +56602,16 @@ function SubjectsTable(_ref) {
         hideOnLoading: false,
         pagination: filter.pagination,
         rowKey: "id",
-        selectOptions: selectOptions,
+        selectOptions: filterOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$9,
+        filtersConfig: selectFiltersConfig,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
-        onChange: filter.onTableChange
+        onChange: filter.onTableChange,
+        app: APP,
+        apiUrl: apiUrl
       })]
     }), /*#__PURE__*/jsxRuntime.jsx(CombineSubjectsModal, {
       isOpen: isCombineModalOpen,
@@ -57041,7 +57134,7 @@ const getColumns$2 = ({
   return cols.filter(v => v.show);
 };
 const checkboxConfig$9 = {};
-const selectFiltersConfig$8 = {
+const selectFiltersConfig$7 = {
   userRole: {
     type: "select",
     label: "Role",
@@ -57117,7 +57210,7 @@ function Users({
   } = useFilters({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$8,
+    selectFiltersConfig: selectFiltersConfig$7,
     defaultUrlParams: defaultUrlParams$2,
     module,
     filtersConfig: filtersConfig$9,
@@ -57215,7 +57308,7 @@ function Users({
         selectOptions: selectOptions,
         setShowFilters: setShowFilters,
         sourcesKey: "authorId",
-        filtersConfig: selectFiltersConfig$8,
+        filtersConfig: selectFiltersConfig$7,
         onFilterChange: onFiltersChange,
         showFilters: showFilters,
         defaultFilters: defaultFilters,
@@ -58406,7 +58499,9 @@ function AdminSubjectsScreen({
     breadcrumbs,
     refetchTrigger,
     getData,
-    user
+    user,
+    APP,
+    apiUrl
   } = config;
   const handleMergeSubjects = React.useCallback(async mergeData => {
     try {
@@ -58454,7 +58549,9 @@ function AdminSubjectsScreen({
       }
     },
     user: user,
-    options: options
+    options: options,
+    APP: APP,
+    apiUrl: apiUrl
   });
 }
@@ -58478,7 +58575,9 @@ function AdminLocationScreen$1({
     breadcrumbs,
     refetchTrigger,
     getData,
-    user
+    user,
+    APP,
+    apiUrl
   } = config;
   const handleMergeLocations = React.useCallback(async mergeData => {
     try {
@@ -58526,50 +58625,33 @@ function AdminLocationScreen$1({
       }
     },
     user: user,
-    options: options
+    options: options,
+    APP: APP,
+    apiUrl: apiUrl
   });
 }
-const selectFiltersConfig$7 = {
-  category: {
-    type: "select",
-    label: "Category",
-    placeholder: t => t("Category"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  country: {
-    type: "select",
-    label: "Country",
-    placeholder: t => t("Country"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  },
-  sources: {
-    type: "select",
-    label: "Sources",
-    placeholder: t => t("Sources"),
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  }
+const getFiltersConfig$1 = ({
+  t
+}) => {
+  return {
+    timeframe: {
+      type: "timeframe",
+      label: "Timeframe",
+      style: {
+        flex: 1
+      }
+    }
+  };
+};
+const getFilterOptions$1 = (options, t) => {
+  const {
+    timeframe = []
+  } = options || {};
+  const _default = {
+    timeframe: timeframe
+  };
+  return _default;
 };
 const filtersConfig$8 = {
   name: "",
@@ -58701,7 +58783,9 @@ function DocumentsTable({
   breadcrumbs,
   refetchTrigger,
   user,
-  options
+  options,
+  APP,
+  apiUrl
 }) {
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -58709,6 +58793,14 @@ function DocumentsTable({
   const {
     token
   } = useToken$1();
+  const selectFiltersConfig = React.useMemo(() => {
+    return getFiltersConfig$1({
+      t
+    });
+  }, [t]);
+  const filterOptions = React.useMemo(() => {
+    return getFilterOptions$1(options);
+  }, [options, t]);
   const {
     filter,
     activeTab,
@@ -58721,7 +58813,7 @@ function DocumentsTable({
   } = useSubjectsAdminTable({
     goTo,
     location,
-    selectFiltersConfig: selectFiltersConfig$7,
+    selectFiltersConfig,
     view,
     defaultUrlParams: defaultUrlParams$1,
     module,
@@ -58775,7 +58867,7 @@ function DocumentsTable({
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      selectOptions: selectOptions,
+      selectOptions: filterOptions,
       checkboxConfig: checkboxConfig$8,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
@@ -58805,14 +58897,16 @@ function DocumentsTable({
         hideOnLoading: false,
         pagination: filter.pagination,
         rowKey: "id",
-        selectOptions: selectOptions,
+        selectOptions: filterOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
-        filtersConfig: selectFiltersConfig$7,
+        filtersConfig: selectFiltersConfig,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
-        onChange: filter.onTableChange
+        onChange: filter.onTableChange,
+        app: APP,
+        apiUrl: apiUrl
       })]
     })
   });
@@ -58838,7 +58932,9 @@ function AdminLocationScreen({
     breadcrumbs,
     refetchTrigger,
     getData,
-    user
+    user,
+    APP,
+    apiUrl
   } = config;
   const getSubjects = React.useCallback(params => {
     if (getData) {
@@ -58869,18 +58965,20 @@ function AdminLocationScreen({
       }
     },
     user: user,
-    options: options
+    options: options,
+    APP: APP,
+    apiUrl: apiUrl
   });
 }
-const getSelectFiltersConfig = ({
+const getFiltersConfig = ({
   t
 }) => {
   return {
-    eventsType: {
-      type: "select",
-      label: "type",
-      placeholder: t("type"),
+    typeOfEvent: {
+      type: 'select',
+      label: 'type',
+      placeholder: t => `${t('Filter by')} ${t('type').toLowerCase()}`,
       style: {
         flex: 1
       },
@@ -58892,6 +58990,14 @@ const getSelectFiltersConfig = ({
     }
   };
 };
+const getFilterOptions = (options, t) => {
+  const {
+    eventsType
+  } = options || {};
+  return {
+    typeOfEvent: eventsType || []
+  };
+};
 const filtersConfig$7 = {
   name: "",
   datastakeId: ""
@@ -59043,7 +59149,9 @@ function EventsTable({
   breadcrumbs,
   refetchTrigger,
   user,
-  options
+  options,
+  APP,
+  apiUrl
 }) {
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -59052,10 +59160,13 @@ function EventsTable({
     token
   } = useToken();
   const selectFiltersConfig = React.useMemo(() => {
-    return getSelectFiltersConfig({
+    return getFiltersConfig({
       t
     });
   }, [t]);
+  const filterOptions = React.useMemo(() => {
+    return getFilterOptions(options);
+  }, [options, t]);
   const {
     filter,
     activeTab,
@@ -59119,7 +59230,7 @@ function EventsTable({
       hasError: hasError,
       setHasError: setHasError,
       canClearSearch: canClearSearch,
-      selectOptions: selectOptions,
+      selectOptions: filterOptions,
       checkboxConfig: checkboxConfig$7,
       defaultTableFilters: {},
       breadcrumbs: breadcrumbs,
@@ -59149,14 +59260,16 @@ function EventsTable({
         hideOnLoading: false,
         pagination: filter.pagination,
         rowKey: "id",
-        selectOptions: selectOptions,
+        selectOptions: filterOptions,
         doEmptyRows: true,
         setShowFilters: setShowFilters,
         filtersConfig: selectFiltersConfig,
         onFilterChange: filter.onFiltersChange,
         showFilters: showFilters,
         defaultFilters: filter.defaultFilters,
-        onChange: filter.onTableChange
+        onChange: filter.onTableChange,
+        app: APP,
+        apiUrl: apiUrl
       })]
     })
   });
@@ -59182,7 +59295,9 @@ function AdminEventsScreen({
     breadcrumbs,
     refetchTrigger,
     getData,
-    user
+    user,
+    APP,
+    apiUrl
   } = config;
   const getSubjects = React.useCallback(params => {
     if (getData) {
@@ -59210,7 +59325,9 @@ function AdminEventsScreen({
       options: options
     },
     user: user,
-    options: options
+    options: options,
+    APP: APP,
+    apiUrl: apiUrl
   });
 }
@@ -64302,6 +64419,32 @@ function MissingTagButton(_ref) {
   });
 }
+const SingleTruncatedLine = _ref => {
+  let {
+    data = []
+  } = _ref;
+  const displayText = data === null || data === void 0 ? void 0 : data.join(", ");
+  const tooltipText = data === null || data === void 0 ? void 0 : data.join("\n");
+  return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+    title: /*#__PURE__*/jsxRuntime.jsx("div", {
+      style: {
+        whiteSpace: "pre-line"
+      },
+      children: tooltipText
+    }),
+    children: /*#__PURE__*/jsxRuntime.jsx("div", {
+      style: {
+        fontWeight: "normal",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+        whiteSpace: "nowrap",
+        maxWidth: "100%"
+      },
+      children: displayText
+    })
+  });
+};
 var Style$5 = styled__default["default"].div`
   display: flex;
   flex-direction: column;
@@ -65702,6 +65845,7 @@ exports.SettingsView = SettingsView;
 exports.Sidenav = Sidenav;
 exports.SidenavMenu = SidenavMenu;
 exports.SimpleGlobe = SimpleGlobe;
+exports.SingleTruncatedLine = SingleTruncatedLine;
 exports.StackChart = StackChart;
 exports.StakeholderMappings = index;
 exports.StatCard = StatCard;