@truedat/dd 6.12.4 → 6.12.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.12.4",
+  "version": "6.12.6",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.12.4",
-    "@truedat/core": "6.12.4",
-    "@truedat/df": "6.12.4",
+    "@truedat/auth": "6.12.6",
+    "@truedat/core": "6.12.6",
+    "@truedat/df": "6.12.6",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "0d67a012c6b0337f9c82db464137cf76062cbd81"
+  "gitHead": "6ee7f5e8767d2149347997223377f91f0164ee34"
 }

package/src/components/StructuresRoutes.js

@@ -14,6 +14,8 @@ import {
   STRUCTURE_VERSION,
   STRUCTURE_MEMBERS_NEW,
 } from "@truedat/core/routes";
+import { connect } from "react-redux";
+import PropTypes from "prop-types";
 import AddStructureMember from "./AddStructureMember";
 import StructureCrumbs from "./StructureCrumbs";
 import StructureLoader from "./StructureLoader";
@@ -50,9 +52,8 @@ const StructureEventsLoader = () => {
   return <EventsLoader resource_id={id} resource_type="data_structure" />;
 };
 
-const AuthorizedRoutes = () => {
+const AuthorizedRoutes = ({ view_quality }) => {
   const { formatMessage } = useIntl();
-
   return (
     <>
       <Switch>
@@ -85,7 +86,7 @@ const AuthorizedRoutes = () => {
             return (
               <>
                 <StructureLoader />
-                <StructureImplementationsLoader />
+                {view_quality ? <StructureImplementationsLoader /> : null}
               </>
             );
           }}
@@ -107,15 +108,29 @@ const AuthorizedRoutes = () => {
   );
 };
 
-export const StructuresRoutes = () => {
-  const authorized = useAuthorized("data_dictionary");
+AuthorizedRoutes.propTypes = { view_quality: PropTypes.bool };
 
+export const StructuresRoutes = ({ view_quality }) => {
+  const authorized = useAuthorized("data_dictionary");
   return (
     <Route
       path={[STRUCTURES, BUCKET_VIEW, BUCKETS_VIEW]}
-      render={() => (authorized ? <AuthorizedRoutes /> : <Unauthorized />)}
+      render={() =>
+        authorized ? (
+          <AuthorizedRoutes view_quality={view_quality} />
+        ) : (
+          <Unauthorized />
+        )
+      }
     />
   );
 };
 
-export default StructuresRoutes;
+StructuresRoutes.propTypes = { view_quality: PropTypes.bool };
+
+const mapStateToProps = (state) => ({
+  view_quality: state.userPermissions.view_quality,
+  userPermissions: state.userPermissions,
+});
+
+export default connect(mapStateToProps)(StructuresRoutes);

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

@@ -76,12 +76,15 @@ describe("<StructureSelector />", () => {
       columns,
       onSelect: jest.fn(),
     };
-    const { container } = render(<StructureSelector {...props} />, renderOpts);
+    const { container, findByText } = render(
+      <StructureSelector {...props} />,
+      renderOpts
+    );
 
     await waitFor(() => {
       expect(container.querySelector(".loading")).toBeNull();
     });
-
+    await findByText(/Results/);
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -77,9 +77,9 @@ describe("<StructuresGrantRequestView />", () => {
       renderOpts
     );
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    await waitFor(() => {
+      expect(container.querySelector(".loading")).toBeNull();
+    });
     await waitFor(() => expect(container).toMatchSnapshot());
 
     const structure1Row = await queryByText(/structure_1/).closest("tr");

package/src/selectors/__tests__/getTabVisibility.spec.js

@@ -152,20 +152,53 @@ describe("selectors: getTabVisibility", () => {
     });
   });
 
-  it("should include rules iff structure.implementation_count is greater than 0", () => {
-    expect(getTabVisibility({})).toMatchObject({ rules: false });
+  it("should include rules iff structure.implementation_count is greater than 0 with permissions", () => {
     expect(
-      getTabVisibility({ structure: { implementation_count: 0 } })
+      getTabVisibility({ userPermissions: { view_quality: true } })
     ).toMatchObject({
       rules: false,
     });
     expect(
-      getTabVisibility({ structure: { implementation_count: 123 } })
+      getTabVisibility({
+        structure: { implementation_count: 0 },
+        userPermissions: { view_quality: true },
+      })
+    ).toMatchObject({
+      rules: false,
+    });
+    expect(
+      getTabVisibility({
+        structure: { implementation_count: 123 },
+        userPermissions: { view_quality: true },
+      })
     ).toMatchObject({
       rules: true,
     });
   });
 
+  it("should not include rules iff structure.implementation_count is greater than 0 without permissions", () => {
+    expect(
+      getTabVisibility({ userPermissions: { view_quality: false } })
+    ).toMatchObject({
+      rules: false,
+    });
+    expect(
+      getTabVisibility({
+        structure: { implementation_count: 0 },
+        userPermissions: { view_quality: false },
+      })
+    ).toMatchObject({
+      rules: false,
+    });
+    expect(
+      getTabVisibility({
+        structure: { implementation_count: 123 },
+        userPermissions: { view_quality: false },
+      })
+    ).toMatchObject({
+      rules: false,
+    });
+  });
   it("should include parents iff parentRelations is not empty", () => {
     expect(getTabVisibility({})).toMatchObject({ parents: false });
     expect(getTabVisibility({ parentRelations: [] })).toMatchObject({

package/src/selectors/getTabVisibility.js

@@ -45,7 +45,9 @@ const structureLinksTabVisible = (state) =>
 const rolesTabVisible = (state) =>
   _.has("manage_structure_acl_entry", state?.structureActions) ||
   !_.isEmpty(state?.structure?.roles);
-const rulesTabVisible = (state) => state?.structure?.implementation_count > 0;
+const rulesTabVisible = (state) =>
+  state?.structure?.implementation_count > 0 &&
+  state?.userPermissions?.view_quality;
 const lineageTabVisible = _.anyPass([_.path("structure.degree.in")]);
 const impactTabVisible = _.anyPass([_.path("structure.degree.out")]);
 const parentsTabVisible = _.conformsTo({ parentRelations: notEmpty });