@truedat/dd 4.53.9 → 4.53.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.53.11] 2022-10-20
+
+### Changed
+
+- [TD-5234] Structure rules tab visibility is now determined by the structure's
+  `implementation_count` prop
+
 ## [4.53.9] 2022-10-17
 
 ### [Fixed]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.53.9",
+  "version": "4.53.11",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.53.9",
+    "@truedat/test": "4.53.11",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,10 +87,10 @@
     ]
   },
   "dependencies": {
-    "@apollo/client": "^3.6.4",
-    "@truedat/auth": "4.53.9",
-    "@truedat/core": "4.53.9",
-    "@truedat/df": "4.53.9",
+    "@apollo/client": "^3.7.0",
+    "@truedat/auth": "4.53.11",
+    "@truedat/core": "4.53.11",
+    "@truedat/df": "4.53.11",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "cfb29ec044aeb972df15ad73f30cf7fb06e2a54b"
+  "gitHead": "f0bff07f7491edcbe2195f2ff9d0ef74736edef9"
 }

package/src/components/EditDomainPopup.js

@@ -34,7 +34,7 @@ export const EditDomainPopup = ({ userPermissions, saving, text }) => {
       trigger={
         <Button
           basic
-          icon={<Icon name={"pencil alternate"} />}
+          icon={<Icon name="pencil alternate" />}
           style={{ boxShadow: "none" }}
         />
       }

package/src/components/GrantRequest.js

@@ -55,7 +55,7 @@ export const GrantRequest = ({ grantRequest, template }) => {
                     </List.Description>
                   </List.Content>
                   {rows && (
-                    <List size={"small"}>
+                    <List size="small">
                       <List.Item>
                         <ConditionSummary
                           rows={rows}

package/src/components/GrantSelectedFilters.js

@@ -19,7 +19,8 @@ import {
 const translations = (formatMessage) => ({
   "active.raw": (v) =>
     formatMessage({ id: `filters.active.raw.${v}`, defaultMessage: v }),
-  "execution_result_info.result_text": (v) => formatMessage({ id: v }),
+  "execution_result_info.result_text": (v) =>
+    formatMessage({ id: v, defaultMessage: v }),
 });
 
 export const mapStateToProps = (state, ownProps) => {

package/src/components/LineageForm.js

@@ -176,12 +176,12 @@ export const LineageForm = ({
               <Form.Field>
                 <Form.Radio
                   disabled={disabled}
-                  name={"allLevels"}
+                  name="allLevels"
                   label={formatMessage({
                     id: "lineage.form.levels.all.label",
                     defaultMessage: "All",
                   })}
-                  value={"all"}
+                  value="all"
                   checked={selectLevels === "all"}
                   onChange={(e, { value }) => setSelectLevels(value)}
                 />
@@ -189,9 +189,9 @@ export const LineageForm = ({
               <Form.Field>
                 <Form.Radio
                   disabled={disabled}
-                  name={"selectLevels"}
+                  name="selectLevels"
                   checked={selectLevels === "select"}
-                  value={"select"}
+                  value="select"
                   onChange={(e, { value }) => setSelectLevels(value)}
                   label={formatMessage({
                     id: "lineage.form.levels.select.label",
@@ -212,7 +212,7 @@ export const LineageForm = ({
                 value={levels || ""}
                 autoComplete="off"
                 onChange={(e) => changeLevels(e)}
-                min={"1"}
+                min="1"
               />
             </Form.Field>
             <Button

package/src/components/LineageGraph.js

@@ -109,7 +109,7 @@ export const LineageGraph = ({
               <Loader size="large">
                 <FormattedMessage
                   id="lineage.graph.loading"
-                  defaultMessage={"Analyzing..."}
+                  defaultMessage="Analyzing..."
                 />
                 {loadingInfo?.data?.graph_hash && loadingInfo?.data?.status && (
                   <p>

package/src/components/StructureTabPaneRoutes.js

@@ -12,7 +12,7 @@ import {
   STRUCTURE_NOTES,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
-  STRUCTURE_RULES_IMPLEMENTATIONS,
+  STRUCTURE_RULES,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
   STRUCTURE_VERSION_VERSIONS,
@@ -30,10 +30,7 @@ export const StructureTabPaneRoutes = ({}) => (
     <Route path={STRUCTURE_NOTES} component={StructureTabPane} />
     <Route path={STRUCTURE_GRANTS} component={StructureTabPane} />
     <Route path={STRUCTURE_METADATA} component={StructureTabPane} />
-    <Route
-      path={STRUCTURE_RULES_IMPLEMENTATIONS}
-      component={StructureTabPane}
-    />
+    <Route path={STRUCTURE_RULES} component={StructureTabPane} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabPane} />
     <Route path={STRUCTURE_PARENTS} component={StructureTabPane} />
     <Route path={STRUCTURE_LINEAGE} component={StructureTabPane} />

package/src/components/StructureTabRoutes.js

@@ -11,7 +11,7 @@ import {
   STRUCTURE_NOTES,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
-  STRUCTURE_RULES_IMPLEMENTATIONS,
+  STRUCTURE_RULES,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
   STRUCTURE_VERSION_VERSIONS,
@@ -29,7 +29,7 @@ export const StructureTabRoutes = () => (
     <Route path={STRUCTURE_EVENTS} component={StructureTabs} />
     <Route path={STRUCTURE_METADATA} component={StructureTabs} />
     <Route path={STRUCTURE_NOTES} component={StructureTabs} />
-    <Route path={STRUCTURE_RULES_IMPLEMENTATIONS} component={StructureTabs} />
+    <Route path={STRUCTURE_RULES} component={StructureTabs} />
     <Route path={STRUCTURE_LINEAGE} component={StructureTabs} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabs} />
     <Route path={STRUCTURE_PARENTS} component={StructureTabs} />

package/src/components/StructureTabs.js

@@ -94,7 +94,7 @@ export const StructureTabs = ({
     {
       active: activeTab === "rules",
       as: Link,
-      to: linkTo.STRUCTURE_RULES_IMPLEMENTATIONS(structure),
+      to: linkTo.STRUCTURE_RULES(structure),
       content: rules ? formatMessage({ id: "tabs.dd.rules" }) : false,
       key: "rules",
     },

package/src/components/StructuresDomainsUploadOption.js

@@ -30,7 +30,7 @@ export const StructuresDomainsUploadOption = ({
       content={formatMessage({
         id: "structures.actions.uploadDomains.confirmation.content",
       })}
-      param={"structures_domains"}
+      param="structures_domains"
       handleSubmit={(data) =>
         uploadStructuresDomains({
           data,

package/src/components/StructuresUploadOption.js

@@ -39,7 +39,7 @@ export const StructuresUploadOption = ({
       content={formatMessage({
         id: "structures.actions.upload.confirmation.content",
       })}
-      param={"structures"}
+      param="structures"
       handleSubmit={(data) =>
         uploadStructures({
           data,

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

@@ -29,7 +29,7 @@ describe("<StructureTabPane />", () => {
   it("does not render profile when active tab is profile and we have any profile: ", () => {
     const wrapper = shallow(
       <StructureTabPane
-        activeTab={"profile"}
+        activeTab="profile"
         tabVisibility={{ profile: false }}
       />
     );
@@ -40,10 +40,7 @@ describe("<StructureTabPane />", () => {
 
   it("does not render grants when active tab is grants and we haven't any grant: ", () => {
     const wrapper = shallow(
-      <StructureTabPane
-        activeTab={"grants"}
-        tabVisibility={{ grants: false }}
-      />
+      <StructureTabPane activeTab="grants" tabVisibility={{ grants: false }} />
     );
     expect(wrapper.find("Connect(StructureGrants)").length).toBe(0);
   });
@@ -51,7 +48,7 @@ describe("<StructureTabPane />", () => {
   it("does render metadata component ", () => {
     const wrapper = shallow(
       <StructureTabPane
-        activeTab={"metadata"}
+        activeTab="metadata"
         tabVisibility={{ metadata: true }}
       />
     );

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

@@ -36,7 +36,7 @@ exports[`<StructureTabRoutes /> matches the latest snapshot 1`] = `
   />
   <Route
     component={[Function]}
-    path="/structures/:id/rules_implementations"
+    path="/structures/:id/rules"
   />
   <Route
     component={[Function]}

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

@@ -37,7 +37,7 @@ exports[`<StructureTabs /> matches the latest snapshot: metadata 1`] = `
     </a>
     <a
       class="item"
-      href="/structures/123/rules_implementations"
+      href="/structures/123/rules"
     >
       Rules
     </a>

package/src/reducers/structure.js

@@ -28,7 +28,7 @@ const structureVersionFields = _.pick([
   "grant",
   "grants",
   "group",
-  "implementations",
+  "implementation_count",
   "metadata",
   "name",
   "note",

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

@@ -10,7 +10,7 @@ import {
   STRUCTURE_NOTES_EDIT,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
-  STRUCTURE_RULES_IMPLEMENTATIONS,
+  STRUCTURE_RULES,
   STRUCTURE_VERSION,
   STRUCTURE_VERSIONS,
   STRUCTURE_VERSION_VERSIONS,
@@ -55,9 +55,7 @@ describe("selectors: getActiveTab", () => {
     expect(getActiveTab(tabVisibility, STRUCTURE_NOTES_EDIT)).toBe("notes");
     expect(getActiveTab(tabVisibility, STRUCTURE_PARENTS)).toBe("parents");
     expect(getActiveTab(tabVisibility, STRUCTURE_PROFILE)).toBe("profile");
-    expect(getActiveTab(tabVisibility, STRUCTURE_RULES_IMPLEMENTATIONS)).toBe(
-      "rules"
-    );
+    expect(getActiveTab(tabVisibility, STRUCTURE_RULES)).toBe("rules");
     expect(getActiveTab(tabVisibility, STRUCTURE_LINKS)).toBe("links");
     expect(getActiveTab(tabVisibility, STRUCTURE_LINKS_NEW)).toBe("links");
     expect(getActiveTab(tabVisibility, STRUCTURE_VERSIONS)).toBe("versions");

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

@@ -138,15 +138,15 @@ describe("selectors: getTabVisibility", () => {
     });
   });
 
-  it("should include rules iff structure.implementations is not empty", () => {
+  it("should include rules iff structure.implementation_count is greater than 0", () => {
     expect(getTabVisibility({})).toMatchObject({ rules: false });
     expect(
-      getTabVisibility({ structure: { implementations: [] } })
+      getTabVisibility({ structure: { implementation_count: 0 } })
     ).toMatchObject({
       rules: false,
     });
     expect(
-      getTabVisibility({ structure: { implementations: [{}] } })
+      getTabVisibility({ structure: { implementation_count: 123 } })
     ).toMatchObject({
       rules: true,
     });

package/src/selectors/getActiveTab.js

@@ -8,7 +8,7 @@ import {
   STRUCTURE_NOTES_EDIT,
   STRUCTURE_PARENTS,
   STRUCTURE_PROFILE,
-  STRUCTURE_RULES_IMPLEMENTATIONS,
+  STRUCTURE_RULES,
   STRUCTURE_LINKS,
   STRUCTURE_LINKS_NEW,
   STRUCTURE_VERSIONS,
@@ -43,7 +43,7 @@ export const getActiveTab = (tabVisibility, path) => {
     [_.eq(STRUCTURE_METADATA), _.constant("metadata")],
     [_.eq(STRUCTURE_PARENTS), _.constant("parents")],
     [_.eq(STRUCTURE_PROFILE), _.constant("profile")],
-    [_.eq(STRUCTURE_RULES_IMPLEMENTATIONS), _.constant("rules")],
+    [_.eq(STRUCTURE_RULES), _.constant("rules")],
     [_.eq(STRUCTURE_LINKS), _.constant("links")],
     [_.eq(STRUCTURE_LINKS_NEW), _.constant("links")],
     [_.eq(STRUCTURE_VERSIONS), _.constant("versions")],

package/src/selectors/getGrantsColumns.js

@@ -17,7 +17,7 @@ export const GrantUserDecorator = ({ authentication, user }) => {
         <Header.Content>
           {user.full_name}{" "}
           {sameUser && (
-            <Label color="teal" size={"small"}>
+            <Label color="teal" size="small">
               {formatMessage({ id: "grant.cell.end_date.same_user" })}
             </Label>
           )}

package/src/selectors/getTabVisibility.js

@@ -36,7 +36,7 @@ const notesTabVisible = ({ templatesLoading, templates, structure }) =>
   )(templates);
 
 const versionsTabVisible = notEmptyPath("structureVersions");
-const rulesTabVisible = notEmptyPath("structure.implementations");
+const rulesTabVisible = (state) => state?.structure?.implementation_count > 0;
 const lineageTabVisible = _.anyPass([_.path("structure.degree.in")]);
 const impactTabVisible = _.anyPass([_.path("structure.degree.out")]);
 const parentsTabVisible = _.conformsTo({ parentRelations: notEmpty });