datastake-daf 0.6.808 → 0.6.809

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

@@ -7390,14 +7390,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({
@@ -51472,6 +51475,209 @@ styled__default["default"].div`
 	}
 `;
 
+class AuthenticationService extends BaseService {
+  register(form) {
+    return this.apiPost({
+      url: '/register',
+      data: form
+    });
+  }
+  login(username, password, firebaseToken, rest) {
+    const headers = {
+      CheckApplicationAccess: rest?.invited ? false : undefined
+    };
+    if (firebaseToken) {
+      headers.FbToken = firebaseToken;
+      headers.Platform = 'web';
+    }
+    return this.apiPost({
+      url: rest?.invited ? '/auth/app-invitation' : '/login',
+      data: rest?.invited ? {
+        email: username,
+        password,
+        ...rest,
+        invited: undefined
+      } : {
+        email: username,
+        password
+      },
+      headers
+    });
+  }
+  updateCompany(id, data) {
+    return this.apiPut({
+      url: `/companies/${id}`,
+      data,
+      isDaf: true
+    });
+  }
+  getApplications() {
+    return this.apiGet({
+      url: '/applications',
+      isDaf: true
+    });
+  }
+  getRegistrationData(code) {
+    return this.apiGet({
+      url: `requests/registration-data/${code}`,
+      isUserManager: true
+    });
+  }
+  getRegistrationOptions(data) {
+    return this.apiPost({
+      url: '/auth/registration-options',
+      isDaf: true,
+      data
+    });
+  }
+  verify(code) {
+    return this.apiGet({
+      url: '/register/confirm',
+      params: {
+        token: code
+      },
+      isDaf: true
+    });
+  }
+  exitImpersonation() {
+    return this.apiGet({
+      url: '/users/impersonate/exit'
+    });
+  }
+  resetPasswordRequest(payload) {
+    const lang = StorageManager.get('datastakeLng') || 'en';
+    const req = {
+      ...payload,
+      language: lang
+    };
+    return this.apiPut({
+      url: '/profile/reset-password',
+      data: req,
+      headers: {
+        Language: lang
+      }
+    });
+  }
+  changePassword(payload) {
+    return this.apiPut({
+      url: '/profile/change-password',
+      data: payload
+    });
+  }
+  resetPassword(payload) {
+    return this.apiPut({
+      url: '/forgot-password/reset',
+      data: payload
+    });
+  }
+  updateLanguage(language) {
+    return this.apiPut({
+      url: '/profile',
+      data: {
+        language
+      }
+    });
+  }
+  resendVerification() {
+    return this.apiGet({
+      url: '/auth/rverification'
+    });
+  }
+  getInvitedUsers(id) {
+    return this.apiGet({
+      url: `/companies/${id}`
+    });
+  }
+  inviteUser(payload, id) {
+    if (id) {
+      return this.apiPost({
+        url: `/companies/${id}/invite`,
+        data: payload
+      });
+    }
+    return this.apiPost({
+      url: '/companies/invite',
+      data: payload
+    });
+  }
+  confirmInvitation({
+    password,
+    mailUpdates
+  }, token, code = {}) {
+    return this.apiPost({
+      url: `/register/${code.companyCode}/sub-user/${code.userCode}`,
+      data: {
+        password: password || '',
+        mailUpdates
+      },
+      headers: token ? {
+        Authorization: `Bearer ${token}`
+      } : undefined
+    });
+  }
+  getUserFromInvitation(code = {}) {
+    return this.apiGet({
+      url: `/companies/${code.companyCode}/sub-user/${code.userCode}`
+    });
+  }
+  demoLogin(token) {
+    return this.apiGet({
+      url: `/demo/${token}`
+    });
+  }
+  demoSignup(payload) {
+    return this.apiPost({
+      url: '/demo-signup',
+      data: payload
+    });
+  }
+  resendEmail(email) {
+    return this.apiPost({
+      url: `/register/resendConfirmation`,
+      data: {
+        email
+      }
+    });
+  }
+  editUserSettings(data = {}) {
+    return this.apiPut({
+      url: `/profile`,
+      data
+    });
+  }
+  editSubUser(data = {}) {
+    return this.apiPut({
+      url: `/users/updateRole/${data.id}`,
+      data
+    });
+  }
+  removeSubUser(companyId, userId) {
+    return this.apiPut({
+      url: `/companies/${companyId}/remove-user/${userId}`
+    });
+  }
+  resendSubUserInvite(id) {
+    return this.apiPost({
+      url: `/companies/resendInvitation/${id}`
+    });
+  }
+  getFormOptions({
+    references = ['countries', 'categoriesOptions', 'subCategoriesOptions', 'locationCategoriesOptions', 'documentationTypesOptions'],
+    language,
+    ...params
+  }) {
+    return this.apiPost({
+      url: '/query/form-options',
+      isDaf: true,
+      data: {
+        references,
+        language
+      }
+    });
+  }
+}
+createLazyService(AuthenticationService);
+
 class AdminService extends BaseService {
   updateCompany(id, data) {
     return this.apiPut({
@@ -51649,7 +51855,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({
@@ -51661,14 +51867,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.apiDelete({
+      url: `/accounts/${accountId}/users/${userId}`
+    });
   }
 }
 createLazyService(AdminService);
@@ -53189,209 +53406,6 @@ const ActivityLocation$1 = ({
   });
 };
 
-class AuthenticationService extends BaseService {
-  register(form) {
-    return this.apiPost({
-      url: '/register',
-      data: form
-    });
-  }
-  login(username, password, firebaseToken, rest) {
-    const headers = {
-      CheckApplicationAccess: rest?.invited ? false : undefined
-    };
-    if (firebaseToken) {
-      headers.FbToken = firebaseToken;
-      headers.Platform = 'web';
-    }
-    return this.apiPost({
-      url: rest?.invited ? '/auth/app-invitation' : '/login',
-      data: rest?.invited ? {
-        email: username,
-        password,
-        ...rest,
-        invited: undefined
-      } : {
-        email: username,
-        password
-      },
-      headers
-    });
-  }
-  updateCompany(id, data) {
-    return this.apiPut({
-      url: `/companies/${id}`,
-      data,
-      isDaf: true
-    });
-  }
-  getApplications() {
-    return this.apiGet({
-      url: '/applications',
-      isDaf: true
-    });
-  }
-  getRegistrationData(code) {
-    return this.apiGet({
-      url: `requests/registration-data/${code}`,
-      isUserManager: true
-    });
-  }
-  getRegistrationOptions(data) {
-    return this.apiPost({
-      url: '/auth/registration-options',
-      isDaf: true,
-      data
-    });
-  }
-  verify(code) {
-    return this.apiGet({
-      url: '/register/confirm',
-      params: {
-        token: code
-      },
-      isDaf: true
-    });
-  }
-  exitImpersonation() {
-    return this.apiGet({
-      url: '/users/impersonate/exit'
-    });
-  }
-  resetPasswordRequest(payload) {
-    const lang = StorageManager.get('datastakeLng') || 'en';
-    const req = {
-      ...payload,
-      language: lang
-    };
-    return this.apiPut({
-      url: '/profile/reset-password',
-      data: req,
-      headers: {
-        Language: lang
-      }
-    });
-  }
-  changePassword(payload) {
-    return this.apiPut({
-      url: '/profile/change-password',
-      data: payload
-    });
-  }
-  resetPassword(payload) {
-    return this.apiPut({
-      url: '/forgot-password/reset',
-      data: payload
-    });
-  }
-  updateLanguage(language) {
-    return this.apiPut({
-      url: '/profile',
-      data: {
-        language
-      }
-    });
-  }
-  resendVerification() {
-    return this.apiGet({
-      url: '/auth/rverification'
-    });
-  }
-  getInvitedUsers(id) {
-    return this.apiGet({
-      url: `/companies/${id}`
-    });
-  }
-  inviteUser(payload, id) {
-    if (id) {
-      return this.apiPost({
-        url: `/companies/${id}/invite`,
-        data: payload
-      });
-    }
-    return this.apiPost({
-      url: '/companies/invite',
-      data: payload
-    });
-  }
-  confirmInvitation({
-    password,
-    mailUpdates
-  }, token, code = {}) {
-    return this.apiPost({
-      url: `/register/${code.companyCode}/sub-user/${code.userCode}`,
-      data: {
-        password: password || '',
-        mailUpdates
-      },
-      headers: token ? {
-        Authorization: `Bearer ${token}`
-      } : undefined
-    });
-  }
-  getUserFromInvitation(code = {}) {
-    return this.apiGet({
-      url: `/companies/${code.companyCode}/sub-user/${code.userCode}`
-    });
-  }
-  demoLogin(token) {
-    return this.apiGet({
-      url: `/demo/${token}`
-    });
-  }
-  demoSignup(payload) {
-    return this.apiPost({
-      url: '/demo-signup',
-      data: payload
-    });
-  }
-  resendEmail(email) {
-    return this.apiPost({
-      url: `/register/resendConfirmation`,
-      data: {
-        email
-      }
-    });
-  }
-  editUserSettings(data = {}) {
-    return this.apiPut({
-      url: `/profile`,
-      data
-    });
-  }
-  editSubUser(data = {}) {
-    return this.apiPut({
-      url: `/users/updateRole/${data.id}`,
-      data
-    });
-  }
-  removeSubUser(companyId, userId) {
-    return this.apiPut({
-      url: `/companies/${companyId}/remove-user/${userId}`
-    });
-  }
-  resendSubUserInvite(id) {
-    return this.apiPost({
-      url: `/companies/resendInvitation/${id}`
-    });
-  }
-  getFormOptions({
-    references = ['countries', 'categoriesOptions', 'subCategoriesOptions', 'locationCategoriesOptions', 'documentationTypesOptions'],
-    language,
-    ...params
-  }) {
-    return this.apiPost({
-      url: '/query/form-options',
-      isDaf: true,
-      data: {
-        references,
-        language
-      }
-    });
-  }
-}
-createLazyService(AuthenticationService);
-
 class NotificationService extends BaseService {
   get({
     status = 'unread'

package/dist/services/index.js

@@ -934,7 +934,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 +946,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.apiDelete({
+      url: `/accounts/${accountId}/users/${userId}`
+    });
   }
 }
 var AdminService$1 = createLazyService(AdminService);
@@ -1405,14 +1416,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

@@ -7554,14 +7554,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,
@@ -7570,10 +7571,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,
@@ -7586,6 +7586,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
@@ -7790,6 +7800,15 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 }
 
 const en = {
+  "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.808",
+	"version": "0.6.809",
 	"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`)}