@truedat/auth 6.16.1 → 6.16.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/auth",
-  "version": "6.16.1",
+  "version": "6.16.5",
   "description": "Truedat Web Auth",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -109,5 +109,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "717d91b523c2e29e373791fef9c12b3a561449b7"
+  "gitHead": "c48a14cb239ca2b3e559467c9e153f19513a7521"
 }

package/src/users/components/User.js

@@ -37,6 +37,13 @@ export const User = ({ user }) => {
             <UserActions />
           </Grid.Column>
           <Grid.Column width={8}>
+            {user.external_id == null ? (
+              user.external_id
+            ) : (
+              <>
+                {user.external_id} <br />
+              </>
+            )}
             {user.full_name}
             <br />
             {user.email}

package/src/users/components/UserCard.js

@@ -6,14 +6,17 @@ import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
 import { deleteUser } from "../routines";
 
-export const UserCard = ({ user: { user_name, id, full_name, email } }) => (
+export const UserCard = ({
+  user: { user_name, id, full_name, email, external_id },
+  showFullName = true,
+}) => (
   <Card key={id}>
     <Card.Content>
       <Card.Header as={Link} to={linkTo.USER({ id })}>
         <Icon name="user" /> {user_name}
       </Card.Header>
       <Card.Description>
-        {full_name}
+        {showFullName ? full_name : external_id}
         <br />
         {email}
       </Card.Description>
@@ -23,6 +26,7 @@ export const UserCard = ({ user: { user_name, id, full_name, email } }) => (
 
 UserCard.propTypes = {
   user: PropTypes.object,
+  showFullName: PropTypes.bool,
 };
 
 export default connect(null, { deleteUser })(UserCard);

package/src/users/components/UserCards.js

@@ -10,7 +10,7 @@ import { USERS_NEW } from "@truedat/core/routes";
 import { filterUsers } from "../selectors/filterUsers";
 import UserCard from "./UserCard";
 
-export const UserCards = ({ users: allUsers }) => {
+export const UserCards = ({ users: allUsers, showFullName }) => {
   const [filter, setFilter] = useState("");
   const { formatMessage } = useIntl();
   const users = _.flow(_.sortBy("user_name"), filterUsers(filter))(allUsers);
@@ -43,7 +43,7 @@ export const UserCards = ({ users: allUsers }) => {
           />
           <Card.Group>
             {users.map((user, i) => (
-              <UserCard key={i} user={user} />
+              <UserCard key={i} user={user} showFullname={showFullName} />
             ))}
           </Card.Group>
         </React.Fragment>
@@ -65,8 +65,13 @@ export const UserCards = ({ users: allUsers }) => {
 
 UserCards.propTypes = {
   users: PropTypes.array,
+  showFullName: PropTypes.bool,
 };
 
-export const mapStateToProps = ({ users }) => ({ users });
+export const mapStateToProps = (state) => ({
+  users: state.users,
+  UserCard: state.userCard,
+  showFullName: state.userCardFullName,
+});
 
 export default connect(mapStateToProps)(UserCards);

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

@@ -10,11 +10,17 @@ describe("<UserCard />", () => {
     role: "admin",
     full_name: "Joe Bloggs",
     email: "joe@bloggs.net",
+    uid: "uID00001",
   };
-  const props = { user, deleteUser };
+  const props_fullname = { user, deleteUser, showFullname: true };
+  const props_uid = { user, deleteUser, showFullname: false };
 
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<UserCard {...props} />);
+    const wrapper = shallow(<UserCard {...props_fullname} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+  it("matches the latest snapshot", () => {
+    const wrapper = shallow(<UserCard {...props_uid} />);
     expect(wrapper).toMatchSnapshot();
   });
 });

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

@@ -37,3 +37,41 @@ exports[`<UserCard /> matches the latest snapshot 1`] = `
   </CardContent>
 </Card>
 `;
+
+exports[`<UserCard /> matches the latest snapshot 2`] = `
+<Card
+  key="1"
+>
+  <CardContent>
+    <CardHeader
+      as={
+        {
+          "$$typeof": Symbol(react.forward_ref),
+          "displayName": "Link",
+          "propTypes": {
+            "innerRef": [Function],
+            "onClick": [Function],
+            "replace": [Function],
+            "target": [Function],
+            "to": [Function],
+          },
+          "render": [Function],
+        }
+      }
+      to="/users/1"
+    >
+      <Icon
+        as="i"
+        name="user"
+      />
+       
+      joe
+    </CardHeader>
+    <CardDescription>
+      Joe Bloggs
+      <br />
+      joe@bloggs.net
+    </CardDescription>
+  </CardContent>
+</Card>
+`;