datastake-daf 0.6.794 → 0.6.796

package/src/@daf/pages/Summary/Activities/Monitoring/helper.js

@@ -17,7 +17,13 @@ export const getActivityImages = (activityData) => {
         { data: activityData?.groupPhotos, label: 'Group Photo' },
         { data: activityData?.photosStartActivity, label: 'Start of Activity' },
         { data: activityData?.photosDuringActivity, label: 'During Activity' },
-        { data: activityData?.photosEndActivity, label: 'End of Activity' }
+        { data: activityData?.photosEndActivity, label: 'End of Activity' },
+        { data: activityData?.plotPhotosMonitoring, label: 'Plot Photos Monitoring' },
+        { data: activityData?.faunaFloraPictures, label: 'Fauna and Flora Photos' },
+        { data: activityData?.pestPlantPhotos, label: 'Pest Plant Photos' },
+        { data: activityData?.soilPhotos, label: 'Soil Photos' },
+        { data: activityData?.otherPictures, label: 'Other Pictures' },
+        { data: activityData?.damagedPlantPhotos, label: 'Damaged Plant Photos' }
     ];
 
     return photoArrays

package/src/@daf/pages/Summary/Activities/Monitoring/index.jsx

@@ -4,11 +4,13 @@ import { getKeyIndicatorsRowConfig, getSiteConditionsConfig } from './config';
 import { getActivityIndicatorsConfig } from './helper';
 import ActivityLocation from './components/ActivityLocation/index.jsx';
 import ActivityImagery from './components/ActivityImagery/index.jsx';
+import EnvironmentalMetrics from './components/EnvironmentalMetrics/index.jsx';
 import WorkersDistribution from './components/WorkersDistribution/index.jsx';
 import MangroveGrowthAndSurvival from './components/MangroveGrowthAndSurvival/index.jsx';
+import BiodiversityAndHabitat from './components/BiodiversityAndHabitat/index.jsx';
 
 
-const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
+const MonitoringActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { }, options }) => {
     const keyIndicatorsConfig = useMemo(() => getKeyIndicatorsRowConfig({ t, data: activityData }), [t, activityData]);
 
     // Activity Indicators Config - mapped from activityData
@@ -18,13 +20,11 @@ const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, do
     );
 
     // Site Conditions Config
-    const siteConditionsConfig = useMemo(() => 
+    const siteConditionsConfig = useMemo(() =>
         getSiteConditionsConfig({ t, data: activityData }),
         [t, activityData]
     );
 
-
-    console.log({activityData});
     return (
         <DashboardLayout
             header={
@@ -53,12 +53,35 @@ const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, do
                 widgetClassName="h-w-btn-header"
             />
 
-            <MangroveGrowthAndSurvival 
-                activityData={activityData} 
-                loading={loading} 
-                t={t} 
+            <MangroveGrowthAndSurvival
+                options={options}
+                activityData={activityData}
+                loading={loading}
+                t={t}
+            />
+
+            <BiodiversityAndHabitat
+                faunaPresent={activityData?.faunaPresent}
+                invasiveSpecies={activityData?.invasiveSpecies}
+                hasInvasiveSpecies={activityData?.hasInvasiveSpecies}
+                loading={loading}
+                t={t}
             />
 
+            <section style={{ display: 'flex', gap: '24px',  }}>
+                <EnvironmentalMetrics
+                    options={options}
+                    activityData={activityData}
+                    loading={loading}
+                    t={t}
+                />
+                <ActivityImagery
+                    activityData={activityData}
+                    loading={loading}
+                    t={t}
+                />
+            </section>
+
         </DashboardLayout>
     )
 }

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/helper.js

@@ -90,7 +90,7 @@ export const mapItem = (data, options, goTo, getRedirectLink, operatorData = {},
                 );
             }
             return goTo(
-                getRedirectLink(`/app/${APP === 'nashiriki' ? 'summary/operators' : 'operator-summary'}/${data.datastakeId}`),
+                getRedirectLink(`/app/operator-summary/${data.datastakeId}`),
             );
         },
     }

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

@@ -58,7 +58,9 @@ import {
     getFiltersConfig as getFiltersConfigProductionSites, 
     getFilterOptions as getFilterOptionsProductionSites,
     formConfig as formConfigProductionSites,
-    viewConfig as viewConfigProductionSites
+    viewConfig as viewConfigProductionSites,
+    sclFormConfig as sclFormConfigProductionSites,
+    sclViewConfig as sclViewConfigProductionSites
 } from '../Locations/MineSite/config.js';
 import { getColumns as getColumnsProductionSites } from "../Locations/MineSite/columns.js";
   
@@ -106,6 +108,13 @@ export const FILTER_REGISTRY = {
       formConfig: formConfigActivities,
       viewConfig: viewConfigActivities,
       columns: getColumnsActivities,
+    },    
+    'corrective-actions': {
+      config: getFiltersConfigActivities,
+      options: getFilterOptionsActivities,
+      formConfig: formConfigActivities,
+      viewConfig: viewConfigActivities,
+      columns: getColumnsActivities,
     },
     incidents: {
       config: getFiltersConfigIncidents,
@@ -127,6 +136,13 @@ export const FILTER_REGISTRY = {
       formConfig: formConfigProductionSites,
       viewConfig: viewConfigProductionSites,
       columns: getColumnsProductionSites,
+    },    
+    scl: {
+      config: getFiltersConfigProductionSites,
+      options: getFilterOptionsProductionSites,
+      formConfig: sclFormConfigProductionSites,
+      viewConfig: sclViewConfigProductionSites,
+      columns: getColumnsProductionSites,
     },
     documents: {
       config: getFilterConfigDocuments,

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/Vegetation.js

@@ -0,0 +1,15 @@
+const VEGETATION_KEYS = {
+	HEALTHY: "healthy",
+	WHITE_SPOTS: "white",
+	BLACK_SPOTS: "black",
+	REDDISH_SPOTS: "reddish",
+	YELLOWING: "yellowing",
+	MOSAIC: "mosaic",
+	DRY_OR_DEAD: "dryOrDead",
+	NO_LEAVES: "noLeaves",
+	SPIDER_WEBS: "spiderWebs",
+	DAMAGE_FROM_INSECTS: "damageFromInsects",
+};
+
+export { VEGETATION_KEYS };
+

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/index.js

@@ -78,6 +78,7 @@ export { default as WidgetCard } from "./@daf/core/components/Dashboard/Widget/W
 export { default as CarouselWidget } from "./@daf/core/components/Dashboard/Widget/CarouselWidget/index.jsx";
 export { default as ImageCarousel } from "./@daf/core/components/Dashboard/Widget/ImageCarousel/index.jsx";
 export { default as StatCard } from "./@daf/core/components/Dashboard/Widget/StatCard/index.js";
+export { default as VegetationHealth } from "./@daf/core/components/Dashboard/Widget/VegetationWidget/index.jsx";
 // export { default as WidgetCatalogue } from "./@daf/core/components/Dashboard/Widget/WidgetCatalogue/index.jsx";
 
 // Forms

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);
-};