datastake-daf 0.6.767 → 0.6.768

package/src/@daf/pages/Events/Activities/index.jsx

@@ -1,11 +1,6 @@
-import React, { useMemo, useState, useEffect, useCallback } from 'react'
-import TablePageWithTabs from '../../../core/components/Screens/TableScreen/TablePageWithTabs/index.jsx'
+import React from 'react'
 import { getColumns } from './columns.js';
-import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
-import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
-import StakeholdersCreate from './create.jsx';
-import { displayMessage } from '../../../../helpers/messages.js';
-import { useFetchData } from '../../hook.js';
+import TablePage from '../../TablePage/index.jsx';
 
 const ActivitiesTable = ({
     t = () => {},
@@ -38,105 +33,52 @@ const ActivitiesTable = ({
     applications = [],
     breadcrumbs = [],
 }) => {
-    const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState("own");
-
-    const columns = useMemo(() => getColumns({
-        t, 
-        goTo, 
-        user,
-        options,
-        activeTab,
-        getRedirectLink, 
-        theme,
-        subject: 'activities',
-        data,
-        applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
-
-    useFetchData({
-        location,
-        getData,
-        activeTab,
-        extendingFilters,
-        subject: 'activities',
-    })
-
-    const selectFiltersConfig = useMemo(() => {
-        return getFiltersConfig({t});
-    }, [t]);
-
-    useEffect(() => {
-        setSelectOptions((prev) => ({
-          ...prev,
-          ...getFilterOptions(options, t),
-        }))
-      }, [options, t])
-
-    const handleActiveTabChange = useCallback((value) => {
-        setActiveTab(value);
-    }, []);
-
     return (
-        <TablePageWithTabs 
-           t={t}
-           title={t("Activities")}
-           breadCrumbs={breadcrumbs}
-           location={location}
-           loading={loading}
-           goTo={goTo}
-           defaultActiveTab={"own"}
-           columns={columns}
-           data={data}
-           checkboxConfig={checkboxConfig}
-           APP={APP}
-           getApiBaseUrl={getApiBaseUrl}
-           selectOptions={selectOptions}
-           selectFiltersConfig={selectFiltersConfig}
-           getRedirectLink={getRedirectLink}
-           filtersConfig={filtersConfig}
-           isMobile={isMobile}
-           view="activities"
-           getActiveTab={handleActiveTabChange}
-           onDownload={() => {
-            console.log("download");
-           }}
-           drawerTitle={t("Create Activity")}
-        >
-            {({onDrawerClose}) => (
-                <StakeholdersCreate 
-                    defaultData={createDefaultValues}
-                    t={t}
-                    goTo={goTo}
-                    user={user}
-                    APP={APP}
-                    getApiBaseUrl={getApiBaseUrl}
-                    getAppHeader={getAppHeader}
-                    getData={getFormData}
-                    saveData={saveFormData}
-                    loading={formLoading}
-                    onSubmitted={(type, m, data) => {
-                        if (data.datastakeId) {
-                            displayMessage(
-                                type,
-                                t("affirmations::subject-created-successfully") || m,
-                            );
-                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            goTo(`/app/edit/activities/${data.datastakeId}`)
-                        }
-                    }}
-                    onCancel={onDrawerClose}
-                    query={query}
-                    ajaxForms={ajaxForms}
-                    changeAjaxForms={changeAjaxForms}
-                    ajaxOptions={ajaxOptions}
-                    changeAjaxOptions={changeAjaxOptions}
-                    formData={formData}
-                    formValue={formValue}
-                    form={form}
-                />
-            )}
-        </TablePageWithTabs>
+        <TablePage 
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}
+            location={location}
+            applications={applications}
+
+            subject="activities"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            getColumns={getColumns}
+            viewConfig={{
+                title: "Activities",
+                breadcrumbs: breadcrumbs,
+                createTitle: "Create Activity",
+            }}
+            extendingFilters={extendingFilters}
+            formConfig={{
+                getFormData,
+                saveFormData,
+                formLoading,
+                query,
+                ajaxForms,
+                changeAjaxForms,
+                ajaxOptions,
+                changeAjaxOptions,
+                formData,
+                formValue,
+                form,
+                namespace: "corrective-actions",
+                view: 'corrective-actions',
+                scope: 'createActivity',
+                formType: 'activity',
+                defaultValues: createDefaultValues,
+            }}
+            onDownload={() => console.log("download")}
+        />
     )
 }
 

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

@@ -1,8 +1,3 @@
-export const checkboxConfig = {
-	name: 'Name',
-	datastakeId: 'ID'
-}
-
 export const getFiltersConfig = ({t}) => {
     return {
 
@@ -129,11 +124,6 @@ timeframe: {
 	}
 }
 
-export const filtersConfig = {
-	name: '',
-	datastakeId: '',
-};
-
 export const getFilterOptions = (options, t) => {
 	const {
 		timeframe = [],
@@ -166,7 +156,7 @@ export const getFilterOptions = (options, t) => {
 		category: stakeholderCategoryOptions || categoryOptions,
 		country: countries,
 		subCategory: subCategoriesOptions,
-		category: category,
+		// category: category,
 		administrativeLevel1,
 		administrativeLevel2,
 		positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,

package/src/@daf/pages/Events/Incidents/index.jsx

@@ -1,11 +1,6 @@
-import React, { useMemo, useState, useEffect, useCallback } from 'react'
-import TablePageWithTabs from '../../../core/components/Screens/TableScreen/TablePageWithTabs/index.jsx'
+import React from 'react'
 import { getColumns } from './columns.js';
-import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
-import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
-import StakeholdersCreate from './create.jsx';
-import { displayMessage } from '../../../../helpers/messages.js';
-import { useFetchData } from '../../hook.js';
+import TablePage from '../../TablePage/index.jsx';
 
 const IncidentsTable = ({
     t = () => {},
@@ -38,105 +33,52 @@ const IncidentsTable = ({
     applications = [],
     breadcrumbs = [],
 }) => {
-    const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState("own");
-
-    const columns = useMemo(() => getColumns({
-        t, 
-        goTo, 
-        user,
-        options,
-        activeTab,
-        getRedirectLink, 
-        theme,
-        subject: 'incidents',
-        data,
-        applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
-
-    useFetchData({
-        location,
-        getData,
-        activeTab,
-        extendingFilters,
-        subject: 'incidents',
-    })
-
-    const selectFiltersConfig = useMemo(() => {
-        return getFiltersConfig({t});
-    }, [t]);
-
-    useEffect(() => {
-        setSelectOptions((prev) => ({
-          ...prev,
-          ...getFilterOptions(options, t),
-        }))
-      }, [options, t])
-
-    const handleActiveTabChange = useCallback((value) => {
-        setActiveTab(value);
-    }, []);
-
     return (
-        <TablePageWithTabs 
-           t={t}
-           title={t("Incidents")}
-           breadCrumbs={breadcrumbs}
-           location={location}
-           loading={loading}
-           goTo={goTo}
-           defaultActiveTab={"own"}
-           columns={columns}
-           data={data}
-           checkboxConfig={checkboxConfig}
-           APP={APP}
-           getApiBaseUrl={getApiBaseUrl}
-           selectOptions={selectOptions}
-           selectFiltersConfig={selectFiltersConfig}
-           getRedirectLink={getRedirectLink}
-           filtersConfig={filtersConfig}
-           isMobile={isMobile}
-           view="incidents"
-           getActiveTab={handleActiveTabChange}
-           onDownload={() => {
-            console.log("download");
-           }}
-           drawerTitle={t("Create Incidents")}
-        >
-            {({onDrawerClose}) => (
-                <StakeholdersCreate 
-                    defaultData={createDefaultValues}
-                    t={t}
-                    goTo={goTo}
-                    user={user}
-                    APP={APP}
-                    getApiBaseUrl={getApiBaseUrl}
-                    getAppHeader={getAppHeader}
-                    getData={getFormData}
-                    saveData={saveFormData}
-                    loading={formLoading}
-                    onSubmitted={(type, m, data) => {
-                        if (data.datastakeId) {
-                            displayMessage(
-                                type,
-                                t("affirmations::subject-created-successfully") || m,
-                            );
-                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            goTo(`/app/edit/incidents/${data.datastakeId}`)
-                        }
-                    }}
-                    onCancel={onDrawerClose}
-                    query={query}
-                    ajaxForms={ajaxForms}
-                    changeAjaxForms={changeAjaxForms}
-                    ajaxOptions={ajaxOptions}
-                    changeAjaxOptions={changeAjaxOptions}
-                    formData={formData}
-                    formValue={formValue}
-                    form={form}
-                />
-            )}
-        </TablePageWithTabs>
+        <TablePage 
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}
+            location={location}
+            applications={applications}
+
+            subject="incidents"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            getColumns={getColumns}
+            viewConfig={{
+                title: "Incidents",
+                breadcrumbs: breadcrumbs,
+                createTitle: "Create Incident",
+            }}
+            extendingFilters={extendingFilters}
+            formConfig={{
+                getFormData,
+                saveFormData,
+                formLoading,
+                query,
+                ajaxForms,
+                changeAjaxForms,
+                ajaxOptions,
+                changeAjaxOptions,
+                formData,
+                formValue,
+                form,
+                namespace: "incident",
+                view: 'incident',
+                scope: 'createIncident',
+                formType: 'incident',
+                defaultValues: createDefaultValues,
+            }}
+            onDownload={() => console.log("download")}
+        />
     )
 }
 

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

@@ -1,8 +1,3 @@
-export const checkboxConfig = {
-	name: 'Name',
-	datastakeId: 'ID'
-}
-
 export const getFiltersConfig = ({t}) => {
     return {
 
@@ -107,14 +102,14 @@ 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,
+		category:{
+			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,
 		},
 		status: {
 		  type: "select",
@@ -125,50 +120,39 @@ export const getFiltersConfig = ({t}) => {
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
 		},
-		category:{
-			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,
-		}
 	}
 }
 
-export const filtersConfig = {
-	name: '',
-	datastakeId: '',
-};
-
 export const getFilterOptions = (options, t) => {
 	const {
         timeframe = [],
 		status = [],
 		categoryOptions = [],
 		countries = [],
-
 		category=[],
+		eventCategoryOptions = [],
 	  } = options || {};
 
-	const _default  = {
+	const catOptions = eventCategoryOptions?.map((item) => ({
+		value: item.value,
+		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
+	}))
+
+	return {
        timeframe: timeframe,
 	   country: countries,
-	   category: category,
-
+	   category: catOptions,
 	   status: [
 		{
 			value: "submitted",
-			label: "Submitted",
+			label: t("Submitted"),
 		},
 		{
 			value: "private",
-			label: "Private",
+			label: t("Private"),
 		},
 	],
 		
 	}
 
-	return _default;
 }

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

@@ -1,11 +1,6 @@
-import React, { useMemo, useState, useEffect, useCallback } from 'react'
-import TablePageWithTabs from '../../core/components/Screens/TableScreen/TablePageWithTabs/index.jsx'
+import React from 'react'
 import { getColumns } from './columns.js';
-import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
-import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
-import EventsCreate from './create.jsx';
-import { displayMessage } from '../../../helpers/messages.js';
-import { useFetchData } from '../hook.js';
+import TablePage from '../TablePage/index.jsx';
 
 const EventsTable = ({
     t = () => {},
@@ -37,112 +32,55 @@ const EventsTable = ({
     applications = [],
     subjectClear = () => {},
     breadcrumbs = [],
+    createDefaultValues = {},
 }) => {
-    const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState("own");
-
-    const columns = useMemo(() => getColumns({
-        t, 
-        goTo, 
-        user,
-        options,
-        activeTab,
-        getRedirectLink, 
-        theme,
-        subject: 'events',
-        data,
-        applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
-
-    useFetchData({
-        location,
-        getData,
-        activeTab,
-        extendingFilters,
-        subject: 'events',
-    })
-
-    const selectFiltersConfig = useMemo(() => {
-        return getFiltersConfig({t});
-    }, [t]);
-
-    useEffect(() => {
-        setSelectOptions((prev) => ({
-          ...prev,
-          ...getFilterOptions(options, t),
-        }))
-      }, [options, t])
-
-    const handleActiveTabChange = useCallback((value) => {
-        setActiveTab(value);
-    }, []);
-
-    useEffect(
-		() => () => {
-			subjectClear();
-		},
-		[],
-	);
-
     return (
-        <TablePageWithTabs 
-           t={t}
-           title={t("Events")}
-           breadCrumbs={breadcrumbs}
-           location={location}
-           loading={loading}
-           goTo={goTo}
-           defaultActiveTab={"own"}
-           columns={columns}
-           data={data}
-           checkboxConfig={checkboxConfig}
-           APP={APP}
-           getApiBaseUrl={getApiBaseUrl}
-           selectOptions={selectOptions}
-           selectFiltersConfig={selectFiltersConfig}
-           getRedirectLink={getRedirectLink}
-           filtersConfig={filtersConfig}
-           isMobile={isMobile}
-           view="events"
-           getActiveTab={handleActiveTabChange}
-           onDownload={() => {
-            console.log("download");
-           }}
-           drawerTitle={t("Create Events")}
-        >
-            {({onDrawerClose}) => (
-                <EventsCreate 
-                    t={t}
-                    goTo={goTo}
-                    user={user}
-                    APP={APP}
-                    getApiBaseUrl={getApiBaseUrl}
-                    getAppHeader={getAppHeader}
-                    getData={getFormData}
-                    saveData={saveFormData}
-                    loading={formLoading}
-                    onSubmitted={(type, m, data) => {
-                        if (data.datastakeId) {
-                            displayMessage(
-                                type,
-                                t("affirmations::subject-created-successfully") || m,
-                            );
-                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            goTo(`/app/edit/events/${data.datastakeId}`)
-                        }
-                    }}
-                    onCancel={onDrawerClose}
-                    query={query}
-                    ajaxForms={ajaxForms}
-                    changeAjaxForms={changeAjaxForms}
-                    ajaxOptions={ajaxOptions}
-                    changeAjaxOptions={changeAjaxOptions}
-                    formData={formData}
-                    formValue={formValue}
-                    form={form}
-                />
-            )}
-        </TablePageWithTabs>
+        <TablePage 
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}
+            location={location}
+            applications={applications}
+
+            subject="events"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            subjectClear={subjectClear}
+            getColumns={getColumns}
+            viewConfig={{
+                title: "Events",
+                breadcrumbs: breadcrumbs,
+                createTitle: "Create Event",
+            }}
+            extendingFilters={extendingFilters}
+            formConfig={{
+                getFormData,
+                saveFormData,
+                formLoading,
+                query,
+                ajaxForms,
+                changeAjaxForms,
+                ajaxOptions,
+                changeAjaxOptions,
+                formData,
+                formValue,
+                form,
+                namespace: "event",
+                view: 'scoping',
+                scope: 'create',
+                formType: 'event',
+                defaultValues: createDefaultValues,
+            }}
+            onDownload={() => console.log("download")}
+        />
     )
 }
 

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

@@ -1,8 +1,3 @@
-export const checkboxConfig = {
-	name: 'Name',
-	datastakeId: 'ID'
-}
-
 export const getFiltersConfig = ({t}) => {
     return {
 		country: {
@@ -122,11 +117,6 @@ export const getFiltersConfig = ({t}) => {
 	}
 }
 
-export const filtersConfig = {
-	name: '',
-	datastakeId: '',
-};
-
 export const getFilterOptions = (options, t) => {
 	const {
 		statusOptions = [],