@truedat/bg 7.2.3 → 7.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.2.3",
+  "version": "7.2.4",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.2.3",
+    "@truedat/test": "7.2.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "7.2.3",
-    "@truedat/df": "7.2.3",
-    "@truedat/lm": "7.2.3",
+    "@truedat/core": "7.2.4",
+    "@truedat/df": "7.2.4",
+    "@truedat/lm": "7.2.4",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "1f8b6f4d6fbd6e278493c35885e540c14f9c551b"
+  "gitHead": "3371f59270a344803524395e395f6a422d879d01"
 }

package/src/concepts/components/ConceptRoutes.js

@@ -23,6 +23,7 @@ import {
   CONCEPTS,
 } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
+import { getSidemenuGlossarySubscopes } from "../selectors/getSidemenuGlossarySubscopes";
 import Concept from "./Concept";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptEdit from "./ConceptEdit";
@@ -47,7 +48,12 @@ const RelationsGraphLoader = React.lazy(() =>
   import("@truedat/lm/components/RelationsGraphLoader")
 );
 
-const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
+const ConceptRoutes = ({
+  concept,
+  conceptLoaded,
+  templatesLoaded,
+  sidemenuGlossarySubscopes,
+}) => {
   const { formatMessage } = useIntl();
   const authorized = useAuthorized([
     "business_glossary_view",
@@ -57,14 +63,6 @@ const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
     return <Unauthorized />;
   }
 
-  const pendingConceptsDefaultFilters = {
-    status: ["pending_approval", "draft", "rejected"],
-  };
-
-  const archivedConceptsDefaultFilters = {
-    status: ["deprecated"],
-  };
-
   const renderConceptsComponent = (props, filters, key) => {
     const subscope = _.get("match.params.subscope", props) || "";
     const baseId = `concepts.${subscope || "default"}.${key}`;
@@ -150,7 +148,10 @@ const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
           authorized ? (
             renderConceptsComponent(
               routeProps,
-              pendingConceptsDefaultFilters,
+              {
+                status: ["pending_approval", "draft", "rejected"],
+                "mustnot.template.subscope": sidemenuGlossarySubscopes,
+              },
               "pending"
             )
           ) : (
@@ -165,7 +166,10 @@ const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
         render={(routeProps) =>
           renderConceptsComponent(
             routeProps,
-            archivedConceptsDefaultFilters,
+            {
+              status: ["deprecated"],
+              "mustnot.template.subscope": sidemenuGlossarySubscopes,
+            },
             "deprecated"
           )
         }
@@ -291,12 +295,14 @@ ConceptRoutes.propTypes = {
   concept: PropTypes.object,
   conceptLoaded: PropTypes.bool,
   templatesLoaded: PropTypes.bool,
+  sidemenuGlossarySubscopes: PropTypes.array,
 };
 
 const mapStateToProps = (state) => ({
   concept: state.concept,
   conceptLoaded: !_.isEmpty(state.concept),
   templatesLoaded: !state.templatesLoading && !_.isEmpty(state.templates),
+  sidemenuGlossarySubscopes: getSidemenuGlossarySubscopes(state),
 });
 
 export default connect(mapStateToProps)(ConceptRoutes);

package/src/concepts/components/ConceptsPanel.js

@@ -1,3 +1,4 @@
+import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
@@ -17,7 +18,7 @@ import ConceptsLabelResults from "./ConceptsLabelResults";
 import ConceptsPagination from "./ConceptsPagination";
 import ConceptsTable from "./ConceptsTable";
 
-export function ConceptsPanelContent({ actions }) {
+export function ConceptsPanelContent({ actions, subscope }) {
   const { loading } = useSearchContext();
 
   return (
@@ -29,7 +30,7 @@ export function ConceptsPanelContent({ actions }) {
           <Loader />
         </Dimmer>
         <ConceptsLabelResults />
-        <ConceptsTable />
+        <ConceptsTable subscope={subscope} />
         <ConceptsPagination />
       </Dimmer.Dimmable>
     </>
@@ -38,6 +39,7 @@ export function ConceptsPanelContent({ actions }) {
 
 ConceptsPanelContent.propTypes = {
   actions: PropTypes.object,
+  subscope: PropTypes.string,
 };
 
 export const ConceptsPanel = ({ defaultFilters, actions, filtersGroup }) => {
@@ -53,9 +55,11 @@ export const ConceptsPanel = ({ defaultFilters, actions, filtersGroup }) => {
     filtersGroup,
   };
 
+  const subscope = _.flow(_.get("template.subscope"), _.head)(defaultFilters);
+
   return (
     <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
-      <ConceptsPanelContent actions={actions} />
+      <ConceptsPanelContent actions={actions} subscope={subscope} />
     </SearchContextProvider>
   );
 };
@@ -63,6 +67,7 @@ export const ConceptsPanel = ({ defaultFilters, actions, filtersGroup }) => {
 ConceptsPanel.propTypes = {
   actions: PropTypes.object,
   defaultFilters: PropTypes.object,
+  filtersGroup: PropTypes.object,
 };
 
 const mapStateToProps = (state) => ({

package/src/concepts/components/ConceptsTable.js

@@ -10,7 +10,7 @@ import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { getConceptColumns } from "../selectors";
 import ConceptRow from "./ConceptRow";
 
-export const ConceptsTable = ({ columnsByScope }) => {
+export const ConceptsTable = ({ columnsByScope, subscope }) => {
   const {
     searchData,
     loading,
@@ -23,10 +23,14 @@ export const ConceptsTable = ({ columnsByScope }) => {
   const { pathname } = useLocation();
 
   const scope = _.last(pathname.split("/"));
-  const columns = columnsByScope[scope] || columnsByScope.concepts;
+  const columns =
+    _.path([subscope, scope])(columnsByScope) ||
+    _.path([scope])(columnsByScope) ||
+    _.path(["concepts"])(columnsByScope);
 
   const conceptColumns = columns.filter(
-    (column) => pathname === CONCEPTS_PENDING || column.name != "status"
+    (column) =>
+      _.last(CONCEPTS_PENDING.split("/")) === scope || column.name != "status"
   );
 
   return (
@@ -79,10 +83,13 @@ export const ConceptsTable = ({ columnsByScope }) => {
 
 ConceptsTable.propTypes = {
   columnsByScope: PropTypes.object,
+  subscope: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
-  columnsByScope: getConceptColumns(state),
-});
+const mapStateToProps = (state) => {
+  return {
+    columnsByScope: getConceptColumns(state),
+  };
+};
 
 export default connect(mapStateToProps)(ConceptsTable);

package/src/concepts/components/__tests__/ConceptsTable.spec.js

@@ -5,7 +5,7 @@ import { ConceptsTable } from "../ConceptsTable";
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useLocation: () => ({ pathname: "/concept/test" }),
+  useLocation: jest.fn(),
 }));
 
 const data = {
@@ -38,8 +38,6 @@ const useSearch = () => ({
   }),
 });
 
-const defaultFilters = {};
-
 const searchProps = {
   initialSortColumn: "name.raw",
   initialSortDirection: "ascending",
@@ -60,21 +58,309 @@ const renderOpts = {
 };
 
 describe("<ConceptsTable />", () => {
-  it("matches the latest snapshot", async () => {
-    const defaultColumns = ["name", "status"].map((name) => ({ name }));
-    const columnsByScope = {
-      concepts: [...defaultColumns],
-      test: [...defaultColumns, { name: "type" }],
-    };
+  const controlColumn = { name: "controlColumn" };
+  const defaultColumns = ["name", "status", "globalPublished"].map((name) => ({
+    name,
+  }));
+  const columnsByScope = {
+    concepts: [controlColumn, ...defaultColumns],
+    pending: [controlColumn, { name: "globalPending" }],
+    deprecated: [controlColumn, { name: "globalDeprecated" }],
+    subscoped: [controlColumn, { name: "subscoped" }],
+    menusubscoped: {
+      published: [controlColumn, { name: "menuscopedPublished" }],
+      pending: [controlColumn, { name: "menuscopedPending" }],
+      deprecated: [controlColumn, { name: "menuscopedDeprecated" }],
+    },
+  };
+
+  it(`matches the latest snapshot`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts" });
 
     const props = { columnsByScope };
     const { container, findByText } = render(
-      <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
         <ConceptsTable {...props} />
       </SearchContextProvider>,
       renderOpts
     );
-    await findByText(/Type/);
+    await findByText(/concepts.props.controlColumn/);
     expect(container).toMatchSnapshot();
   });
+
+  it(`default columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts" });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`subscope columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/subscoped" });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/subscoped/)).toBeInTheDocument();
+  });
+
+  it(`subscope default fallback columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/subscoped" });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`pending columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/pending" });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPending/)).toBeInTheDocument();
+  });
+
+  it(`pending default fallback columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/pending" });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`deprecated columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/deprecated" });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalDeprecated/)).toBeInTheDocument();
+  });
+
+  it(`deprecated default fallback columns`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts/deprecated" });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped published columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/published",
+    });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/menuscopedPublished/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped default published fallback columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/published",
+    });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped pending columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/pending",
+    });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/menuscopedPending/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped pending fallback columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/pending",
+    });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+      pending: [controlColumn, { name: "globalPending" }],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPending/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped default pending fallback columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/deprecated",
+    });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped deprecated columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/deprecated",
+    });
+
+    const props = { columnsByScope };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/menuscopedDeprecated/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped deprecated fallback columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/deprecated",
+    });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+      deprecated: [controlColumn, { name: "globalDeprecated" }],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalDeprecated/)).toBeInTheDocument();
+  });
+
+  it(`menu-subscoped default deprecated fallback columns`, async () => {
+    jest.spyOn(require("react-router-dom"), "useLocation").mockReturnValue({
+      pathname: "/glossarySubscope/menusubscoped/deprecated",
+    });
+
+    const fallbackColumns = {
+      concepts: [controlColumn, ...defaultColumns],
+    };
+
+    const props = { columnsByScope: fallbackColumns };
+    const { findByText, queryByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ConceptsTable {...props} subscope="menusubscoped" />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/concepts.props.controlColumn/);
+    expect(queryByText(/globalPublished/)).toBeInTheDocument();
+  });
 });

package/src/concepts/components/__tests__/__snapshots__/ConceptsTable.spec.js.snap

@@ -11,6 +11,11 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
       <tr
         class=""
       >
+        <th
+          class="disabled"
+        >
+          concepts.props.controlColumn
+        </th>
         <th
           class="disabled"
         >
@@ -19,7 +24,7 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
         <th
           class="disabled"
         >
-          Type
+          concepts.props.globalPublished
         </th>
       </tr>
     </thead>
@@ -29,6 +34,9 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
       <tr
         class=""
       >
+        <td
+          class=""
+        />
         <td
           class=""
         >