datastake-daf 0.6.797 → 0.6.799

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

@@ -7,15 +7,19 @@ export const useViewUrlParams = ({
     search,
     searchParams,
     setSearchParams,
+    getRedirectLink,
 }) => {
     const [namespace, setNamespace] = useState(params?.namespace);
     const [id, setId] = useState(params?.id);
     const [group, setGroup] = useState(params?.group);
     const [subsection, setSubSection] = useState(params?.subsection);
+    const [formId, setFormId] = useState(params?.formid);
+    const [subgroup, setSubGroup] = useState(params?.subgroup);
     const sourceUrl = searchParams.get("source");
     const versionUrl = searchParams.get("version");
     const [source, setSource] = useState(sourceUrl || null);
     const [version, setVersion] = useState(versionUrl || null);
+    const [changedPath, setChangedPath] = useState([]);
 
     useEffect(() => {
         if ((id && params.id !== id) || (namespace && namespace !== params.namespace)) {
@@ -29,6 +33,8 @@ export const useViewUrlParams = ({
         }
         setNamespace(params.namespace);
         setId(params.id);
+        setSubGroup(params.subgroup);
+        setFormId(params.formid);
     }, [params]);
 
     useEffect(() => {
@@ -64,7 +70,18 @@ export const useViewUrlParams = ({
           push(`${previous}/edit/${extra}`);
         }
       }, [pathname, search, push]);
-    
+
+      const getViewLink = useCallback(() => {
+        switch (namespace) {
+          default:
+        }
+        return getRedirectLink(
+          `/app/view/${namespace}/${id}/${group}${subsection ? `/${subsection}` : ""}${
+            subgroup ? `/${subgroup}` : ""
+          }${search ? `/${search}` : ""}`,
+        );
+      }, [namespace, id, group, subsection, subgroup, search, getRedirectLink, pathname, search]);
+
       const match = useMemo(
         () => ({
           params,
@@ -89,5 +106,10 @@ export const useViewUrlParams = ({
         getEditLink,
         match,
         search,
+        formId,
+        subgroup,
+        getViewLink,
+        changedPath,
+        setChangedPath,
       };
 }

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, 
@@ -77,6 +77,7 @@ const View = ({
         search,
         searchParams,
         setSearchParams,
+        getRedirectLink,
     });
 
     const namespaceConfig = useMemo(() => getNamespaceConfig(namespace), [namespace]);
@@ -115,7 +116,11 @@ const View = ({
 	});
 
     const groupForm = 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]) {
@@ -214,6 +219,13 @@ const View = ({
         : pageActions;
     }, [groupForm, pageActions]);
 
+    console.log({namespaceConfiguration, namespaceConfig, allData, namespace, id, group, subsection,
+        version,
+        source,
+        isSupported,
+        notFound
+    })
+
     if(!isSupported || notFound) {
         return <Loading />
     }

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

@@ -15,6 +15,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 +77,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,
+      });
+    }
+
+    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/arrays.js

@@ -0,0 +1 @@
+export const isArrayOfObjects = (arr) => Array.isArray(arr) && arr.map((i) => typeof i === "object").every((i) => i);

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/helpers/Forms.js

@@ -829,3 +829,63 @@ export const getValueOnSelectFromDefaultKeys = (val, options, uniqueDefaultKeys)
 	}
 	return null;
 }
+
+// REQUIRED FOR EDIT FORM SUBMIT(SAVE)
+export const extractFiles = (fileList = []) => {
+	const processedFiles = fileList
+		.map(file => file.response || file)
+		.filter(file => file?.status === "done");
+	
+	// Remove duplicates
+	return Array.isArray(processedFiles) 
+		? [...new Set(processedFiles)]
+		: processedFiles;
+};
+
+export const hasFileList = (value) => {
+	return value && 
+		typeof value === "object" && 
+		value !== null && 
+		"fileList" in value;
+};
+
+export const hasContent = (obj) => {
+	if (typeof obj !== "object" || obj === null) return true;
+	return Object.keys(obj).some(key => propHasValue(obj[key]));
+};
+
+export const transformPayload = (payload) => {
+	if (!payload || typeof payload !== "object") return payload;
+	
+	const transformed = { ...payload };
+	
+	Object.keys(transformed).forEach(key => {
+		const value = transformed[key];
+		
+		// Skip null or non-object values
+		if (!value || typeof value !== "object" || !propHasValue(value)) return;
+		
+		// Handle arrays - filter out empty objects
+		if (Array.isArray(value)) {
+			transformed[key] = value.filter(hasContent);
+			return;
+		}
+		
+		// Handle objects with fileLists
+		if (hasFileList(value)) {
+			transformed[key] = extractFiles(value.fileList);
+			return;
+		}
+		
+		// Handle nested objects that might have fileLists
+		Object.keys(value).forEach(nestedKey => {
+			const nestedValue = value[nestedKey];
+			
+			if (hasFileList(nestedValue)) {
+				transformed[key][nestedKey] = extractFiles(nestedValue.fileList);
+			}
+		});
+	});
+	
+	return transformed;
+};

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";

package/src/pages.js

@@ -16,4 +16,7 @@ export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx'
 export { default as MonitoringActivitySummary } from './@daf/pages/Summary/Activities/Monitoring/index.jsx';
 
 // View
-export { default as View } from './@daf/pages/View/index.jsx';
+export { default as View } from './@daf/pages/View/index.jsx';
+
+// Edit
+export { default as Edit } from './@daf/pages/Edit/index.jsx';

package/src/utils.js

@@ -12,7 +12,7 @@ export { propHasValue } from './helpers/deepFind'
 export { isEmptyOrSpaces, capitalizeAll, capitalize, camelCaseToTitle, snakeCaseToTitleCase, titleToCamelCase, findOptions, getOptionAsObject, nowToIso, renderTemplateString, renderTemplateStringInObject, truncateString, splitStringInMultipleLines, safeJsonParse, cleanJSON, formatToKebabCase } from './helpers/StringHelper.js'
 export { getNkey, groupSubsections, getImageUploadViewValue } from './@daf/core/components/ViewForm/helper'
 export { renderRows } from './@daf/core/components/Table/helper'
-export { filterOptions, filterString, hasNotChanged, filterSelectOptions, mapSubGroupsInSubmit, mapSubGroupsInGet, filterCreateData, changeInputMeta, renderDateFormatted, sortForm } from './helpers/Forms'
+export { filterOptions, filterString, hasNotChanged, filterSelectOptions, mapSubGroupsInSubmit, mapSubGroupsInGet, filterCreateData, changeInputMeta, renderDateFormatted, sortForm, extractFiles, hasFileList, hasContent, transformPayload } from './helpers/Forms'
 export { mapFormGroup, showHideInput, editErrorHandler } from './@daf/core/components/EditForm/helper'
 
 export { defaultFilterKeys, getDefaultActiveFilters, filterParams } from './@daf/utils/filters';
@@ -62,4 +62,6 @@ export {
 
 export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from './helpers/breadCrumbs.js'
 
-export { copyToClipboard } from './helpers/copyToClipboard.js'
+export { copyToClipboard } from './helpers/copyToClipboard.js'
+
+export { isArrayOfObjects } from './@daf/utils/arrays.js'

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: