Skip to content

[Workplace Search] Cleanup a couple of minor sources issues. #84961

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 3 commits into from
Dec 4, 2020
Merged

[Workplace Search] Cleanup a couple of minor sources issues. #84961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ec894c
Set queued message instead of immediate message
scottybollinger Dec 3, 2020
435be54
Don’t pass empty query params
scottybollinger Dec 3, 2020
3ce7f67
Merge branch 'master' into scottybollinger/sources-cleanup
kibanamachine Dec 4, 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
6 changes: 4 additions & 2 deletions ...erprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { keys, pickBy } from 'lodash';
import { keys, pickBy, isEmpty } from 'lodash';

import { kea, MakeLogicType } from 'kea';

Expand Down Expand Up @@ -486,8 +486,10 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
if (subdomain) params.append('subdomain', subdomain);
if (indexPermissions) params.append('index_permissions', indexPermissions.toString());

const paramsString = !isEmpty(params) ? `?${params}` : '';

try {
const response = await HttpLogic.values.http.get(`${route}?${params}`);
const response = await HttpLogic.values.http.get(`${route}${paramsString}`);
actions.setSourceConnectData(response);
successCallback(response.oauthUrl);
} catch (e) {
Expand Down
4 changes: 2 additions & 2 deletions ...rprise_search/public/applications/workplace_search/views/content_sources/sources_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { HttpLogic } from '../../../shared/http';

import {
flashAPIErrors,
setSuccessMessage,
setQueuedSuccessMessage,
FlashMessagesLogic,
} from '../../../shared/flash_messages';

Expand Down Expand Up @@ -225,7 +225,7 @@ export const SourcesLogic = kea<MakeLogicType<ISourcesValues, ISourcesActions>>(
}
);

setSuccessMessage(
setQueuedSuccessMessage(
[
successfullyConnectedMessage,
additionalConfiguration ? additionalConfigurationMessage : '',
Expand Down