datastake-daf 0.6.339 → 0.6.340

package/dist/components/index.js

@@ -55620,10 +55620,10 @@ const checkboxConfig$8 = {
   name: "Name",
   datastakeId: "ID"
 };
-function getNameByLevel(data, level) {
+const getNameByLevel = (data, level) => {
   const entry = Object.values(data || {}).find(item => item.level === level);
-  return entry ? entry.name : null;
-}
+  return entry;
+};
 const getColumns$2 = ({
   t,
   goTo = () => {},
@@ -55655,7 +55655,7 @@ const getColumns$2 = ({
           return [...prev, all];
         }),
         checked: selectedLocations.some(p => p.id === all.id),
-        disabled: selectedLocations.length >= 3 && !selectedLocations.some(p => p.id === all.id)
+        disabled: selectedLocations?.length >= 3 && !selectedLocations.some(p => p.id === all.id)
       });
     }
   }, {
@@ -55744,7 +55744,7 @@ const getColumns$2 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.value?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_1");
+        label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -55767,7 +55767,7 @@ const getColumns$2 = ({
       if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
         label = all?.linking?.SCL?.value?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, "level_2");
+        label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: label || '-',
@@ -55786,8 +55786,8 @@ const getColumns$2 = ({
         });
       }
       const MAX_SOURCES = 3;
-      const count = value.length === MAX_SOURCES + 1 ? value.length : MAX_SOURCES;
-      return Array.isArray(value) && value.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
+      const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
+      return Array.isArray(value) && value?.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
         max: {
           count: count,
           style: {
@@ -55851,8 +55851,8 @@ const getColumns$1 = ({
 }) => {
   return [{
     title: t("admin::organisation_id"),
-    dataIndex: "id",
-    key: "id",
+    dataIndex: "datastakeId",
+    key: "datastakeId",
     render: (value, all) => {
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
         title: value,
@@ -55860,7 +55860,7 @@ const getColumns$1 = ({
       });
     }
   }, {
-    title: t("name"),
+    title: t("Name"),
     dataIndex: "name",
     key: "name",
     render: (value, all) => {
@@ -55892,23 +55892,37 @@ const getColumns$1 = ({
       });
     }
   }, {
-    title: t("admin-level-1"),
-    dataIndex: "adminLevel1",
-    key: "adminLevel1",
+    title: t("Province"),
+    dataIndex: "administrativeLevel1",
+    key: "administrativeLevel1",
+    ellipsis: true,
+    show: true,
     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 /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
+        title: label || '-',
+        children: label || '-'
       });
     }
   }, {
-    title: t("admin-level-2"),
-    dataIndex: "adminLevel2",
-    key: "adminLevel2",
+    title: t("Territory"),
+    dataIndex: "administrativeLevel2",
+    key: "administrativeLevel2",
     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 /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
+        title: label || '-',
+        children: label || '-'
       });
     }
   }];
