datastake-daf 0.6.792 → 0.6.794

package/src/@daf/services/AdminService.js

@@ -69,18 +69,90 @@ class AdminService extends BaseService {
     }
 
     getSubjects({ subject, params }) {
-        return this.apiGet({
-          url: `${subject}`,
+      return this.apiGet({
+          url: `/management/subjects/${subject}`,
           params,
-        })
+      });
     }
 
-    mergeSubjects({ subject, ...data }) {
+    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: `/merge/${subject}`,
-          data,
-        })
+            url,
+            data: payload,
+        });
     }
+
+    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,
+      });
+    }
+
+    getUserGrowth(activeFilter) {
+      return this.apiGet({
+        url: `/accounts/dashboard/user-growth`,
+        isUserManager: true,
+        params: { activeFilter },
+      });
+    }
+
+    
 }
 
 export default createLazyService(AdminService);

package/src/@daf/services/DashboardService.js

@@ -26,4 +26,5 @@ class DashboardService extends BaseService {
     }
 }
 
-export default createLazyService(DashboardService);
+export default createLazyService(DashboardService);
+

package/src/@daf/utils/filters.js

@@ -63,19 +63,29 @@ export const getDefaultActiveFilters = (
 };
 
 const NEW_PAGINATION_APPS = ["nashiriki"];
+
 export const filterParams = (value, module) => {
 	const { activeFilters, ...rest } = value;
 
-	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
-		activeFilters || {};
+	const {
+		page = 1,
+		pageSize = 20,
+		sortDir,
+		sortBy,
+		search,
+		searchParams,
+		...filters
+	} = 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,
@@ -90,13 +100,5 @@ export const filterParams = (value, module) => {
 		});
 	}
 
-	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 };
 };

package/src/constants/locales/en/translation.js

@@ -1,4 +1,11 @@
 const en = {
+  "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",

package/src/constants/locales/fr/translation.js

@@ -420,7 +420,7 @@ const fr = {
 	Documentation: "Documents",
 	"Edit project": "Modifier le projet",
 	Name: "Nom",
-	Type: "Tapez",
+	Type: "Type",
 	type: "Type",
 	Province: "Province",
 	Territory: "Territoire",

package/src/constants/locales/sp/translation.js

@@ -233,7 +233,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Escribe",
+  "Type": "Tipo",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/src/index.js

@@ -97,6 +97,7 @@ export { default as ProgressBar } from "./@daf/core/components/ProgressBar/index
 export { default as MultiBarProgress } from "./@daf/core/components/ProgressBar/MultiBarProgress/index.jsx";
 export { default as MultiColorProgressBar } from "./@daf/core/components/ProgressBar/MultiColorProgressBar/index.jsx";
 export { default as ProgressBarSideIcon } from "./@daf/core/components/ProgressBar/components/SideIcon/index.jsx";
+export { default as ProgressBarWithIcon } from "./@daf/core/components/ProgressBar/ProgressBarWithIcon/index.jsx";
 export { default as ProgressTabs } from "./@daf/core/components/ProgressTabs/index.jsx";
 
 // Data Store

package/src/pages.js

@@ -1,6 +1,7 @@
 // Dashboards
 export { default as SupplyChainDashboard } from './@daf/pages/Dashboards/SupplyChain/index.jsx';
 export { default as UserDashboard } from './@daf/pages/Dashboards/UserDashboard/index.jsx';
+export { default as SelfAssesment } from './@daf/pages/Dashboards/SelfAssesment/index.jsx';
 export { default as OperatorsTable } from './@daf/pages/Stakeholders/Operators/index.jsx';
 export { default as LocationsTable } from './@daf/pages/Locations/index.jsx';
 export { default as StakeholdersTable } from './@daf/pages/Stakeholders/index.jsx';

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: