Skip to content

[SSO LOGIN] added sso link #177

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

Merged
merged 2 commits into from
Aug 19, 2021
Merged

[SSO LOGIN] added sso link #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
300dc96
[SSO LOGIN] added sso link
shivani170 Aug 19, 2021
77e88cd
[SSO LOGIN] text fixed
shivani170 Aug 19, 2021
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
21 changes: 12 additions & 9 deletions src/components/login/SSOLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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';

Expand Down Expand Up @@ -380,7 +380,10 @@ export default class SSOLogin extends Component<SSOLoginProps, SSOLoginState> {

return <section className="global-configuration__component">
<h2 className="form__title">SSO Login Services</h2>
<h5 className="form__subtitle">Configure and manage login service for your organization. &nbsp;</h5>
<h5 className="form__subtitle">Configure and manage login service for your organization.
<span><a rel="noreferrer noopener" target="_blank" className="learn-more__href" href={DOCUMENTATION.GLOBAL_CONFIG_SSO}> Learn more about SSO Login</a> </span>
</h5>

<div className="bcn-0 bw-1 en-2 br-8 pb-22">
<div className="login__sso-flex pl-24">
{this.getSSOLoginTabsArr().map((item) => {
Expand Down
1 change: 1 addition & 0 deletions src/config/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}