@rh-support/manage 1.0.42 → 1.0.43

package/lib/esm/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/AddNewCategoryDropDown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddNewCategoryDropDown.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/AddNewCategoryDropDown.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAUhG,UAAU,MAAM;IACZ,gBAAgB,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,eAmDnD"}
+{"version":3,"file":"AddNewCategoryDropDown.d.ts","sourceRoot":"","sources":["../../../../../../src/components/TopContentManagement/TopContentEditor/TopContentCategoryContent/AddNewCategoryDropDown.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAShG,UAAU,MAAM;IACZ,gBAAgB,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,eA4EnD"}

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

@@ -1,6 +1,6 @@
-import { Dropdown, ToastNotification } from '@rh-support/components';
-import { toOptions } from '@rh-support/utils';
-import React, { useEffect } from 'react';
+import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { ToastNotification } from '@rh-support/components';
+import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useTopContentContext, useTopContentDispatchContext } from '../../../../context/TopContentProvider';
 import { fetchCategories } from '../../../../reducers/TopContentReducer';
@@ -10,11 +10,29 @@ export function AddNewCategoryDropDown(props) {
     const topContentDispatch = useTopContentDispatchContext();
     const allAddedCategories = topContentEditState.map((cat) => cat.categoryName);
     const availableCategories = categories.data.filter((category) => !(allAddedCategories || []).includes(category.categoryName));
+    const [isOpen, setIsOpen] = useState(false);
+    const [selected, setSelected] = useState();
+    const getCategoryOptions = (options) => {
+        return options.map((category, id) => (React.createElement(SelectOption, { key: id, value: category }, category.categoryName)));
+    };
+    const onFilter = (_, value) => {
+        if (!value)
+            return getCategoryOptions(availableCategories);
+        const input = new RegExp(value, 'i');
+        const newOptions = availableCategories.filter((c) => input.test(c.categoryName));
+        return getCategoryOptions(newOptions);
+    };
+    const onToggle = (isExpanded) => {
+        setIsOpen(isExpanded);
+    };
+    const onSelect = (event, selection, isPlaceholder) => {
+        setSelected(selection);
+        props.onCategoryChange(selection);
+        onToggle(false);
+    };
     const onClearCategory = () => {
         props.onCategoryChange(undefined);
-    };
-    const onCategoryChange = (selectedItem) => {
-        props.onCategoryChange(selectedItem.value);
+        setSelected(undefined);
     };
     useEffect(() => {
         try {
@@ -25,8 +43,9 @@ export function AddNewCategoryDropDown(props) {
         }
     }, [topContentDispatch, t]);
     return (React.createElement("div", { className: "form-group add-new-category" },
-        React.createElement(Dropdown, { id: "new-category", name: "new-category", isLoadingList: categories.isFetching, disabled: categories.isFetching || categories.isFetching, required: true, title: t('Select an option or enter a new category'), placeholder: t('Select an option or enter a new category'), list: toOptions(availableCategories, { labelKey: 'categoryName' }), onChange: onCategoryChange, onClearSelection: onClearCategory, searchable: true, label: React.createElement("label", { htmlFor: "new-category" },
-                React.createElement(Trans, null, "Category"),
-                ' ',
-                React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")) })));
+        React.createElement("label", { htmlFor: "new-category" },
+            React.createElement(Trans, null, "Category"),
+            ' ',
+            React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
+        React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, onToggle: onToggle, isOpen: isOpen, onClear: onClearCategory, onSelect: onSelect, onFilter: onFilter, selections: selected === null || selected === void 0 ? void 0 : selected.categoryName, placeholderText: t('Select an option or enter a new category') }, (categories.isFetching && { loadingVariant: 'spinner' }), { id: "new-category", "data-tracking-id": "new-category" }), getCategoryOptions(availableCategories))));
 }

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

@@ -18,7 +18,7 @@ export const TopContentSuggestion = () => {
     }, [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" },
+    return (React.createElement(Panel, { variant: "raised", className: "pf-u-mx-md pf-u-p-md top-content-panel" },
         React.createElement(PanelMain, null,
             React.createElement(PanelMainBody, null,
                 React.createElement(ExpandableSection, { onToggle: onToggle, isExpanded: isExpanded, toggleContent: React.createElement(Title, { headingLevel: "h6", className: "accordion_title" },

package/lib/esm/components/TopContentManagement/TopContentProductVersionSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentProductVersionSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/TopContentManagement/TopContentProductVersionSelector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEnF,OAAO,EAAE,gBAAgB,EAAW,MAAM,0BAA0B,CAAC;AASrE,UAAU,MAAO,SAAQ,gBAAgB;IACrC,eAAe,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACxC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IAC3D,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;CACrB;AAQD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,2BAG1E;AAqBD,iBAAS,gCAAgC,CAAC,KAAK,EAAE,MAAM,eA4HtD;kBA5HQ,gCAAgC;;;AA+HzC,OAAO,EAAE,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"TopContentProductVersionSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/TopContentManagement/TopContentProductVersionSelector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAGnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAS5D,UAAU,MAAO,SAAQ,gBAAgB;IACrC,eAAe,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACxC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IAC3D,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;CACrB;AAQD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,2BAG1E;AAqBD,iBAAS,gCAAgC,CAAC,KAAK,EAAE,MAAM,eAsItD;kBAtIQ,gCAAgC;;;AAyIzC,OAAO,EAAE,gCAAgC,EAAE,CAAC"}

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

@@ -1,6 +1,7 @@
 import { products as productsApi } from '@cee-eng/hydrajs';
-import { Dropdown, useFetch } from '@rh-support/components';
-import { getUniqueSortedVersions, getVersion, toOption, toOptions } from '@rh-support/utils';
+import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { useFetch } from '@rh-support/components';
+import { getUniqueSortedVersions, getVersion } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
@@ -40,10 +41,9 @@ function TopContentProductVersionSelector(props) {
         initialData: [],
     });
     const { request: getProductVersions, isFetching: isLoadingVersions, data: versions, } = useFetch(productsApi.getProductVersions, { initialData: [], postProcessor: postVersionsProcessor });
-    const [isProductInValid, setIsProductInValid] = useState(false);
-    const [isVersionInValid, setIsVersionInValid] = useState(false);
-    const [isProductBlured, setIsProductBlured] = useState(false);
-    const [isVersionBlured, setIsVersionBlured] = useState(false);
+    const [isProductOpen, setIsProductOpen] = useState(false);
+    const [isVersionOpen, setIsVersionOpen] = useState(false);
+    const { selectedProduct, selectedVersion } = props;
     const topContentDispatch = useTopContentDispatchContext();
     /**
      * Fetch products on load
@@ -64,48 +64,49 @@ function TopContentProductVersionSelector(props) {
     }, [versions]);
     const onProductChange = (option) => {
         setIsAddingCategory(topContentDispatch, false);
-        props.onProductChange(option.value);
-        validateProduct(option);
-        isProductValid(option) && getProductVersions(option.value.name);
+        props.onProductChange(option);
+        getProductVersions(option.name);
     };
     const onVersionChange = (option) => {
         setIsAddingCategory(topContentDispatch, false);
-        props.onVersionChange(option.value);
-        validateVersion(option);
+        props.onVersionChange(option);
     };
     const onProductClear = () => {
-        onProductChange(toOption({ name: '', id: '' }, { labelKey: 'name' }));
+        onProductChange({ name: '', id: '' });
     };
-    const onProductOuterClick = (selectedItem) => {
-        setIsProductBlured(true);
+    const getProductOptions = (options) => {
+        return options.map((product, id) => (React.createElement(SelectOption, { key: id, value: product }, product.name)));
     };
-    const onVersionOuterClick = (selectedItem) => {
-        setIsVersionBlured(true);
+    const onProductFilter = (_, value) => {
+        if (!value)
+            return getProductOptions(products);
+        const input = new RegExp(value, 'i');
+        const newOptions = products === null || products === void 0 ? void 0 : products.filter((p) => input.test(p.name));
+        return getProductOptions(newOptions);
     };
-    const validateProduct = (selectedItem) => {
-        setIsProductInValid(!selectedItem);
+    const onProductToggle = (isExpanded) => {
+        setIsProductOpen(isExpanded);
     };
-    const isProductValid = (selectedItem) => {
-        return !isEmpty(selectedItem) && !isEmpty(selectedItem.label);
+    const onProductSelect = (event, selection, isPlaceholder) => {
+        onProductChange(selection);
+        onProductToggle(false);
     };
-    const validateVersion = (selectedItem) => {
-        setIsVersionInValid(isEmpty(selectedItem) || isEmpty(selectedItem.label));
+    const onVersionToggle = (isExpanded) => {
+        setIsVersionOpen(isExpanded);
+    };
+    const onVersionSelect = (e, selection, isPlaceholder) => {
+        onVersionChange(selection);
+        onVersionToggle(false);
     };
-    useEffect(() => {
-        setIsProductInValid(false);
-        setIsVersionInValid(false);
-        isProductBlured && setIsProductInValid(isEmpty(props.selectedProduct.name));
-        isVersionBlured && setIsVersionInValid(isEmpty(props.selectedVersion));
-    }, [isProductBlured, isVersionBlured, props.selectedProduct.name, props.selectedVersion]);
     return (React.createElement("div", { className: "toolbar" },
         React.createElement("div", { className: "toolbar-left" },
             React.createElement("label", { htmlFor: 'tc-product-dropdown-downshift-search' },
                 React.createElement(Trans, null, "Product")),
-            React.createElement(Dropdown, { className: `tc-product-dropdown`, placeholder: t('Select a product'), list: products ? toOptions(products, { labelKey: 'name' }) : [], title: `Select a product`, selectedItem: toOption(props.selectedProduct, { labelKey: 'name' }), isInValid: isProductInValid, onChange: onProductChange, onOuterClick: onProductOuterClick, searchable: true, isLoadingList: isLoadingProducts, onClearSelection: onProductClear, id: "tc-product-dropdown-selector", "data-tracking-id": "tc-product-dropdown-selector" })),
+            React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, onToggle: onProductToggle, selections: selectedProduct === null || selectedProduct === void 0 ? void 0 : selectedProduct.name, isOpen: isProductOpen, onSelect: onProductSelect, onClear: onProductClear, placeholderText: t('Select a product') }, (isLoadingProducts && { loadingVariant: 'spinner' }), { id: "tc-product-dropdown-selector", "data-tracking-id": "tc-product-dropdown-selector", onFilter: onProductFilter, isDisabled: isLoadingProducts }), getProductOptions(products))),
         React.createElement("div", { className: "toolbar-right" },
             React.createElement("label", { htmlFor: "version-selector-dropdown-toggle" },
                 React.createElement(Trans, null, "Version")),
-            React.createElement(Dropdown, { selectedItem: toOption(props.selectedVersion), list: props.selectedProduct ? toOptions(versions === null || versions === void 0 ? void 0 : versions.items) : [], id: "version-selector-dropdown", placeholder: t('Select a version'), isLoadingList: isLoadingVersions, title: `Versions for ${props.selectedProduct.name}`, disabled: isEmpty(versions === null || versions === void 0 ? void 0 : versions.items), isInValid: isVersionInValid, onChange: onVersionChange, onOuterClick: onVersionOuterClick, "data-tracking-id": "version-dropdown-selector" }))));
+            React.createElement(Select, Object.assign({ variant: SelectVariant.single, onToggle: onVersionToggle, onSelect: onVersionSelect, selections: selectedVersion, isOpen: isVersionOpen, placeholderText: t('Select a version'), isDisabled: isEmpty(versions === null || versions === void 0 ? void 0 : versions.items) }, (isLoadingVersions && { loadingVariant: 'spinner' }), { id: "version-dropdown-selector", "data-tracking-id": "version-dropdown-selector" }), ((versions === null || versions === void 0 ? void 0 : versions.items) || []).map((version, id) => (React.createElement(SelectOption, { key: id, value: version }, version)))))));
 }
 TopContentProductVersionSelector.defaultProps = defaultProps;
 export { TopContentProductVersionSelector };

package/lib/esm/scss/_main.scss

@@ -307,3 +307,11 @@ div.prefhostnameTooltip {
 svg.hostnameSpinner {
     vertical-align: -0.65rem !important;
 }
+
+#version-dropdown-selector {
+    z-index: 9999;
+}
+
+#tc-product-dropdown-selector {
+    z-index: 9999;
+}

package/lib/esm/scss/_pf4-overrides.scss

@@ -126,3 +126,7 @@ div.performance-metrics-modal {
         color: var(--pf-global--Color--100);
     }
 }
+
+.top-content-panel {
+    z-index: 100;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/manage",
-    "version": "1.0.42",
+    "version": "1.0.43",
     "description": "Customer Support Manage App",
     "author": "Jordan Eudy <jeudy100@gmail.com>",
     "homepage": "",
@@ -94,9 +94,9 @@
         "@patternfly/pfe-tabs": "1.12.3",
         "@patternfly/react-core": "4.264.0",
         "@patternfly/react-table": "4.111.33",
-        "@rh-support/components": "1.2.24",
+        "@rh-support/components": "1.2.25",
         "@rh-support/configs": "1.0.3",
-        "@rh-support/react-context": "1.0.32",
+        "@rh-support/react-context": "1.0.33",
         "@rh-support/types": "0.2.0",
         "@rh-support/user-permissions": "1.0.14",
         "@rh-support/utils": "1.0.12",
@@ -109,5 +109,5 @@
         "react-i18next": ">=10.11.0",
         "react-router-dom": ">=5.1.2"
     },
-    "gitHead": "415d159b0afb5dddc9247a314d138571433625a2"
+    "gitHead": "503c03f099f29076c7cbd553e53c6fe74bf2d749"
 }