@bundle-stats/ui 4.13.0-beta.8 → 4.13.0-rc.0

package/src/components/bundle-packages/bundle-packages.jsx

@@ -5,7 +5,9 @@ import { COMPONENT, PACKAGE_FILTERS, PACKAGES_SEPARATOR, SECTIONS } from '@bundl
 
 import config from '../../config.json';
 import I18N from '../../i18n';
+import { Box } from '../../layout/box';
 import { FlexStack } from '../../layout/flex-stack';
+import { Stack } from '../../layout/stack';
 import { InputSearch } from '../../ui/input-search';
 import { EmptySet } from '../../ui/empty-set';
 import { Filters } from '../../ui/filters';
@@ -22,9 +24,13 @@ import { SEARCH_PLACEHOLDER } from './bundle-packages.i18n';
 import css from './bundle-packages.module.css';
 import { MetricsDisplaySelector } from '../metrics-display-selector';
 import { MetricsDisplayType } from '../../constants';
-import { MetricsTreemap } from '../metrics-treemap';
+import { MetricsTreemap, getTreemapNodes, getTreemapNodesGroupedByPath } from '../metrics-treemap';
 import { useMetricsDisplayType } from '../../hooks/metrics-display-type';
 
+const DISPLAY_TYPE_GROUPS = {
+  [MetricsDisplayType.TREEMAP]: ['folder'],
+};
+
 const getDropdownFilters = ({ compareMode, filters }) => ({
   [PACKAGE_FILTERS.CHANGED]: {
     label: 'Changed',
@@ -113,6 +119,60 @@ RowHeader.propTypes = {
   search: PropTypes.string,
 };
 
+const ViewMetricsTreemap = (props) => {
+  const { metricsTableTitle, jobs, items, displayType, emptyMessage, showEntryInfo, updateSearch } = props;
+
+  const treeNodes = useMemo(() => {
+    if (displayType.groupBy === 'folder') {
+      return getTreemapNodesGroupedByPath(items);
+    }
+
+    return getTreemapNodes(items);
+  }, [items, displayType.groupBy]);
+
+  const onGroupClick = useCallback(
+    (groupPath) => {
+      // Search by group path
+      // 1. use `^` to match only the string beggining
+      // 2. add `/` suffix to match only exact directories
+      // 3. if the group path is empty(root), clear search
+      if (groupPath) {
+        updateSearch(`^${groupPath}/`);
+      } else {
+        updateSearch('');
+      }
+    },
+    [updateSearch],
+  );
+
+  return (
+    <>
+      <Table compact>
+        <MetricsTableHeader metricTitle={metricsTableTitle} showSum jobs={jobs} rows={items} />
+      </Table>
+      <MetricsTreemap
+        treeNodes={treeNodes}
+        nested={Boolean(displayType.groupBy)}
+        emptyMessage={emptyMessage}
+        onItemClick={showEntryInfo}
+        onGroupClick={onGroupClick}
+      />
+    </>
+  );
+};
+
+ViewMetricsTreemap.propTypes = {
+  jobs: PropTypes.arrayOf(PropTypes.object).isRequired, // eslint-disable-line react/forbid-prop-types
+  items: PropTypes.arrayOf(PropTypes.object).isRequired, // eslint-disable-line react/forbid-prop-types
+  metricsTableTitle: PropTypes.node.isRequired,
+  displayType: PropTypes.shape({
+    groupBy: PropTypes.string,
+  }).isRequired,
+  emptyMessage: PropTypes.node.isRequired,
+  showEntryInfo: PropTypes.func.isRequired,
+  updateSearch: PropTypes.func.isRequired,
+};
+
 export const BundlePackages = (props) => {
   const {
     className,
@@ -137,7 +197,7 @@ export const BundlePackages = (props) => {
 
   const jobLabels = jobs?.map((job) => job?.label);
 
-  const [displayType, setDisplayType] = useMetricsDisplayType();
+  const [displayType, setDisplayType] = useMetricsDisplayType(DISPLAY_TYPE_GROUPS);
 
   const dropdownFilters = useMemo(
     () => getDropdownFilters({ compareMode: jobs?.length > 1, filters }),
@@ -191,12 +251,12 @@ export const BundlePackages = (props) => {
 
   return (
     <>
-      <section className={cx(css.root, className)}>
+      <Stack space="xsmall" as="section" className={cx(css.root, className)}>
         <Toolbar
           className={css.toolbar}
           renderActions={({ actionClassName }) => (
             <FlexStack space="xxsmall" className={cx(css.dropdown, actionClassName)}>
-              <MetricsDisplaySelector onSelect={setDisplayType} value={displayType} />
+              <MetricsDisplaySelector onSelect={setDisplayType} value={displayType.value} groupBy={displayType.groupBy} groups={DISPLAY_TYPE_GROUPS} />
               <MetricsTableOptions
                 handleViewAll={resetAllFilters}
                 handleResetFilters={resetFilters}
@@ -219,8 +279,8 @@ export const BundlePackages = (props) => {
             />
           </FlexStack>
         </Toolbar>
-        <main>
-          {displayType === MetricsDisplayType.TABLE && (
+        <Box outline as="main">
+          {displayType.value === MetricsDisplayType.TABLE && (
             <MetricsTable
               runs={jobs}
               items={items}
@@ -232,21 +292,18 @@ export const BundlePackages = (props) => {
               updateSort={updateSort}
             />
           )}
-          {displayType === MetricsDisplayType.TREEMAP && (
-            <>
-              <Table compact>
-                <MetricsTableHeader
-                  metricTitle={metricsTableTitle}
-                  showSum
-                  jobs={jobs}
-                  rows={items}
-                />
-              </Table>
-              <MetricsTreemap emptyMessage={emptyMessage} items={items} onItemClick={showEntryInfo} />
-            </>
+          {displayType.value === MetricsDisplayType.TREEMAP && (
+            <ViewMetricsTreemap
+              jobs={jobs}
+              items={items}
+              displayType={displayType}
+              emptyMessage={emptyMessage}
+              showEntryInfo={showEntryInfo}
+              updateSearch={updateSearch}
+            />
           )}
-        </main>
-      </section>
+        </Box>
+      </Stack>
       {entryItem && (
         <PackageInfo
           className={css.packageInfo}

package/src/components/bundle-packages/bundle-packages.module.css

@@ -2,14 +2,9 @@
   color: var(--color-text-light);
 }
 
-.toolbar {
-  border-bottom: 1px solid var(--color-outline);
-}
-
 .toolbarSearch {
   width: 100%;
   max-width: 240px;
-  margin-right: -1px; /** collapse border */
 }
 
 .hoverCard {

package/src/components/delta/delta.jsx

@@ -4,7 +4,7 @@ import cx from 'classnames';
 
 import css from './delta.module.css';
 
-export const Delta = ({ className, displayValue, deltaType, inverted }) => {
+export const Delta = ({ className = '', displayValue, deltaType, inverted = false }) => {
   const rootClassName = cx(css.root, className, inverted && css.inverted, css[deltaType]);
   return <span className={rootClassName}>{displayValue}</span>;
 };

package/src/components/delta/delta.module.css

@@ -4,6 +4,10 @@
   white-space: nowrap;
 }
 
+.CHANGE {
+  color: var(--color-info);
+}
+
 .HIGH_NEGATIVE {
   color: var(--color-red-dark);
 }
@@ -29,11 +33,16 @@
 }
 
 .inverted {
-  border-radius: var(--radius-small);
+  padding: 0 2px;
+  border-radius: var(--radius-xsmall);
   background-color: var(--color-gray-ultra-light);
   color: var(--color-light);
 }
 
+.inverted.CHANGE {
+  background: var(--color-info-light);
+}
+
 .inverted.HIGH_NEGATIVE {
   background: var(--color-red-dark);
 }

package/src/components/jobs-header/jobs-header.module.css

@@ -24,10 +24,6 @@
   background: linear-gradient(90deg, transparent, var(--color-background));
 }
 
-.item + .item {
-  margin-left: var(--space-small);
-}
-
 .item:first-child {
   border-left: 0;
   padding-left: 0;

package/src/components/metrics-display-selector/metrics-display-selector.module.css

@@ -1,10 +1,18 @@
-.button {
-  text-decoration: none;
+.buttonActive {
+  background: var(--color-highlight);
 }
 
-.buttonActive,
-.buttonActive:active,
-.buttonActive:focus {
-  color: var(--color-primary);
-  border-color: var(--color-primary);
+/* explicit ControlGroup last item styles to override ariakit injected sibling nodes */
+.itemLast {
+  border-top-right-radius: var(--radius-small) !important;
+  border-bottom-right-radius: var(--radius-small) !important;
+}
+
+.dropdownItemIcon {
+  opacity: 0;
+  transition: var(--transition-out);
+}
+
+.dropdownItemActive .dropdownItemIcon {
+  opacity: 1;
 }

package/src/components/metrics-display-selector/metrics-display-selector.stories.tsx

@@ -0,0 +1,33 @@
+import { action } from '@storybook/addon-actions'; // eslint-disable-line
+import { Meta, StoryObj } from '@storybook/react';
+
+import { MetricsDisplayType } from '../../constants';
+import { MetricsDisplaySelector } from '.';
+
+const meta: Meta<typeof MetricsDisplaySelector> = {
+  title: 'Components/MetricsDisplaySelector',
+  component: MetricsDisplaySelector,
+  args: {
+    onSelect: action('SELECT'),
+  },
+} as Meta;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    value: MetricsDisplayType.TABLE,
+  },
+};
+
+export const TreemapGroups: Story = {
+  args: {
+    value: MetricsDisplayType.TREEMAP,
+    groupBy: '',
+    groups: {
+      [MetricsDisplayType.TREEMAP]: ['folder'],
+    },
+  },
+};

package/src/components/metrics-display-selector/metrics-display-selector.tsx

@@ -2,46 +2,104 @@ import React from 'react';
 import cx from 'classnames';
 
 import { MetricsDisplayType } from '../../constants';
-import { FlexStack } from '../../layout/flex-stack';
 import { Button } from '../../ui/button';
+import { ControlGroup } from '../../ui/control-group';
+import { Dropdown, DropdownItem } from '../../ui/dropdown';
 import { Icon } from '../../ui/icon';
 import css from './metrics-display-selector.module.css';
+import { FlexStack } from '../../layout';
+
+const DEFAULT_GROUP_BY = '';
+
+const METRICS_DISPLAY_MAP = {
+  [MetricsDisplayType.TABLE]: {
+    glyph: Icon.ICONS.TABLE,
+    label: 'Table',
+  },
+  [MetricsDisplayType.TREEMAP]: {
+    glyph: Icon.ICONS.TREEMAP,
+    label: 'Treemap',
+  },
+};
+
+const displayTypes = Object.values(MetricsDisplayType);
 
 interface MetricsDisplaySelectorProps {
   value: MetricsDisplayType;
-  onSelect: (newValue: MetricsDisplayType) => void;
+  groupBy?: string;
+  groups?: Partial<Record<MetricsDisplayType, Array<string>>>;
+  onSelect: (newValue: MetricsDisplayType, groupBy?: string) => void;
 }
 
 export const MetricsDisplaySelector = (
   props: MetricsDisplaySelectorProps &
-    Omit<React.ComponentProps<typeof FlexStack>, 'onSelect' | 'value'>,
+    Omit<React.ComponentProps<typeof ControlGroup>, 'onSelect' | 'value'>,
 ) => {
-  const { className = '', value, onSelect, ...restProps } = props;
+  const { value, groupBy = DEFAULT_GROUP_BY, groups = {}, onSelect, ...restProps } = props;
 
   return (
-    <FlexStack space="xxsmall" as="nav" className={cx(css.root, className)} {...restProps}>
-      <Button
-        outline
-        active={value === MetricsDisplayType.TABLE}
-        size="small"
-        type="button"
-        glyph={Icon.ICONS.TABLE}
-        onClick={() => onSelect(MetricsDisplayType.TABLE)}
-        className={css.button}
-      >
-        Table
-      </Button>
-      <Button
-        outline
-        active={value === MetricsDisplayType.TREEMAP}
-        size="small"
-        type="button"
-        glyph={Icon.ICONS.TREEMAP}
-        onClick={() => onSelect(MetricsDisplayType.TREEMAP)}
-        className={cx(css.button)}
-      >
-        Treemap
-      </Button>
-    </FlexStack>
+    <ControlGroup {...restProps}>
+      {displayTypes.map((displayType, index) => {
+        const displayGroups = groups?.[displayType];
+        const displayProps = METRICS_DISPLAY_MAP[displayType];
+        const isLast = displayTypes.length - 1 === index;
+        const isActive = displayType === value;
+
+        if (!displayGroups || displayGroups.length === 0) {
+          return (
+            <Button
+              outline
+              active={isActive}
+              size="small"
+              type="button"
+              glyph={displayProps.glyph}
+              onClick={() => onSelect(displayType)}
+              className={isLast && css.itemLast}
+              key={displayType}
+            >
+              {displayProps.label}
+            </Button>
+          );
+        }
+
+        const displayGroupsData = [
+          {
+            value: DEFAULT_GROUP_BY,
+            label: 'No groups',
+          },
+          ...displayGroups.map((displayGroup) => ({
+            value: displayGroup,
+            label: `Group by ${displayGroup}`,
+          })),
+        ];
+
+        return (
+          <Dropdown
+            glyph={displayProps.glyph}
+            label={displayProps.label}
+            className={cx(isLast && css.itemLast, isActive && css.buttonActive)}
+            key={displayType}
+          >
+            {displayGroupsData.map((displayGroupData) => {
+              const isGroupActive = isActive && displayGroupData.value === groupBy;
+
+              return (
+                <DropdownItem
+                  onClick={() => onSelect(displayType, displayGroupData.value)}
+                  isActive={isGroupActive}
+                  className={cx(css.dropdownItem, isGroupActive && css.dropdownItemActive)}
+                  key={displayGroupData.value}
+                >
+                  <FlexStack space="xxxsmall" alignItems="center">
+                    <Icon glyph={Icon.ICONS.CHECK} size="small" className={css.dropdownItemIcon} />
+                    <span>{displayGroupData.label}</span>
+                  </FlexStack>
+                </DropdownItem>
+              );
+            })}
+          </Dropdown>
+        );
+      })}
+    </ControlGroup>
   );
 };

package/src/components/metrics-table-header/metrics-table-header.module.css

@@ -1,9 +1,16 @@
 /* columns */
-.root .metricName {
+.root .col {
+  padding-top: var(--space-xxsmall);
+  padding-bottom: var(--space-xxsmall);
+}
+
+.root .metric {
   width: 55%;
+  vertical-align: middle;
 }
 
 .root .job {
+  padding-top: var(--space-xxsmall);
   text-align: right;
 }
 
@@ -30,13 +37,13 @@
 }
 
 /* columns overrides for showHeaderSum */
-.showHeaderSum .headerRow .job {
+.showHeaderSum .job {
   border-bottom: 0;
   padding-bottom: 0;
 }
 
-.showHeaderSum .headerRow .sum {
-  padding-top: var(--space-xxxsmall);
+.showHeaderSum .sum {
+  padding-top: 0;
   font-size: var(--size-small);
   vertical-align: middle;
   text-transform: none;

package/src/components/metrics-table-header/metrics-table-header.tsx

@@ -34,7 +34,7 @@ const JobColumn = ({ job, isBaseline }: JobColumnProps) => {
   }
 
   return (
-    <Table.Th className={css.job} colSpan={colSpan}>
+    <Table.Th className={cx(css.col, css.job)} colSpan={colSpan}>
       <JobName
         title={isBaseline ? I18N.BASELINE_TITLE : I18N.CURRENT_TITLE}
         internalBuildNumber={internalBuildNumber}
@@ -65,7 +65,7 @@ const SumColumn = ({ rows, isBaseline, runIndex, updateSort, sort }: ColumnSumPr
 
   return (
     <>
-      <Table.Th className={cx(css.value, css.sum)}>
+      <Table.Th className={cx(css.col, css.value, css.sum)}>
         <SortButton
           fieldPath={fieldPath}
           fieldName="value"
@@ -78,7 +78,7 @@ const SumColumn = ({ rows, isBaseline, runIndex, updateSort, sort }: ColumnSumPr
       </Table.Th>
       {!isBaseline && (
         <>
-          <Table.Th className={cx(css.delta, css.sum)}>
+          <Table.Th className={cx(css.col, css.delta, css.sum)}>
             <SortButton
               fieldPath={fieldPath}
               fieldName="delta"
@@ -91,7 +91,7 @@ const SumColumn = ({ rows, isBaseline, runIndex, updateSort, sort }: ColumnSumPr
               )}
             </SortButton>
           </Table.Th>
-          <Table.Th className={cx(css.delta, css.deltaPercentage, css.sum)}>
+          <Table.Th className={cx(css.col, css.delta, css.deltaPercentage, css.sum)}>
             <SortButton
               fieldPath={fieldPath}
               fieldName="deltaPercentage"
@@ -146,8 +146,8 @@ export const MetricsTableHeader = (
 
   return (
     <Table.THead className={rootClassName}>
-      <Table.Tr className={css.headerRow}>
-        <Table.Th className={css.metricName} rowSpan={showSum ? 2 : 1}>
+      <Table.Tr>
+        <Table.Th className={cx(css.col, css.metric)} rowSpan={showSum ? 2 : 1}>
           {metricTitle || ' '}
         </Table.Th>
         {jobs.map((job, runIndex) => (
@@ -155,7 +155,7 @@ export const MetricsTableHeader = (
         ))}
       </Table.Tr>
       {showSum && (
-        <Table.Tr className={css.headerRow}>
+        <Table.Tr>
           {jobs.map((_, runIndex) => (
             <SumColumn
               rows={rows}

package/src/components/metrics-table-options/metrics-table-options.jsx

@@ -2,23 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import I18N from '../../i18n';
-import { Dropdown } from '../../ui/dropdown';
+import { Dropdown, DropdownItem } from '../../ui/dropdown';
 
 export const MetricsTableOptions = (props) => {
-  const { className,  handleViewAll, handleResetFilters, ...restProps } = props;
+  const { className, handleViewAll, handleResetFilters, ...restProps } = props;
 
   return (
     <Dropdown className={className} glyph="more-vertical" {...restProps}>
       {handleResetFilters && (
-        <Dropdown.Item onClick={handleResetFilters}>
-          {I18N.RESET_FILTERS}
-        </Dropdown.Item>
-      )}
-      {handleViewAll && (
-        <Dropdown.Item onClick={handleViewAll}>
-          {I18N.VIEW_ALL}
-        </Dropdown.Item>
+        <DropdownItem onClick={handleResetFilters}>{I18N.RESET_FILTERS}</DropdownItem>
       )}
+      {handleViewAll && <DropdownItem onClick={handleViewAll}>{I18N.VIEW_ALL}</DropdownItem>}
     </Dropdown>
   );
 };

package/src/components/metrics-table-title/metrics-table-title.jsx

@@ -15,7 +15,7 @@ export const MetricsTableTitle = (props) => {
   const rootClassName = cx(css.root, className);
 
   return (
-    <Stack space="xxxsmall" className={rootClassName}>
+    <Stack space="none" className={rootClassName}>
       <FlexStack space="xxxsmall" alignItems="center" as="h3" className={css.title}>
         <span>{title}</span>
 

package/src/components/metrics-table-title/metrics-table-title.module.css

@@ -19,6 +19,7 @@
 }
 
 .info {
+  font-size: var(--size-small);
   font-family: var(--font-family-fixed);
   font-weight: normal;
 }