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

[Workplace Search] Migrate SourceLogic from ent-search #83593

Merged
merged 13 commits into from
Nov 18, 2020
Merged

[Workplace Search] Migrate SourceLogic from ent-search #83593

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5d6c3c6
Initial copy/paste of source logic
scottybollinger Nov 17, 2020
82a1195
Add types and route
scottybollinger Nov 17, 2020
174d244
Update paths and typings
scottybollinger Nov 17, 2020
c5f6076
Remove internal flash messages in favor of globals
scottybollinger Nov 17, 2020
ddb64a1
Add return types to callback definitions
scottybollinger Nov 17, 2020
28b8942
Update routes
scottybollinger Nov 17, 2020
e5a39cb
Replace axios with HttpLogic
scottybollinger Nov 17, 2020
d9b78db
Fix incorrect type
scottybollinger Nov 17, 2020
7832179
Create GenericObject to satisfy TypeScript
scottybollinger Nov 17, 2020
3cb5ad3
More strict object typing
scottybollinger Nov 17, 2020
70c5731
Add i18n
scottybollinger Nov 17, 2020
4afbbef
Move button loading action to finally block
scottybollinger Nov 18, 2020
62c7d15
Move route strings to inline
scottybollinger Nov 18, 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
194 changes: 107 additions & 87 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 @@ -8,7 +8,8 @@ import { keys, pickBy } from 'lodash';

import { kea, MakeLogicType } from 'kea';

import http from 'shared/http';
import { HttpLogic } from '../../../shared/http';
import { KibanaLogic } from '../../../shared/kibana';

