@rh-support/manage 1.1.1 → 1.1.3

package/lib/esm/components/ManagePreferences/ManagePreferences.js

@@ -2,6 +2,5 @@ import React from 'react';
 import { Preferences } from './Preferences';
 export function ManagePreferences(props) {
     return (React.createElement("section", { id: "manage-preferences" },
-        React.createElement(Preferences, null),
-        ";"));
+        React.createElement(Preferences, null)));
 }

package/lib/esm/components/TopContentManagement/ContentUsage/{MajorVersionPerformanceMetrics.d.ts → VersionPerformanceMetrics.d.ts}

@@ -4,9 +4,9 @@ interface IProps {
     isModalOpen: boolean;
     onHideModal: () => void;
     filteredTC: ITopContentEditState[];
-    selectedMajorVersion: string;
+    selectedVersionProp: string;
     selectedProduct: string;
 }
-export declare const MajorVersionPerformanceMetrics: FC<IProps>;
+export declare const VersionPerformanceMetrics: FC<IProps>;
 export {};
-//# sourceMappingURL=MajorVersionPerformanceMetrics.d.ts.map
+//# sourceMappingURL=VersionPerformanceMetrics.d.ts.map

package/lib/esm/components/TopContentManagement/ContentUsage/VersionPerformanceMetrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"VersionPerformanceMetrics.d.ts","sourceRoot":"","sources":["../../../../../src/components/TopContentManagement/ContentUsage/VersionPerformanceMetrics.tsx"],"names":[],"mappings":"AAWA,OAAc,EAAE,EAAE,EAAgC,MAAM,OAAO,CAAC;AAMhE,OAAO,EAAE,oBAAoB,EAAwB,MAAM,qCAAqC,CAAC;AAIjG,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;CAC3B;AACD,eAAO,MAAM,yBAAyB,EAAE,EAAE,CAAC,MAAM,CAoFhD,CAAC"}

package/lib/esm/components/TopContentManagement/ContentUsage/{MajorVersionPerformanceMetrics.js → VersionPerformanceMetrics.js}

@@ -1,18 +1,20 @@
 import { Button, ButtonVariant, Flex, FlexItem, Modal, ModalVariant, Title, TitleSizes, } from '@patternfly/react-core';
 import React, { useEffect, useMemo, useState } from 'react';
