@patternfly/quickstarts 6.3.0-prerelease.5 → 6.3.0-prerelease.7

package/dist/ConsoleShared/src/components/markdown-extensions/accordion-extension.d.ts

@@ -1,6 +1,6 @@
 declare const useAccordionShowdownExtension: () => {
     type: string;
     regex: RegExp;
-    replace: (_text: string, accordionContent: string, _command: string, accordionHeading: string) => string;
+    replace: (_text: string, accordionContent: string, _command: string, _quotedHeading: string, accordionHeading: string) => string;
 };
 export default useAccordionShowdownExtension;

package/dist/ConsoleShared/src/components/markdown-extensions/admonition-extension.d.ts

@@ -1,6 +1,6 @@
 declare const useAdmonitionShowdownExtension: () => {
     type: string;
     regex: RegExp;
-    replace: (text: string, content: string, admonitionLabel: string, admonitionType: string, groupId: string) => string;
+    replace: (text: string, content: string, admonitionLabel: string, admonitionType: string) => string;
 };
 export default useAdmonitionShowdownExtension;

package/dist/index.es.js

@@ -1153,6 +1153,155 @@ const useMultilineCopyClipboardShowdownExtension = () => {
     }), [getResource]);
 };
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const DOMPurify$2 = require('dompurify');
+var AdmonitionType;
+(function (AdmonitionType) {
+    AdmonitionType["TIP"] = "TIP";
+    AdmonitionType["NOTE"] = "NOTE";
+    AdmonitionType["IMPORTANT"] = "IMPORTANT";
+    AdmonitionType["WARNING"] = "WARNING";
+    AdmonitionType["CAUTION"] = "CAUTION";
+})(AdmonitionType || (AdmonitionType = {}));
+const admonitionToAlertVariantMap = {
+    [AdmonitionType.NOTE]: { variant: 'info' },
+    [AdmonitionType.TIP]: { variant: 'custom', customIcon: jsx(LightbulbIcon, {}) },
+    [AdmonitionType.IMPORTANT]: { variant: 'danger' },
+    [AdmonitionType.CAUTION]: { variant: 'warning', customIcon: jsx(FireIcon, {}) },
+    [AdmonitionType.WARNING]: { variant: 'warning' },
+};
+const useAdmonitionShowdownExtension = () => 
+// const { getResource } = React.useContext<QuickStartContextValues>(QuickStartContext);
+useMemo(() => ({
+    type: 'lang',
+    regex: /\[(.+)]{{(admonition) ([\w-]+)}}/g,
+    replace: (text, content, admonitionLabel, admonitionType) => {
+        if (!content || !admonitionLabel || !admonitionType) {
+            return text;
+        }
+        if (admonitionLabel !== 'admonition') {
+            return text;
+        }
+        admonitionType = admonitionType.toUpperCase();
+        // Process markdown content directly using marked
+        const processedContent = marked.parseInline(content);
+        const sanitizedContent = DOMPurify$2.sanitize(processedContent);
+        // Handle unknown admonition types by defaulting to NOTE
+        const admonitionConfig = admonitionToAlertVariantMap[admonitionType] || admonitionToAlertVariantMap.NOTE;
+        const { variant, customIcon } = admonitionConfig;
+        const pfAlert = (jsx(Alert, Object.assign({ variant: variant }, (customIcon && { customIcon }), { isInline: true, title: admonitionType, className: "pfext-markdown-admonition" }, { children: jsx("div", { dangerouslySetInnerHTML: { __html: sanitizedContent } }) })));
+        return removeTemplateWhitespace(renderToStaticMarkup(pfAlert));
+    },
+}), []);
+
+const useCodeShowdownExtension = () => useMemo(() => ({
+    type: 'output',
+    regex: /<pre><code>(.*?)\n?<\/code><\/pre>/g,
+    replace: (text, content) => {
+        if (!content) {
+            return text;
+        }
+        const pfCodeBlock = jsx(CodeBlock, { children: content });
+        return removeTemplateWhitespace(renderToStaticMarkup(pfCodeBlock));
+    },
+}), []);
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const DOMPurify$1 = require('dompurify');
+const useAccordionShowdownExtension = () => useMemo(() => ({
+    type: 'lang',
+    regex: /\[(.+)]{{(accordion) (&quot;(.*?)&quot;)}}/g,
+    replace: (_text, accordionContent, _command, _quotedHeading, accordionHeading) => {
+        const accordionId = String(accordionHeading).replace(/\s/g, '-');
+        // Process accordion content with markdown
+        const processedContent = marked.parseInline(accordionContent);
+        const sanitizedContent = DOMPurify$1.sanitize(processedContent);
+        return removeTemplateWhitespace(renderToStaticMarkup(jsx(Accordion, { children: jsxs(AccordionItem, { children: [jsx(AccordionToggle, Object.assign({ id: `${ACCORDION_MARKDOWN_BUTTON_ID}-${accordionId}` }, { children: accordionHeading })), jsx(AccordionContent, Object.assign({ id: `${ACCORDION_MARKDOWN_CONTENT_ID}-${accordionId}`, hidden: true }, { children: jsx("div", { dangerouslySetInnerHTML: { __html: sanitizedContent } }) }))] }) })));
+    },
+}), []);
+
+const AccordionShowdownHandler = ({ buttonElement, contentElement, }) => {
+    const [expanded, setExpanded] = useState(false);
+    const handleClick = () => {
+        const newExpanded = !expanded;
+        const expandedModifier = 'pf-m-expanded';
+        // Find the accordion item element (parent of the button)
+        const accordionItem = buttonElement.closest('.pf-v6-c-accordion__item');
+        // Update button - both visual state and aria-expanded
+        buttonElement.className = `pf-v6-c-accordion__toggle ${newExpanded ? expandedModifier : ''}`;
+        buttonElement.setAttribute('aria-expanded', newExpanded.toString());
+        // Update content - both visual state and hidden attribute
+        contentElement.hidden = !newExpanded;
+        contentElement.className = `pf-v6-c-accordion__expandable-content ${newExpanded ? expandedModifier : ''}`;
+        // Update accordion item
+        if (accordionItem) {
+            accordionItem.className = `pf-v6-c-accordion__item ${newExpanded ? expandedModifier : ''}`;
+        }
+        setExpanded(newExpanded);
+    };
+    useEventListener(buttonElement, 'click', handleClick);
+    return jsx(Fragment$1, {});
+};
+const AccordionRenderExtension = ({ docContext }) => {
+    const buttonElements = docContext.querySelectorAll(`[id ^= ${ACCORDION_MARKDOWN_BUTTON_ID}]`);
+    const contentElements = docContext.querySelectorAll(`[id ^= ${ACCORDION_MARKDOWN_CONTENT_ID}]`);
+    return buttonElements.length > 0 ? (jsx(Fragment$1, { children: Array.from(buttonElements).map((elm) => {
+            const content = Array.from(contentElements).find((elm2) => {
+                const elmId = elm.id.split(ACCORDION_MARKDOWN_BUTTON_ID)[1];
+                const elm2Id = elm2.id.split(ACCORDION_MARKDOWN_CONTENT_ID)[1];
+                return elmId === elm2Id;
+            });
+            return (jsx(AccordionShowdownHandler, { buttonElement: elm, contentElement: content }, elm.id.split(ACCORDION_MARKDOWN_BUTTON_ID)[1]));
+        }) })) : null;
+};
+
+const FallbackImg = ({ src, alt, className, fallback }) => {
+    const [isSrcValid, setIsSrcValid] = useState(true);
+    if (src && isSrcValid) {
+        return jsx("img", { className: className, src: src, alt: alt, onError: () => setIsSrcValid(false) });
+    }
+    return jsx(Fragment$1, { children: fallback });
+};
+
+const DASH = '-';
+
+const PopoverStatus = ({ hideHeader, children, isVisible = null, statusBody, title, onHide, onShow, }) => (jsx(Popover, Object.assign({ position: PopoverPosition.right, headerContent: hideHeader ? null : title, bodyContent: children, "aria-label": title, onHide: onHide, onShow: onShow, isVisible: isVisible }, { children: jsx(Button, Object.assign({ variant: "link", isInline: true }, { children: statusBody })) })));
+
+const StatusIconAndText = ({ icon, title, spin, iconOnly, noTooltip, className, }) => {
+    if (!title) {
+        return jsx(Fragment$1, { children: DASH });
+    }
+    return (jsxs("span", Object.assign({ className: css('pfext-icon-and-text', className), title: iconOnly && !noTooltip ? title : undefined }, { children: [icon &&
+                cloneElement(icon, {
+                    className: css(spin && 'fa-spin', icon.props.className, !iconOnly && 'pfext-icon-and-text__icon pfext-icon-flex-child'),
+                }), !iconOnly && jsx(CamelCaseWrap, { value: title, dataTest: "status-text" })] })));
+};
+
+const GenericStatus = (props) => {
+    const { Icon, children, popoverTitle, title, noTooltip, iconOnly } = props, restProps = __rest(props, ["Icon", "children", "popoverTitle", "title", "noTooltip", "iconOnly"]);
+    const renderIcon = iconOnly && !noTooltip ? jsx(Icon, { title: title }) : jsx(Icon, {});
+    const statusBody = (jsx(StatusIconAndText, Object.assign({}, restProps, { noTooltip: noTooltip, title: title, iconOnly: iconOnly, icon: renderIcon })));
+    return Children.toArray(children).length ? (jsx(PopoverStatus, Object.assign({ title: popoverTitle || title }, restProps, { statusBody: statusBody }, { children: children }))) : (statusBody);
+};
+
+const GreenCheckCircleIcon = ({ className, title, size }) => (jsx(Icon, Object.assign({ size: size, status: "success" }, { children: jsx(CheckCircleIcon, { "data-test": "success-icon", className: className, title: title }) })));
+
+const SuccessStatus = (props) => (jsx(GenericStatus, Object.assign({}, props, { Icon: GreenCheckCircleIcon, title: props.title || 'Healthy' })));
+SuccessStatus.displayName = 'SuccessStatus';
+
+const Status = ({ status, title, iconOnly, noTooltip, className }) => {
+    const statusProps = { title: title || status, iconOnly, noTooltip, className };
+    switch (status) {
+        case 'In Progress':
+            return jsx(StatusIconAndText, Object.assign({}, statusProps, { icon: jsx(SyncAltIcon, {}) }));
+        case 'Complete':
+            return jsx(SuccessStatus, Object.assign({}, statusProps));
+        default:
+            return jsx(Fragment$1, { children: status || DASH });
+    }
+};
+const StatusIcon = ({ status }) => jsx(Status, { status: status, iconOnly: true });
+
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const DOMPurify = require('dompurify');
 const markdownConvert = (markdown, extensions) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1164,7 +1313,7 @@ const markdownConvert = (markdown, extensions) => __awaiter(void 0, void 0, void
             node.setAttribute('rel', 'noopener noreferrer');
             return node;
         }
