@rh-support/manage 1.0.40 → 1.0.42

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentSuggestion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestion.tsx"],"names":[],"mappings":"AACA,OAAc,EAAE,EAAE,EAAuB,MAAM,OAAO,CAAC;AAOvD,UAAU,MAAM;CAAG;AAEnB,eAAO,MAAM,oBAAoB,EAAE,EAAE,CAAC,MAAM,CAiC3C,CAAC"}
+{"version":3,"file":"TopContentSuggestion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestion.tsx"],"names":[],"mappings":"AAEA,OAAc,EAAE,EAAE,EAAuB,MAAM,OAAO,CAAC;AAOvD,UAAU,MAAM;CAAG;AAEnB,eAAO,MAAM,oBAAoB,EAAE,EAAE,CAAC,MAAM,CAoC3C,CAAC"}

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

@@ -1,4 +1,5 @@
 import { ExpandableSection, Panel, PanelMain, PanelMainBody, Title } from '@patternfly/react-core';
+import { isEmpty } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { Trans } from 'react-i18next';
 import { useTopContentContext, useTopContentDispatchContext } from '../../../../context/TopContentProvider';
@@ -15,6 +16,8 @@ export const TopContentSuggestion = () => {
             fetchTopContentSuggestions(topContentDispatch, selectedProduct.name, selectedVersion);
         }
     }, [topContentDispatch, selectedProduct, selectedVersion]);
