@truedat/core 4.28.8 → 4.30.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.30.0] 2021-10-06
+
+### Changed
+
+- [TD-3603] Update react-intl version to v5
+
+## [4.29.5] 2021-10-05
+
+### Changed
+
+- [TD-4111] Extract grant routes
+
 ## [4.28.6] 2021-09-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.28.8",
+  "version": "4.30.0",
   "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.28.8",
+    "@truedat/test": "4.30.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,7 +87,7 @@
     "is-url": "^1.2.4",
     "prop-types": "^15.7.2",
     "react-dropzone": "^4.2.13",
-    "react-intl": "^3.12.0",
+    "react-intl": "^5.20.10",
     "react-moment": "^0.9.7",
     "react-redux": "^7.2.4",
     "react-router-dom": "^5.2.0",
@@ -103,5 +103,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "33a7f73dd4ffbd31d1df270c8453c3a876412990"
+  "gitHead": "43906b019b9b634bfbd6a25d24cd296f50e2842c"
 }

package/src/components/CatalogMenu.js

@@ -6,16 +6,10 @@ import {
   SYSTEMS,
   STRUCTURE_TAGS,
   STRUCTURE_TYPES,
-  MY_GRANTS,
-  GRANTS,
 } from "../routes";
 import Submenu from "./Submenu";
 
