datastake-daf 0.6.846 → 0.6.848

package/dist/pages/index.js

@@ -7510,6 +7510,7 @@ var DashboardService$1 = createLazyService(DashboardService);
 //     url: string
 //     basePath: string,
 // }
+
 const useWidgetFetch = ({
   config,
   getData = DashboardService$1.getWidget,
@@ -7528,7 +7529,7 @@ const useWidgetFetch = ({
       const {
         data
       } = await getData(rest);
-      setData(data);
+      setData(data || defaultData);
       if (isErrorResponse(data)) {
         const errorMessage = getErrorMessage(data);
         antd.message.error(errorMessage);
@@ -7537,13 +7538,11 @@ const useWidgetFetch = ({
       onFetch();
     } catch (err) {
       console.log(err);
-    } finally {
-      setLoading(false);
     }
+    setLoading(false);
   };
   React.useEffect(() => {
     if (!stop) {
-      console.log('fetching data');
       fetchData();
     }
   }, [JSON.stringify(config), stop]);
@@ -17268,11 +17267,11 @@ function SelfAssesment({
 }
 
 class PartnerService extends BaseService {
-  get(tab, filters) {
+  get(params) {
     return this.apiGet({
       url: "/partner",
       isApp: true,
-      params: filters
+      params
     });
   }
   create(data) {
@@ -17338,8 +17337,6 @@ class PartnerService extends BaseService {
 var PartnerService$1 = createLazyService(PartnerService);
 
 const usePartnersActions = ({
-  activeTab,
-  filters,
   setTotalRequests,
   t = () => {}
 }) => {
@@ -17347,15 +17344,15 @@ const usePartnersActions = ({
   const [data, setData] = React.useState([]);
   const [requestDataFetch, setRequestDataFetch] = React.useState(false);
   const [initFetchDone, setInitFetchDone] = React.useState(false);
-  const fetchData = React.useCallback(async () => {
+  const fetchData = React.useCallback(async params => {
     setLoading(true);
     setData([]);
     try {
       const {
         data
-      } = await PartnerService$1.get(activeTab, {
-        ...filters,
-        type: activeTab
+      } = await PartnerService$1.get({
+        ...params,
+        type: params?.tab
       });
       setData(data);
       setTotalRequests(data?.meta?.total || 0);
@@ -17366,7 +17363,7 @@ const usePartnersActions = ({
     if (!initFetchDone) {
       setInitFetchDone(true);
     }
-  }, [activeTab, filters, initFetchDone, setLoading, setTotalRequests, setData, setInitFetchDone]);
+  }, [initFetchDone, setLoading, setTotalRequests, setData, setInitFetchDone]);
   const accept = React.useCallback(async id => {
     setLoading(true);
     try {
@@ -17412,22 +17409,20 @@ const usePartnersActions = ({
     setLoading(true);
     try {
       await PartnerService$1.resendInvite(id);
-      await fetchData();
     } catch (err) {
       console.log(err);
     }
     setLoading(false);
-  }, [fetchData, setLoading]);
+  }, [setLoading]);
   const block = React.useCallback(async id => {
     setLoading(true);
     try {
       await PartnerService$1.block(id);
-      await fetchData();
     } catch (err) {
       console.log(err);
     }
     setLoading(false);
-  }, [fetchData, setLoading]);
+  }, [setLoading]);
   return {
     loading,
     setLoading,
@@ -17505,20 +17500,35 @@ const filtersConfig$1 = {
   name: "",
   datastakeId: ""
 };
-const selectFiltersConfig = {
-  category: {
-    type: "select",
-    label: "Category",
-    placeholder: t => `${t("Filter by")} ${t("Category").toLowerCase()}`,
-    style: {
-      flex: 1
-    },
-    labelStyle: {
-      flex: 1
-    },
-    getLabel: option => option.label,
-    getValue: option => option.value
-  }
+const getSelectFiltersConfig$1 = ({
+  t
+}) => {
+  return {
+    category: {
+      type: "select",
+      label: "Category",
+      placeholder: t => `${t("Filter by")} ${t("Category").toLowerCase()}`,
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
+};
+const getFilterOptions$e = (options, t) => {
+  const {
+    countries,
+    category,
+    categoriesOptions
+  } = options || {};
+  return {
+    country: countries || [],
+    category: categoriesOptions || category || []
+  };
 };
 const checkboxConfig$1 = {
   name: "Name",
@@ -17556,7 +17566,8 @@ const getColumns$g = ({
   activate,
   activeTab,
   setOpen,
-  block
+  block,
+  options
 }) => [{
   title: t("ID"),
   dataIndex: "datastakeId",
@@ -17568,7 +17579,6 @@ const getColumns$g = ({
         className: "daf-default-cell"
       });
     }
-    // THE FALLBACK WAS DEPENDS BEFORE
     return v || "-";
   }
 }, {
@@ -17654,7 +17664,7 @@ const getColumns$g = ({
         className: "daf-default-cell"
       });
     }
-    return v ? findOptions(v, selectOptions?.category || []) : "-";
+    return v ? findOptions(v, options?.categoriesOptions || []) : "-";
   }
 }, {
   title: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18532,6 +18542,7 @@ const TablePageWithTabs = ({
   tabs = [],
   headerTooltip,
   drawerTooltip,
+  externalOpenDrawer = false,
   children
 }) => {
   const params = new URLSearchParams(location?.search);
@@ -18544,6 +18555,11 @@ const TablePageWithTabs = ({
   React.useEffect(() => {
     getActiveTabRef.current(activeTab);
   }, [activeTab]);
+  React.useEffect(() => {
+    if (externalOpenDrawer) {
+      setOpenCreateModal(true);
+    }
+  }, [externalOpenDrawer]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "semibold form-input-output daf-create-view",
     children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
@@ -18586,7 +18602,7 @@ const TablePageWithTabs = ({
       checkboxConfig: checkboxConfig,
       defaultTableFilters: {},
       columns: columns,
-      data: data?.data,
+      data: Array.isArray(data?.data) ? data : data?.data,
       loading: loading,
       location: location,
       goTo: goTo,
@@ -18620,6 +18636,116 @@ const TablePageWithTabs = ({
   });
 };
 
+const StandardTablePage = ({
+  t = () => {},
+  title,
+  breadCrumbs,
+  location,
+  loading = false,
+  goTo = () => {},
+  checkboxConfig = {},
+  columns = [],
+  data = {},
+  APP,
+  getApiBaseUrl = () => {},
+  selectOptions = {},
+  selectFiltersConfig = {},
+  getRedirectLink = () => {},
+  filtersConfig = {},
+  isMobile,
+  view,
+  onDownload,
+  downloadDisabled = false,
+  drawerTitle = "",
+  onCreateModalClose = () => {},
+  headerTooltip,
+  drawerTooltip,
+  externalOpenDrawer = false,
+  children
+}) => {
+  const params = new URLSearchParams(location?.search);
+  const [openCreateModal, setOpenCreateModal] = React.useState(params.has("create"));
+  React.useEffect(() => {
+    if (externalOpenDrawer) {
+      setOpenCreateModal(true);
+    }
+  }, [externalOpenDrawer]);
+  console.log({
+    openCreateModal,
+    externalOpenDrawer
+  });
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "semibold form-input-output daf-create-view",
+    children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
+      title: t(title),
+      breadcrumbs: breadCrumbs,
+      actionButtons: [{
+        type: "primary",
+        onClick: () => setOpenCreateModal(true),
+        tooltip: t("New"),
+        icon: "Add"
+      }],
+      onDownload: onDownload && typeof onDownload === 'function' ? onDownload : undefined,
+      downloadDisabled: downloadDisabled,
+      tooltip: headerTooltip
+    }), /*#__PURE__*/jsxRuntime.jsx(BaseScreen, {
+      t: t,
+      checkboxConfig: checkboxConfig,
+      defaultTableFilters: {},
+      columns: columns,
+      data: Array.isArray(data?.data) ? data : data?.data,
+      loading: loading,
+      location: location,
+      goTo: goTo,
+      APP: APP,
+      getApiBaseUrl: getApiBaseUrl,
+      selectOptions: selectOptions,
+      selectFilters: selectFiltersConfig,
+      view: view,
+      getRedirectLink: getRedirectLink,
+      defaultUrlParams: {},
+      module: APP,
+      filtersConfig: filtersConfig,
+      isMobile: isMobile
+    }), openCreateModal && /*#__PURE__*/jsxRuntime.jsx(antd.Drawer, {
+      destroyOnHidden: true,
+      title: /*#__PURE__*/jsxRuntime.jsx(DrawerHeader, {
+        title: t(drawerTitle)
+      }),
+      tooltip: drawerTooltip,
+      open: openCreateModal,
+      onClose: () => setOpenCreateModal(false),
+      width: CREATE_DRAWER_WIDTH,
+      bodyStyle: {
+        padding: 0
+      },
+      children: typeof children === 'function' ? children({
+        onDrawerClose: () => setOpenCreateModal(false),
+        open: openCreateModal
+      }) : children
+    })]
+  });
+};
+
+/**
+ * Enum for message types used with Ant Design message component
+ * @enum {string}
+ */
+const MessageTypes = {
+  SUCCESS: 'success',
+  ERROR: 'error',
+  WARNING: 'warning'
+};
+
+/**
+ * Displays a notification message using Ant Design's message component
+ * @param {string} type - The type of message (success, error, warning)
+ * @param {string} m - The message content to display
+ */
+function displayMessage(type, m) {
+  antd.message[type](m);
+}
+
 const countriesPhoneNumberLength = {
   AD: 6,
   AE: 9,
@@ -40506,159 +40632,111 @@ function DynamicForm({
   });
 }
 
-const data = {};
 const Create$1 = ({
+  namespace,
+  view,
+  edit = false,
+  formData = {},
+  loading = false,
+  onSubmitted = () => {},
+  onCancel = () => {},
+  getData = () => {},
+  saveData = () => {},
+  form: formConfig = {},
+  formValue = {},
+  defaultData = {},
+  user = {},
+  APP,
   query,
   goTo = () => {},
-  user,
   t = () => {},
-  ajaxForms,
+  ajaxForms = {},
   changeAjaxForms = () => {},
-  ajaxOptions,
+  ajaxOptions = {},
   changeAjaxOptions = () => {},
-  onClose = () => {},
-  fetchData = () => {},
-  APP,
   getAppHeader = () => {},
-  getApiBaseUrl = () => {}
+  getApiBaseUrl = () => {},
+  scope,
+  formType
 }) => {
-  const partnerTypes = React.useMemo(() => getPartnerTypes(t), [t]);
-  const partnershipTypes = React.useMemo(() => getPartnershipTypes(t), [t]);
-  const form = React.useMemo(() => ({
-    identification: {
-      partnershipType: {
-        label: t("Type of partnership"),
-        type: "select",
-        position: 1,
-        dataId: "partnershipType",
-        tooltip: /*#__PURE__*/jsxRuntime.jsxs("div", {
-          style: {
-            maxWidth: 296
-          },
-          children: [t("Source: This partner will share information with you."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Client: You will share information with this partner."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Exchange: You will both share information with each other.")]
-        }),
-        options: partnershipTypes.map(o => ({
-          ...o,
-          label: t(o.label)
-        })),
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }]
-      },
-      partnerType: {
-        label: t("Type of partner"),
-        type: "select",
-        position: 2,
-        dataId: "partnerType",
-        options: partnerTypes.map(o => ({
-          ...o,
-          label: t(o.label)
-        })),
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }]
-      },
-      nickName: {
-        label: {
-          "partnerType is individual": t("Person name"),
-          "partnerType is organisation": t("Organisation name")
-        },
-        type: "text",
-        position: 3,
-        showIf: "partnerType notEmpty true",
-        dataId: "nickName",
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }]
-      },
-      invitationType: {
-        label: t("Invitation type"),
-        type: "select",
-        position: 3,
-        dataId: "invitationType",
-        options: [{
-          label: "Email",
-          value: "email"
-        }, {
-          label: "Application ID",
-          value: "id"
-        }],
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }]
-      },
-      email: {
-        label: t("Email"),
-        type: "text",
-        position: 4,
-        showIf: "invitationType is email",
-        dataId: "email",
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }, {
-          type: "email",
-          message: "errors::field must be email"
-        }]
+  let {
+    form = {},
+    data = defaultData || {}
+  } = !edit ? formData[`${APP}-${view}`] || {} : {
+    form: formConfig,
+    data: formValue
+  };
+  const language = React.useMemo(() => user?.language, [user?.language]);
+  React.useEffect(() => {
+    if (!edit) {
+      getData({
+        namespace,
+        module: APP,
+        view,
+        scope
+      });
+    } else {
+      form = formConfig;
+      data = formValue;
+    }
+  }, [edit, language, scope, namespace, APP, view]);
+  return /*#__PURE__*/jsxRuntime.jsx("div", {
+    className: "daf-create-form",
+    children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
+      form: form,
+      data: {
+        ...defaultData,
+        ...data
       },
-      datastakeId: {
-        label: t("Application ID"),
-        type: "text",
-        position: 4,
-        showIf: "invitationType is id",
-        dataId: "datastakeId",
-        rules: [{
-          required: true,
-          message: "errors::field is required"
-        }]
+      showSaveAndNext: false,
+      module: APP,
+      onCancel: onCancel,
+      isCreate: true,
+      t: t,
+      excludedKeys: ["title"],
+      user: user,
+      ajaxForms: ajaxForms,
+      ajaxOptions: ajaxOptions,
+      getAppHeader: getAppHeader,
+      getApiBaseUrl: getApiBaseUrl,
+      changeAjaxOptions: changeAjaxOptions,
+      app: APP,
+      query: query,
+      goTo: goTo,
+      changeAjaxForms: changeAjaxForms,
+      submit: (payload, setSelectedFormNext) => {
+        const payloadData = {
+          ...payload,
+          module: APP,
+          namespace
+        };
+        const newPayload = {
+          ...defaultData,
+          ...payloadData,
+          form: formType
+        };
+        const {
+          datastakeId,
+          ...finalPayload
+        } = newPayload;
+        const callback = (type, m, data) => {
+          if (setSelectedFormNext) {
+            setSelectedFormNext();
+          }
+          if (type === MessageTypes.SUCCESS) {
+            if (onSubmitted) onSubmitted(type, m, data);
+          } else {
+            antd.message.error(m);
+          }
+        };
+        saveData(!data && !data.id ? finalPayload : Object.assign(finalPayload, {
+          id: data.id
+        }), callback);
       },
-      partnerMessage: {
-        type: "message",
-        position: 4,
-        label: t("If the user you are inviting is part of an existing organisation, the invitation will be shared with the account administrator of that organisation."),
-        showIf: "partnerType is individual",
-        dataId: "partnerMessage"
+      isFormDisabled: () => {
+        return !data || !data.typeOfEvent;
       }
-    }
-  }), [t]);
-  const submit = async data => {
-    try {
-      const {
-        form,
-        ...rest
-      } = data;
-      await PartnerService$1.create(rest);
-      fetchData();
-      onClose();
-    } catch (err) {
-      onClose();
-      antd.message.error(t(err?.response?.data?.message || "Error occured"));
-      console.log(err);
-    }
-  };
-  return /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
-    form: form,
-    data: data,
-    showSaveAndNext: false,
-    module: APP,
-    t: t,
-    isCreate: true,
-    user: user,
-    ajaxForms: ajaxForms,
-    ajaxOptions: ajaxOptions,
-    getAppHeader: getAppHeader,
-    getApiBaseUrl: getApiBaseUrl,
-    changeAjaxOptions: changeAjaxOptions,
-    app: APP,
-    query: query,
-    goTo: () => {},
-    changeAjaxForms: changeAjaxForms,
-    onCancel: onClose,
-    submit: submit
+    })
   });
 };
 
@@ -40708,483 +40786,6 @@ const useGetQueryParams = ({
   return params;
 };
 
-const Style$3 = styled__default["default"].div`
-  display: flex;
-  gap: 8px;
-  justify-content: center;
-  margin-top: var(--size-lg);
-
-  &.mt-0 {
-    margin-top: 0;
-  }
-
-  .ant-btn {
-    width: 75px;
-  }
-`;
-function Footer({
-  onClose = () => {},
-  onSubmit = () => {},
-  t = s => s,
-  loading,
-  className,
-  disabledFooterText,
-  disabledFooter
-}) {
-  return /*#__PURE__*/jsxRuntime.jsxs(Style$3, {
-    className: className,
-    children: [disabledFooterText ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: t(disabledFooterText),
-      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-        type: "primary",
-        onClick: onSubmit,
-        disabled: true,
-        children: t(loading ? 'Loading...' : 'Save')
-      })
-    }) : /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-      type: "primary",
-      onClick: onSubmit,
-      disabled: disabledFooter,
-      children: t(loading ? 'Loading...' : 'Save')
-    }), /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-      onClick: onClose,
-      children: t('Cancel')
-    })]
-  });
-}
-
-const licensingOptions = [{
-  label: 'Open without citation',
-  value: 'no_citation'
-}, {
-  label: 'Open with citation',
-  value: 'citation'
-}, {
-  label: 'Conditional re-use',
-  value: 'conditional',
-  disabled: true
-}, {
-  label: 'Private use',
-  value: 'private'
-}];
-
-const Edit$1 = ({
-  partner,
-  onClose = () => {},
-  fetchData = () => {},
-  t = () => {}
-}) => {
-  const [MainForm] = antd.Form.useForm();
-  const [loading, setLoading] = React.useState(false);
-  React.useMemo(() => getPartnerTypes(t), [t]);
-  const partnershipTypes = React.useMemo(() => getPartnershipTypes(t), [t]);
-  React.useEffect(() => {
-    MainForm.setFieldsValue({
-      ...partner,
-      licensing: 'no_citation'
-    });
-  }, [partner]);
-  const onSubmit = async () => {
-    setLoading(true);
-    try {
-      const val = await MainForm.validateFields();
-      await PartnerService$1.update(partner.id, val);
-      onClose();
-      fetchData();
-    } catch (err) {
-      console.log(err);
-    }
-    setLoading(false);
-  };
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    children: [loading ? /*#__PURE__*/jsxRuntime.jsx(Loading, {}) : null, /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
-      form: MainForm,
-      layout: "vertical",
-      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        required: true,
-        name: "nickName",
-        rules: [{
-          required: true
-        }],
-        label: t('Name'),
-        children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-          name: "name"
-        })
-      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        required: true,
-        name: "partnershipType",
-        label: t('Partner Type'),
-        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-          children: partnershipTypes.map(type => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
-            value: type.value,
-            children: type.label
-          }, type.value))
-        })
-      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        required: true,
-        name: "email",
-        label: t('Email address'),
-        rules: [{
-          type: 'email',
-          required: true
-        }],
-        children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
-          disabled: true
-        })
-      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-        required: true,
-        name: "licensing",
-        label: t('Licensing'),
-        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-          disabled: true,
-          children: licensingOptions.map(option => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
-            value: option.value,
-            children: t(option.label)
-          }, option.value))
-        })
-      })]
-    }), /*#__PURE__*/jsxRuntime.jsx(Footer, {
-      t: t,
-      loading: loading,
-      onClose: onClose,
-      onSubmit: onSubmit
-    })]
-  });
-};
-
-const PartnersTable = ({
-  t = () => {},
-  goTo = () => {},
-  user = {},
-  options = {},
-  getRedirectLink = () => {},
-  theme = {},
-  isMobile,
-  APP,
-  location,
-  breadcrumbs = [],
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  query = {},
-  ajaxForms = {},
-  changeAjaxForms = () => {},
-  ajaxOptions = {},
-  changeAjaxOptions = () => {},
-  applications = [],
-  extendingFilters = {},
-  searchLocationParams
-}) => {
-  const [totalRequests, setTotalRequests] = React.useState(0);
-  const [selectOptions, setSelectOptions] = React.useState();
-  const [activeTab, setActiveTab] = React.useState();
-  const [pendingEditId, setPendingEditId] = React.useState(null);
-  const [openModal, setOpenModal] = React.useState(false);
-  const tabs = React.useMemo(() => [{
-    label: t("List"),
-    key: "partners"
-  }, {
-    label: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "tab-cont",
-      children: [/*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "flex flex-column justify-content-center",
-        children: t('Requests')
-      }), typeof totalRequests === 'number' ? /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "flex flex-column justify-content-center",
-        children: /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "bubble",
-          children: /*#__PURE__*/jsxRuntime.jsx("div", {
-            className: "flex flex-column justify-content-center",
-            children: totalRequests
-          })
-        })
-      }) : null]
-    }),
-    key: "requests"
-  }], [t, totalRequests]);
-  const {
-    paginationQuery,
-    searchParams,
-    otherParams,
-    sortBy,
-    sortDir
-  } = useGetQueryParams({
-    location
-  });
-  const filters = React.useMemo(() => {
-    const cleanSearchParams = Object.fromEntries(Object.entries(searchParams).filter(([_, value]) => value != null && value !== ''));
-    return {
-      pagination: paginationQuery,
-      ...(Object.keys(otherParams).length > 0 && otherParams),
-      ...(Object.keys(cleanSearchParams).length > 0 && {
-        search: cleanSearchParams
-      }),
-      tab: activeTab,
-      sortBy: {
-        [sortBy || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : -1
-      },
-      ...extendingFilters
-    };
-  }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
-  const {
-    loading,
-    data,
-    requestDataFetch,
-    fetchData,
-    accept,
-    decline,
-    activate,
-    suspend,
-    resendInvite,
-    block,
-    setRequestDataFetch,
-    initFetchDone,
-    setInitFetchDone
-  } = usePartnersActions({
-    activeTab,
-    filters,
-    setTotalRequests,
-    t
-  });
-  const columns = React.useMemo(() => getColumns$g({
-    t,
-    accept,
-    decline,
-    suspend,
-    resendInvite,
-    activate,
-    activeTab,
-    selectOptions,
-    block,
-    setOpen: setOpenModal
-  }), [t, accept, decline, suspend, resendInvite, activate, activeTab, selectOptions, block, setOpenModal]);
-  const handleActiveTabChange = React.useCallback(value => {
-    setActiveTab(value);
-  }, []);
-  React.useEffect(() => {
-    if (requestDataFetch) {
-      fetchData();
-      setRequestDataFetch(false);
-    }
-  }, [requestDataFetch, fetchData, setRequestDataFetch]);
-  React.useEffect(() => {
-    if (searchLocationParams.has("datastakeId") && !pendingEditId) {
-      setPendingEditId(searchLocationParams.get("datastakeId"));
-    }
-  }, [searchLocationParams, pendingEditId]);
-  React.useEffect(() => {
-    if (pendingEditId) {
-      const partner = data.find(partner => partner.datastakeId === pendingEditId);
-      if (partner) {
-        setOpenModal(partner);
-        setPendingEditId(null);
-      }
-    }
-  }, [data, pendingEditId]);
-  React.useEffect(() => {
-    fetchData();
-  }, [filters]);
-  const headerTooltip = React.useMemo(() => ({
-    title: t("Partners"),
-    content: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "max-w-250",
-      children: [t("Partners are organisations sharing their information with you, or receiving your information."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Only authorised users can create partnerships.")]
-    })
-  }), [t]);
-  const drawerTooltip = React.useMemo(() => ({
-    content: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "max-w-250",
-      children: [t("Source: This partner will share information with you."), ",", /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Client: You will share information with this partner."), ",", /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Exchange: You will both share information with each other.")]
-    })
-  }), [t]);
-  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsx(TablePageWithTabs, {
-      t: t,
-      tabs: tabs,
-      title: t("Partners"),
-      breadCrumbs: breadcrumbs,
-      location: location,
-      loading: loading,
-      goTo: goTo,
-      defaultActiveTab: "partners",
-      columns: columns,
-      data: data,
-      checkboxConfig: checkboxConfig$1,
-      APP: APP,
-      getApiBaseUrl: getApiBaseUrl,
-      selectOptions: selectOptions,
-      selectFiltersConfig: selectFiltersConfig,
-      getRedirectLink: getRedirectLink,
-      filtersConfig: filtersConfig$1,
-      isMobile: isMobile,
-      view: "partners",
-      getActiveTab: handleActiveTabChange,
-      headerTooltip: headerTooltip,
-      drawerTitle: t("Create Partner"),
-      drawerTooltip: drawerTooltip,
-      children: ({
-        onDrawerClose
-      }) => /*#__PURE__*/jsxRuntime.jsx(Create$1, {
-        query: query,
-        goTo: goTo,
-        user: user,
-        t: t,
-        ajaxForms: ajaxForms,
-        changeAjaxForms: changeAjaxForms,
-        ajaxOptions: ajaxOptions,
-        changeAjaxOptions: changeAjaxOptions,
-        onClose: onDrawerClose,
-        fetchData: () => setRequestDataFetch(true),
-        APP: APP,
-        getAppHeader: getAppHeader,
-        getApiBaseUrl: getApiBaseUrl
-      })
-    }), /*#__PURE__*/jsxRuntime.jsx(antd.Modal, {
-      open: !!openModal,
-      onCancel: () => setOpenModal(false),
-      footer: null,
-      title: /*#__PURE__*/jsxRuntime.jsx(ModalHeader, {
-        title: t("Edit Settings")
-      }),
-      children: openModal ? /*#__PURE__*/jsxRuntime.jsx(Edit$1, {
-        partner: openModal,
-        fetchData: () => setRequestDataFetch(true),
-        onClose: () => setOpenModal(false),
-        t: t
-      }) : null
-    }), /*#__PURE__*/jsxRuntime.jsx("input", {
-      id: "myInput",
-      hidden: true
-    })]
-  });
-};
-
-/**
- * Enum for message types used with Ant Design message component
- * @enum {string}
- */
-const MessageTypes = {
-  SUCCESS: 'success',
-  ERROR: 'error',
-  WARNING: 'warning'
-};
-
-/**
- * Displays a notification message using Ant Design's message component
- * @param {string} type - The type of message (success, error, warning)
- * @param {string} m - The message content to display
- */
-function displayMessage(type, m) {
-  antd.message[type](m);
-}
-
-const Create = ({
-  namespace,
-  view,
-  edit = false,
-  formData = {},
-  loading = false,
-  onSubmitted = () => {},
-  onCancel = () => {},
-  getData = () => {},
-  saveData = () => {},
-  form: formConfig = {},
-  formValue = {},
-  defaultData = {},
-  user = {},
-  APP,
-  query,
-  goTo = () => {},
-  t = () => {},
-  ajaxForms = {},
-  changeAjaxForms = () => {},
-  ajaxOptions = {},
-  changeAjaxOptions = () => {},
-  getAppHeader = () => {},
-  getApiBaseUrl = () => {},
-  scope,
-  formType
-}) => {
-  let {
-    form = {},
-    data = defaultData || {}
-  } = !edit ? formData[`${APP}-${view}`] || {} : {
-    form: formConfig,
-    data: formValue
-  };
-  const language = React.useMemo(() => user?.language, [user?.language]);
-  React.useEffect(() => {
-    if (!edit) {
-      getData({
-        namespace,
-        module: APP,
-        view,
-        scope
-      });
-    } else {
-      form = formConfig;
-      data = formValue;
-    }
-  }, [edit, language, scope, namespace, APP, view]);
-  return /*#__PURE__*/jsxRuntime.jsx("div", {
-    className: "daf-create-form",
-    children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
-      form: form,
-      data: {
-        ...defaultData,
-        ...data
-      },
-      showSaveAndNext: false,
-      module: APP,
-      onCancel: onCancel,
-      isCreate: true,
-      t: t,
-      excludedKeys: ["title"],
-      user: user,
-      ajaxForms: ajaxForms,
-      ajaxOptions: ajaxOptions,
-      getAppHeader: getAppHeader,
-      getApiBaseUrl: getApiBaseUrl,
-      changeAjaxOptions: changeAjaxOptions,
-      app: APP,
-      query: query,
-      goTo: goTo,
-      changeAjaxForms: changeAjaxForms,
-      submit: (payload, setSelectedFormNext) => {
-        const payloadData = {
-          ...payload,
-          module: APP,
-          namespace
-        };
-        const newPayload = {
-          ...defaultData,
-          ...payloadData,
-          form: formType
-        };
-        const {
-          datastakeId,
-          ...finalPayload
-        } = newPayload;
-        const callback = (type, m, data) => {
-          if (setSelectedFormNext) {
-            setSelectedFormNext();
-          }
-          if (type === MessageTypes.SUCCESS) {
-            if (onSubmitted) onSubmitted(type, m, data);
-          } else {
-            antd.message.error(m);
-          }
-        };
-        saveData(!data && !data.id ? finalPayload : Object.assign(finalPayload, {
-          id: data.id
-        }), callback);
-      },
-      isFormDisabled: () => {
-        return !data || !data.typeOfEvent;
-      }
-    })
-  });
-};
-
 const getFiltersConfig$d = ({
   t
 }) => {
@@ -45581,7 +45182,8 @@ const useFetchData = ({
   getData,
   activeTab,
   extendingFilters,
-  subject
+  subject,
+  refetchTrigger
 }) => {
   const {
     paginationQuery,
@@ -45608,19 +45210,71 @@ const useFetchData = ({
       ...(Object.keys(cleanSearchParams).length > 0 && {
         search: cleanSearchParams
       }),
-      tab: activeTab,
+      ...(activeTab && {
+        tab: activeTab
+      }),
       sortBy: {
         [sortBy || extendingSortKey || "updatedAt"]: sortDir ? sortDir === "ascend" ? 1 : -1 : extendingSortDir || -1
       }
     };
     const currentParamsString = JSON.stringify(currentParams);
-    if (prevParamsRef.current === currentParamsString) {
+    const paramsChanged = prevParamsRef.current !== currentParamsString;
+    const shouldFetch = paramsChanged || refetchTrigger;
+    if (!shouldFetch) {
       return;
     }
     prevParamsRef.current = currentParamsString;
     getData(currentParams, subject);
-  }, [location.search, JSON.stringify(extendingFilters), activeTab]);
-};
+  }, [location.search, JSON.stringify(extendingFilters), activeTab, refetchTrigger]);
+};
+
+// export const useFetchData = ({
+//     location,
+//     getData,
+//     activeTab,
+//     extendingFilters,
+//     subject,
+// }) => {
+//     const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
+
+//     const prevParamsRef = useRef();
+
+//     useEffect(() => {
+//         const cleanSearchParams = Object.fromEntries(
+//             Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
+//         );
+
+//         const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+
+//         if (!hasPagination) {
+//             return;
+//         }
+
+//         const extendingSortKey = extendingFilters?.sortBy ? Object.keys(extendingFilters.sortBy)[0] : null;
+//         const extendingSortDir = extendingFilters?.sortBy && extendingSortKey ? extendingFilters.sortBy[extendingSortKey] : null;
+
+//         const currentParams = {
+//             ...extendingFilters,
+//             pagination: paginationQuery,
+//             ...(Object.keys(otherParams).length > 0 && otherParams ),
+//             ...(Object.keys(cleanSearchParams).length > 0 && { search: cleanSearchParams }),
+//             tab: activeTab,
+//             sortBy: {
+//                 [sortBy || extendingSortKey || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : (extendingSortDir || -1),
+//             },
+//         };
+
+//         const currentParamsString = JSON.stringify(currentParams);
+//         if (prevParamsRef.current === currentParamsString) {
+//             return;
+//         }
+
+//         prevParamsRef.current = currentParamsString;
+
+//         getData(currentParams, subject);
+//     }, [location.search, JSON.stringify(extendingFilters), activeTab]);
+// }
+
 const useTablePage = ({
   subject,
   location,
@@ -45635,16 +45289,21 @@ const useTablePage = ({
   data,
   applications,
   subjectClear,
-  APP
+  APP,
+  defaultActiveTab = "own",
+  getActiveTab,
+  refetchTrigger,
+  noTabs = false
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
-  const [activeTab, setActiveTab] = React.useState("own");
+  const [activeTab, setActiveTab] = React.useState(noTabs ? null : defaultActiveTab);
   useFetchData({
     location,
     getData,
     activeTab,
     extendingFilters: extendingFilters,
-    subject
+    subject,
+    refetchTrigger
   });
   const columns = React.useMemo(() => getColumns$3({
     t,
@@ -45689,6 +45348,9 @@ const useTablePage = ({
   }), [subject, getViewConfig]);
   const handleActiveTabChange = React.useCallback(value => {
     setActiveTab(value);
+    if (getActiveTab && typeof getActiveTab === 'function' && !noTabs) {
+      getActiveTab(value);
+    }
   }, []);
   React.useEffect(() => () => {
     if (subjectClear && typeof subjectClear === 'function') {
@@ -45743,7 +45405,19 @@ const TablePage = ({
   subjectClear,
   subject,
   breadcrumbs = [],
-  onDownload
+  onDownload,
+  customCreate,
+  customModal,
+  customTabs,
+  defaultActiveTab = "own",
+  customColumns,
+  customCheckboxConfig,
+  customFiltersConfig,
+  customSelectFiltersConfig,
+  getActiveTab,
+  noTabs = false,
+  refetchTrigger,
+  externalOpenDrawer = false
 }) => {
   const {
     activeTab,
@@ -45756,6 +45430,7 @@ const TablePage = ({
     formInfo,
     viewConfig
   } = useTablePage({
+    defaultActiveTab,
     subject,
     location,
     getData,
@@ -45769,63 +45444,573 @@ const TablePage = ({
     data,
     applications,
     subjectClear,
-    APP
+    APP,
+    getActiveTab,
+    refetchTrigger
   });
-  return /*#__PURE__*/jsxRuntime.jsx(TablePageWithTabs, {
-    t: t,
+  const TableComponent = noTabs ? StandardTablePage : TablePageWithTabs;
+  const commonProps = {
+    t,
     title: t(headerInfo?.title || viewConfig?.title || ""),
     breadCrumbs: breadcrumbs,
-    location: location,
-    loading: loading,
-    goTo: goTo,
-    defaultActiveTab: "own",
-    columns: columns,
+    location,
+    loading,
+    goTo,
+    columns: customColumns || columns,
+    data,
+    checkboxConfig: customCheckboxConfig || checkboxConfig,
+    APP,
+    getApiBaseUrl,
+    selectOptions,
+    selectFiltersConfig: customSelectFiltersConfig || selectFiltersConfig,
+    getRedirectLink,
+    filtersConfig: customFiltersConfig || _filtersConfig,
+    isMobile,
+    view: subject,
+    onDownload: onDownload && typeof onDownload === 'function' ? onDownload : undefined,
+    drawerTitle: t(headerInfo?.createTitle || viewConfig?.createTitle || ""),
+    headerTooltip: headerInfo?.tooltip,
+    drawerTooltip: headerInfo?.drawerTooltip,
+    externalOpenDrawer
+  };
+  const tabsOnlyProps = noTabs ? {} : {
+    tabs: customTabs,
+    defaultActiveTab,
+    getActiveTab: handleActiveTabChange
+  };
+  return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(TableComponent, {
+      ...commonProps,
+      ...tabsOnlyProps,
+      children: ({
+        onDrawerClose,
+        setOpenCreateDrawer
+      }) => customCreate ? customCreate({
+        onDrawerClose,
+        setOpenCreateDrawer
+      }) : /*#__PURE__*/jsxRuntime.jsx(Create$1, {
+        t: t,
+        goTo: goTo,
+        user: user,
+        APP: APP,
+        getApiBaseUrl: getApiBaseUrl,
+        getAppHeader: getAppHeader,
+        getData: formConfig.getFormData,
+        saveData: formConfig.saveFormData,
+        loading: formConfig.formLoading,
+        onSubmitted: (type, m, data) => {
+          if (data.datastakeId) {
+            displayMessage(type, t("affirmations::subject-created-successfully") || m);
+            goTo(`/app/edit/${subject}/${data.datastakeId}`);
+          }
+        },
+        onCancel: onDrawerClose,
+        query: formConfig.query,
+        ajaxForms: formConfig.ajaxForms,
+        changeAjaxForms: formConfig.changeAjaxForms,
+        ajaxOptions: formConfig.ajaxOptions,
+        changeAjaxOptions: formConfig.changeAjaxOptions,
+        formData: formConfig.formData,
+        formValue: formConfig.formValue,
+        form: formConfig.form,
+        namespace: formConfig?.namespace || formInfo?.namespace,
+        view: formConfig?.view || formInfo.view,
+        scope: formConfig?.scope || formInfo.scope,
+        formType: formConfig?.formType || formInfo.formType,
+        defaultData: defaultValues
+      })
+    }), customModal]
+  });
+};
+
+const data = {};
+const Create = ({
+  query,
+  goTo = () => {},
+  user,
+  t = () => {},
+  ajaxForms,
+  changeAjaxForms = () => {},
+  ajaxOptions,
+  changeAjaxOptions = () => {},
+  onClose = () => {},
+  fetchData = () => {},
+  APP,
+  getAppHeader = () => {},
+  getApiBaseUrl = () => {}
+}) => {
+  const partnerTypes = React.useMemo(() => getPartnerTypes(t), [t]);
+  const partnershipTypes = React.useMemo(() => getPartnershipTypes(t), [t]);
+  const form = React.useMemo(() => ({
+    identification: {
+      partnershipType: {
+        label: t("Type of partnership"),
+        type: "select",
+        position: 1,
+        dataId: "partnershipType",
+        tooltip: /*#__PURE__*/jsxRuntime.jsxs("div", {
+          style: {
+            maxWidth: 296
+          },
+          children: [t("Source: This partner will share information with you."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Client: You will share information with this partner."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Exchange: You will both share information with each other.")]
+        }),
+        options: partnershipTypes.map(o => ({
+          ...o,
+          label: t(o.label)
+        })),
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }]
+      },
+      partnerType: {
+        label: t("Type of partner"),
+        type: "select",
+        position: 2,
+        dataId: "partnerType",
+        options: partnerTypes.map(o => ({
+          ...o,
+          label: t(o.label)
+        })),
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }]
+      },
+      nickName: {
+        label: {
+          "partnerType is individual": t("Person name"),
+          "partnerType is organisation": t("Organisation name")
+        },
+        type: "text",
+        position: 3,
+        showIf: "partnerType notEmpty true",
+        dataId: "nickName",
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }]
+      },
+      invitationType: {
+        label: t("Invitation type"),
+        type: "select",
+        position: 3,
+        dataId: "invitationType",
+        options: [{
+          label: "Email",
+          value: "email"
+        }, {
+          label: "Application ID",
+          value: "id"
+        }],
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }]
+      },
+      email: {
+        label: t("Email"),
+        type: "text",
+        position: 4,
+        showIf: "invitationType is email",
+        dataId: "email",
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }, {
+          type: "email",
+          message: "errors::field must be email"
+        }]
+      },
+      datastakeId: {
+        label: t("Application ID"),
+        type: "text",
+        position: 4,
+        showIf: "invitationType is id",
+        dataId: "datastakeId",
+        rules: [{
+          required: true,
+          message: "errors::field is required"
+        }]
+      },
+      partnerMessage: {
+        type: "message",
+        position: 4,
+        label: t("If the user you are inviting is part of an existing organisation, the invitation will be shared with the account administrator of that organisation."),
+        showIf: "partnerType is individual",
+        dataId: "partnerMessage"
+      }
+    }
+  }), [t]);
+  const submit = async data => {
+    try {
+      const {
+        form,
+        ...rest
+      } = data;
+      await PartnerService$1.create(rest);
+      fetchData();
+      onClose();
+    } catch (err) {
+      onClose();
+      antd.message.error(t(err?.response?.data?.message || "Error occured"));
+      console.log(err);
+    }
+  };
+  return /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
+    form: form,
     data: data,
-    checkboxConfig: checkboxConfig,
-    APP: APP,
+    showSaveAndNext: false,
+    module: APP,
+    t: t,
+    isCreate: true,
+    user: user,
+    ajaxForms: ajaxForms,
+    ajaxOptions: ajaxOptions,
+    getAppHeader: getAppHeader,
     getApiBaseUrl: getApiBaseUrl,
-    selectOptions: selectOptions,
-    selectFiltersConfig: selectFiltersConfig,
+    changeAjaxOptions: changeAjaxOptions,
+    app: APP,
+    query: query,
+    goTo: () => {},
+    changeAjaxForms: changeAjaxForms,
+    onCancel: onClose,
+    submit: submit
+  });
+};
+
+const Style$3 = styled__default["default"].div`
+  display: flex;
+  gap: 8px;
+  justify-content: center;
+  margin-top: var(--size-lg);
+
+  &.mt-0 {
+    margin-top: 0;
+  }
+
+  .ant-btn {
+    width: 75px;
+  }
+`;
+function Footer({
+  onClose = () => {},
+  onSubmit = () => {},
+  t = s => s,
+  loading,
+  className,
+  disabledFooterText,
+  disabledFooter
+}) {
+  return /*#__PURE__*/jsxRuntime.jsxs(Style$3, {
+    className: className,
+    children: [disabledFooterText ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: t(disabledFooterText),
+      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+        type: "primary",
+        onClick: onSubmit,
+        disabled: true,
+        children: t(loading ? 'Loading...' : 'Save')
+      })
+    }) : /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+      type: "primary",
+      onClick: onSubmit,
+      disabled: disabledFooter,
+      children: t(loading ? 'Loading...' : 'Save')
+    }), /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+      onClick: onClose,
+      children: t('Cancel')
+    })]
+  });
+}
+
+const licensingOptions = [{
+  label: 'Open without citation',
+  value: 'no_citation'
+}, {
+  label: 'Open with citation',
+  value: 'citation'
+}, {
+  label: 'Conditional re-use',
+  value: 'conditional',
+  disabled: true
+}, {
+  label: 'Private use',
+  value: 'private'
+}];
+
+const Edit$1 = ({
+  partner,
+  onClose = () => {},
+  fetchData = () => {},
+  t = () => {}
+}) => {
+  const [MainForm] = antd.Form.useForm();
+  const [loading, setLoading] = React.useState(false);
+  React.useMemo(() => getPartnerTypes(t), [t]);
+  const partnershipTypes = React.useMemo(() => getPartnershipTypes(t), [t]);
+  React.useEffect(() => {
+    MainForm.setFieldsValue({
+      ...partner,
+      licensing: 'no_citation'
+    });
+  }, [partner]);
+  const onSubmit = async () => {
+    setLoading(true);
+    try {
+      const val = await MainForm.validateFields();
+      await PartnerService$1.update(partner.id, val);
+      onClose();
+      fetchData();
+    } catch (err) {
+      console.log(err);
+    }
+    setLoading(false);
+  };
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    children: [loading ? /*#__PURE__*/jsxRuntime.jsx(Loading, {}) : null, /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
+      form: MainForm,
+      layout: "vertical",
+      children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: true,
+        name: "nickName",
+        rules: [{
+          required: true
+        }],
+        label: t('Name'),
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+          name: "name"
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: true,
+        name: "partnershipType",
+        label: t('Partner Type'),
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+          children: partnershipTypes.map(type => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+            value: type.value,
+            children: type.label
+          }, type.value))
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: true,
+        name: "email",
+        label: t('Email address'),
+        rules: [{
+          type: 'email',
+          required: true
+        }],
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+          disabled: true
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+        required: true,
+        name: "licensing",
+        label: t('Licensing'),
+        children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
+          disabled: true,
+          children: licensingOptions.map(option => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+            value: option.value,
+            children: t(option.label)
+          }, option.value))
+        })
+      })]
+    }), /*#__PURE__*/jsxRuntime.jsx(Footer, {
+      t: t,
+      loading: loading,
+      onClose: onClose,
+      onSubmit: onSubmit
+    })]
+  });
+};
+
+const PartnersTable = ({
+  t = () => {},
+  goTo = () => {},
+  user = {},
+  options = {},
+  getRedirectLink = () => {},
+  theme = {},
+  isMobile,
+  APP,
+  location,
+  breadcrumbs = [],
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  query = {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  applications = [],
+  extendingFilters = {},
+  searchLocationParams
+}) => {
+  const [totalRequests, setTotalRequests] = React.useState(0);
+  const [selectOptions, setSelectOptions] = React.useState();
+  const [activeTab, setActiveTab] = React.useState();
+  const [pendingEditId, setPendingEditId] = React.useState(null);
+  const [openModal, setOpenModal] = React.useState(false);
+  const {
+    loading,
+    data,
+    requestDataFetch,
+    fetchData,
+    accept,
+    decline,
+    activate,
+    suspend,
+    resendInvite,
+    block,
+    setRequestDataFetch,
+    initFetchDone,
+    setInitFetchDone
+  } = usePartnersActions({
+    setTotalRequests,
+    t
+  });
+  const columns = React.useMemo(() => getColumns$g({
+    t,
+    accept,
+    decline,
+    suspend,
+    resendInvite,
+    activate,
+    activeTab,
+    selectOptions,
+    block,
+    setOpen: setOpenModal,
+    options
+  }), [t, accept, decline, suspend, resendInvite, activate, activeTab, selectOptions, block, setOpenModal, options]);
+  React.useEffect(() => {
+    if (searchLocationParams.has("datastakeId") && !pendingEditId) {
+      setPendingEditId(searchLocationParams.get("datastakeId"));
+    }
+  }, [searchLocationParams, pendingEditId]);
+  React.useEffect(() => {
+    if (pendingEditId) {
+      const partner = data.find(partner => partner.datastakeId === pendingEditId);
+      if (partner) {
+        setOpenModal(partner);
+        setPendingEditId(null);
+      }
+    }
+  }, [data, pendingEditId]);
+  const tabs = React.useMemo(() => [{
+    label: t("List"),
+    key: "partners"
+  }, {
+    label: /*#__PURE__*/jsxRuntime.jsxs("div", {
+      className: "tab-cont",
+      children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "flex flex-column justify-content-center",
+        children: t('Requests')
+      }), typeof totalRequests === 'number' ? /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "flex flex-column justify-content-center",
+        children: /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "bubble",
+          children: /*#__PURE__*/jsxRuntime.jsx("div", {
+            className: "flex flex-column justify-content-center",
+            children: totalRequests
+          })
+        })
+      }) : null]
+    }),
+    key: "requests"
+  }], [t, totalRequests]);
+  const selectFiltersConfig = React.useMemo(() => {
+    return getSelectFiltersConfig$1({
+      t
+    });
+  }, [t]);
+  const filterOptions = React.useMemo(() => {
+    return getFilterOptions$e(options);
+  }, [options, t]);
+  const headerInfo = React.useMemo(() => ({
+    title: "Partners",
+    createTitle: "Create Partner",
+    tooltip: {
+      title: t("Partners"),
+      content: /*#__PURE__*/jsxRuntime.jsxs("div", {
+        className: "max-w-250",
+        children: [t("Partners are organisations sharing their information with you, or receiving your information."), /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Only authorised users can create partnerships.")]
+      })
+    },
+    drawerTooltip: {
+      content: /*#__PURE__*/jsxRuntime.jsxs("div", {
+        className: "max-w-250",
+        children: [t("Source: This partner will share information with you."), ",", /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Client: You will share information with this partner."), ",", /*#__PURE__*/jsxRuntime.jsx("br", {}), t("Exchange: You will both share information with each other.")]
+      })
+    }
+  }), [t]);
+  const customCreate = React.useCallback(({
+    onDrawerClose
+  }) => /*#__PURE__*/jsxRuntime.jsx(Create, {
+    query: query,
+    goTo: goTo,
+    user: user,
+    t: t,
+    ajaxForms: ajaxForms,
+    changeAjaxForms: changeAjaxForms,
+    ajaxOptions: ajaxOptions,
+    changeAjaxOptions: changeAjaxOptions,
+    onClose: onDrawerClose,
+    fetchData: () => setRequestDataFetch(true),
+    APP: APP,
+    getAppHeader: getAppHeader,
+    getApiBaseUrl: getApiBaseUrl
+  }), [query, goTo, user, t, ajaxForms, changeAjaxForms, ajaxOptions, changeAjaxOptions, APP, getAppHeader, getApiBaseUrl, setRequestDataFetch]);
+  const customModal = React.useMemo(() => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/jsxRuntime.jsx(antd.Modal, {
+      open: !!openModal,
+      onCancel: () => setOpenModal(false),
+      footer: null,
+      title: /*#__PURE__*/jsxRuntime.jsx(ModalHeader, {
+        title: t("Edit Settings")
+      }),
+      children: openModal ? /*#__PURE__*/jsxRuntime.jsx(Edit$1, {
+        partner: openModal,
+        fetchData: () => setRequestDataFetch(true),
+        onClose: () => setOpenModal(false),
+        t: t
+      }) : null
+    }), /*#__PURE__*/jsxRuntime.jsx("input", {
+      id: "myInput",
+      hidden: true
+    })]
+  }), [openModal, t, setRequestDataFetch]);
+  const handleActiveTabChange = React.useCallback(value => {
+    setActiveTab(value);
+  }, []);
+  return /*#__PURE__*/jsxRuntime.jsx(TablePage, {
+    t: t,
+    goTo: goTo,
+    user: user,
+    options: filterOptions,
     getRedirectLink: getRedirectLink,
-    filtersConfig: _filtersConfig,
+    theme: theme,
+    loading: loading,
+    data: data,
     isMobile: isMobile,
-    view: subject,
+    APP: APP,
+    location: location,
+    headerInfo: headerInfo,
+    extendingFilters: extendingFilters,
+    getData: fetchData,
+    getApiBaseUrl: getApiBaseUrl,
+    getAppHeader: getAppHeader,
+    applications: applications,
+    subject: "partners",
+    breadcrumbs: breadcrumbs,
+    customCreate: customCreate,
+    customModal: customModal,
+    customTabs: tabs,
+    defaultActiveTab: "partners",
+    customColumns: columns,
+    customCheckboxConfig: checkboxConfig$1,
+    customFiltersConfig: filtersConfig$1,
+    customSelectFiltersConfig: selectFiltersConfig,
     getActiveTab: handleActiveTabChange,
-    onDownload: onDownload && typeof onDownload === 'function' ? onDownload : undefined,
-    drawerTitle: t(headerInfo?.createTitle || viewConfig?.createTitle || ""),
-    children: ({
-      onDrawerClose
-    }) => /*#__PURE__*/jsxRuntime.jsx(Create, {
-      t: t,
-      goTo: goTo,
-      user: user,
-      APP: APP,
-      getApiBaseUrl: getApiBaseUrl,
-      getAppHeader: getAppHeader,
-      getData: formConfig.getFormData,
-      saveData: formConfig.saveFormData,
-      loading: formConfig.formLoading,
-      onSubmitted: (type, m, data) => {
-        if (data.datastakeId) {
-          displayMessage(type, t("affirmations::subject-created-successfully") || m);
-          goTo(`/app/edit/${subject}/${data.datastakeId}`);
-        }
-      },
-      onCancel: onDrawerClose,
-      query: formConfig.query,
-      ajaxForms: formConfig.ajaxForms,
-      changeAjaxForms: formConfig.changeAjaxForms,
-      ajaxOptions: formConfig.ajaxOptions,
-      changeAjaxOptions: formConfig.changeAjaxOptions,
-      formData: formConfig.formData,
-      formValue: formConfig.formValue,
-      form: formConfig.form,
-      namespace: formConfig?.namespace || formInfo?.namespace,
-      view: formConfig?.view || formInfo.view,
-      scope: formConfig?.scope || formInfo.scope,
-      formType: formConfig?.formType || formInfo.formType,
-      defaultData: defaultValues
-    })
+    refetchTrigger: requestDataFetch
   });
 };
 