-import { Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import { useTopContentContext } from '../../../context/TopContentProvider';
 import { useVersionsDiffer } from '../../../hooks/useVersionsDiffer';
-import { flagContentUsage } from '../../../reducers/TopContentHelpers';
+import { flagContentUsage, isMajorVersion } from '../../../reducers/TopContentHelpers';
 import { ContentAccordion } from './ContentAccordion';
 import { PerformanceMetricsSelect } from './PerformanceMetricsSelect';
-export const MajorVersionPerformanceMetrics = ({ isModalOpen, onHideModal, filteredTC, selectedMajorVersion, selectedProduct, }) => {
-    const [selectedVersion, setVersion] = useState(selectedMajorVersion.split('.x')[0]);
+export const VersionPerformanceMetrics = ({ isModalOpen, onHideModal, filteredTC, selectedVersionProp, selectedProduct, }) => {
+    const { t } = useTranslation();
+    const isMajorProjectVersion = isMajorVersion(selectedVersionProp);
+    const [selectedVersion, setVersion] = useState(isMajorProjectVersion ? selectedVersionProp.split('.x')[0] : selectedVersionProp);
     const [selectedCategory, setSelectedCategory] = useState('');
     const [selectedContent, setSelectedContent] = useState([]);
     const { categoryUsage } = useTopContentContext();
     const flagContentEditState = useMemo(() => flagContentUsage(filteredTC, categoryUsage, selectedVersion), [filteredTC, categoryUsage, selectedVersion]);
-    const [isLoading, versionDifference] = useVersionsDiffer(selectedProduct, selectedMajorVersion.split('.x')[0]);
+    const [isLoading, versionDifference] = useVersionsDiffer(selectedProduct, selectedVersionProp);
     useEffect(() => {
         var _a;
         const filteredContent = ((_a = flagContentEditState.find((tc) => tc.categoryName === selectedCategory)) === null || _a === void 0 ? void 0 : _a.content) || [];
@@ -25,18 +27,20 @@ export const MajorVersionPerformanceMetrics = ({ isModalOpen, onHideModal, filte
         onHideModal();
     };
     return (React.createElement(Modal, { variant: ModalVariant.large, id: "top-content-major-version-performance-metric", "aria-label": "top-content-performance-metric", isOpen: isModalOpen, onClose: onModalClose, actions: [
-            React.createElement(Button, { variant: ButtonVariant.secondary, key: "close-button", onClick: onModalClose }, "Cancel"),
+            React.createElement(Button, { variant: ButtonVariant.secondary, key: "close-button", onClick: onModalClose },
+                React.createElement(Trans, null, "Cancel")),
         ], className: "performance-metrics-modal" },
         React.createElement("div", { className: "sticky-header" },
             React.createElement(Title, { headingLevel: "h1", size: TitleSizes['2xl'] },
                 React.createElement(Trans, null, " Performance metrics ")),
-            React.createElement("p", { className: "pf-u-pt-sm" }, "Better understand the Performance for the top content resources."),
+            React.createElement("p", { className: "pf-u-pt-sm" },
+                React.createElement(Trans, null, "Better understand the Performance for the top content resources.")),
             React.createElement("br", null),
             React.createElement(Flex, { justifyContent: { default: 'justifyContentSpaceBetween' } },
                 React.createElement(FlexItem, { className: "pf-u-w-50 pf-u-pr-md", style: { marginRight: 'unset' } },
-                    React.createElement(PerformanceMetricsSelect, { placeholderText: "select a version", title: `Version using ${selectedMajorVersion}`, onSelectCallback: (e, selectedOption) => setVersion(selectedOption), options: versionDifference, optionValue: (option) => option, isLoading: isLoading })),
+                    React.createElement(PerformanceMetricsSelect, { placeholderText: t('select a version'), title: t(`Version using ${selectedVersionProp}`), onSelectCallback: (e, selectedOption) => setVersion(selectedOption), options: isMajorProjectVersion ? versionDifference : [selectedVersionProp], optionValue: (option) => option, isLoading: isLoading })),
                 React.createElement(FlexItem, { className: "pf-u-w-50 pf-u-pl-md" },
-                    React.createElement(PerformanceMetricsSelect, { placeholderText: "select a category", title: "Categories", options: flagContentEditState, optionValue: (option) => option.categoryName, onSelectCallback: (e, selectedOption) => setSelectedCategory(selectedOption) })))),
+                    React.createElement(PerformanceMetricsSelect, { placeholderText: t('select a category'), title: t('Categories'), options: flagContentEditState, optionValue: (option) => option.categoryName, onSelectCallback: (e, selectedOption) => setSelectedCategory(selectedOption) })))),
         React.createElement("br", null),
         React.createElement(ContentAccordion, { contentList: selectedContent, selectedVersion: selectedVersion })));
 };

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentEditor.js

@@ -16,10 +16,10 @@ import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import { Trans, useTranslation } from 'react-i18next';
 import { CATEGORY_LIMIT } from '../../../constants/TopContent';
 import { useTopContentContext, useTopContentDispatchContext } from '../../../context/TopContentProvider';
-import { flagContentUsage, isMajorVersion } from '../../../reducers/TopContentHelpers';
+import { flagContentUsage, isMajorOrNamedVersion } from '../../../reducers/TopContentHelpers';
 import { CategoryMode, fetchTopContent, reArrangeCategory, resetChangeInCategory, resetContentWithSelectedProduct, resetDuplicatUrls, setAddNewSection, setIsAddingCategory, setIsSearchModeEnabled, setTopContentArrangingCategory, setTopContentArrangingContent, } from '../../../reducers/TopContentReducer';
 import CategoryLimit from '../CategoryLimit/CategoryLimit';
-import { MajorVersionPerformanceMetrics } from '../ContentUsage/MajorVersionPerformanceMetrics';
+import { VersionPerformanceMetrics } from '../ContentUsage/VersionPerformanceMetrics';
 import { NoTopContentFound } from '../NoTopContentFound';
 import { TopContentHeader } from '../TopContentHeader';
 import { TopContentProductVersionSelector } from '../TopContentProductVersionSelector';
@@ -143,7 +143,7 @@ export function TopContentEditor() {
                             ' ',
                             React.createElement(Button, { variant: "secondary", onClick: arrangeSection, isDisabled: flagContentEditState.length < 2 },
                                 React.createElement(Trans, null, "Arrange section")),
-                            isMajorVersion(selectedVersion) && (React.createElement(Button, { variant: "link", className: "pf-u-float-right", isInline: true, onClick: onOpenModal },
+                            isMajorOrNamedVersion(selectedVersion) && (React.createElement(Button, { variant: "link", className: "pf-u-float-right", isInline: true, onClick: onOpenModal },
                                 React.createElement(Trans, null, "View performance"))))),
                         isArrangingCats && (React.createElement(React.Fragment, null,
                             React.createElement(Button, { variant: "primary", onClick: onSaveArrangement },
@@ -151,5 +151,5 @@ export function TopContentEditor() {
                             ' ',
                             React.createElement(Button, { variant: "link", onClick: onCancelArrangement },
                                 React.createElement(Trans, null, "Cancel")))))))))),
