datastake-daf 0.6.753 → 0.6.754

package/dist/components/index.js

@@ -9436,29 +9436,24 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = function (type, value, user, config) {
-  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
-  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
-  let app = arguments.length > 6 ? arguments[6] : undefined;
-  let allValues = arguments.length > 7 ? arguments[7] : undefined;
-  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
+const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
+        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
+        const options = config?.options || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9473,7 +9468,7 @@ const renderFieldData = function (type, value, user, config) {
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
+      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9487,7 +9482,7 @@ const renderFieldData = function (type, value, user, config) {
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
+        const documentName = allValues?.map(item => item?.name).join(', ');
         return documentName;
       }
     default:
@@ -9495,27 +9490,25 @@ const renderFieldData = function (type, value, user, config) {
   }
 };
 
-const renderValue = _ref => {
-  let {
-    value,
-    hasChildren,
-    config,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    allData = {}
-  } = _ref;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
-    if (!(config !== null && config !== void 0 && config.inputs)) return null;
+const renderValue = ({
+  value,
+  hasChildren,
+  config,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  allData = {}
+}) => {
+  if (config?.type === 'groupInputs') {
+    if (!config?.inputs) return null;
     const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-      var _config$inputs$a, _config$inputs$b;
-      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
-      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
+      const positionA = config.inputs[a]?.position || 0;
+      const positionB = config.inputs[b]?.position || 0;
       return positionA - positionB;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
+      let inputValue = value?.[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9556,8 +9549,8 @@ const renderValue = _ref => {
   } else {
     displayValue = String(value);
   }
-  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
-  let cssClass = "tree-value ".concat(fieldType, "-type");
+  const fieldType = config?.type || 'text';
+  let cssClass = `tree-value ${fieldType}-type`;
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9567,21 +9560,19 @@ const renderValue = _ref => {
     children: displayValue
   });
 };
-const determineHasChildren = _ref2 => {
-  var _config$meta;
-  let {
-    config,
-    level
-  } = _ref2;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
+const determineHasChildren = ({
+  config,
+  level
+}) => {
+  if (config?.type === 'groupInputs') {
     return false;
   }
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
+  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  return (config === null || config === void 0 ? void 0 : config.inputs) || (config === null || config === void 0 ? void 0 : config.type) === 'group' || (config === null || config === void 0 ? void 0 : config.type) === 'dataLinkGroup' || (config === null || config === void 0 ? void 0 : config.type) === 'section' || (config === null || config === void 0 ? void 0 : config.type) === 'ajaxSubGroup' ||
+  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
   // Add this line
-  (config === null || config === void 0 ? void 0 : config.type) === 'dataLink' && (config === null || config === void 0 || (_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.tableKeys) || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
+  config?.type === 'dataLink' && config?.meta?.tableKeys || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -10070,37 +10061,42 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
   }
 };
 
-const handleDataLinkWithTableKeys = ({
-  inputConfig,
-  inputKey,
-  value,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
-  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
+const handleDataLinkWithTableKeys = _ref => {
+  var _inputConfig$meta, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
+  let {
+    inputConfig,
+    inputKey,
+    value,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
+  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)) {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
+  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 ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig?.meta?.namespace,
-    skipFetch: inputConfig?.meta?.skipFetch,
+    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,
     isAjaxModal,
-    formScope: inputConfig?.meta?.formScope,
+    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues?.form;
+  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10113,19 +10109,20 @@ const handleDataLinkWithTableKeys = ({
     };
     const isUploadFieldEmpty = (fieldKey, itemToCheck) => {
       if (uploadTypeFields.includes(fieldKey)) {
-        const itemValue = itemToCheck?.[fieldKey];
+        const itemValue = itemToCheck === null || itemToCheck === void 0 ? void 0 : itemToCheck[fieldKey];
         return itemValue === undefined || itemValue === null || Array.isArray(itemValue) && itemValue.length === 0;
       }
       return false;
     };
     const processedTableKeys = processConditionalTableKeys(tableKeys, item);
     processedTableKeys.filter(tableKey => tableKey !== 'datastakeId').filter(tableKey => !isUploadFieldEmpty(tableKey, item)).forEach(tableKey => {
-      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[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]);
       if (formInputConfig) {
-        inputs[tableKey] = {
-          ...formInputConfig,
+        var _item$linking, _formInputConfig$meta, _formInputConfig$tabl;
+        inputs[tableKey] = _objectSpread2(_objectSpread2({}, 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;
@@ -10133,7 +10130,7 @@ const handleDataLinkWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10141,16 +10138,17 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item[formInputConfig?.meta?.onNewSetValueKey] || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey];
+        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[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$meta = formInputConfig.meta) === null || _formInputConfig$meta === void 0 ? void 0 : _formInputConfig$meta.onNewSetValueKey] || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl = formInputConfig.tableLabel) === null || _formInputConfig$tabl === void 0 ? void 0 : _formInputConfig$tabl.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       } else {
+        var _item$linking2;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig?.type
+          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
         };
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
+        values[tableKey] = (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[tableKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       }
     });
-    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => {
         if (uploadTypeFields.includes(fieldKey)) {
           return !isUploadFieldEmpty(fieldKey, item);
@@ -10160,11 +10158,11 @@ const handleDataLinkWithTableKeys = ({
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
+        var _item$linking3, _formInputConfig$tabl2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = {
-          ...formInputConfig,
+        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        };
+        });
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10172,7 +10170,7 @@ const handleDataLinkWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10180,7 +10178,7 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
+        values[fieldKey] = (item === null || item === void 0 || (_item$linking3 = item.linking) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3.SCL) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking3 === void 0 ? void 0 : _item$linking3.name) || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl2 = formInputConfig.tableLabel) === null || _formInputConfig$tabl2 === void 0 ? void 0 : _formInputConfig$tabl2.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
       });
     }
     return {
@@ -10190,7 +10188,7 @@ const handleDataLinkWithTableKeys = ({
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item?.datastakeId;
+      const datastakeIdValue = item === null || item === void 0 ? void 0 : item.datastakeId;
       const {
         inputs,
         values
@@ -10199,9 +10197,9 @@ const handleDataLinkWithTableKeys = ({
         return null;
       }
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
         config: {
-          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
           type: 'custom-datalink',
           inputs: inputs
         },
@@ -10215,10 +10213,10 @@ const handleDataLinkWithTableKeys = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${inputKey}-${itemIndex}`);
+      }, "".concat(inputKey, "-").concat(itemIndex));
     });
   } else {
-    const datastakeIdValue = value?.datastakeId;
+    const datastakeIdValue = value === null || value === void 0 ? void 0 : value.datastakeId;
     const {
       inputs,
       values
@@ -10243,24 +10241,25 @@ const handleDataLinkWithTableKeys = ({
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, `${inputKey}-single`);
+    }, "".concat(inputKey, "-single"));
   }
 };
 
-const handleGroupChildren = ({
-  config,
-  value,
-  allData,
-  level,
-  t,
-  rootForm,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
-  if (!config?.inputs) {
+const handleGroupChildren = _ref => {
+  let {
+    config,
+    value,
+    allData,
+    level,
+    t,
+    rootForm,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
+  if (!(config !== null && config !== void 0 && config.inputs)) {
     return null;
   }
   const inputKeys = Object.keys(config.inputs);
@@ -10273,7 +10272,7 @@ const handleGroupChildren = ({
     if (value && typeof value === 'object' && value[inputKey]) {
       inputValue = value[inputKey];
     } else {
-      inputValue = allData?.[inputKey];
+      inputValue = allData === null || allData === void 0 ? void 0 : allData[inputKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: inputKey,
@@ -39899,43 +39898,56 @@ function DynamicForm(_ref) {
       //   setOriginalData({});
       //   setValues({});
       //   MainForm.resetFields();
+    } else if (isCreate) {
+      // Reset form when data is empty in create mode (e.g., when switching contexts)
+      setOriginalData({});
+      setValues({});
+      MainForm.resetFields();
     }
-  }, [data]);
+  }, [data, isCreate]);
 
   // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
     if (Object.keys(form).length > 0) {
-      const updatedValues = _objectSpread2({}, values);
-      let hasChanges = false;
-      const isEditMode = data && (data.id || data._id);
-
-      // Process all form fields to set default values for hidden and disabled fields
-      Object.keys(form).forEach(formKey => {
-        Object.keys(form[formKey]).forEach(fieldKey => {
-          var _field$meta, _field$meta2, _field$meta3, _field$meta4, _field$meta5, _field$meta6;
-          const field = form[formKey][fieldKey];
-          const fieldId = field.dataId || fieldKey;
-
-          // Check if field is disabled
-          const isDisabled = field !== null && field !== void 0 && (_field$meta = field.meta) !== null && _field$meta !== void 0 && _field$meta.disableEdit && typeof (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.disableEdit) === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field === null || field === void 0 || (_field$meta3 = field.meta) === null || _field$meta3 === void 0 || (_field$meta3 = _field$meta3.disableEdit) === null || _field$meta3 === void 0 ? void 0 : _field$meta3.edit) && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field === null || field === void 0 || (_field$meta4 = field.meta) === null || _field$meta4 === void 0 || (_field$meta4 = _field$meta4.disableEdit) === null || _field$meta4 === void 0 ? void 0 : _field$meta4.edit) && isEditMode : field === null || field === void 0 || (_field$meta5 = field.meta) === null || _field$meta5 === void 0 ? void 0 : _field$meta5.disableEdit;
-
-          // Set default value for hidden fields or disabled fields with default values
-          if ((field === null || field === void 0 || (_field$meta6 = field.meta) === null || _field$meta6 === void 0 ? void 0 : _field$meta6.defaultValue) !== undefined && !propHasValue(updatedValues[fieldId])) {
-            var _field$meta7;
-            if ((field === null || field === void 0 || (_field$meta7 = field.meta) === null || _field$meta7 === void 0 ? void 0 : _field$meta7.hidden) === true || isDisabled) {
-              updatedValues[fieldId] = field.meta.defaultValue;
-              hasChanges = true;
+      setValues(prevValues => {
+        // Use data prop as base, or current values if data is empty
+        const baseValues = Object.keys(data).length > 0 ? data : prevValues;
+        const updatedValues = _objectSpread2({}, baseValues);
+        let hasChanges = false;
+        const isEditMode = data && (data.id || data._id);
+
+        // Process all form fields to set default values for hidden and disabled fields
+        Object.keys(form).forEach(formKey => {
+          Object.keys(form[formKey]).forEach(fieldKey => {
+            var _field$meta, _field$meta2, _field$meta3, _field$meta4, _field$meta5, _field$meta6;
+            const field = form[formKey][fieldKey];
+            const fieldId = field.dataId || fieldKey;
+
+            // Check if field is disabled
+            const isDisabled = field !== null && field !== void 0 && (_field$meta = field.meta) !== null && _field$meta !== void 0 && _field$meta.disableEdit && typeof (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.disableEdit) === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field === null || field === void 0 || (_field$meta3 = field.meta) === null || _field$meta3 === void 0 || (_field$meta3 = _field$meta3.disableEdit) === null || _field$meta3 === void 0 ? void 0 : _field$meta3.edit) && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field === null || field === void 0 || (_field$meta4 = field.meta) === null || _field$meta4 === void 0 || (_field$meta4 = _field$meta4.disableEdit) === null || _field$meta4 === void 0 ? void 0 : _field$meta4.edit) && isEditMode : field === null || field === void 0 || (_field$meta5 = field.meta) === null || _field$meta5 === void 0 ? void 0 : _field$meta5.disableEdit;
+
+            // Set default value for hidden fields or disabled fields with default values
+            if ((field === null || field === void 0 || (_field$meta6 = field.meta) === null || _field$meta6 === void 0 ? void 0 : _field$meta6.defaultValue) !== undefined) {
+              var _field$meta7, _field$meta8;
+              // In create mode, always update disabled/hidden fields with default values when form config changes
+              // This ensures context switching (Operation -> Restoration) updates the field correctly
+              const shouldUpdate = !propHasValue(updatedValues[fieldId]) || isCreate && !isEditMode && ((field === null || field === void 0 || (_field$meta7 = field.meta) === null || _field$meta7 === void 0 ? void 0 : _field$meta7.hidden) === true || isDisabled);
+              if (shouldUpdate && ((field === null || field === void 0 || (_field$meta8 = field.meta) === null || _field$meta8 === void 0 ? void 0 : _field$meta8.hidden) === true || isDisabled)) {
+                updatedValues[fieldId] = field.meta.defaultValue;
+                hasChanges = true;
+              }
             }
-          }
+          });
         });
+        if (hasChanges) {
+          // Also set the values in the Ant Design form
+          MainForm.setFieldsValue(updatedValues);
+          return updatedValues;
+        }
+        return prevValues;
       });
-      if (hasChanges) {
-        setValues(updatedValues);
-        // Also set the values in the Ant Design form
-        MainForm.setFieldsValue(updatedValues);
-      }
     }
-  }, [form, data, isModal]);
+  }, [form, data, isModal, isCreate]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;

package/dist/pages/index.js

@@ -29371,43 +29371,56 @@ function DynamicForm({
       //   setOriginalData({});
       //   setValues({});
       //   MainForm.resetFields();
+    } else if (isCreate) {
+      // Reset form when data is empty in create mode (e.g., when switching contexts)
+      setOriginalData({});
+      setValues({});
+      MainForm.resetFields();
     }
-  }, [data]);
+  }, [data, isCreate]);
 
   // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
     if (Object.keys(form).length > 0) {
-      const updatedValues = {
-        ...values
-      };
-      let hasChanges = false;
-      const isEditMode = data && (data.id || data._id);
-
-      // Process all form fields to set default values for hidden and disabled fields
-      Object.keys(form).forEach(formKey => {
-        Object.keys(form[formKey]).forEach(fieldKey => {
-          const field = form[formKey][fieldKey];
-          const fieldId = field.dataId || fieldKey;
-
-          // Check if field is disabled
-          const isDisabled = field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || field?.meta?.disableEdit?.edit && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || field?.meta?.disableEdit?.edit && isEditMode : field?.meta?.disableEdit;
-
-          // Set default value for hidden fields or disabled fields with default values
-          if (field?.meta?.defaultValue !== undefined && !propHasValue(updatedValues[fieldId])) {
-            if (field?.meta?.hidden === true || isDisabled) {
-              updatedValues[fieldId] = field.meta.defaultValue;
-              hasChanges = true;
+      setValues(prevValues => {
+        // Use data prop as base, or current values if data is empty
+        const baseValues = Object.keys(data).length > 0 ? data : prevValues;
+        const updatedValues = {
+          ...baseValues
+        };
+        let hasChanges = false;
+        const isEditMode = data && (data.id || data._id);
+
+        // Process all form fields to set default values for hidden and disabled fields
+        Object.keys(form).forEach(formKey => {
+          Object.keys(form[formKey]).forEach(fieldKey => {
+            const field = form[formKey][fieldKey];
+            const fieldId = field.dataId || fieldKey;
+
+            // Check if field is disabled
+            const isDisabled = field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || field?.meta?.disableEdit?.edit && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || field?.meta?.disableEdit?.edit && isEditMode : field?.meta?.disableEdit;
+
+            // Set default value for hidden fields or disabled fields with default values
+            if (field?.meta?.defaultValue !== undefined) {
+              // In create mode, always update disabled/hidden fields with default values when form config changes
+              // This ensures context switching (Operation -> Restoration) updates the field correctly
+              const shouldUpdate = !propHasValue(updatedValues[fieldId]) || isCreate && !isEditMode && (field?.meta?.hidden === true || isDisabled);
+              if (shouldUpdate && (field?.meta?.hidden === true || isDisabled)) {
+                updatedValues[fieldId] = field.meta.defaultValue;
+                hasChanges = true;
+              }
             }
-          }
+          });
         });
+        if (hasChanges) {
+          // Also set the values in the Ant Design form
+          MainForm.setFieldsValue(updatedValues);
+          return updatedValues;
+        }
+        return prevValues;
       });
-      if (hasChanges) {
-        setValues(updatedValues);
-        // Also set the values in the Ant Design form
-        MainForm.setFieldsValue(updatedValues);
-      }
     }
-  }, [form, data, isModal]);
+  }, [form, data, isModal, isCreate]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;
@@ -40813,6 +40826,13 @@ const getKeyIndicatorsRowConfig = ({
   })
 }];
 
+// ============================================================================
+// REGION: Photo/Image Extraction
+// ============================================================================
+
+/**
+ * Normalize URL by removing trailing colon if present
+ */
 const normalizeUrl = url => url?.endsWith(':') ? url.slice(0, -1) : url;
 
 /**
@@ -40925,88 +40945,6 @@ const getGenderTooltipChildren = (item, isEmpty, genderDistributionData, t, rend
   });
 };
 
-// ============================================================================
-// REGION: Multiselect Options
-// ============================================================================
-
-/**
- * Get filtered options for multiselect based on activityData.origin
- * Filters options based on whether origin contains 'kobo', 'straatos', or both
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @param {React.Component} CustomIcon - CustomIcon component for rendering Monitor option avatar
- * @returns {Array} - Filtered array of option objects
- */
-const getFilteredOptions = (activityData, CustomIcon) => {
-  const allOptions = [{
-    label: "Own Data",
-    value: "own",
-    avatar: /*#__PURE__*/jsxRuntime.jsx("span", {
-      children: "OWN"
-    }),
-    background: "#016C6E",
-    color: "white"
-  }, {
-    label: "Monitor",
-    value: "other",
-    avatar: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-      name: "Search02",
-      size: 14
-    })
-  }];
-  if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-    return allOptions;
-  }
-
-  // Extract origin names from the array
-  const originNames = activityData.origin.map(item => item?.name?.toLowerCase()).filter(Boolean);
-  const hasKobo = originNames.includes('kobo');
-  const hasStraatos = originNames.includes('straatos');
-
-  // If contains kobo only, show only Monitor
-  if (hasKobo && !hasStraatos) {
-    return allOptions.filter(option => option.value === 'other');
-  }
-
-  // If contains straatos only, show only Own Data
-  if (hasStraatos && !hasKobo) {
-    return allOptions.filter(option => option.value === 'own');
-  }
-
-  // If contains both or neither, show both
-  return allOptions;
-};
-
-/**
- * Get default selected value for multiselect based on activityData.origin
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @returns {Array} - Array of default selected values
- */
-const getDefaultSelected = activityData => {
-  if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-    return ['own'];
-  }
-
-  // Extract origin names from the array
-  const originNames = activityData.origin.map(item => item?.name?.toLowerCase()).filter(Boolean);
-  const hasKobo = originNames.includes('kobo');
-  const hasStraatos = originNames.includes('straatos');
-
-  // If contains kobo only, default to monitor (other)
-  if (hasKobo && !hasStraatos) {
-    return ['other'];
-  }
-
-  // If contains straatos only, default to own
-  if (hasStraatos && !hasKobo) {
-    return ['own'];
-  }
-
-  // If contains both or neither, default to own
-  return ['own'];
-};
-
 // ============================================================================
 // REGION: Activity Indicators
 // ============================================================================
@@ -41344,12 +41282,6 @@ const RestorationActivitySummary = ({
 
   // Activity Indicators Config - mapped from activityData
   const activityIndicatorsConfig = React.useMemo(() => getActivityIndicatorsConfig(activityData, t), [activityData, t]);
-
-  // Filter options based on activityData.origin
-  const filteredOptions = React.useMemo(() => getFilteredOptions(activityData, CustomIcon), [activityData]);
-
-  // Get default selected based on activityData.origin
-  const defaultSelected = React.useMemo(() => getDefaultSelected(activityData), [activityData]);
   return /*#__PURE__*/jsxRuntime.jsxs(DashboardLayout, {
     header: /*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
       title: 'Restoration Activity Summary',
@@ -41359,25 +41291,7 @@ const RestorationActivitySummary = ({
       actionButtons: actionButtons,
       breadcrumbs: breadcrumbs,
       goBackTo: goBackTo,
-      loading: loading,
-      addedHeaderFirst: true,
-      addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
-        style: {
-          marginRight: 0
-        },
-        children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
-          canUnselectLast: false,
-          options: filteredOptions,
-          isAvatarGroup: true,
-          selectionType: "checkbox",
-          onChange: selected => {
-            console.log(selected);
-          },
-          dropDownWidth: 200,
-          defaultSelected: defaultSelected,
-          placeholder: "Select partners..."
-        })
-      })
+      loading: loading
     }),
     children: [/*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorsWidget, {
@@ -41406,6 +41320,50 @@ const RestorationActivitySummary = ({
             app: "straatos",
             showSider: false,
             user: null,
+            data: [{
+              _id: {},
+              id: "7f2aaed4-4b2e-406c-8e0a-6659c5c8367b",
+              color: "#6698E4",
+              parent: {
+                _id: {},
+                createdAt: "2024-06-13T14:51:55.296Z",
+                updatedAt: "2024-06-13T14:51:55.296Z",
+                id: "a5340bf1-2c7d-413f-a2a5-ccd7dc8f7a7c",
+                name: "New Mine",
+                authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+                collectId: "f8a2b6a9cc935ef3e5844427f49aade34e152eca",
+                country: "AL",
+                category: "mineSite",
+                datastakeId: "LOC-00000000141",
+                __v: 0
+              },
+              administrativeLevel1: "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
+              administrativeLevel2: "f849835d-5640-4bee-ae98-9f1c810c1abe",
+              // "name": "New Mine",
+              country: "AL",
+              category: "mineSite",
+              authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+              gps: {
+                latitude: 7,
+                longitude: 1
+              },
+              area: [[6, 5], [7, 1], [9, 2]],
+              associatedSubjects: [{
+                entity: "Event",
+                _id: {},
+                nature: ""
+              }],
+              published: false,
+              version: 1,
+              createdAt: "2024-06-13T14:51:55.296Z",
+              updatedAt: "2024-06-13T14:51:55.296Z",
+              name: "Name",
+              type: "Loc Type",
+              __v: 0,
+              datastakeId: "LOC-00000000141"
+            }]
+            // tooltipAsText: true,
+            ,
             primaryLink: true,
             renderTooltip: () => {
               return [{
@@ -41413,10 +41371,9 @@ const RestorationActivitySummary = ({
                 value: "Name"
               }];
             },
+            center: [13, -15],
             mapConfig: {
-              maxZoom: 18,
-              zoom: 5,
-              center: [14, -14]
+              maxZoom: 18
             },
             type: 'territory',
             link: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.753",
+	"version": "0.6.754",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/DynamicForm/index.jsx

@@ -165,46 +165,61 @@ export default function DynamicForm({
       //   setOriginalData({});
       //   setValues({});
       //   MainForm.resetFields();
+    } else if (isCreate) {
+      // Reset form when data is empty in create mode (e.g., when switching contexts)
+      setOriginalData({});
+      setValues({});
+      MainForm.resetFields();
     }
-  }, [data]);
+  }, [data, isCreate]);
 
     // Initialize default values for hidden and disabled fields
     useEffect(() => {
       if (Object.keys(form).length > 0) {
-        const updatedValues = { ...values };
-        let hasChanges = false;
-        const isEditMode = data && (data.id || data._id);
-  
-        // Process all form fields to set default values for hidden and disabled fields
-        Object.keys(form).forEach(formKey => {
-          Object.keys(form[formKey]).forEach(fieldKey => {
-            const field = form[formKey][fieldKey];
-            const fieldId = field.dataId || fieldKey;
-            
-            // Check if field is disabled
-            const isDisabled = (field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object')
-              ? isModal 
-              ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field?.meta?.disableEdit?.edit && isEditMode)
-              : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field?.meta?.disableEdit?.edit && isEditMode)
-              : field?.meta?.disableEdit;
-            
-            // Set default value for hidden fields or disabled fields with default values
-            if (field?.meta?.defaultValue !== undefined && !propHasValue(updatedValues[fieldId])) {
-              if (field?.meta?.hidden === true || isDisabled) {
-                updatedValues[fieldId] = field.meta.defaultValue;
-                hasChanges = true;
+        setValues(prevValues => {
+          // Use data prop as base, or current values if data is empty
+          const baseValues = Object.keys(data).length > 0 ? data : prevValues;
+          const updatedValues = { ...baseValues };
+          let hasChanges = false;
+          const isEditMode = data && (data.id || data._id);
+    
+          // Process all form fields to set default values for hidden and disabled fields
+          Object.keys(form).forEach(formKey => {
+            Object.keys(form[formKey]).forEach(fieldKey => {
+              const field = form[formKey][fieldKey];
+              const fieldId = field.dataId || fieldKey;
+              
+              // Check if field is disabled
+              const isDisabled = (field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object')
+                ? isModal 
+                ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field?.meta?.disableEdit?.edit && isEditMode)
+                : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field?.meta?.disableEdit?.edit && isEditMode)
+                : field?.meta?.disableEdit;
+              
+              // Set default value for hidden fields or disabled fields with default values
+              if (field?.meta?.defaultValue !== undefined) {
+                // In create mode, always update disabled/hidden fields with default values when form config changes
+                // This ensures context switching (Operation -> Restoration) updates the field correctly
+                const shouldUpdate = !propHasValue(updatedValues[fieldId]) || 
+                  (isCreate && !isEditMode && (field?.meta?.hidden === true || isDisabled));
+                
+                if (shouldUpdate && (field?.meta?.hidden === true || isDisabled)) {
+                  updatedValues[fieldId] = field.meta.defaultValue;
+                  hasChanges = true;
+                }
               }
-            }
+            });
           });
+    
+          if (hasChanges) {
+            // Also set the values in the Ant Design form
+            MainForm.setFieldsValue(updatedValues);
+            return updatedValues;
+          }
+          return prevValues;
         });
-  
-        if (hasChanges) {
-          setValues(updatedValues);
-          // Also set the values in the Ant Design form
-          MainForm.setFieldsValue(updatedValues);
-        }
       }
-    }, [form, data, isModal]);
+    }, [form, data, isModal, isCreate]);
 
   const setSelectedForm = (id) => {
     setForms(Forms.map(form => {

package/src/@daf/pages/Summary/Activities/Restoration/helper.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 // ============================================================================
 // REGION: Photo/Image Extraction
 // ============================================================================
@@ -122,93 +120,6 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
     });
 };
 
-// ============================================================================
-// REGION: Multiselect Options
-// ============================================================================
-
-/**
- * Get filtered options for multiselect based on activityData.origin
- * Filters options based on whether origin contains 'kobo', 'straatos', or both
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @param {React.Component} CustomIcon - CustomIcon component for rendering Monitor option avatar
- * @returns {Array} - Filtered array of option objects
- */
-export const getFilteredOptions = (activityData, CustomIcon) => {
-    const allOptions = [
-        {
-            label: "Own Data",
-            value: "own",
-            avatar: <span>OWN</span>,
-            background: "#016C6E",
-            color: "white",
-        },
-        {
-            label: "Monitor",
-            value: "other",
-            avatar: <CustomIcon name={"Search02"} size={14} />,
-        },
-    ];
-
-    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-        return allOptions;
-    }
-
-    // Extract origin names from the array
-    const originNames = activityData.origin
-        .map(item => item?.name?.toLowerCase())
-        .filter(Boolean);
-
-    const hasKobo = originNames.includes('kobo');
-    const hasStraatos = originNames.includes('straatos');
-
-    // If contains kobo only, show only Monitor
-    if (hasKobo && !hasStraatos) {
-        return allOptions.filter(option => option.value === 'other');
-    }
-
-    // If contains straatos only, show only Own Data
-    if (hasStraatos && !hasKobo) {
-        return allOptions.filter(option => option.value === 'own');
-    }
-
-    // If contains both or neither, show both
-    return allOptions;
-};
-
-/**
- * Get default selected value for multiselect based on activityData.origin
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @returns {Array} - Array of default selected values
- */
-export const getDefaultSelected = (activityData) => {
-    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-        return ['own'];
-    }
-
-    // Extract origin names from the array
-    const originNames = activityData.origin
-        .map(item => item?.name?.toLowerCase())
-        .filter(Boolean);
-
-    const hasKobo = originNames.includes('kobo');
-    const hasStraatos = originNames.includes('straatos');
-
-    // If contains kobo only, default to monitor (other)
-    if (hasKobo && !hasStraatos) {
-        return ['other'];
-    }
-
-    // If contains straatos only, default to own
-    if (hasStraatos && !hasKobo) {
-        return ['own'];
-    }
-
-    // If contains both or neither, default to own
-    return ['own'];
-};
-
 // ============================================================================
 // REGION: Activity Indicators
 // ============================================================================

package/src/@daf/pages/Summary/Activities/Restoration/index.jsx

@@ -1,7 +1,7 @@
 import { useMemo, useCallback } from 'react';
-import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators, Multiselect, CustomIcon } from '../../../../../../src/index.js'
+import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig, getFilteredOptions, getDefaultSelected } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
 import { useResizeContext } from '../../../../../../src/context';
 
@@ -24,18 +24,6 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         [activityData, t]
     );
 
-    // Filter options based on activityData.origin
-    const filteredOptions = useMemo(() => 
-        getFilteredOptions(activityData, CustomIcon),
-        [activityData]
-    );
-
-    // Get default selected based on activityData.origin
-    const defaultSelected = useMemo(() => 
-        getDefaultSelected(activityData),
-        [activityData]
-    );
-
     return (
         <DashboardLayout
             header={
@@ -48,24 +36,6 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                     breadcrumbs={breadcrumbs}
                     goBackTo={goBackTo}
                     loading={loading}
-                    addedHeaderFirst
-                    addedHeader={
-                            <div style={{ marginRight: 0 }}>
-                                <Multiselect
-                                    canUnselectLast={false}
-                                    options={filteredOptions}
-                                    isAvatarGroup
-                                    selectionType="checkbox"
-                                    onChange={(selected) => {
-                                        console.log(selected);
-                                    }}
-                                    dropDownWidth={200}
-                                    defaultSelected={defaultSelected}
-                                    placeholder="Select partners..."
-                                />
-                            </div>
-                        
-                    }
                 />
             }
         >
@@ -87,6 +57,57 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                             app={"straatos"}
                             showSider={false}
                             user={null}
+                            data={[
+                                {
+                                    _id: {},
+                                    id: "7f2aaed4-4b2e-406c-8e0a-6659c5c8367b",
+                                    color: "#6698E4",
+                                    parent: {
+                                        _id: {},
+                                        createdAt: "2024-06-13T14:51:55.296Z",
+                                        updatedAt: "2024-06-13T14:51:55.296Z",
+                                        id: "a5340bf1-2c7d-413f-a2a5-ccd7dc8f7a7c",
+                                        name: "New Mine",
+                                        authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+                                        collectId: "f8a2b6a9cc935ef3e5844427f49aade34e152eca",
+                                        country: "AL",
+                                        category: "mineSite",
+                                        datastakeId: "LOC-00000000141",
+                                        __v: 0,
+                                    },
+                                    administrativeLevel1: "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
+                                    administrativeLevel2: "f849835d-5640-4bee-ae98-9f1c810c1abe",
+                                    // "name": "New Mine",
+                                    country: "AL",
+                                    category: "mineSite",
+                                    authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+                                    gps: {
+                                        latitude: 7,
+                                        longitude: 1,
+                                    },
+                                    area: [
+                                        [6, 5],
+                                        [7, 1],
+                                        [9, 2],
+                                    ],
+                                    associatedSubjects: [
+                                        {
+                                            entity: "Event",
+                                            _id: {},
+                                            nature: "",
+                                        },
+                                    ],
+                                    published: false,
+                                    version: 1,
+                                    createdAt: "2024-06-13T14:51:55.296Z",
+                                    updatedAt: "2024-06-13T14:51:55.296Z",
+                                    name: "Name",
+                                    type: "Loc Type",
+                                    __v: 0,
+                                    datastakeId: "LOC-00000000141",
+                                },
+                            ]}
+                            // tooltipAsText: true,
                             primaryLink={true}
                             renderTooltip={() => {
                                 return [
@@ -96,8 +117,8 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                                     },
                                 ];
                             }}
-                          
-                            mapConfig={{ maxZoom: 18, zoom: 5, center: [14, -14] }}
+                            center={[13, -15]}
+                            mapConfig={{ maxZoom: 18 }}
                             type={'territory'}
                             link={true}
                             onClickLink={() => { }}