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.

Sign up for GitHub

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

fix: Manage members layout is broken #3058

Merged
merged 2 commits into from
Dec 5, 2023
Merged

fix: Manage members layout is broken #3058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599acc5
fix: Manage members layout is broken
novakzaballa Nov 28, 2023
0f440c5
Re-order values in the widths array
novakzaballa Dec 1, 2023
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
33 changes: 21 additions & 12 deletions frontend/web/components/pages/OrganisationSettingsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import PageTitle from 'components/PageTitle'
import { getStore } from 'common/store'
import { getRoles } from 'common/services/useRole'

const widths = [450, 150, 100]
const widths = [450, 255, 250, 235, 150, 100]
const rolesWidths = [250, 600, 100]
const OrganisationSettingsPage = class extends Component {
static contextTypes = {
Expand Down Expand Up @@ -955,23 +955,28 @@ const OrganisationSettingsPage = class extends Component {
<Flex className='table-column px-3'>
User
</Flex>
<Flex className='table-column'>
<Flex
className='table-column'
style={{
minWidth: widths[1],
}}
>
Role
</Flex>
<div
style={{ width: widths[0] }}
style={{ width: widths[2] }}
className='table-column'
>
Action
</div>
<div
style={{ width: widths[1] }}
style={{ width: widths[4] }}
className='table-column'
>
Last logged in
</div>
<div
style={{ width: widths[2] }}
style={{ width: widths[5] }}
className='table-column text-center'
>
Remove
Expand Down Expand Up @@ -1021,7 +1026,11 @@ const OrganisationSettingsPage = class extends Component {
</Flex>

<Flex className='table-column'>
<div>
<div
style={{
minWidth: widths[3],
}}
>
{organisation.role ===
'ADMIN' &&
id !==
Expand Down Expand Up @@ -1095,7 +1104,7 @@ const OrganisationSettingsPage = class extends Component {
{role !== 'ADMIN' ? (
<div
style={{
width: widths[0],
width: widths[2],
}}
onClick={onEditClick}
className='table-column'
Expand All @@ -1115,13 +1124,13 @@ const OrganisationSettingsPage = class extends Component {
) : (
<div
style={{
width: widths[0],
width: widths[2],
}}
></div>
)}
<div
style={{
width: widths[1],
width: widths[4],
}}
className='table-column'
>
Expand All @@ -1133,7 +1142,7 @@ const OrganisationSettingsPage = class extends Component {
</div>
<div
style={{
width: widths[2],
width: widths[5],
}}
className='table-column text-center'
>
Expand Down Expand Up @@ -1213,7 +1222,7 @@ const OrganisationSettingsPage = class extends Component {
</div>
<div
style={{
width: widths[2],
width: widths[5],
}}
className='table-column text-center'
>
Expand Down Expand Up @@ -1280,7 +1289,7 @@ const OrganisationSettingsPage = class extends Component {
<div
className='table-column text-center'
style={{
width: widths[2],
width: widths[5],
}}
>
<Button
Expand Down