@truedat/core 4.50.2 → 4.51.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [4.51.0] 2022-09-13
+
+### Added
+
+- [TD-3415] Routes, i18n and navigation item for execution groups
+
+## [4.50.3] 2022-08-29
+
+### Changed
+
+- [TD-5091] Dynamic `domain` fields are now integer ids instead of embedded
+  documents
+
 ## [4.49.4] 2022-07-29
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.50.2",
+  "version": "4.51.0",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "5785ca8828b3c25947e8d2587c909f729fbee317"
+  "gitHead": "a3d9290433e773d9c605d9a0d9fa51908c5becad"
 }

package/src/api/queries.js

@@ -4,6 +4,7 @@ export const DOMAINS_QUERY = gql`
   query DomainsQuery($action: String!, $domainActions: [String!]) {
     domains(action: $action) {
       id
+      externalId
       name
       parentId
       actions(actions: $domainActions)

package/src/components/FilterItem.js

@@ -26,10 +26,12 @@ export const FilterItem = ({
   active,
   filter,
   toggleFilterValue,
-  option: { text, value }
+  option: { text, value },
 }) => (
   <Dropdown.Item
-    onClick={e => preventDefault(e, () => toggleFilterValue({ filter, value }))}
+    onClick={(e) =>
+      preventDefault(e, () => toggleFilterValue({ filter, value }))
+    }
     active={active}
   >
     <Icon name={active ? "check square outline" : "square outline"} />
@@ -41,7 +43,7 @@ FilterItem.propTypes = {
   active: PropTypes.bool,
   filter: PropTypes.string,
   toggleFilterValue: PropTypes.func,
-  option: PropTypes.object
+  option: PropTypes.object,
 };
 
 export default FilterItem;

package/src/components/QualityMenu.js

@@ -4,10 +4,11 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useAuthorized } from "../hooks";
 import {
-  RULES,
-  QUALITY_DASHBOARD,
+  EXECUTION_GROUPS,
   IMPLEMENTATIONS,
   IMPLEMENTATIONS_PENDING,
+  QUALITY_DASHBOARD,
+  RULES,
 } from "../routes";
 import { getQualityDashboardConfig } from "../selectors";
 import Submenu from "./Submenu";
@@ -20,6 +21,7 @@ export const ITEMS = [
     routes: [IMPLEMENTATIONS_PENDING],
     groups: ["quality_implementation_workflow_management"],
   },
+  { name: "executions", routes: [EXECUTION_GROUPS], groups: ["quality"] },
   {
     name: "quality_dashboard",
     routes: [QUALITY_DASHBOARD],

package/src/components/SelectedFilters.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import FilterDropdown from "./FilterDropdown";

package/src/components/TreeSelector.js

@@ -49,8 +49,10 @@ const labelValues = _.cond([
 ]);
 
 export const TreeSelector = ({
+  check = false,
   error,
   label,
+  labels = false,
   multiple = false,
   name,
   onBlur,
@@ -113,13 +115,15 @@ export const TreeSelector = ({
     ({ id, level }) => level === 0 || _.includes(id)(displayed)
   );
 
-  const trigger = (
+  const trigger = labels ? (
     <SelectedLabels
       placeholder={placeholder}
       options={options}
       onClick={handleClick}
       value={labelValues(value)}
     />
+  ) : (
+    <label>{placeholder}</label>
   );
 
   const items = _.flow(
@@ -128,7 +132,7 @@ export const TreeSelector = ({
     _.map((option) => (
       <DropdownMenuItem
         key={option?.id}
-        check={false}
+        check={check}
         onOpen={handleOpen}
         onClick={handleClick}
         open={_.contains(option.id)(open)}
@@ -175,8 +179,10 @@ export const TreeSelector = ({
 };
 
 TreeSelector.propTypes = {
+  check: PropTypes.bool,
   error: PropTypes.bool,
   label: PropTypes.string,
+  labels: PropTypes.bool,
   multiple: PropTypes.bool,
   name: PropTypes.string,
   onBlur: PropTypes.func,

package/src/components/__tests__/DomainSelector.spec.js

@@ -12,10 +12,34 @@ const domainsMock = {
   result: {
     data: {
       domains: [
-        { __typename: "Domain", id: "1", name: "foo", parentId: null },
-        { __typename: "Domain", id: "2", name: "bar", parentId: "1" },
-        { __typename: "Domain", id: "3", name: "baz", parentId: "2" },
-        { __typename: "Domain", id: "4", name: "xyzzy", parentId: "99" },
+        {
+          __typename: "Domain",
+          id: "1",
+          name: "foo",
+          externalId: "A",
+          parentId: null,
+        },
+        {
+          __typename: "Domain",
+          id: "2",
+          name: "bar",
+          externalId: "B",
+          parentId: "1",
+        },
+        {
+          __typename: "Domain",
+          id: "3",
+          name: "baz",
+          externalId: "C",
+          parentId: "2",
+        },
+        {
+          __typename: "Domain",
+          id: "4",
+          name: "xyzzy",
+          externalId: "D",
+          parentId: "99",
+        },
       ],
     },
   },

package/src/components/__tests__/__snapshots__/QualityMenu.spec.js.snap

@@ -70,6 +70,19 @@ exports[`<QualityMenu /> matches the latest snapshot 1`] = `
             Drafts
           </span>
         </a>
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/executionGroups"
+          name="executions"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            My Executions
+          </span>
+        </a>
       </div>
     </div>
   </div>