+    if (isEmpty(suggestion.linkedResources))
+        return React.createElement(React.Fragment, null);
     return (React.createElement(Panel, { variant: "raised", className: "pf-u-mx-md pf-u-p-md" },
         React.createElement(PanelMain, null,
             React.createElement(PanelMainBody, null,

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestionHintAccept.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentSuggestionHintAccept.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestionHintAccept.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAuB,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAgBrH,OAAc,EAAE,EAAE,EAAgC,MAAM,OAAO,CAAC;AAahE,UAAU,MAAM;IACZ,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,SAAS,EAAE,mBAAmB,CAAC;CAClC;AAED,eAAO,MAAM,8BAA8B,EAAE,EAAE,CAAC,MAAM,CA8KrD,CAAC"}
+{"version":3,"file":"TopContentSuggestionHintAccept.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentSuggestion/TopContentSuggestionHintAccept.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAuB,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAkBrH,OAAc,EAAE,EAAE,EAAgC,MAAM,OAAO,CAAC;AAgBhE,UAAU,MAAM;IACZ,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,SAAS,EAAE,mBAAmB,CAAC;CAClC;AAED,eAAO,MAAM,8BAA8B,EAAE,EAAE,CAAC,MAAM,CAkPrD,CAAC"}

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

@@ -7,23 +7,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ActionGroup, Button, Card, CardBody, Form, FormGroup, Select, SelectOption, SelectVariant, TextInput, } from '@patternfly/react-core';
+import { Button, Card, CardBody, Form, FormGroup, Select, SelectOption, SelectVariant, TextInput, Tooltip, ValidatedOptions, } from '@patternfly/react-core';
+import PencilAltIcon from '@patternfly/react-icons/dist/js/icons/pencil-alt-icon';
 import { ToastNotification } from '@rh-support/components';
-import { getVersion, isRegularVersion } from '@rh-support/utils';
-import { isEmpty, isUndefined } from 'lodash';
+import { getVersion, isRegularVersion, isValidUrl } from '@rh-support/utils';
+import { isEmpty, isUndefined, trim } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { CATEGORY_LIMIT } from '../../../../constants/TopContent';
 import { useTopContentContext, useTopContentDispatchContext } from '../../../../context/TopContentProvider';
+import { flagContentUsage } from '../../../../reducers/TopContentHelpers';
 import { ContentMode, deleteTopContentSuggestion, fetchCategories, saveAddedNewSectionContents, saveAddToTopContent, } from '../../../../reducers/TopContentReducer';
+import CategoryLimit from '../../CategoryLimit/CategoryLimit';
 export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
     const { t } = useTranslation();
-    const { categories, topContentResponse, topContentEditState, selectedProduct, selectedVersion, isCatOnlyForMajorVersion, isAddingCategory, suggestion, } = useTopContentContext();
+    const { categories, topContentResponse, topContentEditState, selectedProduct, selectedVersion, isCatOnlyForMajorVersion, isAddingCategory, suggestion, categoryUsage, } = useTopContentContext();
     const topContentDispatch = useTopContentDispatchContext();
     const [isSelectOpen, setSelectOpen] = useState(false);
     const [selected, setSelected] = useState();
     const [isSaving, setIsSaving] = useState(false);
     const [resourceTitle, setResourceTitle] = useState('');
+    const [linkToContent, setLinkToContent] = useState('');
+    const [isEditClicked, setIsEditClicked] = useState(false);
     const categoryToSave = useMemo(() => topContentEditState.find((category) => category.categoryId === (selected === null || selected === void 0 ? void 0 : selected.id)), [topContentEditState, selected]);
+    const flagContentEditState = useMemo(() => flagContentUsage(topContentEditState, categoryUsage, selectedVersion), [topContentEditState, categoryUsage, selectedVersion]);
     const isMajorVersionOnly = isUndefined(getVersion(selectedVersion).minor);
     const minorSelectedNoMinorContentButAvailableMajorContent = !topContentResponse.isFetching &&
         !isEmpty(topContentResponse.data) &&
@@ -31,6 +38,8 @@ export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
         isRegularVersion(selectedVersion) &&
         isCatOnlyForMajorVersion &&
         !isAddingCategory;
+    const isCategoryLimitReached = (minorSelectedNoMinorContentButAvailableMajorContent ? [] : flagContentEditState).length >= CATEGORY_LIMIT.MAX;
+    const isCategoryInList = flagContentEditState.some((c) => c.categoryId === (selected === null || selected === void 0 ? void 0 : selected.id));
     const onToggle = () => {
         setSelectOpen((previousToggleState) => !previousToggleState);
     };
@@ -38,13 +47,18 @@ export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
         setSelected(selection);
         onToggle();
     };
+    const isDisabled = isEmpty(linkToContent) ||
+        isEmpty(trim(resourceTitle)) ||
+        isUndefined(selected) ||
+        !isValidUrl(linkToContent) ||
+        (isCategoryLimitReached && !isCategoryInList);
     const addContentToCategory = () => __awaiter(void 0, void 0, void 0, function* () {
         try {
             setIsSaving(true);
             const newContent = {
                 contentTitle: resourceTitle,
                 contentRank: categoryToSave === null || categoryToSave === void 0 ? void 0 : categoryToSave.content.length,
-                contentUrl: resources.resourceViewUri,
+                contentUrl: linkToContent,
                 mode: ContentMode.ADD,
             };
             yield saveAddToTopContent(topContentDispatch, topContentEditState, categoryToSave.id, categoryToSave === null || categoryToSave === void 0 ? void 0 : categoryToSave.categoryId, newContent, -1);
@@ -63,7 +77,7 @@ export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
             setIsSaving(true);
             const newContent = {
                 contentTitle: resourceTitle,
-                contentUrl: resources.resourceViewUri,
+                contentUrl: linkToContent,
                 isAttentionNeeded: false,
                 mode: ContentMode.NEW_SECTION_CONTENT,
             };
@@ -91,7 +105,8 @@ export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
     });
     useEffect(() => {
         setResourceTitle(resources.resourceTitle);
-    }, [resources.resourceTitle]);
+        setLinkToContent(resources.resourceViewUri);
+    }, [resources.resourceTitle, resources.resourceViewUri]);
     useEffect(() => {
         try {
             fetchCategories(topContentDispatch);
@@ -100,17 +115,27 @@ export const TopContentSuggestionHintAccept = ({ onCancel, resources }) => {
             ToastNotification.addDangerMessage(t('There was an error loading top content categories'));
         }
     }, [topContentDispatch, t]);
-    return (React.createElement(Card, null,
+    return (React.createElement(Card, { className: "pf-u-m-sm" },
         React.createElement(CardBody, { className: "card-hint" },
-            React.createElement("span", { className: "hint-title" }, resources.resourceTitle),
             React.createElement(Form, null,
+                isEditClicked ? (React.createElement(React.Fragment, null,
+                    React.createElement(FormGroup, { label: t('Link to content'), isRequired: true, fieldId: "top-content-link" },
+                        React.createElement(TextInput, { isRequired: true, type: "text", id: "top-content-resource-link", name: "top-content-resource-link", "data-tracking-id": "top-content-resource-link", value: linkToContent, onChange: setLinkToContent, validated: isEmpty(linkToContent) || !isValidUrl(linkToContent)
+                                ? ValidatedOptions.error
+                                : ValidatedOptions.default })),
+                    React.createElement(FormGroup, { label: t('Headline'), isRequired: true, fieldId: "simple-form-email-01" },
+                        React.createElement(TextInput, { isRequired: true, type: "text", id: "top-content-headline-category", name: "top-content-headline-category", "data-tracking-id": "top-content-headline-category", value: resourceTitle, onChange: setResourceTitle, validated: isEmpty(trim(resourceTitle)) ? ValidatedOptions.error : ValidatedOptions.default })))) : (React.createElement("span", null,
+                    React.createElement(Button, { variant: "link", isInline: true },
+                        React.createElement("u", null,
+                            React.createElement("a", { className: "hint-title pf-u-font-size-md", target: "_blank", href: linkToContent, rel: "noreferrer" }, resources.resourceTitle))),
+                    React.createElement(Tooltip, { content: t('Edit Link to content and Headline'), position: "top" },
+                        React.createElement(Button, { variant: "link", icon: React.createElement(PencilAltIcon, null), onClick: () => setIsEditClicked((pre) => !pre) })))),
                 React.createElement(FormGroup, { label: t('Category'), isRequired: true, fieldId: "simple-form-email-01" },
-                    React.createElement(Select, { variant: SelectVariant.single, id: "category-selection", name: "category-selection", "data-testid": "category-selection", placeholderText: "Select a category", onToggle: onToggle, isOpen: isSelectOpen, onSelect: onSelect, selections: selected === null || selected === void 0 ? void 0 : selected.categoryName, isDisabled: categories.isFetching || categories.isError }, categories.data.map((category, id) => (React.createElement(SelectOption, { key: id, value: category },
+                    React.createElement(Select, Object.assign({ variant: SelectVariant.single, id: "category-selection", name: "category-selection", "data-testid": "category-selection", placeholderText: "Select a category", onToggle: onToggle, isOpen: isSelectOpen, onSelect: onSelect, selections: selected === null || selected === void 0 ? void 0 : selected.categoryName, isDisabled: categories.isError, loadingVariant: 'spinner' }, (categories.isFetching && { loadingVariant: 'spinner' })), categories.data.map((category, id) => (React.createElement(SelectOption, { key: id, value: category },
                         React.createElement("div", null, category.categoryName)))))),
-                React.createElement(FormGroup, { label: t('Headline'), isRequired: true, fieldId: "simple-form-email-01" },
-                    React.createElement(TextInput, { isRequired: true, type: "text", id: "top-content-hind-category", name: "top-content-hind-category", "data-tracking-id": "top-content-hind-category", value: resourceTitle, onChange: setResourceTitle })),
-                React.createElement(ActionGroup, null,
-                    React.createElement(Button, { variant: "primary", onClick: onSaveContent, isDisabled: isSaving || isUndefined(selected), isLoading: isSaving, "data-tracking-id": "suggested-content-save-button" },
+                React.createElement("div", { className: "pf-u-mt-sm" },
+                    isCategoryLimitReached && !isCategoryInList && !isUndefined(selected) && React.createElement(CategoryLimit, null),
+                    React.createElement(Button, { variant: "primary", onClick: onSaveContent, isDisabled: isSaving || isDisabled, isLoading: isSaving, "data-tracking-id": "suggested-content-save-button" },
                         React.createElement(Trans, null, "Save")),
                     React.createElement(Button, { variant: "link", onClick: () => onCancel(false) },
                         React.createElement(Trans, null, "Cancel")))))));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "1.0.40",
+    "version": "1.0.42",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "homepage": "",
@@ -51,7 +51,7 @@
         "not op_mini all"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.14.53",
+        "@cee-eng/hydrajs": "4.15.64",
         "@patternfly/patternfly": "4.196.7",
         "@patternfly/pfe-accordion": "1.12.3",
         "@patternfly/pfe-collapse": "1.12.3",
@@ -87,19 +87,19 @@
         "typescript": "4.3.5"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.14.53",
+        "@cee-eng/hydrajs": "4.15.64",
         "@patternfly/patternfly": "4.196.7",
         "@patternfly/pfe-accordion": "1.12.3",
         "@patternfly/pfe-collapse": "1.12.3",
         "@patternfly/pfe-tabs": "1.12.3",
         "@patternfly/react-core": "4.264.0",
         "@patternfly/react-table": "4.111.33",
-        "@rh-support/components": "1.2.21",
+        "@rh-support/components": "1.2.24",
         "@rh-support/configs": "1.0.3",
-        "@rh-support/react-context": "1.0.29",
+        "@rh-support/react-context": "1.0.32",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "1.0.11",
-        "@rh-support/utils": "1.0.9",
+        "@rh-support/user-permissions": "1.0.14",
+        "@rh-support/utils": "1.0.12",
         "@types/react-beautiful-dnd": "^13.0.0",
         "i18next": ">=17.0.1",
         "lodash": ">=4.17.15",
@@ -109,5 +109,5 @@
         "react-i18next": ">=10.11.0",
         "react-router-dom": ">=5.1.2"
     },
-    "gitHead": "229815fdeca8ae5ce5b49996cfc7dd6ceb6dc5a8"
+    "gitHead": "415d159b0afb5dddc9247a314d138571433625a2"
 }