datastake-daf 0.6.794 → 0.6.795

package/src/@daf/pages/TablePage/hook.js

@@ -56,6 +56,7 @@ export const useTablePage = ({
     data,
     applications,
     subjectClear,
+    APP,
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -80,8 +81,9 @@ export const useTablePage = ({
             subject,
             data,
             applications,
+            APP,
         }), 
-        [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications, subject, getColumns]
+        [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications, subject, getColumns, APP]
     );
 
     const selectFiltersConfig = useMemo(() => 

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

@@ -29,6 +29,7 @@ const TablePage = ({
         formValue: {},
         form: {},
     },
+    headerInfo = {},
     defaultValues = {},
     extendingFilters = {},
     getData = () => {},
@@ -71,12 +72,13 @@ const TablePage = ({
         data,
         applications,
         subjectClear,
+        APP,
     });
 
     return (
         <TablePageWithTabs
             t={t}
-            title={t(viewConfig?.title || "")}
+            title={t(headerInfo?.title || viewConfig?.title || "")}
             breadCrumbs={breadcrumbs}
             location={location}
             loading={loading}
@@ -95,7 +97,7 @@ const TablePage = ({
             view={subject}
             getActiveTab={handleActiveTabChange}
             onDownload={onDownload && typeof onDownload === 'function' ? onDownload : undefined}
-            drawerTitle={t(viewConfig?.createTitle || "")}
+            drawerTitle={t(headerInfo?.createTitle || viewConfig?.createTitle || "")}
         >
             {({onDrawerClose}) => (
                 <Create 
@@ -126,10 +128,10 @@ const TablePage = ({
                     formData={formConfig.formData}
                     formValue={formConfig.formValue}
                     form={formConfig.form}
-                    namespace={formInfo.namespace}
-                    view={formInfo.view}
-                    scope={formInfo.scope}
-                    formType={formInfo.formType}
+                    namespace={formConfig?.namespace || formInfo?.namespace}
+                    view={formConfig?.view || formInfo.view}
+                    scope={formConfig?.scope || formInfo.scope}
+                    formType={formConfig?.formType || formInfo.formType}
                     defaultData={defaultValues}
                 />
             )}

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

@@ -49,6 +49,7 @@ const View = ({
     addData,
     options,
     getSubjectsDetails,
+    namespaceOverrides,
     // ADD CALLBACK TO GET THE CURRENT NAMESPACE CONFIG
 }) => {
     const getNamespaceConfig = (namespace) => namespaceConfiguration?.[namespace] || {};
@@ -110,6 +111,7 @@ const View = ({
         namespaceConfig: namespaceConfiguration,
         APP,
         viewConfig,
+        namespaceOverrides: namespaceOverrides,
 	});
 
     const groupForm = useMemo(() => {
@@ -167,7 +169,7 @@ const View = ({
 				module: APP,
 				view: namespaceConfig?.view,
 				...(namespaceConfig?.scope && { scope: namespaceConfig.scope }),
-				datastakeId: id,
+				datastakeId: id ? id : 'user',
 				version,
 				source,
 			})
@@ -220,7 +222,7 @@ const View = ({
         <>
             <div className={"daf-view-form"}>
                 <Header
-                    title={data?.name || ""}
+                    title={(namespace === 'kyc' ? "KYC" : data?.name) || ""}
                     breadcrumbs={breadcrumbs}
                     goBackTo={goBack}
                     actionButtons={actionButtons}

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

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

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

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

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

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

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

@@ -1,11 +1,5 @@
 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",
+  "All Data": "All Data",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",

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

@@ -1,4 +1,5 @@
 const fr = {
+	"All Data": "Toutes les données",
 	"Site": "Site",
 	"Production Sites": "Sites de production",
 	"Type of account": "Type de compte",
@@ -420,7 +421,7 @@ const fr = {
 	Documentation: "Documents",
 	"Edit project": "Modifier le projet",
 	Name: "Nom",
-	Type: "Type",
+	Type: "Tapez",
 	type: "Type",
 	Province: "Province",
 	Territory: "Territoire",

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

@@ -1,4 +1,5 @@
 const sp = {
+  "All Data": "Todos los datos",
   "Site": "Sitio",
   "Production Sites": "Centros de producción",
   "Type of account": "Tipo de cuenta",
@@ -233,7 +234,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Tipo",
+  "Type": "Escribe",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/src/pages.js

@@ -2,17 +2,8 @@
 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';
-export { default as EventsTable } from './@daf/pages/Events/index.jsx';
-export { default as DocumentsTable } from './@daf/pages/Documents/index.jsx';
-export { default as WorkersTable } from './@daf/pages/Stakeholders/Workers/index.jsx';
-export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index.jsx';
 
-export { default as IncidentsTable } from './@daf/pages/Events/Incidents/index.jsx';
-export { default as ProductionSitesTable } from './@daf/pages/Locations/MineSite/index.jsx';
-export { default as UsersTable } from './@daf/core/components/Screens/Users/index.jsx';
+// Tables
 export { default as PartnersTable } from './@daf/pages/Partners/index.jsx';
 export { default as TablePage } from './@daf/pages/TablePage/index.jsx';
 

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/columns.js

@@ -1,79 +0,0 @@
-import { findOptions } from "../../../../../../../helpers/StringHelper.js";
-import { Tooltip } from "antd";
-import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
-
-export const getColumns = ({ t, selectOptions, module, entity }) => {
-	return [
-		{
-			title: t("admin::organisation_id"),
-			dataIndex: "datastakeId",
-			key: "datastakeId",
-			show: true,
-			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Name"),
-			dataIndex: "name",
-			key: "name",
-			show: true,
-			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Category"),
-			dataIndex: "category",
-			key: "category",
-			show: true,
-			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.category);
-				return <Tooltip title={label}>{label}</Tooltip>;
-			},
-		},
-		{
-			title: t("Country"),
-			dataIndex: "country",
-			key: "country",
-			show: true,
-			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.country);
-				return <Tooltip title={label}>{label}</Tooltip>;
-			},
-		},
-		{
-			title: t("Province"),
-			dataIndex: "administrativeLevel1",
-			key: "administrativeLevel1",
-			ellipsis: true,
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				let label;
-				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
-				}
-
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
-		},
-		{
-			title: t("Territory"),
-			dataIndex: "administrativeLevel2",
-			key: "administrativeLevel2",
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				let label;
-				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
-				}
-
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
-		},
-	].filter((c) => c?.show);
-};

package/src/@daf/core/components/Screens/Admin/AdminScreens/SubjectsView.jsx

@@ -1,272 +0,0 @@
-import React, { useState, useEffect, useCallback, useMemo } from "react";
-import Header from "../../../Header/index.jsx";
-import Loading from "../../../Loading/index.jsx";
-import SideBarMenu from "../AdminViews/components/SidebarMenu/index.jsx";
-import ViewLocation from "../AdminViews/ViewLocation/index.jsx";
-import ViewStakeholder from "../AdminViews/ViewStakeholder/index.jsx";
-import EditLocation from "../AdminViews/EditLocation/index.jsx";
-import EditStakeholder from "../AdminViews/EditStakeholder/index.jsx";
-import { config as locationConfig } from "../AdminViews/ViewLocation/config.js";
-import { config as stakeholderConfig } from "../AdminViews/ViewStakeholder/config.js";
-import NotFound from "../../NotFound/index.jsx";
-import { Form, message } from "antd";
-import { NOTIFICATION_MODE, useForms, FormsProvider } from "../../../../context/Forms/index.js";
-
-function withFormsProvider(Component) {
-	return function WrappedWithFormsProvider(props) {
-		return (
-			<FormsProvider>
-				<Component {...props} />
-			</FormsProvider>
-		);
-	};
-}
-
-/**
- * Admin Subjects View Screen
- * This component handles viewing and editing individual subjects (locations or stakeholders)
- * 
- * @param {Object} config - Application configuration
- * @param {string} config.subject - Subject type: "location" or "stakeholder"
- * @param {string} config.id - Subject ID from route params
- * @param {string} config.mode - Mode: "view" or "edit"
- * @param {string} config.module - Module identifier
- * @param {Function} config.goTo - Navigation function
- * @param {Function} config.t - Translation function
- * @param {Object} config.location - Router location object
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Function} config.renderBreadCrumbs - Function to render breadcrumbs
- * @param {Object} config.options - Options object with countries, categories, etc.
- * @param {Function} config.AdminService - Admin service for API calls
- * @param {Function} config.handleError - Error handling function
- */
-function AdminSubjectsViewScreen({ config }) {
-	const {
-		subject,
-		id,
-		mode = "view",
-		module,
-		goTo,
-		t,
-		location,
-		getRedirectLink,
-		renderBreadCrumbs,
-		options,
-		AdminService,
-		handleError,
-		userRoles = [],
-		accountStatuses = [],
-	} = config;
-
-	const [loading, setLoading] = useState(false);
-	const [data, setData] = useState({});
-	const [editData, setEditData] = useState({});
-	const [isChanged, setIsChanged] = useState(false);
-	const [selectedGroup, setSelectedGroup] = useState("");
-	const [MainForm] = Form.useForm();
-	const { setNotificationMode, changeNotificationState } = useForms();
-
-	const configs = useMemo(() => {
-		return subject === "location" ? locationConfig : stakeholderConfig;
-	}, [subject]);
-
-	const conf = useMemo(() => {
-		if (!Array.isArray(configs) || configs.length === 0) {
-			console.warn("configs is not a valid array:", configs);
-			return null;
-		}
-
-		if (!selectedGroup) {
-			setSelectedGroup(configs[0].key);
-			return configs[0];
-		}
-		
-		const foundConfig = configs.find((c) => c.key === selectedGroup);
-		return foundConfig || configs[0];
-	}, [selectedGroup, configs]);
-
-	useEffect(() => {
-		MainForm.setFieldsValue(data);
-		setEditData(data);
-	}, [data, MainForm]);
-
-	const goToView = useCallback(() => {
-		changeNotificationState({
-			onYes: () => {
-				setEditData(data);
-				setIsChanged(false);
-				goTo(`/app/management/subject/${subject}/${id}`);
-			},
-		});
-	}, [goTo, changeNotificationState, data, subject, id]);
-
-	const fetchData = useCallback(async () => {
-		try {
-			setLoading(true);
-			
-			let response;
-			if (subject === "location") {
-				response = await AdminService.viewLocation({ id });
-			} else if (subject === "stakeholder") {
-				response = await AdminService.viewStakeholder({ id });
-			}
-			
-			if (response?.data) {
-				console.log('📦 Backend response data:', {
-					id: response.data.id,
-					datastakeId: response.data.datastakeId,
-					name: response.data.name,
-					fullData: response.data
-				});
-				setData(response.data);
-			}
-			
-			setLoading(false);
-		} catch (err) {
-			if (handleError) {
-				handleError(err);
-			}
-			setLoading(false);
-		}
-	}, [id, subject, AdminService, handleError]);
-
-	useEffect(() => {
-		fetchData();
-	}, [fetchData]);
-
-	const breadCrumbs = useMemo(() => {
-		if (renderBreadCrumbs) {
-			return renderBreadCrumbs({
-				view: subject === "location" ? "location" : "stakeholder",
-				t,
-				goTo,
-				id,
-				isView: mode === "view",
-				isEdit: mode === "edit",
-			});
-		}
-		return [];
-	}, [renderBreadCrumbs, subject, t, goTo, id, mode]);
-
-	const formOptions = useMemo(() => {
-		return {
-			countries: options?.countries || [],
-			category: options?.category || [],
-		};
-	}, [options]);
-
-	const actionButtons = useMemo(() => {
-		if (mode === "view") {
-			return [
-				{
-					type: "primary",
-					tooltip: t("Edit"),
-					icon: "Edit",
-					onClick: () => goTo(`/app/management/subject/${subject}/edit/${id}`),
-				},
-			];
-		}
-
-		return [
-			{
-				type: "primary",
-				tooltip: t("Save"),
-				icon: "Save",
-				disabled: !isChanged,
-				onClick: () => {
-					MainForm.validateFields()
-						.then(async (formData) => {
-							setLoading(true);
-
-							try {
-								const allowedKeys = conf?.items?.map(item => item.key) || [];
-								const filteredData = {};
-								allowedKeys.forEach(key => {
-									if (formData[key] !== undefined) {
-										filteredData[key] = formData[key];
-									}
-								});
-
-								const internalId = data.id;
-								if (!internalId) {
-									throw new Error('Internal ID not found');
-								}
-
-								await AdminService.updateSubject({ 
-									subject, 
-									id: internalId, 
-									data: filteredData 
-								});
-								await fetchData();
-								message.success(t("Information saved successfully"));
-								setNotificationMode(NOTIFICATION_MODE.EMPTY);
-								setIsChanged(false);
-								goTo(`/app/management/subject/${subject}/${id}`);
-							} catch (err) {
-								handleError(err);
-							}
-
-							setLoading(false);
-						})
-						.catch(() => {});
-				},
-			},
-			{
-				tooltip: t("Cancel"),
-				icon: "Close",
-				onClick: goToView,
-			},
-		];
-	}, [t, mode, MainForm, goToView, isChanged, editData, fetchData, subject, id, goTo, handleError, AdminService, setNotificationMode]);
-
-	const ViewComponent = subject === "location" ? ViewLocation : ViewStakeholder;
-	const EditComponent = subject === "location" ? EditLocation : EditStakeholder;
-
-	return (
-		<div className={mode === "view" ? "daf-view-form" : "daf-edit-form"}>
-			{loading && <Loading background="white" />}
-			<Header 
-				title={data.name || t("Loading...")} 
-				breadcrumbs={breadCrumbs}
-				actionButtons={actionButtons}
-			/>
-			<div className="view-content">
-				<SideBarMenu
-					selectedGroup={selectedGroup}
-					onChange={(v) => setSelectedGroup(v)}
-					t={t}
-					config={configs}
-				/>
-				{mode === "edit" ? (
-					<EditComponent
-						t={t}
-						conf={conf}
-						data={editData}
-						formOptions={formOptions}
-						MainForm={MainForm}
-						setData={setEditData}
-						isChanged={isChanged}
-						setIsChanged={setIsChanged}
-						goToView={goToView}
-					/>
-				) : (
-					<ViewComponent
-						userRoles={userRoles}
-						formOptions={formOptions}
-						conf={conf}
-						data={data}
-						t={t}
-						goTo={goTo}
-						location={location}
-						getRedirectLink={getRedirectLink}
-						accountStatuses={accountStatuses}
-						module={module}
-					/>
-				)}
-			</div>
-		</div>
-	);
-}
-
-export default withFormsProvider(AdminSubjectsViewScreen);
-