datastake-daf 0.6.743 → 0.6.744

package/dist/services/index.js

@@ -1342,12 +1342,12 @@ const getNamespace = namespace => {
 class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
-  }, language = "en") {
+  }, language = "en", scope) {
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,
       params: {
-        scope: "create",
+        scope: scope || "create",
         language
       }
     });

package/package.json

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

package/src/@daf/pages/dashboards/AllInformation/Documents/columns.js

@@ -6,14 +6,7 @@ import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
 
-const getLinkValue = (value, linkingObject) => {
-  if(linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
-
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -28,8 +21,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },
     {
-        dataIndex: 'title',
-        title: t('Title'),
+        dataIndex: 'name',
+        title: t('Name'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -41,8 +34,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },     
     {
-        dataIndex: 'type',
-        title: t('Type'),
+        dataIndex: 'category',
+        title: t('Category'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -50,12 +43,41 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const type = findOptions(v, data?.options?.locationCategories);
+          const category = findOptions(v, options?.categoriesOptions);
     
-          return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
+          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
         },
     },     
+    {
+        dataIndex: 'subCategory',
+        title: t('Sub Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const subCategory = findOptions(v, options?.subCategoriesOptions);
     
+          return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
+        },
+    }, 
+    {
+        dataIndex: 'country',
+        title: t('Country'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+        },
+    },     
     {
         title: t("Last Update"),
         dataIndex: "updatedAt",
@@ -80,6 +102,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             if (all.empty) {
                 return <div className="daf-default-cell" />;
             }
+            if (!val || val?.length === 0) {
+                return "--";
+            }
 
             const sources = sourceAvatarConfig(val, user, applications);
 

package/src/@daf/pages/dashboards/AllInformation/Documents/create.jsx

@@ -3,8 +3,8 @@ import { message } from 'antd';
 import { MessageTypes } from '../../../../../helpers/messages.js';
 import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
 
-const DocumentsCreate = ({
-    namespace = 'documents',
+const StakeholdersCreate = ({
+    namespace = 'stakeholders',
     view = 'scoping',
     edit = false,
     formData = {},
@@ -39,7 +39,7 @@ const DocumentsCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;
@@ -76,6 +76,7 @@ const DocumentsCreate = ({
                         ...payloadData,
                         form: 'document'
                     };
+
                 
                     const callback = (type, m, data) => {
                         if (setSelectedFormNext) {
@@ -101,4 +102,4 @@ const DocumentsCreate = ({
     )
 }
 
-export default DocumentsCreate
+export default StakeholdersCreate

package/src/@daf/pages/dashboards/AllInformation/Documents/index.jsx

@@ -3,7 +3,7 @@ import TablePageWithTabs from '../../../pages/TablePageWithTabs/index.jsx'
 import { getColumns } from './columns.js';
 import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
 import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
-import DocumentsCreate from './create.jsx';
+import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../../../helpers/messages.js';
 
 const DocumentsTable = ({
@@ -32,12 +32,11 @@ const DocumentsTable = ({
     formData = {},
     formValue = {},
     form = {},
-    extendingFilters = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
-
     const columns = useMemo(() => getColumns({
         t, 
         goTo, 
@@ -47,36 +46,21 @@ const DocumentsTable = ({
         getRedirectLink, 
         theme,
         subject: 'documents',
-        data,
         applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
     const breadCrumbs = [];
 
-    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
-
-    const filters = useMemo(() => {
-        return {
-            ...otherParams,
-            ...extendingFilters
-        }
-    }, [otherParams, extendingFilters])
+    const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
 
     useEffect(() => {
-        console.log("fetching data")
         getData({
             pagination: paginationQuery,
-            ...(Object.keys(filters).length > 0 && { filters: filters }),
+            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
             ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
             tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            }
         }, 'documents')
-        console.log("data fetched")
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
-
-    console.log({data})
+    }, [paginationQuery, otherParams, searchParams, activeTab]);
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});
@@ -93,10 +77,17 @@ const DocumentsTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}
-           title={t("documents")}
+           title={t("Documents")}
            breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
@@ -120,7 +111,7 @@ const DocumentsTable = ({
            drawerTitle={t("Create Document")}
         >
             {({onDrawerClose}) => (
-                <DocumentsCreate 
+                <StakeholdersCreate 
                     t={t}
                     goTo={goTo}
                     user={user}
@@ -136,8 +127,7 @@ const DocumentsTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            goTo(`/app/edit/documents/${data.datastakeId}`)
+                            goTo(`/app/edit/documents/${data.datastakeId}`);
                         }
                     }}
                     onCancel={onDrawerClose}

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

@@ -5,15 +5,136 @@ export const checkboxConfig = {
 
 export const getFiltersConfig = ({t}) => {
     return {
-        country: {
+
+        timeframe: {
+            type: "timeframe",
+            label: "Timeframe",
+            style: { flex: 1 },
+        },
+		country: {
+		  type: 'select',
+		  label: 'Country',
+		  placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+		administrativeLevel1: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel1 } = options;
+	  
+			if (administrativeLevel1) {
+			  if (options.country) {
+				const _item = administrativeLevel1[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_1',
+		  }),
+		  show: (data) => !data.country,
+		  disabled: (data) => !data.country,
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		administrativeLevel2: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel2 } = options;
+	  
+			if (administrativeLevel2) {
+			  if (options.country) {
+				const _item = administrativeLevel2[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  show: (data) => !(data.country && data.administrativeLevel1),
+		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_2',
+			administrativeLevel1: data.administrativeLevel1,
+		  }),
+		  disabled: (data) => !(data.country && data.administrativeLevel1),
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		subCategory: {
+		  type: 'select',
+		  label: 'Category',
+		  placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		  filterOptions: (val) => {
+			if (val) {
+			  const { option, filters } = val
+			  if (filters && option) {
+				const { filters: optionFilters } = option;
+				if (Array.isArray(optionFilters) && optionFilters.length) {
+				  const { value, condition } = optionFilters[0];
+				  if (condition === 'includes') {
+					return value.includes('corporation');
+				  }
+				}
+			  }
+			}
+			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,
+		},
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+		category:{
 			type: 'select',
-			placeholder: t('Country'),
+			label: 'Category',
+			placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
 			style: { flex: 1 },
 			labelStyle: { flex: 1 },
 			getLabel: (option) => option.label,
 			getValue: (option) => option.value,
-		},
-    }
+		}
+	}
 }
 
 export const filtersConfig = {
@@ -22,9 +143,40 @@ export const filtersConfig = {
 };
 
 export const getFilterOptions = (options, t) => {
-	const { countries } = options || {};
+	const {
+        timeframe = [],
+		statusOptions = [],
+		categoryOptions = [],
+		countries = [],
+		subCategory = [],
+		subCategoriesOptions,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		category=[],
+	  } = options || {};
+	console.log({options})
+
 	const _default  = {
-		country: countries,
+       timeframe: timeframe,
+	   country: countries,
+
+		category: stakeholderCategoryOptions || categoryOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		// subCategory: subCategoriesOptions,
+		category: category,
+		status: [
+			{
+				value: "submitted",
+				label: "Submitted",
+			},
+			{
+				value: "private",
+				label: "Private",
+			},
+		],
 	}
 
 	return _default;

package/src/@daf/pages/dashboards/AllInformation/Events/create.jsx

@@ -4,7 +4,7 @@ import { MessageTypes } from '../../../../../helpers/messages.js';
 import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
 
 const EventsCreate = ({
-    namespace = 'events',
+    namespace = 'event',
     view = 'scoping',
     edit = false,
     formData = {},
@@ -39,7 +39,7 @@ const EventsCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;

package/src/@daf/pages/dashboards/AllInformation/Events/index.jsx

@@ -34,6 +34,7 @@ const EventsTable = ({
     form = {},
     extendingFilters = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -93,6 +94,13 @@ const EventsTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}

package/src/@daf/pages/dashboards/AllInformation/Locations/create.jsx

@@ -39,7 +39,7 @@ const StakeholdersCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;

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

@@ -33,6 +33,7 @@ const LocationsTable = ({
     formValue = {},
     form = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -80,6 +81,13 @@ const LocationsTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}

package/src/@daf/pages/dashboards/AllInformation/Stakeholders/create.jsx

@@ -39,7 +39,7 @@ const StakeholdersCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;

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

@@ -33,6 +33,7 @@ const StakeholdersTable = ({
     formValue = {},
     form = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -76,6 +77,13 @@ const StakeholdersTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}
@@ -119,7 +127,7 @@ const StakeholdersTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            goTo(`/app/stakeholders`);
+                            goTo(`/app/edit/stakeholders/${data.datastakeId}`);
                         }
                     }}
                     onCancel={onDrawerClose}