datastake-daf 0.6.819 → 0.6.820

package/dist/hooks/index.js

@@ -1783,9 +1783,13 @@ const useSources = ({
   type,
   id,
   user,
-  t = () => {}
+  t = () => {},
+  stop
 }) => {
   function getData(params) {
+    if (stop) return Promise.resolve({
+      data: []
+    });
     if (id !== undefined && id !== null) {
       return SourceService$1.getSources({
         type,
@@ -2229,14 +2233,17 @@ class DashboardService extends BaseService {
       isApp: true
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
+  async getUserGrowth(activeFilter) {
+    const {
+      data
+    } = await this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
+    return data;
   }
   getAdminDashboard() {
     return this.apiGet({
@@ -2338,14 +2345,18 @@ function useAdminDashboard({
       setLoading(false);
     }
   }, [dashboardService, onError]);
-  const fetchUserGrowth = React.useCallback(async params => {
+  const fetchUserGrowth = React.useCallback(async activeFilter => {
     if (!dashboardService?.getUserGrowth) {
       console.warn("dashboardService.getUserGrowth not provided");
       return;
     }
+    if (activeFilter === undefined || activeFilter === null) {
+      console.warn("activeFilter not provided to fetchUserGrowth");
+      return;
+    }
     setUserGrowthDataLoading(true);
     try {
-      const response = await dashboardService.getUserGrowth(params);
+      const response = await dashboardService.getUserGrowth(activeFilter);
       setUserGrowthData(response || []);
     } catch (err) {
       if (onError) {

package/dist/pages/index.js

@@ -7312,6 +7312,9 @@ class ErrorService {
     return e.join('\n');
   }
 }
+const handleError = err => {
+  antd.message.error(err?.response?.data?.message);
+};
 
 // In datastake-daf - src/services/BaseService.js
 class BaseService extends BaseHTTPService {
@@ -7429,14 +7432,17 @@ class DashboardService extends BaseService {
       isApp: true
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
+  async getUserGrowth(activeFilter) {
+    const {
+      data
+    } = await this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
+    return data;
   }
   getAdminDashboard() {
     return this.apiGet({
@@ -42822,14 +42828,29 @@ const getColumns$b = ({
       items: sources
     });
   }
+}, {
+  title: t("Author"),
+  dataIndex: "author",
+  key: "author",
+  show: activeTab === "own",
+  render: (value, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const author = value?.name;
+    return author ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: author,
+      children: author
+    }) : '-';
+  },
+  ellipsis: true
 }, {
   title: t("Status"),
   dataIndex: "status",
   key: "status",
   show: activeTab === "own",
-  correctiveActions: activeTab === "own",
-  testimonials: activeTab === "own",
-  incident: activeTab === "own",
   render: (value, all) => {
     if (all.empty) {
       return /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -44757,6 +44778,29 @@ const getColumns$6 = ({
       children: category
     });
   }
+}, {
+  dataIndex: 'products',
+  title: t('Products'),
+  ellipsis: true,
+  show: APP === 'nashiriki',
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const products = v?.map(product => product?.typeOfProduct);
+    const productOptions = findOptions(products, options?.minerals || options?.mineralOptions);
+    return productOptions?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(MoreTags, {
+      values: productOptions,
+      limit: 1,
+      tagColor: "processing",
+      style: {
+        fontWeight: "normal",
+        fontSize: 14
+      }
+    }) : '-';
+  }
 }, {
   dataIndex: 'operator',
   title: t('Operator'),
@@ -45382,7 +45426,8 @@ const getColumns$3 = ({
   theme,
   subject,
   data,
-  applications
+  applications,
+  APP
 }) => {
   const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
   return registry?.columns({
@@ -45395,7 +45440,8 @@ const getColumns$3 = ({
     theme,
     subject,
     data,
-    applications
+    applications,
+    APP
   });
 };
 
@@ -45479,9 +45525,6 @@ const useTablePage = ({
     t,
     subject
   }), [t, subject, getFiltersConfig$1]);
-  console.log({
-    options
-  });
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
@@ -52559,48 +52602,6 @@ styled__default["default"].div`
 	width: calc(100% - 48px);
 `;
 
-styled__default["default"].div`
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	height: fit-content;
-	margin-top: 24px;
-
-	.daf-table {
-		margin-top: 12px;
-	}
-
-	.merge-modal-section-text {
-		font-family: SF UI Display;
-		font-weight: 500;
-		font-style: Medium;
-		font-size: 14px;
-		leading-trim: NONE;
-		line-height: 20px;
-		margin-left: 30px;
-		letter-spacing: 0%;
-	}
-
-	.select-container {
-		padding: 12px 24px;
-		border: 1px solid;
-		border-radius: 8px;
-		margin: 2px 30px 48px 30px;
-		display: flex;
-		flex-wrap: wrap;
-		gap: 10px;
-
-		.ant-form-item {
-			margin-bottom: 0;
-		}
-
-		@media (max-width: 868px) {
-			flex-direction: column;
-			gap: 10px;
-		}
-	}
-`;
-
 class AdminService extends BaseService {
   updateCompany(id, data) {
     return this.apiPut({
@@ -52624,6 +52625,20 @@ class AdminService extends BaseService {
       data
     });
   }
+  resendInvitation({
+    invitationToken
+  }) {
+    return this.apiPost({
+      url: `/accounts/resendInvitation/${invitationToken}`
+    });
+  }
+  copyInvitation({
+    invitationToken
+  }) {
+    return this.apiPost({
+      url: `/accounts/copyInvitation/${invitationToken}`
+    });
+  }
   inviteAccount(data) {
     return this.apiPost({
       url: `/accounts/inviteAccount`,
@@ -52640,8 +52655,15 @@ class AdminService extends BaseService {
   }
   updateAccount({
     data,
-    id
+    id,
+    isPending = false
   }) {
+    if (isPending) {
+      return this.apiPut({
+        data,
+        url: `/accounts/invitation/${id}`
+      });
+    }
     return this.apiPut({
       data,
       url: `/accounts/${id}`
@@ -52655,11 +52677,11 @@ class AdminService extends BaseService {
     });
   }
   transferAdmin({
-    userId,
-    id
+    companyId,
+    userId
   }) {
     return this.apiPut({
-      url: `/accounts/transfer-rights/${id}`,
+      url: `/companies/${companyId}/transfer-rights`,
       data: {
         userId
       }
@@ -52756,6 +52778,58 @@ class AdminService extends BaseService {
       url: `/management/subject/${subject}/${id}`
     });
   }
+  getItems({
+    item
+  }) {
+    return this.apiGet({
+      url: `/management/items/${item}`
+    });
+  }
+  getItemForm({
+    item,
+    scope = "create"
+  }) {
+    return this.apiGet({
+      url: `/forms/${item}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getItemData({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
+  deleteItem({
+    item,
+    id
+  }) {
+    return this.apiDelete({
+      url: `/management/item/${item}/${id}`
+    });
+  }
+  updateItem({
+    item,
+    id,
+    data
+  }) {
+    return this.apiPut({
+      url: `/management/item/${item}/${id}`,
+      data
+    });
+  }
+  viewItem({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
   viewLocation({
     id
   }) {
@@ -52778,7 +52852,7 @@ class AdminService extends BaseService {
     const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiPut({
       url: `/management/subject/${type}/${id}`,
-      data: filterCreateData(data)
+      data: data
     });
   }
   deleteSubject({
@@ -52790,17 +52864,78 @@ class AdminService extends BaseService {
       url: `/management/subject/${type}/${id}`
     });
   }
-  getUserGrowth(activeFilter) {
-    return this.apiGet({
+  async getUserGrowth(activeFilter) {
+    const {
+      data
+    } = await this.apiGet({
       url: `/accounts/dashboard/user-growth`,
       isUserManager: true,
       params: {
         activeFilter
       }
     });
+    return data;
+  }
+  removeUserFromAccount({
+    accountId,
+    userId
+  }) {
+    return this.apiPut({
+      url: `/companies/${accountId}/remove-user/${userId}`
+    });
+  }
+  getTopContributors({
+    params
+  }) {
+    return this.apiGet({
+      url: `/accounts/dashboard/top-contributors`,
+      params
+    });
   }
 }
-createLazyService(AdminService);
+var AdminService$1 = createLazyService(AdminService);
+
+styled__default["default"].div`
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	height: fit-content;
+	margin-top: 24px;
+
+	.daf-table {
+		margin-top: 12px;
+	}
+
+	.merge-modal-section-text {
+		font-family: SF UI Display;
+		font-weight: 500;
+		font-style: Medium;
+		font-size: 14px;
+		leading-trim: NONE;
+		line-height: 20px;
+		margin-left: 30px;
+		letter-spacing: 0%;
+	}
+
+	.select-container {
+		padding: 12px 24px;
+		border: 1px solid;
+		border-radius: 8px;
+		margin: 2px 30px 48px 30px;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 10px;
+
+		.ant-form-item {
+			margin-bottom: 0;
+		}
+
+		@media (max-width: 868px) {
+			flex-direction: column;
+			gap: 10px;
+		}
+	}
+`;
 
 const Styles = styled__default["default"].div`
   width: 100%;
@@ -61147,7 +61282,8 @@ const useViewPermissions = ({
   id,
   namespaceOverrides = {
     supportedNamespaces: {},
-    canEdit: {}
+    canEdit: {},
+    canDelete: {}
   },
   namespace,
   user,
@@ -61158,6 +61294,9 @@ const useViewPermissions = ({
   viewConfig
 }) => {
   const baseNamespaceKeys = Object.keys(namespaceConfig || {});
+  console.log({
+    namespaceConfig
+  });
   const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
     acc[key] = () => true;
     return acc;
@@ -61181,6 +61320,16 @@ const useViewPermissions = ({
     };
     return canEditAction[namespace] ? canEditAction[namespace]() : false;
   }, [namespace, data, user]);
+  const canDelete = React.useMemo(() => {
+    baseNamespaceKeys.reduce((acc, key) => {
+      acc[key] = () => isUserData();
+      return acc;
+    }, {});
+    const canDeleteAction = {
+      ...namespaceOverrides.canDelete
+    };
+    return canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+  }, [namespace, data, user, namespaceOverrides]);
   React.useEffect(() => {
     if (data) {
       if (typeof isSupportedNamespaces[namespace] === "function") {
@@ -61193,7 +61342,8 @@ const useViewPermissions = ({
   return {
     isSupportedNamespaces,
     canEdit,
-    isSupported
+    isSupported,
+    canDelete
   };
 };
 
@@ -61312,7 +61462,9 @@ const useViewActions = ({
   getRedirectLink,
   t,
   viewConfig,
-  buttonActions
+  buttonActions,
+  canDelete,
+  deleteSubject
 }) => {
   const [pageActions, setPageActions] = React.useState([]);
   const [extraPageActions, setExtraPageActions] = React.useState([]);
@@ -61343,9 +61495,19 @@ const useViewActions = ({
         }
       }
     }
+    if (canDelete) {
+      if (viewConfig.deleteNamespaces.includes(namespace)) {
+        actions.push(buttonActions.createDeleteButton(t, deleteSubject));
+      }
+    }
     if (viewConfig.summaryNamespaces.includes(namespace)) {
       extraActions.push(buttonActions.createSummaryButton(t, namespace, data, push, getRedirectLink));
       extraActions.push(buttonActions.createRecordsButton(t, setOpenRecordsModal));
+      if (canDelete) {
+        if (viewConfig.deleteNamespaces.includes(namespace)) {
+          extraActions.push(buttonActions.createDeleteButton(t, deleteSubject));
+        }
+      }
     }
     setPageActions(actions);
     setExtraPageActions(extraActions);
@@ -61811,6 +61973,9 @@ const View = ({
 }) => {
   const getNamespaceConfig = namespace => namespaceConfiguration?.[namespace] || {};
   const [openRecordsModal, setOpenRecordsModal] = React.useState(false);
+  console.log({
+    partners
+  });
 
   // HANDLES THE URL PARAMS FOR THE VIEW PAGE
   const {
@@ -61859,7 +62024,8 @@ const View = ({
   });
   const {
     canEdit,
-    isSupported
+    isSupported,
+    canDelete
   } = useViewPermissions({
     data,
     id,
@@ -61892,6 +62058,23 @@ const View = ({
     data,
     serviceMap
   });
+  const subjects = {
+    "management-location": "location",
+    "management-stakeholder": "stakeholder"
+  };
+  const handleDeleteSubject = React.useCallback(async () => {
+    try {
+      await AdminService$1.deleteSubject({
+        subject: subjects[namespace],
+        id: id
+      });
+      antd.message.success(t("Subject deleted successfully"));
+      push(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+    } catch (error) {
+      handleError(error);
+      antd.message.error(t("Failed to delete subject"));
+    }
+  }, [namespace, id, t, push, getRedirectLink]);
   const {
     pageActions,
     extraPageActions
@@ -61911,7 +62094,9 @@ const View = ({
     getRedirectLink,
     t,
     viewConfig,
-    buttonActions
+    buttonActions,
+    canDelete,
+    deleteSubject: handleDeleteSubject
   });
   React.useEffect(() => {
     if (namespace && id && namespaceConfig && typeof getSubjectsDetails === 'function') {
@@ -61955,6 +62140,7 @@ const View = ({
     return null;
   }, [namespace, match, data]);
   const sourceOptions = React.useMemo(() => {
+    if (!partners) return [];
     return partners.map(partner => {
       const isOwnData = partner.id === user?.company?.id;
       return {
@@ -61989,7 +62175,9 @@ const View = ({
           children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
             options: [...sourceOptions],
             isAvatarGroup: true,
-            selectionType: "checkbox",
+            selectionType: "checkbox"
+            // key={partners?.length}
+            ,
             canUnselectLast: false,
             isSingle: true,
             onChange: selected => {
@@ -62001,7 +62189,7 @@ const View = ({
             },
             dropDownWidth: 200,
             defaultSelected: (partners || []).map(p => p.id) || []
-          }, partners?.length)
+          })
         })
       }), /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "view-content",