Skip to content

Commit d7d9057

Browse files
authored
Merge pull request #2742 from devtron-labs/feat/live-config-diff
feat: add support for strategy change live diff in deploy modal
2 parents c5cd985 + 3628292 commit d7d9057

File tree

19 files changed

+281
-425
lines changed

19 files changed

+281
-425
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ src/components/app/details/appDetails/utils.tsx
8888
src/components/app/details/cIDetails/CIDetails.tsx
8989
src/components/app/details/cIDetails/cIDetails.util.tsx
9090
src/components/app/details/cdDetails/CDDetails.tsx
91-
src/components/app/details/cdDetails/service.ts
9291
src/components/app/details/cicdHistory/History.components.tsx
9392
src/components/app/details/main.tsx
9493
src/components/app/details/metrics/BenchmarkModal.tsx

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.15.0-pre-5",
7+
"@devtron-labs/devtron-fe-common-lib": "1.15.0-pre-6",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/components/ApplicationGroup/Details/EnvCDDetails/__mock__/EnvCDDetails.mock.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ResponseType } from '@devtron-labs/devtron-fe-common-lib'
18-
19-
import { ModuleConfigResponse } from '../../../../app/details/appDetails/appDetails.type'
17+
import { ModuleConfigResponse, ResponseType } from '@devtron-labs/devtron-fe-common-lib'
2018

2119
export async function mockCDList(): Promise<ResponseType> {
2220
const response = {

src/components/app/details/appDetails/SourceInfo.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ export const SourceInfo = ({
307307
<>
308308
{!isdeploymentAppDeleting && (
309309
<div style={{ marginLeft: 'auto' }} className="flex dc__gap-8">
310-
<div className="app-details-action-buttons flex border__primary br-6 dc__overflow-hidden">
310+
<div className="app-details-action-buttons flexbox border__primary br-6 dc__overflow-hidden">
311311
{!isVirtualEnvironment && showUrlInfo && (
312312
<>
313313
<Button
@@ -319,7 +319,7 @@ export const SourceInfo = ({
319319
style={ButtonStyleType.neutral}
320320
ariaLabel="URLs"
321321
/>
322-
<div className="divider__primary h-100" />
322+
<div className="divider__secondary" />
323323
</>
324324
)}
325325

@@ -355,7 +355,7 @@ export const SourceInfo = ({
355355
}}
356356
ariaLabel={isHibernated ? 'Unhibernate' : 'Hibernate'}
357357
/>
358-
<div className="divider__primary h-100" />
358+
<div className="divider__secondary" />
359359
</>
360360
)}
361361

@@ -387,7 +387,7 @@ export const SourceInfo = ({
387387
}}
388388
ariaLabel="restart workloads"
389389
/>
390-
<div className="divider__primary h-100" />
390+
<div className="divider__secondary" />
391391
</>
392392
)}
393393

src/components/app/details/appDetails/appDetails.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
DeploymentStatusDetailsResponse,
1919
get,
2020
getUrlWithSearchParams,
21+
ModuleConfigResponse,
2122
ResponseType,
2223
trash,
2324
} from '@devtron-labs/devtron-fe-common-lib'
@@ -30,7 +31,6 @@ import {
3031
DataSourceDetailsDTO,
3132
DataSourceDetailsQueryParams,
3233
DataSourceDetailsType,
33-
ModuleConfigResponse,
3434
} from './appDetails.type'
3535

3636
export const getDataSourceDetailsFromEnvironment = async (envName: string): Promise<DataSourceDetailsType> => {

src/components/app/details/appDetails/appDetails.type.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ export interface AppDetailsPathParams {
6565
envId?: string
6666
}
6767

68-
export interface ModuleConfigResponse extends ResponseType {
69-
result?: {
70-
enabled: boolean
71-
}
72-
}
73-
7468
export interface DataSourceDetailsDTO {
7569
id: number
7670
name: string
@@ -92,18 +86,6 @@ export interface ClusterConnectionResponse extends ResponseType {
9286
}
9387
}
9488

95-
export type DeleteResponseType = {
96-
clusterName: string
97-
clusterReachable: boolean
98-
deleteInitiated: boolean
99-
}
100-
101-
export interface DeploymentStatusDetailRowType {
102-
type: string
103-
hideVerticalConnector?: boolean
104-
deploymentDetailedData: DeploymentStatusDetailsBreakdownDataType
105-
}
106-
10789
export type SocketConnectionType = 'CONNECTED' | 'CONNECTING' | 'DISCONNECTED' | 'DISCONNECTING'
10890

10991
export interface NodeSelectorsType {

src/components/app/details/cdDetails/cd.type.ts

Lines changed: 0 additions & 74 deletions
This file was deleted.

src/components/app/details/cdDetails/service.ts

Lines changed: 0 additions & 165 deletions
This file was deleted.

src/components/app/details/triggerView/PipelineConfigDiff/PipelineConfigDiff.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { URLS } from '@Config/routes'
2828
import { PipelineConfigDiffProps } from './types'
2929

3030
export const PipelineConfigDiff = ({
31-
deploymentConfigSelectorProps,
31+
radioSelectConfig,
3232
scopeVariablesConfig,
3333
urlFilters,
3434
...props
@@ -63,8 +63,8 @@ export const PipelineConfigDiff = ({
6363
},
6464
{
6565
id: 'deployment-config-selector',
66-
type: 'selectPicker',
67-
selectPickerProps: deploymentConfigSelectorProps,
66+
type: 'radio-group',
67+
radioSelectConfig,
6868
},
6969
],
7070
hideDivider: true,

0 commit comments

Comments
 (0)