datastake-daf 0.6.336 → 0.6.337

package/dist/components/index.js

@@ -55620,6 +55620,10 @@ const checkboxConfig$8 = {
   name: "Name",
   datastakeId: "ID"
 };
+function getNameByLevel(data, level) {
+  const entry = Object.values(data).find(item => item.level === level);
+  return entry ? entry.name : null;
+}
 const getColumns$2 = ({
   t,
   goTo = () => {},
@@ -55725,9 +55729,9 @@ const getColumns$2 = ({
       });
     }
   }, {
-    title: t("admin-level-1"),
-    dataIndex: "adminLevel1",
-    key: "adminLevel1",
+    title: t("Province"),
+    dataIndex: "administrativeLevel1",
+    key: "administrativeLevel1",
     ellipsis: true,
     show: true,
     render: (value, all) => {
@@ -55736,26 +55740,33 @@ const getColumns$2 = ({
           className: "daf-default-cell"
         });
       }
+      let label;
+      if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
+        label = all?.linking?.SCL?.value?.name;
+      } else {
+        label = getNameByLevel(all?.linking?.SCL, value);
+      }
       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",
     show: true,
     ellipsis: true,
     render: (value, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("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, value);
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: value,
-        children: value
+        title: label,
+        children: label
       });
     }
   }, {
@@ -56020,7 +56031,7 @@ function CombineLocationModal({
           className: "flex-1",
           name: "adminLevel1",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            placeholder: t("admin::admin-level-1"),
+            placeholder: t("Province"),
             options: selectedLocations.map(location => {
               return {
                 label: location?.adminLevel1 || "--",
@@ -56032,7 +56043,7 @@ function CombineLocationModal({
           className: "flex-1",
           name: "adminLevel2",
           children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-            placeholder: t("admin::admin-level-2"),
+            placeholder: t("Territory"),
             options: selectedLocations.map(location => {
               return {
                 label: location?.adminLevel2 || "--",

package/package.json

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

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

@@ -152,7 +152,7 @@ export default function CombineLocationModal({
 
 					<Form.Item className="flex-1" name="adminLevel1">
 						<Select
-							placeholder={t("admin::admin-level-1")}
+							placeholder={t("Province")}
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.adminLevel1 || "--",
@@ -164,7 +164,7 @@ export default function CombineLocationModal({
 
 					<Form.Item className="flex-1" name="adminLevel2">
 						<Select
-							placeholder={t("admin::admin-level-2")}
+							placeholder={t("Territory")}
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.adminLevel2 || "--",

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

@@ -63,6 +63,11 @@ export const checkboxConfig = {
 	datastakeId: "ID",
 };
 
+function getNameByLevel(data, level) {
+	const entry = Object.values(data).find(item => item.level === level);
+	return entry ? entry.name : null;
+  }
+
 export const getColumns = ({
 	t,
 	goTo = () => {},
@@ -164,9 +169,9 @@ export const getColumns = ({
 			},
 		},
 		{
-			title: t("admin-level-1"),
-			dataIndex: "adminLevel1",
-			key: "adminLevel1",
+			title: t("Province"),
+			dataIndex: "administrativeLevel1",
+			key: "administrativeLevel1",
 			ellipsis: true,
 			show: true,
 			render: (value, all) => {
@@ -174,21 +179,31 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				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, value, "level_1")
+				}
+
+				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},
 		{
-			title: t("admin-level-2"),
-			dataIndex: "adminLevel2",
-			key: "adminLevel2",
+			title: t("Territory"),
+			dataIndex: "administrativeLevel2",
+			key: "administrativeLevel2",
 			show: true,
 			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, value, "level_2")
 				}
 
-				return <Tooltip title={value}>{value}</Tooltip>;
+				return <Tooltip title={label}>{label}</Tooltip>;
 			},
 		},
 		{