datastake-daf 0.6.784 → 0.6.786

package/dist/components/index.js

@@ -8498,20 +8498,22 @@ const useHeader = _ref => {
 const {
   useToken: useToken$m
 } = antd.theme;
-function BreadCrumbs({
-  breadcrumbs = [],
-  mainContWidth = 0
-}) {
+function BreadCrumbs(_ref) {
+  let {
+    breadcrumbs = [],
+    mainContWidth = 0
+  } = _ref;
   const [splitIndex, setSplitIndex] = React.useState(0);
   const {
     token
   } = useToken$m();
-  const _renderBreadcrumb = (b, i, isLast, noOnClickLast = false) => {
+  const _renderBreadcrumb = function (b, i, isLast) {
+    let noOnClickLast = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     return /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex breadcrumb-item",
-      onClick: noOnClickLast && isLast ? undefined : b?.onClick,
+      onClick: noOnClickLast && isLast ? undefined : b === null || b === void 0 ? void 0 : b.onClick,
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        children: b?.label
+        children: b === null || b === void 0 ? void 0 : b.label
       }), !isLast && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-column justify-content-center",
         children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -8521,7 +8523,7 @@ function BreadCrumbs({
           color: token.baseGray50
         })
       })]
-    }, `breadcrumb-item-${i}`);
+    }, "breadcrumb-item-".concat(i));
   };
   React.useEffect(() => {
     const _placeholderCont = document.getElementById("header-breadcrumbs");
@@ -8564,7 +8566,7 @@ function BreadCrumbs({
         placement: "bottomRight",
         menu: {
           items: groupedBreadCrumbs[2].map((it, i) => ({
-            key: `items-${i}`,
+            key: "items-".concat(i),
             label: it.label,
             onClick: it.onClick
           }))
@@ -9969,44 +9971,44 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj || {}).reduce((acc, _ref) => {
-    let [key, value] = _ref;
+  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
-      return _objectSpread2(_objectSpread2({}, acc), value);
+      return {
+        ...acc,
+        ...value
+      };
     }
-    return _objectSpread2(_objectSpread2({}, acc), {}, {
+    return {
+      ...acc,
       [key]: value
-    });
+    };
   }, {});
 };
-const handleDataLinkGroupWithTableKeys = _ref2 => {
-  var _inputConfig$meta, _config$meta2, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
-  let {
-    config,
-    inputConfig,
-    inputKey,
-    value,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref2;
+const handleDataLinkGroupWithTableKeys = ({
+  config,
+  inputConfig,
+  inputKey,
+  value,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
+  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
       const otherConfig = config.inputs[otherInputKey];
-      if ((otherConfig === null || otherConfig === void 0 ? void 0 : otherConfig.type) === 'dataLink') {
-        var _otherConfig$meta, _config$meta;
-        const siblingTableKeys = (otherConfig === null || otherConfig === void 0 || (_otherConfig$meta = otherConfig.meta) === null || _otherConfig$meta === void 0 ? void 0 : _otherConfig$meta.tableKeys) || [];
-        const additionalTableKeys = ((_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.additionalTableKeys) || [];
+      if (otherConfig?.type === 'dataLink') {
+        const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
+        const additionalTableKeys = config.meta?.additionalTableKeys || [];
         const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
@@ -10020,26 +10022,23 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const additionalTableKeys = ((_config$meta2 = config.meta) === null || _config$meta2 === void 0 ? void 0 : _config$meta2.additionalTableKeys) || [];
+  const additionalTableKeys = config.meta?.additionalTableKeys || [];
   const parentInputKeys = Object.keys(config.inputs || {});
   const siblingInputsMatchingTableKeys = parentInputKeys.filter(siblingKey => siblingKey !== inputKey).filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
   [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
-  const isAjaxModal = React.useMemo(() => {
-    var _inputConfig$meta2;
-    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
-  }, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
-    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
+    namespace: inputConfig?.meta?.namespace,
+    skipFetch: inputConfig?.meta?.skipFetch,
     isAjaxModal,
-    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
+    formScope: inputConfig?.meta?.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
+  const dataLinkForm = ajaxModalValues?.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10051,12 +10050,12 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       'videos': 'Video'
     };
     tableKeys.filter(tableKey => tableKey !== 'datastakeId').forEach(tableKey => {
-      var _dataLinkForm$identif;
-      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
+      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
       if (formInputConfig) {
-        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[tableKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10064,7 +10063,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10072,37 +10071,37 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item === null || item === void 0 ? void 0 : item[tableKey];
+        values[tableKey] = item?.[tableKey];
       } else {
-        var _item$linking;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
+          type: inputConfig?.type
         };
-        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
       }
     });
     siblingInputsMatchingTableKeys.forEach(siblingKey => {
       const siblingConfig = config.inputs[siblingKey];
       if (siblingConfig) {
-        inputs[siblingKey] = _objectSpread2(_objectSpread2({}, siblingConfig), {}, {
+        inputs[siblingKey] = {
+          ...siblingConfig,
           label: siblingConfig.label || siblingKey
-        });
-        values[siblingKey] = item === null || item === void 0 ? void 0 : item[siblingKey];
+        };
+        values[siblingKey] = item?.[siblingKey];
       }
     });
-    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey)).filter(fieldKey => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
-        var _item$linking2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[fieldKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        });
-        if (formInputConfig !== null && formInputConfig !== void 0 && formInputConfig.label && typeof (formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label) === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label);
+        };
+        if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
+          const dynamicLabelKeys = Object.keys(formInputConfig?.label);
           let resolvedLabel = null;
           for (const labelKey of dynamicLabelKeys) {
             const parts = labelKey.split(' is ');
@@ -10111,7 +10110,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
               const flattenedItem = Object.assign({}, item.location, {
                 address: item.address
               });
-              if ((flattenedItem === null || flattenedItem === void 0 ? void 0 : flattenedItem[conditionKey]) === conditionValue) {
+              if (flattenedItem?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10119,7 +10118,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
       });
     }
     return {
@@ -10129,17 +10128,16 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      var _merged$inputKey;
       const merged = mergeObject(item);
-      const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey = merged[inputKey]) === null || _merged$inputKey === void 0 ? void 0 : _merged$inputKey.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
       const {
         inputs,
         values
       } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
-          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
           type: 'custom-datalink-group',
           inputs: inputs
         },
@@ -10153,12 +10151,11 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(inputKey, "-").concat(itemIndex));
+      }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    var _merged$inputKey2;
     const merged = mergeObject(value);
-    const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey2 = merged[inputKey]) === null || _merged$inputKey2 === void 0 ? void 0 : _merged$inputKey2.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
     const {
       inputs,
       values
@@ -10180,7 +10177,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, "".concat(inputKey, "-group"));
+    }, `${inputKey}-group`);
   }
 };
 
@@ -14735,7 +14732,7 @@ const useMap$1 = ({
   });
   function handleSelectMarker(clickedMarker) {
     setSelectedMarkersId(prev => {
-      if (prev.includes(clickedMarker.datastakeId)) {
+      if (openPopupIdRef.current === clickedMarker.datastakeId) {
         // Deselecting - clear polylines
         openPopupIdRef.current = null;
         setMarkerWithPopup(null);

package/dist/hooks/index.js

@@ -2384,6 +2384,8 @@ const useGetQueryParams = ({
       searchParams: rawSearchParams,
       sortBy,
       sortDir,
+      status,
+      product,
       ...rest
     } = queryParams;
     return {
@@ -2396,7 +2398,13 @@ const useGetQueryParams = ({
         fields: safeJsonParse(rawSearchParams)
       },
       otherParams: {
-        ...rest
+        ...rest,
+        ...(product && {
+          "products.typeOfProduct": product
+        }),
+        ...(status && {
+          published: status === "submitted" ? true : false
+        })
       },
       sortBy,
       sortDir