contentoh-components-library 21.1.66 → 21.1.69

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.
@@ -84,9 +84,21 @@ var VersionSelector = function VersionSelector(_ref) {
84
84
  };
85
85
  }();
86
86
 
87
- (0, _react.useEffect)(function () {
88
- loadProductVersions(articleId);
89
- }, []);
87
+ (0, _react.useEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
88
+ return _regenerator.default.wrap(function _callee2$(_context2) {
89
+ while (1) {
90
+ switch (_context2.prev = _context2.next) {
91
+ case 0:
92
+ _context2.next = 2;
93
+ return loadProductVersions(articleId);
94
+
95
+ case 2:
96
+ case "end":
97
+ return _context2.stop();
98
+ }
99
+ }
100
+ }, _callee2);
101
+ })), []);
90
102
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Container, {
91
103
  id: modalId,
92
104
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -120,7 +132,7 @@ var VersionSelector = function VersionSelector(_ref) {
120
132
  currentVersion: item.version === currentVersion,
121
133
  productOwner: companyName,
122
134
  setVersion: setVersion
123
- });
135
+ }, item.version);
124
136
  })
125
137
  })]
126
138
  });
@@ -99,6 +99,8 @@ var _VersionSelector = require("../../organisms/VersionSelector");
99
99
 
100
100
  var _customHooks = require("../../../global-files/customHooks");
101
101
 
102
+ var _CreateVersion = require("../../organisms/CreateVersion");
103
+
102
104
  var _jsxRuntime = require("react/jsx-runtime");
103
105
 
104
106
  var reducerImages = function reducerImages(state, action) {
@@ -478,6 +480,11 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
478
480
  saving = _useState82[0],
479
481
  setSaving = _useState82[1];
480
482
 
483
+ var _useState83 = (0, _react.useState)(false),
484
+ _useState84 = (0, _slicedToArray2.default)(_useState83, 2),
485
+ showCreateVersion = _useState84[0],
486
+ setShowCreateVersion = _useState84[1];
487
+
481
488
  var _closeModals = (0, _customHooks.closeModals)("version-selector"),
482
489
  _closeModals2 = (0, _slicedToArray2.default)(_closeModals, 2),
483
490
  showVersionSelector = _closeModals2[0],
@@ -1981,7 +1988,12 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
1981
1988
  articleId: product.id_article,
1982
1989
  setVersion: setVersion,
1983
1990
  companyName: company.company_name,
1984
- currentVersion: version
1991
+ currentVersion: version,
1992
+ setShowCreateVersion: setShowCreateVersion
1993
+ }), showCreateVersion && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CreateVersion.CreateVersion, {
1994
+ idArticle: product.id_article,
1995
+ version: version,
1996
+ setShowCreateVersion: setShowCreateVersion
1985
1997
  })]
1986
1998
  });
1987
1999
  };
@@ -389,16 +389,16 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
389
389
 
390
390
  var isAuditor = user.id_role === 6;
391
391
 
392
- var _closeModals = (0, _customHooks.closeModals)("version-selector"),
393
- _closeModals2 = (0, _slicedToArray2.default)(_closeModals, 2),
394
- showVersionSelector = _closeModals2[0],
395
- setShowVersionSelector = _closeModals2[1];
396
-
397
392
  var _useState71 = (0, _react.useState)(false),
398
393
  _useState72 = (0, _slicedToArray2.default)(_useState71, 2),
399
394
  showCreateVersion = _useState72[0],
400
395
  setShowCreateVersion = _useState72[1];
401
396
 
397
+ var _closeModals = (0, _customHooks.closeModals)("version-selector"),
398
+ _closeModals2 = (0, _slicedToArray2.default)(_closeModals, 2),
399
+ showVersionSelector = _closeModals2[0],
400
+ setShowVersionSelector = _closeModals2[1];
401
+
402
402
  (0, _react.useEffect)(function () {
403
403
  checkAll && setSelectedImages(images.values);
404
404
  }, [checkAll]);
