datastake-daf 0.6.786 → 0.6.787

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/columns.js

@@ -104,48 +104,48 @@ export const getColumns = ({
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},
 		},
-		{
-			title: t("Province"),
-			dataIndex: "administrativeLevel1",
-			key: "administrativeLevel1",
-			ellipsis: true,
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
+	{
+		title: t("Admin Level 1"),
+		dataIndex: "administrativeLevel1",
+		key: "administrativeLevel1",
+		ellipsis: true,
+		show: entity.includes("location"),
+		render: (value, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
 
-				let label;
-				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
-				}
+			let label;
+			if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+				label = all?.linking?.SCL?.[value]?.name
+			} else {
+				label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
+			}
 
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
+			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 		},
-		{
-			title: t("Territory"),
-			dataIndex: "administrativeLevel2",
-			key: "administrativeLevel2",
-			show: entity.includes("locations"),
-			ellipsis: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
+	},
+	{
+		title: t("Admin Level 2"),
+		dataIndex: "administrativeLevel2",
+		key: "administrativeLevel2",
+		show: entity.includes("location"),
+		ellipsis: true,
+		render: (value, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
 
-				let label;
-				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
-					label = all?.linking?.SCL?.[value]?.name
-				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
-				}
+			let label;
+			if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
+				label = all?.linking?.SCL?.[value]?.name
+			} else {
+				label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
+			}
 
-				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
-			},
+			return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 		},
+	},
 		{
 			title: t("Sources"),
 			dataIndex: "sources",

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx

@@ -2,7 +2,7 @@ import { useState, useMemo } from "react";
 import { useAdminTable } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag } from "antd";
+import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
 	getTabs,
@@ -67,7 +67,7 @@ export default function SubjectsTable({
 		return {
 			category: config.options?.category,
 			country: config.options?.countries,
-			sources: [], //TODO: add sources logic and make sure you only show unique sources only once
+			sources: [],
 		};
 	}, [config.options]);
 
