Add GHE support in UI

- update the deployment manifests - read enterprise url from env - use `react-ghe-login` in place of `react-github-login` Signed-off-by: vinamra28 <[email protected]>
tektoncd · Jun 9, 2021 · bf57dff · bf57dff
1 parent 07abb91
commit bf57dff
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 10 deletions.
diff --git a/config/03-ui/30-ui-configmap.yaml b/config/03-ui/30-ui-configmap.yaml
@@ -7,3 +7,4 @@ data:
   API_URL: 'https://api.hub.tekton.dev'
   GH_CLIENT_ID: ''
   API_VERSION: ''
+  GHE_URL: ''
diff --git a/config/03-ui/31-ui-deployment.yaml b/config/03-ui/31-ui-deployment.yaml
@@ -19,6 +19,11 @@ spec:
         - name: ui
           image: quay.io/tekton-hub/ui
           env:
+            - name: GHE_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: ui
+                  key: GHE_URL
             - name: API_URL
               valueFrom:
                 configMapKeyRef:

diff --git a/ui/image/start.sh b/ui/image/start.sh
@@ -15,6 +15,7 @@ window.config = {
   API_URL: '$API_URL',
   GH_CLIENT_ID: '$GH_CLIENT_ID',
   API_VERSION: '$API_VERSION',
+  GHE_URL: '$GHE_URL',
 };
 
 

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -25,7 +25,7 @@
     "mst-persist": "^0.1.3",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-github-login": "^1.0.3",
+    "react-ghe-login": "^1.2.0",
     "react-hotkeys-hook": "^3.3.1",
     "react-markdown": "^5.0.3",
     "react-router-dom": "^5.2.0",

diff --git a/ui/public/config.js b/ui/public/config.js
@@ -1,5 +1,6 @@
 window.config = {
   API_URL: 'https://api.hub.tekton.dev',
   GH_CLIENT_ID: '',
-  API_VERSION: 'v1'
+  API_VERSION: 'v1',
+  GHE_URL: '',
 };
diff --git a/ui/src/config/constant.d.ts b/ui/src/config/constant.d.ts
@@ -2,6 +2,7 @@ interface API_CONFIG {
   API_URL: string;
   GH_CLIENT_ID: string;
   API_VERSION: string;
+  GHE_URL: string;
 }
 
 export declare global {

diff --git a/ui/src/config/constants.tsx b/ui/src/config/constants.tsx
@@ -6,3 +6,4 @@ window.config = window.config || {
 export const API_URL = window.config.API_URL;
 export const GH_CLIENT_ID = window.config.GH_CLIENT_ID;
 export const API_VERSION = window.config.API_VERSION;
+export const GHE_URL = window.config.GHE_URL;
diff --git a/ui/src/containers/Authentication/Authentication.test.tsx b/ui/src/containers/Authentication/Authentication.test.tsx
@@ -2,7 +2,7 @@ import { Card } from '@patternfly/react-core';
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 import renderer from 'react-test-renderer';
-import GitHubLogin from 'react-github-login';
+import GitHubLogin from 'react-ghe-login';
 import Authentication from '.';
 import { FakeHub } from '../../api/testutil';
 import { createProviderAndStore } from '../../store/root';

diff --git a/ui/src/containers/Authentication/index.tsx b/ui/src/containers/Authentication/index.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import GitHubLogin from 'react-github-login';
+import GitHubLogin from 'react-ghe-login';
 import { useHistory } from 'react-router-dom';
 import { observer } from 'mobx-react';
 import { Card, CardBody, CardHeader, AlertVariant } from '@patternfly/react-core';
-import { GH_CLIENT_ID } from '../../config/constants';
+import { GHE_URL, GH_CLIENT_ID } from '../../config/constants';
 import { useMst } from '../../store/root';
 import { AuthCodeProps } from '../../store/auth';
 import { Icons } from '../../common/icons';
@@ -34,6 +34,7 @@ const Authentication: React.FC = observer(() => {
             redirectUri=""
             onSuccess={onSuccess}
             onFailure={user.onFailure}
+            host={GHE_URL || 'https://github.com'}
           />
         </CardBody>
       </Card>

diff --git a/ui/src/react-app-env.d.ts b/ui/src/react-app-env.d.ts
@@ -1,2 +1,2 @@
 /// <reference types="react-scripts" />
-declare module 'react-github-login';
+declare module 'react-ghe-login';