ublo-lib 1.22.1 → 1.22.2

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.
@@ -1 +1 @@
1
- {"version":3,"file":"elloha.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/editors/elloha.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC5E,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,CAAC;AAWF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,MAAM,EACN,SAAS,EACT,IAAI,EACJ,mBAAmB,EACnB,QAAQ,EACR,UAAU,GACX,EAAE,KAAK,2CA2FP"}
1
+ {"version":3,"file":"elloha.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/msem-preset-editor/editors/elloha.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,KAAK,KAAK,GAAG;IACX,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC5E,mBAAmB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACxD,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,CAAC;AAWF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,MAAM,EACN,SAAS,EACT,IAAI,EACJ,mBAAmB,EACnB,QAAQ,EACR,UAAU,GACX,EAAE,KAAK,2CA8GP"}
@@ -1,5 +1,6 @@
1
- import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
1
+ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import * as React from "react";
3
+ import Input from "dt-design-system/es/input";
3
4
  import MultipleSelect from "dt-design-system/es/multiple-select";
4
5
  import Form from "../components/form";
5
6
  import * as API from "../services/api";
@@ -13,7 +14,7 @@ export default function Elloha({ preset, setPreset, stay, setShowPresetDialog, o
13
14
  const [groupNames, setGroupNames] = React.useState([]);
14
15
  const [selectedGroups, setSelectedGroups] = React.useState(getDefaultData(preset));
15
16
  const { merchant } = preset?.options || {};
16
- const error = !stay?.from || !stay?.to;
17
+ const stayIsUndefined = !stay?.from || !stay?.to;
17
18
  const cancelPreset = () => {
18
19
  setPreset(savedPreset.current);
19
20
  setShowPresetDialog(false);
@@ -21,8 +22,12 @@ export default function Elloha({ preset, setPreset, stay, setShowPresetDialog, o
21
22
  const confirmPreset = () => {
22
23
  setShowPresetDialog(false);
23
24
  };
25
+ const manualGroupUpdate = (newValue) => {
26
+ const values = newValue.split(";").map((v) => v.trim());
27
+ setSelectedGroups(values);
28
+ };
24
29
  React.useEffect(() => {
25
- if (!error) {
30
+ if (!stayIsUndefined) {
26
31
  const runEffect = async () => {
27
32
  try {
28
33
  setLoading(true);
@@ -41,7 +46,7 @@ export default function Elloha({ preset, setPreset, stay, setShowPresetDialog, o
41
46
  };
42
47
  runEffect();
43
48
  }
44
- }, [error, merchant, stay.from]);
49
+ }, [merchant, stayIsUndefined, stay.from]);
45
50
  React.useEffect(() => {
46
51
  setPreset((current = {}) => {
47
52
  const newPreset = {
@@ -58,10 +63,12 @@ export default function Elloha({ preset, setPreset, stay, setShowPresetDialog, o
58
63
  return (_jsxs(Form, { title: "Presets activit\u00E9s Elloha", width: 420, preset: preset, buttonsActions: {
59
64
  testPreset,
60
65
  cancelPreset,
61
- confirmPreset: error || groupNames.length === 0 ? undefined : confirmPreset,
62
- }, children: [!error && (_jsx(MultipleSelect, { label: "Groupes", options: groupNames, values: selectedGroups, onChange: setSelectedGroups, placeholder: "S\u00E9lectionnez un ou plusieurs groupes", loading: loading, disabled: groupNames.length === 0, error: !loading &&
66
+ confirmPreset: stayIsUndefined || groupNames.length === 0
67
+ ? undefined
68
+ : confirmPreset,
69
+ }, children: [!stayIsUndefined && (_jsx(MultipleSelect, { label: "Groupes", options: groupNames, values: selectedGroups, onChange: setSelectedGroups, placeholder: "S\u00E9lectionnez un ou plusieurs groupes", loading: loading, disabled: groupNames.length === 0, error: !loading &&
63
70
  groupNames.length === 0 &&
64
- "Aucun groupe disponible à ces dates" })), error && (_jsx("div", { className: css.error, children: "Vous devez renseigner des dates de s\u00E9jour pour afficher les groupes" }))] }));
71
+ "Aucun groupe disponible à ces dates" })), stayIsUndefined && (_jsxs(_Fragment, { children: [_jsx("div", { className: css.error, children: "Vous devez renseigner des dates de s\u00E9jour pour afficher les groupes" }), _jsx(Input, { label: "Groupe", placeholder: "", value: selectedGroups.join("; "), onValueChange: manualGroupUpdate }), _jsx("div", { className: css.helper, children: "Vous pouvez manuellement renseigner un groupe (si plusieurs, les s\u00E9pararer par une \";\"" })] }))] }));
65
72
  }
66
73
  function getDefaultData(preset) {
67
74
  if (!preset?.presets)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ublo-lib",
3
- "version": "1.22.1",
3
+ "version": "1.22.2",
4
4
  "peerDependencies": {
5
5
  "dt-design-system": "^3.1.5",
6
6
  "leaflet": "^1.9.1",