Skip to content

Commit 33b5fff

Browse files
RohitRaj011RohitRaj011
authored
Merge pull request #2907 from devtron-labs/chore/sync-develop-with-main
chore: sync-develop-with-main
2 parents ca9fa32 + d510e0e commit 33b5fff

File tree

6 files changed

+96
-33
lines changed

6 files changed

+96
-33
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": "1.19.4-pre-0",
7+
"@devtron-labs/devtron-fe-common-lib": "1.20.0-pre-0",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

‎src/components/CIPipelineN/VariableDataTable/ValueConfigOverlay.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export const ValueConfigOverlay = ({ row, handleRowUpdateAction }: ConfigOverlay
286286
}
287287

288288
return (
289-
<div className="p-12 flex-grow-1">
289+
<div ref={scrollableRef} className="p-12 flex-grow-1">
290290
<div className="dc__border-dashed br-6 p-16 flexbox-col dc__align-items-center dc__gap-12">
291291
<ICChoicesDropdown />
292292
<div className="w-100 dc__text-center fs-12 lh-18 flexbox-col dc__gap-2">

‎src/components/app/details/triggerView/PipelineConfigDiff/usePipelineDeploymentConfig.ts‎

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -160,46 +160,82 @@ export const usePipelineDeploymentConfig = ({
160160
// NOTE: for security reasons secretsData from getAppEnvDeploymentConfig
161161
// will be null if user is not app admin. therefore need to override it
162162
// with masked values from getCompareSecretsData api
163-
if (
164-
_pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
165-
_pipelineDeploymentConfigRes[0].value &&
166-
!_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
167-
secretsData.status === 'fulfilled' &&
168-
secretsData.value?.[0]
169-
) {
170-
_pipelineDeploymentConfigRes[0].value.result.secretsData = secretsData.value[0].secretsData
171-
}
172-
173-
if (
174-
_pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
175-
_pipelineDeploymentConfigRes[1].value &&
176-
!_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
177-
secretsData.status === 'fulfilled' &&
178-
secretsData.value?.[1]
179-
) {
180-
// we can use 0th secret data it will not impact strategy
181-
_pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
182-
_pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
183-
}
184-
163+
// setting pipelineConfig - last saved config (current published)
185164
if (
186165
_pipelineDeploymentConfigRes[2].status === 'fulfilled' &&
187166
_pipelineDeploymentConfigRes[2].value &&
188167
!_pipelineDeploymentConfigRes[2].value.result.isAppAdmin &&
189168
secretsData.status === 'fulfilled' &&
190-
secretsData.value?.[2]
169+
secretsData.value?.[1]
191170
) {
192171
_pipelineDeploymentConfigRes[2].value.result.secretsData = secretsData.value[1].secretsData
193172
}
194173

174+
// Rollback case
175+
if (isRollbackTriggerSelected && wfrId) {
176+
// setting pipelineConfig - last deployed config (w/o deployment strategy)
177+
if (
178+
_pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
179+
_pipelineDeploymentConfigRes[0].value &&
180+
!_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
181+
secretsDataCDRollback.status === 'fulfilled' &&
182+
secretsDataCDRollback.value?.[0]
183+
) {
184+
_pipelineDeploymentConfigRes[0].value.result.secretsData =
185+
secretsDataCDRollback.value[0].secretsData
186+
}
187+
188+
// setting pipelineConfig - last deployed config (with deployment strategy)
189+
if (
190+
_pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
191+
_pipelineDeploymentConfigRes[1].value &&
192+
!_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
193+
secretsDataCDRollback.status === 'fulfilled' &&
194+
secretsDataCDRollback.value?.[0]
195+
) {
196+
// we can use 0th secret data it will not impact strategy
197+
_pipelineDeploymentConfigRes[1].value.result.secretsData =
198+
secretsDataCDRollback.value[0].secretsData
199+
_pipelineDeploymentConfigRes[1].value.result.secretsData =
200+
secretsDataCDRollback.value[0].secretsData
201+
}
202+
}
203+
// Deploy case
204+
else {
205+
// setting pipelineConfig - last deployed config (w/o deployment strategy)
206+
if (
207+
_pipelineDeploymentConfigRes[0].status === 'fulfilled' &&
208+
_pipelineDeploymentConfigRes[0].value &&
209+
!_pipelineDeploymentConfigRes[0].value.result.isAppAdmin &&
210+
secretsData.status === 'fulfilled' &&
211+
secretsData.value?.[0]
212+
) {
213+
_pipelineDeploymentConfigRes[0].value.result.secretsData = secretsData.value[0].secretsData
214+
}
215+
216+
// setting pipelineConfig - last deployed config (with deployment strategy)
217+
if (
218+
_pipelineDeploymentConfigRes[1].status === 'fulfilled' &&
219+
_pipelineDeploymentConfigRes[1].value &&
220+
!_pipelineDeploymentConfigRes[1].value.result.isAppAdmin &&
221+
secretsData.status === 'fulfilled' &&
222+
secretsData.value?.[0]
223+
) {
224+
// we can use 0th secret data it will not impact strategy
225+
_pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
226+
_pipelineDeploymentConfigRes[1].value.result.secretsData = secretsData.value[0].secretsData
227+
}
228+
}
229+
230+
// setting pipelineConfig - rollback config
195231
if (
196232
_pipelineDeploymentConfigRes[3].status === 'fulfilled' &&
197233
_pipelineDeploymentConfigRes[3].value &&
198234
!_pipelineDeploymentConfigRes[3].value.result.isAppAdmin &&
199235
secretsDataCDRollback.status === 'fulfilled' &&
200-
secretsDataCDRollback.value?.[3]
236+
secretsDataCDRollback.value?.[1]
201237
) {
202-
_pipelineDeploymentConfigRes[3].value.result.secretsData = secretsDataCDRollback.value[2].secretsData
238+
_pipelineDeploymentConfigRes[3].value.result.secretsData = secretsDataCDRollback.value[1].secretsData
203239
}
204240

205241
return _pipelineDeploymentConfigRes

‎src/components/workflowEditor/workflowEditor.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ class WorkflowEdit extends Component<WorkflowEditProps, WorkflowEditState> {
846846
text="Learn about creating workflows"
847847
docLinkKey="APP_CREATE_WORKFLOW"
848848
dataTestId="learn-more-about-creating-workflow-link"
849+
fullWidth
849850
/>
850851
</div>
851852
}

‎src/css/base.scss‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5183,6 +5183,32 @@ details[open] {
51835183
}
51845184
}
51855185

5186+
.DayPicker {
5187+
background-color: var(--bg-menu-primary);
5188+
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.07), 0 2px 5px 0 rgba(0, 0, 0, 0.07), 0 3px 8px 0 rgba(0, 0, 0, 0.07);
5189+
5190+
.DayPickerNavigation_button {
5191+
background-color: var(--bg-primary);
5192+
border: 1px solid var(--border-primary-translucent);
5193+
5194+
&:hover {
5195+
background-color: var(--bg-hover);
5196+
}
5197+
}
5198+
5199+
.CalendarMonthGrid {
5200+
background: var(--bg-menu-primary);
5201+
5202+
.CalendarMonth_caption {
5203+
color: var(--N900);
5204+
}
5205+
5206+
.CalendarMonth {
5207+
background: var(--bg-menu-primary);
5208+
}
5209+
}
5210+
}
5211+
51865212
kbd {
51875213
font-family: 'IBM Plex Sans';
5188-
}
5214+
}

