@truedat/auth 8.12.7 → 8.12.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "8.12.7",
+  "version": "8.12.9",
   "description": "Truedat Web Auth",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -54,16 +54,16 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.12.7",
+    "@truedat/test": "8.12.8",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "@truedat/core": "8.12.7",
+    "@truedat/core": "8.12.9",
     "auth0-js": "^10.2.0",
-    "axios": "^1.15.0",
+    "axios": "^1.20.0",
     "graphql": "^16.11.0",
     "is-hotkey": "^0.2.0",
     "is-url": "^1.2.4",
@@ -90,5 +90,5 @@
     "swr": "^2.3.3"
   },
   "overrides": {},
-  "gitHead": "dae06fd2f915163d5f1e7e3f26c414c8ee9bf055"
+  "gitHead": "daeb646a9077620db07b6a385b705fe8b8dd62ed"
 }

package/src/users/components/UserAclRow.js

@@ -1,15 +1,16 @@
 import PropTypes from "prop-types";
 import { Table } from "semantic-ui-react";
+import { DomainTooltip } from "@truedat/bg/taxonomy/components/DomainPath";
 
 export const UserAclRow = ({ resource, role }) => (
   <Table.Row>
-    <Table.Cell content={resource} />
+    <Table.Cell content={<DomainTooltip domain={resource} />} />
     <Table.Cell content={role} />
   </Table.Row>
 );
 
 UserAclRow.propTypes = {
-  resource: PropTypes.string,
+  resource: PropTypes.object,
   role: PropTypes.string,
 };
 

package/src/users/components/UserGroupAclRow.js

@@ -1,16 +1,17 @@
 import PropTypes from "prop-types";
 import { Table } from "semantic-ui-react";
+import { DomainTooltip } from "@truedat/bg/taxonomy/components/DomainPath";
 
 export const UserGroupAclRow = ({ resource, role, group }) => (
   <Table.Row>
-    <Table.Cell content={resource} />
+    <Table.Cell content={<DomainTooltip domain={resource} />} />
     <Table.Cell content={group} />
     <Table.Cell content={role} />
   </Table.Row>
 );
 
 UserGroupAclRow.propTypes = {
-  resource: PropTypes.string,
+  resource: PropTypes.object,
   role: PropTypes.string,
   group: PropTypes.string,
 };

package/src/users/components/__tests__/UserGroupAclRow.spec.js

@@ -4,7 +4,7 @@ import UserGroupAclRow from "../UserGroupAclRow";
 
 describe("<UserGroupAclRow />", () => {
   const props = {
-    resource: "resource1",
+    resource: { id: 1, name: "resource1" },
     role: "role1",
     group: "grupo1",
   };

package/src/users/components/__tests__/__snapshots__/UserAcls.spec.js.snap

@@ -37,7 +37,9 @@ exports[`<UserAcls /> matches the latest snapshot 1`] = `
         <td
           class=""
         >
-          resource1
+          <span>
+            resource1
+          </span>
         </td>
         <td
           class=""
@@ -51,7 +53,9 @@ exports[`<UserAcls /> matches the latest snapshot 1`] = `
         <td
           class=""
         >
-          resource2
+          <span>
+            resource2
+          </span>
         </td>
         <td
           class=""

package/src/users/components/__tests__/__snapshots__/UserGroupAclRow.spec.js.snap

@@ -10,7 +10,9 @@ exports[`<UserGroupAclRow /> matches the latest snapshot 1`] = `
         <td
           class=""
         >
-          resource1
+          <span>
+            resource1
+          </span>
         </td>
         <td
           class=""

package/src/users/selectors/__tests__/getUserAcls.spec.js

@@ -27,7 +27,7 @@ describe("selectors: getUserGroupAcls", () => {
     expect(res).toEqual(
       expect.arrayContaining([
         {
-          resource: acl3.resource.name,
+          resource: acl3.resource,
           role: acl3.role.name,
           group: acl3.group.name,
         },

package/src/users/selectors/__tests__/getUserGroupAcls.spec.js

@@ -25,12 +25,12 @@ describe("selectors: getUserGroupAcls", () => {
 
     expect(res).toEqual([
       {
-        resource: aclWithAlias.resource.name,
+        resource: aclWithAlias.resource,
         role: aclWithAlias.role.name,
         group: aclWithAlias.group.alias,
       },
       {
-        resource: aclWithoutAlias.resource.name,
+        resource: aclWithoutAlias.resource,
         role: aclWithoutAlias.role.name,
         group: aclWithoutAlias.group.name,
       },

package/src/users/selectors/getUserAcls.js

@@ -5,7 +5,7 @@ import { getUser } from "./getUser";
 const isAcl = flow(prop("group"), isEmpty);
 
 const buildAcl = (m) => ({
-  resource: m.resource.name,
+  resource: m.resource,
   role: m.role.name,
 });
 
@@ -15,6 +15,6 @@ export const getUserAcls = createSelector(
     prop("acls"),
     filter(isAcl),
     map(buildAcl),
-    sortBy(["resource", "role"]),
+    sortBy(["resource.name", "role"]),
   ),
 );

package/src/users/selectors/getUserGroupAcls.js

@@ -5,7 +5,7 @@ import { getUser } from "./getUser";
 const isGroupAcl = (m) => !_.flow(_.prop("group"), _.isEmpty)(m);
 
 const buildGroupAcl = (m) => ({
-  resource: m.resource.name,
+  resource: m.resource,
   role: m.role.name,
   group: m.group.alias || m.group.name,
 });
@@ -15,6 +15,6 @@ export const getUserGroupAcls = createSelector([getUser], (user) =>
     _.prop("acls"),
     _.filter(isGroupAcl),
     _.map(buildGroupAcl),
-    _.sortBy(["resource", "role"]),
+    _.sortBy(["resource.name", "role"]),
   )(user),
 );