@rh-support/troubleshoot 2.2.73 → 2.2.74

package/lib/esm/components/CaseEditView/CaseSolutions/CaseSolutions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseSolutions/CaseSolutions.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAA8D,MAAM,OAAO,CAAC;AAuEnF,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;CACnC;AAUD,eAAO,MAAM,aAAa,+EAqhBxB,CAAC"}
+{"version":3,"file":"CaseSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseSolutions/CaseSolutions.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAqE3E,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;CACnC;AAUD,eAAO,MAAM,aAAa,+EA4fxB,CAAC"}

package/lib/esm/components/CaseEditView/CaseSolutions/CaseSolutions.js

@@ -27,17 +27,17 @@ import { getSolrParams } from '@rh-support/utils';
 import find from 'lodash/find';
 import isEqual from 'lodash/isEqual';
 import some from 'lodash/some';
-import React, { forwardRef, useContext, useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { CaseStatusEnum } from '../../../constants/caseDetailsConstants';
 import { useCaseDispatch, useCaseSelector } from '../../../context/CaseContext';
 import { CaseOverviewDispatchContext } from '../../../context/CaseOverviewContext';
-import { RecommendationDispatchContext, RecommendationStateContext, useRecommendationDispatchContext, useRecommendationStateContext, } from '../../../context/RecommendationContext';
+import { useRecommendationDispatchContext, useRecommendationStateContext, } from '../../../context/RecommendationContext';
 import { useCaseUpdateErrorMessage } from '../../../hooks/useCaseUpdateErrorMessage';
 import { setStatusUpdating } from '../../../reducers/CaseOverviewReducer';
 import { updateCaseDetails } from '../../../reducers/CaseReducer';
 import { fetchRecommendations, fetchWatsonXRecommendations } from '../../../reducers/RecommendationsReducer';
-import { removeKTQuestions } from '../../../utils/caseUtils';
+import { extractKTQuestion1FromDescription } from '../../../utils/caseUtils';
 import { usePostComment } from '../../shared/usePostComment';
 import { CaseSolutionsItem } from './CaseSolutionsItem';
 import { HandpickedItem } from './HandpicketItem';
@@ -101,9 +101,7 @@ export const CaseSolutions = forwardRef((props, ref) => {
     const caseOverviewDispatch = useContext(CaseOverviewDispatchContext);
     const { recommendationState: { isLoadingRecommendations, allDocs }, } = useRecommendationStateContext();
     const { globalMetadataState: { loggedInUsersAccount }, } = useGlobalStateContext();
-    const { recommendationState } = useContext(RecommendationStateContext);
     const recommendationsDispatch = useRecommendationDispatchContext();
-    const watsonXRecommendationDispatch = useContext(RecommendationDispatchContext);
     const { postComment } = usePostComment({ caseNumber: props.caseNumber });
     const { caseNumber, isSecureSupportAccount } = props;
     const [isPinLoading, setIsPinLoading] = useState({});
@@ -117,7 +115,6 @@ export const CaseSolutions = forwardRef((props, ref) => {
     const { t } = useTranslation();
     const hasPin = some(recommendations, (p) => p.isPinned);
     const hasLink = some(recommendations, (p) => p.isLinked);
-    const abortControllerRef = useRef(undefined);
     const getCommentBody = () => {
         return `**Reason for closing case:** \nOther. Found a pinned article that perfectly resolved the issue. Closing this case now.`;
     };
@@ -217,20 +214,15 @@ export const CaseSolutions = forwardRef((props, ref) => {
     useEffect(() => {
         function fetchRecs() {
             if (product && version && summary && description) {
-                const payload = { product, version, summary, description: removeKTQuestions(description) };
-                const queryFilters = {
-                    id: { values: recommendationState.insightsKcsIds, exclude: true },
+                const payload = {
+                    product,
+                    version,
+                    summary,
+                    description: extractKTQuestion1FromDescription(description),
                 };
-                if (abortControllerRef.current !== undefined) {
-                    // Cancel the previous request
-                    abortControllerRef.current.abort();
-                }
-                // recreate a new AbortController for each call
-                let controller = new AbortController();
-                abortControllerRef.current = controller;
                 !loggedInUsersAccount.data.secureSupport
-                    ? fetchWatsonXRecommendations(watsonXRecommendationDispatch, payload, 50, 5, 300, true, queryFilters, controller.signal)
-                    : fetchRecommendations(recommendationsDispatch, payload, 50, 5, 300, false, caseNumber, isSecureSupportAccount, queryFilters, controller.signal);
+                    ? fetchWatsonXRecommendations(recommendationsDispatch, payload, 50, 5, 300, true)
+                    : fetchRecommendations(recommendationsDispatch, payload, 50, 5, 300, false, caseNumber, isSecureSupportAccount);
             }
         }
         fetchRecs();
@@ -242,9 +234,7 @@ export const CaseSolutions = forwardRef((props, ref) => {
         recommendationsDispatch,
         caseNumber,
         isSecureSupportAccount,
-        recommendationState.insightsKcsIds,
         loggedInUsersAccount.data.secureSupport,
-        watsonXRecommendationDispatch,
     ]);
     // populate solutions when result is ready
     useEffect(() => {

package/lib/esm/components/Recommendations/AsideResults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AsideResults.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/AsideResults.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAUvD,OAAO,EAAE,eAAe,EAAsC,MAAM,iCAAiC,CAAC;AAUtG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,qBA6NzC"}
+{"version":3,"file":"AsideResults.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/AsideResults.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AASvD,OAAO,EAAE,eAAe,EAAsC,MAAM,iCAAiC,CAAC;AAUtG,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,qBAwMzC"}

package/lib/esm/components/Recommendations/AsideResults.js

@@ -20,7 +20,6 @@ import { RecommendationDispatchContext, RecommendationStateContext } from '../..
 import { RouteContext } from '../../context/RouteContext';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../context/SessionRestoreContext';
 import { WATSONX_DESCRIPTION_LIMIT, WATSONX_SUMMARY_LIMIT } from '../../reducers/CaseConstNTypes';
-import { getDescriptionWOQues } from '../../reducers/CaseHelpers';
 import { setCaseRecommendations } from '../../reducers/CaseReducer';
 import { RecommendationsConstants } from '../../reducers/RecommendationsReducer';
 import { showSidebarRecommendationsSections } from '../../reducers/RouteConstNTypes';
@@ -33,16 +32,13 @@ export function AsideResults(props) {
      */
     const { globalMetadataState: { loggedInUsersAccount, pcmConfig }, } = useContext(GlobalMetadataStateContext);
     const isRerankEnabled = getConfigField(pcmConfig.data, 'isRerankEnabled', PCM_CONFIG_FIELD_TYPE.FEATURE_FLAG);
-    const { isSelectedAccounntSecureSupport, product, version, caseResourceLinks, summary, issue, environment, periodicityOfIssue, timeFramesAndUrgency, caseType, } = useCaseSelector((state) => ({
+    const { isSelectedAccounntSecureSupport, product, version, caseResourceLinks, summary, issue, caseType } = useCaseSelector((state) => ({
         isSelectedAccounntSecureSupport: state.selectedAccountDetails.data.secureSupport,
         product: state.caseDetails.product,
         version: state.caseDetails.version,
         caseResourceLinks: state.caseDetails.caseResourceLinks,
         summary: state.caseDetails.summary,
         issue: state.caseDetails.issue,
-        environment: state.caseDetails.environment,
-        periodicityOfIssue: state.caseDetails.periodicityOfIssue,
-        timeFramesAndUrgency: state.caseDetails.timeFramesAndUrgency,
         caseType: state.caseDetails.caseType,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
@@ -57,7 +53,7 @@ export function AsideResults(props) {
         product: product,
         version: version,
         summary: summary,
-        description: getDescriptionWOQues(issue, environment, periodicityOfIssue, timeFramesAndUrgency),
+        description: issue, // on recommendation API we only pass issue and skip other KTQs
     });
     // abort controller ref
     const controllerRef = useRef(new AbortController());
@@ -74,7 +70,7 @@ export function AsideResults(props) {
                     product: product,
                     version: version,
                     summary: summary,
-                    description: getDescriptionWOQues(issue, environment, periodicityOfIssue, timeFramesAndUrgency),
+                    description: issue, // on recommendation API we only pass issue and skip other KTQs
                 };
                 const queryFilters = {
                     id: { values: recommendationState.insightsKcsIds, exclude: true },
@@ -115,10 +111,7 @@ export function AsideResults(props) {
         version,
         summary,
         issue,
-        environment,
         activeSection,
-        timeFramesAndUrgency,
-        periodicityOfIssue,
         recommendationState.insightsKcsIds,
     ], 2000);
     const canShowSideRecommendations = () => showSidebarRecommendationsSections.includes(activeSection) &&

package/lib/esm/reducers/RecommendationsReducer.js

@@ -113,7 +113,7 @@ export const fetchWatsonXRecommendations = (dispatch, query, max_rows, page_size
             summary: getTrimmedCharacters(query.summary, WATSONX_SUMMARY_LIMIT),
         })), ((query === null || query === void 0 ? void 0 : query.description) && {
             description: getTrimmedCharacters(query.description, WATSONX_DESCRIPTION_LIMIT),
-        })), { rerank: isRerankEnabled });
+        })), { rerank: isRerankEnabled || false });
         const paramsObj = Object.assign(Object.assign({}, watsonXQuery), getSolrParams(max_rows, highlighted_fragment_size, additionalFilters, seQueryFields));
         const response = yield search.getWatsonXRecommendationsForCase2(
         //@ts-ignore

package/lib/esm/utils/caseUtils.d.ts

@@ -1,2 +1,2 @@
-export declare const removeKTQuestions: (description: string) => string;
+export declare const extractKTQuestion1FromDescription: (description: any) => any;
 //# sourceMappingURL=caseUtils.d.ts.map

package/lib/esm/utils/caseUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseUtils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,gBAAiB,MAAM,WAWpD,CAAC"}
+{"version":3,"file":"caseUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseUtils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iCAAiC,2BAa7C,CAAC"}

package/lib/esm/utils/caseUtils.js

@@ -1,14 +1,16 @@
 import { KtQuestionConstant } from '../reducers/CaseConstNTypes';
-// removes QT Questions from description to have only answers.
-// when description is sent to solr only answers are required.
-export const removeKTQuestions = (description) => {
-    // escape the KtQuestionConstant enum and convert it to a regex
-    const KtQuestionsJoined = Object.values(KtQuestionConstant)
-        .map((item) => item.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'))
-        .join('|');
-    const pattern = new RegExp(KtQuestionsJoined, 'gi');
-    return description
-        .replace(pattern, '')
-        .replace(/(\r|\n)/g, ' ')
-        .trim();
+// extract issue form description and remove other KT questions
+export const extractKTQuestion1FromDescription = (description) => {
+    if (description.startsWith(KtQuestionConstant.issue)) {
+        // escape the KtQuestionConstant enum and convert it to a regex
+        const re = /[-\/\\^$*+?.()|[\]{}]/g;
+        const kt1 = KtQuestionConstant.issue.replace(re, '\\$&');
+        const kt2 = KtQuestionConstant.timeFramesAndUrgency.replace(re, '\\$&');
+        const regex = new RegExp(`${kt1}\n(.*?)\n${kt2}`, 'sm');
+        const match = description.match(regex);
+        return match ? match[1].trim() : null;
+    }
+    else {
+        return description;
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.2.73",
+    "version": "2.2.74",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -61,11 +61,11 @@
         "@progress/kendo-licensing": "1.3.5",
         "@progress/kendo-react-pdf": "^5.16.0",
         "@redux-devtools/extension": "^3.3.0",
-        "@rh-support/components": "2.1.40",
-        "@rh-support/react-context": "2.1.43",
+        "@rh-support/components": "2.1.41",
+        "@rh-support/react-context": "2.1.44",
         "@rh-support/types": "2.0.3",
-        "@rh-support/user-permissions": "2.1.29",
-        "@rh-support/utils": "2.1.21",
+        "@rh-support/user-permissions": "2.1.30",
+        "@rh-support/utils": "2.1.22",
         "@types/react-redux": "^7.1.33",
         "@types/redux": "^3.6.0",
         "dompurify": "^2.2.6",
@@ -132,5 +132,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "28f1b355dad14ac8fd818ab6c152c9c985ca1351"
+    "gitHead": "1507b066b04853fb74cbd1fcac022dbcc94c0ec3"
 }