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: hide additional actions on identity overrides tab in Edge #3135

Merged
merged 2 commits into from
Dec 11, 2023
Merged

fix: hide additional actions on identity overrides tab in Edge #3135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0770bf1
Hide additional actions on identity overrides tab in Edge
matthewelwell Dec 11, 2023
32ee163
Disable switch
matthewelwell Dec 11, 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
86 changes: 46 additions & 40 deletions frontend/web/components/modals/CreateFlag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,20 +1337,22 @@ const CreateFlag = class extends Component {
</Tooltip>
}
action={
<Button
onClick={() =>
this.changeIdentity(
this.state.userOverrides,
)
}
type='button'
theme='secondary'
size='small'
>
{enabledIndentity
? 'Enable All'
: 'Disable All'}
</Button>
!Utils.getIsEdge() && (
<Button
onClick={() =>
this.changeIdentity(
this.state.userOverrides,
)
}
type='button'
theme='secondary'
size='small'
>
{enabledIndentity
? 'Enable All'
: 'Disable All'}
</Button>
)
}
items={this.state.userOverrides}
paging={
Expand All @@ -1373,32 +1375,35 @@ const CreateFlag = class extends Component {
this.userOverridesPage(page)
}
searchPanel={
<div className='text-center mt-2 mb-2'>
<Flex className='text-left'>
<IdentitySelect
isEdge={false}
ignoreIds={this.state.userOverrides?.map(
(v) => v.identity?.id,
)}
environmentId={
this.props.environmentId
}
data-test='select-identity'
placeholder='Create an Identity Override...'
value={
this.state.selectedIdentity
}
onChange={(
selectedIdentity,
) =>
this.setState(
{ selectedIdentity },
this.addItem,
)
}
/>
</Flex>
</div>
!Utils.getIsEdge() && (
<div className='text-center mt-2 mb-2'>
<Flex className='text-left'>
<IdentitySelect
isEdge={false}
ignoreIds={this.state.userOverrides?.map(
(v) => v.identity?.id,
)}
environmentId={
this.props.environmentId
}
data-test='select-identity'
placeholder='Create an Identity Override...'
value={
this.state
.selectedIdentity
}
onChange={(
selectedIdentity,
) =>
this.setState(
{ selectedIdentity },
this.addItem,
)
}
/>
</Flex>
</div>
)
}
renderRow={({
enabled,
Expand All @@ -1425,6 +1430,7 @@ const CreateFlag = class extends Component {
identity,
})
}
disabled={Utils.getIsEdge()}
/>
</div>
<div className='font-weight-medium fs-small lh-sm'>
Expand Down