@@ -55941,8 +55955,11 @@ function CombineLocationModal({
   }, [selectedLocations, t, selectOptions, module]);
   const onSubmit = () => {
     MainForm.validateFields().then(data => {
-      console.log(data, "data");
-      onSuccess(data);
+      const ids = selectedLocations.map(location => location._id);
+      onSuccess({
+        ids,
+        data
+      });
     });
   };
   return /*#__PURE__*/jsxRuntime.jsxs(Modal, {
@@ -55996,8 +56013,8 @@ function CombineLocationModal({
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             options: selectedLocations.map(location => {
               return {
-                label: location?.id || "--",
-                value: location?.id || "--"
+                label: location?.datastakeId || "-",
+                value: location?.datastakeId || "-"
               };
             }),
             placeholder: t("ID")
@@ -56014,8 +56031,8 @@ function CombineLocationModal({
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             options: selectedLocations.map(location => {
               return {
-                label: (selectOptions?.category || []).find(option => option.value === location?.category)?.label || location?.category || "--",
-                value: location?.category || "--"
+                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)),
             placeholder: t("category")
@@ -56026,35 +56043,37 @@ function CombineLocationModal({
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             options: selectedLocations.map(location => {
               return {
-                label: (selectOptions?.country || []).find(option => option.value === location?.country)?.label || location?.country || "--",
-                value: location?.country || "--"
+                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)),
             placeholder: t("admin::country")
           })
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
           className: "flex-1",
-          name: "adminLevel1",
+          name: "administrativeLevel1",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             placeholder: t("Province"),
             options: selectedLocations.map(location => {
+              const _data = getNameByLevel(location?.linking?.SCL, "level_1");
               return {
-                label: location?.adminLevel1 || "--",
-                value: location?.adminLevel1 || "--"
+                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: "adminLevel2",
+          name: "administrativeLevel2",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
             placeholder: t("Territory"),
             options: selectedLocations.map(location => {
+              const _data = getNameByLevel(location?.linking?.SCL, "level_2");
               return {
-                label: location?.adminLevel2 || "--",
-                value: location?.adminLevel2 || "--"
+                label: _data?.name || "-",
+                value: _data?.id || "-"
               };
-            })
+            }).filter((option, index, self) => index === self.findIndex(o => o.value === option.value))
           })
         })]
       })]
@@ -56082,7 +56101,8 @@ function LocationTable(_ref) {
     defaultPageSize = 20,
     view,
     headerTitle,
-    breadcrumbs
+    breadcrumbs,
+    mergeSubjectsFunction
   } = _ref;
   const [showFilters, setShowFilters] = React.useState(false);
   const [hasError, setHasError] = React.useState(false);
@@ -56166,12 +56186,12 @@ function LocationTable(_ref) {
         },
         children: selectedLocations.map(account => /*#__PURE__*/jsxRuntime.jsxs(antd.Tag, {
           className: "flex flex-row gap-2 items-center",
-          onClick: () => setSelectedLocations(prev => prev.filter(a => a.id !== account.id)),
+          onClick: () => setSelectedLocations(prev => prev.filter(a => a.datastakeId !== account.datastakeId)),
           style: {
             cursor: "pointer"
           },
           children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-            children: account.id
+            children: account.datastakeId
           }), /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
             name: "Close",
             size: 10
@@ -56199,8 +56219,10 @@ function LocationTable(_ref) {
       onClose: () => {
         setCombineLocationVisible(false);
       },
-      onSuccess: () => {
+      onSuccess: data => {
+        console.log(data, "success data");
         setCombineLocationVisible(false);
+        // mergeSubjectsFunction(data);
       },
       selectedLocations: selectedLocations,
       selectOptions: selectOptions || {},

package/package.json

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

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

@@ -1,18 +1,19 @@
 import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import { Tooltip } from "antd";
+import { getNameByLevel } from "../../AdminTables/LocationTable/helper.js";
 
 export const getColumns = ({ t, selectOptions, module }) => {
 	return [
 		{
 			title: t("admin::organisation_id"),
-			dataIndex: "id",
-			key: "id",
+			dataIndex: "datastakeId",
+			key: "datastakeId",
 			render: (value, all) => {
 				return <Tooltip title={value}>{value}</Tooltip>;
 			},
 		},
 		{
-			title: t("name"),
+			title: t("Name"),
 			dataIndex: "name",
 			key: "name",
 			render: (value, all) => {
@@ -38,19 +39,35 @@ export const getColumns = ({ t, selectOptions, module }) => {
 			},
 		},
 		{
-			title: t("admin-level-1"),
-			dataIndex: "adminLevel1",
-			key: "adminLevel1",
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
+			ellipsis: true,
+			show: true,
 			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
+				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("admin-level-2"),
-			dataIndex: "adminLevel2",
-			key: "adminLevel2",
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
 			render: (value, all) => {
-				return <Tooltip title={value}>{value}</Tooltip>;
+				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>;
 			},
 		},
 	];

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

@@ -5,6 +5,8 @@ import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 import DAFTable from "../../../../Table/index.jsx";
 import { useMemo, useState } from "react";
 import { getColumns } from "./helper.js";
+import { getNameByLevel } from "../../AdminTables/LocationTable/helper.js";
+
 const { useToken } = theme;
 
 export default function CombineLocationModal({
@@ -31,8 +33,11 @@ export default function CombineLocationModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			console.log(data, "data");
-			onSuccess(data);
+			const ids = selectedLocations.map((location) => location._id);
+			onSuccess({
+				ids,
+				data,
+			});
 		});
 	};
 
@@ -94,8 +99,8 @@ export default function CombineLocationModal({
 						<Select
 							options={selectedLocations.map((location) => {
 								return {
-									label: location?.id || "--",
-									value: location?.id || "--",
+									label: location?.datastakeId || "-",
+									value: location?.datastakeId || "-",
 								};
 							})}
 							placeholder={t("ID")}
@@ -116,8 +121,8 @@ export default function CombineLocationModal({
 												(option) => option.value === location?.category,
 											)?.label ||
 											location?.category ||
-											"--",
-										value: location?.category || "--",
+											"-",
+										value: location?.category || "-",
 									};
 								})
 								.filter(
@@ -138,8 +143,8 @@ export default function CombineLocationModal({
 												(option) => option.value === location?.country,
 											)?.label ||
 											location?.country ||
-											"--",
-										value: location?.country || "--",
+											"-",
+										value: location?.country || "-",
 									};
 								})
 								.filter(
@@ -150,27 +155,35 @@ export default function CombineLocationModal({
 						></Select>
 					</Form.Item>
 
-					<Form.Item className="flex-1" name="adminLevel1">
+					<Form.Item className="flex-1" name="administrativeLevel1">
 						<Select
 							placeholder={t("Province")}
 							options={selectedLocations.map((location) => {
+								const _data = getNameByLevel(location?.linking?.SCL, "level_1");
 								return {
-									label: location?.adminLevel1 || "--",
-									value: location?.adminLevel1 || "--",
-								};
-							})}
+									label: _data?.name || "-",
+									value: _data?.id || "-",
+								}
+							}).filter(
+								(option, index, self) =>
+									index === self.findIndex((o) => o.value === option.value),
+							)}
 						></Select>
 					</Form.Item>
 
-					<Form.Item className="flex-1" name="adminLevel2">
+					<Form.Item className="flex-1" name="administrativeLevel2">
 						<Select
 							placeholder={t("Territory")}
 							options={selectedLocations.map((location) => {
+								const _data = getNameByLevel(location?.linking?.SCL, "level_2");
 								return {
-									label: location?.adminLevel2 || "--",
-									value: location?.adminLevel2 || "--",
-								};
-							})}
+									label: _data?.name || "-",
+									value: _data?.id || "-",
+								}
+							}).filter(
+								(option, index, self) =>
+									index === self.findIndex((o) => o.value === option.value),
+							)}
 						></Select>
 					</Form.Item>
 				</Form>

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

