@rh-support/manage 2.1.44 → 2.1.46

package/lib/esm/components/ManagePartnerships/PartnershipsTermsModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PartnershipsTermsModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ManagePartnerships/PartnershipsTermsModal.tsx"],"names":[],"mappings":"AAgBA,wBAAgB,SAAS,WAMxB;AAID,eAAO,MAAM,sBAAsB,mBA0LlC,CAAC"}
+{"version":3,"file":"PartnershipsTermsModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ManagePartnerships/PartnershipsTermsModal.tsx"],"names":[],"mappings":"AAgBA,wBAAgB,SAAS,WAMxB;AAID,eAAO,MAAM,sBAAsB,mBAqMlC,CAAC"}

package/lib/esm/components/ManagePartnerships/PartnershipsTermsModal.js

@@ -39,6 +39,13 @@ export const PartnershipsTermsModal = () => {
     const onClose = () => {
         if (isUpdating)
             return;
+        if (ackChoice === 'accept' || ackChoice === 'decline') {
+            const navigationObj = {
+                pathname: '/manage/partnerships',
+                search: '',
+            };
+            history.replace(navigationObj);
+        }
         ackChoice === 'decline' &&
             ToastNotification.addDangerMessage(t('You have declined a partner collaboration request'));
         setIsTermsModalOpen(false);
@@ -59,7 +66,7 @@ export const PartnershipsTermsModal = () => {
             catch (error) {
                 const errorCode = parseInt((error === null || error === void 0 ? void 0 : error.code) || (error === null || error === void 0 ? void 0 : error.status)) || '';
                 const errorMessage = errorCode === 400 ? (React.createElement(Trans, null, "You are not authorized to accept or reject partner link.")) : errorCode === 404 ? (React.createElement(Trans, null, "Partner link is invalid. The link has been used or expired.")) : (React.createElement(Trans, null, "There was a problem and partner link cannot be verified at this moment. Please try again later."));
-                setIsTermsVisited(true);
+                setIsVerifyingLink(false);
                 setVerificationFailMessage(errorMessage);
             }
         });
@@ -82,27 +89,33 @@ export const PartnershipsTermsModal = () => {
                 setIsUpdating(false);
                 setIsTermsVisited(false);
             }
-            const navigationObj = {
-                pathname: '/manage/partnerships',
-                search: '',
-            };
-            history.replace(navigationObj);
         });
-        verifyLink();
-        const decisionAccepted = /decision-\d+=accepted/gi.exec(location.search);
-        const decisionDeclined = /rejectedTnC=true/gi.exec(location.search);
-        const ackID = get(/ackID=(\d+)/gi.exec(location.search), [1]);
         const showModal = () => __awaiter(void 0, void 0, void 0, function* () {
+            const decisionAccepted = /decision-\d+=accepted/gi.exec(location.search);
+            const decisionDeclined = /rejectedTnC=true/gi.exec(location.search);
+            const ackID = get(/ackID=(\d+)/gi.exec(location.search), [1]);
             if ((!!decisionAccepted && ackID) || !!decisionDeclined) {
+                // user visited terms and conditions page and declined/accepted the terms then redirected to pcm
                 const choice = !!decisionAccepted ? 'accept' : !!decisionDeclined ? 'decline' : undefined;
                 setAckChoice(choice);
                 yield termAck(choice);
             }
+            else {
+                // verify if link before sending user to terms page to check if link is a valid link and not already used
+                verifyLink();
+            }
         });
         showModal();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [linkHash]);
