@rh-support/react-context 2.1.45 → 2.1.46

package/lib/esm/components/HostnameAwarenessModal/HostnameAwarenessModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HostnameAwarenessModal.d.ts","sourceRoot":"","sources":["../../../../src/components/HostnameAwarenessModal/HostnameAwarenessModal.tsx"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAOtC,OAAO,KAA0C,MAAM,OAAO,CAAC;AAO/D,eAAO,MAAM,sBAAsB,yBA2KlC,CAAC"}
+{"version":3,"file":"HostnameAwarenessModal.d.ts","sourceRoot":"","sources":["../../../../src/components/HostnameAwarenessModal/HostnameAwarenessModal.tsx"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAOtC,OAAO,KAA0C,MAAM,OAAO,CAAC;AAO/D,eAAO,MAAM,sBAAsB,yBAsKlC,CAAC"}

package/lib/esm/components/HostnameAwarenessModal/HostnameAwarenessModal.js

@@ -24,43 +24,50 @@ export const HostnameAwarenessModal = () => {
     // Setting State for original data value which are used to open/finalize close modal
     const [originalViewedCountValue, setViewedCountValue] = useState(999);
     const [doNotShowModal, setDoNotShowModal] = useState(0);
-    const [doNotShowNotClicked, setDoNotShowNotClicked] = useState(true);
-    const [isModalOpen, setIsModalOpen] = useState(true);
+    const [isModalOpen, setIsModalOpen] = useState(false);
     const [isHostnamesChecked, setisHostnamesChecked] = useState(false);
-    const [isLoadingHostnamesVisibilityObj, setIsLoadingHostnamesVisibilityObj] = useState(true);
-    //preserving initial state to disable modal load
-    const [alreadyCheckedCloseModal, setAlreadyCheckedCloseModal] = useState(false);
     const { globalMetadataState: { loggedInUsersAccount }, } = useGlobalStateContext();
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
     const accountNumber = loggedInUsersAccount.data.accountNumber;
     const { request: updateHostnameDefault, isFetching: isFetchingUpdateHostnameDefault } = useFetch(accounts.updateIsSharingHostname);
+    //Do not show modal if user cannot share hostnames.
+    const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
     useEffect(() => {
+        if (loggedInUsersAccount.isFetching)
+            return;
+        let localOriginalViewedCountValue;
+        let localDoNotShowModal;
         const userOriginalHostnamesCount = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
-                setIsLoadingHostnamesVisibilityObj(true);
                 const originalHostnameVisibilityObj = yield getHostnamesVisibilityObj();
                 if (!originalHostnameVisibilityObj)
                     return;
                 const parsedVisibilityObj = JSON.parse(originalHostnameVisibilityObj);
-                setIsLoadingHostnamesVisibilityObj(false);
+                // updating space takes time, here we define a lcal variable to immidiatly use the value
+                localOriginalViewedCountValue = parsedVisibilityObj.shownCount;
+                localDoNotShowModal = parsedVisibilityObj.doNotShow;
                 setViewedCountValue(parsedVisibilityObj.shownCount);
                 setDoNotShowModal(parsedVisibilityObj.doNotShow);
             }
             catch (error) {
-                setIsLoadingHostnamesVisibilityObj(false);
                 console.log(error);
             }
         });
         const userOriginalHostnameValue = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             setisHostnamesChecked((_a = loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.shareHostnameWithRHT);
-            // This is needed so we preserve initial state we do not close modal upon updating names.
-            setAlreadyCheckedCloseModal((_b = loggedInUsersAccount.data) === null || _b === void 0 ? void 0 : _b.shareHostnameWithRHT);
         });
-        userOriginalHostnamesCount();
-        userOriginalHostnameValue();
+        const init = () => __awaiter(void 0, void 0, void 0, function* () {
+            yield userOriginalHostnamesCount();
+            userOriginalHostnameValue();
+            //Do not show modal if user is already sharing hostnames, has seen the modal more than twice, or opted to not show it again
+            if (canUseHostName && localDoNotShowModal !== 1 && localOriginalViewedCountValue < 2) {
+                setIsModalOpen(true);
+            }
+        });
+        init();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [loggedInUsersAccount.isFetching]);
     // To handle modal close
     const onCloseModal = () => __awaiter(void 0, void 0, void 0, function* () {
         if (isFetchingUpdateHostnameDefault)
@@ -68,7 +75,7 @@ export const HostnameAwarenessModal = () => {
         try {
             const updatedCountValue = (originalViewedCountValue || 0) + 1;
             updateShowHostnamesCount({ shownCount: updatedCountValue, doNotShow: doNotShowModal });
-            setIsModalOpen(!isModalOpen);
+            setIsModalOpen(false);
         }
         catch (error) {
             console.log(error);
@@ -89,7 +96,6 @@ export const HostnameAwarenessModal = () => {
     //for the checkbox
     const onDoNotAskAgain = () => {
         try {
-            setDoNotShowNotClicked(false);
             setDoNotShowModal(1);
             const updateObjValue = { shownCount: originalViewedCountValue, doNotShow: 1 };
             updateShowHostnamesCount(updateObjValue);
@@ -109,24 +115,12 @@ export const HostnameAwarenessModal = () => {
                 React.createElement(InfoIcon, { className: "pf-v5-u-ml-sm hostnameInfoIcon" })),
             isFetchingUpdateHostnameDefault && (React.createElement(Spinner, { size: "lg", className: "pf-v5-u-ml-sm hostnameSpinner", "aria-label": "Hostname loading" }))));
     };
-    //Do not show modal if user cannot share hostnames.
-    const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
-    //Do not show modal if user is already sharing hostnames, has seen the modal more than twice, or opted to not show it again
-    if (loggedInUsersAccount.isFetching ||
-        isLoadingHostnamesVisibilityObj ||
-        !canUseHostName ||
-        alreadyCheckedCloseModal ||
-        originalViewedCountValue > 2 ||
-        (doNotShowModal === 1 && doNotShowNotClicked)) {
-        return React.createElement(React.Fragment, null);
-    }
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Modal, { variant: ModalVariant.medium, title: "Share hostnames with Red Hat?", isOpen: isModalOpen, onClose: onCloseModal, actions: [
-                React.createElement(Button, { "data-tracking-id": "close-hostname-modal", key: "close", variant: "primary", onClick: onCloseModal, isDisabled: isFetchingUpdateHostnameDefault }, "Close"),
-                React.createElement("div", { className: "dontAskCheckbox" },
-                    React.createElement(Checkbox, { isChecked: !!doNotShowModal, label: "Don't ask me again", id: "dont-ask-again", "data-tracking-id": "dont-ask-again-hostname-modal", onChange: onDoNotAskAgain })),
-            ] },
-            React.createElement("div", null,
-                React.createElement(Trans, null, "Red Hat Support cannot currently access hostnames that have been entered on a case. You can share this information at any time to improve your support experience, or you can ignore this.")),
-            modalBody())));
+    return (React.createElement(Modal, { variant: ModalVariant.medium, title: "Share hostnames with Red Hat?", isOpen: isModalOpen, onClose: onCloseModal, actions: [
+            React.createElement(Button, { "data-tracking-id": "close-hostname-modal", key: "close", variant: "primary", onClick: onCloseModal, isDisabled: isFetchingUpdateHostnameDefault }, "Close"),
+            React.createElement("div", { className: "dontAskCheckbox" },
+                React.createElement(Checkbox, { isChecked: !!doNotShowModal, label: "Don't ask me again", id: "dont-ask-again", "data-tracking-id": "dont-ask-again-hostname-modal", onChange: onDoNotAskAgain })),
+        ] },
+        React.createElement("div", null,
+            React.createElement(Trans, null, "Red Hat Support cannot currently access hostnames that have been entered on a case. You can share this information at any time to improve your support experience, or you can ignore this.")),
+        modalBody()));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/react-context",
-    "version": "2.1.45",
+    "version": "2.1.46",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -93,5 +93,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "52dfee356aaccf62387bc8c9119bee456521ddd8"
+    "gitHead": "0c9672e10ec1e2d97e7679a47cc9191f4b41d977"
 }