datastake-daf 0.6.767 → 0.6.769

package/src/@daf/core/components/Dashboard/Widget/StatCard/style.js

@@ -0,0 +1,83 @@
+import styled from 'styled-components';
+
+const Style = styled.div`
+    background: #ffffff;
+    border-radius: 8px;
+    border: 1px solid #E5E7EB;
+    padding: var(--size-lg);
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    height: 100%;
+    min-height: 120px;
+    width: 100%;
+    min-width: 300px;
+
+    .stat-card-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        margin-bottom: auto;
+    }
+
+    .stat-card-title {
+        font-size: 14px;
+        font-weight: 500;
+        color: #6C737F;
+        line-height: 100%;
+        letter-spacing: 0%;
+        margin: 0;
+    }
+
+    .stat-card-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #6C737F;
+    }
+
+    .stat-card-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-end;
+        margin-top: auto;
+    }
+
+    .stat-card-value {
+        font-size: 32px;
+        font-weight: 600;
+        color: #384250;
+        margin: 0;
+        line-height: 1.2;
+        letter-spacing: 0%;
+    }
+
+    .stat-card-change {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        padding: 1px 8px;
+        border-radius: 4px;
+        border: 1px solid ${props => props.changeBorderColor || '#A7F3D0'};
+        background-color: ${props => props.changeColor || '#ECFDF3'};
+        
+        .change-icon {
+            display: flex;
+            align-items: center;
+            gap: 2px;
+            color: ${props => props.changeTextColor || '#52C41A'};
+        }
+
+        .change-value {
+            font-size: 12px;
+            font-weight: 500;
+            line-height: 18px;
+            letter-spacing: 0%;
+            color: ${props => props.changeTextColor || '#52C41A'};
+            margin: 0;
+        }
+    }
+`;
+
+export default Style;
+

package/src/@daf/core/components/Icon/configs/Down.js

@@ -0,0 +1,8 @@
+const config = {
+    viewBox: '0 0 11 10',
+    children: (
+        <path d="M7.75 0.75V6.25M7.75 6.25L5.75 4.25M7.75 6.25L9.75 4.25M2.75 0.75V8.75M2.75 8.75L0.75 6.75M2.75 8.75L4.75 6.75" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
+    ),
+}
+
+export default config;

package/src/@daf/core/components/Icon/configs/Up.js

@@ -0,0 +1,8 @@
+const config = {
+    viewBox: '0 0 11 10',
+    children: (
+        <path d="M2.75 8.75V0.75M2.75 0.75L0.75 2.75M2.75 0.75L4.75 2.75M7.75 8.75V3.25M7.75 3.25L5.75 5.25M7.75 3.25L9.75 5.25" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
+    ),
+}
+
+export default config;

package/src/@daf/core/components/Icon/configs/index.js

@@ -226,6 +226,8 @@ import ClockPlus from "./ClockPlus";
 import WaziDarkIcon from "./WaziDarkIcon";	
 import SpacingHeight from "./SpacingHeight";
 import SpacingWidth from "./SpacingWidth";
