-
Notifications
You must be signed in to change notification settings - Fork 8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix_ilm_navigation
- Loading branch information
Showing
41 changed files
with
163 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
...arch/public/applications/workplace_search/components/shared/source_config_fields/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| export { SourceConfigFields } from './source_config_fields'; |
45 changes: 45 additions & 0 deletions
45
...ons/workplace_search/components/shared/source_config_fields/source_config_fields.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { shallow } from 'enzyme'; | ||
|
|
||
| import { ApiKey } from '../api_key'; | ||
| import { CredentialItem } from '../credential_item'; | ||
|
|
||
| import { SourceConfigFields } from './'; | ||
|
|
||
| describe('SourceConfigFields', () => { | ||
| it('renders empty with no items', () => { | ||
| const wrapper = shallow(<SourceConfigFields />); | ||
|
|
||
| expect(wrapper.find(ApiKey)).toHaveLength(0); | ||
| expect(wrapper.find(CredentialItem)).toHaveLength(0); | ||
| }); | ||
|
|
||
| it('renders with all items, hiding API Keys', () => { | ||
| const wrapper = shallow( | ||
| <SourceConfigFields | ||
| clientId="123" | ||
| clientSecret="456" | ||
| publicKey="abc" | ||
| consumerKey="def" | ||
| baseUrl="ghi" | ||
| /> | ||
| ); | ||
|
|
||
| expect(wrapper.find(ApiKey)).toHaveLength(0); | ||
| expect(wrapper.find(CredentialItem)).toHaveLength(3); | ||
| }); | ||
|
|
||
| it('shows API keys', () => { | ||
| const wrapper = shallow( | ||
| <SourceConfigFields clientSecret="456" publicKey="abc" consumerKey="def" baseUrl="ghi" /> | ||
| ); | ||
|
|
||
| expect(wrapper.find(ApiKey)).toHaveLength(2); | ||
| }); | ||
| }); |
61 changes: 61 additions & 0 deletions
61
...ications/workplace_search/components/shared/source_config_fields/source_config_fields.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| import { EuiSpacer } from '@elastic/eui'; | ||
|
|
||
| import { ApiKey } from '../api_key'; | ||
| import { CredentialItem } from '../credential_item'; | ||
|
|
||
| interface ISourceConfigFieldsProps { | ||
| clientId?: string; | ||
| clientSecret?: string; | ||
| publicKey?: string; | ||
| consumerKey?: string; | ||
| baseUrl?: string; | ||
| } | ||
|
|
||
| export const SourceConfigFields: React.FC<ISourceConfigFieldsProps> = ({ | ||
| clientId, | ||
| clientSecret, | ||
| publicKey, | ||
| consumerKey, | ||
| baseUrl, | ||
| }) => { | ||
| const showApiKey = (publicKey || consumerKey) && !clientId; | ||
|
|
||
| const credentialItem = (label: string, item?: string) => | ||
| item && <CredentialItem label={label} value={item} testSubj={label} hideCopy />; | ||
|
|
||
| const keyElement = ( | ||
| <> | ||
| {publicKey && ( | ||
| <> | ||
| <ApiKey label="Public Key" apiKey={publicKey} /> | ||
| <EuiSpacer /> | ||
| </> | ||
| )} | ||
| {consumerKey && ( | ||
| <> | ||
| <ApiKey label="Consumer Key" apiKey={consumerKey} /> | ||
| <EuiSpacer /> | ||
| </> | ||
| )} | ||
| </> | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| {showApiKey && keyElement} | ||
| {credentialItem('Client id', clientId)} | ||
| <EuiSpacer size="s" /> | ||
| {credentialItem('Client secret', clientSecret)} | ||
| <EuiSpacer size="s" /> | ||
| {credentialItem('Base URL', baseUrl)} | ||
| </> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.