datastake-daf 0.6.351 → 0.6.352

package/dist/components/index.js

@@ -55628,6 +55628,7 @@ const getNameByLevel = (data, level) => {
   const entry = Object.values(data || {}).find(item => item.level === level);
   return entry;
 };
+
 const getColumns$3 = ({
   t,
   goTo = () => {},
@@ -56261,6 +56262,21 @@ function LocationTable(_ref) {
   });
 }
 
+const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMapper = null) => {
+  return items.map(item => {
+    if (customMapper) {
+      return customMapper(item);
+    }
+    const value = item?.[valueKey] || "-";
+    const optionsList = selectOptions?.[optionKey] || [];
+    const foundOption = optionsList.find(option => option.value === value);
+    return {
+      label: foundOption?.label || value,
+      value: value
+    };
+  }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value));
+};
+
 const getColumns$1 = ({
   t,
   selectOptions,
@@ -56443,12 +56459,7 @@ function CombineSubjectsModal({
           className: "flex-1",
           name: "id",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: selectedSubjects.map(subject => {
-              return {
-                label: location?.datastakeId || "-",
-                value: location?.datastakeId || "-"
-              };
-            }),
+            options: mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null),
             placeholder: t("ID")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
@@ -56461,24 +56472,14 @@ function CombineSubjectsModal({
           className: "flex-1",
           name: "category",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: selectedSubjects.map(location => {
-              return {
-                label: (selectOptions?.category || []).find(option => option.value === location?.category)?.label || location?.category || "-",
-                value: location?.category || "-"
-              };
-            }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
+            options: mapToSelectOptions(selectedSubjects, "category", selectOptions, "category"),
             placeholder: t("Category")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
           name: "country",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            options: selectedSubjects.map(location => {
-              return {
-                label: (selectOptions?.country || []).find(option => option.value === location?.country)?.label || location?.country || "-",
-                value: location?.country || "-"
-              };
-            }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value)),
+            options: mapToSelectOptions(selectedSubjects, "country", selectOptions, "country"),
             placeholder: t("admin::country")
           })
         }), entity.includes("locations") && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -56487,26 +56488,26 @@ function CombineSubjectsModal({
             name: "administrativeLevel1",
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Province"),
-              options: selectedSubjects.map(location => {
-                const _data = getNameByLevel(location?.linking?.SCL, "level_1");
+              options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
+                const _data = getNameByLevel(subject?.linking?.SCL, "level_1");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
                 };
-              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+              })
             })
           }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "flex-1",
             name: "administrativeLevel2",
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
               placeholder: t("Territory"),
-              options: selectedSubjects.map(location => {
-                const _data = getNameByLevel(location?.linking?.SCL, "level_2");
+              options: mapToSelectOptions(selectedSubjects, null, selectOptions, null, subject => {
+                const _data = getNameByLevel(subject?.linking?.SCL, "level_2");
                 return {
                   label: _data?.name || "-",
                   value: _data?.id || "-"
                 };
-              }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
+              })
             })
           })]
         })]
