datastake-daf 0.6.794 → 0.6.795

package/src/@daf/pages/Dashboards/SelfAssesment/components/ProductionSites/columns.js

@@ -60,7 +60,8 @@ export const getColumns = ({
             return <div className="daf-default-cell" />
           }
 
-          const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+          // const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+          const region = Object.values(all?.linking?.SCL || {}).find(obj => obj?.level === 'level_1')?.name
 
           return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
         },
@@ -75,7 +76,7 @@ export const getColumns = ({
             return <div className="daf-default-cell" />
           }
 
-          const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+          const district = Object.values(all?.linking?.SCL || {}).find(obj => obj?.level === 'level_2')?.name
 
           return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },

package/src/@daf/pages/Dashboards/SelfAssesment/components/ProductionSites/index.jsx

@@ -11,12 +11,20 @@ function ProductionSites({
     user = {},
     goTo = () => {},
     getRedirectLink = () => {},
+    data = [],
+    loading = false,
 }) {
-    const data = [];
+
+    const productionSites = useMemo(() => {
+        if(Array.isArray(data?.productionSites)) {
+            return data?.productionSites;
+        }
+        return data?.data?.productionSites || [];
+    }, [data?.productionSites, data?.data?.productionSites]);
 
     const Wrapper = useMemo(() => {
-        return data.length > 5 ? ComponentWithFocus : "div";
-    }, [data.length]);
+        return productionSites?.length > 5 ? ComponentWithFocus : "div";
+    }, [productionSites]);
 
     const columns = useMemo(() => {
         return getColumns({ t, options, user, goTo, getRedirectLink });
@@ -26,6 +34,7 @@ function ProductionSites({
         <Widget
             title={t("Production Sites")}
             className="with-border-header no-px-body"
+            loading={loading}
         >
             <Wrapper>
 				<Style>
@@ -38,7 +47,7 @@ function ProductionSites({
 					>
 						<StickyTable
 							columns={columns}
-							dataSource={data}
+							dataSource={productionSites || []}
 							hideOnLoading={false}
 							doEmptyRows={true}
 						/>

package/src/@daf/pages/Dashboards/SelfAssesment/index.jsx

@@ -13,27 +13,29 @@ function SelfAssesment({
     getRedirectLink = () => {},
     theme = {},
     options = {},
+    data,
+    loading
 }) {
-  return (
-    <DashboardLayout
-        header={
-            <Header
-                title={t("Self Assesment")}
-                breadcrumbs={breadcrumbs}
-            />
-        }
-    >
-        <section>
-            <OrganisationInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} theme={theme} />
-        </section>
-        <section>
-            <ProductionSites t={t} options={options} user={user} goTo={goTo} getRedirectLink={getRedirectLink} />
-        </section>
-        <section>
-            <AssociatedInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} />
-        </section>
-    </DashboardLayout>
-  )
+    return (
+        <DashboardLayout
+            header={
+                <Header
+                    title={t("Self Assessment")}
+                    breadcrumbs={breadcrumbs}
+                />
+            }
+        >
+            <section>
+                <OrganisationInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} theme={theme} data={data} loading={loading}/>
+            </section>
+            <section>
+                <ProductionSites t={t} options={options} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} />
+            </section>
+            <section>
+                <AssociatedInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} />
+            </section>
+        </DashboardLayout>
+    )
 }
 
 export default SelfAssesment

package/src/@daf/pages/Events/Activities/columns.js

@@ -110,7 +110,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions);
+          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
           const categoryValue = getEventCategoryBySubject(eventCategory, "correctiveActions", true);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';

package/src/@daf/pages/Events/Activities/config.js