-            isMajorVersion(selectedVersion) && (React.createElement(MajorVersionPerformanceMetrics, { isModalOpen: isModalOpen, onHideModal: onHideModal, filteredTC: filteredTC, selectedMajorVersion: selectedVersion, selectedProduct: selectedProduct.name })))));
+            isMajorOrNamedVersion(selectedVersion) && (React.createElement(VersionPerformanceMetrics, { isModalOpen: isModalOpen, onHideModal: onHideModal, filteredTC: filteredTC, selectedVersionProp: selectedVersion, selectedProduct: selectedProduct.name })))));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"useVersionsDiffer.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVersionsDiffer.tsx"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,wBAAyB,MAAM,wBAAwB,MAAM,KAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAsD/G,CAAC"}
+{"version":3,"file":"useVersionsDiffer.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVersionsDiffer.tsx"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,wBAAyB,MAAM,wBAAwB,MAAM,KAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAuD/G,CAAC"}

package/lib/esm/hooks/useVersionsDiffer.js

@@ -1,6 +1,6 @@
 import { pcm, products as productsApi } from '@cee-eng/hydrajs';
 import { useFetch } from '@rh-support/components';
-import { difference } from 'lodash';
+import { intersection } from 'lodash';
 import { useEffect, useState } from 'react';
 import { postVersionsProcessor } from '../components/TopContentManagement/TopContentProductVersionSelector';
 /**
@@ -15,6 +15,7 @@ export const useVersionsDiffer = (selectedProductName, selectedMajorVersion) =>
     // Note we need to call version API again over here because TopContentProductVersionSelector is having version at component state level and if we decide to
     // use it lot of prop drilling will happen or if use lift that state to redux store code refactoring required
     const { request: getProductVersions, isFetching: isLoadingVersions, data: versions, } = useFetch(productsApi.getProductVersions, { initialData: [], postProcessor: postVersionsProcessor });
+    const majorVersionNumber = selectedMajorVersion.split('.x')[0];
     // Get versions who are having top content
     const { request: getTopContentVersions, isFetching: isTopContentVersion, data: topContentVersion, } = useFetch(pcm.topContent.getTopContentVersions, {
         initialData: [],
@@ -25,7 +26,7 @@ export const useVersionsDiffer = (selectedProductName, selectedMajorVersion) =>
             getProductVersions(selectedProductName);
             getTopContentVersions({
                 productName: selectedProductName,
-                majorVersion: +selectedMajorVersion,
+                majorVersion: +majorVersionNumber,
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -35,16 +36,16 @@ export const useVersionsDiffer = (selectedProductName, selectedMajorVersion) =>
         var _a, _b, _c;
         // If versions list is empty, then set `majorVersion.x`
         if (((_a = versions === null || versions === void 0 ? void 0 : versions.items) === null || _a === void 0 ? void 0 : _a.length) && (topContentVersion === null || topContentVersion === void 0 ? void 0 : topContentVersion.length)) {
-            const subVersions = (_b = versions === null || versions === void 0 ? void 0 : versions.items) === null || _b === void 0 ? void 0 : _b.filter((item) => item.startsWith(selectedMajorVersion)).map((item) => { var _a; return (_a = item.split('.')) === null || _a === void 0 ? void 0 : _a.splice(1).join('.'); }).sort();
-            setMajorVersion(difference(subVersions, topContentVersion));
+            const subVersions = (_b = versions === null || versions === void 0 ? void 0 : versions.items) === null || _b === void 0 ? void 0 : _b.filter((item) => item.startsWith(majorVersionNumber)).map((item) => { var _a; return (_a = item.split('.')) === null || _a === void 0 ? void 0 : _a.splice(1).join('.'); }).sort();
+            setMajorVersion(intersection(subVersions, topContentVersion));
         }
         else if ((_c = versions === null || versions === void 0 ? void 0 : versions.items) === null || _c === void 0 ? void 0 : _c.length) {
-            const subVersions = versions === null || versions === void 0 ? void 0 : versions.items.filter((item) => item.startsWith(selectedMajorVersion)).map((item) => { var _a; return (_a = item.split('.')) === null || _a === void 0 ? void 0 : _a.splice(1).join('.'); }).sort();
+            const subVersions = versions === null || versions === void 0 ? void 0 : versions.items.filter((item) => item.startsWith(majorVersionNumber)).map((item) => { var _a; return (_a = item.split('.')) === null || _a === void 0 ? void 0 : _a.splice(1).join('.'); }).sort();
             setMajorVersion(subVersions);
         }
         else {
             setMajorVersion(['x']);
         }
-    }, [versions, topContentVersion, selectedMajorVersion]);
-    return [isLoadingVersions || isTopContentVersion, majorVersion.map((item) => `${selectedMajorVersion}.${item}`)];
+    }, [versions, topContentVersion, majorVersionNumber]);
+    return [isLoadingVersions || isTopContentVersion, majorVersion.map((item) => `${majorVersionNumber}.${item}`)];
 };

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

@@ -15,4 +15,5 @@ export declare const getContentUrls: (contentsArray: any) => any;
  */
 export declare const flagContentUsage: (categories: ITopContentEditState[], categoryUsage: ITopContentResourceUsagesResponse, selectedVersion: string) => ITopContentEditState[];
 export declare const isMajorVersion: (selectedVersion: string) => boolean;
+export declare const isMajorOrNamedVersion: (selectedVersion: string) => boolean;
 //# sourceMappingURL=TopContentHelpers.d.ts.map

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"}
+{"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"}

package/lib/esm/reducers/TopContentHelpers.js

@@ -79,3 +79,6 @@ export const flagContentUsage = (categories, categoryUsage, selectedVersion) =>
 export const isMajorVersion = (selectedVersion) => {
     return /.x/.test(selectedVersion);
 };
+export const isMajorOrNamedVersion = (selectedVersion) => {
+    return /^([a-zA-Z]+|.*\.x)/.test(selectedVersion);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "homepage": "",
@@ -96,7 +96,7 @@
         "@patternfly/react-table": "4.111.33",
         "@rh-support/components": "1.3.0",
         "@rh-support/configs": "1.0.2-beta.58",
-        "@rh-support/react-context": "1.1.0",
+        "@rh-support/react-context": "1.1.1",
         "@rh-support/types": "0.2.1-beta.58",
         "@rh-support/user-permissions": "1.1.0",
         "@rh-support/utils": "1.0.10-beta.58",
@@ -109,5 +109,5 @@
         "react-i18next": ">=10.11.0",
         "react-router-dom": ">=5.1.2"
     },
-    "gitHead": "4b6aad750ee63be3cd580f2bbb26772accd89ae0"
+    "gitHead": "aa7baf511d220c1f19d6f965bbdc2e3861e5d820"
 }

package/lib/esm/components/TopContentManagement/ContentUsage/MajorVersionPerformanceMetrics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MajorVersionPerformanceMetrics.d.ts","sourceRoot":"","sources":["../../../../../src/components/TopContentManagement/ContentUsage/MajorVersionPerformanceMetrics.tsx"],"names":[],"mappings":"AAWA,OAAc,EAAE,EAAE,EAAgC,MAAM,OAAO,CAAC;AAMhE,OAAO,EAAE,oBAAoB,EAAwB,MAAM,qCAAqC,CAAC;AAIjG,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;CAC3B;AACD,eAAO,MAAM,8BAA8B,EAAE,EAAE,CAAC,MAAM,CA8ErD,CAAC"}