datastake-daf 0.6.832 → 0.6.834

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

@@ -1,32 +1,32 @@
-export const selectFiltersConfig = {
-	category: {
-		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
+export const getFiltersConfig = ({t}) => {
+    return {
+        country: {
+			type: 'select',
+			placeholder: t('Country'),
+			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,
+		}
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const { countries, category, categoriesOptions } = options || {};
+	return {
+		country: countries || [],
+		category: categoriesOptions || category || [],
+	}
+}
 
 export const filtersConfig = {
 	name: "",

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

@@ -5,7 +5,8 @@ import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
 import {
-	selectFiltersConfig,
+	getFiltersConfig,
+	getFilterOptions,
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
@@ -33,6 +34,8 @@ export default function SubjectsTable({
 	refetchTrigger,
 	user,
 	options,
+	APP,
+	apiUrl
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -40,6 +43,14 @@ export default function SubjectsTable({
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
+	const selectFiltersConfig = useMemo(() => {
+		return getFiltersConfig({t});
+	}, [t]);
+
+	const filterOptions = useMemo(() => {
+		return getFilterOptions(options, t);
+	}, [options, t]);
+
 	const {
 		filter,
 		activeTab,
@@ -104,7 +115,7 @@ export default function SubjectsTable({
 				hasError={hasError}
 				setHasError={setHasError}
 				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
+				selectOptions={filterOptions}
 				checkboxConfig={checkboxConfig}
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
@@ -133,7 +144,7 @@ export default function SubjectsTable({
 					hideOnLoading={false}
 					pagination={filter.pagination}
 					rowKey="id"
-					selectOptions={selectOptions}
+					selectOptions={filterOptions}
 					doEmptyRows
 					setShowFilters={setShowFilters}
 					filtersConfig={selectFiltersConfig}
@@ -141,6 +152,8 @@ export default function SubjectsTable({
 					showFilters={showFilters}
 					defaultFilters={filter.defaultFilters}
 					onChange={filter.onTableChange}
+					app={APP}
+					apiUrl={apiUrl}
 				/>
 			</AdminTable>
 

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

@@ -124,6 +124,7 @@ export const useGetParams = ({location}) => {
 			...(Object.keys(rest)?.length > 0 && rest ),
 			...(Object.keys(cleanSearchParams)?.length > 0 && { search: cleanSearchParams }),
 			tab: activeTab,
+			...(activeTab === "deleted" && {status: 'deleted'})
 		}
 	}, [location.search]);
 

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

@@ -0,0 +1,25 @@
+import React from 'react'
+import { Tooltip } from 'antd';
+
+const SingleTruncatedLine = ({data = []}) => {
+    const displayText = data?.join(", ");
+    const tooltipText = data?.join("\n");
+    
+    return (
+        <Tooltip title={<div style={{ whiteSpace: "pre-line" }}>{tooltipText}</div>}>
+            <div
+                style={{
+                    fontWeight: "normal",
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                    maxWidth: "100%"
+                }}
+            >
+                {displayText}
+            </div>
+        </Tooltip>
+    );
+}
+
+export default SingleTruncatedLine

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

@@ -137,6 +137,12 @@ const Edit = ({
         namespaceOverrides,
 	});
 
+	useEffect(() => {
+		if (data?.id && !canEdit) {
+			goTo(getViewLink());
+		}
+	}, [canEdit, goTo, getViewLink, namespace, data?.id]);
+
     const action = useMemo(() => actionMap?.[namespaceConfig?.action], [namespaceConfig?.action, actionMap]);
 
     const namespaceGet = {
@@ -237,7 +243,7 @@ const Edit = ({
 		{
 			tooltip: t("Save"),
 			onClick: () => onSubmitData(true),
-			disabled: !isChanged,
+			disabled: !isChanged || !canEdit,
 			type: "primary",
 			icon: "Save",
 		},

package/src/@daf/pages/Events/Activities/columns.js

@@ -109,9 +109,12 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-
+          const subjectMap = {
+            "corrective-actions": "correctiveActions",
+            "activities": "activity",
+          }
           const eventCategory = findOptions(v, data?.options?.eventCategoryOptions || data?.options?.categoryOptions);
-          const categoryValue = getEventCategoryBySubject(eventCategory, "correctiveActions", true);
+          const categoryValue = getEventCategoryBySubject(eventCategory, subjectMap[subject], true);
           
           return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';
         },

package/src/@daf/pages/Summary/Minesite/components/MineSiteDetails/config.js

@@ -1,6 +1,7 @@
 import React from "react";
 import { Tag, Tooltip } from "antd";
 import { getTagColor } from "../../../../../utils/productTag.js";
+import SingleTruncatedLine from "../../../../../core/components/UI/SingleTruncatedLine/index.jsx";
 
 export function getKeyIndicatorsConfig({ t, data }) {
 	return [
@@ -11,20 +12,8 @@ export function getKeyIndicatorsConfig({ t, data }) {
 				if (validExtractionPoints?.length === 0 || !validExtractionPoints) {
 					return "-";
 				}
-				return (
-					<div>
-						{validExtractionPoints?.map((method, index) => {
-							return (
-								<React.Fragment key={method}>
-									<Tooltip title={method}>
-										<span style={{ fontWeight: "normal"}}>{method}</span>
-									</Tooltip>
-									{index < validExtractionPoints.length - 1 && ", "}
-								</React.Fragment>
-							);
-						})}
-					</div>
-				);
+				
+				return <SingleTruncatedLine data={validExtractionPoints} />;
 			},
 		},
 		{
@@ -35,27 +24,7 @@ export function getKeyIndicatorsConfig({ t, data }) {
 					return "-";
 				}
 		
-				return (
-					<div>
-						{validProducts?.map((product, index) => {
-							return (
-								<React.Fragment key={product}>
-									<Tooltip title={product}>
-										<span 
-											style={{ 
-												fontWeight: "normal",
-												color: getTagColor(product)
-											}}
-										>
-											{product}
-										</span>
-									</Tooltip>
-									{index < validProducts.length - 1 && ", "}
-								</React.Fragment>
-							);
-						})}
-					</div>
-				);
+				return <SingleTruncatedLine data={validProducts} />
 			},
 		},
 		{

package/src/helpers/dataFetch.js

@@ -11,9 +11,9 @@ export const formatDataForTable = (data, options) => {
               
                 return { ...rest, children }; 
             }),
-            meta: dataObj.data,
+            meta: dataObj?.meta,
         },
-        ...(Object.keys(options)?.length > 0 && options),
-        totalItems: Array.isArray(dataObj?.meta) ? dataObj?.meta?.[0]?.total : dataObj?.meta?.total || 0,
+        options: options || {},
+        totalItems: dataObj?.meta?.total || dataObj?.data?.length || 0,
     }
 }

package/src/index.js

@@ -201,6 +201,7 @@ export { default as SDGIcons } from "./@daf/core/components/UI/SDGIcon/index.jsx
 export { default as CountryFlag } from "./@daf/core/components/UI/CountryFlag/index.jsx"
 export { default as KeyIndicatorNavigateLabel } from "./@daf/core/components/UI/KeyIndicatorNavigateLabel/index.jsx";
 export { default as MissingTagButton } from "./@daf/core/components/UI/MissingTagButton/index.jsx";
+export { default as SingleTruncatedLine } from "./@daf/core/components/UI/SingleTruncatedLine/index.jsx";
 
 //Settings
 export { default as Settings } from "./@daf/core/components/Screens/Settings/index.js";