ublo-lib 1.19.4 → 1.19.6

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.
@@ -22,13 +22,14 @@ const Filter = ({
22
22
  };
23
23
  setValues(newValues);
24
24
  };
25
- const options = [""].concat(filter.map(({
25
+ const formatedValues = filter.map(({
26
26
  libelle,
27
27
  value
28
28
  }) => ({
29
29
  label: libelle,
30
30
  value
31
- })));
31
+ }));
32
+ const options = values.length === 1 ? formatedValues : [""].concat(formatedValues);
32
33
  const classes = classNames(css.filter, css[code]);
33
34
  return _jsxs("div", {
34
35
  className: classes,
@@ -0,0 +1,3 @@
1
+ import MagicBox from "./magic-box";
2
+ export default MagicBox;
3
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AAEnC,eAAe,QAAQ,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import MagicBox from "./magic-box";
2
- export default MagicBox;
2
+ export default MagicBox;
@@ -12,8 +12,10 @@ type Props = {
12
12
  maxCPDuration?: number;
13
13
  minDays?: number;
14
14
  maxDays?: number;
15
+ allowedActivities?: string[];
15
16
  children?: React.ReactNode;
16
17
  };
17
- declare const _default: React.MemoExoticComponent<({ stay, cartUrl, channel, className, alignContent, maxCPDuration, minDays, maxDays, children, }: Props) => import("react/jsx-runtime").JSX.Element>;
18
+ declare const _default: React.MemoExoticComponent<typeof MagicBox>;
18
19
  export default _default;
20
+ declare function MagicBox({ stay, cartUrl, channel, className, alignContent, maxCPDuration, minDays, maxDays, allowedActivities, children, }: Props): import("react/jsx-runtime").JSX.Element;
19
21
  //# sourceMappingURL=magic-box.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAW/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;;AA6HF,wBAAoC"}
1
+ {"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAW/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;;AAIF,wBAAoC;AAEpC,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,OAAO,EACP,OAAe,EACf,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAW,EACX,OAAkB,EAClB,iBAAiB,EACjB,QAAQ,GACT,EAAE,KAAK,2CAuHP"}
@@ -9,7 +9,8 @@ import Booking from "./booking";
9
9
  import { message } from "./messages";
10
10
  import * as API from "./services/api";
11
11
  import css from "./magic-box.module.css";
12
- const MagicBox = ({ stay, cartUrl, channel = "ESF", className, alignContent, maxCPDuration, minDays = 0, maxDays = Infinity, children, }) => {
12
+ export default React.memo(MagicBox);
13
+ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, maxCPDuration, minDays = 0, maxDays = Infinity, allowedActivities, children, }) {
13
14
  const [filters, setFilters] = React.useState();
14
15
  const [values, setValues] = React.useState();
15
16
  const [currentStep, setCurrentStep] = React.useState(0);
@@ -49,15 +50,26 @@ const MagicBox = ({ stay, cartUrl, channel = "ESF", className, alignContent, max
49
50
  });
50
51
  const newFilters = Object.keys(filtersResult.filters).reduce((acc, key) => {
51
52
  const filter = filtersResult.filters[key];
52
- const values = key !== "days"
53
- ? filter
54
- : filter.filter((item) => {
53
+ if (key === "days") {
54
+ const days = filter.filter((item) => {
55
55
  return item.value >= minDays && item.value <= maxDays;
56
56
  });
57
- return { ...acc, [key]: values };
57
+ return { ...acc, [key]: days };
58
+ }
59
+ if (key === "activities") {
60
+ const mustFilterActivites = allowedActivities && allowedActivities.length > 0;
61
+ const activities = filter.filter((item) => {
62
+ if (mustFilterActivites) {
63
+ return (!item.restricted && allowedActivities.includes(item.value));
64
+ }
65
+ return !item.restricted;
66
+ });
67
+ return { ...acc, activities };
68
+ }
69
+ return { ...acc, [key]: filter };
58
70
  }, {});
59
71
  setFilters(newFilters);
60
- const defaultValues = Object.keys(newFilters).reduce((acc, key) => ({ ...acc, [key]: "" }), {});
72
+ const defaultValues = getDefaultValues(newFilters);
61
73
  setValues(defaultValues);
62
74
  }
63
75
  }, [lang, maxDays, minDays, resort, stay]);
@@ -68,5 +80,12 @@ const MagicBox = ({ stay, cartUrl, channel = "ESF", className, alignContent, max
68
80
  const showFilter = stay && filters && values;
69
81
  const classes = classNames(css.root, className);
70
82
  return (_jsx("div", { className: classes, "data-align": alignContent, children: _jsxs("div", { className: css.top, children: [children, currentStep === 0 && (_jsxs(_Fragment, { children: [!filters && _jsx("div", { className: css.loader }), showFilter && (_jsx(Filters, { filters: filters, values: values, setValues: setValues })), _jsxs(Button, { className: css.confirm, onClick: () => setCurrentStep(1), disabled: !isValid, children: [message(lang, "confirm"), _jsx(Icons.Search, {})] })] })), currentStep === 1 && (_jsx(Booking, { stay: stay, cartUrl: cartUrl, channel: channel, values: values, maxCPDuration: maxCPDuration, setCurrentStep: setCurrentStep }))] }) }));
71
- };
72
- export default React.memo(MagicBox);
83
+ }
84
+ function getDefaultValues(filters) {
85
+ return Object.keys(filters || {}).reduce((acc, key) => {
86
+ if (key === "activities" && filters && filters.activities.length === 1) {
87
+ return { ...acc, [key]: filters.activities[0].value };
88
+ }
89
+ return { ...acc, [key]: "" };
90
+ }, {});
91
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ublo-lib",
3
- "version": "1.19.4",
3
+ "version": "1.19.6",
4
4
  "peerDependencies": {
5
5
  "dt-design-system": "^3.1.5",
6
6
  "leaflet": "^1.9.1",