datastake-daf 0.6.818 → 0.6.819

package/dist/pages/index.js

@@ -7523,14 +7523,15 @@ const getRowConfig$1 = ({
   data = {},
   goTo,
   getRedirectLink,
-  theme = {}
+  theme = {},
+  APP
 }) => [{
   label: /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorNavigateLabel, {
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
     label: "Identified Mine Sites",
-    link: "/app/production-sites"
+    link: APP === 'nashiriki' ? '/app/scl' : '/app/production-sites'
   }),
   render: () => {
     return /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -8137,7 +8138,8 @@ function KeyIndicators$1({
   theme = {},
   getRedirectLink = () => {},
   t = () => {},
-  goTo = () => {}
+  goTo = () => {},
+  APP
 }) {
   const fetchConfig = React.useMemo(() => ({
     ...defaultFetchConfig$6,
@@ -8161,9 +8163,10 @@ function KeyIndicators$1({
       },
       goTo,
       getRedirectLink,
-      theme
+      theme,
+      APP
     });
-  }, [t, data, goTo, getRedirectLink, theme]);
+  }, [t, data, goTo, getRedirectLink, theme, APP]);
   return /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorsWidget, {
     t: t,
     config: config,
@@ -12732,7 +12735,7 @@ const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
         number: 0,
         name: item.name,
         sources: parentId ? [parentId] : [],
-        subTitle: findOptions(item?.category, options?.categoriesOptions),
+        subTitle: findOptions(item?.category, options?.categoriesOptions || options?.category || []),
         leftIcon: type === "client" ? rightIcon : leftIcon,
         leftBackground: type === "client" ? rightBackground : leftBackground,
         topIcon: mapIcon(item.category),
@@ -12749,7 +12752,7 @@ const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
     id: data.id,
     number: 0,
     name: data.name,
-    subTitle: findOptions(data?.category, options?.categoriesOptions),
+    subTitle: findOptions(data?.category, options?.categoriesOptions || options?.category || []),
     leftIcon: middleIcon,
     leftBackground: theme.colorPrimary10,
     topIcon: mapIcon(data.category),
@@ -13907,7 +13910,9 @@ function SupplyChain({
   setSelectedPartners,
   informationSources,
   hardcodedData,
-  breadcrumbs = []
+  breadcrumbs = [],
+  supportText,
+  APP
 }) {
   const sourceOptions = React.useMemo(() => {
     if (!partners?.length) return [];
@@ -13950,6 +13955,7 @@ function SupplyChain({
           defaultSelected: partners?.map(p => p.id) || []
         }, partners?.length)
       }),
+      supportText: supportText,
       breadcrumbs: breadcrumbs
     }),
     children: [/*#__PURE__*/jsxRuntime.jsx("section", {
@@ -13958,7 +13964,8 @@ function SupplyChain({
         theme: theme,
         t: t,
         goTo: goTo,
-        getRedirectLink: getRedirectLink
+        getRedirectLink: getRedirectLink,
+        APP: APP
       })
     }), /*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(SupplyChainMap, {
@@ -13995,11 +14002,11 @@ const getActionWidgetsConfig = ({
 }) => [{
   icon: "MineSite",
   title: t("Create Mine Site"),
-  onClick: () => goTo(getRedirectLink("/app/production-sites?create=true"))
+  onClick: () => goTo(getRedirectLink(`/app/${APP === 'nashiriki' ? 'scl' : 'production-sites'}?create=true`))
 }, {
   icon: "FileEdit",
   title: "Report Activity",
-  onClick: () => goTo(getRedirectLink("/app/activities?create=true"))
+  onClick: () => goTo(getRedirectLink(`/app/${APP === 'nashiriki' ? 'corrective-actions' : 'activities'}?create=true`))
 }, {
   icon: "ReportIncidents",
   title: "Report Incident",
@@ -14060,7 +14067,8 @@ const getRowConfig = ({
   data = {},
   goTo,
   getRedirectLink,
-  theme = {}
+  theme = {},
+  APP
 }) => [{
   label: /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorNavigateLabel, {
     t: t,
@@ -14090,8 +14098,8 @@ const getRowConfig = ({
     t: t,
     getRedirectLink: getRedirectLink,
     theme: theme,
-    label: "Activities",
-    link: "/app/activities"
+    label: APP === 'nashiriki' ? 'Corrective Actions' : 'Activities',
+    link: APP === 'nashiriki' ? '/app/corrective-actions' : '/app/activities'
   }),
   render: () => {
     return /*#__PURE__*/jsxRuntime.jsx("span", {
@@ -14134,7 +14142,8 @@ function KeyIndicators({
   goTo = () => {},
   getRedirectLink = () => {},
   theme = {},
-  partners = []
+  partners = [],
+  APP
 }) {
   const fetchConfig = React.useMemo(() => ({
     ...defaultFetchConfig$5
@@ -14153,8 +14162,9 @@ function KeyIndicators({
     },
     goTo,
     getRedirectLink,
-    theme
-  }), [t, data, goTo, getRedirectLink, partners, theme]);
+    theme,
+    APP
+  }), [t, data, goTo, getRedirectLink, partners, theme, APP]);
   return /*#__PURE__*/jsxRuntime.jsx(KeyIndicatorsWidget, {
     t: t,
     config: config,
@@ -14185,7 +14195,7 @@ const getFiltersConfig$e = ({
   const value = filters.type ? {
     value: filters.type
   } : {};
-  const eventCategoryOptions = (options?.eventCategoryOptions || [])?.map(item => ({
+  const eventCategoryOptions = (options?.eventCategoryOptions || options?.categoryOptions || [])?.map(item => ({
     value: item.value,
     label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
   }));
@@ -14196,7 +14206,7 @@ const getFiltersConfig$e = ({
       key: "category",
       type: "select",
       ...value,
-      options: options?.categoriesOptions ?? []
+      options: options?.categoriesOptions || options?.category || []
     }];
   }
   if (activeTab === 'event') {
@@ -15487,7 +15497,8 @@ function UserDashboard({
         partners: informationSourcesCount,
         t: t,
         goTo: goTo,
-        getRedirectLink: getRedirectLink
+        getRedirectLink: getRedirectLink,
+        APP: APP
       })
     }), /*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(MineSites, {
@@ -41038,6 +41049,10 @@ const Create = ({
           ...payloadData,
           form: formType
         };
+        const {
+          datastakeId,
+          ...finalPayload
+        } = newPayload;
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
             setSelectedFormNext();
@@ -41048,7 +41063,7 @@ const Create = ({
             antd.message.error(m);
           }
         };
-        saveData(!data && !data.id ? newPayload : Object.assign(newPayload, {
+        saveData(!data && !data.id ? finalPayload : Object.assign(finalPayload, {
           id: data.id
         }), callback);
       },
@@ -42487,7 +42502,7 @@ const getFilterOptions$9 = (options, t) => {
     category,
     eventCategoryOptions
   } = options || {};
-  const catOptions = eventCategoryOptions?.map(item => ({
+  const catOptions = (eventCategoryOptions || categoryOptions || [])?.map(item => ({
     value: item.value,
     label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
   }));
@@ -44834,7 +44849,7 @@ const getColumns$6 = ({
       label: t("Summary"),
       value: "Summary",
       onClick: () => {
-        let link = `/app/${subject === 'scl' ? 'summary/scl' : 'mine-summary'}/${all.datastakeId}`;
+        let link = `/app/mine-summary/${all.datastakeId}`;
         if (activeTab === "shared") {
           link += `?sourceId=${all?.authorId?.id}`;
         }
@@ -45464,6 +45479,9 @@ const useTablePage = ({
     t,
     subject
   }), [t, subject, getFiltersConfig$1]);
+  console.log({
+    options
+  });
   React.useEffect(() => {
     setSelectOptions(prev => ({
       ...prev,
@@ -50912,6 +50930,7 @@ const getSourcesType = subject => {
     locations: "location",
     location: "location",
     "production-sites": "location",
+    scl: "location",
     stakeholders: "stakeholder",
     stakeholder: "stakeholder",
     workers: "stakeholder",
@@ -50969,9 +50988,6 @@ const Records = ({
           source: selectedSource
         }
       });
-      console.log({
-        data
-      });
       setVersions(data);
     } catch (error) {
       console.error('Error fetching versions:', error);
@@ -61529,11 +61545,6 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
-    console.log({
-      namespace,
-      language,
-      scope
-    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,

package/dist/services/index.js

@@ -1458,11 +1458,6 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
-    console.log({
-      namespace,
-      language,
-      scope
-    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.818",
+	"version": "0.6.819",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/ViewForm/components/Records/config.js

@@ -4,6 +4,7 @@ export const getSourcesType = (subject) => {
       locations: "location",
       location: "location",
       "production-sites": "location",
+      scl: "location",
       
       stakeholders: "stakeholder",
       stakeholder: "stakeholder",

package/src/@daf/core/components/ViewForm/components/Records/index.jsx

@@ -39,7 +39,6 @@ const Records = ({
             const { data } = await VersionService.getSources({ type, id, params: {
                 source: selectedSource,
             } });
-            console.log({data})
             setVersions(data);
         } catch (error) {
             console.error('Error fetching versions:', error);

package/src/@daf/pages/Dashboards/SupplyChain/components/KeyIndicators/config.js

@@ -2,7 +2,7 @@ import React from "react";
 import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx';
 import KeyIndicatorNavigateLabel from '../../../../../core/components/UI/KeyIndicatorNavigateLabel/index.jsx';
 
-export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }) => [
+export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {}, APP }) => [
 	{
 		label: (
 			<KeyIndicatorNavigateLabel 
@@ -10,7 +10,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
 				label="Identified Mine Sites" 
-				link="/app/production-sites" 
+				link={APP === 'nashiriki' ? '/app/scl' : '/app/production-sites'} 
 			/>
 		),
 		render: () => {

package/src/@daf/pages/Dashboards/SupplyChain/components/KeyIndicators/index.js

@@ -13,7 +13,7 @@ const defaultFetchConfig = {
     },
 };
 
-function KeyIndicators({selectedSources = {}, theme = {}, getRedirectLink = () => {}, t = () => {}, goTo = () => {} }) {
+function KeyIndicators({selectedSources = {}, theme = {}, getRedirectLink = () => {}, t = () => {}, goTo = () => {}, APP }) {
     const fetchConfig = useMemo(() => ({
         ...defaultFetchConfig,
         filters: { ...defaultFetchConfig.filters, sources: selectedSources?.partners || [] },
@@ -29,8 +29,9 @@ function KeyIndicators({selectedSources = {}, theme = {}, getRedirectLink = () =
             goTo,
             getRedirectLink,
             theme,
+            APP
         })
-    }, [t, data, goTo, getRedirectLink, theme])
+    }, [t, data, goTo, getRedirectLink, theme, APP])
     
     return (
         <KeyIndicatorsWidget

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

@@ -21,6 +21,8 @@ function SupplyChain({
     informationSources,
     hardcodedData,
     breadcrumbs = [],
+    supportText,
+    APP,
 }) {
 
     const sourceOptions = useMemo(() => {
@@ -69,12 +71,13 @@ function SupplyChain({
                             />
                         </div>
                     }
+                    supportText={supportText}
                     breadcrumbs={breadcrumbs}
                 />
             }
         >
             <section>
-                <KeyIndicators selectedSources={selectedPartners} theme={theme} t={t} goTo={goTo} getRedirectLink={getRedirectLink} />
+                <KeyIndicators selectedSources={selectedPartners} theme={theme} t={t} goTo={goTo} getRedirectLink={getRedirectLink} APP={APP} />
             </section>                
             <section>
                 <SupplyChainMap selectedSources={selectedPartners} t={t} goTo={goTo} options={options} getRedirectLink={getRedirectLink} />

package/src/@daf/pages/Dashboards/UserDashboard/components/KeyIndicators/config.js

@@ -2,7 +2,7 @@ import React from 'react';
 import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx';
 import KeyIndicatorNavigateLabel from '../../../../../core/components/UI/KeyIndicatorNavigateLabel/index.jsx';
 
-export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }) => [
+export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {}, APP }) => [
 	{
 		label: (
 			<KeyIndicatorNavigateLabel 
@@ -35,8 +35,8 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 				t={t} 
 				getRedirectLink={getRedirectLink} 
 				theme={theme} 
-				label="Activities" 
-				link="/app/activities" 
+				label={APP === 'nashiriki' ? 'Corrective Actions' : 'Activities'}
+				link={APP === 'nashiriki' ? '/app/corrective-actions' : '/app/activities'}
 			/>
 		),
 		render: () => {

package/src/@daf/pages/Dashboards/UserDashboard/components/KeyIndicators/index.jsx

@@ -17,6 +17,7 @@ function KeyIndicators({
     getRedirectLink = () => {},
 	theme = {},
 	partners = [],
+	APP,
 }) {
     const fetchConfig = useMemo(
 		() => ({
@@ -33,9 +34,10 @@ function KeyIndicators({
 				data: { ...data, partners },
 				goTo,
 				getRedirectLink,
-				theme
+				theme,
+				APP
 			}),
-		[t, data, goTo, getRedirectLink, partners, theme],
+		[t, data, goTo, getRedirectLink, partners, theme, APP],
 	);
 
     return (

package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/config.js

@@ -9,7 +9,7 @@ export const getTabs = (t) => {
 export const getFiltersConfig = ({t, filters, activeTab, options}) => {
     const value = filters.type ? { value: filters.type } : {};
 
-	const eventCategoryOptions = (options?.eventCategoryOptions || [])?.map((item) => ({
+	const eventCategoryOptions = (options?.eventCategoryOptions || options?.categoryOptions || [])?.map((item) => ({
 		value: item.value,
 		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 	}))
@@ -22,7 +22,7 @@ export const getFiltersConfig = ({t, filters, activeTab, options}) => {
 				key: "category",
 				type: "select",
 				...value,
-				options: options?.categoriesOptions ?? [],
+				options: options?.categoriesOptions || options?.category || [],
 			},
 		];
 	}

package/src/@daf/pages/Dashboards/UserDashboard/config.js

@@ -2,12 +2,12 @@ export const getActionWidgetsConfig = ({ goTo, getRedirectLink, APP, t }) => [
     {
         icon: "MineSite",
         title: t("Create Mine Site"),
-        onClick: () => goTo(getRedirectLink("/app/production-sites?create=true")),
+        onClick: () => goTo(getRedirectLink(`/app/${APP === 'nashiriki' ? 'scl' : 'production-sites'}?create=true`)),
     },
     {
         icon: "FileEdit",
         title: "Report Activity",
-        onClick: () => goTo(getRedirectLink("/app/activities?create=true")),
+        onClick: () => goTo(getRedirectLink(`/app/${APP === 'nashiriki' ? 'corrective-actions' : 'activities'}?create=true`)),
     },
     {
         icon: "ReportIncidents",

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

@@ -67,6 +67,7 @@ function UserDashboard({
                     t={t} 
                     goTo={goTo} 
                     getRedirectLink={getRedirectLink} 
+                    APP={APP}
                 />
             </section>
             <section>

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

@@ -53,7 +53,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 			number: 0,
 			name: item.name,
 			sources: parentId ? [parentId] : [],
-			subTitle: findOptions(item?.category, options?.categoriesOptions),
+			subTitle: findOptions(item?.category, options?.categoriesOptions || options?.category || []),
 			leftIcon: type === "client" ? rightIcon : leftIcon,
 			leftBackground: type === "client" ? rightBackground : leftBackground,
 			topIcon: mapIcon(item.category),
@@ -70,7 +70,7 @@ export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {
 		id: data.id,
 		number: 0,
 		name: data.name,
-		subTitle: findOptions(data?.category, options?.categoriesOptions),
+		subTitle: findOptions(data?.category, options?.categoriesOptions || options?.category || []),
 		leftIcon: middleIcon,
 		leftBackground: theme.colorPrimary10,
 		topIcon: mapIcon(data.category),

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

@@ -117,7 +117,7 @@ export const getFilterOptions = (options, t) => {
 		eventCategoryOptions,
 	  } = options || {};
 
-	const catOptions = eventCategoryOptions?.map((item) => ({
+	const catOptions = (eventCategoryOptions || categoryOptions || [])?.map((item) => ({
 		value: item.value,
 		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 	}))

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

@@ -188,7 +188,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
               label: t("Summary"),
               value: "Summary",
               onClick: () => {
-                let link = `/app/${subject === 'scl' ? 'summary/scl' : 'mine-summary'}/${all.datastakeId}`
+                let link = `/app/mine-summary/${all.datastakeId}`
                 if (activeTab === "shared") {
                   link += `?sourceId=${all?.authorId?.id}`;
                 }

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

@@ -79,6 +79,8 @@ const Create = ({
                         form: formType
                     };
 
+                    const { datastakeId, ...finalPayload } = newPayload;
+
                 
                     const callback = (type, m, data) => {
                         if (setSelectedFormNext) {
@@ -92,7 +94,7 @@ const Create = ({
                     };
                     
                     saveData(
-                        !data && !data.id ? newPayload : Object.assign(newPayload, { id: data.id }),
+                        !data && !data.id ? finalPayload : Object.assign(finalPayload, { id: data.id }),
                         callback,
                     );
                 }}

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

@@ -94,6 +94,8 @@ export const useTablePage = ({
         [t, subject, getFiltersConfig]
     );
 
+    console.log({options})
+
     useEffect(() => {
         setSelectOptions((prev) => ({
             ...prev,

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

@@ -27,7 +27,6 @@ export const getNamespace = (namespace) => {
 
 class LinkedSubjectsService extends BaseService {
     getForm({ namespace }, language = "en", scope) {
-		console.log({namespace, language, scope})
 		return this.apiGet({
 			url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
 			isApp: true,
@@ -67,6 +66,7 @@ class LinkedSubjectsService extends BaseService {
 	}
 
     save(payload, namespace) {
+		{payload, namespace}
 		if (payload.datastakeId) {
 			let _namespace = getNamespace(namespace);