@rh-support/troubleshoot 2.6.269 → 2.6.271

package/lib/esm/components/SessionRestore/SessionRestore.d.ts

@@ -1,9 +1,11 @@
+import { ISessionItem } from '@cee-eng/hydrajs/@types/api/pcm/troubleshootSession';
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { IRouteUrlParams } from '../../reducers/RouteConstNTypes';
 interface IProps {
     routeProps: RouteComponentProps<IRouteUrlParams>;
 }
+export declare const isSessionFromCurrentAuthCycle: (sessionItem: ISessionItem | undefined, currentLoginStartTime: number) => boolean;
 export declare function SessionRestore(props: IProps): React.JSX.Element;
 export {};
 //# sourceMappingURL=SessionRestore.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SessionRestore.d.ts","sourceRoot":"","sources":["../../../../src/components/SessionRestore/SessionRestore.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,OAAO,EAGH,eAAe,EAElB,MAAM,iCAAiC,CAAC;AAmBzC,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,qBA4W3C"}
+{"version":3,"file":"SessionRestore.d.ts","sourceRoot":"","sources":["../../../../src/components/SessionRestore/SessionRestore.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAgC,YAAY,EAAE,MAAM,qDAAqD,CAAC;AAQjH,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,OAAO,EAGH,eAAe,EAElB,MAAM,iCAAiC,CAAC;AAmBzC,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,6BAA6B,GAAI,aAAa,YAAY,GAAG,SAAS,EAAE,uBAAuB,MAAM,YAKjH,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,qBAiX3C"}

package/lib/esm/components/SessionRestore/SessionRestore.js

@@ -32,7 +32,17 @@ import { restoreFilesFromSession } from '../shared/fileUpload/reducer/Attachment
 import { AttachmentDispatchContext } from '../shared/fileUpload/reducer/AttachmentReducerContext';
 import { RestoreLastSessionModal } from './RestoreLastSessionModal';
 import { SessionRestoreCard } from './SessionRestoreCard';
+export const isSessionFromCurrentAuthCycle = (sessionItem, currentLoginStartTime) => {
+    var _a, _b;
+    if (isEmpty(sessionItem) || !currentLoginStartTime)
+        return true;
+    const sessionModifiedTime = Date.parse((_b = (_a = sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.session) === null || _a === void 0 ? void 0 : _a.modifiedDate) !== null && _b !== void 0 ? _b : '');
+    if (Number.isNaN(sessionModifiedTime))
+        return true;
+    return sessionModifiedTime >= currentLoginStartTime;
+};
 export function SessionRestore(props) {
+    var _a;
     const sessionRestoreDispatch = useContext(SessionRestoreDispatchContext);
     const dispatchToAttachmentReducer = useContext(AttachmentDispatchContext);
     const { sessionRestore } = useContext(SessionRestoreStateContext);
@@ -45,7 +55,7 @@ export function SessionRestore(props) {
         ABTestVariation: state.ABTestVariation,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
-    const { globalMetadataState: { loggedInUsersAccount, loggedInUserRights, referrerUrl }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState: { loggedInUsersAccount, loggedInUserRights, referrerUrl, loggedInUserJwtToken }, } = useContext(GlobalMetadataStateContext);
     const queryParamsFromUrl = RouteUtils.getQueryParams(props.routeProps);
     const currentUrlSeSessionId = queryParamsFromUrl.seSessionId;
     const previousUrlSeSessionId = usePrevious(currentUrlSeSessionId);
@@ -55,6 +65,7 @@ export function SessionRestore(props) {
     const previousActiveSessionId = usePrevious(sessionRestore.activeSessionId);
     const isFirstMountRef = useRef(true);
     const { getMetadata } = useMetadata();
+    const currentLoginStartTime = ((_a = loggedInUserJwtToken === null || loggedInUserJwtToken === void 0 ? void 0 : loggedInUserJwtToken.iat) !== null && _a !== void 0 ? _a : 0) * 1000;
     /**
      * Fetching previous sessions on load
      */
@@ -90,8 +101,9 @@ export function SessionRestore(props) {
         }
         const currentRelevantSession = getRelevantSessionFromSessions(sessionRestoreDispatch, currentUrlSeSessionId, sessionRestore.previousSessions.data, caseDetails);
         const relevantSession = sessionRestore.previousSessions.data[currentRelevantSession];
+        const canReuseRelevantSession = !isEmpty(relevantSession) && isSessionFromCurrentAuthCycle(relevantSession, currentLoginStartTime);
         const setSession = () => __awaiter(this, void 0, void 0, function* () {
-            const needsNewSessionId = hasProductVersionOrSummary && isEmpty(relevantSession);
+            const needsNewSessionId = hasProductVersionOrSummary && !canReuseRelevantSession;
             if (needsNewSessionId) {
                 const userAgent = getUserAgentForCaseMode(isCaseCreate);
                 const userAgentAB = userAgent + (isEqual(ABTestVariation, 'A') ? '-A-1' : '-B-1');
@@ -105,7 +117,7 @@ export function SessionRestore(props) {
                     yield createSession(sessionRestoreDispatch, getSessionDetailsFromCase(caseDetails, selectedNotificationContacts), session);
                 }
             }
-            else if (!isEmpty(relevantSession)) {
+            else if (canReuseRelevantSession) {
                 // Checking if session needs to be restored based on found relevant session
                 // Found relevent session is not same as activeSessionId and is not being restored
                 if (currentRelevantSession !== sessionRestore.activeSessionId && !isRestoring) {
@@ -286,6 +298,7 @@ export function SessionRestore(props) {
                 if (sessionItem.session.id !== sessionRestore.activeSessionId &&
                     sessionItem.session.isActive &&
                     !sessionItem.session.isResolved &&
+                    isSessionFromCurrentAuthCycle(sessionItem, currentLoginStartTime) &&
                     sessionItem.sessionDetails.summary &&
                     sessionItem.sessionDetails.product) {
                     previousSessions.push(sessionItem);
@@ -298,6 +311,7 @@ export function SessionRestore(props) {
                 var _a, _b, _c, _d, _e, _f;
                 return s.session.isActive &&
                     !s.session.isResolved &&
+                    isSessionFromCurrentAuthCycle(s, currentLoginStartTime) &&
                     s.session.id !== sessionRestore.activeSessionId &&
                     ((!isEmpty(caseDetails.product) && caseDetails.product === s.sessionDetails.product) ||
                         includes(((_a = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.summary) !== null && _a !== void 0 ? _a : '').toLowerCase(), ((_c = (_b = s === null || s === void 0 ? void 0 : s.sessionDetails) === null || _b === void 0 ? void 0 : _b.summary) !== null && _c !== void 0 ? _c : '').toLowerCase()) ||

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.6.269",
+    "version": "2.6.271",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -127,5 +127,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "cc12fc4b7c5430b59628fc97568ca31af1e3c6bc"
+    "gitHead": "9353ee00eb30f15f0abf3f7e192ce6c134956454"
 }