@truedat/dd 7.0.1 → 7.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Truedat Web Data Dictionary",
   "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.0.1",
+    "@truedat/test": "7.0.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.0.1",
-    "@truedat/core": "7.0.1",
-    "@truedat/df": "7.0.1",
+    "@truedat/auth": "7.0.3",
+    "@truedat/core": "7.0.3",
+    "@truedat/df": "7.0.3",
     "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": "fff3313b142abb69e4d4139e0b6fd85d1af1a898"
+  "gitHead": "871005135545e304fa6ba9a5d49fa31b46e28a7c"
 }

package/src/components/StructureGrantCartUserSelector.js

@@ -25,40 +25,33 @@ export const StructureGrantCartUserSelector = ({
   const [domainIds, setDomainIds] = useState([]);
   const [selectedRoles, setSelectedRoles] = useState([]);
   const [selectedRoleIds, setSelectedRoleIds] = useState([]);
-
-  const [userId, setUserId] = useState(_.path("user.id")(grantRequestsCart));
+  const [userId, setUserId] = useState(null);
 
   const { modificationGrant } = grantRequestsCart;
   const updateGrant = !_.isEmpty(modificationGrant);
-
   const domainActions = ["publishGrantRequest"];
 
   const { data: roles } = useRoles();
 
+  useEffect(() => {
+    if (!_.isNil(modificationGrant?.user_id)) {
+      selectUser(modificationGrant?.user_id);
+    } else if (!_.isNil(grantRequestsCart?.user?.id) && !_.isEmpty(options)) {
+      _.flow(
+        _.find({ value: userId }),
+        _.pathOr(null, "value"),
+        selectUser
+      )(options);
+    }
+  }, [grantRequestsCart?.user?.id, modificationGrant?.user_id, options]);
+
   useEffect(() => {
     updateGrantRequestUser({
       id: userId,
       valid:
         !thirdParty || (thirdParty && !(_.isNil(userId) && _.isEmpty(userId))),
     });
-    if (updateGrant && modificationGrant.user_id)
-      setUserId(modificationGrant.user_id);
-  }, [
-    modificationGrant,
-    thirdParty,
-    updateGrant,
-    updateGrantRequestUser,
-    userId,
-  ]);
-
-  useEffect(() => {
-    _.flow(
-      _.filter({ value: userId }),
-      _.first,
-      _.pathOr(null, "value"),
-      selectUser
-    )(options);
-  }, [userId, options]);
+  }, [thirdParty, updateGrantRequestUser, userId]);
 
   useEffect(() => {
     _.flow(
@@ -145,7 +138,6 @@ export const StructureGrantCartUserSelector = ({
         domains={domainIds}
         roles={selectedRoleIds}
         permission="allow_foreign_grant_request"
-        hideLoading
       />
       <Form.Dropdown
         placeholder={formatMessage({

package/src/components/StructureTabPane.js

@@ -98,9 +98,12 @@ StructureTabPane.propTypes = {
   tabVisibility: PropTypes.object,
 };
 
-const mapStateToProps = (state, { match: { path } }) => {
+const mapStateToProps = (
+  { structureTabsOrder, ...state },
+  { match: { path } }
+) => {
   const tabVisibility = getTabVisibility(state);
-  const activeTab = getActiveTab(tabVisibility, path);
+  const activeTab = getActiveTab(tabVisibility, path, structureTabsOrder);
   return {
     tabVisibility,
     activeTab,

package/src/components/StructureTabPaneRoutes.js

@@ -3,6 +3,8 @@ import { Route, Switch } from "react-router-dom";
 import {
   STRUCTURE,
   STRUCTURE_CHILDREN,
+  STRUCTURE_FIELDS,
+  STRUCTURE_VERSION_FIELDS,
   STRUCTURE_EVENTS,
   STRUCTURE_GRANTS,
   STRUCTURE_IMPACT,
@@ -24,6 +26,7 @@ import StructureTabPane from "./StructureTabPane";
 export const StructureTabPaneRoutes = ({}) => (
   <Switch>
     <Route path={STRUCTURE_VERSION_VERSIONS} component={StructureTabPane} />
+    <Route path={STRUCTURE_VERSION_FIELDS} component={StructureTabPane} />
     <Route path={STRUCTURE_VERSION} component={StructureTabPane} />
     <Route path={STRUCTURE_PROFILE} component={StructureTabPane} />
     <Route path={STRUCTURE_STRUCTURE_LINKS} component={StructureTabPane} />
@@ -36,6 +39,7 @@ export const StructureTabPaneRoutes = ({}) => (
     <Route path={STRUCTURE_MEMBERS} component={StructureTabPane} />
     <Route path={STRUCTURE_RULES} component={StructureTabPane} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabPane} />
+    <Route path={STRUCTURE_FIELDS} component={StructureTabPane} />
     <Route path={STRUCTURE_PARENTS} component={StructureTabPane} />
     <Route path={STRUCTURE_LINEAGE} component={StructureTabPane} />
     <Route path={STRUCTURE_IMPACT} component={StructureTabPane} />

package/src/components/StructureTabRoutes.js

@@ -3,6 +3,8 @@ import { Route, Switch } from "react-router-dom";
 import {
   STRUCTURE,
   STRUCTURE_CHILDREN,
+  STRUCTURE_FIELDS,
+  STRUCTURE_VERSION_FIELDS,
   STRUCTURE_EVENTS,
   STRUCTURE_GRANTS,
   STRUCTURE_IMPACT,
@@ -24,6 +26,7 @@ import StructureTabs from "./StructureTabs";
 export const StructureTabRoutes = () => (
   <Switch>
     <Route path={STRUCTURE_VERSION_VERSIONS} component={StructureTabs} />
+    <Route path={STRUCTURE_VERSION_FIELDS} component={StructureTabs} />
     <Route path={STRUCTURE_VERSION} component={StructureTabs} />
     <Route path={STRUCTURE_PROFILE} component={StructureTabs} />
     <Route path={STRUCTURE_LINKS} component={StructureTabs} />
@@ -36,6 +39,7 @@ export const StructureTabRoutes = () => (
     <Route path={STRUCTURE_RULES} component={StructureTabs} />
     <Route path={STRUCTURE_LINEAGE} component={StructureTabs} />
     <Route path={STRUCTURE_CHILDREN} component={StructureTabs} />
+    <Route path={STRUCTURE_FIELDS} component={StructureTabs} />
     <Route path={STRUCTURE_PARENTS} component={StructureTabs} />
     <Route path={STRUCTURE_IMPACT} component={StructureTabs} />
     <Route path={STRUCTURE} component={StructureTabs} exact />

package/src/components/StructureTabs.js

@@ -10,10 +10,11 @@ import { linkTo } from "@truedat/core/routes";
 import { getActiveTab } from "../selectors/getActiveTab";
 import { getTabVisibility } from "../selectors/getTabVisibility";
 
-const structureLink = ({ id }, version) =>
-  _.isNil(version)
-    ? linkTo.STRUCTURE({ id })
-    : linkTo.STRUCTURE_VERSION({ id, version });
+const structureFields = ({ id }, version) => {
+  return _.isNil(version)
+    ? linkTo.STRUCTURE_FIELDS({ id })
+    : linkTo.STRUCTURE_VERSION_FIELDS({ id, version });
+};
 
 const versionsLink = ({ id }, version) =>
   _.isNil(version)
@@ -40,6 +41,7 @@ export const StructureTabs = ({
     versions,
   } = {},
   structure,
+  structureTabsOrder,
   version,
 }) => {
   const { formatMessage } = useIntl();
@@ -48,7 +50,7 @@ export const StructureTabs = ({
         {
           active: activeTab === "fields",
           as: Link,
-          to: structureLink(structure, version),
+          to: structureFields(structure, version),
           content: fields ? formatMessage({ id: "tabs.dd.fields" }) : false,
           key: "fields",
         },
@@ -154,6 +156,24 @@ export const StructureTabs = ({
         },
       ])
     : null;
+
+  structureTabsOrder
+    ? items.sort((a, b) => {
+        const aIndex = _.indexOf(a.key)(structureTabsOrder);
+        const bIndex = _.indexOf(b.key)(structureTabsOrder);
+        if (aIndex !== -1 && bIndex !== -1) {
+          return aIndex - bIndex;
+        }
+        if (aIndex !== -1) {
+          return -1;
+        }
+        if (bIndex !== -1) {
+          return 1;
+        }
+        return 0;
+      })
+    : items;
+
   return (
     <>
       <Menu
@@ -171,22 +191,24 @@ export const StructureTabs = ({
 
 StructureTabs.propTypes = {
   structure: PropTypes.object,
+  structureTabsOrder: PropTypes.array,
   version: PropTypes.string,
   activeTab: PropTypes.string,
   tabVisibility: PropTypes.object,
 };
 
-const mapStateToProps = (state, ownProps) => {
+const mapStateToProps = ({ structureTabsOrder, ...state }, ownProps) => {
   const {
     match: { path },
   } = ownProps;
   const { structureVersion: version, structure } = state;
   const tabVisibility = getTabVisibility(state, path);
-  const activeTab = getActiveTab(tabVisibility, path);
+  const activeTab = getActiveTab(tabVisibility, path, structureTabsOrder);
 
   return {
     activeTab,
     structure,
+    structureTabsOrder,
     tabVisibility,
     version,
   };

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

@@ -6,6 +6,10 @@ exports[`<StructureTabRoutes /> matches the latest snapshot 1`] = `
     component={[Function]}
     path="/structures/:id/versions/:version/versions"
   />
+  <Route
+    component={[Function]}
+    path="/structures/:id/versions/:version/fields"
+  />
   <Route
     component={[Function]}
     path="/structures/:id/versions/:version"
@@ -54,6 +58,10 @@ exports[`<StructureTabRoutes /> matches the latest snapshot 1`] = `
     component={[Function]}
     path="/structures/:id/children"
   />
+  <Route
+    component={[Function]}
+    path="/structures/:id/fields"
+  />
   <Route
     component={[Function]}
     path="/structures/:id/parents"

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

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

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

@@ -32,7 +32,7 @@ describe("selectors: defaultTab", () => {
   const versions = truthy;
   const grants = truthy;
 
-  it("should determine value according to precedence", () => {
+  it("should determine value according to precedence without custom order", () => {
     expect(defaultTab({ children, fields })).toBe("fields");
     expect(defaultTab({ children, notes })).toBe("children");
     expect(defaultTab({ notes, parents })).toBe("notes");
@@ -45,6 +45,34 @@ describe("selectors: defaultTab", () => {
     expect(defaultTab({ versions })).toBe("versions");
     expect(defaultTab({})).toBe(undefined);
   });
+
+  it("should determine value according to precedence with custom order", () => {
+    const tabsOrder = [
+      "versions",
+      "links",
+      "roles",
+      "rules",
+      "profile",
+      "parents",
+      "metadata",
+      "grants",
+      "notes",
+      "children",
+      "fields",
+    ];
+    expect(defaultTab({ children, fields }, tabsOrder)).toBe("children");
+    expect(defaultTab({ children, notes }, tabsOrder)).toBe("notes");
+    expect(defaultTab({ notes, parents }, tabsOrder)).toBe("parents");
+    expect(defaultTab({ grants, parents }, tabsOrder)).toBe("parents");
+    expect(defaultTab({ parents, profile }, tabsOrder)).toBe("profile");
+    expect(defaultTab({ profile, rules }, tabsOrder)).toBe("rules");
+    expect(defaultTab({ links, rules }, tabsOrder)).toBe("links");
+    expect(defaultTab({ links, roles }, tabsOrder)).toBe("links");
+    expect(defaultTab({ links, versions }, tabsOrder)).toBe("versions");
+    expect(defaultTab({ versions }, tabsOrder)).toBe("versions");
+    expect(defaultTab({ fields }, tabsOrder)).toBe("fields");
+    expect(defaultTab({}, tabsOrder)).toBe(undefined);
+  });
 });
 
 describe("selectors: getActiveTab", () => {

package/src/selectors/getActiveTab.js

@@ -3,6 +3,8 @@ import {
   STRUCTURE,
   STRUCTURE_VERSION,
   STRUCTURE_CHILDREN,
+  STRUCTURE_FIELDS,
+  STRUCTURE_VERSION_FIELDS,
   STRUCTURE_METADATA,
   STRUCTURE_NOTES,
   STRUCTURE_NOTES_EDIT,
@@ -21,24 +23,30 @@ import {
   STRUCTURE_IMPACT,
 } from "@truedat/core/routes";
 
-export const defaultTab = _.cond([
-  [_.conformsTo({ fields: _.identity }), _.constant("fields")],
-  [_.conformsTo({ children: _.identity }), _.constant("children")],
-  [_.conformsTo({ notes: _.identity }), _.constant("notes")],
-  [_.conformsTo({ grants: _.identity }), _.constant("grants")],
-  [_.conformsTo({ metadata: _.identity }), _.constant("metadata")],
-  [_.conformsTo({ parents: _.identity }), _.constant("parents")],
-  [_.conformsTo({ profile: _.identity }), _.constant("profile")],
-  [_.conformsTo({ rules: _.identity }), _.constant("rules")],
-  [_.conformsTo({ roles: _.identity }), _.constant("roles")],
-  [_.conformsTo({ links: _.identity }), _.constant("links")],
-  [_.conformsTo({ versions: _.identity }), _.constant("versions")],
-]);
+export const defaultTab = (tabVisibility, tabsOrder = []) => {
+  const defaultOrder = [
+    "fields",
+    "children",
+    "notes",
+    "grants",
+    "metadata",
+    "parents",
+    "profile",
+    "rules",
+    "roles",
+    "links",
+    "versions",
+  ];
 
-export const getActiveTab = (tabVisibility, path) => {
+  return _.find((tab) => tabVisibility[tab])([...tabsOrder, ...defaultOrder]);
+};
+
+export const getActiveTab = (tabVisibility, path, tabsOrder) => {
   return _.cond([
-    [_.eq(STRUCTURE), _.constant(defaultTab(tabVisibility))],
-    [_.eq(STRUCTURE_VERSION), _.constant(defaultTab(tabVisibility))],
+    [_.eq(STRUCTURE), _.constant(defaultTab(tabVisibility, tabsOrder))],
+    [_.eq(STRUCTURE_VERSION), _.constant(defaultTab(tabVisibility, tabsOrder))],
+    [_.eq(STRUCTURE_VERSION_FIELDS), _.constant("fields")],
+    [_.eq(STRUCTURE_FIELDS), _.constant("fields")],
     [_.eq(STRUCTURE_CHILDREN), _.constant("children")],
     [_.eq(STRUCTURE_NOTES), _.constant("notes")],
     [_.eq(STRUCTURE_NOTES_EDIT), _.constant("notes")],