Remove unused duplicate code

elastic · Feb 3, 2021 · 402661d · 402661d
1 parent 13aa101
commit 402661d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 88 deletions.
diff --git a/...se_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts b/...se_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
@@ -17,11 +17,7 @@ jest.mock('../../app_logic', () => ({
   AppLogic: { values: { isOrganization: true } },
 }));
 
-import {
-  fullContentSources,
-  sourceConfigData,
-  contentItems,
-} from '../../__mocks__/content_sources.mock';
+import { fullContentSources, contentItems } from '../../__mocks__/content_sources.mock';
 import { meta } from '../../__mocks__/meta.mock';
 
 import { DEFAULT_META } from '../../../shared/constants';
@@ -45,7 +41,6 @@ describe('SourceLogic', () => {
   const defaultValues = {
     contentSource: {},
     contentItems: [],
-    sourceConfigData: {},
     dataLoading: true,
     sectionLoading: true,
     buttonLoading: false,
@@ -87,13 +82,6 @@ describe('SourceLogic', () => {
       expect(setSuccessMessage).toHaveBeenCalled();
     });
 
-    it('setSourceConfigData', () => {
-      SourceLogic.actions.setSourceConfigData(sourceConfigData);
-
-      expect(SourceLogic.values.sourceConfigData).toEqual(sourceConfigData);
-      expect(SourceLogic.values.dataLoading).toEqual(false);
-    });
-
     it('setSearchResults', () => {
       SourceLogic.actions.setSearchResults(searchServerResponse);
 
@@ -401,40 +389,6 @@ describe('SourceLogic', () => {
       });
     });
 
-    describe('getSourceConfigData', () => {
-      const serviceType = 'github';
-
-      it('calls API and sets values', async () => {
-        AppLogic.values.isOrganization = true;
-
-        const setSourceConfigDataSpy = jest.spyOn(SourceLogic.actions, 'setSourceConfigData');
-        const promise = Promise.resolve(contentSource);
-        http.get.mockReturnValue(promise);
-        SourceLogic.actions.getSourceConfigData(serviceType);
-
-        expect(http.get).toHaveBeenCalledWith(
-          `/api/workplace_search/org/settings/connectors/${serviceType}`
-        );
-        await promise;
-        expect(setSourceConfigDataSpy).toHaveBeenCalled();
-      });
-
-      it('handles error', async () => {
-        const error = {
-          response: {
-            error: 'this is an error',
-            status: 400,
-          },
-        };
-        const promise = Promise.reject(error);
-        http.get.mockReturnValue(promise);
-        SourceLogic.actions.getSourceConfigData(serviceType);
-        await expectedAsyncError(promise);
-
-        expect(flashAPIErrors).toHaveBeenCalledWith(error);
-      });
-    });
-
     it('resetSourceState', () => {
       SourceLogic.actions.resetSourceState();
 

diff --git a/...erprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/...erprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -26,7 +26,6 @@ import { ContentSourceFullData, Meta, DocumentSummaryItem, SourceContentItem } f
 export interface SourceActions {
   onInitializeSource(contentSource: ContentSourceFullData): ContentSourceFullData;
   onUpdateSourceName(name: string): string;
-  setSourceConfigData(sourceConfigData: SourceConfigData): SourceConfigData;
   setSearchResults(searchResultsResponse: SearchResultsResponse): SearchResultsResponse;
   initializeFederatedSummary(sourceId: string): { sourceId: string };
   onUpdateSummary(summary: DocumentSummaryItem[]): DocumentSummaryItem[];
@@ -40,28 +39,9 @@ export interface SourceActions {
   resetSourceState(): void;
   removeContentSource(sourceId: string): { sourceId: string };
   initializeSource(sourceId: string): { sourceId: string };
-  getSourceConfigData(serviceType: string): { serviceType: string };
   setButtonNotLoading(): void;
 }
 
-interface SourceConfigData {
-  serviceType: string;
-  name: string;
-  configured: boolean;
-  categories: string[];
-  needsPermissions?: boolean;
-  privateSourcesEnabled: boolean;
-  configuredFields: {
-    publicKey: string;
-    privateKey: string;
-    consumerKey: string;
-    baseUrl?: string;
-    clientId?: string;
-    clientSecret?: string;
-  };
-  accountContextOnly?: boolean;
-}
-
 interface SourceValues {
   contentSource: ContentSourceFullData;
   dataLoading: boolean;
@@ -70,7 +50,6 @@ interface SourceValues {
   contentItems: SourceContentItem[];
   contentMeta: Meta;
   contentFilterValue: string;
-  sourceConfigData: SourceConfigData;
 }
 
 interface SearchResultsResponse {
@@ -83,7 +62,6 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
   actions: {
     onInitializeSource: (contentSource: ContentSourceFullData) => contentSource,
     onUpdateSourceName: (name: string) => name,
-    setSourceConfigData: (sourceConfigData: SourceConfigData) => sourceConfigData,
     onUpdateSummary: (summary: object[]) => summary,
     setSearchResults: (searchResultsResponse: SearchResultsResponse) => searchResultsResponse,
     setContentFilterValue: (contentFilterValue: string) => contentFilterValue,
@@ -95,7 +73,6 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
     removeContentSource: (sourceId: string) => ({
       sourceId,
     }),
-    getSourceConfigData: (serviceType: string) => ({ serviceType }),
     resetSourceState: () => true,
     setButtonNotLoading: () => false,
   },
@@ -114,25 +91,17 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
         }),
       },
     ],
-    sourceConfigData: [
-      {} as SourceConfigData,
-      {
-        setSourceConfigData: (_, sourceConfigData) => sourceConfigData,
-      },
-    ],
     dataLoading: [
       true,
       {
         onInitializeSource: () => false,
-        setSourceConfigData: () => false,
         resetSourceState: () => false,
       },
     ],
     buttonLoading: [
       false,
       {
         setButtonNotLoading: () => false,
-        setSourceConfigData: () => false,
         resetSourceState: () => false,
         removeContentSource: () => true,
       },
@@ -258,16 +227,6 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
         actions.setButtonNotLoading();
       }
     },
-    getSourceConfigData: async ({ serviceType }) => {
-      const route = `/api/workplace_search/org/settings/connectors/${serviceType}`;
-
-      try {
-        const response = await HttpLogic.values.http.get(route);
-        actions.setSourceConfigData(response);
-      } catch (e) {
-        flashAPIErrors(e);
-      }
-    },
     onUpdateSourceName: (name: string) => {
       setSuccessMessage(
         i18n.translate(