datastake-daf 0.6.753 → 0.6.755

package/dist/pages/index.js

@@ -13282,7 +13282,7 @@ const getTabs = t => {
     label: t("Events")
   }];
 };
-const getFiltersConfig$9 = (t, filters, locationCategories) => {
+const getFiltersConfig$a = (t, filters, locationCategories) => {
   const value = filters.type ? {
     value: filters.type
   } : {};
@@ -13485,7 +13485,7 @@ function MineSites({
     config: dataFetchConfig
   });
   const tabs = React.useMemo(() => getTabs(t), [t]);
-  const filtersConfig = React.useMemo(() => getFiltersConfig$9(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
+  const filtersConfig = React.useMemo(() => getFiltersConfig$a(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
   const onFilterChange = filters => {
     setFilters(p => ({
       ...p,
@@ -16039,7 +16039,7 @@ const getLinkValue$4 = (value, linkingObject) => {
   }
   return null;
 };
-const getColumns$8 = ({
+const getColumns$9 = ({
   t,
   goTo,
   user,
@@ -16242,11 +16242,11 @@ const getColumns$8 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$8 = {
+const checkboxConfig$9 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$8 = ({
+const getFiltersConfig$9 = ({
   t
 }) => {
   return {
@@ -16414,11 +16414,11 @@ const getFiltersConfig$8 = ({
     }
   };
 };
-const filtersConfig$8 = {
+const filtersConfig$9 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$8 = (options, t) => {
+const getFilterOptions$9 = (options, t) => {
   const {
     statusOptions = [],
     categoryOptions = [],
@@ -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;
@@ -30015,7 +30028,7 @@ const OperatorsTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState('own');
-  const columns = React.useMemo(() => getColumns$8({
+  const columns = React.useMemo(() => getColumns$9({
     t,
     goTo,
     user,
@@ -30058,14 +30071,14 @@ const OperatorsTable = ({
     }, 'operators');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$8({
+    return getFiltersConfig$9({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$8(options)
+      ...getFilterOptions$9(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -30081,13 +30094,13 @@ const OperatorsTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$8,
+    checkboxConfig: checkboxConfig$9,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$8,
+    filtersConfig: filtersConfig$9,
     isMobile: isMobile,
     view: "operators",
     getActiveTab: handleActiveTabChange,
@@ -30134,7 +30147,7 @@ const getLinkValue$3 = (value, linkingObject) => {
   }
   return null;
 };
-const getColumns$7 = ({
+const getColumns$8 = ({
   t,
   goTo,
   user,
@@ -30320,11 +30333,11 @@ const getColumns$7 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$7 = {
+const checkboxConfig$8 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$7 = ({
+const getFiltersConfig$8 = ({
   t
 }) => {
   return {
@@ -30355,11 +30368,11 @@ const getFiltersConfig$7 = ({
     }
   };
 };
-const filtersConfig$7 = {
+const filtersConfig$8 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$7 = (options, t) => {
+const getFilterOptions$8 = (options, t) => {
   const {
     countries = [],
     category = []
@@ -30502,7 +30515,7 @@ const LocationsTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$7({
+  const columns = React.useMemo(() => getColumns$8({
     t,
     goTo,
     user,
@@ -30538,14 +30551,14 @@ const LocationsTable = ({
     data
   });
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$7({
+    return getFiltersConfig$8({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$7(options)
+      ...getFilterOptions$8(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -30564,13 +30577,13 @@ const LocationsTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$7,
+    checkboxConfig: checkboxConfig$8,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$7,
+    filtersConfig: filtersConfig$8,
     isMobile: isMobile,
     view: "locations",
     getActiveTab: handleActiveTabChange,
@@ -30609,7 +30622,7 @@ const LocationsTable = ({
   });
 };
 
-const getColumns$6 = ({
+const getColumns$7 = ({
   t,
   goTo,
   user,
@@ -30780,11 +30793,11 @@ const getColumns$6 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$6 = {
+const checkboxConfig$7 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$6 = ({
+const getFiltersConfig$7 = ({
   t
 }) => {
   return {
@@ -30815,11 +30828,11 @@ const getFiltersConfig$6 = ({
     }
   };
 };
-const filtersConfig$6 = {
+const filtersConfig$7 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$6 = (options, t) => {
+const getFilterOptions$7 = (options, t) => {
   const {
     countries = [],
     category = []
@@ -30962,7 +30975,7 @@ const StakeholdersTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$6({
+  const columns = React.useMemo(() => getColumns$7({
     t,
     goTo,
     user,
@@ -30994,14 +31007,14 @@ const StakeholdersTable = ({
     }, 'stakeholders');
   }, [paginationQuery, otherParams, searchParams, activeTab]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$6({
+    return getFiltersConfig$7({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$6(options)
+      ...getFilterOptions$7(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -31020,13 +31033,13 @@ const StakeholdersTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$6,
+    checkboxConfig: checkboxConfig$7,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$6,
+    filtersConfig: filtersConfig$7,
     isMobile: isMobile,
     view: "stakeholders",
     getActiveTab: handleActiveTabChange,
@@ -31208,7 +31221,7 @@ const renderEventStatusTag = ({
       });
   }
 };
-const getColumns$5 = ({
+const getColumns$6 = ({
   t,
   goTo,
   user,
@@ -31442,11 +31455,11 @@ const getColumns$5 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$5 = {
+const checkboxConfig$6 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$5 = ({
+const getFiltersConfig$6 = ({
   t
 }) => {
   return {
@@ -31634,11 +31647,11 @@ const getFiltersConfig$5 = ({
     }
   };
 };
-const filtersConfig$5 = {
+const filtersConfig$6 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$5 = (options, t) => {
+const getFilterOptions$6 = (options, t) => {
   const {
     timeframe = [],
     status = [],
@@ -31796,7 +31809,7 @@ const EventsTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$5({
+  const columns = React.useMemo(() => getColumns$6({
     t,
     goTo,
     user,
@@ -31840,14 +31853,14 @@ const EventsTable = ({
     }, 'events');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$5({
+    return getFiltersConfig$6({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$5(options)
+      ...getFilterOptions$6(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -31866,13 +31879,13 @@ const EventsTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$5,
+    checkboxConfig: checkboxConfig$6,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$5,
+    filtersConfig: filtersConfig$6,
     isMobile: isMobile,
     view: "events",
     getActiveTab: handleActiveTabChange,
@@ -31912,7 +31925,7 @@ const EventsTable = ({
   });
 };
 
-const getColumns$4 = ({
+const getColumns$5 = ({
   t,
   goTo,
   user,
@@ -32046,11 +32059,11 @@ const getColumns$4 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$4 = {
+const checkboxConfig$5 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$4 = ({
+const getFiltersConfig$5 = ({
   t
 }) => {
   return {
@@ -32063,11 +32076,11 @@ const getFiltersConfig$4 = ({
     }
   };
 };
-const filtersConfig$4 = {
+const filtersConfig$5 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$4 = (options, t) => {
+const getFilterOptions$5 = (options, t) => {
   const {
     timeframe = []
   } = options || {};
@@ -32208,7 +32221,7 @@ const DocumentsTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$4({
+  const columns = React.useMemo(() => getColumns$5({
     t,
     goTo,
     user,
@@ -32245,14 +32258,14 @@ const DocumentsTable = ({
     }, 'documents');
   }, [paginationQuery, otherParams, searchParams, activeTab]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$4({
+    return getFiltersConfig$5({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$4(options)
+      ...getFilterOptions$5(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -32271,13 +32284,13 @@ const DocumentsTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$4,
+    checkboxConfig: checkboxConfig$5,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$4,
+    filtersConfig: filtersConfig$5,
     isMobile: isMobile,
     view: "documents",
     getActiveTab: handleActiveTabChange,
@@ -32351,7 +32364,7 @@ const renderStatusTag$2 = ({
       });
   }
 };
-const getColumns$3 = ({
+const getColumns$4 = ({
   t,
   goTo,
   user,
@@ -32523,11 +32536,11 @@ const getColumns$3 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$3 = {
+const checkboxConfig$4 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$3 = ({
+const getFiltersConfig$4 = ({
   t
 }) => {
   return {
@@ -32695,11 +32708,11 @@ const getFiltersConfig$3 = ({
     }
   };
 };
-const filtersConfig$3 = {
+const filtersConfig$4 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$3 = (options, t) => {
+const getFilterOptions$4 = (options, t) => {
   const {
     statusOptions = [],
     categoryOptions = [],
@@ -32867,7 +32880,7 @@ const WorkersTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState('own');
-  const columns = React.useMemo(() => getColumns$3({
+  const columns = React.useMemo(() => getColumns$4({
     t,
     goTo,
     user,
@@ -32910,14 +32923,14 @@ const WorkersTable = ({
     }, 'workers');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$3({
+    return getFiltersConfig$4({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$3(options)
+      ...getFilterOptions$4(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -32933,13 +32946,13 @@ const WorkersTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$3,
+    checkboxConfig: checkboxConfig$4,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$3,
+    filtersConfig: filtersConfig$4,
     isMobile: isMobile,
     view: "workers",
     getActiveTab: handleActiveTabChange,
@@ -33029,7 +33042,7 @@ const renderStatusTag$1 = ({
       });
   }
 };
-const getColumns$2 = ({
+const getColumns$3 = ({
   t,
   goTo,
   user,
@@ -33249,11 +33262,11 @@ const getColumns$2 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$2 = {
+const checkboxConfig$3 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$2 = ({
+const getFiltersConfig$3 = ({
   t
 }) => {
   return {
@@ -33428,11 +33441,11 @@ const getFiltersConfig$2 = ({
     }
   };
 };
-const filtersConfig$2 = {
+const filtersConfig$3 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$2 = (options, t) => {
+const getFilterOptions$3 = (options, t) => {
   const {
     timeframe = [],
     statusOptions = [],
@@ -33602,7 +33615,7 @@ const ActivitiesTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$2({
+  const columns = React.useMemo(() => getColumns$3({
     t,
     goTo,
     user,
@@ -33645,14 +33658,14 @@ const ActivitiesTable = ({
     }, 'activities');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$2({
+    return getFiltersConfig$3({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$2(options)
+      ...getFilterOptions$3(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -33668,13 +33681,13 @@ const ActivitiesTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$2,
+    checkboxConfig: checkboxConfig$3,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$2,
+    filtersConfig: filtersConfig$3,
     isMobile: isMobile,
     view: "activities",
     getActiveTab: handleActiveTabChange,
@@ -33764,7 +33777,7 @@ const renderStatusTag = ({
       });
   }
 };
-const getColumns$1 = ({
+const getColumns$2 = ({
   t,
   goTo,
   user,
@@ -33975,11 +33988,11 @@ const getColumns$1 = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig$1 = {
+const checkboxConfig$2 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig$1 = ({
+const getFiltersConfig$2 = ({
   t
 }) => {
   return {
@@ -34154,11 +34167,11 @@ const getFiltersConfig$1 = ({
     }
   };
 };
-const filtersConfig$1 = {
+const filtersConfig$2 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions$1 = (options, t) => {
+const getFilterOptions$2 = (options, t) => {
   const {
     timeframe = [],
     statusOptions = [],
@@ -34328,7 +34341,7 @@ const IncidentsTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState("own");
-  const columns = React.useMemo(() => getColumns$1({
+  const columns = React.useMemo(() => getColumns$2({
     t,
     goTo,
     user,
@@ -34371,14 +34384,14 @@ const IncidentsTable = ({
     }, 'incidents');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig$1({
+    return getFiltersConfig$2({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions$1(options)
+      ...getFilterOptions$2(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -34394,13 +34407,13 @@ const IncidentsTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data,
-    checkboxConfig: checkboxConfig$1,
+    checkboxConfig: checkboxConfig$2,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig$1,
+    filtersConfig: filtersConfig$2,
     isMobile: isMobile,
     view: "incidents",
     getActiveTab: handleActiveTabChange,
@@ -34447,7 +34460,7 @@ const getLinkValue = (value, linkingObject) => {
   }
   return null;
 };
-const getColumns = ({
+const getColumns$1 = ({
   t,
   goTo,
   user,
@@ -34652,11 +34665,11 @@ const getColumns = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig = {
+const checkboxConfig$1 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig = ({
+const getFiltersConfig$1 = ({
   t
 }) => {
   return {
@@ -34824,11 +34837,11 @@ const getFiltersConfig = ({
     }
   };
 };
-const filtersConfig = {
+const filtersConfig$1 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions = (options, t) => {
+const getFilterOptions$1 = (options, t) => {
   const {
     statusOptions = [],
     categoryOptions = [],
@@ -34996,7 +35009,7 @@ const ProductionSitesTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState('own');
-  const columns = React.useMemo(() => getColumns({
+  const columns = React.useMemo(() => getColumns$1({
     t,
     goTo,
     user,
@@ -35038,14 +35051,14 @@ const ProductionSitesTable = ({
     }, 'production-sites');
   }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
   const selectFiltersConfig = React.useMemo(() => {
-    return getFiltersConfig({
+    return getFiltersConfig$1({
       t
     });
   }, [t]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions(options)
+      ...getFilterOptions$1(options)
     }));
   }, [options, t]);
   const handleActiveTabChange = React.useCallback(value => {
@@ -35061,13 +35074,13 @@ const ProductionSitesTable = ({
     defaultActiveTab: "own",
     columns: columns,
     data: data?.data,
-    checkboxConfig: checkboxConfig,
+    checkboxConfig: checkboxConfig$1,
     APP: APP,
     getApiBaseUrl: getApiBaseUrl,
     selectOptions: selectOptions,
     selectFiltersConfig: selectFiltersConfig,
     getRedirectLink: getRedirectLink,
-    filtersConfig: filtersConfig,
+    filtersConfig: filtersConfig$1,
     isMobile: isMobile,
     view: "production-sites",
     getActiveTab: handleActiveTabChange,
@@ -35108,60 +35121,669 @@ const ProductionSitesTable = ({
   });
 };
 
-const useSummary = ({
-  getOne,
-  getMultiple,
-  id,
-  hasSelect = false,
-  storageKey,
-  data,
-  isPdf,
-  params,
-  partners,
-  selectedPartners,
-  user,
+const getColumns = ({
   t,
-  theme = {},
-  service,
-  onIdChange = () => {}
-}) => {
-  const [search, setSearch] = React.useState("");
-  const [debouncedSearch, setDebouncedSearch] = React.useState("");
-  const [hasInitialized, setHasInitialized] = React.useState(false);
-  const [singleItemData, setSingleItemData] = React.useState();
-  const [loading, setLoading] = React.useState(false);
-  const [_partners, _setPartners] = React.useState();
-  const [selectedItem, setSelectedItem] = React.useState(undefined);
-  const dataOptions = React.useMemo(() => {
-    if (hasSelect) {
-      const mappedData = Array.isArray(data) ? data.map(item => ({
-        label: item?.name,
-        value: item?.datastakeId
-      })) : [];
-      const storedData = StorageManager$1.get(storageKey);
-      if (storedData) {
-        try {
-          const parsedStoredData = JSON.parse(storedData);
-          const existsInData = mappedData?.find(item => item.value === parsedStoredData.value);
-          if (!existsInData) {
-            return [...mappedData, parsedStoredData];
-          }
-        } catch (error) {
-          console.log('Error parsing stored data:', error);
-        }
-      }
-      return mappedData;
+  goTo,
+  user,
+  removeUser = () => {},
+  resendInvite = () => {},
+  setUserToEdit = () => {},
+  userRoles = [],
+  company = {},
+  canCreate = false,
+  app
+}) => [
+// {
+//     dataIndex: 'datastakeId',
+//     title: t('ID'),
+//     ellipsis: true,
+//     show: true,
+//     render: (v, all) => {
+//       if (all.empty) {
+//         return <div className="daf-default-cell" />
+//       }
+
+//       return <Tooltip title={v}>{v}</Tooltip>;
+//     },
+// },
+{
+  dataIndex: 'firstName',
+  title: t('Name'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
     }
-  }, [data, hasSelect, storageKey]);
-  React.useEffect(() => {
-    if (hasSelect && dataOptions && dataOptions.length > 0 && !debouncedSearch && !hasInitialized) {
-      let selectedValue;
-      if (isPdf) {
-        selectedValue = id;
-      } else {
-        const storedData = StorageManager$1.get(storageKey);
-        if (storedData) {
-          try {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'lastName',
+  title: t('Last Name'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'email',
+  title: t('Email'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  title: t("Status"),
+  dataIndex: "status",
+  key: "status",
+  width: 150,
+  ellipsis: false,
+  show: true,
+  render: (status, users) => {
+    if (users.empty) {
+      return null;
+    }
+    if (status === "inactive") {
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+        color: "red",
+        style: {
+          width: 100,
+          textAlign: "center"
+        },
+        children: t("Blocked")
+      });
+    }
+    if (status === "active") {
+      return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+        color: "green",
+        style: {
+          width: 100,
+          textAlign: "center"
+        },
+        children: t("Active")
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+      color: "orange",
+      style: {
+        width: 100,
+        textAlign: "center"
+      },
+      children: t("Pending")
+    });
+  }
+}, {
+  title: t("Last Login"),
+  dataIndex: "lastLogin",
+  key: "lastLogin",
+  width: 125,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  title: t("User Role"),
+  dataIndex: "roleName",
+  key: "role",
+  show: true,
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+
+    // Display role name if available, fallback to role ID
+    const displayValue = val || all.role;
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: displayValue,
+      children: displayValue
+    });
+  }
+}, {
+  title: t(""),
+  key: "actions",
+  width: 60,
+  show: removeUser || setUserToEdit,
+  render: (row, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _v = userRoles?.find(r => r.value === all.role);
+    const items = [removeUser ? {
+      key: "removeUser",
+      onClick: () => {
+        antd.Modal.confirm({
+          title: t("Are you sure you want to remove this user from your organisation?"),
+          onOk: () => removeUser(all.id),
+          cancelText: t("No"),
+          okText: "Yes",
+          closable: true
+        });
+      },
+      label: t("Remove User")
+    } : null, setUserToEdit ? {
+      key: "editPermission",
+      onClick: () => setUserToEdit(all),
+      disabled: all.isAdmin || _v?.isForAppAdmin,
+      label: t("Edit Permissions")
+    } : null, all.invitationToken && canCreate ? {
+      key: "copyLink",
+      onClick: () => {
+        if (location.pathname.includes(`/${APP}`)) {
+          navigator.clipboard.writeText(`${window.location.host}/${app}/r/${company.inviteToken}/${all.invitationToken}`);
+        } else {
+          navigator.clipboard.writeText(`${window.location.host}/r/${company.inviteToken}/${all.invitationToken}`);
+        }
+        antd.message.info({
+          content: t("Invitation link copied")
+        });
+      },
+      label: t("Copy Invitation Link")
+    } : null, all.invitationToken && canCreate ? {
+      key: "resendInvite",
+      onClick: () => {
+        antd.Modal.confirm({
+          title: t("Are you sure you want to invite this user again? This user will receive a new notification"),
+          onOk: () => resendInvite(all.id),
+          cancelText: t("No"),
+          okText: "Yes",
+          closable: true
+        });
+      },
+      label: t("Resend Invite")
+    } : null];
+    return /*#__PURE__*/jsxRuntime.jsx(MoreMenu, {
+      items: items
+    });
+  },
+  client: false
+}].filter(column => column.show !== false);
+
+const checkboxConfig = {
+  name: 'Name',
+  datastakeId: 'ID'
+};
+const getFiltersConfig = ({
+  t
+}) => {
+  return {
+    email: {
+      type: 'text',
+      label: 'Email',
+      placeholder: t => `${t('Filter by')} ${t('Email').toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    status: {
+      type: "select",
+      label: "Status",
+      placeholder: t => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        fley: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    },
+    timeframe: {
+      type: "timeframe",
+      label: "Timeframe",
+      placeholder: t => `${t("Filter by")} ${t("Timeframe").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    },
+    userRole: {
+      type: "select",
+      label: "User Role",
+      placeholder: t => `${t("Filter by")} ${t("User Role").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      }
+    }
+  };
+};
+const filtersConfig = {
+  name: '',
+  datastakeId: ''
+};
+const getFilterOptions = (options, t) => {
+  const {
+    emailOptions = [],
+    statusOptions = [],
+    timeframeOptions = [],
+    userRoleOptions = []
+  } = options || {};
+  console.log({
+    options
+  });
+  const _default = {
+    timeframe: timeframeOptions,
+    email: emailOptions,
+    status: statusOptions,
+    userRole: userRoleOptions,
+    status: [{
+      value: "active",
+      label: "Active"
+    }, {
+      value: "pending",
+      label: "Pending"
+    }]
+  };
+  return _default;
+};
+const getUserForm = ({
+  t,
+  userRoles = [],
+  APP
+}) => {
+  return {
+    user: {
+      position: 0,
+      firstName: {
+        group: "user",
+        section: "user",
+        moduleScope: {
+          cadd: ["scoping", "new", "linking-extra"],
+          pme: ["scoping", "new", "linking-extra"]
+        },
+        label: t("First Name"),
+        comment: false,
+        type: "text",
+        rules: [{
+          required: true,
+          message: "This field is required"
+        }],
+        mergeStrategy: "simple",
+        position: 1
+      },
+      lastName: {
+        group: "user",
+        section: "user",
+        moduleScope: {
+          cadd: ["scoping", "new", "linking-extra"],
+          pme: ["scoping", "new", "linking-extra"]
+        },
+        label: t("Last Name"),
+        comment: false,
+        type: "text",
+        rules: [{
+          required: true,
+          message: "This field is required"
+        }],
+        mergeStrategy: "simple",
+        position: 2
+      },
+      email: {
+        group: "user",
+        section: "user",
+        moduleScope: {
+          cadd: ["scoping", "new", "linking-extra"],
+          pme: ["scoping", "new", "linking-extra"]
+        },
+        label: t("Email"),
+        comment: false,
+        type: "text",
+        rules: [{
+          required: true,
+          message: "This field is required"
+        }, {
+          type: "email",
+          message: "errors::field must be email"
+        }],
+        mergeStrategy: "simple",
+        position: 3
+      },
+      role: {
+        group: "user",
+        section: "user",
+        moduleScope: {
+          cadd: ["scoping", "new", "linking", "linking-extra", "admin"],
+          pme: ["scoping", "new", "linking", "linking-extra", "admin"]
+        },
+        label: t("User Role"),
+        placeholder: t("User Role"),
+        comment: false,
+        type: "select",
+        options: userRoles.filter(r => r.canBeAssignedToSubUsers && r.app === APP).map(v => ({
+          label: t(v.label),
+          value: v.value
+        })),
+        optionsName: "userRoles",
+        // tooltip: <UserRolePopover t={t} />,
+        sortOptions: true,
+        rules: [{
+          required: true,
+          message: "This field is required"
+        }],
+        position: 4
+      }
+    }
+  };
+};
+
+const UsersCreate = ({
+  onSubmitted = () => {},
+  onCancel = () => {},
+  user = {},
+  APP,
+  query,
+  goTo = () => {},
+  t = () => {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  getAppHeader = () => {},
+  getApiBaseUrl = () => {},
+  userToEdit = null,
+  userRoles = []
+}) => {
+  const disabledInputs = React.useMemo(() => !userToEdit ? [] : ['firstName', 'lastName', 'email'], [userToEdit]);
+  const data = React.useMemo(() => ({
+    ...(userToEdit || {}),
+    userRole: userToEdit?.role
+  }), [userToEdit]);
+  const form = React.useMemo(() => getUserForm({
+    t,
+    userRoles,
+    APP
+  }), [t, userRoles, APP]);
+  return /*#__PURE__*/jsxRuntime.jsx("div", {
+    className: "daf-create-form",
+    children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
+      form: form,
+      data: data,
+      showSaveAndNext: false,
+      module: APP,
+      onCancel: onCancel,
+      isCreate: true,
+      t: t,
+      user: user,
+      ajaxForms: ajaxForms,
+      ajaxOptions: ajaxOptions,
+      getAppHeader: getAppHeader,
+      getApiBaseUrl: getApiBaseUrl,
+      changeAjaxOptions: changeAjaxOptions,
+      app: APP,
+      query: query,
+      goTo: goTo,
+      changeAjaxForms: changeAjaxForms,
+      disabledInputs: disabledInputs,
+      submit: payload => {
+        onSubmitted({
+          ...payload,
+          apps: {
+            [APP]: {
+              ...((userToEdit?.apps || {})[APP] || {}),
+              role: payload.role
+            }
+          }
+        });
+      }
+    })
+  });
+};
+
+const UsersTable = ({
+  t = () => {},
+  goTo = () => {},
+  user = {},
+  options = {},
+  getRedirectLink = () => {},
+  theme = {},
+  loading = false,
+  data = {},
+  isMobile,
+  APP,
+  location,
+  getData = () => {},
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  onInviteUser = () => {},
+  onEditUser = () => {},
+  query = {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  extendingFilters = {},
+  userRoles = []
+}) => {
+  const [selectOptions, setSelectOptions] = React.useState();
+  const params = new URLSearchParams(location?.search);
+  const [openCreateModal, setOpenCreateModal] = React.useState(params.has("create"));
+  const [userToEdit, setUserToEdit] = React.useState(null);
+  const columns = React.useMemo(() => getColumns({
+    t,
+    goTo,
+    user,
+    options,
+    getRedirectLink,
+    theme,
+    subject: 'user',
+    data,
+    setUserToEdit
+  }), [t, goTo, user, options, getRedirectLink, theme, data]);
+  const breadCrumbs = [];
+  const {
+    paginationQuery,
+    searchParams,
+    otherParams,
+    sortBy,
+    sortDir
+  } = useGetQueryParams({
+    location
+  });
+  React.useMemo(() => ({
+    ...otherParams,
+    ...extendingFilters
+  }), [otherParams, extendingFilters]);
+  React.useEffect(() => {
+    getData({
+      pagination: paginationQuery,
+      ...(Object.keys(searchParams).length > 0 && {
+        search: searchParams
+      }),
+      ...otherParams,
+      sortBy: {
+        [sortBy || 'updatedAt']: sortDir ? sortDir === 'ascend' ? 1 : -1 : -1
+      },
+      ...extendingFilters
+    }, 'users');
+  }, [location.search, JSON.stringify(extendingFilters)]);
+  const selectFiltersConfig = React.useMemo(() => getFiltersConfig({
+    t
+  }), [t]);
+  React.useEffect(() => {
+    setSelectOptions(prev => ({
+      ...prev,
+      ...getFilterOptions(options)
+    }));
+  }, [options, t]);
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "semibold form-input-output daf-create-view",
+    children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
+      title: t("users"),
+      breadcrumbs: breadCrumbs,
+      actionButtons: [{
+        type: "primary",
+        onClick: () => setOpenCreateModal(true),
+        tooltip: t("New"),
+        icon: "Add"
+      }]
+      // onDownload={() => {
+      //   console.log("download");
+      // }}
+      // downloadDisabled={false}
+    }), /*#__PURE__*/jsxRuntime.jsx(BaseScreen, {
+      t: t,
+      checkboxConfig: checkboxConfig,
+      defaultTableFilters: {},
+      columns: columns,
+      data: data,
+      loading: loading,
+      location: location,
+      goTo: goTo,
+      APP: APP,
+      getApiBaseUrl: getApiBaseUrl,
+      selectOptions: selectOptions,
+      selectFilters: selectFiltersConfig,
+      view: "users",
+      getRedirectLink: getRedirectLink,
+      defaultUrlParams: {},
+      module: APP,
+      filtersConfig: filtersConfig,
+      isMobile: isMobile
+    }), (openCreateModal || !!userToEdit) && /*#__PURE__*/jsxRuntime.jsx(antd.Drawer, {
+      destroyOnClose: true,
+      title: /*#__PURE__*/jsxRuntime.jsx(DrawerHeader, {
+        title: t(userToEdit ? "Edit User" : "New User")
+      }),
+      open: openCreateModal || !!userToEdit,
+      onClose: () => {
+        setOpenCreateModal(false);
+        setUserToEdit(null);
+      },
+      width: CREATE_DRAWER_WIDTH,
+      bodyStyle: {
+        padding: 0
+      },
+      maskClosable: false,
+      children: /*#__PURE__*/jsxRuntime.jsx(UsersCreate, {
+        t: t,
+        goTo: goTo,
+        user: user,
+        APP: APP,
+        getApiBaseUrl: getApiBaseUrl,
+        getAppHeader: getAppHeader,
+        onSubmitted: payload => {
+          if (userToEdit) {
+            onEditUser(payload);
+          } else {
+            onInviteUser(payload);
+          }
+          setOpenCreateModal(false);
+          setUserToEdit(null);
+        },
+        onCancel: () => {
+          setOpenCreateModal(false);
+          setUserToEdit(null);
+        },
+        query: query,
+        ajaxForms: ajaxForms,
+        changeAjaxForms: changeAjaxForms,
+        ajaxOptions: ajaxOptions,
+        changeAjaxOptions: changeAjaxOptions,
+        userRoles: userRoles,
+        userToEdit: userToEdit
+      })
+    })]
+  });
+};
+
+const useSummary = ({
+  getOne,
+  getMultiple,
+  id,
+  hasSelect = false,
+  storageKey,
+  data,
+  isPdf,
+  params,
+  partners,
+  selectedPartners,
+  user,
+  t,
+  theme = {},
+  service,
+  onIdChange = () => {}
+}) => {
+  const [search, setSearch] = React.useState("");
+  const [debouncedSearch, setDebouncedSearch] = React.useState("");
+  const [hasInitialized, setHasInitialized] = React.useState(false);
+  const [singleItemData, setSingleItemData] = React.useState();
+  const [loading, setLoading] = React.useState(false);
+  const [_partners, _setPartners] = React.useState();
+  const [selectedItem, setSelectedItem] = React.useState(undefined);
+  const dataOptions = React.useMemo(() => {
+    if (hasSelect) {
+      const mappedData = Array.isArray(data) ? data.map(item => ({
+        label: item?.name,
+        value: item?.datastakeId
+      })) : [];
+      const storedData = StorageManager$1.get(storageKey);
+      if (storedData) {
+        try {
+          const parsedStoredData = JSON.parse(storedData);
+          const existsInData = mappedData?.find(item => item.value === parsedStoredData.value);
+          if (!existsInData) {
+            return [...mappedData, parsedStoredData];
+          }
+        } catch (error) {
+          console.log('Error parsing stored data:', error);
+        }
+      }
+      return mappedData;
+    }
+  }, [data, hasSelect, storageKey]);
+  React.useEffect(() => {
+    if (hasSelect && dataOptions && dataOptions.length > 0 && !debouncedSearch && !hasInitialized) {
+      let selectedValue;
+      if (isPdf) {
+        selectedValue = id;
+      } else {
+        const storedData = StorageManager$1.get(storageKey);
+        if (storedData) {
+          try {
             const parsedData = JSON.parse(storedData);
             const existsInOptions = dataOptions?.find(item => item?.value === parsedData?.value);
             selectedValue = existsInOptions ? parsedData?.value : Array.isArray(dataOptions) ? dataOptions[0]?.value : undefined;
@@ -40813,6 +41435,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 +41554,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 +41891,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 +41900,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 +41929,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 +41980,9 @@ const RestorationActivitySummary = ({
                 value: "Name"
               }];
             },
+            center: [13, -15],
             mapConfig: {
-              maxZoom: 18,
-              zoom: 5,
-              center: [14, -14]
+              maxZoom: 18
             },
             type: 'territory',
             link: true,
@@ -41953,4 +42519,5 @@ exports.RestorationActivitySummary = RestorationActivitySummary;
 exports.StakeholdersTable = StakeholdersTable;
 exports.SupplyChainDashboard = SupplyChain;
 exports.UserDashboard = UserDashboard;
+exports.UsersTable = UsersTable;
 exports.WorkersTable = WorkersTable;