import {
flashAPIErrors,
Expand Down Expand Up @@ -360,35 +361,35 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
],
}),
listeners: ({ actions, values }) => ({
initializeSource: ({ sourceId, history }) => {
initializeSource: async ({ sourceId }) => {
const { isOrganization } = AppLogic.values;
const route = isOrganization
? `/api/workplace_search/org/sources/${sourceId}`
: `/api/workplace_search/account/sources/${sourceId}`;

http(route)
.then(({ data }) => {
actions.onInitializeSource(data);
if (data.isFederatedSource) {
actions.initializeFederatedSummary(sourceId);
}
})
.catch((error) => {
if (error.response.status === 404) {
history.push(NOT_FOUND_PATH);
} else {
flashAPIErrors(e);
}
});
try {
const response = await HttpLogic.values.http.get(route);
actions.onInitializeSource(response);
if (response.isFederatedSource) {
actions.initializeFederatedSummary(sourceId);
}
} catch (e) {
// TODO: Verify this works once components are there. Not sure if the catch gives a status code.
if (e.response.status === 404) {
KibanaLogic.values.navigateToUrl(NOT_FOUND_PATH);
} else {
flashAPIErrors(e);
}
}
},
initializeFederatedSummary: ({ sourceId }) => {
initializeFederatedSummary: async ({ sourceId }) => {
const route = `/api/workplace_search/org/sources/${sourceId}/federated_summary`;

http(route)
.then(({ data }) => actions.onUpdateSummary(data.summary))
.catch(() => {
flashAPIErrors(e);
});
try {
const response = await HttpLogic.values.http.get(route);
actions.onUpdateSummary(response.summary);
} catch (e) {
flashAPIErrors(e);
}
},
searchContentSourceDocuments: async ({ sourceId }, breakpoint) => {
await breakpoint(300);
Expand All @@ -403,46 +404,57 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
contentMeta: { page },
} = values;

http
.post(route, { query, page })
.then(({ data }) => actions.setSearchResults(data))
.catch(flashAPIErrors(e));
try {
const response = await HttpLogic.values.http.post(route, {
body: JSON.stringify({ query, page }),
});
actions.setSearchResults(response);
} catch (e) {
flashAPIErrors(e);
}
},
updateContentSource: ({ sourceId, source }) => {
updateContentSource: async ({ sourceId, source }) => {
const { isOrganization } = AppLogic.values;
const route = isOrganization
? `/api/workplace_search/org/sources/${sourceId}/settings`
: `/api/workplace_search/account/sources/${sourceId}/settings`;

http
.patch(route, { content_source: source })
.then(({ data }) => actions.onUpdateSourceName(data.name))
.catch(flashAPIErrors(e));
try {
const response = await HttpLogic.values.http.patch(route, {
body: JSON.stringify({ content_source: source }),
});
actions.onUpdateSourceName(response.name);
} catch (e) {
flashAPIErrors(e);
}
},
removeContentSource: ({ sourceId, successCallback }) => {
removeContentSource: async ({ sourceId, successCallback }) => {
FlashMessagesLogic.actions.clearFlashMessages();
const { isOrganization } = AppLogic.values;
const route = isOrganization
? `/api/workplace_search/org/sources/${sourceId}`
: `/api/workplace_search/account/sources/${sourceId}`;

return http
.delete(route)
.then(({ data: { name } }) => {
setQueuedSuccessMessage(`Successfully deleted ${name}`);
successCallback();
})
.catch(flashAPIErrors(e))
.finally(actions.setButtonNotLoading);
try {
const response = await HttpLogic.values.http.delete(route);
setQueuedSuccessMessage(`Successfully deleted ${response.name}`);
successCallback();
} catch (e) {
flashAPIErrors(e);
actions.setButtonNotLoading();
}
},
getSourceConfigData: ({ serviceType }) => {
getSourceConfigData: async ({ serviceType }) => {
const route = `/api/workplace_search/org/settings/connectors/${serviceType}`;

http(route)
.then(({ data }) => actions.setSourceConfigData(data))
.catch(flashAPIErrors(e));
try {
const response = await HttpLogic.values.http.get(route);
actions.setSourceConfigData(response);
} catch (e) {
flashAPIErrors(e);
}
},
getSourceConnectData: ({ serviceType, successCallback }) => {
getSourceConnectData: async ({ serviceType, successCallback }) => {
FlashMessagesLogic.actions.clearFlashMessages();
const { isOrganization } = AppLogic.values;
const { subdomainValue: subdomain, indexPermissionsValue: indexPermissions } = values;
Expand All @@ -455,35 +467,42 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
if (subdomain) params.append('subdomain', subdomain);
if (indexPermissions) params.append('index_permissions', indexPermissions.toString());

return http(`${route}?${params}`)
.then(({ data }) => {
actions.setSourceConnectData(data);
successCallback(data.oauthUrl);
})
.catch(flashAPIErrors(e))
.finally(actions.setButtonNotLoading);
try {
const response = await HttpLogic.values.http.get(`${route}?${params}`);
actions.setSourceConnectData(response);
successCallback(response.oauthUrl);
} catch (e) {
flashAPIErrors(e);
actions.setButtonNotLoading();
}
},
getSourceReConnectData: ({ sourceId }) => {
getSourceReConnectData: async ({ sourceId }) => {
const { isOrganization } = AppLogic.values;
const route = isOrganization
? `/api/workplace_search/org/sources/${sourceId}/reauth_prepare`
: `/api/workplace_search/account/sources/${sourceId}/reauth_prepare`;

return http(route)
.then(({ data }) => actions.setSourceConnectData(data))
.catch(flashAPIErrors(e));
try {
const response = await HttpLogic.values.http.get(route);
actions.setSourceConnectData(response);
} catch (e) {
flashAPIErrors(e);
}
},
getPreContentSourceConfigData: ({ preContentSourceId }) => {
getPreContentSourceConfigData: async ({ preContentSourceId }) => {
const { isOrganization } = AppLogic.values;
const route = isOrganization
? `/api/workplace_search/org/pre_sources/${preContentSourceId}`
: `/api/workplace_search/account/pre_sources/${preContentSourceId}`;

http(route)
.then(({ data }) => actions.setPreContentSourceConfigData(data))
.catch(flashAPIErrors(e));
try {
const response = await HttpLogic.values.http.get(route);
actions.setPreContentSourceConfigData(response);
} catch (e) {
flashAPIErrors(e);
}
},
saveSourceConfig: ({ isUpdating, successCallback }) => {
saveSourceConfig: async ({ isUpdating, successCallback }) => {
FlashMessagesLogic.actions.clearFlashMessages();
const {
sourceConfigData: { serviceType },
Expand All @@ -497,7 +516,7 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
? `/api/workplace_search/org/settings/connectors/${serviceType}`
: '/api/workplace_search/org/settings/connectors';

const method = isUpdating ? 'put' : 'post';
const http = isUpdating ? HttpLogic.values.http.put : HttpLogic.values.http.post;

const params = {
base_url: baseUrlValue || undefined,
Expand All @@ -509,19 +528,20 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
consumer_key: sourceConfigData.configuredFields?.consumerKey,
};

return http({ url: route, method, data: params })
.then(({ data }) => {
if (isUpdating) setSuccessMessage('Successfully updated configuration.');
actions.setSourceConfigData(data);
if (successCallback) successCallback();
})
.catch((e) => {
flashAPIErrors(e);
if (!isUpdating) throw new Error(e);
})
.finally(actions.setButtonNotLoading);
try {
const response = await http(route, {
body: JSON.stringify({ params }),
});
if (isUpdating) setSuccessMessage('Successfully updated configuration.');
actions.setSourceConfigData(response);
if (successCallback) successCallback();
} catch (e) {
flashAPIErrors(e);
actions.setButtonNotLoading();
if (!isUpdating) throw new Error(e);
}
},
createContentSource: ({ serviceType, successCallback, errorCallback }) => {
createContentSource: async ({ serviceType, successCallback, errorCallback }) => {
FlashMessagesLogic.actions.clearFlashMessages();
const { isOrganization } = AppLogic.values;
const route = isOrganization ? ORG_CREATE_SOURCE_ROUTE : ACCOUNT_CREATE_SOURCE_ROUTE;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we inline these variables? They are not used anywhere else.

Expand All @@ -546,18 +566,18 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
// Remove undefined values from params
Object.keys(params).forEach((key) => params[key] === undefined && delete params[key]);

return http
.post(route, params)
.then(({ data }) => {
actions.setCustomSourceData(data);
successCallback();
})
.catch((e) => {
flashAPIErrors(e);
if (errorCallback) errorCallback();
throw new Error('Auth Error');
})
.finally(actions.setButtonNotLoading);
try {
const response = await HttpLogic.values.http.post(route, {
body: JSON.stringify({ params }),
});
actions.setCustomSourceData(response);
successCallback();
} catch (e) {
flashAPIErrors(e);
actions.setButtonNotLoading();
Copy link
Contributor

Choose a reason for hiding this comment

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

This was in finally block before. Now it's only in catch block. Should we move it below the try-catch block?

if (errorCallback) errorCallback();
throw new Error('Auth Error');
}
},
onUpdateSourceName: (name: string) => {
setSuccessMessage(`Successfully changed name to ${name}`);
Expand Down