@redocly/theme 0.30.1-beta.1 → 0.30.2

package/lib/components/Catalog/useCatalog.js

@@ -256,10 +256,9 @@ function collectFilterOptions(items, filters) {
                 }
             }
         }
-        const options = Object.entries(usedOptions).map(([value, count]) => ({ value, count }));
-        if (!staticOptions) {
-            options.sort((a, b) => b.value.localeCompare(a.value));
-        }
+        const options = Object.entries(usedOptions)
+            .map(([value, count]) => ({ value, count }))
+            .sort((a, b) => b.value.localeCompare(a.value));
         if (othersCount) {
             options.push({
                 value: filter.missingCategoryNameTranslationKey || filter.missingCategoryName || 'Others',

package/lib/components/Filter/Filter.js

@@ -52,7 +52,7 @@ function Filter({ filter, filterValuesCasing, }) {
                             return;
                         filter.selectOption(Object.assign(Object.assign({}, filter.selectedOptions), { to: formatDateWithNoTimeZone(to) }));
                     } })))) : (filter.filteredOptions.map((value) => {
-            const id = 'filter--' + filter.property + '--' + value.value;
+            const id = 'filter--' + filter.property + '--' + slug(value.value);
             return (react_1.default.createElement(FilterOption, { key: id, role: "link", onClick: () => filter.toggleOption(value.value) },
                 react_1.default.createElement(icons_1.CheckboxIcon, { checked: filter.selectedOptions.has(value.value) }),
                 react_1.default.createElement(FilterOptionLabel, null, changeCasing(translate(value.value), filterValuesCasing)),
@@ -133,6 +133,10 @@ const StyledSelect = (0, styled_components_1.default)(Select_1.Select) `
     margin: var(--filter-select-option-margin);
   }
 `;
+// TODO: import from portal
+function slug(str) {
+    return str.replace(/\s/g, '-').toLowerCase();
+}
 const DatePickerWrapper = styled_components_1.default.div `
   color: var(--filter-date-picker-color);
   display: flex;

package/lib/components/Menu/MenuItemSwitch.js

@@ -16,7 +16,7 @@ const MenuItem_1 = require("../../components/Menu/MenuItem");
 function MenuItemSwitch(props) {
     var _a;
     const type = (0, getMenuType_1.getMenuType)(props.item);
-    const { Drilldown, handleBack, handleExpand, isExpanded: drilldownIsExpanded, prevActiveItem, } = (0, useDrilldown_1.useDrilldown)(props);
+    const { Drilldown, handleBack, handleExpand, isExpanded: drilldownIsExpanded, } = (0, useDrilldown_1.useDrilldown)(props);
     const { MenuGroup, handleGroupClick, isExpanded } = (0, useMenuGroup_1.useMenuGroup)(props.item);
     switch (type) {
         case types_1.MenuType.Separator:
@@ -31,7 +31,7 @@ function MenuItemSwitch(props) {
             }
             return (react_1.default.createElement(Group, { item: props.item, isExpanded: isExpanded, toggleExpanded: handleGroupClick }, props.children));
         case types_1.MenuType.DrillDown:
-            return (react_1.default.createElement(Drilldown, { item: props.item, isExpanded: drilldownIsExpanded, back: handleBack, expand: handleExpand, prevActiveItem: prevActiveItem }, props.children));
+            return (react_1.default.createElement(Drilldown, { item: props.item, isExpanded: drilldownIsExpanded, back: handleBack, expand: handleExpand }, props.children));
         default:
             return react_1.default.createElement(MenuItem_1.MenuItem, Object.assign({}, props));
     }

package/lib/components/Scorecard/Card.d.ts

@@ -1,4 +1,2 @@
-export declare const ScorecardCard: import("styled-components").StyledComponent<"div", any, {
-    'data-component-name': string;
-}, "data-component-name">;
+export declare const ScorecardCard: import("styled-components").StyledComponent<"div", any, {}, never>;
 export declare const ScorecardCardTitle: import("styled-components").StyledComponent<"h3", any, {}, never>;

package/lib/components/Scorecard/Card.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScorecardCardTitle = exports.ScorecardCard = void 0;
 const styled_components_1 = __importDefault(require("styled-components"));
-exports.ScorecardCard = styled_components_1.default.div.attrs({
-    'data-component-name': 'Scorecard/ScorecardCard',
-}) `
+exports.ScorecardCard = styled_components_1.default.div `
   color: var(--text-primary);
-  background-color: var(--bg-raised);
+  background-color: var(--thin-tile-background-color);
   border-radius: 4px;
 
   border: 1px solid var(--border-primary);

package/lib/components/Scorecard/Gauge.d.ts

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-export interface GaugeProps {
+export declare function Gauge({ chunks, }: {
     chunks: {
         share: number;
         color: string;
-        title?: string;
     }[];
-    className?: string;
-}
-export declare function Gauge({ chunks, className }: GaugeProps): JSX.Element;
+}): JSX.Element;
 export declare const GaugeValue: import("styled-components").StyledComponent<"span", any, {}, never>;

package/lib/components/Scorecard/Gauge.js

@@ -29,12 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GaugeValue = exports.Gauge = void 0;
 const React = __importStar(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
-function Gauge({ chunks, className }) {
-    const title = chunks
-        .map((chunk) => chunk.title)
-        .filter(Boolean)
-        .join(', ');
-    return (React.createElement(GaugeWrapper, { "data-component-name": "Scorecard/StatusByLevelWidget", className: className, title: title }, chunks.map((chunk, i) => (React.createElement(GaugeChunk, { key: i, share: chunk.share, color: chunk.color })))));
+function Gauge({ chunks, }) {
+    return (React.createElement(GaugeWrapper, null, chunks.map((chunk, i) => (React.createElement(GaugeChunk, Object.assign({ key: i }, chunk))))));
 }
 exports.Gauge = Gauge;
 exports.GaugeValue = styled_components_1.default.span `

package/lib/components/Scorecard/StatusByLevelWidget.d.ts

@@ -7,6 +7,5 @@ export interface StatusByLevelWidgetProps {
         warnings: number;
         total: number;
     }[];
-    className?: string;
 }
 export declare function StatusByLevelWidget(props: StatusByLevelWidgetProps): JSX.Element;

package/lib/components/Scorecard/StatusByLevelWidget.js

@@ -32,8 +32,8 @@ const styled_components_1 = __importDefault(require("styled-components"));
 const Gauge_1 = require("../../components/Scorecard/Gauge");
 const Card_1 = require("../../components/Scorecard/Card");
 function StatusByLevelWidget(props) {
-    const { levels, title, className } = props;
-    return (React.createElement(Card_1.ScorecardCard, { "data-component-name": "Scorecard/StatusByLevelWidget", className: className },
+    const { levels, title } = props;
+    return (React.createElement(Card_1.ScorecardCard, null,
         React.createElement(Card_1.ScorecardCardTitle, null, title),
         React.createElement(CardBody, null, levels.map((level) => {
             const success = level.total - level.errors - level.warnings;
@@ -43,17 +43,14 @@ function StatusByLevelWidget(props) {
                         {
                             share: (success / level.total) * 100,
                             color: 'var(--scorecard-color-success)',
-                            title: `${success} passed`,
                         },
                         {
                             share: (level.warnings / level.total) * 100,
                             color: 'var(--scorecard-color-warning)',
-                            title: `${level.warnings} ${level.warnings === 1 ? 'warning' : 'warnings'}`,
                         },
                         {
                             share: (level.errors / level.total) * 100,
                             color: 'var(--scorecard-color-error)',
-                            title: `${level.errors} ${level.errors === 1 ? 'error' : 'errors'}`,
                         },
                     ] }),
                 React.createElement(Gauge_1.GaugeValue, null,

package/lib/components/Sidebar/DrilldownMenu.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { DrilldownMenuProps } from '../../components/Sidebar/types';
-export declare function DrilldownMenu({ item, back, prevActiveItem, children, className, }: React.PropsWithChildren<DrilldownMenuProps>): JSX.Element;
+export declare function DrilldownMenu({ item, back, children, className, }: React.PropsWithChildren<DrilldownMenuProps>): JSX.Element;

package/lib/components/Sidebar/DrilldownMenu.js

@@ -33,15 +33,12 @@ const BackButton_1 = require("../../components/Sidebar/BackButton");
 const DrilldownMenuItem_1 = require("../../components/Sidebar/DrilldownMenuItem");
 const hooks_1 = require("../../mocks/hooks");
 const Menu_1 = require("../../components/Menu");
-function DrilldownMenu({ item, back, prevActiveItem, children, className, }) {
+function DrilldownMenu({ item, back, children, className, }) {
     const { translate } = (0, hooks_1.useTranslate)();
-    const label = item.label === (prevActiveItem === null || prevActiveItem === void 0 ? void 0 : prevActiveItem.label) || !(prevActiveItem === null || prevActiveItem === void 0 ? void 0 : prevActiveItem.label)
-        ? translate('theme.sidebar.menu.backLabel', 'Back')
-        : prevActiveItem === null || prevActiveItem === void 0 ? void 0 : prevActiveItem.label;
     return (react_1.default.createElement(MenuContainer, { "data-component-name": "Sidebar/DrilldownMenu", className: className },
         react_1.default.createElement(MenuContent, null,
             react_1.default.createElement(MenuWrapper, null,
-                react_1.default.createElement(BackButton_1.BackButton, { back: back, "data-translation-key": "theme.sidebar.menu.backLabel" }, label),
+                react_1.default.createElement(BackButton_1.BackButton, { back: back, "data-translation-key": "theme.sidebar.menu.backLabel" }, translate('theme.sidebar.menu.backLabel', 'Back')),
                 react_1.default.createElement(Menu_1.MenuLinkItem, { item: item },
                     react_1.default.createElement(DrilldownMenuItem_1.DrilldownMenuItem, { item: item }))),
             children)));

package/lib/components/Sidebar/types.d.ts

@@ -10,7 +10,6 @@ export interface ItemState extends NavItem {
 export interface DrilldownMenuProps {
     back: () => void;
     item: ItemState;
-    prevActiveItem?: ItemState;
     className?: string;
 }
 export interface MenuItemProps {

package/lib/config.d.ts

@@ -282,7 +282,7 @@ declare const scorecardConfigSchema: {
     readonly additionalProperties: true;
     readonly required: readonly ["levels"];
     readonly properties: {
-        readonly failBuildIfBelowMinimum: {
+        readonly ignoreNonCompliant: {
             readonly type: "boolean";
             readonly default: false;
         };
@@ -309,9 +309,6 @@ declare const scorecardConfigSchema: {
                     readonly name: {
                         readonly type: "string";
                     };
-                    readonly color: {
-                        readonly type: "string";
-                    };
                     readonly extends: {
                         readonly type: "array";
                         readonly items: {
@@ -1854,7 +1851,7 @@ export declare const themeConfigSchema: {
             readonly additionalProperties: true;
             readonly required: readonly ["levels"];
             readonly properties: {
-                readonly failBuildIfBelowMinimum: {
+                readonly ignoreNonCompliant: {
                     readonly type: "boolean";
                     readonly default: false;
                 };
@@ -1881,9 +1878,6 @@ export declare const themeConfigSchema: {
                             readonly name: {
                                 readonly type: "string";
                             };
-                            readonly color: {
-                                readonly type: "string";
-                            };
                             readonly extends: {
                                 readonly type: "array";
                                 readonly items: {

package/lib/config.js

@@ -264,7 +264,7 @@ const scorecardConfigSchema = {
     additionalProperties: true,
     required: ['levels'],
     properties: {
-        failBuildIfBelowMinimum: { type: 'boolean', default: false },
+        ignoreNonCompliant: { type: 'boolean', default: false },
         teamMetadataProperty: {
             type: 'object',
             properties: {
@@ -280,7 +280,6 @@ const scorecardConfigSchema = {
                 required: ['name'],
                 properties: {
                     name: { type: 'string' },
-                    color: { type: 'string' },
                     extends: { type: 'array', items: { type: 'string' } },
                     rules: {
                         type: 'object',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.30.1-beta.1",
+  "version": "0.30.2",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",

package/src/components/Catalog/useCatalog.ts

@@ -299,12 +299,9 @@ function collectFilterOptions(
       }
     }
 
-    const options = Object.entries(usedOptions).map(([value, count]) => ({ value, count }));
-
-    if (!staticOptions) {
-      options.sort((a, b) => b.value.localeCompare(a.value));
-    }
-
+    const options = Object.entries(usedOptions)
+      .map(([value, count]) => ({ value, count }))
+      .sort((a, b) => b.value.localeCompare(a.value));
     if (othersCount) {
       options.push({
         value: filter.missingCategoryNameTranslationKey || filter.missingCategoryName || 'Others',

package/src/components/Filter/Filter.tsx

@@ -109,7 +109,7 @@ export function Filter({
         </>
       ) : (
         filter.filteredOptions.map((value: any) => {
-          const id = 'filter--' + filter.property + '--' + value.value;
+          const id = 'filter--' + filter.property + '--' + slug(value.value);
           return (
             <FilterOption key={id} role="link" onClick={() => filter.toggleOption(value.value)}>
               <CheckboxIcon checked={filter.selectedOptions.has(value.value)} />
@@ -210,6 +210,11 @@ const StyledSelect = styled(Select)`
   }
 `;
 
+// TODO: import from portal
+function slug(str: string): string {
+  return str.replace(/\s/g, '-').toLowerCase();
+}
+
 const DatePickerWrapper = styled.div`
   color: var(--filter-date-picker-color);
   display: flex;

package/src/components/Menu/MenuItemSwitch.tsx

@@ -19,7 +19,6 @@ export function MenuItemSwitch(props: PropsWithChildren<MenuItemProps>) {
     handleBack,
     handleExpand,
     isExpanded: drilldownIsExpanded,
-    prevActiveItem,
   } = useDrilldown(props);
 
   const { MenuGroup, handleGroupClick, isExpanded } = useMenuGroup(props.item);
@@ -52,7 +51,6 @@ export function MenuItemSwitch(props: PropsWithChildren<MenuItemProps>) {
           isExpanded={drilldownIsExpanded}
           back={handleBack}
           expand={handleExpand}
-          prevActiveItem={prevActiveItem}
         >
           {props.children}
         </Drilldown>

package/src/components/Scorecard/Card.tsx

@@ -1,10 +1,8 @@
 import styled from 'styled-components';
 
-export const ScorecardCard = styled.div.attrs({
-  'data-component-name': 'Scorecard/ScorecardCard',
-})`
+export const ScorecardCard = styled.div`
   color: var(--text-primary);
-  background-color: var(--bg-raised);
+  background-color: var(--thin-tile-background-color);
   border-radius: 4px;
 
   border: 1px solid var(--border-primary);

package/src/components/Scorecard/Gauge.tsx

@@ -1,27 +1,18 @@
 import * as React from 'react';
 import styled from 'styled-components';
-export interface GaugeProps {
+
+export function Gauge({
+  chunks,
+}: {
   chunks: {
     share: number;
     color: string;
-    title?: string;
   }[];
-  className?: string;
-}
-
-export function Gauge({ chunks, className }: GaugeProps) {
-  const title = chunks
-    .map((chunk) => chunk.title)
-    .filter(Boolean)
-    .join(', ');
+}) {
   return (
-    <GaugeWrapper
-      data-component-name="Scorecard/StatusByLevelWidget"
-      className={className}
-      title={title}
-    >
+    <GaugeWrapper>
       {chunks.map((chunk, i) => (
-        <GaugeChunk key={i} share={chunk.share} color={chunk.color} />
+        <GaugeChunk key={i} {...chunk} />
       ))}
     </GaugeWrapper>
   );

package/src/components/Scorecard/StatusByLevelWidget.tsx

@@ -7,13 +7,12 @@ import { ScorecardCard, ScorecardCardTitle } from '@theme/components/Scorecard/C
 export interface StatusByLevelWidgetProps {
   title: string;
   levels: { name: string; errors: number; warnings: number; total: number }[];
-  className?: string;
 }
 
 export function StatusByLevelWidget(props: StatusByLevelWidgetProps) {
-  const { levels, title, className } = props;
+  const { levels, title } = props;
   return (
-    <ScorecardCard data-component-name="Scorecard/StatusByLevelWidget" className={className}>
+    <ScorecardCard>
       <ScorecardCardTitle>{title}</ScorecardCardTitle>
       <CardBody>
         {levels.map((level) => {
@@ -26,17 +25,14 @@ export function StatusByLevelWidget(props: StatusByLevelWidgetProps) {
                   {
                     share: (success / level.total) * 100,
                     color: 'var(--scorecard-color-success)',
-                    title: `${success} passed`,
                   },
                   {
                     share: (level.warnings / level.total) * 100,
                     color: 'var(--scorecard-color-warning)',
-                    title: `${level.warnings} ${level.warnings === 1 ? 'warning' : 'warnings'}`,
                   },
                   {
                     share: (level.errors / level.total) * 100,
                     color: 'var(--scorecard-color-error)',
-                    title: `${level.errors} ${level.errors === 1 ? 'error' : 'errors'}`,
                   },
                 ]}
               />

package/src/components/Sidebar/DrilldownMenu.tsx

@@ -10,22 +10,17 @@ import { MenuLinkItem } from '@theme/components/Menu';
 export function DrilldownMenu({
   item,
   back,
-  prevActiveItem,
   children,
   className,
 }: React.PropsWithChildren<DrilldownMenuProps>): JSX.Element {
   const { translate } = useTranslate();
-  const label =
-    item.label === prevActiveItem?.label || !prevActiveItem?.label
-      ? translate('theme.sidebar.menu.backLabel', 'Back')
-      : prevActiveItem?.label;
 
   return (
     <MenuContainer data-component-name="Sidebar/DrilldownMenu" className={className}>
       <MenuContent>
         <MenuWrapper>
           <BackButton back={back} data-translation-key="theme.sidebar.menu.backLabel">
-            {label}
+            {translate('theme.sidebar.menu.backLabel', 'Back')}
           </BackButton>
           <MenuLinkItem item={item}>
             <DrilldownMenuItem item={item} />

package/src/components/Sidebar/types.ts

@@ -12,7 +12,6 @@ export interface ItemState extends NavItem {
 export interface DrilldownMenuProps {
   back: () => void;
   item: ItemState;
-  prevActiveItem?: ItemState;
   className?: string;
 }
 

package/src/config.ts

@@ -303,7 +303,7 @@ const scorecardConfigSchema = {
   additionalProperties: true,
   required: ['levels'],
   properties: {
-    failBuildIfBelowMinimum: { type: 'boolean', default: false },
+    ignoreNonCompliant: { type: 'boolean', default: false },
     teamMetadataProperty: {
       type: 'object',
       properties: {
@@ -319,7 +319,6 @@ const scorecardConfigSchema = {
         required: ['name'],
         properties: {
           name: { type: 'string' },
-          color: { type: 'string' },
           extends: { type: 'array', items: { type: 'string' } },
           rules: {
             type: 'object',