datastake-daf 0.6.812 → 0.6.813

package/dist/hooks/index.js

@@ -2229,14 +2229,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 +2341,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

@@ -7297,6 +7297,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 {
@@ -7414,14 +7417,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({
@@ -51694,6 +51700,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`,
@@ -51710,8 +51730,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}`
@@ -51826,6 +51853,21 @@ class AdminService extends BaseService {
       url: `/management/subject/${subject}/${id}`
     });
   }
+  getItems({
+    item
+  }) {
+    return this.apiGet({
+      url: `/management/items/${item}`
+    });
+  }
+  getItemData({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
   viewLocation({
     id
   }) {
@@ -51848,7 +51890,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({
@@ -51860,17 +51902,28 @@ 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}`
+    });
   }
 }
-createLazyService(AdminService);
+var AdminService$1 = createLazyService(AdminService);
 
 const Styles = styled__default["default"].div`
   width: 100%;
@@ -60096,7 +60149,8 @@ const useViewPermissions = ({
   id,
   namespaceOverrides = {
     supportedNamespaces: {},
-    canEdit: {}
+    canEdit: {},
+    canDelete: {}
   },
   namespace,
   user,
@@ -60107,6 +60161,9 @@ const useViewPermissions = ({
   viewConfig
 }) => {
   const baseNamespaceKeys = Object.keys(namespaceConfig || {});
+  console.log({
+    namespaceConfig
+  });
   const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
     acc[key] = () => true;
     return acc;
@@ -60130,6 +60187,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") {
@@ -60142,7 +60209,8 @@ const useViewPermissions = ({
   return {
     isSupportedNamespaces,
     canEdit,
-    isSupported
+    isSupported,
+    canDelete
   };
 };
 
@@ -60261,7 +60329,9 @@ const useViewActions = ({
   getRedirectLink,
   t,
   viewConfig,
-  buttonActions
+  buttonActions,
+  canDelete,
+  deleteSubject
 }) => {
   const [pageActions, setPageActions] = React.useState([]);
   const [extraPageActions, setExtraPageActions] = React.useState([]);
@@ -60292,9 +60362,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);
@@ -60808,7 +60888,8 @@ const View = ({
   });
   const {
     canEdit,
-    isSupported
+    isSupported,
+    canDelete
   } = useViewPermissions({
     data,
     id,
@@ -60841,6 +60922,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"));
+      goTo(getRedirectLink(`/app/management/subject/${subjects[namespace]}`));
+    } catch (error) {
+      handleError(error);
+      antd.message.error(t("Failed to delete subject"));
+    }
+  }, [namespace, id, t]);
   const {
     pageActions,
     extraPageActions
@@ -60860,7 +60958,9 @@ const View = ({
     getRedirectLink,
     t,
     viewConfig,
-    buttonActions
+    buttonActions,
+    canDelete,
+    deleteSubject: handleDeleteSubject
   });
   React.useEffect(() => {
     if (namespace && id && namespaceConfig && typeof getSubjectsDetails === 'function') {

package/dist/services/index.js

@@ -780,6 +780,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`,
@@ -796,8 +810,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}`
@@ -912,6 +933,21 @@ class AdminService extends BaseService {
       url: `/management/subject/${subject}/${id}`
     });
   }
+  getItems({
+    item
+  }) {
+    return this.apiGet({
+      url: `/management/items/${item}`
+    });
+  }
+  getItemData({
+    item,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/item/${item}/${id}`
+    });
+  }
   viewLocation({
     id
   }) {
@@ -934,7 +970,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({
@@ -946,14 +982,25 @@ 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}`
+    });
   }
 }
 var AdminService$1 = createLazyService(AdminService);
@@ -1405,14 +1452,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({

package/dist/utils/index.js

@@ -7578,14 +7578,15 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
+const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page = 1,
-    pageSize = 20,
+    page,
+    pageSize,
     sortDir,
     sortBy,
     search,
@@ -7594,10 +7595,9 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    page,
-    pageSize
+    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
+    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
   });
-  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7610,6 +7610,16 @@ const filterParams = (value, module) => {
       by: sortBy
     });
   }
+  if (Object.keys(filters).length) {
+    if (value.sourceId && value.sourceId === "overview") {
+      params.filters = JSON.stringify(filters);
+    } else {
+      params.filters = JSON.stringify({
+        ...filters,
+        authorId: undefined
+      });
+    }
+  }
   return {
     ...rest,
     ...params
@@ -7814,6 +7824,19 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "admin::events": "Events",
+  "admin::document": "Documents",
+  "events": "Events",
+  "merge-locations": "Merge Locations",
+  "edit-account": "Edit Account",
+  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
+  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
+  "merge": "Merge",
+  "Are-you-sure-you-want-to-suspend-this-account?": "Are you sure you want to suspend this account?",
+  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Associated users will lose access to the application and to all data created for this account.",
+  "current_subjects": "Current Subjects",
+  "merged_output": "Merged Output",
+  "merge-subjects": "Merge Subjects",
   "All Data": "All Data",
   "sbg-admin::remove-user-title": "Remove User Title",
   "sbg-admin::remove-user-body": "Remove User Body",

package/package.json

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

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

@@ -13,13 +13,20 @@ function AuthForm ({
   errors,
   t = (key) => key,
   executeRecaptcha = () => {},
-  getCurrentStep = () => {}
+  getCurrentStep = () => {},
+  theme,
 }){
   const [formInstance] = Form.useForm(form);
   const [currentStep, setCurrentStep] = useState(0);
   const [allFormValues, setAllFormValues] = useState(initialValues);
   const [formErrors, setFormErrors] = useState(null);
 
+  const buttonStyle = theme?.colorPrimary ? {
+    backgroundColor: theme.colorPrimary,
+    borderColor: theme.colorPrimary,
+  } : {};
+
+
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps?.[currentStep]?.fields : fields || [];
 
@@ -166,6 +173,7 @@ function AuthForm ({
       name: field.name,
       label: field.label,
       rules: field.rules,
+      dependencies: field.dependencies,
       style: { marginBottom: 0 }
     };
     if (field.valuePropName && field.type !== 'select') {
@@ -217,6 +225,7 @@ function AuthForm ({
                                 htmlType="submit"
                                 disabled={isLastStep && !allFieldsFilled}
                                 block className="normal-br"
+                                style={buttonStyle}
                             >
                                 {isLastStep ? submitText : t("Next")}
                             </BorderedButton>
@@ -225,14 +234,14 @@ function AuthForm ({
                 }}
                 </Form.Item>
                 <div className="buttons" style={{ marginTop: 0}}>
-                    <BorderedButton onClick={prev} block className="normal-br">
+                    <BorderedButton onClick={prev} block className="normal-br" style={buttonStyle}>
                         {t("Back")}
                     </BorderedButton>
                 </div>
             </div>
         ) : (
             <div className="buttons" style={{ marginTop: isMultiStep ? '16px' : 0}}>
-                <BorderedButton type="primary" htmlType="submit" block className="normal-br">
+                <BorderedButton type="primary" htmlType="submit" block className="normal-br" style={buttonStyle}>
                     {isMultiStep ? t("Next") : submitText}
                 </BorderedButton>
             </div>

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/TopContributors/index.jsx

@@ -8,7 +8,6 @@ export default function TopContributors({ data, loading, t }) {
 	const container = useRef(null);
 
 	useTopContributors({ container, data, t });
-console.log("topcontributorshhhh", data);
 	return (
 		<Widget
 			title={t(`admin::top-contributors`)}

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/hook.js

@@ -12,7 +12,6 @@ export default function useUserGrowth({ container, data: mainData = {}, t, trans
 	const [mainGraph, setMainGraph] = useState(null);
 	const [data, setData] = useState([]);
 	const { token } = useToken();
-console.log("mainData", mainData);
 	const fetchData = () => {
 		const { dates = [] } = mainData;
 		const _data = [];

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -9,13 +9,11 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 	const [selectValue, setSelectValue] = useState(selectOptions[0]?.value);
 
 	useUserGrowth({ container, data, t, translationKeys });
-console.log("usergrowthhhhh", data);
-
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {
 			fetchUserGrowth(selectValue);
 		}
-	}, [selectValue]);
+	}, [selectValue, fetchUserGrowth]);
 
 	return (
 		<Widget