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: tweak sdk copy #3341

Merged
merged 1 commit into from
Jan 29, 2024
Merged

fix: tweak sdk copy #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions frontend/web/components/AdminAPIKeys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,10 @@ export default class AdminAPIKeys extends PureComponent {
{!!apiKeys && !!apiKeys.length && (
<PanelSearch
className='no-pad'
title='API Keys'
items={apiKeys}
header={
<Row className='table-header'>
<Flex className='table-column px-3'>API Keys</Flex>
<Flex className='table-column px-3'>Terraform API Keys</Flex>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this change back to Terraform API keys? This was changed on purpose since we're soon going to support regular API keys (using roles etc.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's clearer right now. We would probably want to split out legacy keys in a separate table anyway?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean by 'legacy keys' ??

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I mean I'm not sure what we are doing with "Terraform keys" are we going to deprecate them or call them something different?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're just going to exist in the same 'API keys' section

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the exact same entity under the hood.

<Flex className='table-column'>Created</Flex>
<div
className='table-column text-center'
Expand Down
2 changes: 1 addition & 1 deletion frontend/web/components/ServerSideSDKKeys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class ServerSideSDKKeys extends Component {
using our{' '}
<Button
theme='text'
href='https://docs.flagsmith.com/clients/overview'
href='https://docs.flagsmith.com/clients/overview#server-side-sdks'
target='__blank'
>
Server-side Environment Keys
Expand Down
14 changes: 12 additions & 2 deletions frontend/web/components/pages/EnvironmentSettingsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,11 +660,21 @@ const EnvironmentSettingsPage = class extends Component {
</div>
</div>
</TabItem>
<TabItem tabLabel='Keys'>
<TabItem tabLabel='SDK Keys'>
<FormGroup className='mt-4'>
<h5 className='mb-5'>Client-side Environment Key</h5>
<div className='col-md-6'>
<label>Environment Key</label>
<p className='fs-small lh-sm mb-0'>
Use this key to initialise{' '}
<Button
theme='text'
href='https://docs.flagsmith.com/clients/overview#client-side-sdks'
target='__blank'
>
Client-side
</Button>
{' '}SDKs.
</p>
<Row>
<Flex>
<Input
Expand Down
2 changes: 1 addition & 1 deletion frontend/web/components/pages/OrganisationSettingsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ const OrganisationSettingsPage = class extends Component {
)}

{displayedTabs.includes(SettingsTab.Keys) && (
<TabItem tabLabel='Keys'>
<TabItem tabLabel='API Keys'>
<AdminAPIKeys organisationId={organisation.id} />
</TabItem>
)}
Expand Down
Loading