@kando-env/kando-ui 1.2.318-alpha.8 → 1.2.318
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/lib/Widgets/Map/MapUtils.js +6 -2
- package/lib/Widgets/Map/areas/AreaPolygon.js +39 -35
- package/lib/Widgets/Map/areas/AreaUtils.js +17 -3
- package/lib/Widgets/Map/points/PointMarker.js +39 -29
- package/lib/Widgets/Map/points/PointUtils.js +5 -28
- package/lib/components/Header/InfoBar/InfoBar.js +1 -6
- package/lib/components/Header/Toolbar/CustomerMenu/CustomerMenu.js +5 -2
- package/lib/macros/getVersion.js +2 -2
- package/lib/pages/AreaPage/AreaPage.js +10 -6
- package/lib/pages/AreaPage/Dashboard/Dashboard.js +3 -6
- package/lib/pages/DashboardMap/List.js +24 -39
- package/lib/pages/DashboardMap/WWTPMap.js +29 -36
- package/lib/pages/DashboardMap/Widget.js +25 -15
- package/lib/pages/DashboardMap/utils.js +18 -50
- package/lib/pages/SitePage/SitePage.js +9 -6
- package/lib/pages/UtilityDashboardPage/UtilityDashboardPage.js +5 -6
- package/lib/pages/UtilityDashboardPage/VirtualAreaDashboardPage.js +10 -6
- package/lib/pages/WbeDashboard/WbeDashboardPage.js +4 -7
- package/lib/store/events/models/IEvent.js +1 -1
- package/package.json +1 -1
- package/lib/pages/DashboardMap/Capacity.js +0 -112
|
@@ -1,112 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.setFocusedItem = exports.getPoints = exports.getAreas = exports.fetchCapacity = void 0;
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
-
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
10
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
|
|
11
|
-
var fetchData = /*#__PURE__*/function () {
|
|
12
|
-
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(type, id, waterAuthorityId) {
|
|
13
|
-
var response, data;
|
|
14
|
-
return _regenerator.default.wrap(function _callee$(_context) {
|
|
15
|
-
while (1) {
|
|
16
|
-
switch (_context.prev = _context.next) {
|
|
17
|
-
case 0:
|
|
18
|
-
_context.prev = 0;
|
|
19
|
-
_context.next = 3;
|
|
20
|
-
return fetch("/api_ui/wwtp_page/".concat(type, "/").concat(id, "/capacity?&water_authority_id=").concat(waterAuthorityId));
|
|
21
|
-
case 3:
|
|
22
|
-
response = _context.sent;
|
|
23
|
-
_context.next = 6;
|
|
24
|
-
return response.json();
|
|
25
|
-
case 6:
|
|
26
|
-
data = _context.sent;
|
|
27
|
-
return _context.abrupt("return", data);
|
|
28
|
-
case 10:
|
|
29
|
-
_context.prev = 10;
|
|
30
|
-
_context.t0 = _context["catch"](0);
|
|
31
|
-
console.error('Error fetching capacity data:', _context.t0);
|
|
32
|
-
throw _context.t0;
|
|
33
|
-
case 14:
|
|
34
|
-
case "end":
|
|
35
|
-
return _context.stop();
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}, _callee, null, [[0, 10]]);
|
|
39
|
-
}));
|
|
40
|
-
return function fetchData(_x, _x2, _x3) {
|
|
41
|
-
return _ref.apply(this, arguments);
|
|
42
|
-
};
|
|
43
|
-
}();
|
|
44
|
-
var getPoints = function getPoints(list, points_data) {
|
|
45
|
-
var returnedPoints = list.map(function (item) {
|
|
46
|
-
return points_data.find(function (point) {
|
|
47
|
-
return point.id === item.id;
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
|
-
return returnedPoints;
|
|
51
|
-
};
|
|
52
|
-
exports.getPoints = getPoints;
|
|
53
|
-
var getAreas = function getAreas(areaIds, areas) {
|
|
54
|
-
if (areaIds.length === 0 || !areas) return [];
|
|
55
|
-
var returnedAreas = areaIds.map(function (id) {
|
|
56
|
-
var correspondingArea = areas.find(function (area) {
|
|
57
|
-
return area.area_id === id;
|
|
58
|
-
});
|
|
59
|
-
return correspondingArea;
|
|
60
|
-
});
|
|
61
|
-
return returnedAreas;
|
|
62
|
-
};
|
|
63
|
-
exports.getAreas = getAreas;
|
|
64
|
-
var setFocusedItem = function setFocusedItem(object, listItems, points, areas, dispatch, setFocusedArea) {
|
|
65
|
-
if (object.forWWTPMap) {
|
|
66
|
-
var areaIds = listItems.map(function (item) {
|
|
67
|
-
return item.id;
|
|
68
|
-
});
|
|
69
|
-
var subAreas = getAreas(areaIds, areas);
|
|
70
|
-
var focusedPoint = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, object), {}, {
|
|
71
|
-
factories: subAreas.length > 0 ? [] : getPoints(listItems, points),
|
|
72
|
-
sub_areas: subAreas,
|
|
73
|
-
shape_data: [[object.latitude, object.longitude]]
|
|
74
|
-
});
|
|
75
|
-
dispatch(setFocusedArea(focusedPoint));
|
|
76
|
-
} else {
|
|
77
|
-
var focusedArea = object;
|
|
78
|
-
if (listItems && listItems.length > 0) {
|
|
79
|
-
var _focusedArea$sub_area;
|
|
80
|
-
var area = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, focusedArea), {}, {
|
|
81
|
-
factories: (focusedArea === null || focusedArea === void 0 ? void 0 : (_focusedArea$sub_area = focusedArea.sub_areas) === null || _focusedArea$sub_area === void 0 ? void 0 : _focusedArea$sub_area.length) > 0 ? [] : getPoints(listItems, points)
|
|
82
|
-
});
|
|
83
|
-
dispatch(setFocusedArea(area));
|
|
84
|
-
} else {
|
|
85
|
-
dispatch(setFocusedArea(focusedArea));
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
|
-
exports.setFocusedItem = setFocusedItem;
|
|
90
|
-
var fetchCapacity = /*#__PURE__*/function () {
|
|
91
|
-
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(type, id, waterAuthorityId) {
|
|
92
|
-
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
93
|
-
while (1) {
|
|
94
|
-
switch (_context2.prev = _context2.next) {
|
|
95
|
-
case 0:
|
|
96
|
-
_context2.next = 2;
|
|
97
|
-
return fetchData(type, id, waterAuthorityId);
|
|
98
|
-
case 2:
|
|
99
|
-
return _context2.abrupt("return", _context2.sent);
|
|
100
|
-
case 3:
|
|
101
|
-
case "end":
|
|
102
|
-
return _context2.stop();
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
}, _callee2);
|
|
106
|
-
}));
|
|
107
|
-
return function fetchCapacity(_x4, _x5, _x6) {
|
|
108
|
-
return _ref2.apply(this, arguments);
|
|
109
|
-
};
|
|
110
|
-
}();
|
|
111
|
-
exports.fetchCapacity = fetchCapacity;
|
|
112
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["fetchData","_ref","_asyncToGenerator2","default","_regenerator","mark","_callee","type","id","waterAuthorityId","response","data","wrap","_callee$","_context","prev","next","fetch","concat","sent","json","abrupt","t0","console","error","stop","_x","_x2","_x3","apply","arguments","getPoints","list","points_data","returnedPoints","map","item","find","point","exports","getAreas","areaIds","areas","length","returnedAreas","correspondingArea","area","area_id","setFocusedItem","object","listItems","points","dispatch","setFocusedArea","forWWTPMap","subAreas","focusedPoint","_objectSpread2","factories","sub_areas","shape_data","latitude","longitude","focusedArea","_focusedArea$sub_area","fetchCapacity","_ref2","_callee2","_callee2$","_context2","_x4","_x5","_x6"],"sources":["../../../src/pages/DashboardMap/Capacity.ts"],"sourcesContent":["import { IArea } from 'src/store/areas/models/IArea';\nimport { IPoint } from 'src/store/points/models/IPoint';\n\nconst fetchData = async (\n  type: string,\n  id: number,\n  waterAuthorityId: number,\n) => {\n  try {\n    const response = await fetch(\n      `/api_ui/wwtp_page/${type}/${id}/capacity?&water_authority_id=${waterAuthorityId}`,\n    );\n    const data = await response.json();\n    return data;\n  } catch (error) {\n    console.error('Error fetching capacity data:', error);\n    throw error;\n  }\n};\n\nexport const getPoints = (list: any[], points_data: IPoint[]) => {\n  const returnedPoints = list.map((item) => {\n    return points_data.find((point) => point.id === item.id);\n  });\n  return returnedPoints;\n};\n\nexport const getAreas = (areaIds: any[], areas: IArea[]) => {\n  if (areaIds.length === 0 || !areas) return [];\n\n  const returnedAreas = areaIds.map((id) => {\n    const correspondingArea = areas.find((area) => area.area_id === id);\n    return correspondingArea;\n  });\n\n  return returnedAreas;\n};\n\nexport const setFocusedItem = (\n  object,\n  listItems,\n  points,\n  areas,\n  dispatch,\n  setFocusedArea,\n) => {\n  if (object.forWWTPMap) {\n    const areaIds = listItems.map((item) => item.id);\n    const subAreas = getAreas(areaIds, areas);\n    const focusedPoint = {\n      ...object,\n      factories: subAreas.length > 0 ? [] : getPoints(listItems, points),\n      sub_areas: subAreas,\n      shape_data: [[object.latitude, object.longitude]],\n    };\n    dispatch(setFocusedArea(focusedPoint));\n  } else {\n    let focusedArea = object;\n    if (listItems && listItems.length > 0) {\n      const area = {\n        ...focusedArea,\n        factories:\n          focusedArea?.sub_areas?.length > 0\n            ? []\n            : getPoints(listItems, points),\n      };\n      dispatch(setFocusedArea(area));\n    } else {\n      dispatch(setFocusedArea(focusedArea));\n    }\n  }\n};\n\nexport const fetchCapacity = async (\n  type: string,\n  id: number,\n  waterAuthorityId: number,\n) => {\n  return await fetchData(type, id, waterAuthorityId);\n};\n"],"mappings":"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"}
|