From 300dc96eff6f0c0776935af61626c4ac374b4196 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 19 Aug 2021 09:25:15 +0530 Subject: [PATCH 1/2] [SSO LOGIN] added sso link --- src/components/login/SSOLogin.tsx | 21 ++++++++++++--------- src/config/constants.ts | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/login/SSOLogin.tsx b/src/components/login/SSOLogin.tsx index 146418f491..7528b5b33d 100644 --- a/src/components/login/SSOLogin.tsx +++ b/src/components/login/SSOLogin.tsx @@ -1,6 +1,14 @@ import React, { Component } from 'react' import { Progressing, ConfirmationDialog, DevtronSwitch as Switch, DevtronSwitchItem as SwitchItem, showError, ErrorScreenManager, } from '../common' +import CodeEditor from '../CodeEditor/CodeEditor'; +import { SSOLoginProps, SSOLoginState, SSOLoginTabType } from './ssoConfig.types' +import { getSSOConfig, createSSOList, updateSSOList, getSSOConfigList } from './login.service' +import { SSOConfigType } from './ssoConfig.types' +import { ViewType, DOCUMENTATION } from '../../config' +import { toast } from 'react-toastify'; +import yamlJsParser from 'yaml'; +import sample from './sampleConfig.json'; import { ReactComponent as Google } from '../../assets/icons/ic-google.svg' import Check from '../../assets/icons/ic-outline-check.svg' import { ReactComponent as Help } from '../../assets/icons/ic-help.svg' @@ -10,14 +18,6 @@ import { ReactComponent as LDAP } from '../../assets/icons/ic-ldap.svg' import { ReactComponent as OIDC } from '../../assets/icons/ic-oidc.svg' import { ReactComponent as Openshift } from '../../assets/icons/ic-openshift.svg' import warn from '../../assets/icons/ic-warning.svg'; -import CodeEditor from '../CodeEditor/CodeEditor'; -import { SSOLoginProps, SSOLoginState, SSOLoginTabType } from './ssoConfig.types' -import { getSSOConfig, createSSOList, updateSSOList, getSSOConfigList } from './login.service' -import { SSOConfigType } from './ssoConfig.types' -import { ViewType } from '../../config' -import { toast } from 'react-toastify'; -import yamlJsParser from 'yaml'; -import sample from './sampleConfig.json'; import './login.css'; import { ReactComponent as Warn } from '../../assets/icons/ic-info-warn.svg'; @@ -380,7 +380,10 @@ export default class SSOLogin extends Component { return

SSO Login Services

-
Configure and manage login service for your organization.  
+
Configure and manage login service for your organization. + Learn more about Git Material +
+
{this.getSSOLoginTabsArr().map((item) => { diff --git a/src/config/constants.ts b/src/config/constants.ts index 76dfb7dc06..4ebcaab34a 100644 --- a/src/config/constants.ts +++ b/src/config/constants.ts @@ -191,5 +191,6 @@ export const DOCUMENTATION = { GLOBAL_CONFIG_CHART: 'https://docs.devtron.ai/user-guide/global-configurations/chart-repo', GLOBAL_CONFIG_NOTIFICATION: 'https://docs.devtron.ai/global-configurations/manage-notification', GLOBAL_CONFIG_PROJECT: 'https://docs.devtron.ai/global-configurations/projects', + GLOBAL_CONFIG_SSO: 'https://docs.devtron.ai/user-guide/global-configurations/sso-login', GLOBAL_CONFIG_USER: 'https://docs.devtron.ai/user-guide/global-configurations/user-access', } \ No newline at end of file From 77e88cd84de06a1b2dc07c411ceedc81ddceb1e1 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 19 Aug 2021 09:42:04 +0530 Subject: [PATCH 2/2] [SSO LOGIN] text fixed --- src/components/login/SSOLogin.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/login/SSOLogin.tsx b/src/components/login/SSOLogin.tsx index 7528b5b33d..e82f6c6c3c 100644 --- a/src/components/login/SSOLogin.tsx +++ b/src/components/login/SSOLogin.tsx @@ -381,7 +381,7 @@ export default class SSOLogin extends Component { return

SSO Login Services

Configure and manage login service for your organization. - Learn more about Git Material + Learn more about SSO Login