datastake-daf 0.6.844 → 0.6.845

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 (10) hide show
  1. package/build/favicon.ico +0 -0
  2. package/build/logo192.png +0 -0
  3. package/build/logo512.png +0 -0
  4. package/build/manifest.json +25 -0
  5. package/build/robots.txt +3 -0
  6. package/dist/components/index.js +2196 -2320
  7. package/dist/pages/index.js +15 -10
  8. package/package.json +1 -1
  9. package/src/@daf/core/components/EditForm/helper.js +14 -6
  10. package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/config.js +10 -1
package/dist/pages/index.js CHANGED
@@ -14265,6 +14265,8 @@ const getFiltersConfig$e = ({
14265
14265
  value: item.value,
14266
14266
  label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
14267
14267
  }));
14268
+ const merged = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
14269
+ const deduped = Array.from(new Map(merged.map(item => [item.value, item])).values());
14268
14270
  if (activeTab === 'stakeholder') {
14269
14271
  return [{
14270
14272
  label: t("Stakeholder type"),
@@ -14291,7 +14293,7 @@ const getFiltersConfig$e = ({
14291
14293
  key: "type",
14292
14294
  type: "select",
14293
14295
  ...value,
14294
- options: [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])] ?? []
14296
+ options: deduped
14295
14297
  }];
14296
14298
  };
14297
14299
 
@@ -34207,10 +34209,14 @@ const inputTypeComponent$1 = {
34207
34209
  }
34208
34210
  return {
34209
34211
  label: o.label,
34210
- items: opts.filter(op => op.group === o.value)
34212
+ items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
34211
34213
  };
34212
34214
  });
34213
- const notGrouped = opts.filter(op => !gKeys.includes(op.group));
34215
+ const notGrouped = opts.filter(op => {
34216
+ const filterValue = op?.filters?.[0]?.value;
34217
+ if (!filterValue) return true;
34218
+ return !gKeys.some(key => filterValue.includes(key));
34219
+ });
34214
34220
  if (notGrouped.length) {
34215
34221
  groupOptions.unshift(...notGrouped);
34216
34222
  }
@@ -34374,20 +34380,19 @@ const inputTypeComponent$1 = {
34374
34380
  }
34375
34381
  return {
34376
34382
  label: o.label,
34377
- items: opts.filter(op => op.group === o.value)
34383
+ items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
34378
34384
  };
34379
34385
  });
34380
- const notGrouped = opts.filter(op => !gKeys.includes(op.group));
34386
+ const notGrouped = opts.filter(op => {
34387
+ const filterValue = op?.filters?.[0]?.value;
34388
+ if (!filterValue) return true;
34389
+ return !gKeys.some(key => filterValue.includes(key));
34390
+ });
34381
34391
  if (notGrouped.length) {
34382
34392
  groupOptions.unshift(...notGrouped);
34383
34393
  }
34384
34394
  opts = groupOptions;
34385
34395
  }
34386
- console.log({
34387
- maxWidth,
34388
- staticWidth,
34389
- fullWidth
34390
- });
34391
34396
  return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
34392
34397
  size: "medium",
34393
34398
  allowClear: true,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "datastake-daf",
3
- "version": "0.6.844",
3
+ "version": "0.6.845",
4
4
  "dependencies": {
5
5
  "@ant-design/icons": "^5.2.5",
6
6
  "@antv/g2": "^5.1.1",
package/src/@daf/core/components/EditForm/helper.js CHANGED
@@ -778,10 +778,15 @@ export const inputTypeComponent = {
778
778
  }
779
779
  return {
780
780
  label: o.label,
781
- items: opts.filter((op) => op.group === o.value),
781
+ items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
782
782
  };
783
783
  });
784
- const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
784
+ const notGrouped = opts.filter((op) => {
785
+ const filterValue = op?.filters?.[0]?.value;
786
+ if (!filterValue) return true;
787
+
788
+ return !gKeys.some(key => filterValue.includes(key));
789
+ });
785
790
  if (notGrouped.length) {
786
791
  groupOptions.unshift(...notGrouped);
787
792
  }
@@ -975,18 +980,21 @@ export const inputTypeComponent = {
975
980
  }
976
981
  return {
977
982
  label: o.label,
978
- items: opts.filter((op) => op.group === o.value),
983
+ items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
979
984
  };
980
985
  });
981
- const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
986
+ const notGrouped = opts.filter((op) => {
987
+ const filterValue = op?.filters?.[0]?.value;
988
+ if (!filterValue) return true;
989
+
990
+ return !gKeys.some(key => filterValue.includes(key));
991
+ });
982
992
  if (notGrouped.length) {
983
993
  groupOptions.unshift(...notGrouped);
984
994
  }
985
995
  opts = groupOptions;
986
996
  }
987
997
 
988
- console.log({maxWidth, staticWidth, fullWidth});
989
-
990
998
  return (
991
999
  <Select
992
1000
  size="medium"
package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/config.js CHANGED
@@ -14,6 +14,15 @@ export const getFiltersConfig = ({t, filters, activeTab, options}) => {
14
14
  label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
15
15
  }))
16
16
 
17
+ const merged = [
18
+ ...(options?.locationCategories || []),
19
+ ...(options?.productionSiteCategories || [])
20
+ ];
21
+
22
+ const deduped = Array.from(
23
+ new Map(merged.map(item => [item.value, item])).values()
24
+ );
25
+
17
26
  if(activeTab === 'stakeholder') {
18
27
  return [
19
28
  {
@@ -47,7 +56,7 @@ export const getFiltersConfig = ({t, filters, activeTab, options}) => {
47
56
  key: "type",
48
57
  type: "select",
49
58
  ...value,
50
- options: [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])] ?? [],
59
+ options: deduped
51
60
  },
52
61
  ];
53
62
  }