@@ -56545,7 +56546,7 @@ function SubjectsTable(_ref) {
   const {
     token
   } = useToken();
-  const [combineLocationVisible, setCombineLocationVisible] = React.useState(false);
+  const [isCombineModalOpen, setIsModalOpen] = React.useState(false);
   const {
     filter,
     activeTab,
@@ -56598,7 +56599,7 @@ function SubjectsTable(_ref) {
       headerTitle: headerTitle,
       actionButton: [{
         icon: "Merge",
-        onClick: () => setCombineLocationVisible(true),
+        onClick: () => setIsModalOpen(true),
         tooltip: t("admin::merge-subjects"),
         disabled: selectedSubjects.length < 2
       }],
@@ -56652,13 +56653,13 @@ function SubjectsTable(_ref) {
         onChange: filter.onTableChange
       })]
     }), /*#__PURE__*/jsxRuntime.jsx(CombineSubjectsModal, {
-      isOpen: combineLocationVisible,
+      isOpen: isCombineModalOpen,
       t: t,
       onClose: () => {
-        setCombineLocationVisible(false);
+        setIsModalOpen(false);
       },
       onSuccess: data => {
-        setCombineLocationVisible(false);
+        setIsModalOpen(false);
         setLoading(true);
         if (typeof mergeSubjectsFunction === 'function') {
           mergeSubjectsFunction(data);

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/columns.js

@@ -0,0 +1,79 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { Tooltip } from "antd";
+import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
+
+export const getColumns = ({ t, selectOptions, module, entity }) => {
+	return [
+		{
+			title: t("admin::organisation_id"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Name"),
+			dataIndex: "name",
+			key: "name",
+			show: true,
+			render: (value, all) => {
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Category"),
+			dataIndex: "category",
+			key: "category",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.category);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Country"),
+			dataIndex: "country",
+			key: "country",
+			show: true,
+			render: (value, all) => {
+				const label = findOptions(value, selectOptions?.country);
+				return <Tooltip title={label}>{label}</Tooltip>;
+			},
+		},
+		{
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				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>;
+			},
+		},
+		{
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
+			show: entity.includes("locations"),
+			render: (value, all) => {
+				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>;
+			},
+		},
+	].filter((c) => c?.show);
+};

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/helper.js

@@ -1,79 +1,21 @@
-import { findOptions } from "../../../../../../../helpers/StringHelper.js";
-import { Tooltip } from "antd";
-import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
-
-export const getColumns = ({ t, selectOptions, module, entity }) => {
-	return [
-		{
-			title: t("admin::organisation_id"),
-			dataIndex: "datastakeId",
-			key: "datastakeId",
-			show: true,
-			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Name"),
-			dataIndex: "name",
-			key: "name",
-			show: true,
-			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Category"),
-			dataIndex: "category",
-			key: "category",
-			show: true,
-			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.category);
-				return <Tooltip title={label}>{label}</Tooltip>;
-			},
-		},
-		{
-			title: t("Country"),
-			dataIndex: "country",
-			key: "country",
-			show: true,
-			render: (value, all) => {
-				const label = findOptions(value, selectOptions?.country);
-				return <Tooltip title={label}>{label}</Tooltip>;
-			},
-		},
-		{
-			title: t("Province"),
-			dataIndex: "administrativeLevel1",
-			key: "administrativeLevel1",
-			ellipsis: true,
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				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>;
-			},
-		},
-		{
-			title: t("Territory"),
-			dataIndex: "administrativeLevel2",
-			key: "administrativeLevel2",
-			show: entity.includes("locations"),
-			render: (value, all) => {
-				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>;
-			},
-		},
-	].filter((c) => c?.show);
+export const mapToSelectOptions = (items, valueKey, selectOptions, optionKey, customMapper = null) => {
+	return items
+		.map((item) => {
+			if (customMapper) {
+				return customMapper(item);
+			}
+			
+			const value = item?.[valueKey] || "-";
+			const optionsList = selectOptions?.[optionKey] || [];
+			const foundOption = optionsList.find((option) => option.value === value);
+			
+			return {
+				label: foundOption?.label || value,
+				value: value,
+			};
+		})
+		.filter(
+			(option, index, self) =>
+				index === self.findIndex((o) => o.value === option.value),
+		);
 };

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/index.jsx

@@ -4,7 +4,8 @@ import { Container } from "../CombineModalStyle.js";
 import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
-import { getColumns } from "./helper.js";
+import { mapToSelectOptions } from "./helper.js";
+import { getColumns } from "./columns.js";
 import { getNameByLevel } from "../../AdminTables/SubjectsTable/helper.js";
 
 const { useToken } = theme;
@@ -111,12 +112,7 @@ export default function CombineSubjectsModal({
 				>
 					<Form.Item className="flex-1" name="id">
 						<Select
-							options={selectedSubjects.map((subject) => {
-								return {
-									label: location?.datastakeId || "-",
-									value: location?.datastakeId || "-",
-								};
-							})}
+							options={mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null)}
 							placeholder={t("ID")}
 						></Select>
 					</Form.Item>
@@ -127,44 +123,14 @@ export default function CombineSubjectsModal({
 
 					<Form.Item className="flex-1" name="category">
 						<Select
-							options={selectedSubjects
-								.map((location) => {
-									return {
-										label:
-											(selectOptions?.category || []).find(
-												(option) => option.value === location?.category,
-											)?.label ||
-											location?.category ||
-											"-",
-										value: location?.category || "-",
-									};
-								})
-								.filter(
-									(option, index, self) =>
-										index === self.findIndex((o) => o.value === option.value),
-								)}
+							options={mapToSelectOptions(selectedSubjects, "category", selectOptions, "category")}
 							placeholder={t("Category")}
 						></Select>
 					</Form.Item>
 
 					<Form.Item className="flex-1" name="country">
 						<Select
-							options={selectedSubjects
-								.map((location) => {
-									return {
-										label:
-											(selectOptions?.country || []).find(
-												(option) => option.value === location?.country,
-											)?.label ||
-											location?.country ||
-											"-",
-										value: location?.country || "-",
-									};
-								})
-								.filter(
-									(option, index, self) =>
-										index === self.findIndex((o) => o.value === option.value),
-								)}
+							options={mapToSelectOptions(selectedSubjects, "country", selectOptions, "country")}
 							placeholder={t("admin::country")}
 						></Select>
 					</Form.Item>
@@ -174,36 +140,26 @@ export default function CombineSubjectsModal({
 						<Form.Item className="flex-1" name="administrativeLevel1">
 							<Select
 							placeholder={t("Province")}
-							options={selectedSubjects
-								.map((location) => {
-								const _data = getNameByLevel(location?.linking?.SCL, "level_1");
+							options={mapToSelectOptions(selectedSubjects, null, selectOptions, null, (subject) => {
+								const _data = getNameByLevel(subject?.linking?.SCL, "level_1");
 								return {
 									label: _data?.name || "-",
 									value: _data?.id || "-",
 								};
-								})
-								.filter(
-								(option, index, self) =>
-									index === self.findIndex((o) => o.value === option.value),
-								)}
+							})}
 							/>
 						</Form.Item>
 
 						<Form.Item className="flex-1" name="administrativeLevel2">
 							<Select
 							placeholder={t("Territory")}
-							options={selectedSubjects
-								.map((location) => {
-								const _data = getNameByLevel(location?.linking?.SCL, "level_2");
+							options={mapToSelectOptions(selectedSubjects, null, selectOptions, null, (subject) => {
+								const _data = getNameByLevel(subject?.linking?.SCL, "level_2");
 								return {
 									label: _data?.name || "-",
 									value: _data?.id || "-",
 								};
-								})
-								.filter(
-								(option, index, self) =>
-									index === self.findIndex((o) => o.value === option.value),
-								)}
+							})}
 							/>
 						</Form.Item>
 						</>

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

@@ -10,8 +10,8 @@ import {
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
-	getColumns,
 } from "../SubjectsTable/helper.js";
+import { getColumns } from "../SubjectsTable/columns.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
 const { useToken } = theme;
 

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

@@ -0,0 +1,224 @@
+import { Checkbox, Tooltip, Avatar } from "antd";
+import CustomIcon from "../../../../Icon/CustomIcon.jsx";
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { getNameByLevel } from "./helper.js";
+
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+	token,
+	selectedSubjects,
+	setSelectedSubjects,
+	selectOptions,
+	entity,
+}) => {
+	const cols = [
+		{
+			title: "",
+			dataIndex: "select",
+			key: "select",
+			width: 50,
+			show: true,
+			render: (v, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+				return (
+					<Checkbox
+						onChange={() =>
+							setSelectedSubjects((prev) => {
+								const isSelected = prev.some((p) => p.id === all.id);
+								if (isSelected) {
+									return prev.filter((p) => p.id !== all.id);
+								}
+								return [...prev, all];
+							})
+						}
+						checked={selectedSubjects.some((p) => p.id === all.id)}
+						disabled={
+							selectedSubjects?.length >= 3 &&
+							!selectedSubjects.some((p) => p.id === all.id)
+						}
+					/>
+				);
+			},
+		},
+		{
+			title: t("ID"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Name"),
+			dataIndex: "name",
+			key: "name",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Category"),
+			dataIndex: "category",
+			key: "category",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const category = findOptions(value, selectOptions?.category || []) || "--";
+
+				return <Tooltip title={category}>{category}</Tooltip>;
+			},
+		},
+		{
+			title: t("Country"),
+			dataIndex: "country",
+			key: "country",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+				const country = findOptions(value, selectOptions?.country || []) || "--";
+
+				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" />;
+				}
+
+				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>;
+			},
+		},
+		{
+			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" />;
+				}
+
+				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>;
+			},
+		},
+		{
+			title: t("Sources"),
+			dataIndex: "sources",
+			key: "sources",
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const MAX_SOURCES = 3;
+				const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+				return (
+					Array.isArray(value) && value?.length > 0 ? <Avatar.Group
+					max={{
+						count: count,
+						style: {
+							color: token.baseGray90,
+							backgroundColor: token.baseGray20,
+							border: `1px solid ${token.baseGray40}`,
+						},
+					}}
+					size={"small"}
+				>
+					{value.map((v, i) => (
+						<Avatar
+							key={i}
+							size={"small"}
+							style={{
+								backgroundColor: token.baseGray20,
+								color: token.baseGray90,
+								border: `1px solid ${token.baseGray40}`,
+								display: "flex",
+								alignItems: "center",
+								justifyContent: "center",
+							}}
+						>
+							<CustomIcon
+								name="Organisation02"
+								width={18}
+								height={18}
+								color={token.baseGray90}
+							/>
+						</Avatar>
+					))}
+				</Avatar.Group> : '-'
+				);
+			},
+		},
+		{
+			title: "",
+			dataIndex: "actions",
+			key: "actions",
+			width: 60,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return (
+					<div
+						className="cursor-pointer"
+						onClick={() => {
+							goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
+						}}
+					>
+						<CustomIcon name="Link" width={18} height={18} />
+					</div>
+				);
+			},
+		},
+	];
+
+	return cols.filter((c) => c[show]);
+};

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