@@ -18,6 +18,8 @@ var closeModals = function closeModals(id) {
18
18
  setShowModal = _useState2[1];
19
19
 
20
20
  var closeModal = function closeModal(e) {
21
+ e.stopPropagation();
22
+
21
23
  if ((!e.target.closest("#".concat(id)) || e.target.closest("#close-button") || e.target.closest("#add-version")) && showModal) {
22
24
  document.removeEventListener("click", closeModal);
23
25
  setShowModal(false);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "contentoh-components-library",
3
- "version": "21.1.66",
3
+ "version": "21.1.69",
4
4
  "dependencies": {
5
5
  "@aws-amplify/auth": "^4.5.3",
6
6
  "@aws-amplify/datastore": "^3.11.0",
@@ -32,8 +32,8 @@ export const VersionSelector = ({
32
32
  }
33
33
  };
34
34
 
35
- useEffect(() => {
36
- loadProductVersions(articleId);
35
+ useEffect(async () => {
36
+ await loadProductVersions(articleId);
37
37
  }, []);
38
38
 
39
39
  return (
@@ -62,6 +62,7 @@ export const VersionSelector = ({
62
62
  <div className="versions-container">
63
63
  {versions?.map((item) => (
64
64
  <VersionItem
65
+ key={item.version}
65
66
  version={item.version}
66
67
  articleStatus={item.article_status}
67
68
  currentVersion={item.version === currentVersion}
@@ -42,6 +42,7 @@ import Slide1_4 from "../../../assets/images/sliderToolTip/slide4.svg";
42
42
  import Slide1_5 from "../../../assets/images/sliderToolTip/slide5.svg";
43
43
  import { VersionSelector } from "../../organisms/VersionSelector";
44
44
  import { closeModals } from "../../../global-files/customHooks";
45
+ import { CreateVersion } from "../../organisms/CreateVersion";
45
46
 
46
47
  const reducerImages = (state, action) => {
47
48
  let { values, attrForImgs } = state;
@@ -211,6 +212,7 @@ export const ProviderProductEdition = ({
211
212
  const [modalViewTextArea, setModalViewTextArea] = useState(false);
212
213
  const [socketType, setSocketType] = useState(null);
213
214
  const [saving, setSaving] = useState(loading);
215
+ const [showCreateVersion, setShowCreateVersion] = useState(false);
214
216
  const [showVersionSelector, setShowVersionSelector] =
215
217
  closeModals("version-selector");
216
218
 
@@ -1454,6 +1456,14 @@ export const ProviderProductEdition = ({
1454
1456
  setVersion={setVersion}
1455
1457
  companyName={company.company_name}
1456
1458
  currentVersion={version}
1459
+ setShowCreateVersion={setShowCreateVersion}
1460
+ />
1461
+ )}
1462
+ {showCreateVersion && (
1463
+ <CreateVersion
1464
+ idArticle={product.id_article}
1465
+ version={version}
1466
+ setShowCreateVersion={setShowCreateVersion}
1457
1467
  />
1458
1468
  )}
1459
1469
  </Container>
@@ -168,9 +168,9 @@ export const RetailerProductEdition = ({
168
168
  const [servicesStatus, setServicesStatus] = useState([]);
169
169
  const [saving, setSaving] = useState(loading);
170
170
  const isAuditor = user.id_role === 6;
171
+ const [showCreateVersion, setShowCreateVersion] = useState(false);
171
172
  const [showVersionSelector, setShowVersionSelector] =
172
173
  closeModals("version-selector");
173
- const [showCreateVersion, setShowCreateVersion] = useState(false);
174
174
 
175
175
  useEffect(() => {
176
176
  checkAll && setSelectedImages(images.values);
@@ -5,6 +5,7 @@ export const closeModals = (id) => {
5
5
  const [showModal, setShowModal] = useState(false);
6
6
 
7
7
  const closeModal = (e) => {
8
+ e.stopPropagation();
8
9
  if (
9
10
  (!e.target.closest(`#${id}`) ||
10
11
  e.target.closest("#close-button") ||
@@ -15,7 +16,6 @@ export const closeModals = (id) => {
15
16
  setShowModal(false);
16
17
  }
17
18
  };
18
-
19
19
  useEffect(() => {
20
20
  if (showModal) {
21
21
  document.addEventListener("click", closeModal);