@@ -113,25 +113,15 @@ export default function SubjectsTable({
 				breadcrumbs={breadcrumbs}
 			>
 				{selectedSubjects.length > 0 && (
-					<div
-						className="flex flex-row  ml-6 mt-5"
-						style={{
-							flexWrap: "wrap",
-							gap: "8px",
-						}}
-					>
+					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
 						{selectedSubjects.map((account) => (
 							<Tag
 								key={account.userId}
 								className="flex flex-row gap-2 items-center"
 								onClick={() =>
-									setSelectedSubjects((prev) =>
-										prev.filter((a) => a.datastakeId !== account.datastakeId),
-									)
+									setSelectedSubjects((prev) => prev.filter((a) => a.datastakeId !== account.datastakeId))
 								}
-								style={{
-									cursor: "pointer",
-								}}
+								style={{ cursor: "pointer" }}
 							>
 								<span>{account.datastakeId}</span>
 								<CustomIcon name="Close" size={10} />
@@ -160,19 +150,20 @@ export default function SubjectsTable({
 			<CombineSubjectsModal
 				isOpen={isCombineModalOpen}
 				t={t}
-				onClose={() => {
-					setIsModalOpen(false);
-				}}
+				onClose={() => setIsModalOpen(false)}
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
+					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data);
-						setSelectedSubjects([])
+						mergeSubjectsFunction(data).finally(() => {
+							setSelectedSubjects([]);
+							fetchData();
+						});
 					}
 				}}
 				selectedSubjects={selectedSubjects}
-				selectOptions={selectOptions || {}}
+				selectOptions={selectOptions}
 				module={module}
 				entity={headerTitle}
 			/>

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/helper.js

@@ -167,10 +167,7 @@ export const getColumns = ({
 	return cols.filter((v) => v.show);
 };
 
-export const checkboxConfig = {
-	name: "Name",
-	datastakeId: "ID",
-};
+export const checkboxConfig = {};
 
 export const selectFiltersConfig = {
 	userRole: {
@@ -194,9 +191,17 @@ export const selectFiltersConfig = {
 };
 
 export const filtersConfig = {
-	name: "",
-	datastakeId: "",
+	search: "",
+};
+
+export const defaultUrlParams = {
+	search: "",
+	userRole: null,
+	status: null,
 };
 
-export const defaultUrlParams = {};
-export const defaultTableFilters = {};
+export const defaultTableFilters = {
+	search: "",
+	userRole: null,
+	status: null,
+};

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/index.jsx

@@ -60,10 +60,10 @@ export default function Users({
 			userRole: userRoles.filter((u) => !u.isForAppAdmin),
 			status: accountStatuses,
 		};
-	}, [userRoles]);
+	}, [userRoles, accountStatuses]);
 
 	const canClearSearch = useMemo(() => {
-		return !!activeFilters.search;
+		return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
 	}, [activeFilters]);
 
 	const onDeleteUserClick = useCallback(

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -104,7 +104,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminLocationConfig === "function"
       ? [
           {
-            path: "subjects/location",
+            path: "management/subjects/location",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -115,7 +115,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminSubjectsConfig === "function"
       ? [
           {
-            path: "subjects/stakeholder",
+            path: "management/subjects/stakeholder",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
             exact: true,
             visible: (user) => userIsAdmin(user),

package/src/@daf/pages/SelfAssesment/components/AssociatedInformationTable/columns.js

@@ -0,0 +1,180 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions, getLinkValue } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import MoreOptions from '../../../core/components/Table/MoreOptions/index.jsx';
+import { renderStatusTag } from '../../../utils/tags.js';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },    
+    {
+        dataIndex: 'category',
+        title: t('Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const category = findOptions(v, options?.locationCategories);
+    
+          return <Tooltip title={category}>{category}</Tooltip>;
+        },
+    },  
+    {
+        dataIndex: 'lealForm',
+        title: t('Legal Form'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const legalForm = findOptions(v, options?.legalFormOptions);
+
+          return legalForm ? <Tooltip title={legalForm}>{legalForm}</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?.countryOptions);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+        },
+    },     
+  
+    // {
+    //     dataIndex: 'operator',
+    //     title: t('Operator'),
+    //     ellipsis: true,
+    //     show: true,
+    //     render: (v, all) => {
+    //       if (all.empty) {
+    //         return <div className="daf-default-cell" />
+    //       }
+
+    //       const operators = all?.operator?.map((operator) => operator?.locationClient?.name)?.filter(Boolean);
+    //       return (operators && operators.length > 0) ? <MoreOptions data={operators || []} toolTipPlacement={operators?.length < 2 ? "topLeft" : "top"} /> : '-';
+    //     },
+    // },   
+    {
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
+    // {
+    //     title: t("Status"),
+    //     dataIndex: 'status',
+    //     ellipsis: true,
+    //     show: activeTab == "own",
+    //     render: (v, all) => {
+    //       if (all.empty) {
+    //         return <div className="daf-default-cell" />
+    //       }
+    //       const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+    //       return renderStatusTag({ value: _val, t });
+    //     },
+    // },
+    
+    //   {
+    //     title: t("Sources"),
+    //     dataIndex: 'sources',
+    //     ellipsis: true,
+    //     show: activeTab !== "own",
+    //     render: (v, all) => {
+    //       if (all.empty) {
+    //         return <div className="daf-default-cell" />
+    //       }
+    //       const sources = sourceAvatarConfig(v, user, applications);
+    //       return <AvatarGroup items={sources}></AvatarGroup>;
+    //     },
+    //   },
+      {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+          const onClick = () => {
+            let link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+          const moreMenuItems = [
+            {
+              label: t("Details"),
+              value: "details",
+              onClick: onClick,
+            },
+            {
+              label: t("Summary"),
+              value: "Summary",
+              onClick: () => {
+                let link = `/app/mine-summary/${all.datastakeId}`
+                if (activeTab === "shared") {
+                  link += `?sourceId=${all?.authorId?.id}`;
+                }
+                goTo(getRedirectLink(link));
+              },
+              // disabled: true,
+            },
+          ];
+          return <div >
+               <MoreMenu items={moreMenuItems} />
+          </div>;
+        }
+      }
+].filter((column) => column.show !== false);

package/src/@daf/pages/SelfAssesment/components/AssociatedInformationTable/index.jsx

@@ -0,0 +1,27 @@
+import React, { useState, useEffect, useRef } from 'react'
+import TabsHeader from '../../../../core/components/Header/TabsHeader'
+import {Widget} from '../../../../core/components/Dashboard/Widget'
+import {getColumns} from './columns.js'
+import {useParams} from 'react-router-dom'
+import {DAFTable} from '../../../../core/components/Table'
+import {useIsDatastake} from '../../../../hooks/useIsDatastake.js'
+
+const AssociatedInformationTable = () => {
+    const tabs =[
+        {value:"stakeholders", label:"Stakeholders"},
+        {value:"locations", label:"Locations"},
+        {values:"events", label:"Events"},
+        {values:"DOcuments",label:"Documents"},
+    ]
+    const [activeTab, setActiveTab] = useState("stakeholders");
+    const [data,setData]= useState({
+        stakeholders:[],
+        locations:[],
+        events:[],
+        documents:[],
+    })
+    const [_options, _setOptions] = useState({});
+	const params = useParams();
+	const { user } = useSelector((state) => state.authentication);
+	const { getRedirectLink } = useIsDatastake();
+}

package/src/@daf/pages/SelfAssesment/components/OrgInformationTable/columns.js

@@ -0,0 +1,157 @@
+import {  Tooltip } from "antd";
+import CustomIcon from "../../../../core/components/Icon/CustomIcon.jsx";
+// import  {findOptions} from "../../../../helpers/StringHelper.js";
+import ProgressBar from "../../../../core/components/ProgressBar/index.jsx";
+import ProgressBarSideIcon from "../../../../core/components/ProgressBar/components/SideIcon/index.jsx";
+import { Link } from "react-router-dom";
+import { renderDateFormatted } from "../../../../../helpers/Forms.js";
+
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+	token,
+	selectedSubjects,
+	setSelectedSubjects,
+	selectOptions,
+	entity,
+}) => {
+const cols = [
+    {
+        dataIndex: "formName",
+        title: t("form"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const title = all?.published
+                ? t("general-information")
+                : t("registration");
+
+            return <Tooltip title={title}>{title}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "completion",
+        title: t("completion"),
+        ellipsis: true,
+        show: !isMonitoring,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const submittedStages = ["evaluation", "planning", "improvement"];
+
+            const step1Stage = data?.stepStages?.["step-1"];
+            const step2Stage = data?.stepStages?.["step-2"];
+            const isSubmitted =
+                data?.published &&
+                submittedStages.includes(step1Stage) &&
+                submittedStages.includes(step2Stage);
+
+            return (
+                <div style={{ display: "flex", alignItems: "center", gap: "5px" }}>
+                    <ProgressBar
+                        tooltipTitle={isSubmitted && t("Submitted")}
+                        style={{ width: "100%" }}
+                        percentage={v || 0}
+                        isSubmitted={isSubmitted}
+                    ></ProgressBar>
+                    {isSubmitted ? (
+                        <ProgressBarSideIcon size={16} iconSize={10} />
+                    ) : (
+                        <span>{v || 0}%</span>
+                    )}
+                </div>
+            );
+        },
+    },
+    {
+        dataIndex: "monitoring",
+        title: t("Monitoring"),
+        ellipsis: true,
+        show: isMonitoring,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            return <Tooltip title={v || 0}>{v || 0}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "lastUpdate",
+        title: t("Last Update"),
+        ellipsis: true,
+        show: true,
+        render: (_v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const v = _v
+                ? renderDateFormatted(_v, "DD MMM YYYY", user?.language || "en")
+                : "-";
+
+            return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "action",
+        title: "",
+        width: 60,
+        show: true,
+        render: (_, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            let link = `/app/mines/${all.datastakeId}/${all?.key?.toLowerCase()}`;
+
+            if (all?.key.includes("monitoring")) {
+                return (
+                    <Link to={getRedirectLink(link)}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </Link>
+                );
+            }
+
+            if (all?.key.includes("identification")) {
+                link = `/app/view/location/${all.datastakeId}`;
+            }
+
+            const stage = data?.stage;
+            const key = all?.key;
+            let isDisabled = false;
+
+            if (
+                (stage === "evaluation" && (key === "improvement" || key === "planning")) ||
+                (stage === "planning" && key === "improvement") ||
+                (!["evaluation", "planning", "improvement"].includes(stage) &&
+                    key !== "identification")
+            ) {
+                isDisabled = true;
+            }
+
+            return <div style={{ display: "flex", justifyContent: "center" }}>
+                {isDisabled ? (
+                    <span style={{ cursor: "not-allowed", opacity: 0.5 }}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </span>
+                ) : (
+                    <Link to={getRedirectLink(link)}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </Link>
+                )}
+            </div>;
+        },
+    },
+]
+
+	return cols.filter((c) => c[show]);
+};

package/src/@daf/pages/SelfAssesment/components/OrgInformationTable/config.js

@@ -0,0 +1,31 @@
+export const getFiltersConfig = ({t}) => {
+    return {
+        timeframe: {
+            type: "timeframe",
+            label: "Timeframe",
+            style: { flex: 1 },
+        },
+    }
+}
+
+export const getFilterOptions = (options, t) => {
+    const { timeframe = [] } = options || {};
+    const _default = {
+        timeframe: timeframe,
+    }
+
+    return _default;
+}
+
+export const formConfig = {
+    namespace: 'organisation',
+    view: 'information',
+    scope: 'create',
+    formType: 'organisation',
+}
+
+export const viewConfig = {
+    title: "Organisations",
+    createTitle: "Create Organisation",
+}
+