datastake-daf 0.6.806 → 0.6.807

package/dist/pages/index.js

@@ -13989,7 +13989,7 @@ const getTabs = t => {
     label: t("Events")
   }];
 };
-const getFiltersConfig$a = (t, filters, locationCategories) => {
+const getFiltersConfig$b = (t, filters, locationCategories) => {
   const value = filters.type ? {
     value: filters.type
   } : {};
@@ -14192,7 +14192,7 @@ function MineSites({
     config: dataFetchConfig
   });
   const tabs = React.useMemo(() => getTabs(t), [t]);
-  const filtersConfig = React.useMemo(() => getFiltersConfig$a(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
+  const filtersConfig = React.useMemo(() => getFiltersConfig$b(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
   const onFilterChange = filters => {
     setFilters(p => ({
       ...p,
@@ -15879,7 +15879,7 @@ const NavigationAction = ({
   });
 };
 
-const getColumns$f = ({
+const getColumns$g = ({
   t,
   data,
   user,
@@ -16005,7 +16005,7 @@ function OrganisationInformation({
     });
   }, [organisationInfo, data]);
   const columns = React.useMemo(() => {
-    return getColumns$f({
+    return getColumns$g({
       t,
       data: tableData,
       user,
@@ -16136,7 +16136,7 @@ const Style$8 = styled__default["default"].div`
   }
 `;
 
-const getColumns$e = ({
+const getColumns$f = ({
   t = () => {},
   options = {},
   user = {},
@@ -16293,7 +16293,7 @@ function ProductionSites({
     return productionSites?.length > 5 ? ComponentWithFocus : "div";
   }, [productionSites]);
   const columns = React.useMemo(() => {
-    return getColumns$e({
+    return getColumns$f({
       t,
       options,
       user,
@@ -16527,7 +16527,7 @@ const getAdminLevelName = (data, level) => {
   return entry?.name || "-";
 };
 
-const getColumns$d = ({
+const getColumns$e = ({
   t,
   activeTab,
   options,
@@ -16821,7 +16821,7 @@ function AssociatedInformation$1({
   console.log({
     data
   });
-  const columns = React.useMemo(() => getColumns$d({
+  const columns = React.useMemo(() => getColumns$e({
     t,
     isMonitoring: false,
     activeTab,
@@ -17160,7 +17160,7 @@ const copyToClipboard = id => {
   }
 };
 
-const filtersConfig = {
+const filtersConfig$1 = {
   name: "",
   datastakeId: ""
 };
@@ -17179,7 +17179,7 @@ const selectFiltersConfig = {
     getValue: option => option.value
   }
 };
-const checkboxConfig = {
+const checkboxConfig$1 = {
   name: "Name",
   datastakeId: "ID"
 };
@@ -17205,7 +17205,7 @@ const getPartnershipTypes = t => {
   }];
 };
 
-const getColumns$c = ({
+const getColumns$d = ({
   t,
   accept,
   decline,
@@ -19366,6 +19366,12 @@ const showHideInput$3 = (input, formsValue, repeatValues) => {
   }
   return true;
 };
+const getNkey = namespace => {
+  if (['location', 'scl', 'village', 'event', 'incidents', 'corrective-actions', 'testimonials', 'initiatives', 'victims', 'pictures', 'documents', 'lir', 'sp', 'im', 'sci', 'bpe', 'gm'].includes(namespace)) {
+    return 'scoping';
+  }
+  return namespace;
+};
 const groupSubsections = (form, onlyConf = false) => {
   return Object.keys(form).reduce((f, fKey) => {
     if (form[fKey].subSection) {
@@ -40508,7 +40514,7 @@ const PartnersTable = ({
     setTotalRequests,
     t
   });
-  const columns = React.useMemo(() => getColumns$c({
+  const columns = React.useMemo(() => getColumns$d({
     t,
     accept,
     decline,
@@ -40571,13 +40577,13 @@ const PartnersTable = ({
       defaultActiveTab: "partners",
       columns: columns,
       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: "partners",
       getActiveTab: handleActiveTabChange,
@@ -40670,12 +40676,12 @@ const Create = ({
   let {
     form = {},
     data = defaultData || {}
-  } = !edit ? formData || {} : {
+  } = !edit ? formData[`${APP}-${view}`] || {} : {
     form: formConfig,
     data: formValue
   };
   React.useEffect(() => {
-    if (Object.keys(form).length === 0) {
+    if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
       if (!edit) {
         getData({
           namespace,
@@ -40745,7 +40751,7 @@ const Create = ({
   });
 };
 
-const getFiltersConfig$9 = ({
+const getFiltersConfig$a = ({
   t
 }) => {
   return {
@@ -40776,7 +40782,7 @@ const getFiltersConfig$9 = ({
     }
   };
 };
-const getFilterOptions$9 = (options, t) => {
+const getFilterOptions$a = (options, t) => {
   const {
     countries,
     category,
@@ -40880,7 +40886,7 @@ function sourceAvatarConfig(items, user, applications) {
   });
 }
 
-const getColumns$b = ({
+const getColumns$c = ({
   t,
   goTo,
   user,
@@ -41034,7 +41040,7 @@ const getColumns$b = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$8 = ({
+const getFiltersConfig$9 = ({
   t
 }) => {
   return {
@@ -41202,7 +41208,7 @@ const getFiltersConfig$8 = ({
     }
   };
 };
-const getFilterOptions$8 = (options, t) => {
+const getFilterOptions$9 = (options, t) => {
   const {
     statusOptions,
     categoryOptions,
@@ -41271,7 +41277,7 @@ const renderStatusTag = ({
   }
 };
 
-const getColumns$a = ({
+const getColumns$b = ({
   t,
   goTo,
   user,
@@ -41478,7 +41484,7 @@ const getColumns$a = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$7 = ({
+const getFiltersConfig$8 = ({
   t
 }) => {
   return {
@@ -41619,7 +41625,7 @@ const getFiltersConfig$7 = ({
     }
   };
 };
-const getFilterOptions$7 = (options, t) => {
+const getFilterOptions$8 = (options, t) => {
   const {
     statusOptions,
     categoryOptions,
@@ -41657,7 +41663,7 @@ const viewConfig$6 = {
   createTitle: "Create Worker"
 };
 
-const getColumns$9 = ({
+const getColumns$a = ({
   t,
   goTo,
   user,
@@ -41833,7 +41839,7 @@ const getColumns$9 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$6 = ({
+const getFiltersConfig$7 = ({
   t
 }) => {
   return {
@@ -41985,7 +41991,7 @@ const getFiltersConfig$6 = ({
     }
   };
 };
-const getFilterOptions$6 = (options, t) => {
+const getFilterOptions$7 = (options, t) => {
   const {
     timeframe = [],
     status,
@@ -42144,7 +42150,7 @@ MoreTags.propTypes = {
   limit: PropTypes__default["default"].number
 };
 
-const getColumns$8 = ({
+const getColumns$9 = ({
   t,
   goTo,
   user,
@@ -42376,7 +42382,7 @@ const getColumns$8 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$5 = ({
+const getFiltersConfig$6 = ({
   t
 }) => {
   return {
@@ -42548,7 +42554,7 @@ const getFiltersConfig$5 = ({
     }
   };
 };
-const getFilterOptions$5 = (options, t) => {
+const getFilterOptions$6 = (options, t) => {
   const {
     timeframe = [],
     statusOptions,
@@ -42601,7 +42607,7 @@ const getEventCategoryBySubject = (eventCategoryObject, subject, isSingular = fa
   return eventCategoryObject[key] || null;
 };
 
-const getColumns$7 = ({
+const getColumns$8 = ({
   t,
   goTo,
   user,
@@ -42811,7 +42817,7 @@ const getColumns$7 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$4 = ({
+const getFiltersConfig$5 = ({
   t
 }) => {
   return {
@@ -42982,7 +42988,7 @@ const getFiltersConfig$4 = ({
     }
   };
 };
-const getFilterOptions$4 = (options, t) => {
+const getFilterOptions$5 = (options, t) => {
   const {
     timeframe = [],
     statusOptions,
@@ -43026,7 +43032,7 @@ const viewConfig$3 = {
   createTitle: "Create Incident"
 };
 
-const getColumns$6 = ({
+const getColumns$7 = ({
   t,
   goTo,
   user,
@@ -43236,7 +43242,7 @@ const getColumns$6 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$3 = ({
+const getFiltersConfig$4 = ({
   t
 }) => {
   return {
@@ -43267,7 +43273,7 @@ const getFiltersConfig$3 = ({
     }
   };
 };
-const getFilterOptions$3 = (options, t) => {
+const getFilterOptions$4 = (options, t) => {
   const {
     countries,
     category,
@@ -43289,7 +43295,7 @@ const viewConfig$2 = {
   createTitle: "Create Location"
 };
 
-const getColumns$5 = ({
+const getColumns$6 = ({
   t,
   goTo,
   user,
@@ -43459,7 +43465,7 @@ const getColumns$5 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$2 = ({
+const getFiltersConfig$3 = ({
   t
 }) => {
   return {
@@ -43617,7 +43623,7 @@ const getFiltersConfig$2 = ({
     }
   };
 };
-const getFilterOptions$2 = (options, t) => {
+const getFilterOptions$3 = (options, t) => {
   const {
     statusOptions = [],
     categoryOptions = [],
@@ -43703,7 +43709,7 @@ MoreOptions.propTypes = {
   limit: PropTypes__default["default"].number
 };
 
-const getColumns$4 = ({
+const getColumns$5 = ({
   t,
   goTo,
   user,
@@ -43912,7 +43918,7 @@ const getColumns$4 = ({
   }
 }].filter(column => column.show !== false);
 
-const getFiltersConfig$1 = ({
+const getFiltersConfig$2 = ({
   t
 }) => {
   return {
@@ -43925,7 +43931,7 @@ const getFiltersConfig$1 = ({
     }
   };
 };
-const getFilterOptions$1 = (options, t) => {
+const getFilterOptions$2 = (options, t) => {
   const {
     timeframe = []
   } = options || {};
@@ -43945,7 +43951,7 @@ const viewConfig = {
   createTitle: "Create Document"
 };
 
-const getColumns$3 = ({
+const getColumns$4 = ({
   t,
   goTo,
   user,
@@ -44066,81 +44072,81 @@ const getColumns$3 = ({
 
 const FILTER_REGISTRY = {
   stakeholders: {
-    config: getFiltersConfig$9,
-    options: getFilterOptions$9,
+    config: getFiltersConfig$a,
+    options: getFilterOptions$a,
     formConfig: formConfig$8,
     viewConfig: viewConfig$8,
-    columns: getColumns$b
+    columns: getColumns$c
   },
   workers: {
-    config: getFiltersConfig$7,
-    options: getFilterOptions$7,
+    config: getFiltersConfig$8,
+    options: getFilterOptions$8,
     formConfig: formConfig$6,
     viewConfig: viewConfig$6,
-    columns: getColumns$9
+    columns: getColumns$a
   },
   operators: {
-    config: getFiltersConfig$8,
-    options: getFilterOptions$8,
+    config: getFiltersConfig$9,
+    options: getFilterOptions$9,
     formConfig: formConfig$7,
     viewConfig: viewConfig$7,
-    columns: getColumns$a
+    columns: getColumns$b
   },
   events: {
-    config: getFiltersConfig$6,
-    options: getFilterOptions$6,
+    config: getFiltersConfig$7,
+    options: getFilterOptions$7,
     formConfig: formConfig$5,
     viewConfig: viewConfig$5,
-    columns: getColumns$8
+    columns: getColumns$9
   },
   activities: {
-    config: getFiltersConfig$5,
-    options: getFilterOptions$5,
+    config: getFiltersConfig$6,
+    options: getFilterOptions$6,
     formConfig: formConfig$4,
     viewConfig: viewConfig$4,
-    columns: getColumns$7
+    columns: getColumns$8
   },
   'corrective-actions': {
-    config: getFiltersConfig$5,
-    options: getFilterOptions$5,
+    config: getFiltersConfig$6,
+    options: getFilterOptions$6,
     formConfig: formConfig$4,
     viewConfig: viewConfig$4,
-    columns: getColumns$7
+    columns: getColumns$8
   },
   incidents: {
-    config: getFiltersConfig$4,
-    options: getFilterOptions$4,
+    config: getFiltersConfig$5,
+    options: getFilterOptions$5,
     formConfig: formConfig$3,
     viewConfig: viewConfig$3,
-    columns: getColumns$6
+    columns: getColumns$7
   },
   locations: {
-    config: getFiltersConfig$3,
-    options: getFilterOptions$3,
+    config: getFiltersConfig$4,
+    options: getFilterOptions$4,
     formConfig: formConfig$2,
     viewConfig: viewConfig$2,
-    columns: getColumns$5
+    columns: getColumns$6
   },
   'production-sites': {
-    config: getFiltersConfig$2,
-    options: getFilterOptions$2,
+    config: getFiltersConfig$3,
+    options: getFilterOptions$3,
     formConfig: formConfig$1,
     viewConfig: viewConfig$1,
-    columns: getColumns$4
+    columns: getColumns$5
   },
   scl: {
-    config: getFiltersConfig$2,
-    options: getFilterOptions$2,
+    config: getFiltersConfig$3,
+    options: getFilterOptions$3,
     formConfig: sclFormConfig,
     viewConfig: sclViewConfig,
-    columns: getColumns$4
+    columns: getColumns$5
   },
   documents: {
-    config: getFiltersConfig$1,
-    options: getFilterOptions$1,
+    config: getFiltersConfig$2,
+    options: getFilterOptions$2,
     formConfig: formConfig,
     viewConfig: viewConfig,
-    columns: getColumns$3
+    columns: getColumns$4
   }
 };
 const DEFAULT_SUBJECT = 'stakeholders';
@@ -44161,7 +44167,7 @@ const getSelectFiltersConfig = ({
     datastakeId: ''
   };
 };
-const getFiltersConfig = ({
+const getFiltersConfig$1 = ({
   t,
   subject
 }) => {
@@ -44170,7 +44176,7 @@ const getFiltersConfig = ({
     t
   });
 };
-const getFilterOptions = ({
+const getFilterOptions$1 = ({
   t,
   subject,
   options
@@ -44191,7 +44197,7 @@ const getViewConfig = ({
   return registry?.viewConfig;
 };
 
-const getColumns$2 = ({
+const getColumns$3 = ({
   t,
   goTo,
   user,
@@ -44279,7 +44285,7 @@ const useTablePage = ({
     extendingFilters: extendingFilters,
     subject
   });
-  const columns = React.useMemo(() => getColumns$2({
+  const columns = React.useMemo(() => getColumns$3({
     t,
     goTo,
     user,
@@ -44291,21 +44297,21 @@ const useTablePage = ({
     data,
     applications,
     APP
-  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications, subject, getColumns$2, APP]);
-  const selectFiltersConfig = React.useMemo(() => getFiltersConfig({
+  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications, subject, getColumns$3, APP]);
+  const selectFiltersConfig = React.useMemo(() => getFiltersConfig$1({
     t,
     subject
-  }), [t, subject, getFiltersConfig]);
+  }), [t, subject, getFiltersConfig$1]);
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
-      ...getFilterOptions({
+      ...getFilterOptions$1({
         t,
         subject,
         options
       })
     }));
-  }, [options, t, subject, getFilterOptions]);
+  }, [options, t, subject, getFilterOptions$1]);
   const checkboxConfig = React.useMemo(() => getCheckboxConfig({
     subject
   }), [subject, getCheckboxConfig]);
@@ -55068,7 +55074,7 @@ const CommunityParticipation = ({
 const ACTIVITIES_TAB$1 = 'activities';
 const PARTNERS_TAB$1 = 'partners';
 const INCIDENTS_TAB$1 = 'incidents';
-const getColumns$1 = ({
+const getColumns$2 = ({
   projectId,
   t,
   show = 'show',
@@ -55749,7 +55755,7 @@ const AssociatedInformation = ({
   const handleTabChange = React.useCallback(value => {
     setActiveTab(value);
   }, []);
-  const columns = React.useMemo(() => getColumns$1({
+  const columns = React.useMemo(() => getColumns$2({
     t,
     activeTab,
     view: activeTab,
@@ -58026,6 +58032,612 @@ const MonitoringActivitySummary = ({
   });
 };
 
+const getColumns$1 = ({
+  t,
+  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"
+      });
+    }
+    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 || {};
+  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$1({
+    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 useViewUrlParams = ({
   params,
   push,
@@ -58137,45 +58749,65 @@ const usePrepareForm$1 = ({
   const [linkingForms, setLinkingForms] = React.useState({});
   const [loading, setLoading] = React.useState(true);
   const [notFound, setNotFound] = React.useState(false);
+  console.log({
+    form,
+    data,
+    groups,
+    linkingForms,
+    loading,
+    notFound
+  });
   const prepareForm = currentView => {
     const dKey = namespaceConfig?.dataKey;
-    if (hasKeyInObject(allData, dKey)) {
+    const nKey = `${APP}-${currentView}`;
+    console.log({
+      dKey,
+      nKey,
+      allData
+    });
+    console.log({
+      condition1: hasKeyInObject(allData, dKey)
+    });
+    console.log({
+      condition2: hasKeyInObject(allData[dKey], nKey)
+    });
+    if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
       const {
         form = {},
         data = {},
         config = {},
         linkingForms = {}
-      } = JSON.parse(JSON.stringify(allData[dKey] || {}));
-      if (Object.keys(form).length > 0) {
-        if (data.datastakeId === id || id === "user" || data.id === id) {
-          if (viewConfig.adminNamespaces.includes(namespace)) {
-            setForm(form);
-          } else {
-            setForm({
-              ...form,
-              linking: {
-                position: 100,
-                excludeFromEdit: true,
-                label: t("Linked Subjects"),
-                template: "linkingSubjects"
-              }
-            });
-          }
-          setData(data);
-          setGroups(config.groups || {});
-          setLinkingForms(linkingForms);
+      } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
+      console.log("here", dKey, nKey);
+      if (data.datastakeId === id || id === "user" || data.id === id) {
+        if (viewConfig.adminNamespaces.includes(namespace)) {
+          setForm(form);
+        } else {
+          setForm({
+            ...form,
+            linking: {
+              position: 100,
+              excludeFromEdit: true,
+              label: t("Linked Subjects"),
+              template: "linkingSubjects"
+            }
+          });
+        }
+        setData(data);
+        setGroups(config.groups || {});
+        setLinkingForms(linkingForms);
+        setLoading(false);
+        setNotFound(false);
+      } else if (!data.id) {
+        if (mode === "proxy") {
+          window.location.reload();
+        } else {
           setLoading(false);
-          setNotFound(false);
-        } else if (!data.id) {
-          if (mode === "proxy") {
-            window.location.reload();
-          } else {
-            setLoading(false);
-            setNotFound(true);
-          }
+          setNotFound(true);
         }
       }
     }
+    console.log('data', data);
   };
   const getCertainData = allData?.[namespaceConfig?.dataKey];
   React.useEffect(() => {
@@ -58307,7 +58939,8 @@ const useCallToGetData = ({
   const isFirstRender = React.useRef(true);
   const callToGetData = (_doCall = false) => {
     const dKey = namespaceConfig?.dataKey;
-    const doCall = _doCall ? true : hasKeyInObject(allData, dKey) ? allData[dKey]?.data?.datastakeId !== id : true;
+    const nKey = `${APP}-${getNkey(namespace || "")}`;
+    const doCall = _doCall ? true : hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey) ? allData[dKey][nKey]?.data?.datastakeId !== id : true;
     if (doCall) {
       if (isSupported) {
         namespaceGet[namespace]();
@@ -59154,15 +59787,16 @@ const usePrepareForm = ({
   const prepareForm = (setExtra = true) => {
     if (isSupported) {
       const dKey = namespaceConfig?.dataKey;
-      if (hasKeyInObject(allData, dKey)) {
-        const d = JSON.parse(JSON.stringify(allData[dKey].data || {}));
+      const nKey = `${APP}-${namespaceConfig?.view}`;
+      if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
+        const d = JSON.parse(JSON.stringify(allData[dKey][nKey].data || {}));
         Object.keys(d).forEach(k => {
           if (d[k] === null) {
             d[k] = undefined;
           }
         });
         if (d.datastakeId === id || d.applicationId === id || id === "user" || d.id === id) {
-          const formG = mapFormGroup(allData[dKey].form || {}, d);
+          const formG = mapFormGroup(allData[dKey][nKey].form || {}, d);
           setForm(formG);
           if (setExtra) {
             if ((d || {}).risk && Array.isArray(formG) && formG.find(r => r.id === "risk")) {
@@ -59198,7 +59832,7 @@ const usePrepareForm = ({
                 setOriginalData({
                   ...d
                 });
-                setLinkingForms(allData[dKey].linkingForms);
+                setLinkingForms(allData[dKey][nKey].linkingForms);
                 setLoading(false);
                 return;
               }
@@ -59214,7 +59848,7 @@ const usePrepareForm = ({
             setOriginalData({
               ...d
             });
-            setLinkingForms(allData[dKey].linkingForms);
+            setLinkingForms(allData[dKey][nKey].linkingForms);
             setLoading(false);
           }
         }
@@ -59655,4 +60289,5 @@ exports.SelfAssesment = SelfAssesment;
 exports.SupplyChainDashboard = SupplyChain;
 exports.TablePage = TablePage;
 exports.UserDashboard = UserDashboard;
+exports.UsersTable = UsersTable;
 exports.View = View;