-    return (React.createElement(Modal, { id: "partnership-terms-and-conditions-modal", className: "pf-modal-overflow-visible", title: 'Confirm partnership collaboration', isOpen: isTermsModalOpen, onClose: onClose, showClose: true, onEscapePress: onClose, variant: ModalVariant.large, actions: !isTermVisited
+    const modalContentWhenTermIsVisited = () => isUpdating ? (React.createElement(LoadingIndicator, { show: true, size: "lg" })) : ackChoice === 'accept' ? (React.createElement(Trans, null, "Your partnership link is created successfully")) : ackChoice === 'decline' ? (React.createElement(Trans, null, "You have not accepted terms and conditions")) : (React.createElement(React.Fragment, null));
+    const modalContentBeforeTermVisited = () => isVerifyingLink ? (React.createElement("p", { className: "pf-v5-u-mt-xs" },
+        React.createElement(LoadingDots, { show: true, message: t('Verifying partner link') }))) : verificationFailMessage ? (React.createElement("p", { className: "pf-v5-u-mt-xs pf-v5-u-danger-color-100" }, verificationFailMessage)) : (React.createElement(React.Fragment, null,
+        React.createElement("p", null,
+            React.createElement(Trans, null, "A partner would like to collaborate with you for support when cases are shared. Please confirm the name below and continue to accept terms and conditions.")),
+        React.createElement(TextContent, { className: "pf-v5-u-mt-lg" },
+            React.createElement(Text, { component: TextVariants.h3 }, linkAccountName))));
+    return (React.createElement(Modal, { id: "partnership-terms-and-conditions-modal", className: "pf-modal-overflow-visible", title: t('Confirm partnership collaboration'), isOpen: isTermsModalOpen, onClose: onClose, showClose: true, onEscapePress: onClose, variant: ModalVariant.large, actions: !isTermVisited && !verificationFailMessage
             ? [
                 React.createElement(Button, { href: getTnCUrl(), component: "a", variant: ButtonVariant.primary, key: "go-to-agreement", "data-tracking-id": "go-to-agreement" },
                     React.createElement(ExternalLinkAltIcon, null),
@@ -116,9 +129,5 @@ export const PartnershipsTermsModal = () => {
                 React.createElement(Button, { key: "close-after-link-created", "data-tracking-id": "close-after-link-created", variant: ButtonVariant.primary, onClick: () => onClose(), isDisabled: isUpdating },
                     React.createElement(Trans, null, "Close")),
             ] },
-        React.createElement(React.Fragment, null, isVerifyingLink ? (React.createElement(React.Fragment, null, verificationFailMessage ? (React.createElement("p", { className: "pf-v5-u-mt-xs pf-v5-u-danger-color-100" }, verificationFailMessage)) : (React.createElement("p", { className: "pf-v5-u-mt-xs" },
-            React.createElement(LoadingDots, { show: true, message: t('Verifying partner link') }))))) : !isVerifyingLink && !isTermVisited ? (React.createElement(React.Fragment, null,
-            React.createElement("p", null, "A partner would like to collaborate with you for support when cases are shared. Please confirm the name below and continue to accept terms and conditions."),
-            React.createElement(TextContent, { className: "pf-v5-u-mt-lg" },
-                React.createElement(Text, { component: TextVariants.h3 }, linkAccountName)))) : isTermVisited && isUpdating ? (React.createElement(LoadingIndicator, { show: true, size: "lg" })) : isTermVisited && ackChoice === 'accept' ? (React.createElement("div", null, "Your partnership link is created successfully")) : (React.createElement("div", null, "You have not accepted terms and conditions")))));
+        React.createElement(React.Fragment, null, isTermVisited ? modalContentWhenTermIsVisited() : modalContentBeforeTermVisited())));
 };

package/lib/esm/reducers/TopContentHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/TopContentHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iCAAiC,EAEpC,MAAM,2DAA2D,CAAC;AAKnE,OAAO,EAAE,oBAAoB,EAAwB,MAAM,qBAAqB,CAAC;AAEjF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WASlD,CAAC;AAEF,eAAO,MAAM,cAAc,6BAe1B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,eACb,oBAAoB,EAAE,iBACnB,iCAAiC,mBAC/B,MAAM,2BAqC1B,CAAC;AAEF,eAAO,MAAM,cAAc,oBAAqB,MAAM,KAAG,OAExD,CAAC;AAEF,eAAO,MAAM,qBAAqB,oBAAqB,MAAM,KAAG,OAE/D,CAAC"}
+{"version":3,"file":"TopContentHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/TopContentHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iCAAiC,EAEpC,MAAM,2DAA2D,CAAC;AAInE,OAAO,EAAE,oBAAoB,EAAwB,MAAM,qBAAqB,CAAC;AAEjF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WASlD,CAAC;AAEF,eAAO,MAAM,cAAc,6BAe1B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,eACb,oBAAoB,EAAE,iBACnB,iCAAiC,mBAC/B,MAAM,2BAqC1B,CAAC;AAEF,eAAO,MAAM,cAAc,oBAAqB,MAAM,KAAG,OAExD,CAAC;AAEF,eAAO,MAAM,qBAAqB,oBAAqB,MAAM,KAAG,OAE/D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "2.1.44",
+    "version": "2.1.46",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "homepage": "",
@@ -68,7 +68,7 @@
         "@types/react-router-dom": "^5.1.2",
         "i18next": "^19.0.1",
         "identity-obj-proxy": "^3.0.0",
-        "react-test-renderer": "17.0.1",
+        "react-test-renderer": "17.0.2",
         "tslib": "^1.10.0",
         "typescript": "4.3.5"
     },
@@ -77,12 +77,12 @@
         "@patternfly/patternfly": "5.1.0",
         "@patternfly/react-core": "5.1.1",
         "@patternfly/react-table": "5.1.1",
-        "@rh-support/components": "2.1.32",
-        "@rh-support/configs": "2.0.14",
-        "@rh-support/react-context": "2.1.35",
+        "@rh-support/components": "2.1.33",
+        "@rh-support/configs": "2.0.15",
+        "@rh-support/react-context": "2.1.36",
         "@rh-support/types": "2.0.2",
-        "@rh-support/user-permissions": "2.1.22",
-        "@rh-support/utils": "2.1.15",
+        "@rh-support/user-permissions": "2.1.23",
+        "@rh-support/utils": "2.1.16",
         "@types/react-beautiful-dnd": "^13.0.0",
         "i18next": ">=17.0.1",
         "lodash": ">=4.17.15",
@@ -96,5 +96,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "d52b9ccf062855933cbb1da3dac7f4c6a2694671"
+    "gitHead": "031565d4fcd752c2962e59c9e7fbf593e78acae9"
 }