-const items = [
-  { name: "structures", routes: [STRUCTURES, SYSTEMS] },
-  { name: "my_grants", routes: [MY_GRANTS] },
-  { name: "grants", routes: [GRANTS] },
-];
+const items = [{ name: "structures", routes: [STRUCTURES, SYSTEMS] }];
 
 const adminItems = [
   { name: "structure_types", routes: [STRUCTURE_TYPES] },

package/src/components/GrantMenu.js

@@ -0,0 +1,18 @@
+import React from "react";
+import { useAuthorized } from "../hooks";
+import { MY_GRANTS, GRANTS, MY_GRANT_REQUESTS } from "../routes";
+import Submenu from "./Submenu";
+
+const items = [
+  { name: "my_grants", routes: [MY_GRANTS] },
+  { name: "grants", routes: [GRANTS] },
+  // { name: "grant_requests", routes: [GRANT_REQUESTS] },
+  { name: "my_grant_requests", routes: [MY_GRANT_REQUESTS] },
+];
+
+export const GrantMenu = () => {
+  const authorized = useAuthorized("data_dictionary");
+  return authorized ? <Submenu items={items} icon="key" name="grants" /> : null;
+};
+
+export default GrantMenu;

package/src/components/SideMenu.js

@@ -12,10 +12,11 @@ import QualityMenu from "./QualityMenu";
 import SearchMenu from "./SearchMenu";
 import SidebarToggle from "./SidebarToggle";
 import TaxonomyMenu from "./TaxonomyMenu";
+import GrantMenu from "./GrantMenu";
 import MembersMenu from "./MembersMenu";
 
 export const SideMenu = ({ children, animation = "push", inverted }) => {
-  const sidebarVisible = useSelector(state => state.sidebarVisible);
+  const sidebarVisible = useSelector((state) => state.sidebarVisible);
 
   const width = sidebarVisible ? null : "very thin";
 
@@ -33,6 +34,7 @@ export const SideMenu = ({ children, animation = "push", inverted }) => {
         <SearchMenu />
         <GlossaryMenu />
         <CatalogMenu />
+        <GrantMenu />
         <QualityMenu />
         <LineageMenu />
         <IngestMenu />
@@ -50,7 +52,7 @@ export const SideMenu = ({ children, animation = "push", inverted }) => {
 SideMenu.propTypes = {
   animation: PropTypes.string,
   children: PropTypes.node,
-  inverted: PropTypes.bool
+  inverted: PropTypes.bool,
 };
 
 export default SideMenu;

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

@@ -4,7 +4,7 @@ import { CatalogMenu } from "../CatalogMenu";
 
 jest.mock("../../hooks", () => ({
   useActiveRoutes: jest.fn(() => true),
-  useAuthorized: jest.fn(() => true)
+  useAuthorized: jest.fn(() => true),
 }));
 
 describe("<CatalogMenu />", () => {

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

@@ -0,0 +1,15 @@
+import React from "react";
+import { shallow } from "enzyme";
+import { GrantMenu } from "../GrantMenu";
+
+jest.mock("../../hooks", () => ({
+  useActiveRoutes: jest.fn(() => true),
+  useAuthorized: jest.fn(() => true),
+}));
+
+describe("<GrantMenu />", () => {
+  it("matches the latest snapshot", () => {
+    const wrapper = shallow(<GrantMenu />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

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

@@ -29,10 +29,9 @@ exports[`<AvailableFilters/> matches the latest snapshot 1`] = `
       onClick={[MockFunction]}
     >
       <em>
-        <FormattedMessage
+        <MemoizedFormattedMessage
           defaultMessage="(reset filters)"
           id="filters.reset"
-          values={Object {}}
         />
       </em>
     </DropdownItem>

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

@@ -12,18 +12,6 @@ exports[`<CatalogMenu /> matches the latest snapshot 1`] = `
           "/systems",
         ],
       },
-      Object {
-        "name": "my_grants",
-        "routes": Array [
-          "/my_grants",
-        ],
-      },
-      Object {
-        "name": "grants",
-        "routes": Array [
-          "/grants",
-        ],
-      },
       Object {
         "name": "structure_types",
         "routes": Array [

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

@@ -23,10 +23,9 @@ exports[`<FilterDropdown/> matches the latest snapshot 1`] = `
   selectOnNavigation={true}
   trigger={
     <Label>
-      <FormattedMessage
+      <Memo(MemoizedFormattedMessage)
         defaultMessage="foo"
         id="filters.foo"
-        values={Object {}}
       />
       <Icon
         as="i"

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

@@ -17,9 +17,8 @@ exports[`<FilterItem/> matches the latest snapshot 1`] = `
 `;
 
 exports[`<FilterItem/> matches the latest snapshot 2`] = `
-<FormattedMessage
+<MemoizedFormattedMessage
   defaultMessage="bar"
   id="filters.foo.bar"
-  values={Object {}}
 />
 `;

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

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<GrantMenu /> matches the latest snapshot 1`] = `
+<Submenu
+  icon="key"
+  items={
+    Array [
+      Object {
+        "name": "my_grants",
+        "routes": Array [
+          "/my_grants",
+        ],
+      },
+      Object {
+        "name": "grants",
+        "routes": Array [
+          "/grants",
+        ],
+      },
+      Object {
+        "name": "my_grant_requests",
+        "routes": Array [
+          "/my_grant_requests",
+        ],
+      },
+    ]
+  }
+  name="grants"
+/>
+`;

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

@@ -5,17 +5,15 @@ exports[`<ModalSaveFilter /> matches the latest snapshot 1`] = `
   actions={
     Array [
       Object {
-        "content": <FormattedMessage
+        "content": <Memo(MemoizedFormattedMessage)
           id="search.save_filter.cancel"
-          values={Object {}}
         />,
         "key": "no",
         "secondary": true,
       },
       Object {
-        "content": <FormattedMessage
+        "content": <Memo(MemoizedFormattedMessage)
           id="search.save_filter.save"
-          values={Object {}}
         />,
         "disabled": true,
         "key": "yes",
@@ -32,9 +30,8 @@ exports[`<ModalSaveFilter /> matches the latest snapshot 1`] = `
   }
   handleSubmit={[Function]}
   header={
-    <FormattedMessage
+    <Memo(MemoizedFormattedMessage)
       id="search.filters.actions.save.confirmation.header"
-      values={Object {}}
     />
   }
   icon="save"
@@ -42,9 +39,8 @@ exports[`<ModalSaveFilter /> matches the latest snapshot 1`] = `
     <a
       className="resetFilters"
     >
-      <FormattedMessage
+      <Memo(MemoizedFormattedMessage)
         id="search.save_filters"
-        values={Object {}}
       />
     </a>
   }
@@ -57,9 +53,8 @@ exports[`<SaveFilterForm /> matches the latest snapshot 1`] = `
 >
   <FormField>
     <label>
-      <FormattedMessage
+      <MemoizedFormattedMessage
         id="search.saveFilterForm.filter_name"
-        values={Object {}}
       />
     </label>
     <FormInput

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

@@ -18,9 +18,8 @@ exports[`<SelectedFilters/> matches the latest snapshot 1`] = `
     <div
       className="appliedFilters"
     >
-      <FormattedMessage
+      <MemoizedFormattedMessage
         id="search.applied_filters"
-        values={Object {}}
       />
     </div>
     <FilterDropdown
@@ -52,9 +51,8 @@ exports[`<SelectedFilters/> matches the latest snapshot 1`] = `
       className="resetFilters"
       onClick={[Function]}
     >
-      <FormattedMessage
+      <MemoizedFormattedMessage
         id="search.clear_filters"
-        values={Object {}}
       />
     </a>
     <ModalSaveFilter

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

@@ -15,6 +15,7 @@ exports[`<SideMenu /> matches the latest snapshot 1`] = `
     <SearchMenu />
     <GlossaryMenu />
     <CatalogMenu />
+    <GrantMenu />
     <QualityMenu />
     <LineageMenu />
     <IngestMenu />

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

@@ -14,9 +14,8 @@ exports[`<Submenu /> matches the latest snapshot 1`] = `
       as="i"
       size="large"
     />
-    <FormattedMessage
+    <MemoizedFormattedMessage
       id="sidemenu.undefined"
-      values={Object {}}
     />
   </Link>
   <MenuMenu>

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

@@ -18,7 +18,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
       </span>
       <ConfirmModal
         content={
-          <FormattedMessage
+          <Memo(MemoizedFormattedMessage)
             id="search.filters.actions.delete.confirmation.content"
             values={
               Object {
@@ -33,9 +33,8 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
         }
         handleSubmit={[Function]}
         header={
-          <FormattedMessage
+          <Memo(MemoizedFormattedMessage)
             id="search.filters.actions.delete.confirmation.header"
-            values={Object {}}
           />
         }
         icon="trash"
@@ -63,7 +62,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
       </span>
       <ConfirmModal
         content={
-          <FormattedMessage
+          <Memo(MemoizedFormattedMessage)
             id="search.filters.actions.delete.confirmation.content"
             values={
               Object {
@@ -78,9 +77,8 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
         }
         handleSubmit={[Function]}
         header={
-          <FormattedMessage
+          <Memo(MemoizedFormattedMessage)
             id="search.filters.actions.delete.confirmation.header"
-            values={Object {}}
           />
         }
         icon="trash"

package/src/messages/en.js

@@ -73,13 +73,15 @@ export default {
   "sidemenu.configurations": "Configuration",
   "sidemenu.dashboard": "Dashboard",
   "sidemenu.glossary": "Glossary",
+  "sidemenu.grant_requests": "Grant Requests",
   "sidemenu.grants": "Grants",
   "sidemenu.hide": "Collapse sidebar",
   "sidemenu.ingests": "Data Requests",
   "sidemenu.implementations": "Implementations",
   "sidemenu.jobs": "Jobs",
   "sidemenu.lineage": "Lineage Analysis",
-  "sidemenu.my_grants": "My grants",
+  "sidemenu.my_grant_requests": "My Grant Requests",
+  "sidemenu.my_grants": "My Grants",
   "sidemenu.quality": "Data Quality",
   "sidemenu.quality_dashboard": "Quality Dashboard",
   "sidemenu.roles": "Roles",

package/src/messages/es.js

@@ -76,6 +76,7 @@ export default {
   "sidemenu.configurations": "Configuración",
   "sidemenu.dashboard": "Dashboard",
   "sidemenu.glossary": "Glosario",
+  "sidemenu.grant_requests": "Peticiones de Accesos",
   "sidemenu.grants": "Accesos",
   "sidemenu.hide": "Ocultar",
   "sidemenu.implementations": "Implementaciones",
@@ -83,6 +84,7 @@ export default {
   "sidemenu.jobs": "Jobs",
   "sidemenu.lineage": "Linaje",
   "sidemenu.my_grants": "Mis accesos",
+  "sidemenu.my_grant_requests": "Mis Peticiones de Accesos",
   "sidemenu.quality": "Calidad",
   "sidemenu.quality_dashboard": "Dashboard de Calidad",
   "sidemenu.roles": "Roles",

package/src/routes.js

@@ -40,6 +40,9 @@ export const DOMAIN_MEMBERS = "/domains/:id/members";
 export const DOMAIN_MEMBERS_NEW = "/domains/:id/members/new";
 export const DOMAIN_NEW = "/domains/:id/new";
 export const EXECUTION_GROUP = "/executionGroups/:id";
+export const GRANT_REQUESTS = "/grant_requests";
+export const GRANT_REQUEST = "/grant_requests/:id";
+
 export const GRANTS = "/grants";
 export const GRANTS_REQUESTS_CHECKOUT = "/grants_requests/checkout";
 export const GRAPH = "/graphs/:id";
@@ -67,6 +70,7 @@ export const INGEST_RELATIONS_STRUCTURES_NEW =
 export const JOB = "/jobs/:id";
 export const JOBS = "/jobs";
 export const LOGIN = "/login";
+export const MY_GRANT_REQUESTS = "/my_grant_requests";
 export const MY_GRANTS = "/my_grants";
 export const PASSWORD = "/password";
 export const PROFILE_EXECUTION =
@@ -182,6 +186,8 @@ const routes = {
   DOMAINS_SEARCH,
   DOMAINS,
   EXECUTION_GROUP,
+  GRANT_REQUEST,
+  GRANT_REQUESTS,
   GRANTS,
   GRANTS_REQUESTS_CHECKOUT,
   GRAPH,
@@ -207,6 +213,7 @@ const routes = {
   JOB,
   JOBS,
   LOGIN,
+  MY_GRANT_REQUESTS,
   MY_GRANTS,
   PASSWORD,
   PROFILE_EXECUTION,