datastake-daf 0.6.340 → 0.6.342

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/components/index.js +7 -6
  2. package/package.json +1 -1
  3. package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/helper.js +2 -2
  4. package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/LocationTable.stories.js +357 -87
  5. package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/helper.js +2 -2
  6. package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx +3 -2
package/dist/components/index.js CHANGED
@@ -55742,7 +55742,7 @@ const getColumns$2 = ({
55742
55742
  }
55743
55743
  let label;
55744
55744
  if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
55745
- label = all?.linking?.SCL?.value?.name;
55745
+ label = all?.linking?.SCL?.[value]?.name;
55746
55746
  } else {
55747
55747
  label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
55748
55748
  }
@@ -55765,7 +55765,7 @@ const getColumns$2 = ({
55765
55765
  }
55766
55766
  let label;
55767
55767
  if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
55768
- label = all?.linking?.SCL?.value?.name;
55768
+ label = all?.linking?.SCL?.[value]?.name;
55769
55769
  } else {
55770
55770
  label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
55771
55771
  }
@@ -55900,7 +55900,7 @@ const getColumns$1 = ({
55900
55900
  render: (value, all) => {
55901
55901
  let label;
55902
55902
  if (all?.administrativeLevel1 && value === all?.administrativeLevel1) {
55903
- label = all?.linking?.SCL?.value?.name;
55903
+ label = all?.linking?.SCL?.[value]?.name;
55904
55904
  } else {
55905
55905
  label = getNameByLevel(all?.linking?.SCL, "level_1")?.name;
55906
55906
  }
@@ -55916,7 +55916,7 @@ const getColumns$1 = ({
55916
55916
  render: (value, all) => {
55917
55917
  let label;
55918
55918
  if (all?.administrativeLevel2 && value === all?.administrativeLevel2) {
55919
- label = all?.linking?.SCL?.value?.name;
55919
+ label = all?.linking?.SCL?.[value]?.name;
55920
55920
  } else {
55921
55921
  label = getNameByLevel(all?.linking?.SCL, "level_2")?.name;
55922
55922
  }
@@ -56220,9 +56220,10 @@ function LocationTable(_ref) {
56220
56220
  setCombineLocationVisible(false);
56221
56221
  },
56222
56222
  onSuccess: data => {
56223
- console.log(data, "success data");
56224
56223
  setCombineLocationVisible(false);
56225
- // mergeSubjectsFunction(data);
56224
+ if (typeof mergeSubjectsFunction === 'function') {
56225
+ mergeSubjectsFunction(data);
56226
+ }
56226
56227
  },
56227
56228
  selectedLocations: selectedLocations,
56228
56229
  selectOptions: selectOptions || {},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "datastake-daf",
3
- "version": "0.6.340",
3
+ "version": "0.6.342",
4
4
  "dependencies": {
5
5
  "@ant-design/icons": "^5.2.5",
6
6
  "@antv/g2": "^5.1.1",
package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/helper.js CHANGED
@@ -47,7 +47,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
47
47
  render: (value, all) => {
48
48
  let label;
49
49
  if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
50
- label = all?.linking?.SCL?.value?.name
50
+ label = all?.linking?.SCL?.[value]?.name
51
51
  } else {
52
52
  label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
53
53
  }
@@ -62,7 +62,7 @@ export const getColumns = ({ t, selectOptions, module }) => {
62
62
  render: (value, all) => {
63
63
  let label;
64
64
  if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
65
- label = all?.linking?.SCL?.value?.name
65
+ label = all?.linking?.SCL?.[value]?.name
66
66
  } else {
67
67
  label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
68
68
  }
package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/LocationTable.stories.js CHANGED
@@ -27,29 +27,41 @@ export const Primary = {
27
27
  data: {
28
28
  data: [
29
29
  {
30
- "_id": "68d15dff5c53c03e613a978b",
31
- "createdAt": "2025-09-22T14:32:31.513Z",
32
- "updatedAt": "2025-09-22T14:32:31.513Z",
33
- "id": "937b8b13-947d-4ee0-accf-961cbc63c663",
30
+ "_id": "68d15e0f5c53c03e613a9828",
31
+ "createdAt": "2025-09-22T14:32:47.847Z",
32
+ "updatedAt": "2025-09-22T14:32:47.847Z",
33
+ "id": "ccc59d38-43f0-4b37-bb52-c844a2cdf14a",
34
34
  "name": "Armed Group",
35
35
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
36
- "collectId": "5d0ba2c7110a07ae97fa63e06b1041fe76367e2b",
36
+ "collectId": "7e8657085a039941b1adadf0fc6f07e70c46cd9b",
37
37
  "country": "AL",
38
- "category": "nonStateArmedGroup",
39
- "sources": [],
40
- "subCategory": "militia",
41
- "datastakeId": "STK-00000000452",
38
+ "administrativeLevel1": "822d339e-a0a8-4987-b344-d98b6699f3bd",
39
+ "administrativeLevel2": "629e5e97-77bb-4bd3-a783-deef01e494a9",
40
+ "category": "conflictArea",
41
+ "datastakeId": "LOC-00000000243",
42
42
  "linking": {
43
43
  "SCL": {
44
- "6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
44
+ "629e5e97-77bb-4bd3-a783-deef01e494a9": {
45
45
  "_id": {},
46
- "createdAt": "2023-02-19T17:25:34.444Z",
47
- "updatedAt": "2023-02-19T17:25:34.444Z",
48
- "id": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
46
+ "createdAt": "2023-02-19T17:25:34.459Z",
47
+ "updatedAt": "2023-02-19T17:25:34.459Z",
48
+ "id": "629e5e97-77bb-4bd3-a783-deef01e494a9",
49
+ "level": "level_2",
50
+ "country": "AL",
51
+ "collectId": "48f7681ece1e3033b780f748973d88a10974140d",
52
+ "name": "Dibrës",
53
+ "administrativeLevel1": "822d339e-a0a8-4987-b344-d98b6699f3bd",
54
+ "__v": 0
55
+ },
56
+ "822d339e-a0a8-4987-b344-d98b6699f3bd": {
57
+ "_id": {},
58
+ "createdAt": "2023-02-19T17:25:34.445Z",
59
+ "updatedAt": "2023-02-19T17:25:34.445Z",
60
+ "id": "822d339e-a0a8-4987-b344-d98b6699f3bd",
49
61
  "level": "level_1",
50
62
  "country": "AL",
51
- "collectId": "1e29d64aee47553eba7e89bf04d43cc7c1c1a017",
52
- "name": "Berat",
63
+ "collectId": "3635c68fd1f902751fd4c7a41f1456a1bed79257",
64
+ "name": "Dibër",
53
65
  "__v": 0
54
66
  }
55
67
  }
@@ -57,20 +69,32 @@ export const Primary = {
57
69
  "__v": 0
58
70
  },
59
71
  {
60
- "_id": "68d26bad5c53c03e613a9fef",
61
- "createdAt": "2025-09-23T09:43:09.055Z",
62
- "updatedAt": "2025-09-23T09:43:09.055Z",
63
- "id": "e3d4b71c-63b2-4a57-8833-ea4cfa519a67",
72
+ "_id": "68d26bbd5c53c03e613aa071",
73
+ "createdAt": "2025-09-23T09:43:25.869Z",
74
+ "updatedAt": "2025-09-23T09:43:25.869Z",
75
+ "id": "3e0caa5b-2677-423b-9929-deda36cdf36c",
64
76
  "name": "Test",
65
77
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
66
- "collectId": "cc1e6e29bb85f01ec835687b607f8179d7ea3ff3",
78
+ "collectId": "3e5924ab27a2ff28f6a70dbbe20e11d75474bcc0",
67
79
  "country": "AL",
68
- "category": "nonStateArmedGroup",
69
- "sources": [],
70
- "subCategory": "militia",
71
- "datastakeId": "STK-00000000453",
80
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
81
+ "administrativeLevel2": "4cf54e97-fd16-4983-a8ef-aae551d105c9",
82
+ "category": "conflictArea",
83
+ "datastakeId": "LOC-00000000244",
72
84
  "linking": {
73
85
  "SCL": {
86
+ "4cf54e97-fd16-4983-a8ef-aae551d105c9": {
87
+ "_id": {},
88
+ "createdAt": "2023-02-19T17:25:34.458Z",
89
+ "updatedAt": "2023-02-19T17:25:34.458Z",
90
+ "id": "4cf54e97-fd16-4983-a8ef-aae551d105c9",
91
+ "level": "level_2",
92
+ "country": "AL",
93
+ "collectId": "ee33b849f448f982f45db56fe6ff887ffd21b15b",
94
+ "name": "Kuçovës",
95
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
96
+ "__v": 0
97
+ },
74
98
  "6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
75
99
  "_id": {},
76
100
  "createdAt": "2023-02-19T17:25:34.444Z",
@@ -87,93 +111,339 @@ export const Primary = {
87
111
  "__v": 0
88
112
  },
89
113
  {
90
- "_id": "68d519355c53c03e613ad03a",
91
- "createdAt": "2025-09-25T10:28:05.989Z",
92
- "updatedAt": "2025-09-25T10:28:05.989Z",
93
- "id": "1f5ac021-c82d-46ce-817a-c4045392b13d",
94
- "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.",
114
+ "_id": "68d660fb64890754e9a4fe47",
115
+ "createdAt": "2025-09-26T09:46:35.807Z",
116
+ "updatedAt": "2025-09-26T09:46:35.807Z",
117
+ "id": "0b3a14b4-2eb8-43af-908a-2048174e36e0",
118
+ "name": "Test :pca",
95
119
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
96
- "collectId": "203f6b80dac93e506d50073b0a8e365a727aceae",
97
- "country": "AX",
98
- "category": "corporation",
99
- "sources": [],
100
- "subCategory": "publicCompany",
101
- "datastakeId": "STK-00000000454",
120
+ "collectId": "ec2f79968b4be6d84da7b1e443101a36cd81bdcb",
121
+ "country": "CD",
122
+ "administrativeLevel1": "mongala",
123
+ "administrativeLevel2": "bongandanga",
124
+ "category": "mineSite",
125
+ "datastakeId": "LOC-00000000245",
126
+ "linking": {
127
+ "SCL": {
128
+ "bongandanga": {
129
+ "_id": {},
130
+ "createdAt": "2021-01-21T22:01:18.594Z",
131
+ "updatedAt": "2021-01-21T22:01:18.594Z",
132
+ "id": "bongandanga",
133
+ "level": "level_2",
134
+ "country": "CD",
135
+ "collectId": "3134239a2f1552a156bea17df8ed2a88df8dc358",
136
+ "name": "Bongandanga",
137
+ "administrativeLevel1": "mongala",
138
+ "__v": 0
139
+ },
140
+ "mongala": {
141
+ "_id": {},
142
+ "createdAt": "2021-01-21T22:00:55.686Z",
143
+ "updatedAt": "2021-01-21T22:00:55.686Z",
144
+ "id": "mongala",
145
+ "level": "level_1",
146
+ "country": "CD",
147
+ "collectId": "039ec02240415832a7f29086e087a396997880bd",
148
+ "name": "Mongala",
149
+ "__v": 0
150
+ }
151
+ }
152
+ },
102
153
  "__v": 0
103
154
  },
104
155
  {
105
- "_id": "68d687408a2a09b08388b0e8",
106
- "createdAt": "2025-09-26T12:29:52.120Z",
107
- "updatedAt": "2025-09-26T12:29:52.120Z",
108
- "id": "9fe2475c-98a6-4a72-a9c7-0b459f44c0ed",
109
- "name": "ANOTHER OP",
156
+ "_id": "68d662a547d0efb5ba6ddeee",
157
+ "createdAt": "2025-09-26T09:53:41.180Z",
158
+ "updatedAt": "2025-09-26T09:53:41.180Z",
159
+ "id": "cb3847ed-ccdf-4d5a-b5ba-1862620ec95b",
160
+ "name": "shume tester ",
110
161
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
111
- "collectId": "d77e36a69838047cc627933b935a93dcedb1ee06",
112
- "country": "AL",
113
- "category": "corporation",
114
- "sources": [],
115
- "subCategory": "publicCompany",
116
- "datastakeId": "STK-00000000455",
162
+ "collectId": "a2c1bd6a31704f8a53775c35da4f3576bf5b812e",
163
+ "country": "CD",
164
+ "administrativeLevel1": "tanganyika",
165
+ "administrativeLevel2": "kalemie",
166
+ "category": "mineSite",
167
+ "datastakeId": "LOC-00000000246",
168
+ "linking": {
169
+ "SCL": {
170
+ "kalemie": {
171
+ "_id": {},
172
+ "createdAt": "2021-01-21T22:01:20.816Z",
173
+ "updatedAt": "2021-01-21T22:01:20.816Z",
174
+ "id": "kalemie",
175
+ "level": "level_2",
176
+ "country": "CD",
177
+ "collectId": "de1e5aab09f08214b157815a764ccbf42dcf3dc9",
178
+ "name": "Kalemie",
179
+ "administrativeLevel1": "tanganyika",
180
+ "__v": 0
181
+ },
182
+ "tanganyika": {
183
+ "_id": {},
184
+ "createdAt": "2021-01-21T22:00:55.690Z",
185
+ "updatedAt": "2021-01-21T22:00:55.690Z",
186
+ "id": "tanganyika",
187
+ "level": "level_1",
188
+ "country": "CD",
189
+ "collectId": "0058fb0969145f842aad519be9deccdf466ef67c",
190
+ "name": "Tanganyika",
191
+ "__v": 0
192
+ }
193
+ }
194
+ },
117
195
  "__v": 0
118
196
  },
119
197
  {
120
- "_id": "68d6881b5b4566f0cabcbff2",
121
- "createdAt": "2025-09-26T12:33:31.263Z",
122
- "updatedAt": "2025-09-26T12:33:31.263Z",
123
- "id": "9c561b78-452a-468a-9c71-a8380d1bdc1d",
124
- "name": "SOME GUY",
198
+ "_id": "68d662ce47d0efb5ba6de050",
199
+ "createdAt": "2025-09-26T09:54:22.935Z",
200
+ "updatedAt": "2025-09-26T09:54:22.935Z",
201
+ "id": "42d549b8-fccc-441e-ada9-d5baab9fc435",
202
+ "name": "324324",
125
203
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
126
- "collectId": "a94ffae8f0f46dcde6d9c5f21eab16b041051209",
127
- "country": "AL",
128
- "category": "corporation",
129
- "sources": [],
130
- "subCategory": "publicCompany",
131
- "datastakeId": "STK-00000000456",
204
+ "collectId": "7ab72f8ae551d248fa37f8b2276a015b7e35dc08",
205
+ "country": "CD",
206
+ "administrativeLevel1": "mongala",
207
+ "administrativeLevel2": "bumba",
208
+ "category": "mineSite",
209
+ "datastakeId": "LOC-00000000247",
210
+ "linking": {
211
+ "SCL": {
212
+ "bumba": {
213
+ "_id": {},
214
+ "createdAt": "2021-01-21T22:01:20.790Z",
215
+ "updatedAt": "2021-01-21T22:01:20.790Z",
216
+ "id": "bumba",
217
+ "level": "level_2",
218
+ "country": "CD",
219
+ "collectId": "0ea0a1c2a098e90b2ffbde1af87fce5e4621e980",
220
+ "name": "Bumba",
221
+ "administrativeLevel1": "mongala",
222
+ "__v": 0
223
+ },
224
+ "mongala": {
225
+ "_id": {},
226
+ "createdAt": "2021-01-21T22:00:55.686Z",
227
+ "updatedAt": "2021-01-21T22:00:55.686Z",
228
+ "id": "mongala",
229
+ "level": "level_1",
230
+ "country": "CD",
231
+ "collectId": "039ec02240415832a7f29086e087a396997880bd",
232
+ "name": "Mongala",
233
+ "__v": 0
234
+ }
235
+ }
236
+ },
132
237
  "__v": 0
133
238
  },
134
239
  {
135
- "_id": "68d6946a84cca23fe8a6abe4",
136
- "createdAt": "2025-09-26T13:26:02.415Z",
137
- "updatedAt": "2025-09-26T13:26:02.415Z",
138
- "id": "bb2a2497-eae6-47a4-b903-9f0663dc8b0c",
139
- "name": "THIS SOWULD BE THE 4-th OP FOR THIS MS",
240
+ "_id": "68d663a196d0c4b46dd4d900",
241
+ "createdAt": "2025-09-26T09:57:53.795Z",
242
+ "updatedAt": "2025-09-26T09:57:53.795Z",
243
+ "id": "e6cf80d7-ac2b-4785-9197-bb88b5455197",
244
+ "name": "345435",
140
245
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
141
- "collectId": "da9d2cb826b1ffb51f3acc97a3bc2d2110bad033",
246
+ "collectId": "5143e6d7d691ff7a9058012f2bea8eba3331dee6",
142
247
  "country": "AL",
143
- "category": "corporation",
144
- "sources": [],
145
- "subCategory": "privateCompany",
146
- "datastakeId": "STK-00000000457",
248
+ "administrativeLevel1": "822d339e-a0a8-4987-b344-d98b6699f3bd",
249
+ "administrativeLevel2": "1e680d2d-bb3f-4086-96c7-f07ec26ae7dd",
250
+ "category": "area",
251
+ "datastakeId": "LOC-00000000248",
252
+ "linking": {
253
+ "SCL": {
254
+ "1e680d2d-bb3f-4086-96c7-f07ec26ae7dd": {
255
+ "_id": {},
256
+ "createdAt": "2023-02-19T17:25:34.459Z",
257
+ "updatedAt": "2023-02-19T17:25:34.459Z",
258
+ "id": "1e680d2d-bb3f-4086-96c7-f07ec26ae7dd",
259
+ "level": "level_2",
260
+ "country": "AL",
261
+ "collectId": "d0a3eedc784f9a70f6435a696d745361725c952f",
262
+ "name": "Bulqizës",
263
+ "administrativeLevel1": "822d339e-a0a8-4987-b344-d98b6699f3bd",
264
+ "__v": 0
265
+ },
266
+ "822d339e-a0a8-4987-b344-d98b6699f3bd": {
267
+ "_id": {},
268
+ "createdAt": "2023-02-19T17:25:34.445Z",
269
+ "updatedAt": "2023-02-19T17:25:34.445Z",
270
+ "id": "822d339e-a0a8-4987-b344-d98b6699f3bd",
271
+ "level": "level_1",
272
+ "country": "AL",
273
+ "collectId": "3635c68fd1f902751fd4c7a41f1456a1bed79257",
274
+ "name": "Dibër",
275
+ "__v": 0
276
+ }
277
+ }
278
+ },
147
279
  "__v": 0
148
280
  },
149
281
  {
150
- "_id": "68d6963009b07d172ba0ed25",
151
- "createdAt": "2025-09-26T13:33:36.403Z",
152
- "updatedAt": "2025-09-26T13:33:36.403Z",
153
- "id": "058894d7-22a8-4804-b4a8-98be5003f310",
154
- "name": "THE BES OP EVER",
282
+ "_id": "68d66b2c69d1126ca1fa7565",
283
+ "createdAt": "2025-09-26T10:30:04.050Z",
284
+ "updatedAt": "2025-09-26T10:30:04.050Z",
285
+ "id": "5d7bce2c-4273-4e42-8871-6f9e4afbddec",
286
+ "name": "342324234",
155
287
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
156
- "collectId": "6d8b56767a7edc6fc605d9c669ce0878d4918630",
157
- "country": "AX",
158
- "category": "corporation",
159
- "sources": [],
160
- "subCategory": "stockCompany",
161
- "datastakeId": "STK-00000000458",
288
+ "collectId": "fa1550b14aef12635a09da102899725c7d044f2a",
289
+ "country": "AF",
290
+ "administrativeLevel1": "3ce33e90-2217-488b-95b2-955933eaeec2",
291
+ "administrativeLevel2": "55e213a6-52a6-425a-8fa1-815949a0568e",
292
+ "category": "area",
293
+ "datastakeId": "LOC-00000000249",
294
+ "linking": {
295
+ "SCL": {
296
+ "3ce33e90-2217-488b-95b2-955933eaeec2": {
297
+ "_id": {},
298
+ "createdAt": "2023-09-19T10:34:22.840Z",
299
+ "updatedAt": "2023-09-19T10:34:22.840Z",
300
+ "id": "3ce33e90-2217-488b-95b2-955933eaeec2",
301
+ "level": "level_1",
302
+ "country": "AF",
303
+ "collectId": "1405ac04e3a2d0645a46bc30a98c9130d1f16c3c",
304
+ "name": "Kandahar",
305
+ "__v": 0
306
+ },
307
+ "55e213a6-52a6-425a-8fa1-815949a0568e": {
308
+ "_id": {},
309
+ "createdAt": "2023-09-19T10:34:33.451Z",
310
+ "updatedAt": "2023-09-19T10:34:33.451Z",
311
+ "id": "55e213a6-52a6-425a-8fa1-815949a0568e",
312
+ "level": "level_2",
313
+ "country": "AF",
314
+ "collectId": "6e5503b1d89004b33fe9a2abba50cbc348e14829",
315
+ "name": "Arghandab",
316
+ "administrativeLevel1": "3ce33e90-2217-488b-95b2-955933eaeec2",
317
+ "__v": 0
318
+ }
319
+ }
320
+ },
321
+ "__v": 0
322
+ },
323
+ {
324
+ "_id": "68d6844c00b8322cb5c033c1",
325
+ "createdAt": "2025-09-26T12:17:16.674Z",
326
+ "updatedAt": "2025-09-26T12:17:16.674Z",
327
+ "id": "c125c756-0015-4f4c-bcb9-1facfdb09403",
328
+ "name": "Ilvi ms",
329
+ "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
330
+ "collectId": "94585792355f916be23479550c27a89fa954b0f9",
331
+ "country": "CD",
332
+ "administrativeLevel1": "mongala",
333
+ "administrativeLevel2": "bongandanga",
334
+ "category": "mineSite",
335
+ "datastakeId": "LOC-00000000250",
336
+ "linking": {
337
+ "SCL": {
338
+ "bongandanga": {
339
+ "_id": {},
340
+ "createdAt": "2021-01-21T22:01:18.594Z",
341
+ "updatedAt": "2021-01-21T22:01:18.594Z",
342
+ "id": "bongandanga",
343
+ "level": "level_2",
344
+ "country": "CD",
345
+ "collectId": "3134239a2f1552a156bea17df8ed2a88df8dc358",
346
+ "name": "Bongandanga",
347
+ "administrativeLevel1": "mongala",
348
+ "__v": 0
349
+ },
350
+ "mongala": {
351
+ "_id": {},
352
+ "createdAt": "2021-01-21T22:00:55.686Z",
353
+ "updatedAt": "2021-01-21T22:00:55.686Z",
354
+ "id": "mongala",
355
+ "level": "level_1",
356
+ "country": "CD",
357
+ "collectId": "039ec02240415832a7f29086e087a396997880bd",
358
+ "name": "Mongala",
359
+ "__v": 0
360
+ }
361
+ }
362
+ },
363
+ "__v": 0
364
+ },
365
+ {
366
+ "_id": "68d698f256c1ef8316e58b06",
367
+ "createdAt": "2025-09-26T13:45:22.830Z",
368
+ "updatedAt": "2025-09-26T13:45:22.830Z",
369
+ "id": "b927201d-18ba-4154-92ae-0f79077f7d99",
370
+ "name": "Test 123",
371
+ "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
372
+ "collectId": "f94be122667e35213cc4b74954414bb0172f0f43",
373
+ "country": "AL",
374
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
375
+ "administrativeLevel2": "f849835d-5640-4bee-ae98-9f1c810c1abe",
376
+ "category": "area",
377
+ "datastakeId": "LOC-00000000251",
378
+ "linking": {
379
+ "SCL": {
380
+ "6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
381
+ "_id": {},
382
+ "createdAt": "2023-02-19T17:25:34.444Z",
383
+ "updatedAt": "2023-02-19T17:25:34.444Z",
384
+ "id": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
385
+ "level": "level_1",
386
+ "country": "AL",
387
+ "collectId": "1e29d64aee47553eba7e89bf04d43cc7c1c1a017",
388
+ "name": "Berat",
389
+ "__v": 0
390
+ },
391
+ "f849835d-5640-4bee-ae98-9f1c810c1abe": {
392
+ "_id": {},
393
+ "createdAt": "2023-02-19T17:25:34.458Z",
394
+ "updatedAt": "2023-02-19T17:25:34.458Z",
395
+ "id": "f849835d-5640-4bee-ae98-9f1c810c1abe",
396
+ "level": "level_2",
397
+ "country": "AL",
398
+ "collectId": "31be82b800f58603b5813992efa9043c2536261c",
399
+ "name": "Beratit",
400
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
401
+ "__v": 0
402
+ }
403
+ }
404
+ },
162
405
  "__v": 0
163
406
  },
164
407
  {
165
- "_id": "68d6999991fe77d8e0113b0b",
166
- "createdAt": "2025-09-26T13:48:09.933Z",
167
- "updatedAt": "2025-09-26T13:48:09.933Z",
168
- "id": "0777e572-6f47-4d54-a58c-7a43ef26d3c1",
408
+ "_id": "68d699cc91fe77d8e0113c32",
409
+ "createdAt": "2025-09-26T13:49:00.537Z",
410
+ "updatedAt": "2025-09-26T13:49:00.537Z",
411
+ "id": "22e19897-046f-4119-a9b4-a2653e854693",
169
412
  "name": "Grupim i armatosur",
170
413
  "authorId": "fc4ca5c6-f46d-424f-a948-d66b031a82c3",
171
- "collectId": "8c26f08b914b23459e52e3506e30caf508d9679d",
414
+ "collectId": "0d3811cc5defec843398290a429e148726a61f60",
172
415
  "country": "AL",
173
- "category": "nonStateArmedGroup",
174
- "sources": [],
175
- "subCategory": "militia",
176
- "datastakeId": "STK-00000000459",
416
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
417
+ "administrativeLevel2": "f849835d-5640-4bee-ae98-9f1c810c1abe",
418
+ "category": "area",
419
+ "datastakeId": "LOC-00000000252",
420
+ "linking": {
421
+ "SCL": {
422
+ "6839cb26-5af4-44a3-b136-a0f0a0bcecc6": {
423
+ "_id": {},
424
+ "createdAt": "2023-02-19T17:25:34.444Z",
425
+ "updatedAt": "2023-02-19T17:25:34.444Z",
426
+ "id": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
427
+ "level": "level_1",
428
+ "country": "AL",
429
+ "collectId": "1e29d64aee47553eba7e89bf04d43cc7c1c1a017",
430
+ "name": "Berat",
431
+ "__v": 0
432
+ },
433
+ "f849835d-5640-4bee-ae98-9f1c810c1abe": {
434
+ "_id": {},
435
+ "createdAt": "2023-02-19T17:25:34.458Z",
436
+ "updatedAt": "2023-02-19T17:25:34.458Z",
437
+ "id": "f849835d-5640-4bee-ae98-9f1c810c1abe",
438
+ "level": "level_2",
439
+ "country": "AL",
440
+ "collectId": "31be82b800f58603b5813992efa9043c2536261c",
441
+ "name": "Beratit",
442
+ "administrativeLevel1": "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
443
+ "__v": 0
444
+ }
445
+ }
446
+ },
177
447
  "__v": 0
178
448
  }
179
449
  ],
package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/helper.js CHANGED
@@ -181,7 +181,7 @@ export const getColumns = ({
181
181
 
182
182
  let label;
183
183
  if(all?.administrativeLevel1 && value === all?.administrativeLevel1) {
184
- label = all?.linking?.SCL?.value?.name
184
+ label = all?.linking?.SCL?.[value]?.name
185
185
  } else {
186
186
  label = getNameByLevel(all?.linking?.SCL, "level_1")?.name
187
187
  }
@@ -202,7 +202,7 @@ export const getColumns = ({
202
202
 
203
203
  let label;
204
204
  if(all?.administrativeLevel2 && value === all?.administrativeLevel2) {
205
- label = all?.linking?.SCL?.value?.name
205
+ label = all?.linking?.SCL?.[value]?.name
206
206
  } else {
207
207
  label = getNameByLevel(all?.linking?.SCL, "level_2")?.name
208
208
  }
package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx CHANGED
@@ -159,9 +159,10 @@ export default function LocationTable({
159
159
  setCombineLocationVisible(false);
160
160
  }}
161
161
  onSuccess={(data) => {
162
- console.log(data, "success data");
163
162
  setCombineLocationVisible(false);
164
- // mergeSubjectsFunction(data);
163
+ if (typeof mergeSubjectsFunction === 'function') {
164
+ mergeSubjectsFunction(data);
165
+ }
165
166
  }}
166
167
  selectedLocations={selectedLocations}
167
168
  selectOptions={selectOptions || {}}