@@ -1,3 +1,5 @@
+import { getStatusOptions } from '../../../utils/filters';
+
 export const getFiltersConfig = ({t}) => {
     return {
 		timeframe: {
@@ -102,15 +104,15 @@ export const getFiltersConfig = ({t}) => {
 			return true;
 		  },
 		},
-		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",
@@ -126,44 +128,35 @@ export const getFiltersConfig = ({t}) => {
 export const getFilterOptions = (options, t) => {
 	const {
 		timeframe = [],
-		statusOptions = [],
-		categoryOptions = [],
-		countries = [],
-		subCategory = [],
-		category = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
+		category,
 		stakeholderCategoryOptions,
 		stakeholderSubCategoriesOptions,
 		administrativeLevel1,
 		administrativeLevel2,
 		positionInMineralSupplyChainOptions,
 		subCategoriesOptions,
-		eventCategoryOptions = [],
+		eventCategoryOptions,
 	} = options || {};
 
-	const _categoryOptions = eventCategoryOptions?.map((item) => ({
+	const _categoryOptions = (eventCategoryOptions || categoryOptions || [])?.map((item) => ({
 		value: item.value,
 		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 	}))
 
 	const _default  = {
 		timeframe: timeframe,
-		status: [
-			{
-				value: "submitted",
-				label: t("Submitted"),
-			},
-			{
-				value: "private",
-				label: t("Private"),
-			},
-		],
-		eventCategory: _categoryOptions,
-		country: countries,
-		subCategory: subCategoriesOptions,
+		status: getStatusOptions(t) || [],
+		eventCategory: _categoryOptions || [],
+		country: countries || [],
+		subCategory: subCategoriesOptions || [],
 		// category: category,
 		administrativeLevel1,
 		administrativeLevel2,
-		positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,
+		// positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions || [],
 	}
 
 	return _default;

package/src/@daf/pages/Events/Incidents/columns.js

@@ -110,7 +110,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions);
+          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
           const categoryValue = getEventCategoryBySubject(eventCategory, subject);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';

package/src/@daf/pages/Events/Incidents/config.js

@@ -1,3 +1,5 @@
+import { getStatusOptions } from '../../../utils/filters';
+
 export const getFiltersConfig = ({t}) => {
     return {
 		timeframe: {
@@ -101,15 +103,15 @@ export const getFiltersConfig = ({t}) => {
 			return true;
 		  },
 		},
-		positionInTheMineralSupplyChain: {
-		  type: 'select',
-		  label: 'Position',
-		  placeholder: (t) => `${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) => `${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",
@@ -125,44 +127,35 @@ export const getFiltersConfig = ({t}) => {
 export const getFilterOptions = (options, t) => {
 	const {
 		timeframe = [],
-		statusOptions = [],
-		categoryOptions = [],
-		countries = [],
-		subCategory = [],
-		category = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
+		category,
 		stakeholderCategoryOptions,
 		stakeholderSubCategoriesOptions,
 		administrativeLevel1,
 		administrativeLevel2,
 		positionInMineralSupplyChainOptions,
 		subCategoriesOptions,
-		eventCategoryOptions = [],
+		eventCategoryOptions,
 	} = options || {};
 
-	const _categoryOptions = eventCategoryOptions?.map((item) => ({
+	const _categoryOptions = (eventCategoryOptions || categoryOptions || [])?.map((item) => ({
 		value: item.value,
 		label: typeof item.label === 'object' ? Object.values(item.label)[0] : item.label,
 	}))
 
 	const _default  = {
 		timeframe: timeframe,
-		status: [
-			{
-				value: "submitted",
-				label: t("Submitted"),
-			},
-			{
-				value: "private",
-				label: t("Private"),
-			},
-		],
-		eventCategory: _categoryOptions,
-		country: countries,
-		subCategory: subCategoriesOptions,
+		status: getStatusOptions(t) || [],
+		eventCategory: _categoryOptions || [],
+		country: countries || [],
+		subCategory: subCategoriesOptions || [],
 		// category: category,
 		administrativeLevel1,
 		administrativeLevel2,
-		positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,
+		// positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions || [],
 	}
 
 	return _default;

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

@@ -110,11 +110,11 @@ export const getFiltersConfig = ({t}) => {
 export const getFilterOptions = (options, t) => {
 	const {
         timeframe = [],
-		status = [],
-		categoryOptions = [],
-		countries = [],
-		category=[],
-		eventCategoryOptions = [],
+		status,
+		categoryOptions,
+		countries,
+		category,
+		eventCategoryOptions,
 	  } = options || {};
 
 	const catOptions = eventCategoryOptions?.map((item) => ({
@@ -124,8 +124,8 @@ export const getFilterOptions = (options, t) => {
 
 	return {
        timeframe: timeframe,
-	   country: countries,
-	   category: catOptions,
+	   country: countries || [],
+	   category: catOptions || [],
 	   status: [
 		{
 			value: "submitted",

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -9,7 +9,7 @@ import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 import MoreOptions from '../../../core/components/Table/MoreOptions/index.jsx';
 import { renderStatusTag } from '../../../utils/tags.js';
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications, APP}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -74,7 +74,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         dataIndex: 'category',
         title: t('type'),
         ellipsis: true,
-        show: true,
+        show: APP === "wazi",
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -167,7 +167,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
               label: t("Summary"),
               value: "Summary",
               onClick: () => {
-                let link = `/app/mine-summary/${all.datastakeId}`
+                let link = `/app/${subject === 'scl' ? 'summary/scl' : 'mine-summary'}/${all.datastakeId}`
                 if (activeTab === "shared") {
                   link += `?sourceId=${all?.authorId?.id}`;
                 }

package/src/@daf/pages/Locations/MineSite/config.js

@@ -1,3 +1,5 @@
+import { getStatusOptions } from '../../../utils/filters';
+
 export const getFiltersConfig = ({t}) => {
     return {
 		country: {
@@ -124,28 +126,20 @@ export const getFilterOptions = (options, t) => {
 		administrativeLevel1,
 		administrativeLevel2,
 		mineralOptions,
+		minerals,
 		productionSiteCategories,
 		locationCategories = [],
 	  } = options || {};
 
 	const _default  = {
 		// category: stakeholderCategoryOptions || categoryOptions,
-		country: countries,
-		product: mineralOptions,
-		category: productionSiteCategories || locationCategories,
+		country: countries || [],
+		product: mineralOptions || minerals || [],
+		category: productionSiteCategories || locationCategories || [],
 		administrativeLevel1,
 		administrativeLevel2,
-		subCategory: subCategoriesOptions,
-		status: [
-			{
-				value: "submitted",
-				label: t("Submitted"),
-			},
-			{
-				value: "private",
-				label: t("Private"),
-			},
-		],
+		subCategory: subCategoriesOptions || [],
+		status: getStatusOptions(t) || [],
 	}
 
 	return _default;
@@ -161,4 +155,16 @@ export const formConfig = {
 export const viewConfig = {
 	title: "Production Sites",
 	createTitle: "Create Production Site",
+}
+
+export const sclFormConfig = {
+	namespace: 'SCL',
+	view: ['scoping', 'new'],
+	scope: 'create',
+	formType: 'scl',
+}
+
+export const sclViewConfig = {
+	title: "Mine Sites",
+	createTitle: "New Mine Site",
 }

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

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

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -49,7 +49,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, data?.options?.positionSupplyChainOptions);
+          const country = findOptions(v, data?.options?.positionSupplyChainOptions || data?.options?.optionPositionSupplyChain);
 
           return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
@@ -66,7 +66,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const subCategory = findOptions(v, data?.options?.subCategoriesOptions);
+          const subCategory = findOptions(v, data?.options?.subCategoriesOptions || data?.options?.subCategory);
     
           return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },

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

@@ -1,3 +1,5 @@
+import { getStatusOptions } from '../../../utils/filters';
+
 export const getFiltersConfig = ({t}) => {
     return {
 		country: {
@@ -75,7 +77,7 @@ export const getFiltersConfig = ({t}) => {
 		subCategory: {
 		  type: 'select',
 		  label: 'Sub Category',
-		  placeholder: () => `${t('Filter by')} ${t('Sub Category').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Legal Form').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -119,10 +121,10 @@ export const getFiltersConfig = ({t}) => {
 
 export const getFilterOptions = (options, t) => {
 	const {
-		statusOptions = [],
-		categoryOptions = [],
-		countries = [],
-		subCategory = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
 		subCategoriesOptions,
 		stakeholderCategoryOptions,
 		stakeholderSubCategoriesOptions,
@@ -135,17 +137,8 @@ export const getFilterOptions = (options, t) => {
 		country: countries,
 		administrativeLevel1,
 		administrativeLevel2,
-		subCategory: subCategoriesOptions,
-		status: [
-			{
-				value: "submitted",
-				label: t("Submitted"),
-			},
-			{
-				value: "private",
-				label: t("Private"),
-			},
-		],
+		subCategory: subCategoriesOptions || subCategory,
+		status: getStatusOptions(t) || [],
 	}
 
 	return _default;

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

@@ -66,7 +66,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const activity = findOptions(v, data?.options?.activityAtSiteOptions);
+          const activity = findOptions(v, data?.options?.activityAtSiteOptions || data?.options?.activityAtSite);
     
           return activity ? <Tooltip title={activity}>{activity}</Tooltip> : '-';
         },

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,