datastake-daf 0.6.798 → 0.6.800

package/src/@daf/pages/SelfAssesment/components/ProductionSiteTable/index.jsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import TablePage from '../../../TablePage/index.jsx';
+import { getColumns } from './columns.js';
+
+const ProductionSiteTable = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    loading = false,
+    data = {},
+    isMobile,
+    APP,
+    location,
+    getData = () => {},
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    applications = [],
+    subjectClear = () => {},
+    breadcrumbs = [],
+    extendingFilters = {},
+    createDefaultValues = {},
+}) => {
+    return (
+        <TablePage
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}   
+            location={location}
+            applications={applications}
+            subject="production-sites"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            subjectClear={subjectClear}
+            extendingFilters={extendingFilters}
+            breadcrumbs={breadcrumbs}
+            formConfig={formConfig}
+            defaultValues={createDefaultValues}
+            onDownload={() => console.log("download")}
+        />
+    )
+}
+
+export default ProductionSiteTable

package/src/@daf/pages/View/hooks/usePrepareForm.js

@@ -17,10 +17,16 @@ export const usePrepareForm = ({
       const [linkingForms, setLinkingForms] = useState({});
       const [loading, setLoading] = useState(true);
       const [notFound, setNotFound] = 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 {
@@ -29,8 +35,10 @@ export const usePrepareForm = ({
                   config = {},
                   linkingForms = {},
               } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
+              console.log("here", dKey, nKey)
   
-              if (data.datastakeId === id || id === "user") {
+              if (data.datastakeId === id || id === "user" || data.id === id) {
+                console.log("here2", data.datastakeId, id, data.id)
                 //   if (viewConfig.linkingSubjects.includes(namespace)) {
                       setForm({
                           ...form,
@@ -58,6 +66,8 @@ export const usePrepareForm = ({
                   }
               }
           }
+
+          console.log('data', data)
       };
   
     const getCertainData = allData?.[namespaceConfig?.dataKey];

package/src/@daf/pages/View/index.jsx

@@ -54,7 +54,7 @@ const View = ({
 }) => {
     const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
     const [openRecordsModal, setOpenRecordsModal] = useState(false);
-
+    
     // HANDLES THE URL PARAMS FOR THE VIEW PAGE
     const {
 		namespace, 
@@ -215,6 +215,13 @@ const View = ({
         : pageActions;
     }, [groupForm, pageActions]);
 
+    console.log({namespaceConfiguration, namespaceConfig, allData, namespace, id, group, subsection,
+        version,
+        source,
+        isSupported,
+        notFound
+    })
+
     if(!isSupported || notFound) {
         return <Loading />
     }
@@ -230,7 +237,7 @@ const View = ({
                     extraButtons={extraPageActions}
                     addedHeaderFirst
                     addedHeader={
-                        <div className="flex flex-row gap-4">
+                        namespaceConfig?.isAdmin ? null : <div className="flex flex-row gap-4">
                             <Multiselect
                                 options={[...sourceOptions]}
                                 isAvatarGroup

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

@@ -1,5 +1,6 @@
 import { BaseService } from './BaseService.js';
 import { createLazyService } from './helpers/LazyService.js';
+import { filterCreateData } from "../../helpers/Forms.js";
 
 class AdminService extends BaseService {
     updateCompany(id, data) {
@@ -15,6 +16,14 @@ class AdminService extends BaseService {
         })
     }
 
+
+  inviteCompanyAccount({ companyId, data }) {
+    return this.apiPost({
+      url: `/accounts/${companyId}/invite`,
+      data,
+    })
+  }
+
     inviteAccount(data) {
         return this.apiPost({
           url: `/accounts/inviteAccount`, 
@@ -69,18 +78,114 @@ 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,
+        });
+    }
+
+    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: filterCreateData(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 },
+      });
+    }
+
+    
 }
 
 export default createLazyService(AdminService);

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

@@ -1,5 +1,6 @@
 import { BaseService } from "./BaseService.js";
 import { createLazyService } from "./helpers/LazyService.js";
+import { StorageManager } from '../../helpers/StorageManager.js';
 
 class AuthenticationService extends BaseService {
     register(form) {

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,14 +100,6 @@ 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,5 +1,12 @@
 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",

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

@@ -421,7 +421,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

@@ -234,7 +234,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

@@ -152,6 +152,7 @@ export { default as StakeholderMappings } from "./@daf/core/components/Graphs/St
 //* ------------------------------ Screens ------------------------------
 export { default as BaseScreen } from "./@daf/core/components/Screens/BaseScreen/index.jsx";
 // Admin - Base Components
+export { default as AppInvitation } from "./@daf/core/components/Screens/Admin/AppInvitation/index.jsx";
 export { default as AdminDashboard } from "./@daf/core/components/Screens/Admin/AdminDashboard/index.jsx";
 export { default as UserTable } from "./@daf/core/components/Screens/Admin/AdminTables/UserTable/index.jsx";
 export { default as AccountTable } from "./@daf/core/components/Screens/Admin/AdminTables/AccountTable/index.jsx";