@redocly/theme 0.25.0 → 0.25.1-beta.4

package/lib/components/Catalog/useCatalog.js

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

package/lib/components/Filter/Filter.js

@@ -56,7 +56,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 + '--' + slug(value.value);
+            const id = 'filter--' + filter.property + '--' + 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)),
@@ -137,10 +137,6 @@ 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/Scorecard/Card.d.ts

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

package/lib/components/Scorecard/Card.js

@@ -5,9 +5,11 @@ 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 `
+exports.ScorecardCard = styled_components_1.default.div.attrs({
+    'data-component-name': 'Scorecard/ScorecardCard',
+}) `
   color: var(--text-primary);
-  background-color: var(--thin-tile-background-color);
+  background-color: var(--bg-raised);
   border-radius: 4px;
 
   border: 1px solid var(--border-primary);

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

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

package/lib/components/Scorecard/Gauge.js

@@ -29,8 +29,12 @@ 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, }) {
-    return (React.createElement(GaugeWrapper, null, chunks.map((chunk, i) => (React.createElement(GaugeChunk, Object.assign({ key: i }, chunk))))));
+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 })))));
 }
 exports.Gauge = Gauge;
 exports.GaugeValue = styled_components_1.default.span `

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

@@ -7,5 +7,6 @@ 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 } = props;
-    return (React.createElement(Card_1.ScorecardCard, null,
+    const { levels, title, className } = props;
+    return (React.createElement(Card_1.ScorecardCard, { "data-component-name": "Scorecard/StatusByLevelWidget", className: className },
         React.createElement(Card_1.ScorecardCardTitle, null, title),
         React.createElement(CardBody, null, levels.map((level) => {
             const success = level.total - level.errors - level.warnings;
@@ -43,14 +43,17 @@ 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/config.d.ts

@@ -309,6 +309,9 @@ declare const scorecardConfigSchema: {
                     readonly name: {
                         readonly type: "string";
                     };
+                    readonly color: {
+                        readonly type: "string";
+                    };
                     readonly extends: {
                         readonly type: "array";
                         readonly items: {
@@ -1862,6 +1865,9 @@ 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

@@ -280,6 +280,7 @@ 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.25.0",
+  "version": "0.25.1-beta.4",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",

package/src/components/Catalog/useCatalog.ts

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

package/src/components/Filter/Filter.tsx

@@ -111,7 +111,7 @@ export function Filter({
         </>
       ) : (
         filter.filteredOptions.map((value: any) => {
-          const id = 'filter--' + filter.property + '--' + slug(value.value);
+          const id = 'filter--' + filter.property + '--' + value.value;
           return (
             <FilterOption key={id} role="link" onClick={() => filter.toggleOption(value.value)}>
               <CheckboxIcon checked={filter.selectedOptions.has(value.value)} />
@@ -212,11 +212,6 @@ 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/Scorecard/Card.tsx

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

package/src/components/Scorecard/Gauge.tsx

@@ -1,18 +1,27 @@
 import * as React from 'react';
 import styled from 'styled-components';
-
-export function Gauge({
-  chunks,
-}: {
+export interface GaugeProps {
   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>
+    <GaugeWrapper
+      data-component-name="Scorecard/StatusByLevelWidget"
+      className={className}
+      title={title}
+    >
       {chunks.map((chunk, i) => (
-        <GaugeChunk key={i} {...chunk} />
+        <GaugeChunk key={i} share={chunk.share} color={chunk.color} />
       ))}
     </GaugeWrapper>
   );

package/src/components/Scorecard/StatusByLevelWidget.tsx

@@ -7,12 +7,13 @@ 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 } = props;
+  const { levels, title, className } = props;
   return (
-    <ScorecardCard>
+    <ScorecardCard data-component-name="Scorecard/StatusByLevelWidget" className={className}>
       <ScorecardCardTitle>{title}</ScorecardCardTitle>
       <CardBody>
         {levels.map((level) => {
@@ -25,14 +26,17 @@ 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/config.ts

@@ -319,6 +319,7 @@ const scorecardConfigSchema = {
         required: ['name'],
         properties: {
           name: { type: 'string' },
+          color: { type: 'string' },
           extends: { type: 'array', items: { type: 'string' } },
           rules: {
             type: 'object',