Skip to content

[Enterprise Search] Added Logic for the Credentials View #77626

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

Merged
merged 35 commits into from
Sep 28, 2020
Merged

[Enterprise Search] Added Logic for the Credentials View #77626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7641d56
Add Logic for the Credentials View
JasonStoltz Sep 16, 2020
91392ae
TS fixes
JasonStoltz Sep 17, 2020
3e1fe7d
Removed keyHelpText
JasonStoltz Sep 21, 2020
1fa29d5
Whitespace adjustments in credentials test
JasonStoltz Sep 21, 2020
d1c2444
Removed apiUrl from credentials logic
JasonStoltz Sep 21, 2020
8ba4cee
Prefer arrow syntax and inlined declarations
JasonStoltz Sep 21, 2020
b2eec73
Removed unused code
JasonStoltz Sep 21, 2020
b8a77a2
Removed unused apiTokenSort
JasonStoltz Sep 21, 2020
b6d0fb5
Removed TODOs about flashMessages
JasonStoltz Sep 21, 2020
08ab4f7
Fixed bad delete route
JasonStoltz Sep 21, 2020
33cc9d5
Move credentials constants to /credentials
JasonStoltz Sep 21, 2020
c80e0c8
Moved format_api_name
JasonStoltz Sep 21, 2020
18dd7ef
Apply suggestions from code review
JasonStoltz Sep 21, 2020
844f6e2
Apply suggestions from code review
JasonStoltz Sep 21, 2020
0ede789
Merge branch 'master' into credentials-logic
JasonStoltz Sep 21, 2020
77e519b
Suggestion edits and error handling
JasonStoltz Sep 22, 2020
4ff917d
Updated formatApiName tests
JasonStoltz Sep 22, 2020
c715de8
Updated formatApiName implementation
JasonStoltz Sep 22, 2020
a0d519e
Prefer arrow syntax in flushPromises
JasonStoltz Sep 22, 2020
fb3d159
Accepted suggestions for constants file
JasonStoltz Sep 22, 2020
75eb3c4
Moved types to public
JasonStoltz Sep 22, 2020
a83ca06
Create ITokenReadWrite type
JasonStoltz Sep 22, 2020
9111c36
Removed unnecessary comment
JasonStoltz Sep 22, 2020
6347c61
Removed 'Should not change tests'
JasonStoltz Sep 22, 2020
b7349e5
Dry up tests
JasonStoltz Sep 22, 2020
4e1d616
Revert "Dry up tests"
JasonStoltz Sep 23, 2020
c58121b
Changed the meta type to Partial<IMeta>
JasonStoltz Sep 23, 2020
175198d
Adjusted space for consistency and readability
JasonStoltz Sep 23, 2020
585f6e6
Removed flushPromise
JasonStoltz Sep 24, 2020
5a46c08
PR Feedback and Coverage
JasonStoltz Sep 24, 2020
1cd6812
Loosened up test types
JasonStoltz Sep 24, 2020
defa75f
Moved ICredentialsDetails
JasonStoltz Sep 24, 2020
a7db3ed
Merge branch 'master' into credentials-logic
JasonStoltz Sep 24, 2020
7422f90
Moved IApiToken type
JasonStoltz Sep 24, 2020
5437fbd
Moved error expectations
JasonStoltz Sep 24, 2020
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
24 changes: 0 additions & 24 deletions x-pack/plugins/enterprise_search/common/__mocks__/flush_promises.ts
View file
Open in desktop

This file was deleted.

45 changes: 30 additions & 15 deletions ...se_search/public/applications/app_search/components/credentials/credentials_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jest.mock('../../../shared/flash_messages', () => ({
}));
import { flashAPIErrors } from '../../../shared/flash_messages';
import { IMeta } from '../../../../../common/types';
import { flushPromises } from '../../../../../common/__mocks__/flush_promises';
import { IApiToken, ICredentialsDetails } from '../../types';

describe('CredentialsLogic', () => {
Expand Down Expand Up @@ -1097,24 +1096,30 @@ describe('CredentialsLogic', () => {
it('will call an API endpoint and set the results with the `setCredentialsData` action', async () => {
mount();
jest.spyOn(CredentialsLogic.actions, 'setCredentialsData').mockImplementationOnce(() => {});
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(Promise.resolve({ meta, results }));
const promise = Promise.resolve({ meta, results });
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.fetchCredentials(2);
expect(HttpLogic.values.http.get).toHaveBeenCalledWith('/api/app_search/credentials', {
query: {
'page[current]': 2,
},
});
await flushPromises();
await promise;
expect(CredentialsLogic.actions.setCredentialsData).toHaveBeenCalledWith(meta, results);
});

it('handles errors', async () => {
mount();
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(Promise.reject('An error occured'));
const promise = Promise.reject('An error occured');
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.fetchCredentials(2);
await flushPromises();
try {
await promise;
} catch {
// Ignore this
}
expect(flashAPIErrors).toHaveBeenCalledWith('An error occured');
});
});
Expand All @@ -1125,22 +1130,28 @@ describe('CredentialsLogic', () => {
jest
.spyOn(CredentialsLogic.actions, 'setCredentialsDetails')
.mockImplementationOnce(() => {});
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(Promise.resolve(credentialsDetails));
const promise = Promise.resolve(credentialsDetails);
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.fetchDetails();
expect(HttpLogic.values.http.get).toHaveBeenCalledWith('/api/app_search/credentials/details');
await flushPromises();
await promise;
expect(CredentialsLogic.actions.setCredentialsDetails).toHaveBeenCalledWith(
credentialsDetails
);
});

it('handles errors', async () => {
mount();
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(Promise.reject('An error occured'));
const promise = Promise.reject('An error occured');
(HttpLogic.values.http.get as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.fetchDetails();
await flushPromises();
try {
await promise;
} catch {
// Ignore this
}
expect(flashAPIErrors).toHaveBeenCalledWith('An error occured');
});
});
Expand All @@ -1151,24 +1162,28 @@ describe('CredentialsLogic', () => {
it('will call an API endpoint and set the results with the `onApiKeyDelete` action', async () => {
mount();
jest.spyOn(CredentialsLogic.actions, 'onApiKeyDelete').mockImplementationOnce(() => {});
(HttpLogic.values.http.delete as jest.Mock).mockReturnValue(Promise.resolve());
const promise = Promise.resolve();
(HttpLogic.values.http.delete as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.deleteApiKey(tokenName);
expect(HttpLogic.values.http.delete).toHaveBeenCalledWith(
`/api/app_search/credentials/${tokenName}`
);
await flushPromises();
await promise;
expect(CredentialsLogic.actions.onApiKeyDelete).toHaveBeenCalledWith(tokenName);
});

it('handles errors', async () => {
mount();
(HttpLogic.values.http.delete as jest.Mock).mockReturnValue(
Promise.reject('An error occured')
);
const promise = Promise.reject('An error occured');
(HttpLogic.values.http.delete as jest.Mock).mockReturnValue(promise);

CredentialsLogic.actions.deleteApiKey(tokenName);
await flushPromises();
try {
await promise;
} catch {
// Ignore this
}
expect(flashAPIErrors).toHaveBeenCalledWith('An error occured');
});
});
Expand Down