@@ -1,9 +1,3 @@
-import { Checkbox, Tooltip, Avatar } from "antd";
-import CustomIcon from "../../../../Icon/CustomIcon.jsx";
-import { findOptions } from "../../../../../../../helpers/StringHelper.js";
-
-export const view = "locations";
-
 export const getTabs = ({ t }) => {
 	return [
 		{
@@ -68,222 +62,4 @@ export const getNameByLevel = (data, level) => {
 	return entry;
   }
 
-export const getColumns = ({
-	t,
-	goTo = () => {},
-	show = "show",
-	getRedirectLink = () => {},
-	token,
-	selectedSubjects,
-	setSelectedSubjects,
-	selectOptions,
-	entity,
-}) => {
-	const cols = [
-		{
-			title: "",
-			dataIndex: "select",
-			key: "select",
-			width: 50,
-			show: true,
-			render: (v, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-				return (
-					<Checkbox
-						onChange={() =>
-							setSelectedSubjects((prev) => {
-								const isSelected = prev.some((p) => p.id === all.id);
-								if (isSelected) {
-									return prev.filter((p) => p.id !== all.id);
-								}
-								return [...prev, all];
-							})
-						}
-						checked={selectedSubjects.some((p) => p.id === all.id)}
-						disabled={
-							selectedSubjects?.length >= 3 &&
-							!selectedSubjects.some((p) => p.id === all.id)
-						}
-					/>
-				);
-			},
-		},
-		{
-			title: t("ID"),
-			dataIndex: "datastakeId",
-			key: "datastakeId",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
 
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Name"),
-			dataIndex: "name",
-			key: "name",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Category"),
-			dataIndex: "category",
-			key: "category",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				const category = findOptions(value, selectOptions?.category || []) || "--";
-
-				return <Tooltip title={category}>{category}</Tooltip>;
-			},
-		},
-		{
-			title: t("Country"),
-			dataIndex: "country",
-			key: "country",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-				const country = findOptions(value, selectOptions?.country || []) || "--";
-
-				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" />;
-				}
-
-				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>;
-			},
-		},
-		{
-			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" />;
-				}
-
-				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>;
-			},
-		},
-		{
-			title: t("Sources"),
-			dataIndex: "sources",
-			key: "sources",
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				const MAX_SOURCES = 3;
-				const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
-				return (
-					Array.isArray(value) && value?.length > 0 ? <Avatar.Group
-					max={{
-						count: count,
-						style: {
-							color: token.baseGray90,
-							backgroundColor: token.baseGray20,
-							border: `1px solid ${token.baseGray40}`,
-						},
-					}}
-					size={"small"}
-				>
-					{value.map((v, i) => (
-						<Avatar
-							key={i}
-							size={"small"}
-							style={{
-								backgroundColor: token.baseGray20,
-								color: token.baseGray90,
-								border: `1px solid ${token.baseGray40}`,
-								display: "flex",
-								alignItems: "center",
-								justifyContent: "center",
-							}}
-						>
-							<CustomIcon
-								name="Organisation02"
-								width={18}
-								height={18}
-								color={token.baseGray90}
-							/>
-						</Avatar>
-					))}
-				</Avatar.Group> : '-'
-				);
-			},
-		},
-		{
-			title: "",
-			dataIndex: "actions",
-			key: "actions",
-			width: 60,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return (
-					<div
-						className="cursor-pointer"
-						onClick={() => {
-							goTo(getRedirectLink(`/app/accounts/view/${all.id}/details`));
-						}}
-					>
-						<CustomIcon name="Link" width={18} height={18} />
-					</div>
-				);
-			},
-		},
-	];
-
-	return cols.filter((c) => c[show]);
-};

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

