Skip to content

Commit 552914c

Browse files
AbhishekA1509AbhishekA1509
committed
Merge branch 'main' into feat/add-delete-cd
2 parents 0124e92 + 7d9c134 commit 552914c

File tree

11 files changed

+625
-22
lines changed

11 files changed

+625
-22
lines changed

‎src/assets/icons/ic-login-dt-with-hat.svg

Lines changed: 289 additions & 0 deletions
Loading

‎src/assets/icons/ic-sidebar-dt-with-hat.svg

Lines changed: 286 additions & 0 deletions
Loading

‎src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ export function WebhookDetailsModal({ close }: WebhookDetailType) {
365365
<div className="flexbox w-100 dc__position-rel en-2 bw-1 br-4 h-32">
366366
<CustomInput
367367
name="api-token"
368-
label={renderWebhhokTokenLabel}
368+
label={renderWebhhokTokenLabel()}
369369
placeholder="Enter API token"
370370
rootClassName="bcn-0 dc__no-border"
371371
onChange={handleTokenChange}

‎src/components/cluster/ClusterForm.tsx

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ export default function ClusterForm({
670670
value={state.url.value}
671671
error={state.url.error}
672672
onChange={handleOnChange}
673-
label={clusterLabel}
673+
label={clusterLabel()}
674674
disabled={isDefaultCluster()}
675675
placeholder="Enter server URL"
676676
dataTestid="enter_server_url_input"
@@ -687,8 +687,8 @@ export default function ClusterForm({
687687
? id !== 1
688688
? DEFAULT_SECRET_PLACEHOLDER
689689
: config?.bearer_token
690-
? config.bearer_token
691-
: ''
690+
? config.bearer_token
691+
: ''
692692
: state.token.value
693693
}
694694
onChange={handleOnChange}
@@ -710,7 +710,9 @@ export default function ClusterForm({
710710
<>
711711
<hr />
712712
<div className="dc__position-rel dc__hover mb-20">
713-
<span className="form__input-header pb-20">How do you want Devtron to connect with this cluster?</span>
713+
<span className="form__input-header pb-20">
714+
How do you want Devtron to connect with this cluster?
715+
</span>
714716
<span className="pb-20">
715717
<KubectlConnectionRadio
716718
toConnectViaProxy={isConnectedViaProxyTemp}
@@ -719,8 +721,18 @@ export default function ClusterForm({
719721
changeSSHAuthenticationType={changeSSHAuthenticationType}
720722
proxyUrl={state.proxyUrl}
721723
sshTunnelUser={state.sshTunnelUser}
722-
sshTunnelPassword={(SSHConnectionType === SSHAuthenticationType.Password || SSHConnectionType === SSHAuthenticationType.Password_And_SSH_Private_Key) ? state.sshTunnelPassword : {value: '', error: ''}}
723-
sshTunnelPrivateKey={(SSHConnectionType === SSHAuthenticationType.SSH_Private_Key || SSHConnectionType === SSHAuthenticationType.Password_And_SSH_Private_Key) ? state.sshTunnelPrivateKey : {value: '', error: ''}}
724+
sshTunnelPassword={
725+
SSHConnectionType === SSHAuthenticationType.Password ||
726+
SSHConnectionType === SSHAuthenticationType.Password_And_SSH_Private_Key
727+
? state.sshTunnelPassword
728+
: { value: '', error: '' }
729+
}
730+
sshTunnelPrivateKey={
731+
SSHConnectionType === SSHAuthenticationType.SSH_Private_Key ||
732+
SSHConnectionType === SSHAuthenticationType.Password_And_SSH_Private_Key
733+
? state.sshTunnelPrivateKey
734+
: { value: '', error: '' }
735+
}
724736
sshTunnelUrl={state.sshTunnelUrl}
725737
handleOnChange={handleOnChange}
726738
/>

‎src/components/common/navigation/Navigation.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import { ReactComponent as SecurityIcon } from '../../../assets/icons/ic-nav-sec
1414
import { ReactComponent as BulkEditIcon } from '../../../assets/icons/ic-nav-code.svg'
1515
import { ReactComponent as GlobalConfigIcon } from '../../../assets/icons/ic-nav-gear.svg'
1616
import { ReactComponent as StackManagerIcon } from '../../../assets/icons/ic-nav-stack.svg'
17-
import NavSprite from '../../../assets/icons/navigation-sprite.svg'
17+
import { ReactComponent as ChristmasLogo } from '../../../assets/icons/ic-sidebar-dt-with-hat.svg'
18+
// TODO: Remove after New Year
19+
// import NavSprite from '../../../assets/icons/navigation-sprite.svg'
1820
import TextLogo from '../../../assets/icons/ic-nav-devtron.svg'
1921
import { Command, CommandErrorBoundary } from '../../command'
2022
import { ModuleStatus } from '../../v2/devtronStackManager/DevtronStackManager.type'
@@ -334,13 +336,15 @@ export default class Navigation extends Component<
334336
}}
335337
>
336338
<div className="short-nav--flex">
337-
<svg
339+
{/* TODO: Uncomment after New Year */}
340+
{/* <svg
338341
className="devtron-logo"
339342
data-testid="click-on-devtron-app-logo"
340343
viewBox="0 0 40 40"
341344
>
342345
<use href={`${NavSprite}#nav-short-devtron-logo`}></use>
343-
</svg>
346+
</svg> */}
347+
<ChristmasLogo className="icon-dim-40" />
344348
<div className="pl-12">
345349
<img src={TextLogo} alt="devtron" className="devtron-logo devtron-logo--text" />
346350
</div>

‎src/components/common/navigation/NavigationRoutes.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,14 +524,14 @@ export function RedirectUserWithSentry({ isFirstLoginUser }) {
524524
}
525525

526526
export function RedirectToAppList() {
527-
const { push } = useHistory()
527+
const { replace } = useHistory()
528528
const { serverMode } = useContext(mainContext)
529529
useEffect(() => {
530530
let baseUrl = `${URLS.APP}/${URLS.APP_LIST}`
531531
if (serverMode == SERVER_MODE.FULL) {
532-
push(`${baseUrl}/${AppListConstants.AppType.DEVTRON_APPS}`)
532+
replace(`${baseUrl}/${AppListConstants.AppType.DEVTRON_APPS}`)
533533
} else {
534-
push(`${baseUrl}/${AppListConstants.AppType.HELM_APPS}`)
534+
replace(`${baseUrl}/${AppListConstants.AppType.HELM_APPS}`)
535535
}
536536
}, [])
537537
return null

‎src/components/dockerRegistry/Docker.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,8 +1511,10 @@ function DockerForm({
15111511
)}
15121512
</>
15131513
)
1514-
}}
1515-
const EA_MODE_REGISTRY_TYPE_MAP = REGISTRY_TYPE_MAP
1514+
}
1515+
}
1516+
// For EA Mode GCR is not available as it is not OCI compliant
1517+
const EA_MODE_REGISTRY_TYPE_MAP = JSON.parse(JSON.stringify(REGISTRY_TYPE_MAP))
15161518
delete EA_MODE_REGISTRY_TYPE_MAP['gcr']
15171519
return (
15181520
<form onSubmit={handleOnSubmit} className="docker-form divider" autoComplete="off">

‎src/components/gitOps/GitOpsConfiguration.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class GitOpsConfiguration extends Component<GitOpsProps, GitOpsState> {
173173
})
174174
})
175175
.catch((error) => {
176-
showError(error,true,true)
176+
showError(error, true, true)
177177
this.setState({ view: ViewType.ERROR, statusCode: error.code })
178178
})
179179
}
@@ -600,7 +600,7 @@ class GitOpsConfiguration extends Component<GitOpsProps, GitOpsState> {
600600
onChange={(event) => this.handleChange(event, 'host')}
601601
name="Enter host"
602602
error={this.state.isError.host}
603-
label={getGitOpsLabel}
603+
label={getGitOpsLabel()}
604604
tabIndex={1}
605605
labelClassName="gitops__id form__label--fs-13 fw-5 fs-13 mb-4"
606606
dataTestid={

‎src/components/login/Login.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { Component } from 'react'
2-
import dt from '../../assets/icons/logo/logo-dt.svg'
2+
// TODO: Enable after New Year
3+
// import dt from '../../assets/icons/logo/logo-dt.svg'
34
import LoginIcons from '../../assets/icons/LoginSprite.svg'
45
import { Switch, Redirect, Route, NavLink } from 'react-router-dom'
56
import { toast } from 'react-toastify'
@@ -8,6 +9,8 @@ import { URLS, DOCUMENTATION, TOKEN_COOKIE_NAME, PREVIEW_DEVTRON, PRIVACY_POLICY
89
import { LoginProps, LoginFormState } from './login.types'
910
import { getSSOConfigList, loginAsAdmin } from './login.service'
1011
import { dashboardAccessed } from '../../services/service'
12+
// TODO: remove after New Year
13+
import { ReactComponent as ChristmasLogo } from '../../assets/icons/ic-login-dt-with-hat.svg'
1114
import './login.scss'
1215

1316
export default class Login extends Component<LoginProps, LoginFormState> {
@@ -138,7 +141,10 @@ export default class Login extends Component<LoginProps, LoginFormState> {
138141

139142
return (
140143
<div className="login__control">
141-
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
144+
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
145+
<div className="flex">
146+
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
147+
</div>
142148
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
143149
{this.state.loginList
144150
.filter((sso) => sso.active)
@@ -172,7 +178,11 @@ export default class Login extends Component<LoginProps, LoginFormState> {
172178

173179
return (
174180
<div className="login__control">
175-
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
181+
{/* TODO: Uncomment after New year */}
182+
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
183+
<div className="flex">
184+
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
185+
</div>
176186
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
177187
{/* @ts-ignore */}
178188
<form className="login-dt__form" autoComplete="on" onSubmit={this.login}>

‎src/components/material/MaterialView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ export class MaterialView extends Component<MaterialViewProps, MaterialViewState
526526
</div>
527527
<div>
528528
<CustomInput
529-
label={this.renderGitRepoUrlLabel}
529+
label={this.renderGitRepoUrlLabel()}
530530
name="Git Repo URL"
531531
placeholder={this.gitAuthType('placeholder')}
532532
value={`${this.props.material.url}`}

0 commit comments

Comments
 (0)