@truedat/core 4.40.7 → 4.40.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.40.10] 2022-03-21
+
+### Changed
+
+- [TD-4447] Default message for filters now strips any prefix
+
 ## [4.40.0] 2022-03-07
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.40.7",
+  "version": "4.40.10",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -32,7 +32,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.40.5",
+    "@truedat/test": "4.40.10",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "57ce60d30f6238ab63207ae402dfc0bc0e5c934a"
+  "gitHead": "2a753ab01d2f856c32336cebc938b83f4bc97ea6"
 }

package/src/components/AvailableFilters.js

@@ -5,12 +5,14 @@ import { Dropdown } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { i18nOrder } from "../services/sort";
 
+const removePrefix = _.replace(/^.*\./, "");
+
 export const AvailableFilters = ({
   addFilter,
   disabled,
   filters,
   loading,
-  resetFilters
+  resetFilters,
 }) => {
   const { formatMessage } = useIntl();
   return (
@@ -38,12 +40,12 @@ export const AvailableFilters = ({
         {_.flow(
           _.defaultTo([]),
           _.sortBy(i18nOrder(formatMessage, "filters")),
-          _.map(filter => (
+          _.map((filter) => (
             <Dropdown.Item
               key={filter}
               text={formatMessage({
                 id: `filters.${filter}`,
-                defaultMessage: filter
+                defaultMessage: removePrefix(filter),
               })}
               onClick={() => addFilter({ filter })}
             />
@@ -59,7 +61,7 @@ AvailableFilters.propTypes = {
   disabled: PropTypes.bool,
   filters: PropTypes.array,
   resetFilters: PropTypes.func,
-  loading: PropTypes.bool
+  loading: PropTypes.bool,
 };
 
 export default AvailableFilters;

package/src/components/FilterDropdown.js

@@ -4,9 +4,10 @@ import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { Label, Icon, Dropdown, Dimmer, Loader } from "semantic-ui-react";
 import { accentInsensitivePathOrder } from "../services/sort";
-
 import FilterItem from "./FilterItem";
 
+const removePrefix = _.replace(/^.*\./, "");
+
 export const FilterDropdown = ({
   activeValues,
   closeFilter,
@@ -25,7 +26,10 @@ export const FilterDropdown = ({
     upward={false}
     trigger={
       <Label key={filter}>
-        <FormattedMessage id={`filters.${filter}`} defaultMessage={filter} />
+        <FormattedMessage
+          id={`filters.${filter}`}
+          defaultMessage={removePrefix(filter)}
+        />
         <Icon
           name="delete"
           onClick={(e) => {

package/src/routes.js

@@ -86,15 +86,20 @@ export const PROFILE_EXECUTION =
   "/profileGroups/:group_id/profileExecutions/:id";
 export const PROFILE_GROUP = "/profileGroups/:id";
 export const QUALITY_DASHBOARD = "/quality_dashboard";
+export const REMEDIATION_PLAN = "/rule_results/:rule_result_id/remediation";
+export const REMEDIATION_EDIT =
+  "/rules/:id/implementations/:implementation_id/ruleResults/:rule_result_id/remediation/edit";
+export const REMEDIATION_NEW =
+  "/rules/:id/implementations/:implementation_id/ruleResults/:rule_result_id/remediation/new";
 export const ROLE = "/roles/:id";
 export const ROLES = "/roles";
 export const ROLES_NEW = "/roles/new";
-export const RULE = "/rules/:id";
+export const RULE = "/rules/:id(\\d+)";
 export const RULES = "/rules";
 export const RULE_EDIT = "/rules/:id/edit";
 export const RULE_EVENTS = "/rules/:id/events";
 export const RULE_IMPLEMENTATION =
-  "/rules/:id/implementations/:implementation_id";
+  "/rules/:id/implementations/:implementation_id(\\d+)";
 export const RULE_IMPLEMENTATIONS = "/rules/:id/implementations";
 export const RULE_IMPLEMENTATION_EVENTS =
   "/rules/:id/implementations/:implementation_id/events";
@@ -238,6 +243,9 @@ const routes = {
   PROFILE_EXECUTION,
   PROFILE_GROUP,
   QUALITY_DASHBOARD,
+  REMEDIATION_PLAN,
+  REMEDIATION_EDIT,
+  REMEDIATION_NEW,
   ROLE,
   ROLES_NEW,
   ROLES,