datastake-daf 0.6.793 → 0.6.795

package/src/@daf/pages/Stakeholders/Workers/config.js

@@ -1,3 +1,5 @@
+import { getStatusOptions } from '../../../utils/filters';
+
 export const getFiltersConfig = ({t}) => {
     return {
 		country: {
@@ -81,15 +83,15 @@ export const getFiltersConfig = ({t}) => {
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
 		},
-		positionInTheMineralSupplyChain: {
-		  type: 'select',
-		  label: 'Position',
-		  placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
-		  style: { flex: 1 },
-		  labelStyle: { flex: 1 },
-		  getLabel: (option) => option.label,
-		  getValue: (option) => option.value,
-		},
+		// positionInTheMineralSupplyChain: {
+		//   type: 'select',
+		//   label: 'Position',
+		//   placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		//   style: { flex: 1 },
+		//   labelStyle: { flex: 1 },
+		//   getLabel: (option) => option.label,
+		//   getValue: (option) => option.value,
+		// },
 		status: {
 		  type: "select",
 		  label: "Status",
@@ -104,37 +106,29 @@ export const getFiltersConfig = ({t}) => {
 
 export const getFilterOptions = (options, t) => {
 	const {
-		statusOptions = [],
-		categoryOptions = [],
-		countries = [],
-		subCategory = [],
-		activityAtSiteOptions = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
+		activityAtSiteOptions,
 		stakeholderCategoryOptions,
 		stakeholderSubCategoriesOptions,
 		administrativeLevel1,
 		administrativeLevel2,
 		positionInMineralSupplyChainOptions,
 		subCategoriesOptions,
+		activityAtSite,
 	  } = options || {};
 
 	const _default  = {
-		status: [
-			{
-				value: "submitted",
-				label: t("Submitted"),
-			},
-			{
-				value: "private",
-				label: t("Private"),
-			},
-		],
-		category: stakeholderCategoryOptions || categoryOptions,
-		country: countries,
-		subCategory: subCategoriesOptions,
-		activity: activityAtSiteOptions,
+		status: getStatusOptions(t) || [],
+		// category: stakeholderCategoryOptions || categoryOptions || [],
+		country: countries || [],
+		// subCategory: subCategoriesOptions || [],
+		activity: activityAtSiteOptions || activityAtSite || [],
 		administrativeLevel1,
 		administrativeLevel2,
-		positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,
+		// positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,
 	}
 
 	return _default;

package/src/@daf/pages/Stakeholders/config.js

@@ -21,10 +21,10 @@ export const getFiltersConfig = ({t}) => {
 }
 
 export const getFilterOptions = (options, t) => {
-	const { countries = [], category = [], categoriesOptions = [] } = options || {};
+	const { countries, category, categoriesOptions } = options || {};
 	return {
-		country: countries,
-		category: categoriesOptions || category,
+		country: countries || [],
+		category: categoriesOptions || category || [],
 	}
 }
 

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/utils/filters.js

@@ -100,3 +100,16 @@ export const filterParams = (value, module) => {
 
 	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,4 +1,5 @@
 const en = {
+  "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",

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

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