@@ -51116,7 +51301,7 @@ class SourceService extends BaseService {
       ...rest
     } = filters;
     const params = {
-      filters: rest,
+      ...rest,
       pagination: {
         skip: page,
         take: pageSize
@@ -55442,13 +55627,6 @@ const PlantingLocations = ({
   });
 };
 
-/**
- * Formats a date based on the time filter
- * @param {dayjs.Dayjs} date - The date to format
- * @param {boolean} breakLine - Whether to add a line break (for tooltips)
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
- * @returns {string} Formatted date string
- */
 const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
   switch (timeFilter) {
     case "daily":
@@ -55462,12 +55640,6 @@ const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
       return breakLine ? `${capitalize(date.format("MMM"))}\n${date.format("YY")}` : `${capitalize(date.format("MMM"))} ${date.format("YY")}`;
   }
 };
-
-/**
- * Gets the time quantity string for dayjs operations
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
- * @returns {string} Time quantity string ('days', 'weeks', 'months', 'years')
- */
 const getTimeQuantity = (timeFilter = 'monthly') => {
   switch (timeFilter) {
     case "daily":
@@ -55480,15 +55652,6 @@ const getTimeQuantity = (timeFilter = 'monthly') => {
       return "months";
   }
 };
-
-/**
- * Gets previous cumulative score from data before start date
- * @param {Array} dates - Array of data objects with date field
- * @param {dayjs.Dayjs} startDate - The start date
- * @param {string} timeFilter - The time filter
- * @param {string} valueField - The field name to extract value from (default: 'total')
- * @returns {Object} Object with hasPreviousData, previousCumulativeScore, previousMaxScore
- */
 const getPreviousGraphData = (dates, startDate, timeFilter, valueField = 'total') => {
   let previousCumulativeScore = 0;
   let previousMaxScore = 0;
@@ -55524,17 +55687,6 @@ const getPreviousGraphData = (dates, startDate, timeFilter, valueField = 'total'
     previousMaxScore
   };
 };
-
-/**
- * Processes chart data with time filtering support
- * @param {Object} params - Parameters object
- * @param {Array} params.mainData - Array of data objects with date and value fields
- * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly', 'yearly')
- * @param {Object} params.filters - Optional filters object with timeframe
- * @param {boolean} params.isCumulative - Whether to calculate cumulative values (default: false)
- * @param {string} params.valueField - Field name to extract value from (default: 'total', also checks 'count', 'jobs', 'value')
- * @returns {Array} Processed chart data array
- */
 const processChartDateData = ({
   mainData,
   timeFilter: filter,
@@ -55546,8 +55698,35 @@ const processChartDateData = ({
   const dates = mainData || [];
   const isEmpty = !mainData || !Array.isArray(mainData) || mainData.length === 0;
   const _data = [];
-  let end = filters?.timeframe?.endDate || dayjs__default["default"]();
-  let start = filters?.timeframe?.startDate || dayjs__default["default"]().add(-12, timeQuantity);
+
+  // Derive date range from actual data if no filters provided and data exists
+  let end, start;
+  if (filters?.timeframe?.endDate) {
+    end = filters.timeframe.endDate;
+  } else if (!isEmpty) {
+    // Find the latest date in the data
+    const sortedDates = dates.map(d => dayjs__default["default"](d.date, "YYYY-MM-DD")).filter(d => d.isValid()).sort((a, b) => b.valueOf() - a.valueOf());
+    end = sortedDates.length > 0 ? sortedDates[0] : dayjs__default["default"]();
+  } else {
+    end = dayjs__default["default"]();
+  }
+  if (filters?.timeframe?.startDate) {
+    start = filters.timeframe.startDate;
+  } else if (!isEmpty) {
+    // Find the earliest date in the data
+    const sortedDates = dates.map(d => dayjs__default["default"](d.date, "YYYY-MM-DD")).filter(d => d.isValid()).sort((a, b) => a.valueOf() - b.valueOf());
+    start = sortedDates.length > 0 ? sortedDates[0] : dayjs__default["default"]().add(-12, timeQuantity);
+
+    // For daily filter, limit to last 14 days to avoid overcrowded x-axis
+    if (filter === "daily" && end) {
+      const maxDailyStart = end.subtract(13, 'days'); // 14 days total including end date
+      if (start.isBefore(maxDailyStart)) {
+        start = maxDailyStart;
+      }
+    }
+  } else {
+    start = dayjs__default["default"]().add(-12, timeQuantity);
+  }
 
   // Normalize start and end to period boundaries
   if (filter === "daily") {
@@ -55563,6 +55742,30 @@ const processChartDateData = ({
     start = start.startOf('month');
     end = end.startOf('month');
   }
+
+  // Ensure minimum number of periods to fill the x-axis properly
+  const getMinPeriods = f => {
+    switch (f) {
+      case "daily":
+        return 14;
+      // At least 14 days
+      case "weekly":
+        return 8;
+      // At least 8 weeks
+      case "yearly":
+        return 5;
+      // At least 5 years
+      default:
+        return 12;
+      // At least 12 months
+    }
+  };
+  const minPeriods = getMinPeriods(filter);
+  const periodsDiff = end.diff(start, timeQuantity);
+  if (periodsDiff < minPeriods - 1) {
+    const periodsToAdd = minPeriods - 1 - periodsDiff;
+    start = start.subtract(periodsToAdd, timeQuantity);
+  }
   let i = 0;
   let cumulativeScore = 0;
 
@@ -55629,13 +55832,6 @@ const processChartDateData = ({
   }
   return _data;
 };
-
-/**
- * Formats date axis labels, checking if already formatted
- * @param {string} label - The label to format
- * @param {Function} getFormatDateFn - Function to format dates
- * @returns {string} Formatted date string
- */
 const formatDateAxis = (label, getFormatDateFn) => {
   if (!label) return label;
 
@@ -61023,7 +61219,7 @@ const getColumns$1 = ({
   userRoles = [],
   company = {},
   canCreate = false,
-  app
+  APP
 }) => [
 // {
 //     dataIndex: 'datastakeId',
@@ -61196,7 +61392,7 @@ const getColumns$1 = ({
       key: "copyLink",
       onClick: () => {
         if (location.pathname.includes(`/${APP}`)) {
-          navigator.clipboard.writeText(`${window.location.host}/${app}/r/${company.inviteToken}/${all.invitationToken}`);
+          navigator.clipboard.writeText(`${window.location.host}/${APP}/r/${company.inviteToken}/${all.invitationToken}`);
         } else {
           navigator.clipboard.writeText(`${window.location.host}/r/${company.inviteToken}/${all.invitationToken}`);
         }
@@ -61457,6 +61653,7 @@ const UsersCreate = ({
             }
           }
         });
+        onCancel();
       }
     })
   });
@@ -61485,11 +61682,12 @@ const UsersTable = ({
   ajaxOptions = {},
   changeAjaxOptions = () => {},
   extendingFilters = {},
-  userRoles = []
+  userRoles = [],
+  breadCrumbs = []
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const params = new URLSearchParams(location?.search);
-  const [openCreateModal, setOpenCreateModal] = React.useState(params.has("create"));
+  React.useState(params.has("create"));
   const [userToEdit, setUserToEdit] = React.useState(null);
   const columns = React.useMemo(() => getColumns$1({
     t,
@@ -61500,35 +61698,9 @@ const UsersTable = ({
     theme,
     subject: 'user',
     data,
-    setUserToEdit
+    setUserToEdit,
+    APP
   }), [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]);
@@ -61538,84 +61710,65 @@ const UsersTable = ({
       ...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, {
+  const customCreate = ({
+    onDrawerClose
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(UsersCreate, {
       t: t,
-      checkboxConfig: checkboxConfig,
-      defaultTableFilters: {},
-      columns: columns,
-      data: data,
-      loading: loading,
-      location: location,
       goTo: goTo,
+      user: user,
       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);
+      getAppHeader: getAppHeader,
+      onSubmitted: payload => {
+        if (userToEdit) {
+          onEditUser(payload);
+        } else {
+          onInviteUser(payload);
+        }
+        onDrawerClose();
       },
-      width: CREATE_DRAWER_WIDTH,
-      bodyStyle: {
-        padding: 0
+      onCancel: () => {
+        onDrawerClose();
       },
-      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
-      })
-    })]
+      query: query,
+      ajaxForms: ajaxForms,
+      changeAjaxForms: changeAjaxForms,
+      ajaxOptions: ajaxOptions,
+      changeAjaxOptions: changeAjaxOptions,
+      userRoles: userRoles,
+      userToEdit: userToEdit
+    });
+  };
+  return /*#__PURE__*/jsxRuntime.jsx(TablePage, {
+    t: t,
+    goTo: goTo,
+    user: user,
+    options: options,
+    getRedirectLink: getRedirectLink,
+    theme: theme,
+    loading: loading,
+    data: data,
+    isMobile: isMobile,
+    APP: APP,
+    location: location,
+    getData: getData,
+    getApiBaseUrl: getApiBaseUrl,
+    getAppHeader: getAppHeader,
+    extendingFilters: extendingFilters,
+    subject: "users",
+    breadcrumbs: breadCrumbs,
+    headerInfo: {
+      title: "users",
+      createTitle: "New User"
+    },
+    noTabs: true,
+    customCreate: customCreate,
+    customColumns: columns,
+    customCheckboxConfig: checkboxConfig,
+    customFiltersConfig: filtersConfig,
+    customSelectFiltersConfig: selectFiltersConfig,
+    externalOpenDrawer: !!userToEdit
   });
 };
 
@@ -61924,10 +62077,14 @@ const useCallToGetData = ({
   version,
   user,
   setLoading,
-  APP
+  APP,
+  selectedPartners
 }) => {
   const isFirstRender = React.useRef(true);
   const callToGetData = (_doCall = false) => {
+    if (selectedPartners?.loading) {
+      return;
+    }
     const dKey = namespaceConfig?.dataKey;
     const nKey = `${APP}-${getNkey(namespace || "")}`;
     const doCall = _doCall ? true : hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey) ? allData[dKey][nKey]?.data?.datastakeId !== id : true;
@@ -61943,7 +62100,7 @@ const useCallToGetData = ({
       return;
     }
     callToGetData(true);
-  }, [source, version]);
+  }, [source, version, selectedPartners?.partners]);
   React.useEffect(() => {
     callToGetData(true);
   }, [id, namespace, user.language]);
@@ -62494,6 +62651,7 @@ const View = ({
   APP,
   viewConfig,
   partners,
+  selectedPartners,
   setSelectedPartners,
   user,
   serviceMap,
@@ -62656,7 +62814,7 @@ const View = ({
         }),
         datastakeId: id ? id : 'user',
         version,
-        source
+        sources: source || selectedPartners?.partners
       });
     }
   };
@@ -62671,7 +62829,8 @@ const View = ({
     version,
     user,
     setLoading,
-    APP
+    APP,
+    selectedPartners
   });
   const extraLinking = React.useMemo(() => {
     return null;
@@ -62701,7 +62860,7 @@ const View = ({
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "daf-view-form",
       children: [/*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
-        title: (namespace === 'kyc' ? "KYC" : data?.name) || "",
+        title: (namespace === 'kyc' ? `${user?.firstName} ${user?.lastName} - KYC` : data?.name) || "",
         breadcrumbs: breadcrumbs,
         goBackTo: goBack,
         actionButtons: actionButtons,
@@ -63001,6 +63160,7 @@ const Edit = ({
   params,
   clear,
   getRedirectLink,
+  selectedPartners,
   pathname,
   search,
   viewConfig,
@@ -63117,7 +63277,8 @@ const Edit = ({
         ...(namespaceConfig?.scope && {
           scope: namespaceConfig.scope
         }),
-        datastakeId: id ? id : 'user'
+        datastakeId: id ? id : 'user',
+        sources: selectedPartners?.partners
       });
     }
   };
@@ -63132,7 +63293,8 @@ const Edit = ({
     version: null,
     user,
     setLoading,
-    APP
+    APP,
+    selectedPartners
   });
   const callback = (type, m) => {
     localStorage.removeItem(`${id}-loading`);