Skip to content

Commit 3c57518

Browse files
Elessar1802Elessar1802
authored
Merge pull request #2045 from devtron-labs/chore/main-sync-rc-18
chore: main sync after release-candidate 18
2 parents 86268f9 + 5730b2d commit 3c57518

File tree

6 files changed

+69
-76
lines changed

6 files changed

+69
-76
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.2.32",
7+
"@devtron-labs/devtron-fe-common-lib": "0.3.1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

‎src/components/cdPipeline/CDPipeline.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,6 @@ export default function CDPipeline({
646646
}),
647647
}
648648

649-
const _userApprovalConfig = getUserApprovalConfigPayload(formData.userApprovalConfig)
650-
651649
const pipeline = {
652650
name: formData.name,
653651
appWorkflowId: +workflowId,
@@ -663,7 +661,9 @@ export default function CDPipeline({
663661
deploymentAppName: formData.deploymentAppName,
664662
releaseMode: formData.releaseMode,
665663
deploymentAppCreated: formData.deploymentAppCreated,
666-
userApprovalConfig: _userApprovalConfig,
664+
...(getUserApprovalConfigPayload ? {
665+
userApprovalConfig: getUserApprovalConfigPayload(formData.userApprovalConfig)
666+
}: {}),
667667
triggerType: formData.triggerType,
668668
environmentName: formData.environmentName,
669669
preStageConfigMapSecretNames: _preStageConfigMapSecretNames,

‎src/components/common/security/ScanDetailsModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,18 +218,18 @@ export class ScanDetailsModal extends Component<ScanDetailsModalProps, ScanDetai
218218
>
219219
{this.renderHeader()}
220220
{this.renderAppEnvInfo()}
221-
<div className="trigger-modal__body trigger-modal__body--security-scan">
221+
<div className="flexbox-col dc__overflow-auto p-0 bcn-0 trigger-modal__body--security-scan">
222222
{this.state.view === ViewType.LOADING ? (
223223
<Progressing pageLoader />
224224
) : this.state.view === ViewType.ERROR ? (
225225
<Reload reload={this.callGetAPI} />
226226
) : this.state.view === ViewType.FORM && this.state.vulnerabilities.length === 0 ? (
227227
<NoVulnerabilityViewWithTool scanToolId={this.state.scanToolId} />
228228
) : (
229-
<div className="trigger-modal__body trigger-modal__body--security-scan">
229+
<>
230230
{this.renderScannedObjectInfo()}
231231
{this.renderTable()}
232-
</div>
232+
</>
233233
)}
234234
</div>
235235
</div>

‎src/components/globalConfigurations/GlobalConfiguration.tsx

Lines changed: 57 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,11 @@ const NavItem = ({ serverMode }) => {
330330
to={`${route.href}`}
331331
activeClassName="active-route"
332332
data-testid={route.dataTestId}
333-
className={`${
334-
route.name === 'API tokens' &&
333+
className={`${route.name === 'API tokens' &&
335334
location.pathname.startsWith(`${URLS.GLOBAL_CONFIG_AUTH}/${Routes.API_TOKEN}`)
336-
? 'active-route'
337-
: ''
338-
}`}
335+
? 'active-route'
336+
: ''
337+
}`}
339338
onClick={(e) => {
340339
if (!preventOnClickOp) {
341340
handleGroupCollapsedState(e, route)
@@ -420,9 +419,8 @@ const NavItem = ({ serverMode }) => {
420419
key={`nav_item_${index}`}
421420
to={route.href}
422421
data-testid="user-authorization-link"
423-
className={`cursor ${
424-
collapsedState[route.name] ? '' : 'fw-6'
425-
} flex dc__content-space`}
422+
className={`cursor ${collapsedState[route.name] ? '' : 'fw-6'
423+
} flex dc__content-space`}
426424
onClick={(e) => {
427425
handleGroupCollapsedState(e, route)
428426
}}
@@ -573,7 +571,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
573571
}
574572

575573
return (
576-
<Switch location={location}>
574+
<Switch>
577575
<Route
578576
path={URLS.GLOBAL_CONFIG_CLUSTER}
579577
render={(props) => {
@@ -587,7 +585,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
587585
}}
588586
/>
589587
{!window._env_.K8S_CLIENT && [
590-
serverMode !== SERVER_MODE.EA_ONLY && (
588+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
591589
<Route
592590
key={URLS.GLOBAL_CONFIG_HOST_URL}
593591
path={URLS.GLOBAL_CONFIG_HOST_URL}
@@ -602,7 +600,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
602600
)
603601
}}
604602
/>
605-
),
603+
)] : [],
606604
<Route
607605
key={URLS.GLOBAL_CONFIG_GITOPS}
608606
path={URLS.GLOBAL_CONFIG_GITOPS}
@@ -617,15 +615,15 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
617615
return <Project {...props} isSuperAdmin={isSuperAdmin} />
618616
}}
619617
/>,
620-
serverMode !== SERVER_MODE.EA_ONLY && (
618+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
621619
<Route
622620
key={URLS.GLOBAL_CONFIG_GIT}
623621
path={URLS.GLOBAL_CONFIG_GIT}
624622
render={(props) => {
625623
return <GitProvider {...props} isSuperAdmin={isSuperAdmin} />
626624
}}
627625
/>
628-
),
626+
)] : [],
629627
<Route
630628
key={URLS.GLOBAL_CONFIG_DOCKER}
631629
path={`${URLS.GLOBAL_CONFIG_DOCKER}/:id?`}
@@ -647,14 +645,14 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
647645
return <ChartRepo {...props} isSuperAdmin={isSuperAdmin} />
648646
}}
649647
/>,
650-
serverMode !== SERVER_MODE.EA_ONLY && (
648+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
651649
<Route
652650
key={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
653651
path={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
654652
>
655653
<DeploymentChartsRouter />
656654
</Route>
657-
),
655+
)] : [],
658656
<Route key={URLS.GLOBAL_CONFIG_AUTH} path={URLS.GLOBAL_CONFIG_AUTH} component={Authorization} />,
659657
<Route
660658
key={URLS.GLOBAL_CONFIG_NOTIFIER}
@@ -675,10 +673,10 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
675673
</Route>,
676674
...(serverMode !== SERVER_MODE.EA_ONLY
677675
? [
678-
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
679-
<BuildInfra isSuperAdmin={isSuperAdmin} />
680-
</Route>,
681-
]
676+
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
677+
<BuildInfra isSuperAdmin={isSuperAdmin} />
678+
</Route>,
679+
]
682680
: []),
683681
]}
684682
{window._env_.ENABLE_SCOPED_VARIABLES && (
@@ -694,47 +692,43 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
694692
<CatalogFramework isSuperAdmin={isSuperAdmin} />
695693
</Route>
696694
)}
697-
{serverMode !== SERVER_MODE.EA_ONLY && (
698-
<>
699-
{DeploymentWindow && (
700-
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
701-
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
702-
</Route>
703-
)}
704-
,
705-
{ImagePromotion && (
706-
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
707-
<ImagePromotion isSuperAdmin={isSuperAdmin} />
708-
</Route>
709-
)}
710-
,
711-
{PluginsPolicy && (
712-
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
713-
<PluginsPolicy />
714-
</Route>
715-
)}
716-
{PullImageDigest && (
717-
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
718-
<PullImageDigest isSuperAdmin={isSuperAdmin} />
719-
</Route>
720-
)}
721-
{TagListContainer && (
722-
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
723-
<TagListContainer />
724-
</Route>
725-
)}
726-
{FilterConditions && (
727-
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
728-
<FilterConditions isSuperAdmin={isSuperAdmin} />
729-
</Route>
730-
)}
731-
{LockDeploymentConfiguration && (
732-
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
733-
<LockDeploymentConfiguration />
734-
</Route>
735-
)}
736-
</>
737-
)}
695+
{serverMode !== SERVER_MODE.EA_ONLY && [
696+
DeploymentWindow && (
697+
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
698+
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
699+
</Route>
700+
),
701+
ImagePromotion && (
702+
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
703+
<ImagePromotion isSuperAdmin={isSuperAdmin} />
704+
</Route>
705+
),
706+
PluginsPolicy && (
707+
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
708+
<PluginsPolicy />
709+
</Route>
710+
),
711+
PullImageDigest && (
712+
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
713+
<PullImageDigest isSuperAdmin={isSuperAdmin} />
714+
</Route>
715+
),
716+
TagListContainer && (
717+
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
718+
<TagListContainer />
719+
</Route>
720+
),
721+
FilterConditions && (
722+
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
723+
<FilterConditions isSuperAdmin={isSuperAdmin} />
724+
</Route>
725+
),
726+
LockDeploymentConfiguration && (
727+
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
728+
<LockDeploymentConfiguration />
729+
</Route>
730+
)
731+
]}
738732
<Redirect to={defaultRoute()} />
739733
</Switch>
740734
)
@@ -825,7 +819,7 @@ export const ProtectedInput = ({
825819
labelClassName = '',
826820
placeholder = '',
827821
dataTestid = '',
828-
onBlur = (e) => {},
822+
onBlur = (e) => { },
829823
isRequiredField = false,
830824
}: ProtectedInputType) => {
831825
const [shown, toggleShown] = useState(false)
@@ -888,7 +882,7 @@ export const ShowHide = ({
888882
height="24"
889883
className={className}
890884
viewBox="0 0 24 24"
891-
onClick={disabled ? () => {} : onClick || defaultOnClick}
885+
onClick={disabled ? () => { } : onClick || defaultOnClick}
892886
>
893887
<g fill="none" fillRule="evenodd">
894888
<path d="M0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0z" />
@@ -905,7 +899,7 @@ export const ShowHide = ({
905899
height="24"
906900
className={className}
907901
viewBox="0 0 24 24"
908-
onClick={disabled ? () => {} : onClick || defaultOnClick}
902+
onClick={disabled ? () => { } : onClick || defaultOnClick}
909903
>
910904
<g fill="none" fillRule="evenodd">
911905
<path d="M0 0h24v24H0z" />

‎src/components/security/security.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,7 @@
368368
}
369369

370370
.trigger-modal__body--security-scan {
371-
background-color: var(--N000);
372-
padding: 0;
371+
height: calc(100vh - 87px);
373372
}
374373

375374
.vulnerability-exp__form {

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,10 +1556,10 @@
15561556
dependencies:
15571557
"@jridgewell/trace-mapping" "0.3.9"
15581558

1559-
"@devtron-labs/devtron-fe-common-lib@0.2.32":
1560-
version "0.2.32"
1561-
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.2.32.tgz#c99483786133649e8acdec32923522ff0af8dfad"
1562-
integrity sha512-J4KGv58dRZ5WhFr/xEiAqTJL7cfLwL1ULvXFx7okMIJiwIRMDTStn36VIcEUdQ8cyaDjE1LmYt9R0Rxwz+04SQ==
1559+
"@devtron-labs/devtron-fe-common-lib@0.3.1":
1560+
version "0.3.1"
1561+
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.3.1.tgz#6ce30c90493b151d492c04506f8be64ece5e49b5"
1562+
integrity sha512-CsOSbYn4VIzkFNBElLSWcWoN+9rnA1Ak2m5vQF2B+EA/qUdbxdGgSBLA6rzK2suzP1ay8STzKc0BC4rHFvnGfg==
15631563
dependencies:
15641564
"@types/react-dates" "^21.8.6"
15651565
ansi_up "^5.2.1"

0 commit comments

Comments
 (0)