Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 9550 - Update to display office group id #10662

Merged
merged 6 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ exports[`ErrorBoundary should match a snapshot when no error 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,4 @@ exports[`Nav should match a snapshot 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -673,4 +673,4 @@ exports[`OrgsPage should match a snapshot 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
4 changes: 2 additions & 2 deletions packages/rc-service/src/components/users/__styles__/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ export const DisplayChip = styled.span`
display: inline-block;
`

export const twoColTable = css`
grid-template-columns: repeat(2, 1fr);
export const threeColTable = css`
grid-template-columns: repeat(3, 1fr);
`
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ exports[`UpdateUserModal should match a snapshot where there is data 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ exports[`UsersPage should match a snapshot 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
8 changes: 5 additions & 3 deletions packages/rc-service/src/components/users/user-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
elMb7,
useModal,
} from '@reapit/elements'
import { DisplayChip, twoColTable } from './__styles__'
import { DisplayChip, threeColTable } from './__styles__'
import {
GetActionNames,
SendFunction,
Expand Down Expand Up @@ -307,12 +307,14 @@ export const UserContent: FC<UserContentProps> = ({ user, refreshUsers, userGrou
{userInfo && shouldFetch.officeGroups && userInfo.officeGroupIds ? (
<>
<Table>
<TableHeadersRow className={twoColTable}>
<TableHeadersRow className={threeColTable}>
<TableHeader>Group Name</TableHeader>
<TableHeader>Office Group Id</TableHeader>
<TableHeader>Office Ids</TableHeader>
</TableHeadersRow>
<TableRow className={twoColTable}>
<TableRow className={threeColTable}>
<TableCell>{userInfo.officeGroupName}</TableCell>
<TableCell>{userInfo.officeGroupId}</TableCell>
<TableCell>{userInfo.officeGroupIds}</TableCell>
</TableRow>
</Table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ exports[`PrivateRouter should match a snapshot 1`] = `
"rerender": [Function],
"unmount": [Function],
}
`;
`;
Loading