-        // add PF content classes
+        // add PF content classes to standard elements (details blocks get handled separately)
         if (node.nodeType === 1) {
             const contentElements = [
                 'ul',
@@ -1215,13 +1364,82 @@ const markdownConvert = (markdown, extensions) => __awaiter(void 0, void 0, void
     const reversedMarkdown = reverseString(markdown);
     const reverseMarkdownWithSubstitutedCodeFences = reversedMarkdown.replace(/{{```((.|\n)*?)```/g, '{{@@@$1@@@');
     const markdownWithSubstitutedCodeFences = reverseString(reverseMarkdownWithSubstitutedCodeFences);
-    const parsedMarkdown = yield marked.parse(markdownWithSubstitutedCodeFences);
+    // Fix malformed HTML entities early in the process
+    let preprocessedMarkdown = markdownWithSubstitutedCodeFences;
+    preprocessedMarkdown = preprocessedMarkdown
+        .replace(/&nbsp([^;])/g, '&nbsp;$1')
+        .replace(/&amp;nbsp;/g, '&nbsp;');
+    preprocessedMarkdown = preprocessedMarkdown.replace(/&nbsp(?![;])/g, '&nbsp;');
+    // Process content in segments to ensure markdown parsing continues after HTML blocks
+    const htmlBlockRegex = /(<(?:details|div|section|article)[^>]*>[\s\S]*?<\/(?:details|div|section|article)>)/g;
+    let parsedMarkdown = '';
+    // Check if there are any HTML blocks
+    if (htmlBlockRegex.test(preprocessedMarkdown)) {
+        // Reset regex for actual processing
+        htmlBlockRegex.lastIndex = 0;
+        let lastIndex = 0;
+        let match;
+        while ((match = htmlBlockRegex.exec(preprocessedMarkdown)) !== null) {
+            // Process markdown before the HTML block
+            const markdownBefore = preprocessedMarkdown.slice(lastIndex, match.index).trim();
+            if (markdownBefore) {
+                const parsed = yield marked.parse(markdownBefore);
+                parsedMarkdown += parsed;
+            }
+            // Process the HTML block: parse markdown content inside while preserving HTML structure
+            let htmlBlock = match[1];
+            // Find and process markdown content inside HTML tags
+            const contentRegex = />(\s*[\s\S]*?)\s*</g;
+            const contentMatches = [];
+            let contentMatch;
+            while ((contentMatch = contentRegex.exec(htmlBlock)) !== null) {
+                const content = contentMatch[1];
+                // Only process content that has markdown formatting but no extension syntax
+                if (content.trim() &&
+                    !content.includes('{{') &&
+                    (content.includes('**') || content.includes('- ') || content.includes('\n'))) {
+                    // This looks like markdown content without extensions - parse it as block content
+                    const parsedContent = yield marked.parse(content.trim());
+                    // Remove wrapping <p> tags if they exist since we're inside HTML already
+                    const cleanedContent = parsedContent.replace(/^<p[^>]*>([\s\S]*)<\/p>[\s]*$/g, '$1');
+                    contentMatches.push({
+                        original: contentMatch[0],
+                        replacement: `>${cleanedContent}<`,
+                    });
+                }
+            }
+            // Apply the content replacements
+            contentMatches.forEach(({ original, replacement }) => {
+                htmlBlock = htmlBlock.replace(original, replacement);
+            });
+            // Apply extensions (like admonitions) to the processed HTML block
+            if (extensions) {
+                extensions.forEach(({ regex, replace }) => {
+                    if (regex) {
+                        htmlBlock = htmlBlock.replace(regex, replace);
+                    }
+                });
+            }
+            parsedMarkdown += htmlBlock;
+            lastIndex = htmlBlockRegex.lastIndex;
+        }
+        // Process any remaining markdown after the last HTML block
+        const markdownAfter = preprocessedMarkdown.slice(lastIndex).trim();
+        if (markdownAfter) {
+            const parsed = yield marked.parse(markdownAfter);
+            parsedMarkdown += parsed;
+        }
+    }
+    else {
+        // No HTML blocks found, process normally
+        parsedMarkdown = yield marked.parse(preprocessedMarkdown);
+    }
     // Swap the temporary tokens back to code fences before we run the extensions
     let md = parsedMarkdown.replace(/@@@/g, '```');
     if (extensions) {
         // Convert code spans back to md format before we run the custom extension regexes
         md = md.replace(/<code>(.*)<\/code>/g, '`$1`');
-        extensions.forEach(({ regex, replace }) => {
+        extensions.forEach(({ regex, replace }, _index) => {
             if (regex) {
                 md = md.replace(regex, replace);
             }
@@ -1286,7 +1504,7 @@ const RenderExtension = ({ renderExtension, selector, markup, docContext, }) =>
 };
 const InlineMarkdownView = ({ markup, isEmpty, renderExtension, className, }) => {
     const id = useMemo(() => uniqueId('markdown'), []);
-    return (jsxs("div", Object.assign({ className: css({ 'is-empty': isEmpty }, className), id: id }, { children: [jsx("div", { dangerouslySetInnerHTML: { __html: markup } }), renderExtension && (jsx(RenderExtension, { renderExtension: renderExtension, selector: `#${id}`, markup: markup }))] })));
+    return (jsxs("div", Object.assign({ className: css({ 'is-empty': isEmpty }, className), id: id }, { children: [jsx("div", { style: { marginBlockEnd: 'var(--pf-t-global--spacer--md)' }, dangerouslySetInnerHTML: { __html: markup } }), renderExtension && (jsx(RenderExtension, { renderExtension: renderExtension, selector: `#${id}`, markup: markup }))] })));
 };
 const IFrameMarkdownView = ({ exactHeight, markup, isEmpty, renderExtension, className, }) => {
     const [frame, setFrame] = useState();
@@ -1345,7 +1563,7 @@ const IFrameMarkdownView = ({ exactHeight, markup, isEmpty, renderExtension, cla
   }
   </style>
   <body class="pf-m-redhat-font"><div style="overflow-y: auto;">${markup}</div></body>`;
-    return (jsxs(Fragment$1, { children: [jsx("iframe", { sandbox: "allow-popups allow-popups-to-escape-sandbox allow-same-origin", srcDoc: contents, style: { border: '0px', display: 'block', width: '100%', height: '0' }, ref: (r) => {
+    return (jsxs(Fragment$1, { children: [jsx("iframe", { title: "Markdown content preview", sandbox: "allow-popups allow-popups-to-escape-sandbox allow-same-origin", srcDoc: contents, style: { border: '0px', display: 'block', width: '100%', height: '0' }, ref: (r) => {
                     setFrame(r);
                 }, onLoad: () => onLoad(), className: className }), loaded && frame && renderExtension && (jsx(RenderExtension, { markup: markup, selector: '', renderExtension: renderExtension, docContext: frame.contentDocument }))] }));
 };
@@ -1393,131 +1611,6 @@ const QuickStartMarkdownView = ({ content, exactHeight, className, }) => {
                     markdown.renderExtension(docContext, rootSelector)] })), className: className }));
 };
 
-var AdmonitionType;
-(function (AdmonitionType) {
-    AdmonitionType["TIP"] = "TIP";
-    AdmonitionType["NOTE"] = "NOTE";
-    AdmonitionType["IMPORTANT"] = "IMPORTANT";
-    AdmonitionType["WARNING"] = "WARNING";
-    AdmonitionType["CAUTION"] = "CAUTION";
-})(AdmonitionType || (AdmonitionType = {}));
-const admonitionToAlertVariantMap = {
-    [AdmonitionType.NOTE]: { variant: 'info' },
-    [AdmonitionType.TIP]: { variant: 'custom', customIcon: jsx(LightbulbIcon, {}) },
-    [AdmonitionType.IMPORTANT]: { variant: 'danger' },
-    [AdmonitionType.CAUTION]: { variant: 'warning', customIcon: jsx(FireIcon, {}) },
-    [AdmonitionType.WARNING]: { variant: 'warning' },
-};
-const useAdmonitionShowdownExtension = () => 
-// const { getResource } = React.useContext<QuickStartContextValues>(QuickStartContext);
-useMemo(() => ({
-    type: 'lang',
-    regex: /\[(.+)]{{(admonition) ([\w-]+)}}/g,
-    replace: (text, content, admonitionLabel, admonitionType, groupId) => {
-        if (!content || !admonitionLabel || !admonitionType || !groupId) {
-            return text;
-        }
-        admonitionType = admonitionType.toUpperCase();
-        const { variant, customIcon } = admonitionToAlertVariantMap[admonitionType];
-        const mdContent = jsx(QuickStartMarkdownView, { content: content });
-        const pfAlert = (jsx(Alert, Object.assign({ variant: variant }, (customIcon && { customIcon }), { isInline: true, title: admonitionType, className: "pfext-markdown-admonition" }, { children: mdContent })));
-        return removeTemplateWhitespace(renderToStaticMarkup(pfAlert));
-    },
-}), []);
-
-const useCodeShowdownExtension = () => useMemo(() => ({
-    type: 'output',
-    regex: /<pre><code>(.*?)\n?<\/code><\/pre>/g,
-    replace: (text, content) => {
-        if (!content) {
-            return text;
-        }
-        const pfCodeBlock = jsx(CodeBlock, { children: content });
-        return removeTemplateWhitespace(renderToStaticMarkup(pfCodeBlock));
-    },
-}), []);
-
-const useAccordionShowdownExtension = () => useMemo(() => ({
-    type: 'lang',
-    regex: /\[(.+)]{{(accordion) ("(.*?)")}}/g,
-    replace: (_text, accordionContent, _command, accordionHeading) => {
-        const accordionId = String(accordionHeading).replace(/\s/g, '-');
-        return removeTemplateWhitespace(renderToStaticMarkup(jsx(Fragment$1, { children: jsx(Accordion, Object.assign({ asDefinitionList: true }, { children: jsxs(AccordionItem, Object.assign({ isExpanded: false }, { children: [jsx(AccordionToggle, Object.assign({ id: `${ACCORDION_MARKDOWN_BUTTON_ID}-${accordionId}` }, { children: accordionHeading })), jsx(AccordionContent, Object.assign({ id: `${ACCORDION_MARKDOWN_CONTENT_ID}-${accordionId}` }, { children: accordionContent }))] })) })) })));
-    },
-}), []);
-
-const AccordionShowdownHandler = ({ buttonElement, contentElement, }) => {
-    const [expanded, setExpanded] = useState(false);
-    const handleClick = () => {
-        const expandedModifier = 'pf-m-expanded';
-        buttonElement.className = `pf-v6-c-accordion__toggle ${!expanded ? expandedModifier : ''}`;
-        contentElement.hidden = expanded;
-        contentElement.className = `pf-v6-c-accordion__expanded-content ${!expanded ? expandedModifier : ''}`;
-        setExpanded(!expanded);
-    };
-    useEventListener(buttonElement, 'click', handleClick);
-    return jsx(Fragment$1, {});
-};
-const AccordionRenderExtension = ({ docContext }) => {
-    const buttonElements = docContext.querySelectorAll(`[id ^= ${ACCORDION_MARKDOWN_BUTTON_ID}]`);
-    const contentElements = docContext.querySelectorAll(`[id ^= ${ACCORDION_MARKDOWN_CONTENT_ID}]`);
-    return buttonElements.length > 0 ? (jsx(Fragment$1, { children: Array.from(buttonElements).map((elm) => {
-            const content = Array.from(contentElements).find((elm2) => {
-                const elmId = elm.id.split(ACCORDION_MARKDOWN_BUTTON_ID)[1];
-                const elm2Id = elm2.id.split(ACCORDION_MARKDOWN_CONTENT_ID)[1];
-                return elmId === elm2Id;
-            });
-            return (jsx(AccordionShowdownHandler, { buttonElement: elm, contentElement: content }, elm.id.split(ACCORDION_MARKDOWN_BUTTON_ID)[1]));
-        }) })) : null;
-};
-
-const FallbackImg = ({ src, alt, className, fallback }) => {
-    const [isSrcValid, setIsSrcValid] = useState(true);
-    if (src && isSrcValid) {
-        return jsx("img", { className: className, src: src, alt: alt, onError: () => setIsSrcValid(false) });
-    }
-    return jsx(Fragment$1, { children: fallback });
-};
-
-const DASH = '-';
-
-const PopoverStatus = ({ hideHeader, children, isVisible = null, statusBody, title, onHide, onShow, }) => (jsx(Popover, Object.assign({ position: PopoverPosition.right, headerContent: hideHeader ? null : title, bodyContent: children, "aria-label": title, onHide: onHide, onShow: onShow, isVisible: isVisible }, { children: jsx(Button, Object.assign({ variant: "link", isInline: true }, { children: statusBody })) })));
-
-const StatusIconAndText = ({ icon, title, spin, iconOnly, noTooltip, className, }) => {
-    if (!title) {
-        return jsx(Fragment$1, { children: DASH });
-    }
-    return (jsxs("span", Object.assign({ className: css('pfext-icon-and-text', className), title: iconOnly && !noTooltip ? title : undefined }, { children: [icon &&
-                cloneElement(icon, {
-                    className: css(spin && 'fa-spin', icon.props.className, !iconOnly && 'pfext-icon-and-text__icon pfext-icon-flex-child'),
-                }), !iconOnly && jsx(CamelCaseWrap, { value: title, dataTest: "status-text" })] })));
-};
-
-const GenericStatus = (props) => {
-    const { Icon, children, popoverTitle, title, noTooltip, iconOnly } = props, restProps = __rest(props, ["Icon", "children", "popoverTitle", "title", "noTooltip", "iconOnly"]);
-    const renderIcon = iconOnly && !noTooltip ? jsx(Icon, { title: title }) : jsx(Icon, {});
-    const statusBody = (jsx(StatusIconAndText, Object.assign({}, restProps, { noTooltip: noTooltip, title: title, iconOnly: iconOnly, icon: renderIcon })));
-    return Children.toArray(children).length ? (jsx(PopoverStatus, Object.assign({ title: popoverTitle || title }, restProps, { statusBody: statusBody }, { children: children }))) : (statusBody);
-};
-
-const GreenCheckCircleIcon = ({ className, title, size }) => (jsx(Icon, Object.assign({ size: size, status: "success" }, { children: jsx(CheckCircleIcon, { "data-test": "success-icon", className: className, title: title }) })));
-
-const SuccessStatus = (props) => (jsx(GenericStatus, Object.assign({}, props, { Icon: GreenCheckCircleIcon, title: props.title || 'Healthy' })));
-SuccessStatus.displayName = 'SuccessStatus';
-
-const Status = ({ status, title, iconOnly, noTooltip, className }) => {
-    const statusProps = { title: title || status, iconOnly, noTooltip, className };
-    switch (status) {
-        case 'In Progress':
-            return jsx(StatusIconAndText, Object.assign({}, statusProps, { icon: jsx(SyncAltIcon, {}) }));
-        case 'Complete':
-            return jsx(SuccessStatus, Object.assign({}, statusProps));
-        default:
-            return jsx(Fragment$1, { children: status || DASH });
-    }
-};
-const StatusIcon = ({ status }) => jsx(Status, { status: status, iconOnly: true });
-
 const QuickStartTileDescription = ({ description, prerequisites, }) => {
     const { getResource } = useContext(QuickStartContext);
     const prereqs = prerequisites === null || prerequisites === void 0 ? void 0 : prerequisites.filter((p) => p);
@@ -1620,7 +1713,7 @@ const QuickStartCatalogFilterSelect = (_a) => {
 };
 const QuickStartCatalogFilterCount = ({ quickStartsCount }) => {
     const { getResource } = useContext(QuickStartContext);
-    return (jsx(ToolbarItem, Object.assign({ align: { default: 'alignEnd' } }, { children: getResource('{{count, number}} item', quickStartsCount).replace('{{count, number}}', quickStartsCount) })));
+    return (jsx(ToolbarItem, Object.assign({ align: { default: 'alignEnd' } }, { children: getResource('{{count, number}} item', quickStartsCount) })));
 };
 const QuickStartCatalogFilterSearchWrapper = ({ onSearchInputChange = () => { } }) => {
     const { useQueryParams, filter, setFilter } = useContext(QuickStartContext);
@@ -1834,7 +1927,7 @@ const QuickStartIntroduction = ({ tasks, introduction, allTaskStatuses, prerequi
     const prereqs = prerequisites === null || prerequisites === void 0 ? void 0 : prerequisites.filter((p) => p);
     const [isPrereqsExpanded, setIsPrereqsExpanded] = useState(false);
     const prereqList = (prereqs === null || prereqs === void 0 ? void 0 : prereqs.length) > 0 && (jsx(ExpandableSection, Object.assign({ toggleText: getResource('View Prerequisites ({{totalPrereqs}})').replace('{{totalPrereqs}}', prereqs.length), onToggle: () => setIsPrereqsExpanded(!isPrereqsExpanded) }, { children: jsx(List, { children: prereqs.map((pr) => (jsx(ListItem, { children: jsx(QuickStartMarkdownView, { content: pr }) }, pr))) }) })));
-    return (jsxs(Stack, Object.assign({ hasGutter: true }, { children: [jsx(QuickStartMarkdownView, { content: introduction }), prereqList, jsxs("p", { children: [getResource('In this quick start, you will complete {{count, number}} task', tasks === null || tasks === void 0 ? void 0 : tasks.length).replace('{{count, number}}', (tasks === null || tasks === void 0 ? void 0 : tasks.length) || 0), ":"] }), jsx(QuickStartTaskHeaderList, { tasks: tasks, allTaskStatuses: allTaskStatuses, onTaskSelect: onTaskSelect })] })));
+    return (jsxs(Stack, Object.assign({ hasGutter: true }, { children: [jsx(QuickStartMarkdownView, { content: introduction }), prereqList, jsxs("p", { children: [getResource('In this quick start, you will complete {{count, number}} task', (tasks === null || tasks === void 0 ? void 0 : tasks.length) || 0).replace('{{count, number}}', (tasks === null || tasks === void 0 ? void 0 : tasks.length) || 0), ":"] }), jsx(QuickStartTaskHeaderList, { tasks: tasks, allTaskStatuses: allTaskStatuses, onTaskSelect: onTaskSelect })] })));
 };
 
 const getAlertVariant = (status) => {
@@ -2007,7 +2100,7 @@ const QuickStartPanelContent = (_a) => {
 const QuickStartDrawerContent = (_a) => {
     var { quickStarts = [], appendTo, fullWidth, handleDrawerClose } = _a, props = __rest(_a, ["quickStarts", "appendTo", "fullWidth", "handleDrawerClose"]);
     const { activeQuickStartID, allQuickStarts = [], activeQuickStartState, } = useContext(QuickStartContext);
-    const combinedQuickStarts = allQuickStarts.concat(quickStarts);
+    const combinedQuickStarts = [...allQuickStarts, ...quickStarts].filter((qs, idx, arr) => arr.findIndex((q) => q.metadata.name === qs.metadata.name) === idx);
     const handleClose = () => {
         handleDrawerClose && handleDrawerClose(activeQuickStartState === null || activeQuickStartState === void 0 ? void 0 : activeQuickStartState.status);
     };