@rh-support/troubleshoot 2.4.5-beta.10 → 2.4.5-beta.11

package/lib/esm/components/Cve/CveItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CveItem.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveItem.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,UAAU,KAAK;IACX,GAAG,EAAE,0BAA0B,CAAC;CACnC;AAID,eAAO,MAAM,OAAO,UAAW,KAAK,sBA2InC,CAAC"}
+{"version":3,"file":"CveItem.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveItem.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,UAAU,KAAK;IACX,GAAG,EAAE,0BAA0B,CAAC;CACnC;AAaD,eAAO,MAAM,OAAO,UAAW,KAAK,sBAqJnC,CAAC"}

package/lib/esm/components/Cve/CveItem.js

@@ -2,7 +2,7 @@ import { Button, Flex, FlexItem, Label, LabelGroup, Text, TextVariants } from '@
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
-import { format } from 'date-fns';
+import { format, isValid, parseISO } from 'date-fns';
 import DOMPurify from 'dompurify';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
@@ -12,34 +12,43 @@ import React from 'react';
 import { Trans } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 const sanitize = (html) => ({ __html: DOMPurify.sanitize(html) });
+function formatDate(dateString) {
+    const date = parseISO(dateString);
+    if (isValid(date)) {
+        return format(date, 'MMM dd, yyyy');
+    }
+    else {
+        return dateString;
+    }
+}
 export const CveItem = (props) => {
     const { cve } = props;
     const { isCveModalOpened } = useCaseSelector((state) => ({
         isCveModalOpened: state.isCveModalOpened,
     }), isEqual);
-    const renderDate = () => (React.createElement("div", { className: "pf-v5-u-disabled-color-100" },
+    const renderDate = () => (cve === null || cve === void 0 ? void 0 : cve.publicDate) && (React.createElement("div", { className: "pf-v5-u-disabled-color-100" },
         React.createElement(Trans, null, "Public on"),
         " - ",
-        format(cve === null || cve === void 0 ? void 0 : cve.publicDate, 'MMM dd, yyyy')));
+        formatDate(cve.publicDate)));
     const renderLabels = () => (React.createElement(LabelGroup, { defaultIsOpen: true, numLabels: 10 },
         React.createElement(Label, { color: "green", isCompact: true, icon: React.createElement(StarIcon, null) },
             React.createElement(Trans, null, "Exact match")),
-        React.createElement(Label, { color: cve.severity === 'Critical'
+        !isEmpty(cve === null || cve === void 0 ? void 0 : cve.severity) && (React.createElement(Label, { color: cve.severity === 'Critical'
                 ? 'red'
                 : cve.severity === 'Important'
-                    ? 'orange'
+                    ? 'blue'
                     : cve.severity === 'Moderate'
-                        ? 'gold'
-                        : undefined, isCompact: true }, cve.severity),
+                        ? 'orange'
+                        : undefined, isCompact: true }, cve.severity)),
         !isEmpty(cve.errataData) && (React.createElement(Label, { color: "blue", isCompact: true },
             React.createElement(Trans, null, "Fixed"))),
         !isEmpty(cve.mitigation) && (React.createElement(Label, { isCompact: true },
-            React.createElement(Trans, null, "Mitigation available")))));
+            React.createElement(Trans, { color: "blue" }, "Mitigation available")))));
     const displayErrataTable = () => {
         if (isEmpty(cve === null || cve === void 0 ? void 0 : cve.errataData)) {
             return null;
         }
-        return (React.createElement(Table, { "aria-label": "Errata table", variant: 'compact' },
+        return (React.createElement(Table, { "aria-label": "Errata table", variant: 'compact', className: "pf-v5-u-mt-md", style: { borderTop: 'var(--pf-v5-global--BorderColor--light-100) solid 1px' } },
             React.createElement(Thead, null,
                 React.createElement(Tr, null,
                     React.createElement(Th, null,
@@ -63,7 +72,8 @@ export const CveItem = (props) => {
     const displayDescription = () => {
         var _a;
         if (isEmpty(cve === null || cve === void 0 ? void 0 : cve.mitigation) && ((_a = cve === null || cve === void 0 ? void 0 : cve.errataData) === null || _a === void 0 ? void 0 : _a.length) === 0) {
-            return (React.createElement("p", { className: "pf-v5-u-mt-md" }, "for this CVE mitigation and fix is not available, for more details, go to CVE page."));
+            return (React.createElement("p", { className: "pf-v5-u-mt-md" },
+                React.createElement(Trans, null, "for this CVE, mitigation and fix is not available, for more details, go to the CVE page.")));
         }
         const MAX_DESCRIPTION_LENGTH = isCveModalOpened ? 300 : 120;
         const description = !isEmpty(cve === null || cve === void 0 ? void 0 : cve.mitigation) ? cve === null || cve === void 0 ? void 0 : cve.mitigation : cve === null || cve === void 0 ? void 0 : cve.details;
@@ -72,7 +82,7 @@ export const CveItem = (props) => {
         const trimmedDescription = description.length <= MAX_DESCRIPTION_LENGTH
             ? description
             : description.slice(0, MAX_DESCRIPTION_LENGTH).trim() + '...';
-        return React.createElement("p", { className: "pf-v5-u-mt-md", dangerouslySetInnerHTML: sanitize(trimmedDescription) });
+        return React.createElement("p", { className: "pf-v5-u-mt-md pf-v5-u-color-300", dangerouslySetInnerHTML: sanitize(trimmedDescription) });
     };
     return (React.createElement("p", null,
         React.createElement(Flex, null,

package/lib/esm/components/Cve/CveModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CveModal.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveModal.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAQ1C,eAAO,MAAM,QAAQ,yBA2DpB,CAAC"}
+{"version":3,"file":"CveModal.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveModal.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAQ1C,eAAO,MAAM,QAAQ,yBA+DpB,CAAC"}

package/lib/esm/components/Cve/CveModal.js

@@ -30,8 +30,7 @@ export const CveModal = () => {
         return `https://${getAccessHostname()}/labs/cvechecker/?source=pcm&session=${activeSessionId}&id=${cveTitles}`;
     };
     return (React.createElement(Modal, { variant: ModalVariant.medium, title: React.createElement(Flex, { alignItems: { default: 'alignItemsCenter' } },
-            React.createElement(FlexItem, { spacer: { default: 'spacerSm' } },
-                React.createElement(Trans, null, "Handpicked for this CVEs")),
+            React.createElement(FlexItem, { spacer: { default: 'spacerSm' } }, cveWorkflowRecommendation.length > 1 ? (React.createElement(Trans, null, "Handpicked for these CVEs")) : (React.createElement(Trans, null, "Handpicked for this CVE"))),
             React.createElement(Badge, { isRead: true }, size(cveWorkflowRecommendation))), isOpen: isCveModalOpened, onClose: handleModalToggle, titleIconVariant: "info", disableFocusTrap: true, onEscapePress: handleEscapePress, actions: [
             React.createElement(Button, { key: "cve-checker-link", "data-tracking-id": "cve-checker-link", target: "_blank", variant: "secondary", isInline: true, component: "a", href: generateCveCheckerUrl() },
                 React.createElement(Trans, null, "Red Hat CVE Checker"),

package/lib/esm/components/Cve/CveSidebar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CveSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveSidebar.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,eAAO,MAAM,UAAU,yBAyBtB,CAAC"}
+{"version":3,"file":"CveSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Cve/CveSidebar.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,eAAO,MAAM,UAAU,yBA6BtB,CAAC"}

package/lib/esm/components/Cve/CveSidebar.js

@@ -16,8 +16,7 @@ export const CveSidebar = () => {
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "card card-white card-support file-diag pf-v5-u-mb-md" },
             React.createElement("h3", { className: "card-heading popular-solutions green-card-heading" },
-                React.createElement("span", { className: "pf-v5-u-mr-sm" },
-                    React.createElement(Trans, null, "Handpicked for this CVEs")),
+                React.createElement("span", { className: "pf-v5-u-mr-sm" }, cveWorkflowRecommendation.length > 1 ? (React.createElement(Trans, null, "Handpicked for these CVEs")) : (React.createElement(Trans, null, "Handpicked for this CVE"))),
                 React.createElement(Badge, { isRead: true }, size(cveWorkflowRecommendation))),
             React.createElement("div", { className: "card-body" },
                 React.createElement(CvePanel, null)))));

package/lib/esm/components/ProductSelector/AllProductsSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllProductsSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/AllProductsSelector.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAMvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAMvG,UAAU,MAAM;IACZ,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACjD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAQD;;;;;;;GAOG;AACH,QAAA,MAAM,mBAAmB,4EA0JvB,CAAC;AAGH,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"AllProductsSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/AllProductsSelector.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,OAAO,EAAuC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAOvG,UAAU,MAAM;IACZ,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACjD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAQD;;;;;;;GAOG;AACH,QAAA,MAAM,mBAAmB,4EA4JvB,CAAC;AAGH,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/lib/esm/components/ProductSelector/AllProductsSelector.js

@@ -10,10 +10,12 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
 import { RouteContext } from '../../context/RouteContext';
 import { TCStateContext } from '../../context/TopContentContext';
+import { useFetchCVEData } from '../../hooks/useFetchCVEData';
 import { setCaseDetails } from '../../reducers/CaseReducer';
 import { AppRouteSections } from '../../reducers/RouteConstNTypes';
 import RouteUtils from '../../utils/routeUtils';
 import OpenCaseIssue from '../CaseInformation/OpenCaseIssue';
+import { CveModal } from '../Cve/CveModal';
 import Suggestions from '../Suggestions/Suggestions';
 import { ProductVersionDropdownSelector } from './ProductVersionDropdownSelector';
 const defaultProps = {
@@ -38,6 +40,7 @@ const AllProductsSelector = forwardRef((props, ref) => {
         version: state.caseDetails.version,
         contactSSOName: state.caseDetails.contactSSOName,
     }), isEqual);
+    const { cveRecommendation } = useFetchCVEData();
     const { topContentState: { topContent }, } = useContext(TCStateContext);
     const [isModalOpen, setIsModalOpen] = useState(false);
     const [showModal, setShowModal] = useState(false);
@@ -90,6 +93,7 @@ const AllProductsSelector = forwardRef((props, ref) => {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: "case-details-summary" },
                 React.createElement(OpenCaseIssue, { inlineEditable: false, required: true, isOnSummaryPage: props.isOnSummaryPage })),
+            (cveRecommendation === null || cveRecommendation === void 0 ? void 0 : cveRecommendation.length) !== 0 && React.createElement(CveModal, null),
             React.createElement(AlertMessage, { isInline: true, variant: AlertType.DANGER, className: "pf-v5-u-mt-lg", title: t(`${loggedInUserRights.data.isSSOUsernameSameAsLoggedInUser(contactSSOName)
                     ? 'You are'
                     : 'Selected owner is'} not allowed to create case on this product.`), show: !allProducts.isFetching && props.checkEntitledProduct && !isEntitledProduct && !isEmpty(product) }),

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

@@ -1 +1 @@
-{"version":3,"file":"ProductSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/ProductSelector.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAOlE,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACjD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IACzE,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC9D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,qBAqGpD"}
+{"version":3,"file":"ProductSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/ProductSelector.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAMlE,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACjD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IACzE,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC9D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,qBAmGpD"}

package/lib/esm/components/ProductSelector/ProductSelector.js

@@ -7,8 +7,6 @@ import React, { useContext, useRef } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 import { RouteContext } from '../../context/RouteContext';
-import { useFetchCVEData } from '../../hooks/useFetchCVEData';
-import { CveModal } from '../Cve/CveModal';
 import { EARuleWidget } from '../Recommendations/EARules/EARuleWidget';
 import Recommendations from '../Recommendations/Recommendations';
 import { AllProductsSelector } from './AllProductsSelector';
@@ -22,7 +20,6 @@ import { ProductSelectorLoader } from './ProductSelectorLoader';
  * @param props
  */
 export default function ProductSelector(props) {
-    const { cveRecommendation } = useFetchCVEData();
     const { t } = useTranslation();
     const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
     const { product, version, enableGetSupportProductVersion } = useCaseSelector((state) => ({
@@ -42,7 +39,6 @@ export default function ProductSelector(props) {
         React.createElement(AlertMessage, { variant: AlertType.DANGER, className: "pf-v5-u-mt-lg", title: t('There was an error loading products.'), show: allProducts.isError }),
         allProducts.isFetching ? (React.createElement(ProductSelectorLoader, null)) : (!allProducts.isError && (React.createElement(React.Fragment, null,
             React.createElement("form", null,
-                (cveRecommendation === null || cveRecommendation === void 0 ? void 0 : cveRecommendation.length) !== 0 && React.createElement(CveModal, null),
                 React.createElement(AllProductsSelector, { routeProps: props.routeProps, checkEntitledProduct: isCaseCreate ? true : false, ref: productSelectorRef, isOnSummaryPage: true, isOnGetSupportPage: props === null || props === void 0 ? void 0 : props.isOnGetSupportPage, caseCreateExperience: props.caseCreateExperience }),
                 product === 'Subscription Watch' && (React.createElement(Alert, { isInline: true, variant: AlertVariant.warning, title: React.createElement(Trans, null,
                         ' ',

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

@@ -1 +1 @@
-{"version":3,"file":"useFetchCVEData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetchCVEData.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,0BAA0B,EAAkB,MAAM,iCAAiC,CAAC;AAI7F,wBAAgB,eAAe;;EA8H9B"}
+{"version":3,"file":"useFetchCVEData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetchCVEData.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,0BAA0B,EAAkB,MAAM,iCAAiC,CAAC;AAI7F,wBAAgB,eAAe;;EAiI9B"}

package/lib/esm/hooks/useFetchCVEData.js

@@ -44,8 +44,11 @@ export function useFetchCVEData() {
             var _a, _b;
             const product = (_b = (_a = obj === null || obj === void 0 ? void 0 : obj.product) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.trim();
             const productVersionMatchConditions = product === selectedProductLower ||
+                product === `red hat ${selectedProductLower}` ||
                 product === `${selectedProductLower} ${selectedVersionLower}` ||
-                (majorVersion && product === `${selectedProductLower} ${majorVersion}`);
+                product === `red hat ${selectedProductLower} ${selectedVersionLower}` ||
+                (majorVersion && product === `${selectedProductLower} ${majorVersion}`) ||
+                (majorVersion && product === `red hat ${selectedProductLower} ${majorVersion}`);
             return productVersionMatchConditions && (obj === null || obj === void 0 ? void 0 : obj.state) === 'Fixed';
         });
         return map(filteredArray, (i) => {

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

@@ -1,4 +1,16 @@
 export declare const extractKTQuestion1FromDescription: (description: any) => any;
+/**
+ * Normalizes CVE (Common Vulnerabilities and Exposures) identifiers
+ * to the standard format: CVE-YYYY-NNNNN
+ *
+ * @param {string} input - The input text containing CVE identifiers
+ * @returns {string} Normalized text with standardized CVE format
+ *
+ * @example
+ * normalizeCVE("CVE 2021-44228") and normalizeCVE("CVE2022-1234")
+ * // Returns: "CVE-2021-44228" and "CVE-2022-1234"
+ */
+export declare const normalizeCVE: (input: string) => string;
 /**
  * Finds all CVE identifiers in the given text.
  * @param {string} text - The input text to search for CVE identifiers.

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

@@ -1 +1 @@
-{"version":3,"file":"caseUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseUtils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iCAAiC,2BAa7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,MAAM,EAYrD,CAAC"}
+{"version":3,"file":"caseUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseUtils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iCAAiC,2BAa7C,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,UAAW,MAAM,WAazC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,MAAM,EAgBrD,CAAC"}

package/lib/esm/utils/caseUtils.js

@@ -14,6 +14,30 @@ export const extractKTQuestion1FromDescription = (description) => {
         return description;
     }
 };
+/**
+ * Normalizes CVE (Common Vulnerabilities and Exposures) identifiers
+ * to the standard format: CVE-YYYY-NNNNN
+ *
+ * @param {string} input - The input text containing CVE identifiers
+ * @returns {string} Normalized text with standardized CVE format
+ *
+ * @example
+ * normalizeCVE("CVE 2021-44228") and normalizeCVE("CVE2022-1234")
+ * // Returns: "CVE-2021-44228" and "CVE-2022-1234"
+ */
+export const normalizeCVE = (input) => {
+    // Function to format each match
+    const formatCVE = (match) => {
+        // Remove all spaces, ensure there's a dash after CVE and before the year
+        return match
+            .toUpperCase()
+            .replace(/\s/g, '')
+            .replace(/^CVE(?!-)/, 'CVE-')
+            .replace(/(\d{4})(\d{4,7})/, '$1-$2');
+    };
+    // Replace all matches in the input string
+    return input.replace(input, formatCVE);
+};
 /**
  * Finds all CVE identifiers in the given text.
  * @param {string} text - The input text to search for CVE identifiers.
@@ -21,11 +45,14 @@ export const extractKTQuestion1FromDescription = (description) => {
  */
 export const findCVEsInString = (text) => {
     // Regular expression to match CVE identifiers
-    const cveRegex = /\b(CVE-\d{4}-\d{4,7})\b/gi;
+    // CVE 2021-44228 , CVE2022-1234 and CVE-2022-1234
+    const cveRegex = /\b(CVE[-\s]?\d{4}-\d{4,7})\b/gim;
     // Find all matches in the text
     const matches = text.match(cveRegex);
-    // Deduplicate the matches and convert to uppercase
-    const uniqueMatches = [...new Set(matches === null || matches === void 0 ? void 0 : matches.map((match) => match.toUpperCase()))];
+    // Normalizes CVE
+    const normalizedCVEs = matches === null || matches === void 0 ? void 0 : matches.map((cve) => normalizeCVE(cve));
+    // Deduplicate the matches
+    const uniqueMatches = [...new Set(normalizedCVEs)];
     // Return the unique matches, or an empty array if no matches found
     return uniqueMatches || [];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.4.5-beta.10",
+    "version": "2.4.5-beta.11",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -134,5 +134,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "da7b8e905aae45b73513dfff0427639dcc5da502"
+    "gitHead": "d867a78014ee4a08aa8d7bf9e0dc9bd08ce6ac5a"
 }