@rh-support/troubleshoot 2.6.303 → 2.6.305

package/lib/esm/components/shared/fileUpload/reducer/AttachmentHelper.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { caseAttachments, Config, pcm, sessionAttachments } from '@cee-eng/hydrajs';
+import { Config, pcm, sessionAttachments } from '@cee-eng/hydrajs';
 import { ToastNotification } from '@rh-support/components';
-import { fetchCaseDetailsByCaseNumber, GET_CONTENT_DOCUMENT_IDS, GET_CONTENT_VERSION_STATUS, getText, pendoTrackEvent, } from '@rh-support/utils';
+import { fetchCaseDetailsByCaseNumber, GET_CONTENT_DOCUMENT_IDS, getText, pendoTrackEvent, pollAttachmentUploadStatus, pollContentVersionStatus, uploadCaseAttachment, } from '@rh-support/utils';
 import find from 'lodash/find';
 import forEach from 'lodash/forEach';
 import includes from 'lodash/includes';
@@ -110,7 +110,9 @@ export const isUploadedAndAnalysisSkipped = (file) => isSessionUploadComplete(fi
 export const updateUploadMetadata = (dispatch, fileIndexToEdit, newUploadMetadata) => {
     udpateFileUploadMetadata(dispatch, newUploadMetadata, fileIndexToEdit);
 };
-export const uploadAllFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dispatch, idToUploadTo, caseFiles, isSecureSupport, needsAnalyzing = false, isSessionId = false, slowUploadConfig = {}, }) {
+export const uploadAllFiles = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dispatch, idToUploadTo, caseFiles, 
+// isSecureSupport, // TODO: Re-enable when Hydra/GraphQL attachment APIs support secure support again
+needsAnalyzing = false, isSessionId = false, slowUploadConfig = {}, apolloClient, caseSalesforceId, }) {
     forEach(caseFiles.selectedLocalFiles, (localFile, index) => __awaiter(void 0, void 0, void 0, function* () {
         const fileStatus = new FileStatusHelper(localFile);
         if (fileStatus.isUploadComplete() ||
@@ -126,14 +128,17 @@ export const uploadAllFiles = (_a) => __awaiter(void 0, [_a], void 0, function*
             localFile,
             originalFile: caseFiles.selectedOriginalFiles[index],
             index,
-            isSecureSupport,
             needsAnalyzing,
             isSessionId,
             slowUploadConfig,
+            apolloClient,
+            caseSalesforceId,
         });
     }));
 });
-export const uploadFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dispatch, idToUploadTo, localFile, originalFile, index, isSecureSupport, needsAnalyzing = false, isSessionId = false, slowUploadConfig = {}, }) {
+export const uploadFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ dispatch, idToUploadTo, localFile, originalFile, index, 
+// isSecureSupport = false, // TODO: Re-enable when Hydra/GraphQL attachment APIs support secure support again
+needsAnalyzing = false, isSessionId = false, slowUploadConfig = {}, apolloClient, caseSalesforceId, }) {
     if (!localFile.uploadability.ableToUpload) {
         return;
     }
@@ -203,12 +208,42 @@ export const uploadFile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ d
             }, putObjectRequest, listener, true, { partSize: 5 * 1024 * 1024, queueSize: 5 }, Object.assign(Object.assign({}, slowUploadConfig), { preferSlowS3Upload: Config.userConfig.preferSlowS3Upload }));
         }
         else {
-            attachmentId = yield caseAttachments.uploadAttachmentS3(idToUploadTo, {
-                description: localFile.description,
-                fileName: localFile.name,
-                isPrivate: localFile.isPrivate,
-                size: localFile.size,
-            }, putObjectRequest, listener, true, { partSize: 5 * 1024 * 1024, queueSize: 5 }, isSecureSupport, Object.assign(Object.assign({}, slowUploadConfig), { preferSlowS3Upload: Config.userConfig.preferSlowS3Upload }));
+            // Mirror master Hydra listener behavior for circular progress + abort button.
+            let abortUpload;
+            const onAbort = (abortedFileIndex) => {
+                const abortPayload = {
+                    percentUploaded: 0,
+                    onAbort: undefined,
+                    uploadStatus: UploadStatusConstants.aborted,
+                };
+                abortUpload === null || abortUpload === void 0 ? void 0 : abortUpload();
+                updateUploadMetadata(dispatch, abortedFileIndex, abortPayload);
+            };
+            attachmentId = yield uploadCaseAttachment(idToUploadTo, originalFile, (percent) => {
+                const verifyingUpdate = percent === 100;
+                updateUploadMetadata(dispatch, index, {
+                    uploadStatus: verifyingUpdate
+                        ? UploadStatusConstants.verifyingCaseUpload
+                        : UploadStatusConstants.uploadingOnCase,
+                    percentUploaded: percent,
+                    uploadErrorMessage: '',
+                    onAbort: verifyingUpdate ? undefined : onAbort,
+                });
+            }, (abort) => {
+                abortUpload = abort;
+                updateUploadMetadata(dispatch, index, {
+                    uploadStatus: UploadStatusConstants.uploadingOnCase,
+                    onAbort,
+                });
+            });
+            if (apolloClient && caseSalesforceId) {
+                updateUploadMetadata(dispatch, index, {
+                    uploadStatus: UploadStatusConstants.verifyingCaseUpload,
+                    percentUploaded: 100,
+                    onAbort: undefined,
+                });
+                yield pollAttachmentUploadStatus(apolloClient, caseSalesforceId, attachmentId);
+            }
         }
         attachmentId && updateAttachmentIdForFile(dispatch, attachmentId, index);
         const uploadPayload = {
@@ -322,13 +357,7 @@ export function computeAnalysisResults(idToUploadTo, attachmentId, fileSize, isS
     });
 }
 const SCT_PART_SIZE = 5 * 1024 * 1024;