+import Up from "./Up";
+import Down from "./Down";
 
 const config = {
 	AppAdmin,
@@ -456,6 +458,8 @@ const config = {
 	WaziDarkIcon,
 	SpacingHeight,
 	SpacingWidth,
+	Up,
+	Down,
 };
 
 export default config;

package/src/@daf/core/components/Icon/configs/partnerIcon.js

@@ -1,7 +1,7 @@
 const config = {
 	viewBox: "0 0 18 14",
 	children: (
-        <path d="M5.08333 2.53462H0.75V8.75H1.50141C2.09639 8.75 2.67622 8.93763 3.15841 9.2862L7.44192 12.3827C7.74723 12.6034 8.15773 12.6105 8.47051 12.4006C8.95317 12.0765 9.00645 11.3867 8.5793 10.9924L6.81667 9.36538L9.68494 11.9601C9.95925 12.2082 10.366 12.2412 10.6767 12.0404C11.0996 11.7672 11.1772 11.1801 10.8398 10.8064L9.15 8.93462L11.4946 11.4923C11.828 11.8561 12.3838 11.9055 12.7762 11.6063C13.2258 11.2635 13.2802 10.607 12.8932 10.1948L11.0167 8.19615L13.3903 10.686C13.711 11.0223 14.2308 11.0702 14.6075 10.7981C15.0685 10.4651 15.1251 9.79991 14.727 9.39379L14.2167 8.87308M16.75 8.57952V2.79983M16.75 8.57952C16.75 8.57952 16.75 5.25112 16.75 2.79983M16.75 8.57952C16.75 8.72136 16.662 8.85066 16.5235 8.91219L15.2216 9.49081C15.0608 9.56228 14.8682 9.52676 14.7494 9.40375L8.66241 3.09692C8.52364 2.95315 8.28848 2.93195 8.1222 3.04823L7.31667 3.61154C6.63455 4.08854 5.73081 4.19895 4.93775 3.90217L4.14065 3.60388C3.96864 3.53951 3.93837 3.32657 4.08656 3.22341L6.64053 1.44562C7.4038 0.914316 8.33376 0.75 9.28973 0.75H9.89529C10.373 0.75 10.8476 0.821816 11.3003 0.962629L16.4777 2.44993C16.6404 2.50054 16.75 2.64134 16.75 2.79983" stroke="#722ED1" strokeWidth="1.5" strokeLinejoin="round"/>
+        <path d="M5.08333 2.53462H0.75V8.75H1.50141C2.09639 8.75 2.67622 8.93763 3.15841 9.2862L7.44192 12.3827C7.74723 12.6034 8.15773 12.6105 8.47051 12.4006C8.95317 12.0765 9.00645 11.3867 8.5793 10.9924L6.81667 9.36538L9.68494 11.9601C9.95925 12.2082 10.366 12.2412 10.6767 12.0404C11.0996 11.7672 11.1772 11.1801 10.8398 10.8064L9.15 8.93462L11.4946 11.4923C11.828 11.8561 12.3838 11.9055 12.7762 11.6063C13.2258 11.2635 13.2802 10.607 12.8932 10.1948L11.0167 8.19615L13.3903 10.686C13.711 11.0223 14.2308 11.0702 14.6075 10.7981C15.0685 10.4651 15.1251 9.79991 14.727 9.39379L14.2167 8.87308M16.75 8.57952V2.79983M16.75 8.57952C16.75 8.57952 16.75 5.25112 16.75 2.79983M16.75 8.57952C16.75 8.72136 16.662 8.85066 16.5235 8.91219L15.2216 9.49081C15.0608 9.56228 14.8682 9.52676 14.7494 9.40375L8.66241 3.09692C8.52364 2.95315 8.28848 2.93195 8.1222 3.04823L7.31667 3.61154C6.63455 4.08854 5.73081 4.19895 4.93775 3.90217L4.14065 3.60388C3.96864 3.53951 3.93837 3.32657 4.08656 3.22341L6.64053 1.44562C7.4038 0.914316 8.33376 0.75 9.28973 0.75H9.89529C10.373 0.75 10.8476 0.821816 11.3003 0.962629L16.4777 2.44993C16.6404 2.50054 16.75 2.64134 16.75 2.79983" stroke="currentColor" strokeWidth="1.5" strokeLinejoin="round"/>
 	),
 };
 

package/src/@daf/core/components/Screens/BaseScreen/index.jsx

@@ -134,7 +134,7 @@ const BaseScreen = ({
 				<div className="daf-table-wrapper pagination-w-padding">
 					<DAFTable
 						columns={columns}
-						data={data?.data}
+						data={Array.isArray(data?.data) ? data?.data : data?.data?.data}
 						loading={loading}
 						hideOnLoading={false}
 						pagination={pagination}

package/src/@daf/core/components/Screens/TableScreen/TablePageWithTabs/index.jsx

@@ -90,7 +90,7 @@ const TablePageWithTabs = ({
                 checkboxConfig={checkboxConfig}
                 defaultTableFilters={{}}
                 columns={columns}
-                data={data}
+                data={data?.data}
                 loading={loading}
                 location={location}
                 goTo={goTo}

package/src/@daf/core/components/Sidenav/Menu.jsx

@@ -468,9 +468,9 @@ export default function SidenavMenu({
                           className={formatClassname([
                             typeof selectedKeys[0] === "string"
                               ? !!(
-                                selectedKeys[0].includes(subitem.path) ||
+                                matchPath({ path: subitem.path, exact: true }, selectedKeys[0]) ||
                                 (subitem.subPath || []).find((p) =>
-                                  matchPath(p, selectedKeys[0])
+                                  matchPath({ path: p, exact: true }, selectedKeys[0])
                                 )
                               ) && "selected-label"
                               : "",
@@ -494,9 +494,9 @@ export default function SidenavMenu({
                       className: formatClassname([
                         typeof selectedKeys[0] === "string"
                           ? !!(
-                            selectedKeys[0].includes(subitem.path) ||
+                            matchPath({ path: subitem.path, exact: true }, selectedKeys[0]) ||
                             (subitem.subPath || []).find((p) =>
-                              matchPath(p, selectedKeys[0])
+                              matchPath({ path: p, exact: true }, selectedKeys[0])
                             )
                           ) && "selected-it"
                           : "",

package/src/@daf/core/components/UI/MissingTagButton/index.jsx

@@ -0,0 +1,36 @@
+import React from 'react'
+import { Tag, Tooltip } from 'antd'
+import { formatClassname } from '../../../../../helpers/ClassesHelper.js'
+
+function MissingTagButton({
+    hasMissing,
+    setHighlightMandatory,
+    highlightMandatory,
+    t,
+}) {
+  return (
+    <>
+        {hasMissing ? (
+            <Tag
+                onClick={() => setHighlightMandatory(!highlightMandatory)}
+                className={formatClassname(['ml-2 highlight-tag', highlightMandatory && 'highlighted'])}
+                style={{textAlign: "center"}}
+            >
+                {t('missing-inputs')}
+            </Tag>
+        ) : (
+            <Tooltip title={t('all-inputs-fullfilled')}>
+                <Tag
+                    onClick={() => setHighlightMandatory(!highlightMandatory)}
+                    className={formatClassname(['ml-2 highlight-tag disabled'])}
+                    style={{textAlign: "center"}}
+                >
+                    {t('missing-inputs')}
+                </Tag>
+            </Tooltip>
+        )}
+    </>
+  )
+}
+
+export default MissingTagButton;

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

@@ -24,8 +24,6 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 
     const { loading, data } = useWidgetFetch({config: defaultConfig});
 
-	console.log('data', data);
-
     return (
         <Widget
             title={t("Supply Chain Map")}

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

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

package/src/@daf/pages/Documents/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 DocumentsTable = ({
     t = () => {},
@@ -37,109 +32,57 @@ const DocumentsTable = ({
     subjectClear = () => {},
     breadcrumbs = [],
     extendingFilters = {},
+    createDefaultValues = {},
 }) => {
-    const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState("own");
-    const columns = useMemo(() => getColumns({
-        t, 
-        goTo, 
-        user,
-        options,
-        activeTab,
-        getRedirectLink, 
-        theme,
-        subject: 'documents',
-        applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
-
-    useFetchData({
-        location,
-        getData,
-        activeTab,
-        extendingFilters,
-        subject: 'documents',
-    })
-
-    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("Documents")}
-           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="documents"
-           getActiveTab={handleActiveTabChange}
-           onDownload={() => {
-            console.log("download");
-           }}
-           drawerTitle={t("Create Document")}
-        >
-            {({onDrawerClose}) => (
-                <StakeholdersCreate 
-                    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/documents/${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="documents"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            subjectClear={subjectClear}
+            getColumns={getColumns}
+            
+            viewConfig={{
+                title: "Documents",
+                breadcrumbs: breadcrumbs,
+                createTitle: "Create Document",
+            }}
+                        
+            formConfig={{
+                getFormData,
+                saveFormData,
+                formLoading,
+                query,
+                ajaxForms,
+                changeAjaxForms,
+                ajaxOptions,
+                changeAjaxOptions,
+                formData,
+                formValue,
+                form,
+                namespace: 'document',
+                view: 'scoping',
+                scope: 'create',
+                formType: 'document',
+                defaultValues: createDefaultValues,
+            }}
+            
+            onDownload={() => console.log("download")}
+        />
     )
 }
 

package/src/@daf/pages/Events/Activities/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/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,