@bundle-stats/ui 4.0.0-rc.5 → 4.0.0

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

@@ -27,6 +27,19 @@ import { MetricsTableOptions } from '../metrics-table-options';
 import { MetricsTableTitle } from '../metrics-table-title';
 import css from './bundle-packages.module.css';
 
+const getDropdownFilters = ({ compareMode, filters }) => ({
+  [PACKAGE_FILTERS.CHANGED]: {
+    label: 'Changed',
+    defaultValue: filters[PACKAGE_FILTERS.CHANGED],
+    disabled: !compareMode,
+  },
+  [PACKAGE_FILTERS.DUPLICATE]: {
+    label: 'Duplicate',
+    defaultValue: filters[PACKAGE_FILTERS.DUPLICATE],
+  },
+});
+
+
 const PackagePopoverContent = ({ name, fullName, path, duplicate, CustomComponentLink }) => {
   const fallbackPackagePath = `node_modules/${fullName.split(PACKAGES_SEPARATOR).join('/node_modules/')}`;
   const normalizedPackagePath = `${path || fallbackPackagePath}/`;
@@ -208,20 +221,34 @@ export const BundlePackages = (props) => {
     customComponentLink: CustomComponentLink,
   } = props;
 
-  const emptyMessage = (
-    <EmptySet
-      resources="packages"
-      filtered={totalRowCount !== 0}
-      handleResetFilters={resetFilters}
-      handleViewAll={resetAllFilters}
-    />
+  const dropdownFilters = useMemo(
+    () => getDropdownFilters({ compareMode: jobs?.length > 1, filters }),
+    [jobs, filters],
   );
 
+  const metricsTableTitle = useMemo(() => (
+    <MetricsTableTitle
+      title={I18N.PACKAGES}
+      info={`${items.length}/${totalRowCount}`}
+      popoverInfo={I18N.PACKAGES_INFO}
+      popoverHref={config.documentation.packages}
+    />
+  ), [items, totalRowCount]);
+
   const renderRowHeader = useCallback(
     (row) => <RowHeader row={row} CustomComponentLink={CustomComponentLink} />,
     [CustomComponentLink],
   );
 
+  const emptyMessage = useMemo(() => (
+    <EmptySet
+      resources="packages"
+      filtered={totalRowCount !== 0}
+      handleResetFilters={resetFilters}
+      handleViewAll={resetAllFilters}
+    />
+  ), [totalRowCount, resetFilters, resetAllFilters]);
+
   return (
     <section className={cx(css.root, className)}>
       <Toolbar
@@ -244,17 +271,7 @@ export const BundlePackages = (props) => {
             updateSearch={updateSearch}
           />
           <Filters
-            filters={{
-              [PACKAGE_FILTERS.CHANGED]: {
-                label: 'Changed',
-                defaultValue: filters[PACKAGE_FILTERS.CHANGED],
-                disabled: jobs.length <= 1,
-              },
-              [PACKAGE_FILTERS.DUPLICATE]: {
-                label: 'Duplicate',
-                defaultValue: filters[PACKAGE_FILTERS.DUPLICATE],
-              },
-            }}
+            filters={dropdownFilters}
             label={`Filters (${items.length}/${totalRowCount})`}
             onChange={updateFilters}
             hasActiveFilters={hasActiveFilters}
@@ -268,14 +285,7 @@ export const BundlePackages = (props) => {
           emptyMessage={emptyMessage}
           renderRowHeader={renderRowHeader}
           showHeaderSum
-          title={
-            <MetricsTableTitle
-              title={I18N.PACKAGES}
-              info={`(${items.length}/${totalRowCount})`}
-              popoverInfo={I18N.PACKAGES_INFO}
-              popoverHref={config.documentation.packages}
-            />
-          }
+          title={metricsTableTitle}
         />
       </main>
     </section>

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

@@ -14,24 +14,26 @@ export const MetricsTableTitle = (props) => {
   const rootClassName = cx(css.root, className);
 
   return (
-    <FlexStack space="xxxsmall" className={rootClassName}>
-      <span>{title}</span>
-      {info && <span className={css.info}>{info}</span>}
-      {(popoverInfo || popoverHref) && (
-        <HoverCard label={<Icon glyph="help" />}>
-          <Stack space="xxxsmall">
-            {popoverInfo && <p>{popoverInfo}</p>}
-            {popoverHref && (
-              <p>
-                <button type="button" onClick={() => window.open(popoverHref)} className={css.readMoreLink}>
-                  {I18N.READ_MORE}
-                </button>
-              </p>
-            )}
-          </Stack>
-        </HoverCard>
-      )}
-    </FlexStack>
+    <Stack className={rootClassName}>
+      <FlexStack space="xxxsmall" className={css.title}>
+        <span>{title}</span>
+        {(popoverInfo || popoverHref) && (
+          <HoverCard label={<Icon glyph="help" />} className={css.hoverCard}>
+            <Stack space="xxxsmall">
+              {popoverInfo && <p>{popoverInfo}</p>}
+              {popoverHref && (
+                <p>
+                  <button type="button" onClick={() => window.open(popoverHref)} className={css.readMoreLink}>
+                    {I18N.READ_MORE}
+                  </button>
+                </p>
+              )}
+            </Stack>
+          </HoverCard>
+        )}
+      </FlexStack>
+      {info && <p className={css.info}>{info}</p>}
+    </Stack>
   );
 };
 

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

@@ -1,14 +1,20 @@
 .root {
+}
+
+.title {
+  color: var(--color-text-light);
   align-items: center;
   font-weight: bold;
-  line-height: var(--space-small);
   text-transform: uppercase;
-  color: var(--color-text-light);
+}
+
+.hoverCard {
+  line-height: 1;
 }
 
 .info {
+  font-size: var(--size-xsmall);
   font-weight: normal;
-  text-transform: none;
 }
 
 .readMoreLink {

package/src/ui/filters/filters.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { get, map } from 'lodash';
+import { get } from 'lodash';
 
 import { FlexStack } from '../../layout/flex-stack';
 import { Dropdown } from '../dropdown';
@@ -58,8 +58,8 @@ const FilterGroup = (props) => {
   const groupCheckboxes = groupItems.filter(
     ([itemKey, item]) => typeof item?.defaultValue !== 'undefined',
   );
-  const isGroupChecked = groupCheckboxes
-    .map(([itemKey]) => get(values, `${groupKey}.${itemKey}`))
+  const areAllGroupItemsChecked = groupCheckboxes
+    .map(([itemKey]) => values?.[`${groupKey}.${itemKey}`])
     .reduce((agg, val) => agg && val, true);
 
   const filterSuffix = getGroupFiltersLabelSuffix(groupItems);
@@ -123,7 +123,7 @@ const FilterGroup = (props) => {
               })}
             </div>
             <div className={css.filterGroupActions}>
-              {isGroupChecked ? (
+              {areAllGroupItemsChecked ? (
                 <MenuItem
                   id="clear-all"
                   as="button"

package/src/ui/filters/filters.utils.js

@@ -64,3 +64,24 @@ export const getGroupFiltersLabelSuffix = (filters) => {
 
   return `${suffix}${skippedLabels > 0 ? ` +${skippedLabels}` : ''}`;
 };
+
+export const getInitialValues = (key, filters) => {
+  if (typeof filters?.defaultValue !== 'undefined') {
+    return {
+      [key]: filters.defaultValue,
+    };
+  }
+
+  if (typeof filters === 'object') {
+    return Object.entries(filters).map(([groupKey, groupFilters]) => getInitialValues(
+      [...key ? [key] : [], groupKey].join('.'),
+      groupFilters,
+    )).reduce((agg, current) => ({
+      ...agg,
+      ...current,
+    }), {});
+  }
+
+  return {};
+};
+

package/src/ui/filters/index.jsx

@@ -0,0 +1,72 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { isEqual, merge } from 'lodash';
+
+import { getInitialValues } from './filters.utils';
+import { Filters as BaseComponent } from './filters';
+
+export const Filters = (props) => {
+  const { onChange, filters, ...restProps } = props;
+  const [values, setValues] = useState(getInitialValues('', filters));
+
+  // Update values when the parent filters are changing (route with query string change)
+  useEffect(
+    () => {
+      const parentValues = getInitialValues('', filters);
+
+      if (isEqual(parentValues, values)) {
+        return;
+      }
+
+      setValues(parentValues);
+    },
+    // Do not trigger effect when the values are changing locally
+    [filters, setValues],
+  );
+
+  const toggleFilter = useCallback(
+    (key, value) => {
+      const nextValues = merge({}, values, { [key]: value });
+      setValues(nextValues);
+
+      if (onChange) {
+        onChange(nextValues);
+      }
+    },
+    [onChange, setValues, values]
+  );
+
+  const toggleFilters = useCallback(
+    (newFilters) => {
+      const nextValues = merge({}, values, newFilters);
+      setValues(nextValues);
+
+      if (onChange) {
+        onChange(nextValues);
+      }
+    },
+    [onChange, setValues, values],
+  );
+
+  return (
+    <BaseComponent
+      {...restProps}
+      filters={filters}
+      values={values}
+      toggleFilter={toggleFilter}
+      toggleFilters={toggleFilters}
+    />
+  );
+};
+
+Filters.defaultProps = {
+  onChange: null,
+};
+
+Filters.propTypes = {
+  /** Filter config */
+  filters: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+
+  /** OnChange handler */
+  onChange: PropTypes.func,
+};

package/lib/ui/filters/filters.container.js

@@ -1,187 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.filtersDropdownContainer = void 0;
-
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _excluded = ["values"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-var getInitialValues = function getInitialValues(key, filters) {
-  if (typeof (filters === null || filters === void 0 ? void 0 : filters.defaultValue) !== 'undefined') {
-    return _defineProperty({}, key, filters.defaultValue);
-  }
-
-  if (_typeof(filters) === 'object') {
-    return Object.entries(filters).map(function (_ref2) {
-      var _ref3 = _slicedToArray(_ref2, 2),
-          groupKey = _ref3[0],
-          groupFilters = _ref3[1];
-
-      return getInitialValues([].concat(_toConsumableArray(key ? [key] : []), [groupKey]).join('.'), groupFilters);
-    }).reduce(function (agg, current) {
-      return _objectSpread(_objectSpread({}, agg), current);
-    }, {});
-  }
-
-  return {};
-};
-
-var filtersDropdownContainer = function filtersDropdownContainer(BaseComponent) {
-  var FiltersContainer = /*#__PURE__*/function (_React$Component) {
-    _inherits(FiltersContainer, _React$Component);
-
-    var _super = _createSuper(FiltersContainer);
-
-    function FiltersContainer(props) {
-      var _this;
-
-      _classCallCheck(this, FiltersContainer);
-
-      _this = _super.call(this, props);
-
-      _defineProperty(_assertThisInitialized(_this), "toggleFilter", function (key, value) {
-        return _this.setState(function (_ref4) {
-          var values = _ref4.values,
-              state = _objectWithoutProperties(_ref4, _excluded);
-
-          var newState = _objectSpread(_objectSpread({}, state), {}, {
-            values: _objectSpread(_objectSpread({}, values), {}, _defineProperty({}, key, value))
-          });
-
-          var onChange = _this.props.onChange;
-
-          if (onChange) {
-            onChange(newState.values);
-          }
-
-          return newState;
-        });
-      });
-
-      _defineProperty(_assertThisInitialized(_this), "toggleFilters", function (newFilters) {
-        return _this.setState(function (prevState) {
-          var newState = _objectSpread(_objectSpread({}, prevState), {}, {
-            values: _objectSpread(_objectSpread({}, prevState.values), newFilters)
-          });
-
-          var onChange = _this.props.onChange;
-
-          if (onChange) {
-            onChange(newState.values);
-          }
-
-          return newState;
-        });
-      });
-
-      var filters = _this.props.filters;
-      _this.state = {
-        values: getInitialValues('', filters)
-      };
-      return _this;
-    }
-
-    _createClass(FiltersContainer, [{
-      key: "render",
-      value: function render() {
-        return /*#__PURE__*/_react["default"].createElement(BaseComponent, _extends({}, this.props, this.state, {
-          toggleFilter: this.toggleFilter,
-          toggleFilters: this.toggleFilters
-        }));
-      }
-    }], [{
-      key: "getDerivedStateFromProps",
-      value: function getDerivedStateFromProps(_ref5, state) {
-        var filters = _ref5.filters;
-
-        if ((0, _isEqual2["default"])(filters, state.values)) {
-          return null;
-        }
-
-        return {
-          values: getInitialValues('', filters)
-        };
-      }
-    }]);
-
-    return FiltersContainer;
-  }(_react["default"].Component);
-
-  FiltersContainer.defaultProps = {
-    onChange: null
-  };
-  FiltersContainer.propTypes = {
-    /** Filter config */
-    filters: _propTypes["default"].object.isRequired,
-    // eslint-disable-line react/forbid-prop-types
-
-    /** OnChange handler */
-    onChange: _propTypes["default"].func
-  };
-  return FiltersContainer;
-};
-
-exports.filtersDropdownContainer = filtersDropdownContainer;

package/lib-esm/ui/filters/filters.container.js

@@ -1,111 +0,0 @@
-import _isEqual from "lodash/isEqual";
-
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const getInitialValues = (key, filters) => {
-  if (typeof (filters == null ? void 0 : filters.defaultValue) !== 'undefined') {
-    return {
-      [key]: filters.defaultValue
-    };
-  }
-
-  if (typeof filters === 'object') {
-    return Object.entries(filters).map(_ref => {
-      let [groupKey, groupFilters] = _ref;
-      return getInitialValues([...(key ? [key] : []), groupKey].join('.'), groupFilters);
-    }).reduce((agg, current) => ({ ...agg,
-      ...current
-    }), {});
-  }
-
-  return {};
-};
-
-export const filtersDropdownContainer = BaseComponent => {
-  class FiltersContainer extends React.Component {
-    constructor(props) {
-      super(props);
-      const {
-        filters
-      } = this.props;
-      this.state = {
-        values: getInitialValues('', filters)
-      };
-    }
-
-    static getDerivedStateFromProps(_ref2, state) {
-      let {
-        filters
-      } = _ref2;
-
-      if (_isEqual(filters, state.values)) {
-        return null;
-      }
-
-      return {
-        values: getInitialValues('', filters)
-      };
-    }
-
-    toggleFilter = (key, value) => this.setState(_ref3 => {
-      let {
-        values,
-        ...state
-      } = _ref3;
-      const newState = { ...state,
-        values: { ...values,
-          [key]: value
-        }
-      };
-      const {
-        onChange
-      } = this.props;
-
-      if (onChange) {
-        onChange(newState.values);
-      }
-
-      return newState;
-    });
-    toggleFilters = newFilters => this.setState(prevState => {
-      const newState = { ...prevState,
-        values: { ...prevState.values,
-          ...newFilters
-        }
-      };
-      const {
-        onChange
-      } = this.props;
-
-      if (onChange) {
-        onChange(newState.values);
-      }
-
-      return newState;
-    });
-
-    render() {
-      return /*#__PURE__*/React.createElement(BaseComponent, _extends({}, this.props, this.state, {
-        toggleFilter: this.toggleFilter,
-        toggleFilters: this.toggleFilters
-      }));
-    }
-
-  }
-
-  FiltersContainer.defaultProps = {
-    onChange: null
-  };
-  FiltersContainer.propTypes = {
-    /** Filter config */
-    filters: PropTypes.object.isRequired,
-    // eslint-disable-line react/forbid-prop-types
-
-    /** OnChange handler */
-    onChange: PropTypes.func
-  };
-  return FiltersContainer;
-};