datastake-daf 0.6.798 → 0.6.799

package/dist/context/index.js

@@ -385,7 +385,7 @@ const assignParamsToUrl = (path, params) => {
  * @returns storage objects
  * @class StorageManager
  */
-class StorageManager$1 {
+class StorageManager {
   /**
    * @description Set or update given value in localStorage
    * @static
@@ -520,11 +520,11 @@ class StorageManager$1 {
 const isProxy = () => {
   const pathname = window.location.pathname;
   if (pathname.includes('/proxy/pme') || pathname.includes('/proxy/cadd')) {
-    return window.opener || !!StorageManager$1.get('proxy_token');
+    return window.opener || !!StorageManager.get('proxy_token');
   }
   return false;
 };
-const getToken = () => isProxy() ? StorageManager$1.get('proxy_token') : StorageManager$1.get('token');
+const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
 
 /**
  * Custom params serializer to maintain JSON format for nested objects
@@ -870,7 +870,7 @@ class ErrorService {
 class BaseService extends BaseHTTPService {
   constructor() {
     const errorHandler = createErrorHandler({
-      getStorageManager: () => StorageManager$1,
+      getStorageManager: () => StorageManager,
       handleError: ({
         status,
         statusText,
@@ -890,7 +890,7 @@ class BaseService extends BaseHTTPService {
       onUnauthorized: () => {
         console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
         console.trace('[BaseService] Unauthorized call stack:');
-        StorageManager$1.clearOne('token');
+        StorageManager.clearOne('token');
         if (typeof window !== 'undefined') {
           window.location.href = '/';
         }
@@ -907,7 +907,7 @@ class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: StorageManager$1.get('datastakeLng') || 'en',
+          Language: StorageManager.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application
         };

package/dist/pages/index.js

@@ -4965,7 +4965,7 @@ Timeframe.propTypes = {
  * @returns storage objects
  * @class StorageManager
  */
-class StorageManager$1 {
+class StorageManager {
   /**
    * @description Set or update given value in localStorage
    * @static
@@ -5100,11 +5100,11 @@ class StorageManager$1 {
 const isProxy = () => {
   const pathname = window.location.pathname;
   if (pathname.includes('/proxy/pme') || pathname.includes('/proxy/cadd')) {
-    return window.opener || !!StorageManager$1.get('proxy_token');
+    return window.opener || !!StorageManager.get('proxy_token');
   }
   return false;
 };
-const getToken = () => isProxy() ? StorageManager$1.get('proxy_token') : StorageManager$1.get('token');
+const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
 
 /**
  * @function
@@ -7145,7 +7145,7 @@ class ErrorService {
 class BaseService extends BaseHTTPService {
   constructor() {
     const errorHandler = createErrorHandler({
-      getStorageManager: () => StorageManager$1,
+      getStorageManager: () => StorageManager,
       handleError: ({
         status,
         statusText,
@@ -7165,7 +7165,7 @@ class BaseService extends BaseHTTPService {
       onUnauthorized: () => {
         console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
         console.trace('[BaseService] Unauthorized call stack:');
-        StorageManager$1.clearOne('token');
+        StorageManager.clearOne('token');
         if (typeof window !== 'undefined') {
           window.location.href = '/';
         }
@@ -7182,7 +7182,7 @@ class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: StorageManager$1.get('datastakeLng') || 'en',
+          Language: StorageManager.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application
         };
@@ -17791,7 +17791,7 @@ const useFilters = ({
       }
       return all;
     }, {});
-    const filters = StorageManager$1.saveFilters(module, view, {
+    const filters = StorageManager.saveFilters(module, view, {
       ...filteredFilters
     });
     if (!filters.pageSize) {
@@ -17881,7 +17881,7 @@ const useFilters = ({
     if (isNaN(page.current)) {
       page.current = 1;
     }
-    const filters = StorageManager$1.saveFilters(module, view, {
+    const filters = StorageManager.saveFilters(module, view, {
       page: page.current
     }, true);
     updateQuery(filters, page.current);
@@ -44287,7 +44287,7 @@ const useSummary = ({
         label: item?.name,
         value: item?.datastakeId
       })) : [];
-      const storedData = StorageManager$1.get(storageKey);
+      const storedData = StorageManager.get(storageKey);
       if (storedData) {
         try {
           const parsedStoredData = JSON.parse(storedData);
@@ -44308,7 +44308,7 @@ const useSummary = ({
       if (isPdf) {
         selectedValue = id;
       } else {
-        const storedData = StorageManager$1.get(storageKey);
+        const storedData = StorageManager.get(storageKey);
         if (storedData) {
           try {
             const parsedData = JSON.parse(storedData);
@@ -44339,7 +44339,7 @@ const useSummary = ({
           label: selectedData.name,
           value: selectedData.datastakeId
         };
-        StorageManager$1.set(storageKey, JSON.stringify(saved));
+        StorageManager.set(storageKey, JSON.stringify(saved));
       }
     }
   }, [selectedItem, storageKey, data]);
@@ -50765,6 +50765,207 @@ styled__default["default"].div`
 	}
 `;
 
+class AdminService extends BaseService {
+  updateCompany(id, data) {
+    return this.apiPut({
+      url: `/companies/${id}`,
+      data
+    });
+  }
+  getAccount({
+    id
+  }) {
+    return this.apiGet({
+      url: `/accounts/${id}`
+    });
+  }
+  inviteCompanyAccount({
+    companyId,
+    data
+  }) {
+    return this.apiPost({
+      url: `/accounts/${companyId}/invite`,
+      data
+    });
+  }
+  inviteAccount(data) {
+    return this.apiPost({
+      url: `/accounts/inviteAccount`,
+      data
+    });
+  }
+  getAccounts({
+    params
+  }) {
+    return this.apiGet({
+      params,
+      url: `/accounts`
+    });
+  }
+  updateAccount({
+    data,
+    id
+  }) {
+    return this.apiPut({
+      data,
+      url: `/accounts/${id}`
+    });
+  }
+  toggleAccountStatus({
+    id
+  }) {
+    return this.apiPut({
+      url: `/accounts/suspendActivate/${id}`
+    });
+  }
+  transferAdmin({
+    userId,
+    id
+  }) {
+    return this.apiPut({
+      url: `/accounts/transfer-rights/${id}`,
+      data: {
+        userId
+      }
+    });
+  }
+  getUsers({
+    params
+  }) {
+    return this.apiGet({
+      params,
+      url: `/accounts/users`
+    });
+  }
+  impersonate({
+    id
+  }) {
+    return this.apiGet({
+      url: `/accounts/impersonate/${id}`
+    });
+  }
+  cancelInvitation({
+    token
+  }) {
+    return this.apiPut({
+      url: `/accounts/cancelInvitation/${token}`
+    });
+  }
+  getSubjects({
+    subject,
+    params
+  }) {
+    return this.apiGet({
+      url: `/management/subjects/${subject}`,
+      params
+    });
+  }
+  mergeLocations({
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/location/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
+  mergeSubjects({
+    subject,
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/${subject}/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
+  getSubjectForm({
+    subject,
+    scope = 'global'
+  }) {
+    return this.apiGet({
+      url: `/forms/${subject}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getSubjectData({
+    subject,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/${subject}/${id}`
+    });
+  }
+  viewLocation({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/location/${id}`
+    });
+  }
+  viewStakeholder({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/stakeholder/${id}`
+    });
+  }
+  updateSubject({
+    subject,
+    id,
+    data
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiPut({
+      url: `/management/subject/${type}/${id}`,
+      data
+    });
+  }
+  deleteSubject({
+    subject,
+    id
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiDelete({
+      url: `/management/subject/${type}/${id}`
+    });
+  }
+  getUserGrowth(activeFilter) {
+    return this.apiGet({
+      url: `/accounts/dashboard/user-growth`,
+      isUserManager: true,
+      params: {
+        activeFilter
+      }
+    });
+  }
+}
+createLazyService(AdminService);
+
 const Styles = styled__default["default"].div`
   width: 100%;
   height: 100vh;
@@ -57517,9 +57718,28 @@ const usePrepareForm$1 = ({
   const [linkingForms, setLinkingForms] = React.useState({});
   const [loading, setLoading] = React.useState(true);
   const [notFound, setNotFound] = React.useState(false);
+  console.log({
+    form,
+    data,
+    groups,
+    linkingForms,
+    loading,
+    notFound
+  });
   const prepareForm = currentView => {
     const dKey = namespaceConfig?.dataKey;
     const nKey = `${APP}-${currentView}`;
+    console.log({
+      dKey,
+      nKey,
+      allData
+    });
+    console.log({
+      condition1: hasKeyInObject(allData, dKey)
+    });
+    console.log({
+      condition2: hasKeyInObject(allData[dKey], nKey)
+    });
     if (hasKeyInObject(allData, dKey) && hasKeyInObject(allData[dKey], nKey)) {
       const {
         form = {},
@@ -57527,7 +57747,9 @@ const usePrepareForm$1 = ({
         config = {},
         linkingForms = {}
       } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
-      if (data.datastakeId === id || id === "user") {
+      console.log("here", dKey, nKey);
+      if (data.datastakeId === id || id === "user" || data.id === id) {
+        console.log("here2", data.datastakeId, id, data.id);
         //   if (viewConfig.linkingSubjects.includes(namespace)) {
         setForm({
           ...form,
@@ -57555,6 +57777,7 @@ const usePrepareForm$1 = ({
         }
       }
     }
+    console.log('data', data);
   };
   const getCertainData = allData?.[namespaceConfig?.dataKey];
   React.useEffect(() => {
@@ -58310,7 +58533,10 @@ const View = ({
     namespaceOverrides: namespaceOverrides
   });
   const groupForm = React.useMemo(() => {
-    const gF = form[group] || {};
+    // If no group is specified, use the first available group
+    const formKeys = Object.keys(form || {});
+    const selectedGroup = group || (formKeys.length > 0 ? formKeys[0] : null);
+    const gF = selectedGroup ? form[selectedGroup] || {} : {};
     if (subsection) {
       const sectionForms = groupSubsections(gF);
       if (sectionForms[subsection]) {
@@ -58408,6 +58634,19 @@ const View = ({
   const actionButtons = React.useMemo(() => {
     return groupForm?.template === "linkingSubjects" ? pageActions.filter(v => v.key !== "edit") : pageActions;
   }, [groupForm, pageActions]);
+  console.log({
+    namespaceConfiguration,
+    namespaceConfig,
+    allData,
+    namespace,
+    id,
+    group,
+    subsection,
+    version,
+    source,
+    isSupported,
+    notFound
+  });
   if (!isSupported || notFound) {
     return /*#__PURE__*/jsxRuntime.jsx(Loading, {});
   }

package/dist/services/index.js

@@ -50,7 +50,7 @@ const assignParamsToUrl = (path, params) => {
  * @returns storage objects
  * @class StorageManager
  */
-class StorageManager$1 {
+class StorageManager {
   /**
    * @description Set or update given value in localStorage
    * @static
@@ -185,11 +185,11 @@ class StorageManager$1 {
 const isProxy = () => {
   const pathname = window.location.pathname;
   if (pathname.includes('/proxy/pme') || pathname.includes('/proxy/cadd')) {
-    return window.opener || !!StorageManager$1.get('proxy_token');
+    return window.opener || !!StorageManager.get('proxy_token');
   }
   return false;
 };
-const getToken = () => isProxy() ? StorageManager$1.get('proxy_token') : StorageManager$1.get('token');
+const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
 
 /**
  * Custom params serializer to maintain JSON format for nested objects
@@ -626,7 +626,7 @@ class ErrorService {
 class BaseService extends BaseHTTPService {
   constructor() {
     const errorHandler = createErrorHandler({
-      getStorageManager: () => StorageManager$1,
+      getStorageManager: () => StorageManager,
       handleError: ({
         status,
         statusText,
@@ -646,7 +646,7 @@ class BaseService extends BaseHTTPService {
       onUnauthorized: () => {
         console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
         console.trace('[BaseService] Unauthorized call stack:');
-        StorageManager$1.clearOne('token');
+        StorageManager.clearOne('token');
         if (typeof window !== 'undefined') {
           window.location.href = '/';
         }
@@ -663,7 +663,7 @@ class BaseService extends BaseHTTPService {
       getHeaders: () => {
         const config = getServicesConfig();
         return {
-          Language: StorageManager$1.get('datastakeLng') || 'en',
+          Language: StorageManager.get('datastakeLng') || 'en',
           'ngrok-skip-browser-warning': true,
           Application: config.application
         };
@@ -697,6 +697,15 @@ class AdminService extends BaseService {
       url: `/accounts/${id}`
     });
   }
+  inviteCompanyAccount({
+    companyId,
+    data
+  }) {
+    return this.apiPost({
+      url: `/accounts/${companyId}/invite`,
+      data
+    });
+  }
   inviteAccount(data) {
     return this.apiPost({
       url: `/accounts/inviteAccount`,
@@ -765,19 +774,113 @@ class AdminService extends BaseService {
     params
   }) {
     return this.apiGet({
-      url: `${subject}`,
+      url: `/management/subjects/${subject}`,
       params
     });
   }
+  mergeLocations({
+    ids,
+    data
+  }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/location/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
+    return this.apiPost({
+      url,
+      data: payload
+    });
+  }
   mergeSubjects({
     subject,
-    ...data
+    ids,
+    data
   }) {
+    const [id1, id2, ...remainingIds] = ids || [];
+    if (!id1 || !id2) {
+      throw new Error('At least two IDs are required for merging');
+    }
+    const url = `/management/merge/${subject}/${id1}/${id2}`;
+    const payload = {
+      ...data
+    };
+    if (remainingIds.length > 0) {
+      payload.additionalIds = remainingIds;
+    }
     return this.apiPost({
-      url: `/merge/${subject}`,
+      url,
+      data: payload
+    });
+  }
+  getSubjectForm({
+    subject,
+    scope = 'global'
+  }) {
+    return this.apiGet({
+      url: `/forms/${subject}`,
+      params: {
+        scope
+      }
+    });
+  }
+  getSubjectData({
+    subject,
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/${subject}/${id}`
+    });
+  }
+  viewLocation({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/location/${id}`
+    });
+  }
+  viewStakeholder({
+    id
+  }) {
+    return this.apiGet({
+      url: `/management/subject/stakeholder/${id}`
+    });
+  }
+  updateSubject({
+    subject,
+    id,
+    data
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiPut({
+      url: `/management/subject/${type}/${id}`,
       data
     });
   }
+  deleteSubject({
+    subject,
+    id
+  }) {
+    const type = subject === 'location' ? 'location' : 'stakeholder';
+    return this.apiDelete({
+      url: `/management/subject/${type}/${id}`
+    });
+  }
+  getUserGrowth(activeFilter) {
+    return this.apiGet({
+      url: `/accounts/dashboard/user-growth`,
+      isUserManager: true,
+      params: {
+        activeFilter
+      }
+    });
+  }
 }
 var AdminService$1 = createLazyService(AdminService);
 

package/dist/utils/index.js

@@ -7554,15 +7554,14 @@ const getDefaultActiveFilters = (params, selectFiltersConfig, defaultPageSize, d
   });
   return o;
 };
-const NEW_PAGINATION_APPS = ["nashiriki"];
 const filterParams = (value, module) => {
   const {
     activeFilters,
     ...rest
   } = value;
   const {
-    page,
-    pageSize,
+    page = 1,
+    pageSize = 20,
     sortDir,
     sortBy,
     search,
@@ -7571,9 +7570,10 @@ const filterParams = (value, module) => {
   } = activeFilters || {};
   const params = {};
   params.pagination = JSON.stringify({
-    [NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-    [NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize
+    page,
+    pageSize
   });
+  params.filters = JSON.stringify(filters);
   if (search && searchParams) {
     params.search = JSON.stringify({
       qs: search,
@@ -7586,16 +7586,6 @@ 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
@@ -7801,6 +7791,13 @@ function getRedirectPath(user, fallback = '', app, isDatastake) {
 
 const en = {
   "All Data": "All Data",
+  "sbg-admin::remove-user-title": "Remove User Title",
+  "sbg-admin::remove-user-body": "Remove User Body",
+  "Administrative-level-1": "Administrative Level 1",
+  "Administrative-level-2": "Administrative Level 2",
+  "merge-output": "Merge Output",
+  "admin::current_subjects": "Current Subjects",
+  "add-account": "Add Account",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",
@@ -9501,7 +9498,7 @@ const fr = {
   Documentation: "Documents",
   "Edit project": "Modifier le projet",
   Name: "Nom",
-  Type: "Tapez",
+  Type: "Type",
   type: "Type",
   Province: "Province",
   Territory: "Territoire",
@@ -11313,7 +11310,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Escribe",
+  "Type": "Tipo",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/package.json

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

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

@@ -10,7 +10,6 @@ const { useToken } = theme;
 export default function useTopContributors({ container, data = [], t }) {
 	const [mainGraph, setMainGraph] = useState(null);
 	const { token } = useToken();
-
 	useEffect(() => {
 		if (container.current) {
 			if (mainGraph) {