datastake-daf 0.6.264 → 0.6.265
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.
- package/.env +8 -0
- package/.vscode/settings.json +13 -0
- package/dist/components/index.js +64 -117
- package/package.json +2 -2
- package/src/@daf/core/components/Dashboard/Globe/Globe.stories.js +5 -30
- package/src/@daf/core/components/Dashboard/Globe/hook.js +7 -63
- package/src/@daf/core/components/Dashboard/Globe/index.jsx +6 -24
- package/src/@daf/core/components/Dashboard/Map/helper.js +7 -0
- package/src/@daf/core/components/Dashboard/Map/hook.js +2 -0
- package/src/@daf/core/components/Dashboard/Map/index.jsx +159 -165
- package/src/@daf/core/components/Dashboard/Map/storyConfig3.js +6 -0
- package/src/@daf/core/components/EditForm/form.jsx +621 -551
- package/src/@daf/core/components/EditForm/storyConfig2.js +28 -33
- package/src/@daf/core/components/Dashboard/Globe/storyConfig.js +0 -243
- package/src/@daf/core/components/Dashboard/Globe/storyConfig1.js +0 -354
package/.env
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
"cSpell.words": ["cukura"],
|
|
3
|
+
"files.autoSave": "afterDelay",
|
|
4
|
+
"editor.wordWrap": "on",
|
|
5
|
+
"editor.autoClosingBrackets": "always",
|
|
6
|
+
"editor.autoClosingComments": "always",
|
|
7
|
+
"editor.autoClosingQuotes": "always",
|
|
8
|
+
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
9
|
+
"editor.formatOnPaste": true,
|
|
10
|
+
"editor.formatOnSave": true,
|
|
11
|
+
"notebook.defaultFormatter": "esbenp.prettier-vscode",
|
|
12
|
+
"javascript.format.semicolons": "insert"
|
|
13
|
+
}
|
package/dist/components/index.js
CHANGED
|
@@ -18213,6 +18213,7 @@ function useMapHelper$1({
|
|
|
18213
18213
|
mapCenter,
|
|
18214
18214
|
allData,
|
|
18215
18215
|
renderTooltip,
|
|
18216
|
+
renderTooltipTags,
|
|
18216
18217
|
onClickLink,
|
|
18217
18218
|
link,
|
|
18218
18219
|
tooltipAsText,
|
|
@@ -18332,6 +18333,7 @@ function useMapHelper$1({
|
|
|
18332
18333
|
...data,
|
|
18333
18334
|
totals
|
|
18334
18335
|
}),
|
|
18336
|
+
tags: renderTooltipTags(data),
|
|
18335
18337
|
link,
|
|
18336
18338
|
total: data.sources,
|
|
18337
18339
|
onClickLink: () => onClickLink(data)
|
|
@@ -18355,6 +18357,7 @@ function useMapHelper$1({
|
|
|
18355
18357
|
children: renderTooltipJsx({
|
|
18356
18358
|
title: data.name,
|
|
18357
18359
|
items: renderTooltip(data),
|
|
18360
|
+
tags: renderTooltipTags(data),
|
|
18358
18361
|
link,
|
|
18359
18362
|
total: data.sources,
|
|
18360
18363
|
onClickLink: () => onClickLink(data)
|
|
@@ -18387,6 +18390,7 @@ function useMapHelper$1({
|
|
|
18387
18390
|
data: data,
|
|
18388
18391
|
title: data.name,
|
|
18389
18392
|
renderTooltip: renderTooltip,
|
|
18393
|
+
renderTooltipTags: renderTooltipTags,
|
|
18390
18394
|
link: link,
|
|
18391
18395
|
onClickLink: onClickLink,
|
|
18392
18396
|
activeStakeholder: activeStakeholder,
|
|
@@ -18421,7 +18425,8 @@ function useMapHelper$1({
|
|
|
18421
18425
|
total: data.sources,
|
|
18422
18426
|
link,
|
|
18423
18427
|
onClickLink: () => onClickLink(data),
|
|
18424
|
-
items: renderTooltip(data)
|
|
18428
|
+
items: renderTooltip(data),
|
|
18429
|
+
tags: renderTooltipTags(data)
|
|
18425
18430
|
})
|
|
18426
18431
|
}));
|
|
18427
18432
|
roots.current.push(root);
|
|
@@ -18467,7 +18472,8 @@ function useMapHelper$1({
|
|
|
18467
18472
|
total: data.sources,
|
|
18468
18473
|
link,
|
|
18469
18474
|
onClickLink: () => onClickLink(data),
|
|
18470
|
-
items: renderTooltip(data)
|
|
18475
|
+
items: renderTooltip(data),
|
|
18476
|
+
tags: renderTooltipTags(data)
|
|
18471
18477
|
})
|
|
18472
18478
|
}));
|
|
18473
18479
|
roots.current.push(root);
|
|
@@ -18484,7 +18490,7 @@ function useMapHelper$1({
|
|
|
18484
18490
|
}]);
|
|
18485
18491
|
}
|
|
18486
18492
|
}
|
|
18487
|
-
}, [mapRef, renderTooltip, tooltipAsText, onClickLink, zoom, selectedMarkersId, openPopupIdRef.current, handleSelectMarker, activeStakeholder, setActiveStakeholder]);
|
|
18493
|
+
}, [mapRef, renderTooltip, renderTooltipTags, tooltipAsText, onClickLink, zoom, selectedMarkersId, openPopupIdRef.current, handleSelectMarker, activeStakeholder, setActiveStakeholder]);
|
|
18488
18494
|
|
|
18489
18495
|
// Map control handlers
|
|
18490
18496
|
const zoomHandler = React.useCallback(() => mapRef.setZoom(mapRef.getZoom() + 1), [mapRef]);
|
|
@@ -18575,6 +18581,7 @@ const useMap$1 = ({
|
|
|
18575
18581
|
polygon,
|
|
18576
18582
|
app,
|
|
18577
18583
|
renderTooltip,
|
|
18584
|
+
renderTooltipTags,
|
|
18578
18585
|
mapConfig,
|
|
18579
18586
|
tooltipAsText,
|
|
18580
18587
|
renderMarker,
|
|
@@ -18678,6 +18685,7 @@ const useMap$1 = ({
|
|
|
18678
18685
|
allData,
|
|
18679
18686
|
mapCenter,
|
|
18680
18687
|
renderTooltip,
|
|
18688
|
+
renderTooltipTags,
|
|
18681
18689
|
onClickLink,
|
|
18682
18690
|
link,
|
|
18683
18691
|
tooltipAsText,
|
|
@@ -19069,6 +19077,7 @@ function Map$3(_ref) {
|
|
|
19069
19077
|
link,
|
|
19070
19078
|
siderTitle = "Mine Description",
|
|
19071
19079
|
renderTooltip = () => [],
|
|
19080
|
+
renderTooltipTags = () => {},
|
|
19072
19081
|
mapConfig = {},
|
|
19073
19082
|
emptyDescriptionText = "No description provided",
|
|
19074
19083
|
tooltipAsText = false,
|
|
@@ -19105,6 +19114,7 @@ function Map$3(_ref) {
|
|
|
19105
19114
|
t,
|
|
19106
19115
|
app,
|
|
19107
19116
|
renderTooltip,
|
|
19117
|
+
renderTooltipTags,
|
|
19108
19118
|
onClickLink,
|
|
19109
19119
|
link,
|
|
19110
19120
|
mapConfig,
|
|
@@ -19919,26 +19929,14 @@ const useGlobe = ({
|
|
|
19919
19929
|
const addedSources = React.useRef(new Set());
|
|
19920
19930
|
const isMounted = React.useRef(true);
|
|
19921
19931
|
const addAllDataToMap = React.useCallback(() => {
|
|
19922
|
-
|
|
19923
|
-
console.log('🚀 [GLOBE HOOK] data:', data);
|
|
19924
|
-
console.log('🚀 [GLOBE HOOK] mapRef exists:', !!mapRef);
|
|
19925
|
-
console.log('🚀 [GLOBE HOOK] style loaded:', mapRef?.isStyleLoaded());
|
|
19926
|
-
if (!data || !mapRef) {
|
|
19927
|
-
console.log('❌ [GLOBE HOOK] addAllDataToMap early return - missing data or mapRef');
|
|
19928
|
-
return;
|
|
19929
|
-
}
|
|
19930
|
-
if (!mapRef.isStyleLoaded()) {
|
|
19931
|
-
console.log('⏳ [GLOBE HOOK] Style not loaded yet, retrying in 100ms...');
|
|
19932
|
-
setTimeout(() => {
|
|
19933
|
-
addAllDataToMap();
|
|
19934
|
-
}, 100);
|
|
19932
|
+
if (!data || !mapRef || !mapRef.isStyleLoaded()) {
|
|
19935
19933
|
return;
|
|
19936
19934
|
}
|
|
19935
|
+
|
|
19936
|
+
// Prevent multiple calls with empty data
|
|
19937
19937
|
if (data.length === 0) {
|
|
19938
|
-
console.log('❌ [GLOBE HOOK] addAllDataToMap early return - no data');
|
|
19939
19938
|
return;
|
|
19940
19939
|
}
|
|
19941
|
-
console.log('✅ [GLOBE HOOK] Starting to add markers to map...');
|
|
19942
19940
|
|
|
19943
19941
|
// Clear existing markers using functional update to avoid dependency issues
|
|
19944
19942
|
setMapMarkers(currentMarkers => {
|
|
@@ -19990,13 +19988,8 @@ const useGlobe = ({
|
|
|
19990
19988
|
if (data && mapRef) {
|
|
19991
19989
|
const newMarkers = [];
|
|
19992
19990
|
const maxTotal = Math.max(...(data || []).map(d => d.total || 0));
|
|
19993
|
-
console.log('🎯 [GLOBE HOOK] Processing data items:', data.length);
|
|
19994
19991
|
data.forEach((d, i) => {
|
|
19995
|
-
console.log(`🎯 [GLOBE HOOK] Processing item ${i}:`, d);
|
|
19996
|
-
console.log(`🎯 [GLOBE HOOK] Item ${i} marker:`, d?.marker);
|
|
19997
|
-
console.log(`🎯 [GLOBE HOOK] Item ${i} lat/lng:`, d?.marker?.lat, d?.marker?.lng);
|
|
19998
19992
|
if (d?.marker?.lat && d?.marker?.lng) {
|
|
19999
|
-
console.log(`✅ [GLOBE HOOK] Item ${i} has valid coordinates, creating marker...`);
|
|
20000
19993
|
let marker;
|
|
20001
19994
|
let iconClassName = "";
|
|
20002
19995
|
let iconSize = [25, 25];
|
|
@@ -20076,7 +20069,6 @@ const useGlobe = ({
|
|
|
20076
20069
|
el.style.fontWeight = 'bold';
|
|
20077
20070
|
el.innerHTML = `<span>${d.total || 0}</span>`;
|
|
20078
20071
|
marker = new mapboxgl.Marker(el).setLngLat([d.marker.lng, d.marker.lat]).setPopup(new mapboxgl.Popup().setDOMContent(div)).addTo(mapRef);
|
|
20079
|
-
console.log(`🎉 [GLOBE HOOK] Marker ${i} added to map at:`, [d.marker.lng, d.marker.lat]);
|
|
20080
20072
|
} else if (type === "territory") {
|
|
20081
20073
|
// Handle territory polygons
|
|
20082
20074
|
if (d.area && Array.isArray(d.area)) {
|
|
@@ -20146,7 +20138,6 @@ const useGlobe = ({
|
|
|
20146
20138
|
}));
|
|
20147
20139
|
roots.current.push(root);
|
|
20148
20140
|
marker = new mapboxgl.Marker(el).setLngLat([d.marker.lng, d.marker.lat]).setPopup(new mapboxgl.Popup().setDOMContent(div)).addTo(mapRef);
|
|
20149
|
-
console.log(`🎉 [GLOBE HOOK] Default marker ${i} added to map at:`, [d.marker.lng, d.marker.lat]);
|
|
20150
20141
|
}
|
|
20151
20142
|
|
|
20152
20143
|
// Add click handler
|
|
@@ -20180,7 +20171,6 @@ const useGlobe = ({
|
|
|
20180
20171
|
mapboxgl.accessToken = MAP_TOKEN;
|
|
20181
20172
|
|
|
20182
20173
|
// Create the map with Mapbox GL JS - 3D globe
|
|
20183
|
-
console.log('🗺️ [GLOBE HOOK] Creating map with style:', STYLE_URL);
|
|
20184
20174
|
const map = new mapboxgl.Map({
|
|
20185
20175
|
container: container.current,
|
|
20186
20176
|
style: STYLE_URL,
|
|
@@ -20199,13 +20189,8 @@ const useGlobe = ({
|
|
|
20199
20189
|
|
|
20200
20190
|
// Configure the map when style loads
|
|
20201
20191
|
map.on('style.load', () => {
|
|
20202
|
-
console.log('🎨 [GLOBE HOOK] Style loaded event triggered');
|
|
20203
|
-
console.log('🎨 [GLOBE HOOK] Map style loaded:', map.isStyleLoaded());
|
|
20204
|
-
|
|
20205
20192
|
// Wait a bit for the style to fully load
|
|
20206
20193
|
setTimeout(() => {
|
|
20207
|
-
console.log('🎨 [GLOBE HOOK] After timeout - Map style loaded:', map.isStyleLoaded());
|
|
20208
|
-
|
|
20209
20194
|
// Set fog for the space background effect with stars - simplified to avoid errors
|
|
20210
20195
|
try {
|
|
20211
20196
|
map.setFog({
|
|
@@ -20301,10 +20286,9 @@ const useGlobe = ({
|
|
|
20301
20286
|
|
|
20302
20287
|
// Add navigation controls
|
|
20303
20288
|
map.addControl(new mapboxgl.NavigationControl(), 'top-right');
|
|
20304
|
-
console.log('🗺️ [GLOBE HOOK] Map created successfully');
|
|
20305
20289
|
return map;
|
|
20306
20290
|
} catch (error) {
|
|
20307
|
-
console.error('
|
|
20291
|
+
console.error('Error creating Mapbox GL JS globe:', error);
|
|
20308
20292
|
return null;
|
|
20309
20293
|
}
|
|
20310
20294
|
}, []);
|
|
@@ -20317,12 +20301,9 @@ const useGlobe = ({
|
|
|
20317
20301
|
// }, [initialMarkerSetIsDone]);
|
|
20318
20302
|
|
|
20319
20303
|
React.useEffect(() => {
|
|
20320
|
-
console.log('🔄 [GLOBE HOOK] useEffect for map creation - mapRef:', !!mapRef);
|
|
20321
20304
|
if (!mapRef) {
|
|
20322
|
-
console.log('🔄 [GLOBE HOOK] Creating map instance...');
|
|
20323
20305
|
const instance = createInstance();
|
|
20324
20306
|
if (instance) {
|
|
20325
|
-
console.log('🔄 [GLOBE HOOK] Map instance created, setting mapRef');
|
|
20326
20307
|
setMapRef(instance);
|
|
20327
20308
|
|
|
20328
20309
|
// Add comprehensive resize detection for Mapbox GL JS responsiveness
|
|
@@ -20403,22 +20384,14 @@ const useGlobe = ({
|
|
|
20403
20384
|
}
|
|
20404
20385
|
}, [polygon, mapRef]);
|
|
20405
20386
|
React.useEffect(() => {
|
|
20406
|
-
console.log('📥 [GLOBE HOOK] allData received:', allData);
|
|
20407
|
-
console.log('📥 [GLOBE HOOK] allData length:', allData?.length);
|
|
20408
20387
|
if (allData) {
|
|
20409
20388
|
if (allData.length === 0) {
|
|
20410
|
-
console.log('⚠️ [GLOBE HOOK] Empty data array');
|
|
20411
20389
|
setEmptyStateIsVisible(true);
|
|
20412
20390
|
} else if (emptyStateIsVisible) {
|
|
20413
20391
|
setEmptyStateIsVisible(false);
|
|
20414
20392
|
}
|
|
20415
|
-
|
|
20416
|
-
const filteredData = filterValidGPS(allData);
|
|
20417
|
-
console.log('🔍 [GLOBE HOOK] filtered data result:', filteredData);
|
|
20418
|
-
console.log('🔍 [GLOBE HOOK] filtered data length:', filteredData.length);
|
|
20419
|
-
setData(filteredData);
|
|
20393
|
+
setData(filterValidGPS(allData));
|
|
20420
20394
|
} else {
|
|
20421
|
-
console.log('❌ [GLOBE HOOK] No allData provided');
|
|
20422
20395
|
setData(null);
|
|
20423
20396
|
}
|
|
20424
20397
|
}, [allData, emptyStateIsVisible]);
|
|
@@ -20448,19 +20421,7 @@ const useGlobe = ({
|
|
|
20448
20421
|
}
|
|
20449
20422
|
}, [user, mapRef, allData]);
|
|
20450
20423
|
React.useEffect(() => {
|
|
20451
|
-
|
|
20452
|
-
mapRef: !!mapRef,
|
|
20453
|
-
data: !!data,
|
|
20454
|
-
dataLength: data?.length,
|
|
20455
|
-
initialMarkerSetIsDone,
|
|
20456
|
-
styleLoaded: mapRef?.isStyleLoaded()
|
|
20457
|
-
});
|
|
20458
|
-
if (mapRef && data && !initialMarkerSetIsDone) {
|
|
20459
|
-
console.log('🚀 [GLOBE HOOK] Attempting to add markers...');
|
|
20460
|
-
console.log('🚀 [GLOBE HOOK] Style loaded check:', mapRef.isStyleLoaded());
|
|
20461
|
-
|
|
20462
|
-
// Try to add markers immediately, and if style isn't loaded,
|
|
20463
|
-
// the addAllDataToMap function will handle it
|
|
20424
|
+
if (mapRef && data && !initialMarkerSetIsDone && mapRef.isStyleLoaded()) {
|
|
20464
20425
|
setInitialMarkerSetIsDone(true);
|
|
20465
20426
|
addAllDataToMap();
|
|
20466
20427
|
}
|
|
@@ -20673,7 +20634,7 @@ function Globe(_ref) {
|
|
|
20673
20634
|
renderSider = null,
|
|
20674
20635
|
renderMarker = null,
|
|
20675
20636
|
type = "default",
|
|
20676
|
-
showSider =
|
|
20637
|
+
showSider = true,
|
|
20677
20638
|
filtersConfig,
|
|
20678
20639
|
onFilterChange = () => {},
|
|
20679
20640
|
isSatellite = false,
|
|
@@ -20683,29 +20644,15 @@ function Globe(_ref) {
|
|
|
20683
20644
|
onUnmount
|
|
20684
20645
|
} = _ref;
|
|
20685
20646
|
// Map data to include marker coordinates
|
|
20686
|
-
const mappedData = React.useMemo(() => {
|
|
20687
|
-
|
|
20688
|
-
|
|
20689
|
-
|
|
20690
|
-
|
|
20691
|
-
|
|
20692
|
-
|
|
20693
|
-
const mapped = data.map((d, i) => {
|
|
20694
|
-
var _d$gps, _d$gps2;
|
|
20695
|
-
console.log("\uD83D\uDCCA [GLOBE COMPONENT] Mapping item ".concat(i, ":"), d);
|
|
20696
|
-
console.log("\uD83D\uDCCA [GLOBE COMPONENT] Item ".concat(i, " GPS:"), d === null || d === void 0 ? void 0 : d.gps);
|
|
20697
|
-
const result = _objectSpread2(_objectSpread2({}, d), {}, {
|
|
20698
|
-
marker: {
|
|
20699
|
-
lat: d === null || d === void 0 || (_d$gps = d.gps) === null || _d$gps === void 0 ? void 0 : _d$gps.latitude,
|
|
20700
|
-
lng: d === null || d === void 0 || (_d$gps2 = d.gps) === null || _d$gps2 === void 0 ? void 0 : _d$gps2.longitude
|
|
20701
|
-
}
|
|
20702
|
-
});
|
|
20703
|
-
console.log("\uD83D\uDCCA [GLOBE COMPONENT] Item ".concat(i, " mapped result:"), result);
|
|
20704
|
-
return result;
|
|
20647
|
+
const mappedData = React.useMemo(() => data.map(d => {
|
|
20648
|
+
var _d$gps, _d$gps2;
|
|
20649
|
+
return _objectSpread2(_objectSpread2({}, d), {}, {
|
|
20650
|
+
marker: {
|
|
20651
|
+
lat: d === null || d === void 0 || (_d$gps = d.gps) === null || _d$gps === void 0 ? void 0 : _d$gps.latitude,
|
|
20652
|
+
lng: d === null || d === void 0 || (_d$gps2 = d.gps) === null || _d$gps2 === void 0 ? void 0 : _d$gps2.longitude
|
|
20653
|
+
}
|
|
20705
20654
|
});
|
|
20706
|
-
|
|
20707
|
-
return mapped;
|
|
20708
|
-
}, [data]);
|
|
20655
|
+
}), [data]);
|
|
20709
20656
|
|
|
20710
20657
|
// Get resize context for sidebar state changes
|
|
20711
20658
|
const {
|
|
@@ -33849,7 +33796,7 @@ const EditForm = _ref => {
|
|
|
33849
33796
|
errors = {},
|
|
33850
33797
|
changeErrors = () => {},
|
|
33851
33798
|
evaluationConfig = [],
|
|
33852
|
-
staticWidth =
|
|
33799
|
+
staticWidth = "614px"
|
|
33853
33800
|
} = _ref;
|
|
33854
33801
|
const [isSubmitting] = React.useState(false);
|
|
33855
33802
|
const formData = JSON.parse(JSON.stringify(convertUndefinedToNull(data) || {}));
|
|
@@ -33862,9 +33809,9 @@ const EditForm = _ref => {
|
|
|
33862
33809
|
options = {},
|
|
33863
33810
|
introText,
|
|
33864
33811
|
formTitles,
|
|
33865
|
-
formClass =
|
|
33812
|
+
formClass = ""
|
|
33866
33813
|
} = form || {};
|
|
33867
|
-
const excludedKeys = [...defaultExcludedKeys,
|
|
33814
|
+
const excludedKeys = [...defaultExcludedKeys, "icon", "label", "description", "showFormIf", "sectionLabel", "formDescription", "introText", "formClass", "alertConf", "formTitles", "position", "id"];
|
|
33868
33815
|
const [initialValues, setInitialValues] = React.useState(undefined);
|
|
33869
33816
|
const getData = (name, input, value, commentValue, path, disabledPath) => {
|
|
33870
33817
|
var _input$meta, _input$meta2, _input$meta10, _input$meta11, _input$meta12, _input$meta13, _input$meta14, _input$meta15;
|
|
@@ -33881,28 +33828,28 @@ const EditForm = _ref => {
|
|
|
33881
33828
|
if (disabledInputs.includes(disabledPath) || isDisabled) {
|
|
33882
33829
|
props.disabled = true;
|
|
33883
33830
|
}
|
|
33884
|
-
if (input.type ===
|
|
33831
|
+
if (input.type === "total100" && !value) {
|
|
33885
33832
|
value = [{
|
|
33886
33833
|
type: null,
|
|
33887
33834
|
value: null
|
|
33888
33835
|
}];
|
|
33889
|
-
} else if (input.type ===
|
|
33836
|
+
} else if (input.type === "date") {
|
|
33890
33837
|
// value = value ? typeof value === 'string' ? value : value.format('YYYY-MM-DD') : undefined;
|
|
33891
33838
|
value = convertToDayJs(value);
|
|
33892
|
-
} else if (input.type ===
|
|
33839
|
+
} else if (input.type === "year") {
|
|
33893
33840
|
// value = value ? dayjs(value) : undefined;
|
|
33894
33841
|
value = convertToDayJs(value);
|
|
33895
|
-
} else if (input.type ===
|
|
33842
|
+
} else if (input.type === "switch") {
|
|
33896
33843
|
if (!propHasValue$1(value)) {
|
|
33897
33844
|
value = value || false;
|
|
33898
|
-
if (typeof path ===
|
|
33845
|
+
if (typeof path === "string") {
|
|
33899
33846
|
dot__default["default"].str(path, value, values);
|
|
33900
33847
|
}
|
|
33901
33848
|
}
|
|
33902
|
-
} else if (input.type ===
|
|
33903
|
-
const fileList = (Array.isArray(value) ? value : value && typeof value ===
|
|
33904
|
-
if (!Array.isArray(value) && value && typeof value ===
|
|
33905
|
-
if (typeof path ===
|
|
33849
|
+
} else if (input.type === "upload" || input.type === "imageUpload" || input.type === "videoUpload") {
|
|
33850
|
+
const fileList = (Array.isArray(value) ? value : value && typeof value === "object" && value.fileList && Array.isArray(value.fileList) ? value.fileList.map(f => f.response).filter(f => f) : []) || [];
|
|
33851
|
+
if (!Array.isArray(value) && value && typeof value === "object" && value.fileList && Array.isArray(value.fileList)) {
|
|
33852
|
+
if (typeof path === "string") {
|
|
33906
33853
|
dot__default["default"].set(path, fileList, values);
|
|
33907
33854
|
}
|
|
33908
33855
|
}
|
|
@@ -33929,7 +33876,7 @@ const EditForm = _ref => {
|
|
|
33929
33876
|
});
|
|
33930
33877
|
}
|
|
33931
33878
|
}
|
|
33932
|
-
if (input.type ===
|
|
33879
|
+
if (input.type === "modal") {
|
|
33933
33880
|
props.linkingform = {};
|
|
33934
33881
|
props.datalink = input.dataLink;
|
|
33935
33882
|
if (linkingForms[name]) {
|
|
@@ -33969,21 +33916,21 @@ const EditForm = _ref => {
|
|
|
33969
33916
|
value,
|
|
33970
33917
|
allowDupplicates: input.allowDupplicates,
|
|
33971
33918
|
commentValue,
|
|
33972
|
-
commentHint: input.commentHint ? input.commentHint : t(
|
|
33919
|
+
commentHint: input.commentHint ? input.commentHint : t("Please specify"),
|
|
33973
33920
|
rules: (input.rules || []).map(r => {
|
|
33974
|
-
if (r.message && r.message.indexOf(
|
|
33921
|
+
if (r.message && r.message.indexOf("errors::") >= 0) {
|
|
33975
33922
|
r.message = t(r.message);
|
|
33976
33923
|
}
|
|
33977
33924
|
return r;
|
|
33978
33925
|
}),
|
|
33979
33926
|
template: input.template
|
|
33980
33927
|
};
|
|
33981
|
-
if (input.type ===
|
|
33928
|
+
if (input.type === "switch" && input.autocomplete) {
|
|
33982
33929
|
Object.assign(config, {
|
|
33983
33930
|
autocomplete: input.autocomplete
|
|
33984
33931
|
});
|
|
33985
33932
|
}
|
|
33986
|
-
if (input.type ===
|
|
33933
|
+
if (input.type === "switch") {
|
|
33987
33934
|
if (input.replace) {
|
|
33988
33935
|
Object.assign(config, {
|
|
33989
33936
|
replace: input.replace
|
|
@@ -33995,16 +33942,16 @@ const EditForm = _ref => {
|
|
|
33995
33942
|
});
|
|
33996
33943
|
}
|
|
33997
33944
|
}
|
|
33998
|
-
if (input.type ===
|
|
33945
|
+
if (input.type === "linkingModal") {
|
|
33999
33946
|
Object.assign(config, {
|
|
34000
33947
|
content: input.inputs
|
|
34001
33948
|
});
|
|
34002
33949
|
}
|
|
34003
|
-
if (input.type ===
|
|
33950
|
+
if (input.type === "group") {
|
|
34004
33951
|
Object.assign(config, {
|
|
34005
33952
|
groupInputs: Object.keys(input.groupInputs || {}).map(key => {
|
|
34006
|
-
const isRep = path.split(
|
|
34007
|
-
const newPath = path.split(
|
|
33953
|
+
const isRep = path.split(".")[0].match(/\[/);
|
|
33954
|
+
const newPath = path.split(".").length === 1 ? key : isRep && isRep.length ? path.split(".")[0] + ".".concat(key) : path.split(".")[0] + ".".concat(key);
|
|
34008
33955
|
const groupInp = input.groupInputs[key];
|
|
34009
33956
|
const inputData = getData(groupInp.dataId || key, input.groupInputs[key], dot__default["default"].pick(newPath, values), null, newPath);
|
|
34010
33957
|
return {
|
|
@@ -34023,11 +33970,11 @@ const EditForm = _ref => {
|
|
|
34023
33970
|
})
|
|
34024
33971
|
});
|
|
34025
33972
|
}
|
|
34026
|
-
if (input.type ===
|
|
33973
|
+
if (input.type === "groupInputs") {
|
|
34027
33974
|
Object.assign(config, {
|
|
34028
33975
|
groupInputs: Object.keys(input.inputs || {}).map(key => {
|
|
34029
|
-
const isRep = path.split(
|
|
34030
|
-
const newPath = path.split(
|
|
33976
|
+
const isRep = path.split(".")[0].match(/\[/);
|
|
33977
|
+
const newPath = path.split(".").length === 1 ? key : isRep && isRep.length ? path.split(".")[0] + ".".concat(key) : path.split(".")[0] + ".".concat(key);
|
|
34031
33978
|
const groupInp = input.inputs[key];
|
|
34032
33979
|
const inputData = getData(groupInp.dataId || key, input.inputs[key], dot__default["default"].pick(newPath, values), null, newPath);
|
|
34033
33980
|
return {
|
|
@@ -34069,21 +34016,21 @@ const EditForm = _ref => {
|
|
|
34069
34016
|
style: {
|
|
34070
34017
|
maxWidth: 700
|
|
34071
34018
|
},
|
|
34072
|
-
className: "main-form".concat(formClass ? " ".concat(formClass) :
|
|
34019
|
+
className: "main-form".concat(formClass ? " ".concat(formClass) : ""),
|
|
34073
34020
|
onValuesChange: (_changedValue, _allValues) => {
|
|
34074
34021
|
const changedValue = _objectSpread2({}, _changedValue);
|
|
34075
34022
|
const allValues = _objectSpread2({}, _allValues);
|
|
34076
34023
|
|
|
34077
34024
|
// AjaxSubGroup fix, so meta dont get lost
|
|
34078
34025
|
Object.keys(_allValues || {}).forEach(key => {
|
|
34079
|
-
if (key && values[key] && values[key].meta && typeof values[key] ===
|
|
34026
|
+
if (key && values[key] && values[key].meta && typeof values[key] === "object") {
|
|
34080
34027
|
changedValue[key] = _objectSpread2(_objectSpread2({}, values[key]), _changedValue[key]);
|
|
34081
34028
|
allValues[key] = _objectSpread2(_objectSpread2({}, values[key]), _allValues[key]);
|
|
34082
34029
|
}
|
|
34083
34030
|
});
|
|
34084
34031
|
const cleanedChangeValue = convertUndefinedToNull(changedValue);
|
|
34085
34032
|
const cleanedAllValues = convertUndefinedToNull(_objectSpread2(_objectSpread2({}, values), allValues));
|
|
34086
|
-
if (
|
|
34033
|
+
if ("associatedMine" in cleanedChangeValue && cleanedChangeValue.associatedMine === null && values.associatedMine != null) {
|
|
34087
34034
|
cleanedChangeValue.associatedMine = values.associatedMine;
|
|
34088
34035
|
cleanedAllValues.associatedMine = values.associatedMine;
|
|
34089
34036
|
}
|
|
@@ -34099,7 +34046,7 @@ const EditForm = _ref => {
|
|
|
34099
34046
|
// ...allValues
|
|
34100
34047
|
// });
|
|
34101
34048
|
},
|
|
34102
|
-
children: [definition, introText && introText !==
|
|
34049
|
+
children: [definition, introText && introText !== "" ? /*#__PURE__*/jsxRuntime.jsx("p", {
|
|
34103
34050
|
className: "repeatable",
|
|
34104
34051
|
children: introText
|
|
34105
34052
|
}) : null, options.alertConf && typeof options.alertConf === "object" ? /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
|
|
@@ -34111,10 +34058,10 @@ const EditForm = _ref => {
|
|
|
34111
34058
|
const input = options[k];
|
|
34112
34059
|
|
|
34113
34060
|
// Apply styling based on individual input type
|
|
34114
|
-
const inputStyles = input.type ===
|
|
34115
|
-
|
|
34061
|
+
const inputStyles = input.type === "groupInputs" || input.type === "phoneNumber" ? {} : {
|
|
34062
|
+
"--static-width": input.type === "group" && (_data$k = data[k]) !== null && _data$k !== void 0 && _data$k.noPlanningRequired ? "586px" : staticWidth
|
|
34116
34063
|
};
|
|
34117
|
-
if (input.type ===
|
|
34064
|
+
if (input.type === "ajaxSubGroup") {
|
|
34118
34065
|
return /*#__PURE__*/jsxRuntime.jsx("div", {
|
|
34119
34066
|
style: inputStyles,
|
|
34120
34067
|
children: /*#__PURE__*/jsxRuntime.jsx(AjaxSubGroup, {
|
|
@@ -34141,9 +34088,9 @@ const EditForm = _ref => {
|
|
|
34141
34088
|
user: user
|
|
34142
34089
|
})
|
|
34143
34090
|
}, i);
|
|
34144
|
-
} else if (input.inputs && input.type !==
|
|
34091
|
+
} else if (input.inputs && input.type !== "groupInputs" && input.type !== "groupCheckbox" && input.type !== "dataLinkGroup") {
|
|
34145
34092
|
return /*#__PURE__*/jsxRuntime.jsx("div", {
|
|
34146
|
-
className: formatClassname([
|
|
34093
|
+
className: formatClassname(["group", !input.repeatable && "sub-group"]),
|
|
34147
34094
|
style: inputStyles,
|
|
34148
34095
|
children: renderNestedInputs$1(options, k, setValues, values, excludedKeys, i, formTitles, getData, MainForm, plainForms, setAddress, onValuesChange, data, _objectSpread2(_objectSpread2({}, allData), {}, {
|
|
34149
34096
|
subGroupTitle
|
|
@@ -34168,7 +34115,7 @@ const EditForm = _ref => {
|
|
|
34168
34115
|
highlightMandatory: highlightMandatory,
|
|
34169
34116
|
changeInputMeta: changeInputMeta,
|
|
34170
34117
|
changeLinking: changeLinking,
|
|
34171
|
-
inputMeta: inputsMeta[k],
|
|
34118
|
+
inputMeta: inputsMeta[k] || {},
|
|
34172
34119
|
values: values,
|
|
34173
34120
|
MainForm: MainForm,
|
|
34174
34121
|
options: options,
|
|
@@ -34225,12 +34172,12 @@ const EditForm = _ref => {
|
|
|
34225
34172
|
});
|
|
34226
34173
|
}
|
|
34227
34174
|
},
|
|
34228
|
-
children: t(
|
|
34175
|
+
children: t("Save")
|
|
34229
34176
|
}), /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
|
|
34230
34177
|
loading: isSubmitting,
|
|
34231
34178
|
disabled: isSubmitting,
|
|
34232
34179
|
onClick: () => onCancel(),
|
|
34233
|
-
children: t(
|
|
34180
|
+
children: t("Cancel")
|
|
34234
34181
|
})]
|
|
34235
34182
|
})]
|
|
34236
34183
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "datastake-daf",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.265",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"@ant-design/icons": "^5.2.5",
|
|
6
6
|
"@antv/g2": "^5.1.1",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"buffer": "^6.0.3",
|
|
16
16
|
"countries-list": "^2.6.1",
|
|
17
17
|
"country-city-location": "^1.0.13",
|
|
18
|
-
"datastake-daf": "0.6.
|
|
18
|
+
"datastake-daf": "^0.6.263",
|
|
19
19
|
"dayjs": "^1.11.12",
|
|
20
20
|
"deepmerge": "^4.3.1",
|
|
21
21
|
"dot-object": "^2.1.5",
|
|
@@ -2,7 +2,7 @@ import Globe from "./index";
|
|
|
2
2
|
import ThemeLayout from "../../ThemeLayout";
|
|
3
3
|
import Widget from "../Widget";
|
|
4
4
|
|
|
5
|
-
import * as configs from "
|
|
5
|
+
import * as configs from "../Map/storyConfig";
|
|
6
6
|
|
|
7
7
|
export default {
|
|
8
8
|
title: "Dashboard/Globe",
|
|
@@ -29,14 +29,14 @@ export default {
|
|
|
29
29
|
export const DefaultGlobe = {
|
|
30
30
|
name: "Default Globe",
|
|
31
31
|
args: {
|
|
32
|
-
...configs.
|
|
32
|
+
...configs.DefaultMapConfig,
|
|
33
33
|
},
|
|
34
34
|
};
|
|
35
35
|
|
|
36
36
|
export const SatelliteGlobe = {
|
|
37
37
|
name: "Satellite Globe",
|
|
38
38
|
args: {
|
|
39
|
-
...configs.
|
|
39
|
+
...configs.DefaultMapConfig,
|
|
40
40
|
isSatellite: true,
|
|
41
41
|
},
|
|
42
42
|
};
|
|
@@ -44,19 +44,11 @@ export const SatelliteGlobe = {
|
|
|
44
44
|
export const TerritoryGlobe = {
|
|
45
45
|
name: "Territory Globe",
|
|
46
46
|
args: {
|
|
47
|
-
...configs.
|
|
47
|
+
...configs.TerritoryMapConfig,
|
|
48
48
|
type: "territory",
|
|
49
49
|
},
|
|
50
50
|
};
|
|
51
51
|
|
|
52
|
-
export const StakeholderGlobe = {
|
|
53
|
-
name: "Stakeholder Globe",
|
|
54
|
-
args: {
|
|
55
|
-
...configs.StakeholderGlobeConfig,
|
|
56
|
-
type: "stakeholder",
|
|
57
|
-
},
|
|
58
|
-
};
|
|
59
|
-
|
|
60
52
|
export const EventGlobe = {
|
|
61
53
|
name: "Event Globe",
|
|
62
54
|
args: {
|
|
@@ -65,27 +57,10 @@ export const EventGlobe = {
|
|
|
65
57
|
},
|
|
66
58
|
};
|
|
67
59
|
|
|
68
|
-
export const ChainGlobe = {
|
|
69
|
-
name: "Supply Chain Globe",
|
|
70
|
-
args: {
|
|
71
|
-
...configs.ChainGlobeConfig,
|
|
72
|
-
type: "chain",
|
|
73
|
-
},
|
|
74
|
-
};
|
|
75
|
-
|
|
76
60
|
export const LocationGlobe = {
|
|
77
61
|
name: "Location Globe",
|
|
78
62
|
args: {
|
|
79
|
-
...configs.
|
|
63
|
+
...configs.DefaultMapConfig,
|
|
80
64
|
type: "location",
|
|
81
65
|
},
|
|
82
66
|
};
|
|
83
|
-
|
|
84
|
-
export const ProjectGlobe = {
|
|
85
|
-
name: "Project Globe",
|
|
86
|
-
args: {
|
|
87
|
-
...configs.ProjectGlobeConfig,
|
|
88
|
-
type: "project",
|
|
89
|
-
},
|
|
90
|
-
};
|
|
91
|
-
|