‎yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,9 +1722,9 @@ __metadata:
17221722
languageName: node
17231723
linkType: hard
17241724

1725-
"@devtron-labs/devtron-fe-common-lib@npm:1.19.4-pre-0":
1726-
version: 1.19.4-pre-0
1727-
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.19.4-pre-0"
1725+
"@devtron-labs/devtron-fe-common-lib@npm:1.20.0-pre-0":
1726+
version: 1.20.0-pre-0
1727+
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.0-pre-0"
17281728
dependencies:
17291729
"@codemirror/autocomplete": "npm:6.18.6"
17301730
"@codemirror/lang-json": "npm:6.0.1"
@@ -1774,7 +1774,7 @@ __metadata:
17741774
react-select: 5.8.0
17751775
rxjs: ^7.8.1
17761776
yaml: ^2.4.1
1777-
checksum: 10c0/47a2fe19d51cd77611eda22cf16c151e18e8dee9fad2888912af0053245d5f0aa0d30f934192c8249883f5aeb7ecf30c1802c6eb31f34afb2cac28237d5d74a3
1777+
checksum: 10c0/6e5bf8c152404212d83b714193a9217f2a895b3074fc865e13a30d10a00877f6283e7a789db0448a821a92011160617740b773fee2189decad51d31166448ae6
17781778
languageName: node
17791779
linkType: hard
17801780

@@ -5721,7 +5721,7 @@ __metadata:
57215721
version: 0.0.0-use.local
57225722
resolution: "dashboard@workspace:."
57235723
dependencies:
5724-
"@devtron-labs/devtron-fe-common-lib": "npm:1.19.4-pre-0"
5724+
"@devtron-labs/devtron-fe-common-lib": "npm:1.20.0-pre-0"
57255725
"@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
57265726
"@playwright/test": "npm:^1.32.1"
57275727
"@rjsf/core": "npm:^5.13.3"

0 commit comments

Comments
 (0)