Extract github_via_app and github_enterprise_server_via_app to co…

…nstants
elastic · Dec 2, 2021 · 5af1a37 · 5af1a37
1 parent 26495a1
commit 5af1a37
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -336,6 +336,9 @@ export const GITHUB_LINK_TITLE = i18n.translate(
  }
 );
 
+export const GITHUB_VIA_APP_SERVICE_TYPE = 'github_via_app';
+export const GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE = 'github_enterprise_server_via_app';
+
 export const CUSTOM_SERVICE_TYPE = 'custom';
 
 export const WORKPLACE_SEARCH_URL_PREFIX = '/app/enterprise_search/workplace_search';

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -9,6 +9,11 @@ import { generatePath } from 'react-router-dom';
 
 import { docLinks } from '../shared/doc_links';
 
+import {
+ GITHUB_VIA_APP_SERVICE_TYPE,
+ GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE,
+} from './constants';
+
 export const SETUP_GUIDE_PATH = '/setup_guide';
 
 export const NOT_FOUND_PATH = '/404';
@@ -72,8 +77,8 @@ export const ADD_CONFLUENCE_SERVER_PATH = `${SOURCES_PATH}/add/confluence_server
 export const ADD_DROPBOX_PATH = `${SOURCES_PATH}/add/dropbox`;
 export const ADD_GITHUB_ENTERPRISE_PATH = `${SOURCES_PATH}/add/github_enterprise_server`;
 export const ADD_GITHUB_PATH = `${SOURCES_PATH}/add/github`;
-export const ADD_GITHUB_VIA_APP_PATH = `${SOURCES_PATH}/add/github_via_app`;
-export const ADD_GITHUB_ENTERPRISE_SERVER_VIA_APP_PATH = `${SOURCES_PATH}/add/github_enterprise_server_via_app`;
+export const ADD_GITHUB_VIA_APP_PATH = `${SOURCES_PATH}/add/${GITHUB_VIA_APP_SERVICE_TYPE}`;
+export const ADD_GITHUB_ENTERPRISE_SERVER_VIA_APP_PATH = `${SOURCES_PATH}/add/${GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE}`;
 export const ADD_GMAIL_PATH = `${SOURCES_PATH}/add/gmail`;
 export const ADD_GOOGLE_DRIVE_PATH = `${SOURCES_PATH}/add/google_drive`;
 export const ADD_JIRA_PATH = `${SOURCES_PATH}/add/jira_cloud`;

diff --git a/...ions/workplace_search/views/content_sources/components/add_source/github_via_app_logic.ts b/...ions/workplace_search/views/content_sources/components/add_source/github_via_app_logic.ts
@@ -11,6 +11,10 @@ import { flashAPIErrors, flashSuccessToast } from '../../../../../shared/flash_m
 import { HttpLogic } from '../../../../../shared/http';
 import { KibanaLogic } from '../../../../../shared/kibana';
 import { AppLogic } from '../../../../app_logic';
+import {
+ GITHUB_VIA_APP_SERVICE_TYPE,
+ GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE,
+} from '../../../../constants';
 import { SOURCES_PATH, getSourcesPath } from '../../../../routes';
 import { ContentSourceFullData } from '../../../../types';
 
@@ -86,8 +90,8 @@ export const GithubViaAppLogic = kea<MakeLogicType<GithubViaAppValues, GithubVia
 
  const params = {
  service_type: githubEnterpriseServerUrl
- ? 'github_enterprise_server_via_app'
- : 'github_via_app',
+ ? GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE
+ : GITHUB_VIA_APP_SERVICE_TYPE,
  app_id: githubAppId,
  base_url: githubEnterpriseServerUrl,
  private_key: stagedPrivateKey,

diff --git a/...public/applications/workplace_search/views/content_sources/components/source_settings.tsx b/...public/applications/workplace_search/views/content_sources/components/source_settings.tsx
@@ -29,7 +29,11 @@ import { AppLogic } from '../../../app_logic';
 import { ContentSection } from '../../../components/shared/content_section';
 import { SourceConfigFields } from '../../../components/shared/source_config_fields';
 import { ViewContentHeader } from '../../../components/shared/view_content_header';
-import { NAV } from '../../../constants';
+import {
+ NAV,
+ GITHUB_VIA_APP_SERVICE_TYPE,
+ GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE,
+} from '../../../constants';
 
 import {
  CANCEL_BUTTON,
@@ -88,7 +92,8 @@ export const SourceSettings: React.FC = () => {
  }, []);
 
  const isGithubApp =
- serviceType === 'github_via_app' || serviceType === 'github_enterprise_server_via_app';
+ serviceType === GITHUB_VIA_APP_SERVICE_TYPE ||
+ serviceType === GITHUB_ENTERPRISE_SERVER_VIA_APP_SERVICE_TYPE;
 
  const editPath = isGithubApp
  ? undefined // undefined for GitHub apps, as they are configured source-wide, and don't use a connector where you can edit the configuration