@truedat/core 4.56.9 → 4.58.1

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [4.56.9] 2022-11-12
+## [4.58.1] 2022-12-19
+
+### Added
+
+- [TD-5367] Route for grant detail
+
+## [4.58.0] 2022-12-15
+
+### Added
+
+- [TD-3919] Add concept subscopes submenus
+
+## [4.56.9] 2022-12-12
 
 ### Added
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.56.9",
+  "version": "4.58.1",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.56.9",
+    "@truedat/test": "4.58.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -107,7 +107,7 @@
     "semantic-ui-react": "^2.1.4",
     "slate": "^0.47.3",
     "slate-react": "^0.22.3",
-    "swr": "^1.3.0",
+    "swr": "^2.0.0",
     "validator": "^13.6.0"
   },
   "peerDependencies": {
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "da9a49da6d48b51faf603abff56ff7b1b6c5e413"
+  "gitHead": "f1d6fab3f573f3f3ee9e0e6060d2761d452ca804"
 }

package/src/components/GenericCrumbs.js

@@ -7,6 +7,7 @@ import { FormattedMessage } from "react-intl";
 export const GenericCrumbs = ({ header, title }) => {
   const history = useHistory();
   const goBack = () => history.goBack();
+
   return (
     <Breadcrumb>
       <Breadcrumb.Section onClick={goBack} active={false}>

package/src/components/GlossaryMenu.js

@@ -1,30 +1,69 @@
+import _ from "lodash/fp";
 import React from "react";
+import TemplatesLoader from "@truedat/df/templates/components/TemplatesLoader";
+import { connect } from "react-redux";
+import PropTypes from "prop-types";
+import { makeGetSubscopes } from "@truedat/df/selectors/subscopedTemplates";
+import { linkTo } from "@truedat/core/routes";
 import { useAuthorized } from "../hooks";
 import { CONCEPTS, CONCEPTS_PENDING } from "../routes";
 import Submenu from "./Submenu";
 
-const items = [
+const items = (bgSubscopes = []) => [
   {
     name: "concepts",
     routes: [CONCEPTS],
-    groups: ["business_glossary_view"]
+    groups: ["business_glossary_view"],
   },
+  ...bgSubscopes,
   {
     name: "concepts_management",
     routes: [CONCEPTS_PENDING],
-    groups: ["business_glossary_management"]
-  }
+    groups: ["business_glossary_management"],
+  },
 ];
 
-export const GlossaryMenu = () => {
+const subscopeItems = _.flow(
+  _.map((bgSubscope) => ({
+    name: bgSubscope,
+    routes: [linkTo.CONCEPTS_SUBSCOPED({ subscope: bgSubscope })],
+    groups: ["business_glossary_view"],
+  })),
+  _.orderBy(["name"], ["asc"])
+);
+
+export const GlossaryMenu = ({ bgSubscopes }) => {
   const authorized = useAuthorized([
     "business_glossary_view",
-    "business_glossary_management"
+    "business_glossary_management",
   ]);
 
   return authorized ? (
-    <Submenu items={items} icon="tags" name="glossary" />
+    // Use TemplatesLoader without scope, so that templates are saved in the
+    // "allTemplates" reducer, and thus do not collide with other
+    // <TemplatesLoader scope="..."> that collect templates in the "templates"
+    // reducer.
+    <>
+      <TemplatesLoader />
+      <Submenu
+        items={items(subscopeItems(bgSubscopes))}
+        icon="tags"
+        name="glossary"
+      />
+    </>
   ) : null;
 };
 
-export default GlossaryMenu;
+GlossaryMenu.propTypes = {
+  bgSubscopes: PropTypes.array,
+};
+
+const makeMapStateToProps = () => {
+  const getSubscopes = makeGetSubscopes("bg");
+  const mapStateToProps = (state, props) => ({
+    bgSubscopes: getSubscopes(state, props),
+  });
+  return mapStateToProps;
+};
+
+export default connect(makeMapStateToProps)(GlossaryMenu);

package/src/components/Submenu.js

@@ -81,6 +81,7 @@ export const Submenu = ({ items, icon, name, sidebarVisible }) => {
     );
   } else {
     const className = active ? "active" : null;
+
     const trigger = (
       <Link to={primaryRoute} className="ui">
         <Icon size="large" name={icon} />

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

@@ -1,16 +1,80 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { GlossaryMenu } from "../GlossaryMenu";
+import { render } from "@truedat/test/render";
+import GlossaryMenu from "../GlossaryMenu";
 
 jest.mock("../../hooks", () => ({
   useActiveRoutes: jest.fn(() => true),
   useAuthorized: jest.fn(() => true),
-  useAuthorizedItems: jest.fn(() => true)
+  useAuthorizedItems: jest.fn((items) => items),
 }));
 
+const messages = {
+  en: {
+    "sidemenu.concepts": "sidemenu.concepts",
+    "sidemenu.concepts_management": "sidemenu.concepts_management",
+  },
+};
+
+const renderOpts = {
+  messages,
+  state: {
+    allTemplates: [
+      {
+        content: [],
+        id: 7,
+        label: "Término",
+        name: "termino",
+        scope: "bg",
+        subscope: null,
+      },
+      {
+        content: [],
+        id: 2,
+        label: "Métrica",
+        name: "metrica",
+        scope: "bg",
+        subscope: null,
+      },
+      {
+        content: [],
+        id: 3,
+        label: "Dimensión",
+        name: "dimension",
+        scope: "bg",
+        subscope: null,
+      },
+      {
+        content: [],
+        id: 53,
+        label: "subscope1",
+        name: "subscope1",
+        scope: "bg",
+        subscope: "subscope1",
+      },
+      {
+        content: [],
+        id: 54,
+        label: "subscope2",
+        name: "subscope2",
+        scope: "bg",
+        subscope: "subscope2",
+      },
+    ],
+  },
+};
+
 describe("<GlossaryMenu />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<GlossaryMenu />);
-    expect(wrapper).toMatchSnapshot();
+  it("matches the latest snapshot, finds fixed and subscopes submenus", () => {
+    const { container, queryByRole } = render(<GlossaryMenu />, renderOpts);
+
+    expect(container).toMatchSnapshot();
+    expect(
+      queryByRole("option", { name: "sidemenu.concepts" })
+    ).toBeInTheDocument();
+    expect(
+      queryByRole("option", { name: "sidemenu.concepts_management" })
+    ).toBeInTheDocument();
+    expect(queryByRole("option", { name: "subscope1" })).toBeInTheDocument();
+    expect(queryByRole("option", { name: "subscope2" })).toBeInTheDocument();
   });
 });

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

@@ -1,30 +1,90 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<GlossaryMenu /> matches the latest snapshot 1`] = `
-<Connect(Submenu)
-  icon="tags"
-  items={
-    Array [
-      Object {
-        "groups": Array [
-          "business_glossary_view",
-        ],
-        "name": "concepts",
-        "routes": Array [
-          "/concepts",
-        ],
-      },
-      Object {
-        "groups": Array [
-          "business_glossary_management",
-        ],
-        "name": "concepts_management",
-        "routes": Array [
-          "/pendingConcepts",
-        ],
-      },
-    ]
-  }
-  name="glossary"
-/>
+exports[`<GlossaryMenu /> matches the latest snapshot, finds fixed and subscopes submenus 1`] = `
+<div>
+  <div
+    class="active"
+  >
+    <div
+      aria-expanded="false"
+      class="ui item dropdown active"
+      role="listbox"
+      tabindex="0"
+    >
+      <a
+        class="ui"
+        href="/concepts"
+      >
+        <i
+          aria-hidden="true"
+          class="tags large icon"
+        />
+      </a>
+      <div
+        class="menu transition"
+      >
+        <div
+          class="header selectable"
+        >
+          glossary
+        </div>
+        <div
+          class="divider"
+        />
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/concepts"
+          name="concepts"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            sidemenu.concepts
+          </span>
+        </a>
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/subscopedConcepts/subscope1"
+          name="subscope1"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            subscope1
+          </span>
+        </a>
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/subscopedConcepts/subscope2"
+          name="subscope2"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            subscope2
+          </span>
+        </a>
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/pendingConcepts"
+          name="concepts_management"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            sidemenu.concepts_management
+          </span>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
 `;

package/src/messages/en.js

@@ -82,7 +82,7 @@ export default {
   "sidemenu.admin": "Administration",
   "sidemenu.catalog": "Catalog",
   "sidemenu.concepts_management": "Drafts",
-  "sidemenu.concepts": "Concepts",
+  "sidemenu.concepts": "Glossary",
   "sidemenu.configurations": "Configuration",
   "sidemenu.dashboard": "Dashboard",
   "sidemenu.executions": "My Executions",

package/src/messages/es.js

@@ -85,7 +85,7 @@ export default {
   "sidemenu.admin": "Administración",
   "sidemenu.catalog": "Catálogo",
   "sidemenu.concepts_management": "Borradores",
-  "sidemenu.concepts": "Conceptos",
+  "sidemenu.concepts": "Glosario",
   "sidemenu.configurations": "Configuración",
   "sidemenu.dashboard": "Dashboard",
   "sidemenu.executions": "Mis ejecuciones",

package/src/routes.js

@@ -6,6 +6,7 @@ export const CONCEPTS = "/concepts";
 export const CONCEPTS_BULK_UPDATE = "/concepts/bulk_update";
 export const CONCEPTS_NEW = "/concepts/new";
 export const CONCEPTS_PENDING = "/pendingConcepts";
+export const CONCEPTS_SUBSCOPED = "/subscopedConcepts/:subscope";
 export const CONCEPT_ARCHIVE =
   "/concepts/:business_concept_id/versions/:id/archive";
 export const CONCEPT_EDIT = "/concepts/:business_concept_id/versions/:id/edit";
@@ -49,6 +50,7 @@ export const GRANT_APPROVAL_RULE = "/grantApproveRules/:id";
 export const GRANT_APPROVAL_RULE_NEW = "/grantApproveRules/new";
 export const GRANT_APPROVAL_RULE_EDIT = "/grantApproveRules/:id/edit";
 export const GRANT_APPROVAL_RULES = "/grantApprovalRules";
+export const GRANT = "/grants/:id";
 export const GRANTS = "/grants";
 export const GRANTS_REQUESTS_CHECKOUT = "/grantsRequests/checkout";
 export const GRANT_REQUEST = "/grantRequests/:id";
@@ -210,6 +212,7 @@ const routes = {
   CONCEPTS_BULK_UPDATE,
   CONCEPTS_NEW,
   CONCEPTS_PENDING,
+  CONCEPTS_SUBSCOPED,
   CONCEPT_ARCHIVE,
   CONCEPT_EDIT,
   CONCEPT_EVENTS,
@@ -238,6 +241,7 @@ const routes = {
   DOMAIN_STRUCTURES,
   EXECUTION_GROUP,
   EXECUTION_GROUPS,
+  GRANT,
   GRANT_APPROVAL_RULE,
   GRANT_APPROVAL_RULE_NEW,
   GRANT_APPROVAL_RULE_EDIT,