@rh-support/react-context 1.0.12 → 1.0.13

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;AAatC,eAAO,MAAM,sBAAsB,mBA0JlC,CAAC"}
+{"version":3,"file":"HostnameAwarenessModal.d.ts","sourceRoot":"","sources":["../../../../src/components/HostnameAwarenessModal/HostnameAwarenessModal.tsx"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAatC,eAAO,MAAM,sBAAsB,mBAyKlC,CAAC"}

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

@@ -25,32 +25,36 @@ export const HostnameAwarenessModal = () => {
     const [doNotShowModal, setDoNotShowModal] = useState(null);
     const [isModalOpen, setIsModalOpen] = useState(true);
     const [isHostnamesChecked, setisHostnamesChecked] = useState(false);
+    const [isLoadingHostnamesVisibilityObj, setIsLoadingHostnamesVisibilityObj] = useState(false);
     //preserving initial state to disable modal load
     const [alreadyCheckedCloseModal, setAlreadyCheckedCloseModal] = useState(false);
     const [isHostnamesLoading, setIsHostnamesLoading] = useState(true);
-    const userOriginalHostnamesCount = () => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const originalHostnameVisibilityObj = yield getHostnamesVisibilityObj();
-            const parsedVisibilityObj = JSON.parse(originalHostnameVisibilityObj);
-            setViewedCountValue(parsedVisibilityObj.shownCount);
-            setDoNotShowModal(parsedVisibilityObj.doNotShow);
-        }
-        catch (error) {
-            console.log(error);
-        }
-    });
     const { globalMetadataState: { loggedInUsersAccount }, } = useGlobalStateContext();
     const accountNumber = loggedInUsersAccount.data.accountNumber;
-    const { request: fetchHostnameDefault } = useFetch(accounts.getIsSharingHostname);
-    const { request: updateHostnameDefault } = useFetch(accounts.updateIsSharingHostname);
-    const userOriginalHostnameValue = () => __awaiter(void 0, void 0, void 0, function* () {
-        const fetchedHostnameStatus = yield fetchHostnameDefault(accountNumber);
-        setisHostnamesChecked(fetchedHostnameStatus.shareHostnameWithRHT);
-        // This is needed so we preserve initial state we do not close modal upon updating names.
-        setAlreadyCheckedCloseModal(fetchedHostnameStatus.shareHostnameWithRHT);
-        setIsHostnamesLoading(false);
-    });
+    const { request: fetchHostnameDefault, isFetching: isFetchingHostnameDefault } = useFetch(accounts.getIsSharingHostname);
+    const { request: updateHostnameDefault, isFetching: isFetchingUpdateHostnameDefault } = useFetch(accounts.updateIsSharingHostname);
     useEffect(() => {
+        const userOriginalHostnamesCount = () => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                setIsLoadingHostnamesVisibilityObj(true);
+                const originalHostnameVisibilityObj = yield getHostnamesVisibilityObj();
+                const parsedVisibilityObj = JSON.parse(originalHostnameVisibilityObj);
+                setIsLoadingHostnamesVisibilityObj(false);
+                setViewedCountValue(parsedVisibilityObj.shownCount);
+                setDoNotShowModal(parsedVisibilityObj.doNotShow);
+            }
+            catch (error) {
+                setIsLoadingHostnamesVisibilityObj(false);
+                console.log(error);
+            }
+        });
+        const userOriginalHostnameValue = () => __awaiter(void 0, void 0, void 0, function* () {
+            const fetchedHostnameStatus = yield fetchHostnameDefault(accountNumber);
+            setisHostnamesChecked(fetchedHostnameStatus.shareHostnameWithRHT);
+            // This is needed so we preserve initial state we do not close modal upon updating names.
+            setAlreadyCheckedCloseModal(fetchedHostnameStatus.shareHostnameWithRHT);
+            setIsHostnamesLoading(false);
+        });
         userOriginalHostnamesCount();
         userOriginalHostnameValue();
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -100,18 +104,21 @@ export const HostnameAwarenessModal = () => {
     };
     //Do not show modal if user cannot share hostnames.
     const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
-    if (!canUseHostName) {
-        return React.createElement(React.Fragment, null);
-    }
     //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 (alreadyCheckedCloseModal || originalViewedCountValue > 2 || doNotShowModal) {
+    if (isFetchingHostnameDefault ||
+        isFetchingUpdateHostnameDefault ||
+        isLoadingHostnamesVisibilityObj ||
+        !canUseHostName ||
+        alreadyCheckedCloseModal ||
+        originalViewedCountValue > 2 ||
+        doNotShowModal === 1) {
         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 }, "Close"),
                 React.createElement("div", { className: "dontAskCheckbox" },
-                    React.createElement(Checkbox, { label: "Don't ask me again", id: "dont-ask-again", "data-tracking-id": "dont-ask-again-hostname-modal", onClick: onDoNotAskAgain })),
+                    React.createElement(Checkbox, { isChecked: !!doNotShowModal, label: "Don't ask me again", id: "dont-ask-again", "data-tracking-id": "dont-ask-again-hostname-modal", onClick: 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.")),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/react-context",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -87,5 +87,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "361b4d05273169e7c9b7f5c5236ccd7ce1463499"
+    "gitHead": "e5eaffb494da11a1b2f33603dd6b369106033882"
 }