-const SCT_POLL_INTERVAL_MS = 5000;
-const SCTUploadStatus = {
-    IN_PROGRESS: 'In Progress',
-    FAILED: 'Failed',
-    COMPLETED: 'Completed',
-};
-export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, localFile, fileIndex, apolloClient) {
+export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, localFile, fileIndex, apolloClient, caseSalesforceId) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         if (!caseNumber || !sessionId || !localFile.attachmentId)
@@ -339,10 +368,10 @@ export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, loc
         };
         updateUploadMetadata(dispatch, fileIndex, currentUploadPayload);
         try {
-            let caseSalesforceId;
-            if (apolloClient) {
+            let resolvedCaseSalesforceId = caseSalesforceId;
+            if (apolloClient && !resolvedCaseSalesforceId) {
                 const caseDetails = yield fetchCaseDetailsByCaseNumber(apolloClient, caseNumber);
-                caseSalesforceId = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.id;
+                resolvedCaseSalesforceId = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.id;
             }
             const totalChunks = Math.ceil(localFile.size / SCT_PART_SIZE);
             const moveResponse = yield sessionAttachments.moveSessionAttachmentsToCaseSCT(sessionId, {
@@ -361,7 +390,7 @@ export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, loc
             if (!sctAttachmentId) {
                 throw new Error('Missing attachmentId from SCT move response');
             }
-            if (!caseSalesforceId || !apolloClient) {
+            if (!resolvedCaseSalesforceId || !apolloClient) {
                 updateUploadMetadata(dispatch, fileIndex, {
                     uploadStatus: UploadStatusConstants.uploadedOnCase,
                 });
@@ -369,7 +398,7 @@ export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, loc
             }
             const { data: docLinkData } = yield apolloClient.query({
                 query: GET_CONTENT_DOCUMENT_IDS,
-                variables: { linkedEntityId: { eq: caseSalesforceId } },
+                variables: { linkedEntityId: { eq: resolvedCaseSalesforceId } },
                 fetchPolicy: 'network-only',
             });
             const contentDocumentIds = ((_e = (_d = (_c = (_b = docLinkData === null || docLinkData === void 0 ? void 0 : docLinkData.redhat_support_uiapi) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.RedHatSupportContentDocumentLink) === null || _d === void 0 ? void 0 : _d.edges) !== null && _e !== void 0 ? _e : []).map((edge) => edge.node.ContentDocumentId.value);
@@ -398,31 +427,6 @@ export function moveSessionAttachmentToCase(dispatch, caseNumber, sessionId, loc
         }
     });
 }
-function pollContentVersionStatus(apolloClient, contentDocumentIds, attachmentUUID) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        while (true) {
-            const { data } = yield apolloClient.query({
-                query: GET_CONTENT_VERSION_STATUS,
-                variables: {
-                    contentDocumentIds: { in: contentDocumentIds },
-                    attachmentUUID: { eq: attachmentUUID },
-                },
-                fetchPolicy: 'network-only',
-            });
-            const edges = (_d = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.redhat_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.RedHatSupportContentVersion) === null || _c === void 0 ? void 0 : _c.edges) !== null && _d !== void 0 ? _d : [];
-            const matchingEntry = edges.find((edge) => { var _a; return ((_a = edge.node.AttachmentUUID__c) === null || _a === void 0 ? void 0 : _a.value) === attachmentUUID; });
-            const uploadStatus = (_f = (_e = matchingEntry === null || matchingEntry === void 0 ? void 0 : matchingEntry.node) === null || _e === void 0 ? void 0 : _e.UploadStatus__c) === null || _f === void 0 ? void 0 : _f.value;
-            if (uploadStatus === SCTUploadStatus.COMPLETED) {
-                return;
-            }
-            if (uploadStatus === SCTUploadStatus.FAILED) {
-                throw new Error('Attachment move to case failed');
-            }
-            yield new Promise((resolve) => setTimeout(resolve, SCT_POLL_INTERVAL_MS));
-        }
-    });
-}
 export function restoreFilesFromSession(dispatch, sessionId) {
     return __awaiter(this, void 0, void 0, function* () {
         resetAttachment(dispatch);

package/lib/esm/components/shared/fileUpload/types/index.d.ts

@@ -1,6 +1,7 @@
 export interface IFileUploaderCommonProps {
-    isSecureSupport: boolean;
     idToUploadTo: string;
+    /** Salesforce case Id from caseDetails.state — avoids an extra GetCaseByCaseNumber on upload. */
+    caseSalesforceId?: string;
     needsAnalyzing?: boolean;
     isSessionId: boolean;
     autoUploadOnSelect?: boolean;

package/lib/esm/components/shared/fileUpload/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/shared/fileUpload/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACrC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/shared/fileUpload/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IAGrC,YAAY,EAAE,MAAM,CAAC;IACrB,iGAAiG;IACjG,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B"}

package/lib/esm/components/shared/fileUpload/useFileUploader.d.ts

@@ -2,11 +2,11 @@ import React from 'react';
 import { IFileLocal } from './reducer/AttachmentReducer';
 import { IFileUploaderCommonProps } from './types';
 export declare function useFileUploader(props: IFileUploaderCommonProps): {
-    retryUpload: (indexToRetry: number) => void;
+    retryUpload: (indexToRetry: number) => Promise<void>;
     editFile: (editedLocalFile: IFileLocal, fileIndexToEdit: number, changes: IFileLocal) => Promise<void>;
     removeFile: (fileIndexToRemove: number, file: IFileLocal) => Promise<void>;
     uploadAll: (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => Promise<void>;
-    uploadFile: (fileIndex: number) => void;
+    uploadFile: (fileIndex: number) => Promise<void>;
     retryAnalysis: (indexToRetry: number) => void;
 };
 //# sourceMappingURL=useFileUploader.d.ts.map

package/lib/esm/components/shared/fileUpload/useFileUploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileUploader.d.ts","sourceRoot":"","sources":["../../../../../src/components/shared/fileUpload/useFileUploader.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAenF,OAAO,EAAE,UAAU,EAAmD,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,wBAAgB,eAAe,CAAC,KAAK,EAAE,wBAAwB;gCA8DvB,MAAM;gCAYM,UAAU,mBAAmB,MAAM,WAAW,UAAU;oCAOpD,MAAM,QAAQ,UAAU;wBAczC,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC;4BA4BjD,MAAM;kCAxDA,MAAM;EA8EhD"}
+{"version":3,"file":"useFileUploader.d.ts","sourceRoot":"","sources":["../../../../../src/components/shared/fileUpload/useFileUploader.tsx"],"names":[],"mappings":"AAaA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAenF,OAAO,EAAE,UAAU,EAAmD,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,wBAAgB,eAAe,CAAC,KAAK,EAAE,wBAAwB;gCAsEjB,MAAM;gCAYA,UAAU,mBAAmB,MAAM,WAAW,UAAU;oCAOpD,MAAM,QAAQ,UAAU;wBA0BzC,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC;4BA8B3C,MAAM;kCAtEN,MAAM;EA+FhD"}

package/lib/esm/components/shared/fileUpload/useFileUploader.js

@@ -7,10 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { caseAttachments, sessionAttachments } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
+import { sessionAttachments } from '@cee-eng/hydrajs';
 import { useFetch, usePrevious } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
-import { getConfigField, getUserAgentForCaseMode, PCM_CONFIG_FIELD_TYPE } from '@rh-support/utils';
+import { deleteCaseAttachment, fetchCaseDetailsByCaseNumber, getConfigField, getUserAgentForCaseMode, PCM_CONFIG_FIELD_TYPE, } from '@rh-support/utils';
 import debounce from 'lodash/debounce';
 import { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../../context/SessionRestoreContext';
@@ -23,9 +24,16 @@ import { AttachmentDispatchContext, AttachmentStateContext } from './reducer/Att
 export function useFileUploader(props) {
     const { attachmentState, attachmentState: { caseFiles }, } = useContext(AttachmentStateContext);
     const dispatch = useContext(AttachmentDispatchContext);
+    const apolloClient = useApolloClient();
+    const caseSalesforceIdRef = useRef();
     const { request: deleteSessionAttachment } = useFetch(sessionAttachments.deleteSesionAttachment);
-    const { request: deleteCaseAttachment } = useFetch(caseAttachments.deleteAttachment);
-    const { idToUploadTo, needsAnalyzing, isSecureSupport, isSessionId, autoUploadOnSelect, onUploadClick } = props;
+    const { request: deleteCaseAttachmentRequest } = useFetch(deleteCaseAttachment);
+    const { idToUploadTo, caseSalesforceId, needsAnalyzing, isSessionId, autoUploadOnSelect, onUploadClick } = props;
+    useEffect(() => {
+        if (caseSalesforceId) {
+            caseSalesforceIdRef.current = caseSalesforceId;
+        }
+    }, [caseSalesforceId]);
     const { globalMetadataState: { pcmConfig, referrerUrl, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const { sessionRestore } = useContext(SessionRestoreStateContext);
     const sessionRestoreDispatch = useContext(SessionRestoreDispatchContext);
@@ -55,11 +63,11 @@ export function useFileUploader(props) {
         sessionAttachments.updateSessionAttachmentMetadata(idToUploadTo, [Object.assign({ id: file.attachmentId }, changes)]);
     }), [idToUploadTo]);
     const debounceSessionMetadataUpdate = useMemo(() => debounce(updateSessionAttachmentMetadata, 800), [updateSessionAttachmentMetadata]);
-    const onRetryLocal = (indexToRetry) => {
+    const onRetryLocal = (indexToRetry) => __awaiter(this, void 0, void 0, function* () {
         if (idToUploadTo && attachmentState.caseFiles.selectedLocalFiles[indexToRetry]) {
-            onUploadFile(indexToRetry);
+            yield onUploadFile(indexToRetry);
         }
-    };
+    });
     const onRetryAnalysis = (indexToRetry) => {
         const file = attachmentState.caseFiles.selectedLocalFiles[indexToRetry];
         if (idToUploadTo && file && file.attachmentId) {
@@ -85,12 +93,25 @@ export function useFileUploader(props) {
             });
         }
         isUploadedSuccessfully(file) && isSessionId && deleteSessionAttachment(idToUploadTo, file.attachmentId);
-        isUploadedSuccessfully(file) &&
-            !isSessionId &&
-            deleteCaseAttachment(idToUploadTo, file.attachmentId, isSecureSupport);
+        // TODO: Re-enable when delete API accepts isSecureSupport again
+        // isUploadedSuccessfully(file) && !isSessionId && deleteCaseAttachment(idToUploadTo, file.attachmentId, isSecureSupport);
+        isUploadedSuccessfully(file) && !isSessionId && deleteCaseAttachmentRequest(idToUploadTo, file.attachmentId);
+    });
+    const resolveCaseSalesforceId = () => __awaiter(this, void 0, void 0, function* () {
+        if (caseSalesforceIdRef.current || isSessionId || !idToUploadTo || !apolloClient) {
+            return;
+        }
+        try {
+            const caseDetails = yield fetchCaseDetailsByCaseNumber(apolloClient, idToUploadTo);
+            caseSalesforceIdRef.current = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.id;
+        }
+        catch (_a) {
+            caseSalesforceIdRef.current = undefined;
+        }
     });
     const onUploadAll = (event) => __awaiter(this, void 0, void 0, function* () {
         onUploadClick && onUploadClick();
+        yield resolveCaseSalesforceId();
         // on truobleshoot flow, user can upload a file while no data has added therefore no sessionId is available
         let sessionId = '';
         if (!idToUploadTo) {
@@ -109,25 +130,28 @@ export function useFileUploader(props) {
             dispatch,
             idToUploadTo: idToUploadTo || sessionId,
             caseFiles,
-            isSecureSupport,
             needsAnalyzing,
             isSessionId,
             slowUploadConfig,
+            apolloClient: !isSessionId ? apolloClient : undefined,
+            caseSalesforceId: !isSessionId ? caseSalesforceIdRef.current : undefined,
         });
     });
-    const onUploadFile = (fileIndex) => {
+    const onUploadFile = (fileIndex) => __awaiter(this, void 0, void 0, function* () {
+        yield resolveCaseSalesforceId();
         uploadFile({
             dispatch,
             idToUploadTo,
             localFile: attachmentState.caseFiles.selectedLocalFiles[fileIndex],
             originalFile: attachmentState.caseFiles.selectedOriginalFiles[fileIndex],
             index: fileIndex,
-            isSecureSupport,
             needsAnalyzing,
             isSessionId,
             slowUploadConfig,
+            apolloClient: !isSessionId ? apolloClient : undefined,
+            caseSalesforceId: !isSessionId ? caseSalesforceIdRef.current : undefined,
         });
-    };
+    });
     return {
         retryUpload: onRetryLocal,
         editFile: onFileEditLocal,

package/lib/esm/components/wizardLayout/GlobalTroubleshootEffects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAiBvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAYvG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAsctD"}
+{"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgBvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAYvG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,qBAodtD"}

package/lib/esm/components/wizardLayout/GlobalTroubleshootEffects.js

@@ -25,7 +25,7 @@ import { TCDispatchContext, TCStateContext } from '../../context/TopContentConte
 import { useResetCaseCreate } from '../../hooks/useResetCaseCreate';
 import { CASE_DEATILS_SOURCE_REFERRER_LIMIT } from '../../reducers/CaseConstNTypes';
 import { getDescriptionWOQues } from '../../reducers/CaseHelpers';
-import { fetchCaseGroupsForContactGraphQL, setCaseAccountNumber, setCaseDetails, setCaseOwner, setCaseState, } from '../../reducers/CaseReducer';
+import { fetchCaseGroupsForContactGraphQL, setCaseAccountNumber, setCaseDetails, setCaseState, } from '../../reducers/CaseReducer';
 import { AppRouteSections } from '../../reducers/RouteConstNTypes';
 import { setActiveSectionChanged, setRouteFlags, updateisNextBtnClickedToShowValidationError, } from '../../reducers/RouteReducer';
 import { fetchEdmundAbbottRules } from '../../reducers/RulesReducer';
@@ -175,8 +175,6 @@ export function GlobalTroubleshootEffects(props) {
         var _a, _b;
         if (isEmpty(loggedInUserRights.data))
             return;
-        if (loggedInUserRights.data.isInternal())
-            return;
         const resolvedAccountNumber = ((_a = loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.accountNumber) ||
             loggedInUserRights.data.getAccountNumber() ||
             (loggedInUserJwtToken === null || loggedInUserJwtToken === void 0 ? void 0 : loggedInUserJwtToken.account_number) ||
@@ -185,11 +183,6 @@ export function GlobalTroubleshootEffects(props) {
             const hasFullAccountData = !isEmpty((_b = loggedInUsersAccount.data) === null || _b === void 0 ? void 0 : _b.accountNumber);
             setCaseAccountNumber(caseDispatch, resolvedAccountNumber, hasFullAccountData, hasFullAccountData ? loggedInUsersAccount.data : {}, apolloClient);
         }
-        if (isEmpty(contactSsoUsername)) {
-            setCaseOwner(caseDispatch, loggedInUserRights.data.getHydraContactFromLoggedInUser(), product, undefined, undefined, true, undefined, true, undefined, undefined, loggedInUserRights.data.isInternal()
-                ? accountNumber || loggedInUserRights.data.getAccountNumber()
-                : undefined);
-        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         caseDispatch,
@@ -200,43 +193,66 @@ export function GlobalTroubleshootEffects(props) {
         contactSsoUsername,
     ]);
     useEffect(() => {
-        if (isEmpty(loggedInUserRights.data) || loggedInUserRights.data.isInternal())
-            return;
-        if (isEmpty(accountNumber) || isEmpty(contactSsoUsername))
-            return;
-        if (selectedAccountDetails.isFetching)
+        if (isEmpty(loggedInUserRights.data))
             return;
         if (selectedOwnerContactId)
             return;
-        const ownerSso = loggedInUserRights.data.getSSOUsername();
-        const fetchContacts = () => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const fetchAndSetDefaultOwner = () => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
             try {
-                const { data } = yield apolloClient.query({
+                // First get logged-in user's FederationIdentifier and ContactId
+                const { data: userData } = yield apolloClient.query({
+                    query: GET_ACCOUNT_CONTACTS,
+                    variables: { first: 1, contactsWhere: { IsActive__c: { eq: true } } },
+                });
+                const response = userData;
+                const userEdges = (_d = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.redhat_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.RedHatSupportUser) === null || _c === void 0 ? void 0 : _c.edges) !== null && _d !== void 0 ? _d : [];
+                const loggedInUser = userEdges.find(({ node }) => { var _a, _b; return ((_a = node.FederationIdentifier) === null || _a === void 0 ? void 0 : _a.value) != null && ((_b = node.ContactId) === null || _b === void 0 ? void 0 : _b.value); });
+                if (!loggedInUser)
+                    return;
+                const federationId = loggedInUser.node.FederationIdentifier.value;
+                // Search for the contact using FederationIdentifier (SSOUserName__c)
+                const { data: contactData } = yield apolloClient.query({
                     query: GET_ACCOUNT_CONTACTS,
                     variables: {
-                        accountNumber: { eq: accountNumber },
-                        first: 200,
-                        orderBy: { Name: { order: 'ASC' } },
+                        first: 1,
+                        contactsWhere: {
+                            IsActive__c: { eq: true },
+                            SSOUserName__c: { like: federationId },
+                        },
                     },
+                    fetchPolicy: 'network-only',
                 });
-                const response = data;
-                const contactEdges = (_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.redhat_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.RedHatSupportAccount) === null || _c === void 0 ? void 0 : _c.edges) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.node) === null || _f === void 0 ? void 0 : _f.Contacts) === null || _g === void 0 ? void 0 : _g.edges) !== null && _h !== void 0 ? _h : [];
-                const matchingContact = contactEdges.find(({ node }) => { var _a, _b; return ((_b = (_a = node.SSOUserName__c) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === (ownerSso === null || ownerSso === void 0 ? void 0 : ownerSso.toLowerCase()); });
-                if ((_j = matchingContact === null || matchingContact === void 0 ? void 0 : matchingContact.node) === null || _j === void 0 ? void 0 : _j.Id) {
-                    const ownerWithId = Object.assign(Object.assign({}, loggedInUserRights.data.getHydraContactFromLoggedInUser()), { id: matchingContact.node.Id, defaultCaseGroup: (_l = (_k = matchingContact.node.DefaultCaseGroup__c) === null || _k === void 0 ? void 0 : _k.value) !== null && _l !== void 0 ? _l : null });
+                const contactResponse = contactData;
+                const contactEdges = (_m = (_l = (_k = (_j = (_h = (_g = (_f = (_e = contactResponse === null || contactResponse === void 0 ? void 0 : contactResponse.redhat_support_uiapi) === null || _e === void 0 ? void 0 : _e.query) === null || _f === void 0 ? void 0 : _f.RedHatSupportAccount) === null || _g === void 0 ? void 0 : _g.edges) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.node) === null || _k === void 0 ? void 0 : _k.Contacts) === null || _l === void 0 ? void 0 : _l.edges) !== null && _m !== void 0 ? _m : [];
+                const matchingContact = contactEdges[0];
+                if (matchingContact === null || matchingContact === void 0 ? void 0 : matchingContact.node) {
+                    const node = matchingContact.node;
+                    const ownerData = {
+                        id: node.Id,
+                        ssoUsername: (_p = (_o = node.SSOUserName__c) === null || _o === void 0 ? void 0 : _o.value) !== null && _p !== void 0 ? _p : '',
+                        firstName: (_r = (_q = node.FirstName) === null || _q === void 0 ? void 0 : _q.value) !== null && _r !== void 0 ? _r : '',
+                        lastName: (_t = (_s = node.LastName) === null || _s === void 0 ? void 0 : _s.value) !== null && _t !== void 0 ? _t : '',
+                        fullNameCustom: (_v = (_u = node.Name) === null || _u === void 0 ? void 0 : _u.value) !== null && _v !== void 0 ? _v : '',
+                        manageSupportCases: (_x = (_w = node.ManageSupportCases__c) === null || _w === void 0 ? void 0 : _w.value) !== null && _x !== void 0 ? _x : true,
+                        isInternal: (_z = (_y = node.IsInternal__c) === null || _y === void 0 ? void 0 : _y.value) !== null && _z !== void 0 ? _z : false,
+                        isOrgAdmin: (_1 = (_0 = node.IsOrgAdmin__c) === null || _0 === void 0 ? void 0 : _0.value) !== null && _1 !== void 0 ? _1 : false,
+                        phone: (_3 = (_2 = node.Phone) === null || _2 === void 0 ? void 0 : _2.value) !== null && _3 !== void 0 ? _3 : '',
+                        defaultCaseGroup: (_5 = (_4 = node.DefaultCaseGroup__c) === null || _4 === void 0 ? void 0 : _4.value) !== null && _5 !== void 0 ? _5 : null,
+                    };
                     setCaseState(caseDispatch, {
-                        selectedOwner: { data: ownerWithId, isFetching: false, isError: false, errorMessage: '' },
+                        selectedOwner: { data: ownerData, isFetching: false, isError: false, errorMessage: '' },
                     });
+                    setCaseDetails(caseDispatch, { contactSSOName: ownerData.ssoUsername });
                 }
             }
-            catch (e) {
-                // Contact fetch failed; case proceeds with owner from JWT
+            catch (_6) {
+                // Contact fetch failed; owner stays empty
             }
         });
-        fetchContacts();
+        fetchAndSetDefaultOwner();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [accountNumber, contactSsoUsername, selectedAccountDetails.isFetching, selectedOwnerContactId]);
+    }, [loggedInUserRights.data, selectedOwnerContactId]);
     /**
      * Fetch case groups for the selected owner's contactId.
      * Filters groups where the contact is a member via GET_CASE_GROUP.
@@ -262,9 +278,17 @@ export function GlobalTroubleshootEffects(props) {
         if (isEmpty(product) || selectedAccountDetails.isFetching || isEmpty(selectedAccountDetails.data))
             return;
         const serviceLevels = resolveProductServiceLevelsForAccount(selectedAccountDetails.data, allProducts.data.productsResult, product);
-        if (!serviceLevels)
+        if (!serviceLevels || !serviceLevels.productServiceLevel) {
+            setCaseState(caseDispatch, {
+                isProductNotEntitled: true,
+                productServiceLevel: undefined,
+                otherServiceLevels: [],
+                selectedEntitlementId: undefined,
+            });
             return;
+        }
         setCaseState(caseDispatch, {
+            isProductNotEntitled: false,
             productServiceLevel: serviceLevels.productServiceLevel,
             otherServiceLevels: serviceLevels.otherServiceLevels,
             selectedEntitlementId: serviceLevels.defaultEntitlementId,

package/lib/esm/components/wizardLayout/WizardLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WizardLayout.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/WizardLayout.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAMvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAcvG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,qBAoLzC"}
+{"version":3,"file":"WizardLayout.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/WizardLayout.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAMvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAevG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,qBA+NzC"}

package/lib/esm/components/wizardLayout/WizardLayout.js

@@ -21,11 +21,12 @@ import { Trans } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
 import { RouteContext } from '../../context/RouteContext';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../context/SessionRestoreContext';
-import { submitCase } from '../../reducers/CaseReducer';
+import { setCaseState, submitCase } from '../../reducers/CaseReducer';
 import { AppRouteSections } from '../../reducers/RouteConstNTypes';
 import { useMetadata } from '../../utils/metadataUtil';
 import RouteUtils from '../../utils/routeUtils';
 import PreCaseConfirmationModals, { PreCaseConfirmationModalsEnum, } from '../ConfirmationModals/PreCaseConfirmationModals';
+import { ProductNotEntitledModal } from '../ProductSelector/ProductNotEntitledModal';
 import AlertToastWrapper from '../Recommendations/AlertToastWrapper';
 import { preferredSSModalOpenPendoEvent } from '../shared/Constants';
 import { AttachmentStateContext } from '../shared/fileUpload';
@@ -38,12 +39,17 @@ export function WizardLayout(props) {
     const { routeState: { activeSection, isCaseCreate }, } = useContext(RouteContext);
     const { getMetadata } = useMetadata();
     const [isAIChatMode, setIsAIChatMode] = useState(false);
-    const { caseCreationError, caseType, product, caseState, hasInvalidEntitlements } = useCaseSelector((state) => ({
+    const [showEntitlementModal, setShowEntitlementModal] = useState(false);
+    const entitlementTimerRef = useRef(null);
+    const { caseCreationError, caseType, product, caseState, hasInvalidEntitlements, isProductNotEntitled, entitlementWarningDismissedForProduct, isAccountLoaded, } = useCaseSelector((state) => ({
         caseState: state,
         caseCreationError: state.caseCreationError,
         caseType: state.caseDetails.caseType,
         product: state.caseDetails.product,
         hasInvalidEntitlements: state.hasInvalidEntitlements,
+        isProductNotEntitled: state.isProductNotEntitled,
+        entitlementWarningDismissedForProduct: state.entitlementWarningDismissedForProduct,
+        isAccountLoaded: !state.selectedAccountDetails.isFetching && !isEmpty(state.selectedAccountDetails.data),
     }), isEqual);
     const sessionRestoreDispatch = useContext(SessionRestoreDispatchContext);
     const caseDispatch = useCaseDispatch();
@@ -51,6 +57,25 @@ export function WizardLayout(props) {
     const { globalMetadataState: { allProducts, loggedInUser, loggedInUsersAccount, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
     const apolloClient = useApolloClient();
+    useEffect(() => {
+        if (entitlementTimerRef.current) {
+            clearTimeout(entitlementTimerRef.current);
+            entitlementTimerRef.current = null;
+        }
+        if (!isProductNotEntitled || isEmpty(product) || !isAccountLoaded) {
+            setShowEntitlementModal(false);
+            return;
+        }
+        if (product === entitlementWarningDismissedForProduct)
+            return;
+        entitlementTimerRef.current = setTimeout(() => {
+            setShowEntitlementModal(true);
+        }, 300);
+        return () => {
+            if (entitlementTimerRef.current)
+                clearTimeout(entitlementTimerRef.current);
+        };
+    }, [isProductNotEntitled, product, isAccountLoaded, entitlementWarningDismissedForProduct]);
     const canAddAttachments = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.ATTACHMENTS);
     const { attachmentState } = useContext(AttachmentStateContext);
     const isAnyFileAttachedLocal = isAnyFileAttached(attachmentState.caseFiles.selectedLocalFiles);
@@ -132,5 +157,9 @@ export function WizardLayout(props) {
                 React.createElement(WizardMain, { routeProps: props.routeProps, submitCaseAndNavigate: submitCaseAndNavigate, confirmSupportModal: confirmSupportModal, isAIChatMode: isAIChatMode, setIsAIChatMode: setIsAIChatMode, isSecureSupport: (_a = loggedInUsersAccount === null || loggedInUsersAccount === void 0 ? void 0 : loggedInUsersAccount.data) === null || _a === void 0 ? void 0 : _a.secureSupport, hasConfirmedStatesideSupport: (_b = loggedInUsersAccount === null || loggedInUsersAccount === void 0 ? void 0 : loggedInUsersAccount.data) === null || _b === void 0 ? void 0 : _b.hasConfirmedStatesideSupport, isUserExternal: (_d = (_c = loggedInUserRights === null || loggedInUserRights === void 0 ? void 0 : loggedInUserRights.data) === null || _c === void 0 ? void 0 : _c.isExternal()) !== null && _d !== void 0 ? _d : false, hasInvalidEntitlements: hasInvalidEntitlements })),
             !isAIChatMode && (React.createElement(GridItem, { span: 4, className: "grid-wizard-aside-content" },
                 React.createElement(WizardAside, { isAttachmentUploadModalOpen: confirmationModalType === PreCaseConfirmationModalsEnum.NO_ATTACHMENT_MODAL, routeProps: props.routeProps })))),
-        React.createElement(AlertToastWrapper, { submitCaseAndNavigate: submitCaseAndNavigate, routeProps: props.routeProps })));
+        React.createElement(AlertToastWrapper, { submitCaseAndNavigate: submitCaseAndNavigate, routeProps: props.routeProps }),
+        React.createElement(ProductNotEntitledModal, { isOpen: showEntitlementModal, onClose: () => {
+                setShowEntitlementModal(false);
+                setCaseState(caseDispatch, { entitlementWarningDismissedForProduct: product });
+            } })));
 }

package/lib/esm/hooks/useS3Upload.d.ts

@@ -1,9 +1,10 @@
-export declare function useS3Upload(idToUploadTo: any, isSecureSupport: any): {
-    uploadFile: ({ file, description, isPrivate, listenerFn }: {
-        file: any;
+import { ApolloQueryClient } from '@rh-support/utils';
+export declare function useS3Upload(caseNumber: string, apolloClient?: ApolloQueryClient, caseSalesforceId?: string): {
+    uploadFile: ({ file, description, isPrivate, listenerFn, }: {
+        file: File;
         description?: string;
         isPrivate?: boolean;
-        listenerFn?: (percent: any, abort: any) => void;
+        listenerFn?: (percent: number, abort: () => void) => void;
     }) => Promise<string>;
     isUploadingFile: boolean;
 };

package/lib/esm/hooks/useS3Upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/hooks/useS3Upload.ts"],"names":[],"mappings":"AASA,wBAAgB,WAAW,CAAC,YAAY,KAAA,EAAE,eAAe,KAAA;;;;;;;;EA0ExD"}
+{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/hooks/useS3Upload.ts"],"names":[],"mappings":"AACA,OAAO,EACH,iBAAiB,EAIpB,MAAM,mBAAmB,CAAC;AAU3B,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,MAAM;gEAuBpG;QACC,IAAI,EAAE,IAAI,CAAC;QACX,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;KAC7D;;EA4CJ"}