package/src/messages/en.js

@@ -82,6 +82,7 @@ export default {
   "sidemenu.concepts": "Concepts",
   "sidemenu.configurations": "Configuration",
   "sidemenu.dashboard": "Dashboard",
+  "sidemenu.executions": "My Executions",
   "sidemenu.glossary": "Glossary",
   "sidemenu.grant_request_approvals": "Approve Grant Requests",
   "sidemenu.grant_requests": "Grant Requests",

package/src/messages/es.js

@@ -85,6 +85,7 @@ export default {
   "sidemenu.concepts": "Conceptos",
   "sidemenu.configurations": "Configuración",
   "sidemenu.dashboard": "Dashboard",
+  "sidemenu.executions": "Mis ejecuciones",
   "sidemenu.glossary": "Glosario",
   "sidemenu.grant_request_approvals": "Aprobar Peticiones de Accesos",
   "sidemenu.grant_requests": "Peticiones de Accesos",

package/src/routes.js

@@ -43,6 +43,7 @@ export const DOMAIN_MEMBERS_NEW = "/domains/:id/members/new";
 export const DOMAIN_NEW = "/domains/:id/new";
 export const DOMAIN_STRUCTURES = "/domains/:id/structures";
 export const EXECUTION_GROUP = "/executionGroups/:id";
+export const EXECUTION_GROUPS = "/executionGroups";
 export const GRANTS = "/grants";
 export const GRANTS_REQUESTS_CHECKOUT = "/grants_requests/checkout";
 export const GRANT_REQUEST = "/grant_requests/:id";
@@ -227,6 +228,7 @@ const routes = {
   DOMAIN_NEW,
   DOMAIN_STRUCTURES,
   EXECUTION_GROUP,
+  EXECUTION_GROUPS,
   GRANTS,
   GRANTS_REQUESTS_CHECKOUT,
   GRANT_REQUEST,

package/src/services/__tests__/filters.spec.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { mergeFilters, getSearchPayload } from "../filters";
+import { isEmbedded, mergeFilters, getSearchPayload } from "../filters";
 
 describe("services: filters", () => {
   describe("mergeFilters", () => {
@@ -72,4 +72,12 @@ describe("services: filters", () => {
       });
     });
   });
+
+  describe("isEmbedded", () => {
+    test("returns true iff item has name and id prop", () => {
+      expect(isEmbedded({ id: 123, name: "foo" })).toBe(true);
+      expect(isEmbedded(123)).toBe(false);
+      expect(isEmbedded("123")).toBe(false);
+    });
+  });
 });

package/src/services/filters.js

@@ -28,10 +28,14 @@ export const getSearchPayload = (searchQuery, props) => {
   ]);
 };
 
+export const isEmbedded = _.overEvery(_.has("id"), _.has("name"));
+
 export const formatFilterValues = (selectedFilter) => (values) =>
   selectedFilter === "taxonomy"
     ? getDomainSelectorOptions({ domains: values })
+    : _.any(isEmbedded)(values)
+    ? _.map(({ id, name }) => ({ value: id, text: name }))(values)
     : values;
 
 export const toFilterValues = (filterValues) =>
-  _.map((v) => (_.isObject(v) ? v.id : v))(filterValues);
+  _.map((v) => (_.isObject(v) ? v.id || v.value : v))(filterValues);