datastake-daf 0.6.770 → 0.6.772

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

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../TablePage/index.jsx';
 
 const LocationsTable = ({
@@ -48,22 +47,13 @@ const LocationsTable = ({
             APP={APP}
             location={location}
             applications={applications}
-            
             subject="locations"
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
             subjectClear={subjectClear}
-            getColumns={getColumns}
-            
-            viewConfig={{
-                title: "Locations",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Location",
-            }}
-            
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
-            
             formConfig={{
                 getFormData,
                 saveFormData,
@@ -76,13 +66,8 @@ const LocationsTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: 'locations',
-                view: 'scoping',
-                scope: 'create',
-                formType: 'location',
-                defaultValues: createDefaultValues,
             }}
-            
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -149,4 +149,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'OPERATOR',
+	view: ['scoping', 'new'],
+	scope: 'global',
+	formType: 'operator',
+}
+
+export const viewConfig = {
+	title: "Operators",
+	createTitle: "Create Operator",
 }

package/src/@daf/pages/Stakeholders/Operators/index.jsx

@@ -47,17 +47,11 @@ const OperatorsTable = ({
             APP={APP}
             location={location}
             applications={applications}
-
             subject="operators"
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
-            getColumns={getColumns}
-            viewConfig={{
-                title: "Operators",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Operator",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -71,12 +65,8 @@ const OperatorsTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "OPERATOR",
-                view: ['scoping', 'new'],
-                scope: 'global',
-                formType: 'operator',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -153,4 +153,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'WORKERS',
+	view: ['scoping', 'new'],
+	scope: 'global',
+	formType: 'worker',
+}
+
+export const viewConfig = {
+	title: "Workers",
+	createTitle: "Create Worker",
 }

package/src/@daf/pages/Stakeholders/Workers/index.jsx

@@ -53,11 +53,7 @@ const WorkersTable = ({
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
             getColumns={getColumns}
-            viewConfig={{
-                title: "Workers",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Worker",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -71,12 +67,8 @@ const WorkersTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "WORKERS",
-                view: ['scoping', 'new'],
-                scope: 'global',
-                formType: 'worker',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -26,4 +26,16 @@ export const getFilterOptions = (options, t) => {
 		country: countries,
 		category: categoriesOptions || category,
 	}
+}
+
+export const formConfig = {
+	namespace: 'stakeholders',
+	view: 'scoping',
+	scope: 'create',
+	formType: 'stakeholder',
+}
+
+export const viewConfig = {
+	title: "Stakeholders",
+	createTitle: "Create Stakeholder",
 }

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

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../TablePage/index.jsx';
 
 const StakeholdersTable = ({
@@ -48,22 +47,13 @@ const StakeholdersTable = ({
             APP={APP}
             location={location}
             applications={applications}
-            
             subject="stakeholders"
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
             subjectClear={subjectClear}
-            getColumns={getColumns}
-            
-            viewConfig={{
-                title: "Stakeholders",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Stakeholder",
-            }}
-            
-            extendingFilters={extendingFilters}
-            
+            breadcrumbs={breadcrumbs}
+            extendingFilters={extendingFilters}   
             formConfig={{
                 getFormData,
                 saveFormData,
@@ -76,13 +66,8 @@ const StakeholdersTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: 'stakeholders',
-                view: 'scoping',
-                scope: 'create',
-                formType: 'stakeholder',
-                defaultValues: createDefaultValues,
             }}
-            
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -78,6 +78,7 @@ const TradeRelationships = ({
 						filtersConfig={filterConfig}
 						onFilterChange={onFilterChange}
 						onRenderComplete={(data) => {
+							console.log("onRenderComplete");
 							setIsFullyRendered(!data);
 						}}
 					/>

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

@@ -34,6 +34,9 @@ export const useSummary = ({
 			const mappedData = Array.isArray(data) ? data.map((item) => ({
 				label: item?.name,
 				value: item?.datastakeId
+			})) : Array.isArray(data?.data) ? data?.data.map((item) => ({
+				label: item?.name,
+				value: item?.datastakeId
 			})) : [];
 			
 			const storedData = StorageManager.get(storageKey);
@@ -82,9 +85,16 @@ export const useSummary = ({
 	}, [hasSelect, storageKey, isPdf, id, debouncedSearch, hasInitialized, dataOptions]);
 
 	useEffect(() => {
-		if (selectedItem && Array.isArray(data)) {
-			const selectedData = data.find((item) => item?.datastakeId === selectedItem);
-			if(selectedData) {
+		if (selectedItem) {
+			let selectedData;
+			
+			if (Array.isArray(data)) {
+				selectedData = data.find((item) => item?.datastakeId === selectedItem);
+			} else if (Array.isArray(data?.data)) {
+				selectedData = data.data.find((item) => item?.datastakeId === selectedItem);
+			}
+			
+			if (selectedData) {
 				const saved = {
 					label: selectedData.name,
 					value: selectedData.datastakeId,

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

@@ -0,0 +1,29 @@
+import { FILTER_REGISTRY, DEFAULT_SUBJECT } from './helper.js';
+
+export const getColumns = ({
+    t, 
+    goTo, 
+    user,
+    options,
+    activeTab,
+    getRedirectLink, 
+    theme,
+    subject,
+    data,
+    applications,
+}) => {
+    const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
+
+    return registry?.columns({
+        t,
+        goTo,
+        user,
+        options,
+        activeTab,
+        getRedirectLink,
+        theme,
+        subject,
+        data,
+        applications,
+    });
+}

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

@@ -1,16 +1,4 @@
-import { getFiltersConfig as getFiltersConfigStakeholders, getFilterOptions as getFilterOptionsStakeholders } from '../Stakeholders/config';
-import { getFiltersConfig as getFiltersConfigOperators, getFilterOptions as getFilterOptionsOperators } from '../Stakeholders/Operators/config';
-import { getFiltersConfig as getFiltersConfigWorkers, getFilterOptions as getFilterOptionsWorkers } from '../Stakeholders/Workers/config';
-
-import { getFiltersConfig as getFiltersConfigEvents, getFilterOptions as getFilterOptionsEvents } from '../Events/config';
-import { getFiltersConfig as getFiltersConfigActivities, getFilterOptions as getFilterOptionsActivities } from '../Events/Activities/config';
-import { getFiltersConfig as getFiltersConfigIncidents, getFilterOptions as getFilterOptionsIncidents } from '../Events/Incidents/config';
-
-import { getFiltersConfig as getFiltersConfigLocations, getFilterOptions as getFilterOptionsLocations } from '../Locations/config';
-import { getFiltersConfig as getFiltersConfigProductionSites, getFilterOptions as getFilterOptionsProductionSites } from '../Locations/MineSite/config';
-
-import { getFiltersConfig as getFilterConfigDocuments, getFilterOptions as getFilterOptionsDocuments } from '../Documents/config';
-
+import { FILTER_REGISTRY, DEFAULT_SUBJECT } from './helper.js';
 
 export const getCheckboxConfig = ({ subject }) => {
   return {
@@ -26,53 +14,22 @@ export const getSelectFiltersConfig = ({ subject }) => {
   }
 };
 
-const FILTER_REGISTRY = {
-    stakeholders: {
-      config: getFiltersConfigStakeholders,
-      options: getFilterOptionsStakeholders,
-    },
-    workers: {
-      config: getFiltersConfigWorkers,
-      options: getFilterOptionsWorkers,
-    },
-    operators: {
-      config: getFiltersConfigOperators,
-      options: getFilterOptionsOperators,
-    },
-    events: {
-      config: getFiltersConfigEvents,
-      options: getFilterOptionsEvents,
-    },
-    activities: {
-      config: getFiltersConfigActivities,
-      options: getFilterOptionsActivities,
-    },
-    incidents: {
-      config: getFiltersConfigIncidents,
-      options: getFilterOptionsIncidents,
-    },
-    locations: {
-      config: getFiltersConfigLocations,
-      options: getFilterOptionsLocations,
-    },
-    'production-sites': {
-      config: getFiltersConfigProductionSites,
-      options: getFilterOptionsProductionSites,
-    },
-    documents: {
-      config: getFilterConfigDocuments,
-      options: getFilterOptionsDocuments,
-    },
-  };
-  
-  const DEFAULT_SUBJECT = 'stakeholders';
-  
-  export const getFiltersConfig = ({ t, subject }) => {
-    const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
-    return registry?.config({ t });
-  };
+export const getFiltersConfig = ({ t, subject }) => {
+  const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
+  return registry?.config({ t });
+};
   
-  export const getFilterOptions = ({ t, subject, options }) => {
-    const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
-    return registry.options(options, t);
-  };
+export const getFilterOptions = ({ t, subject, options }) => {
+  const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
+  return registry.options(options, t);
+};
+
+export const getFormConfig = ({ subject }) => {
+  const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
+  return registry?.formConfig;
+};
+
+export const getViewConfig = ({ subject }) => {
+  const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
+  return registry?.viewConfig;
+};

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

@@ -0,0 +1,140 @@
+import { 
+    getFiltersConfig as getFiltersConfigStakeholders, 
+    getFilterOptions as getFilterOptionsStakeholders,
+    formConfig as formConfigStakeholders,
+    viewConfig as viewConfigStakeholders
+} from '../Stakeholders/config.js';
+import { getColumns as getColumnsStakeholders } from "../Stakeholders/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigOperators, 
+    getFilterOptions as getFilterOptionsOperators,
+    formConfig as formConfigOperators,
+    viewConfig as viewConfigOperators
+} from '../Stakeholders/Operators/config.js';
+import { getColumns as getColumnsOperators } from "../Stakeholders/Operators/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigWorkers, 
+    getFilterOptions as getFilterOptionsWorkers,
+    formConfig as formConfigWorkers,
+    viewConfig as viewConfigWorkers
+} from '../Stakeholders/Workers/config.js';
+import { getColumns as getColumnsWorkers } from "../Stakeholders/Workers/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigEvents, 
+    getFilterOptions as getFilterOptionsEvents,
+    formConfig as formConfigEvents,
+    viewConfig as viewConfigEvents
+} from '../Events/config.js';
+import { getColumns as getColumnsEvents } from "../Events/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigActivities, 
+    getFilterOptions as getFilterOptionsActivities,
+    formConfig as formConfigActivities,
+    viewConfig as viewConfigActivities
+} from '../Events/Activities/config.js';
+import { getColumns as getColumnsActivities } from "../Events/Activities/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigIncidents, 
+    getFilterOptions as getFilterOptionsIncidents,
+    formConfig as formConfigIncidents,
+    viewConfig as viewConfigIncidents
+} from '../Events/Incidents/config.js';
+import { getColumns as getColumnsIncidents } from "../Events/Incidents/columns.js";
+  
+import { 
+    getFiltersConfig as getFiltersConfigLocations, 
+    getFilterOptions as getFilterOptionsLocations,
+    formConfig as formConfigLocations,
+    viewConfig as viewConfigLocations
+} from '../Locations/config.js';
+import { getColumns as getColumnsLocations } from "../Locations/columns.js";
+
+import { 
+    getFiltersConfig as getFiltersConfigProductionSites, 
+    getFilterOptions as getFilterOptionsProductionSites,
+    formConfig as formConfigProductionSites,
+    viewConfig as viewConfigProductionSites
+} from '../Locations/MineSite/config.js';
+import { getColumns as getColumnsProductionSites } from "../Locations/MineSite/columns.js";
+  
+import { 
+    getFiltersConfig as getFilterConfigDocuments, 
+    getFilterOptions as getFilterOptionsDocuments,
+    formConfig as formConfigDocuments,
+    viewConfig as viewConfigDocuments
+} from '../Documents/config.js';
+import { getColumns as getColumnsDocuments } from "../Documents/columns.js";
+
+
+export const FILTER_REGISTRY = {
+    stakeholders: {
+      config: getFiltersConfigStakeholders,
+      options: getFilterOptionsStakeholders,
+      formConfig: formConfigStakeholders,
+      viewConfig: viewConfigStakeholders,
+      columns: getColumnsStakeholders,
+    },
+    workers: {
+      config: getFiltersConfigWorkers,
+      options: getFilterOptionsWorkers,
+      formConfig: formConfigWorkers,
+      viewConfig: viewConfigWorkers,
+      columns: getColumnsWorkers,
+    },
+    operators: {
+      config: getFiltersConfigOperators,
+      options: getFilterOptionsOperators,
+      formConfig: formConfigOperators,
+      viewConfig: viewConfigOperators,
+      columns: getColumnsOperators,
+    },
+    events: {
+      config: getFiltersConfigEvents,
+      options: getFilterOptionsEvents,
+      formConfig: formConfigEvents,
+      viewConfig: viewConfigEvents,
+      columns: getColumnsEvents,
+    },
+    activities: {
+      config: getFiltersConfigActivities,
+      options: getFilterOptionsActivities,
+      formConfig: formConfigActivities,
+      viewConfig: viewConfigActivities,
+      columns: getColumnsActivities,
+    },
+    incidents: {
+      config: getFiltersConfigIncidents,
+      options: getFilterOptionsIncidents,
+      formConfig: formConfigIncidents,
+      viewConfig: viewConfigIncidents,
+      columns: getColumnsIncidents,
+    },
+    locations: {
+      config: getFiltersConfigLocations,
+      options: getFilterOptionsLocations,
+      formConfig: formConfigLocations,
+      viewConfig: viewConfigLocations,
+      columns: getColumnsLocations,
+    },
+    'production-sites': {
+      config: getFiltersConfigProductionSites,
+      options: getFilterOptionsProductionSites,
+      formConfig: formConfigProductionSites,
+      viewConfig: viewConfigProductionSites,
+      columns: getColumnsProductionSites,
+    },
+    documents: {
+      config: getFilterConfigDocuments,
+      options: getFilterOptionsDocuments,
+      formConfig: formConfigDocuments,
+      viewConfig: viewConfigDocuments,
+      columns: getColumnsDocuments,
+    },
+};
+  
+export const DEFAULT_SUBJECT = 'stakeholders';

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

@@ -1,6 +1,14 @@
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { useGetQueryParams } from "../../hooks/useGetQueryParams.js";
-import { getFiltersConfig, getFilterOptions, getCheckboxConfig, getSelectFiltersConfig } from './config.js';
+import { 
+    getFiltersConfig,
+    getFilterOptions, 
+    getCheckboxConfig, 
+    getSelectFiltersConfig,
+    getFormConfig,
+    getViewConfig
+} from './config.js';
+import { getColumns } from './columns.js';
 
 export const useFetchData = ({
     location,
@@ -38,7 +46,6 @@ export const useTablePage = ({
     subject,
     location,
     getData,
-    getColumns,
     extendingFilters,
     options,
     t,
@@ -98,6 +105,15 @@ export const useTablePage = ({
         return getSelectFiltersConfig({ subject });
     }, [subject, getSelectFiltersConfig]);
 
+    const formInfo = useMemo(() => 
+        getFormConfig({ subject }), 
+        [subject, getFormConfig]
+    );
+
+    const viewConfig = useMemo(() => 
+        getViewConfig({ subject }), 
+        [subject, getViewConfig]
+    );
     const handleActiveTabChange = useCallback((value) => {
         setActiveTab(value);
     }, []);
@@ -119,5 +135,7 @@ export const useTablePage = ({
         handleActiveTabChange,
         checkboxConfig,
         _filtersConfig,
+        formInfo,
+        viewConfig,
     };
 }

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

@@ -28,12 +28,8 @@ const TablePage = ({
         formData: {},
         formValue: {},
         form: {},
-        namespace: '',
-        view: '',
-        scope: '',
-        formType: '',
-        defaultValues: {},
     },
+    defaultValues = {},
     extendingFilters = {},
     getData = () => {},
     getApiBaseUrl = () => {},
@@ -41,12 +37,7 @@ const TablePage = ({
     applications = [],
     subjectClear,
     subject,
-    getColumns = () => {},
-    viewConfig = {
-        title: '',
-        breadcrumbs: [],
-        createTitle: '',
-    },
+    breadcrumbs = [],
     onDownload,
 }) => {
     
@@ -58,11 +49,12 @@ const TablePage = ({
         handleActiveTabChange,
         checkboxConfig,
         _filtersConfig,
+        formInfo,
+        viewConfig,
     } = useTablePage({
         subject,
         location,
         getData,
-        getColumns,
         extendingFilters,
         options,
         t,
@@ -78,8 +70,8 @@ const TablePage = ({
     return (
         <TablePageWithTabs
             t={t}
-            title={t(viewConfig.title || "")}
-            breadCrumbs={viewConfig.breadcrumbs}
+            title={t(viewConfig?.title || "")}
+            breadCrumbs={breadcrumbs}
             location={location}
             loading={loading}
             goTo={goTo}
@@ -97,7 +89,7 @@ const TablePage = ({
             view={subject}
             getActiveTab={handleActiveTabChange}
             onDownload={onDownload && typeof onDownload === 'function' ? onDownload : undefined}
-            drawerTitle={t(viewConfig.createTitle || "")}
+            drawerTitle={t(viewConfig?.createTitle || "")}
         >
             {({onDrawerClose}) => (
                 <Create 
@@ -128,11 +120,11 @@ const TablePage = ({
                     formData={formConfig.formData}
                     formValue={formConfig.formValue}
                     form={formConfig.form}
-                    namespace={formConfig.namespace}
-                    view={formConfig.view}
-                    scope={formConfig.scope}
-                    formType={formConfig.formType}
-                    defaultData={formConfig.defaultValues}
+                    namespace={formInfo.namespace}
+                    view={formInfo.view}
+                    scope={formInfo.scope}
+                    formType={formInfo.formType}
+                    defaultData={defaultValues}
                 />
             )}
         </TablePageWithTabs>

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

@@ -48,12 +48,12 @@ class LinkedSubjectsService extends BaseService {
 		});
 	}
 
-    getOne({ id, signal, namespace, sourceId }) {
+    getOne({ id, signal, namespace, sourceId, source, version }) {
 		return this.apiGet({
 			url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
 			isApp: true,
 			signal,
-			params: { authorId: sourceId },
+			params: { authorId: sourceId, source, version },
 		});
 	}
 

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

@@ -45,11 +45,11 @@ class OperatorService extends BaseService {
 		});
 	}
 
-	getData(id, sourceId) {
+	getData(id, sourceId, source, version) {
 		return this.apiGet({
 			isApp: true,
 			url: `/stakeholder/${id}`,
-			params: { authorId: sourceId },
+			params: { authorId: sourceId, source, version },
 		});
 	}
 

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

@@ -0,0 +1,13 @@
+import { BaseService } from "./BaseService.js";
+import { createLazyService } from "./helpers/LazyService.js";
+
+class VersionService extends BaseService {
+  getSources({type,id, params}) {
+      return this.apiGet({
+          url: `/${type}/versions/${id}`,
+          params,
+      });
+  }
+}
+
+export default createLazyService(VersionService);