datastake-daf 0.6.337 → 0.6.339

package/dist/components/index.js

@@ -55621,7 +55621,7 @@ const checkboxConfig$8 = {
   datastakeId: "ID"
 };
 function getNameByLevel(data, level) {
-  const entry = Object.values(data).find(item => item.level === level);
+  const entry = Object.values(data || {}).find(item => item.level === level);
   return entry ? entry.name : null;
 }
 const getColumns$2 = ({
@@ -55660,8 +55660,8 @@ const getColumns$2 = ({
     }
   }, {
     title: t("ID"),
-    dataIndex: "id",
-    key: "id",
+    dataIndex: "datastakeId",
+    key: "datastakeId",
     ellipsis: true,
     show: true,
     render: (value, all) => {
@@ -55744,11 +55744,11 @@ const getColumns$2 = ({
       if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
         label = all?.linking?.SCL?.value?.name;
       } else {
-        label = getNameByLevel(all?.linking?.SCL, value);
+        label = getNameByLevel(all?.linking?.SCL, "level_1");
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label,
-        children: label
+        title: label || '-',
+        children: label || '-'
       });
     }
   }, {
@@ -55758,15 +55758,20 @@ const getColumns$2 = ({
     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);
+        label = getNameByLevel(all?.linking?.SCL, "level_2");
       }
       return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-        title: label,
-        children: label
+        title: label || '-',
+        children: label || '-'
       });
     }
   }, {
@@ -55782,7 +55787,7 @@ const getColumns$2 = ({
       }
       const MAX_SOURCES = 3;
       const count = value.length === MAX_SOURCES + 1 ? value.length : MAX_SOURCES;
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
+      return Array.isArray(value) && value.length > 0 ? /*#__PURE__*/jsxRuntime.jsx(antd.Avatar.Group, {
         max: {
           count: count,
           style: {
@@ -55809,7 +55814,7 @@ const getColumns$2 = ({
             color: token.baseGray90
           })
         }, i))
-      });
+      }) : '-';
     }
   }, {
     title: "",

package/package.json

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

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

@@ -27,50 +27,155 @@ export const Primary = {
 				data: {
 					data: [
 						{
-							id: "LOC0000001",
-							name: "Location 1",
-							category: "CAT1",
-							country: "AL",
-							adminLevel1: "Admin Level 1-1",
-							adminLevel2: "Admin Level 2-1",
-							sources: [{}, {}],
+							"_id": {},
+							"createdAt": "2025-09-22T14:32:31.513Z",
+							"updatedAt": "2025-09-22T14:32:31.513Z",
+							"id": "937b8b13-947d-4ee0-accf-961cbc63c663",
+							"name": "Armed Group",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "5d0ba2c7110a07ae97fa63e06b1041fe76367e2b",
+							"country": "AL",
+							"category": "nonStateArmedGroup",
+							"sources": [],
+							"subCategory": "militia",
+							"datastakeId": "STK-00000000452",
+							"linking": {
+								"SCL": {
+									"6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
+										"_id": {},
+										"createdAt": "2023-02-19T17:25:34.444Z",
+										"updatedAt": "2023-02-19T17:25:34.444Z",
+										"id": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
+										"level": "level_1",
+										"country": "AL",
+										"collectId": "1e29d64aee47553eba7e89bf04d43cc7c1c1a017",
+										"name": "Berat",
+										"__v": 0
+									}
+								}
+							},
+							"__v": 0
 						},
 						{
-							id: "LOC0000002",
-							name: "Location 2",
-							category: "CAT2",
-							country: "AL",
-							adminLevel1: "Admin Level 1-2",
-							adminLevel2: "Admin Level 2-2",
-							sources: [{}, {}, {}, {}, {}, {}],
+							"_id": {},
+							"createdAt": "2025-09-23T09:43:09.055Z",
+							"updatedAt": "2025-09-23T09:43:09.055Z",
+							"id": "e3d4b71c-63b2-4a57-8833-ea4cfa519a67",
+							"name": "Test",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "cc1e6e29bb85f01ec835687b607f8179d7ea3ff3",
+							"country": "AL",
+							"category": "nonStateArmedGroup",
+							"sources": [],
+							"subCategory": "militia",
+							"datastakeId": "STK-00000000453",
+							"linking": {
+								"SCL": {
+									"6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
+										"_id": {},
+										"createdAt": "2023-02-19T17:25:34.444Z",
+										"updatedAt": "2023-02-19T17:25:34.444Z",
+										"id": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
+										"level": "level_1",
+										"country": "AL",
+										"collectId": "1e29d64aee47553eba7e89bf04d43cc7c1c1a017",
+										"name": "Berat",
+										"__v": 0
+									}
+								}
+							},
+							"__v": 0
 						},
 						{
-							id: "LOC0000003",
-							name: "Location 3",
-							category: "CAT3",
-							country: "DZ",
-							adminLevel1: "Admin Level 1-3",
-							adminLevel2: "Admin Level 2-3",
-							sources: [{}, {}],
+							"_id": {},
+							"createdAt": "2025-09-25T10:28:05.989Z",
+							"updatedAt": "2025-09-25T10:28:05.989Z",
+							"id": "1f5ac021-c82d-46ce-817a-c4045392b13d",
+							"name": "This operator will have a name so ridiculously long that every other name will sulk in jealousy, rushing to hand over their daughters just like in the medieval days, hoping his children will inherit even half the glory of that absurdly oversized title.",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "203f6b80dac93e506d50073b0a8e365a727aceae",
+							"country": "AX",
+							"category": "corporation",
+							"sources": [],
+							"subCategory": "publicCompany",
+							"datastakeId": "STK-00000000454",
+							"__v": 0
 						},
 						{
-							id: "LOC0000004",
-							name: "Location 4",
-							category: "CAT4",
-							country: "AL",
-							adminLevel1: "Admin Level 1-4",
-							adminLevel2: "Admin Level 2-4",
-							sources: [{}, {}, {}, {}],
+							"_id": {},
+							"createdAt": "2025-09-26T12:29:52.120Z",
+							"updatedAt": "2025-09-26T12:29:52.120Z",
+							"id": "9fe2475c-98a6-4a72-a9c7-0b459f44c0ed",
+							"name": "ANOTHER OP",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "d77e36a69838047cc627933b935a93dcedb1ee06",
+							"country": "AL",
+							"category": "corporation",
+							"sources": [],
+							"subCategory": "publicCompany",
+							"datastakeId": "STK-00000000455",
+							"__v": 0
 						},
 						{
-							id: "LOC0000005",
-							name: "Location 5",
-							category: "CAT4",
-							country: "AL",
-							adminLevel1: "Admin Level 1-5",
-							adminLevel2: "Admin Level 2-5",
-							sources: [{}, {}, {}, {}, {}],
+							"_id": {},
+							"createdAt": "2025-09-26T12:33:31.263Z",
+							"updatedAt": "2025-09-26T12:33:31.263Z",
+							"id": "9c561b78-452a-468a-9c71-a8380d1bdc1d",
+							"name": "SOME GUY",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "a94ffae8f0f46dcde6d9c5f21eab16b041051209",
+							"country": "AL",
+							"category": "corporation",
+							"sources": [],
+							"subCategory": "publicCompany",
+							"datastakeId": "STK-00000000456",
+							"__v": 0
 						},
+						{
+							"_id": {},
+							"createdAt": "2025-09-26T13:26:02.415Z",
+							"updatedAt": "2025-09-26T13:26:02.415Z",
+							"id": "bb2a2497-eae6-47a4-b903-9f0663dc8b0c",
+							"name": "THIS SOWULD BE THE 4-th OP FOR THIS MS",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "da9d2cb826b1ffb51f3acc97a3bc2d2110bad033",
+							"country": "AL",
+							"category": "corporation",
+							"sources": [],
+							"subCategory": "privateCompany",
+							"datastakeId": "STK-00000000457",
+							"__v": 0
+						},
+						{
+							"_id": {},
+							"createdAt": "2025-09-26T13:33:36.403Z",
+							"updatedAt": "2025-09-26T13:33:36.403Z",
+							"id": "058894d7-22a8-4804-b4a8-98be5003f310",
+							"name": "THE BES OP EVER",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "6d8b56767a7edc6fc605d9c669ce0878d4918630",
+							"country": "AX",
+							"category": "corporation",
+							"sources": [],
+							"subCategory": "stockCompany",
+							"datastakeId": "STK-00000000458",
+							"__v": 0
+						},
+						{
+							"_id": {},
+							"createdAt": "2025-09-26T13:48:09.933Z",
+							"updatedAt": "2025-09-26T13:48:09.933Z",
+							"id": "0777e572-6f47-4d54-a58c-7a43ef26d3c1",
+							"name": "Grupim i armatosur",
+							"authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
+							"collectId": "8c26f08b914b23459e52e3506e30caf508d9679d",
+							"country": "AL",
+							"category": "nonStateArmedGroup",
+							"sources": [],
+							"subCategory": "militia",
+							"datastakeId": "STK-00000000459",
+							"__v": 0
+						}
 					],
 					meta: {
 						total: 0,

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

@@ -64,7 +64,7 @@ export const checkboxConfig = {
 };
 
 function getNameByLevel(data, level) {
-	const entry = Object.values(data).find(item => item.level === level);
+	const entry = Object.values(data || {}).find(item => item.level === level);
 	return entry ? entry.name : null;
   }
 
@@ -111,8 +111,8 @@ export const getColumns = ({
 		},
 		{
 			title: t("ID"),
-			dataIndex: "id",
-			key: "id",
+			dataIndex: "datastakeId",
+			key: "datastakeId",
 			ellipsis: true,
 			show: true,
 			render: (value, all) => {
@@ -183,10 +183,10 @@ export const getColumns = ({
 				if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
 					label = all?.linking?.SCL?.value?.name
 				} else {
-					label = getNameByLevel(all?.linking?.SCL, value, "level_1")
+					label = getNameByLevel(all?.linking?.SCL, "level_1")
 				}
 
-				return <Tooltip title={label}>{label}</Tooltip>;
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 			},
 		},
 		{
@@ -196,14 +196,18 @@ export const getColumns = ({
 			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")
+					label = getNameByLevel(all?.linking?.SCL, "level_2")
 				}
 
-				return <Tooltip title={label}>{label}</Tooltip>;
+				return <Tooltip title={label || '-'}>{label || '-'}</Tooltip>;
 			},
 		},
 		{
@@ -219,39 +223,39 @@ export const getColumns = ({
 				const MAX_SOURCES = 3;
 				const count = value.length === MAX_SOURCES + 1 ? value.length : MAX_SOURCES;
 				return (
-					<Avatar.Group
-						max={{
-							count: count,
-							style: {
-								color: token.baseGray90,
+					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}`,
-							},
-						}}
-						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>
+								display: "flex",
+								alignItems: "center",
+								justifyContent: "center",
+							}}
+						>
+							<CustomIcon
+								name="Organisation02"
+								width={18}
+								height={18}
+								color={token.baseGray90}
+							/>
+						</Avatar>
+					))}
+				</Avatar.Group> : '-'
 				);
 			},
 		},