@@ -10,8 +10,8 @@ import {
 	filtersConfig,
 	defaultUrlParams,
 	checkboxConfig,
-	getColumns,
 } from "./helper.js";
+import { getColumns } from "./columns.js";
 import CombineSubjectsModal from "../../AdminModals/CombineSubjects/index.jsx";
 
 const { useToken } = theme;
@@ -36,7 +36,7 @@ export default function SubjectsTable({
 	const [hasError, setHasError] = useState(false);
 	const [selectedSubjects, setSelectedSubjects] = useState([]);
 	const { token } = useToken();
-	const [combineLocationVisible, setCombineLocationVisible] = useState(false);
+	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
 	const {
 		filter,
@@ -94,7 +94,7 @@ export default function SubjectsTable({
 				actionButton={[
 					{
 						icon: "Merge",
-						onClick: () => setCombineLocationVisible(true),
+						onClick: () => setIsModalOpen(true),
 						tooltip: t("admin::merge-subjects"),
 						disabled: selectedSubjects.length < 2,
 					},
@@ -158,13 +158,13 @@ export default function SubjectsTable({
 			</AdminTable>
 
 			<CombineSubjectsModal
-				isOpen={combineLocationVisible}
+				isOpen={isCombineModalOpen}
 				t={t}
 				onClose={() => {
-					setCombineLocationVisible(false);
+					setIsModalOpen(false);
 				}}
 				onSuccess={(data) => {
-					setCombineLocationVisible(false);
+					setIsModalOpen(false);
 					setLoading(true);
 					if (typeof mergeSubjectsFunction === 'function') {
 						mergeSubjectsFunction(data);