@@ -27,7 +27,7 @@ export const Primary = {
 				data: {
 					data: [
 						{
-							"_id": {},
+							"_id": "68d15dff5c53c03e613a978b",
 							"createdAt": "2025-09-22T14:32:31.513Z",
 							"updatedAt": "2025-09-22T14:32:31.513Z",
 							"id": "937b8b13-947d-4ee0-accf-961cbc63c663",
@@ -57,7 +57,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d26bad5c53c03e613a9fef",
 							"createdAt": "2025-09-23T09:43:09.055Z",
 							"updatedAt": "2025-09-23T09:43:09.055Z",
 							"id": "e3d4b71c-63b2-4a57-8833-ea4cfa519a67",
@@ -87,7 +87,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d519355c53c03e613ad03a",
 							"createdAt": "2025-09-25T10:28:05.989Z",
 							"updatedAt": "2025-09-25T10:28:05.989Z",
 							"id": "1f5ac021-c82d-46ce-817a-c4045392b13d",
@@ -102,7 +102,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d687408a2a09b08388b0e8",
 							"createdAt": "2025-09-26T12:29:52.120Z",
 							"updatedAt": "2025-09-26T12:29:52.120Z",
 							"id": "9fe2475c-98a6-4a72-a9c7-0b459f44c0ed",
@@ -117,7 +117,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d6881b5b4566f0cabcbff2",
 							"createdAt": "2025-09-26T12:33:31.263Z",
 							"updatedAt": "2025-09-26T12:33:31.263Z",
 							"id": "9c561b78-452a-468a-9c71-a8380d1bdc1d",
@@ -132,7 +132,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d6946a84cca23fe8a6abe4",
 							"createdAt": "2025-09-26T13:26:02.415Z",
 							"updatedAt": "2025-09-26T13:26:02.415Z",
 							"id": "bb2a2497-eae6-47a4-b903-9f0663dc8b0c",
@@ -147,7 +147,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d6963009b07d172ba0ed25",
 							"createdAt": "2025-09-26T13:33:36.403Z",
 							"updatedAt": "2025-09-26T13:33:36.403Z",
 							"id": "058894d7-22a8-4804-b4a8-98be5003f310",
@@ -162,7 +162,7 @@ export const Primary = {
 							"__v": 0
 						},
 						{
-							"_id": {},
+							"_id": "68d6999991fe77d8e0113b0b",
 							"createdAt": "2025-09-26T13:48:09.933Z",
 							"updatedAt": "2025-09-26T13:48:09.933Z",
 							"id": "0777e572-6f47-4d54-a58c-7a43ef26d3c1",

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

@@ -63,9 +63,9 @@ export const checkboxConfig = {
 	datastakeId: "ID",
 };
 
-function getNameByLevel(data, level) {
+export const getNameByLevel = (data, level) => {
 	const entry = Object.values(data || {}).find(item => item.level === level);
-	return entry ? entry.name : null;
+	return entry;
   }
 
 export const getColumns = ({
@@ -102,7 +102,7 @@ export const getColumns = ({
 						}
 						checked={selectedLocations.some((p) => p.id === all.id)}
 						disabled={
-							selectedLocations.length >= 3 &&
+							selectedLocations?.length >= 3 &&
 							!selectedLocations.some((p) => p.id === all.id)
 						}
 					/>
@@ -183,7 +183,7 @@ export const getColumns = ({
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
 					label = all?.linking?.SCL?.value?.name
 				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_1")
+					label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
 				}
 
 				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
@@ -204,7 +204,7 @@ export const getColumns = ({
 				if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
 					label = all?.linking?.SCL?.value?.name
 				} else {
-					label = getNameByLevel(all?.linking?.SCL, "level_2")
+					label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
 				}
 
 				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
@@ -221,9 +221,9 @@ export const getColumns = ({
 				}
 
 				const MAX_SOURCES = 3;
-				const count = value.length === MAX_SOURCES + 1 ? value.length : MAX_SOURCES;
+				const count = value?.length === MAX_SOURCES + 1 ? value?.length : MAX_SOURCES;
 				return (
-					Array.isArray(value) && value.length > 0 ? <Avatar.Group
+					Array.isArray(value) && value?.length > 0 ? <Avatar.Group
 					max={{
 						count: count,
 						style: {

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

@@ -28,6 +28,7 @@ export default function LocationTable({
 	view,
 	headerTitle,
 	breadcrumbs,
+	mergeSubjectsFunction,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -120,14 +121,14 @@ export default function LocationTable({
 								className="flex flex-row gap-2 items-center"
 								onClick={() =>
 									setSelectedLocations((prev) =>
-										prev.filter((a) => a.id !== account.id),
+										prev.filter((a) => a.datastakeId !== account.datastakeId),
 									)
 								}
 								style={{
 									cursor: "pointer",
 								}}
 							>
-								<span>{account.id}</span>
+								<span>{account.datastakeId}</span>
 								<CustomIcon name="Close" size={10} />
 							</Tag>
 						))}
@@ -157,8 +158,10 @@ export default function LocationTable({
 				onClose={() => {
 					setCombineLocationVisible(false);
 				}}
-				onSuccess={() => {
+				onSuccess={(data) => {
+					console.log(data, "success data");
 					setCombineLocationVisible(false);
+					// mergeSubjectsFunction(data);
 				}}
 				selectedLocations={selectedLocations}
 				selectOptions={selectOptions || {}}