From dee33ae35b9e431b805adbb29733ce1a675c1d6a Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 21 Jan 2025 18:25:18 +0530 Subject: [PATCH 01/12] feat: introduce WorkflowStatusEnum and update workflow status handling across components --- .../ApplicationGroup/AppGroup.types.ts | 8 +++++++ .../ApplicationGroup/AppGroup.utils.ts | 24 ++++++++++++------- src/components/app/config.tsx | 10 ++++---- .../app/details/cIDetails/CIDetails.tsx | 2 ++ .../workflow/nodes/TriggerLinkedCINode.tsx | 9 +++---- .../workflow/nodes/triggerCINode.tsx | 3 ++- .../workflow/nodes/triggerPrePostCDNode.tsx | 4 ++-- .../workflow/nodes/workflow.utils.tsx | 17 +++++++++++++ 8 files changed, 58 insertions(+), 19 deletions(-) diff --git a/src/components/ApplicationGroup/AppGroup.types.ts b/src/components/ApplicationGroup/AppGroup.types.ts index 994b549623..8cc3a9af7d 100644 --- a/src/components/ApplicationGroup/AppGroup.types.ts +++ b/src/components/ApplicationGroup/AppGroup.types.ts @@ -154,6 +154,14 @@ export interface ProcessWorkFlowStatusType { workflows: WorkflowType[] } +export enum WorkflowStatusEnum { + STARTING = 'Starting', + RUNNING = 'Running', + PROGRESSING = 'Progressing', + WAITING_TO_START = 'WaitingToStart', + CANCELLED = 'CANCELLED', +} + export interface CIWorkflowStatusType { ciPipelineId: number ciPipelineName: string diff --git a/src/components/ApplicationGroup/AppGroup.utils.ts b/src/components/ApplicationGroup/AppGroup.utils.ts index 41df07b9bb..e0277499f8 100644 --- a/src/components/ApplicationGroup/AppGroup.utils.ts +++ b/src/components/ApplicationGroup/AppGroup.utils.ts @@ -34,6 +34,7 @@ import { CDWorkflowStatusType, CIWorkflowStatusType, ProcessWorkFlowStatusType, + WorkflowStatusEnum, } from './AppGroup.types' let timeoutId @@ -55,7 +56,12 @@ export const processWorkflowStatuses = ( status: pipeline.ciStatus, storageConfigured: pipeline.storageConfigured || false, } - if (!cicdInProgress && (pipeline.ciStatus === 'Starting' || pipeline.ciStatus === 'Running')) { + if ( + !cicdInProgress && + (pipeline.ciStatus === WorkflowStatusEnum.STARTING || + pipeline.ciStatus === WorkflowStatusEnum.RUNNING || + pipeline.ciStatus === WorkflowStatusEnum.WAITING_TO_START) + ) { cicdInProgress = true } }) @@ -73,11 +79,13 @@ export const processWorkflowStatuses = ( } if ( !cicdInProgress && - (pipeline.pre_status === 'Starting' || - pipeline.pre_status === 'Running' || - pipeline.deploy_status === 'Progressing' || - pipeline.post_status === 'Starting' || - pipeline.post_status === 'Running') + (pipeline.pre_status === WorkflowStatusEnum.STARTING || + pipeline.pre_status === WorkflowStatusEnum.RUNNING || + pipeline.pre_status === WorkflowStatusEnum.WAITING_TO_START || + pipeline.deploy_status === WorkflowStatusEnum.PROGRESSING || + pipeline.post_status === WorkflowStatusEnum.STARTING || + pipeline.post_status === WorkflowStatusEnum.RUNNING || + pipeline.post_status === WorkflowStatusEnum.WAITING_TO_START) ) { cicdInProgress = true } @@ -322,8 +330,8 @@ export const getAppGroupDeploymentHistoryLink = ( } if (redirectToAppGroup) { // It will redirect to application group deployment history in case of same environment - return `${URLS.APPLICATION_GROUP}/${envId}/${URLS.APP_CD_DETAILS}/${appId}/${pipelineId}${type ?`?type=${type}` : ''}` + return `${URLS.APPLICATION_GROUP}/${envId}/${URLS.APP_CD_DETAILS}/${appId}/${pipelineId}${type ? `?type=${type}` : ''}` // It will redirect to application deployment history in case of other environments } - return `${URLS.APP}/${appId}/${URLS.APP_CD_DETAILS}/${envId}/${pipelineId}${type ?`?type=${type}` : ''}` + return `${URLS.APP}/${appId}/${URLS.APP_CD_DETAILS}/${envId}/${pipelineId}${type ? `?type=${type}` : ''}` } diff --git a/src/components/app/config.tsx b/src/components/app/config.tsx index 2821f278a7..4330ae7e07 100644 --- a/src/components/app/config.tsx +++ b/src/components/app/config.tsx @@ -14,8 +14,9 @@ * limitations under the License. */ -export const Colors = { - yellow: 'var(--O500)', +import { WorkflowStatusEnum } from '@Components/ApplicationGroup/AppGroup.types' + +const Colors = { red: 'var(--R500)', green: 'var(--G500)', orange: 'var(--O500)', @@ -36,12 +37,13 @@ export const CI_PIPELINE_VIEW = { export const TriggerStatus = { pending: Colors.orange, - starting: Colors.yellow, - running: Colors.yellow, + starting: Colors.orange, + running: Colors.orange, succeeded: Colors.green, failed: Colors.red, error: Colors.red, cancelled: Colors.gray, notbuilt: Colors.gray, nottriggered: Colors.gray, + [WorkflowStatusEnum.WAITING_TO_START.toLowerCase()]: Colors.orange, } diff --git a/src/components/app/details/cIDetails/CIDetails.tsx b/src/components/app/details/cIDetails/CIDetails.tsx index f579eafe77..39bf69eced 100644 --- a/src/components/app/details/cIDetails/CIDetails.tsx +++ b/src/components/app/details/cIDetails/CIDetails.tsx @@ -440,10 +440,12 @@ export const Details = ({ podStatus={triggerDetails.podStatus} stage={triggerDetails.stage} artifact={triggerDetails.artifact} + namespace={triggerDetails.namespace} environmentName={triggerDetails.environmentName} isJobView={isJobView} workerPodName={triggerDetails.podName} renderDeploymentHistoryTriggerMetaText={renderDeploymentHistoryTriggerMetaText} + workflowExecutionStages={triggerDetails.workflowExecutionStages} />
{ x: number @@ -78,7 +79,7 @@ export class TriggerLinkedCINode extends Component { className="dc__cd-trigger-status" style={{ color: TriggerStatus[status] }} > - {this.props.status} + {getWorkflowNodeStatusTitle(this.props.status)} {!this.props.fromAppGrouping && ( <> {this.props.status && /} diff --git a/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx b/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx index 666d69296e..37a0bdc84e 100644 --- a/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx +++ b/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx @@ -24,6 +24,7 @@ import { ReactComponent as IcLink } from '../../../../../../assets/icons/ic-link import { TriggerViewContext } from '../../config' import { DEFAULT_ENV } from '../../Constants' import { getLinkedCITippyContent } from '../../../../../../Pages/Shared/LinkedCIDetailsModal/utils' +import { getWorkflowNodeStatusTitle } from './workflow.utils' export interface TriggerCINodeProps extends RouteComponentProps<{ appId: string }> { x: number @@ -106,7 +107,7 @@ export class TriggerCINode extends Component { className="dc__cd-trigger-status mb-6" style={{ color: TriggerStatus[status] }} > - {this.props.status && this.props.status.toLowerCase() === 'cancelled' ? 'ABORTED' : this.props.status} + {getWorkflowNodeStatusTitle(this.props.status)} {this.props.status && /} { @@ -63,7 +63,7 @@ export class TriggerPrePostCDNode extends Component - {this.props.status} + {getWorkflowNodeStatusTitle(this.props.status)} <> {this.props.status && /} diff --git a/src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx b/src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx index c1222e2c21..71f0009aa4 100644 --- a/src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx +++ b/src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx @@ -16,6 +16,7 @@ import Tippy from '@tippyjs/react' import { DO_NOT_DEPLOY } from '../../Constants' +import { WorkflowStatusEnum } from '@Components/ApplicationGroup/AppGroup.types' export const envDescriptionTippy = (environmentName: string, description: string) => { return ( @@ -53,3 +54,19 @@ export const getNodeSideHeadingAndClass = ( return { heading: triggerType, className: '' } } + +export const getWorkflowNodeStatusTitle = (status: string) => { + if (!status) { + return null + } + + if (status.toLowerCase() === 'cancelled') { + return 'ABORTED' + } + + if (status === WorkflowStatusEnum.WAITING_TO_START) { + return 'Waiting to start' + } + + return status +} From 28b6e8099e29766179d4816e421d5a10eeb2414a Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 21 Jan 2025 23:55:44 +0530 Subject: [PATCH 02/12] feat: integrate WorkflowStatusEnum and enhance job pipeline status display in AppOverview component --- src/components/app/Overview/Overview.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/app/Overview/Overview.tsx b/src/components/app/Overview/Overview.tsx index a49129eea7..5c98baf57a 100644 --- a/src/components/app/Overview/Overview.tsx +++ b/src/components/app/Overview/Overview.tsx @@ -55,6 +55,8 @@ import { EnvironmentList } from './EnvironmentList' import { MAX_LENGTH_350 } from '../../../config/constantMessaging' import { getModuleInfo } from '../../v2/devtronStackManager/DevtronStackManager.service' import { MODAL_STATE, OVERVIEW_TABS, TAB_SEARCH_KEY } from './constants' +import { getWorkflowNodeStatusTitle } from '../details/triggerView/workflow/nodes/workflow.utils' +import { WorkflowStatusEnum } from '@Components/ApplicationGroup/AppGroup.types' const MandatoryTagWarning = importComponentFromFELibrary('MandatoryTagWarning') const Catalog = importComponentFromFELibrary('Catalog', null, 'function') @@ -382,6 +384,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn return case 'InProgress': return + case WorkflowStatusEnum.WAITING_TO_START: case 'Starting': return
case 'Running': @@ -436,11 +439,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn className="mr-16 w-150 h-20 m-tb-8 fs-13 cn-9 flex dc__content-start" > {getStatusIcon(jobPipeline.status)} - {jobPipeline.status === 'CANCELLED' ? ( -
Aborted
- ) : ( -
{jobPipeline.status}
- )} + {getWorkflowNodeStatusTitle(jobPipeline.status)}
Date: Wed, 22 Jan 2025 13:24:13 +0530 Subject: [PATCH 03/12] chore: util and type migraiton to common --- .../ApplicationGroup/AppGroup.types.ts | 8 -------- .../ApplicationGroup/AppGroup.utils.ts | 2 +- src/components/app/Overview/Overview.tsx | 4 ++-- src/components/app/config.tsx | 2 +- .../workflow/nodes/TriggerLinkedCINode.tsx | 2 +- .../workflow/nodes/triggerCINode.tsx | 5 ++--- .../workflow/nodes/triggerPrePostCDNode.tsx | 6 +++--- .../workflow/nodes/workflow.utils.tsx | 17 ----------------- 8 files changed, 10 insertions(+), 36 deletions(-) diff --git a/src/components/ApplicationGroup/AppGroup.types.ts b/src/components/ApplicationGroup/AppGroup.types.ts index 8cc3a9af7d..994b549623 100644 --- a/src/components/ApplicationGroup/AppGroup.types.ts +++ b/src/components/ApplicationGroup/AppGroup.types.ts @@ -154,14 +154,6 @@ export interface ProcessWorkFlowStatusType { workflows: WorkflowType[] } -export enum WorkflowStatusEnum { - STARTING = 'Starting', - RUNNING = 'Running', - PROGRESSING = 'Progressing', - WAITING_TO_START = 'WaitingToStart', - CANCELLED = 'CANCELLED', -} - export interface CIWorkflowStatusType { ciPipelineId: number ciPipelineName: string diff --git a/src/components/ApplicationGroup/AppGroup.utils.ts b/src/components/ApplicationGroup/AppGroup.utils.ts index e0277499f8..6e055bd190 100644 --- a/src/components/ApplicationGroup/AppGroup.utils.ts +++ b/src/components/ApplicationGroup/AppGroup.utils.ts @@ -25,6 +25,7 @@ import { CIMaterialType, SourceTypeMap, DEPLOYMENT_STATUS, + WorkflowStatusEnum, } from '@devtron-labs/devtron-fe-common-lib' import { getParsedBranchValuesForPlugin } from '@Components/common' import { DEFAULT_GIT_BRANCH_VALUE, DOCKER_FILE_ERROR_TITLE, SOURCE_NOT_CONFIGURED, URLS } from '../../config' @@ -34,7 +35,6 @@ import { CDWorkflowStatusType, CIWorkflowStatusType, ProcessWorkFlowStatusType, - WorkflowStatusEnum, } from './AppGroup.types' let timeoutId diff --git a/src/components/app/Overview/Overview.tsx b/src/components/app/Overview/Overview.tsx index 5c98baf57a..08dc1ebc95 100644 --- a/src/components/app/Overview/Overview.tsx +++ b/src/components/app/Overview/Overview.tsx @@ -31,6 +31,8 @@ import { EditableTextArea, ToastManager, ToastVariantType, + WorkflowStatusEnum, + getWorkflowNodeStatusTitle, } from '@devtron-labs/devtron-fe-common-lib' import ReactGA from 'react-ga4' import { getGitProviderIcon, handleUTCTime, importComponentFromFELibrary } from '../../common' @@ -55,8 +57,6 @@ import { EnvironmentList } from './EnvironmentList' import { MAX_LENGTH_350 } from '../../../config/constantMessaging' import { getModuleInfo } from '../../v2/devtronStackManager/DevtronStackManager.service' import { MODAL_STATE, OVERVIEW_TABS, TAB_SEARCH_KEY } from './constants' -import { getWorkflowNodeStatusTitle } from '../details/triggerView/workflow/nodes/workflow.utils' -import { WorkflowStatusEnum } from '@Components/ApplicationGroup/AppGroup.types' const MandatoryTagWarning = importComponentFromFELibrary('MandatoryTagWarning') const Catalog = importComponentFromFELibrary('Catalog', null, 'function') diff --git a/src/components/app/config.tsx b/src/components/app/config.tsx index 4330ae7e07..2955f2fd2d 100644 --- a/src/components/app/config.tsx +++ b/src/components/app/config.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { WorkflowStatusEnum } from '@Components/ApplicationGroup/AppGroup.types' +import { WorkflowStatusEnum } from '@devtron-labs/devtron-fe-common-lib' const Colors = { red: 'var(--R500)', diff --git a/src/components/app/details/triggerView/workflow/nodes/TriggerLinkedCINode.tsx b/src/components/app/details/triggerView/workflow/nodes/TriggerLinkedCINode.tsx index 1a3d679d28..f99005057d 100644 --- a/src/components/app/details/triggerView/workflow/nodes/TriggerLinkedCINode.tsx +++ b/src/components/app/details/triggerView/workflow/nodes/TriggerLinkedCINode.tsx @@ -17,11 +17,11 @@ import { Component } from 'react' import { RouteComponentProps, Link } from 'react-router-dom' import Tippy from '@tippyjs/react' +import { getWorkflowNodeStatusTitle } from '@devtron-labs/devtron-fe-common-lib' import link from '@Icons/ic-link.svg' import { ReactComponent as ICLinkedCINode } from '@Icons/ic-node-build-linked.svg' import { TriggerStatus } from '../../../../config' import { DEFAULT_STATUS, URLS } from '../../../../../../config' -import { getWorkflowNodeStatusTitle } from './workflow.utils' export interface CINodeProps extends RouteComponentProps<{}> { x: number diff --git a/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx b/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx index 37a0bdc84e..fd255a619d 100644 --- a/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx +++ b/src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx @@ -14,17 +14,16 @@ * limitations under the License. */ -import React, { Component } from 'react' +import { Component } from 'react' import { RouteComponentProps, Link } from 'react-router-dom' import Tippy from '@tippyjs/react' -import { CIMaterialType, ConsequenceType } from '@devtron-labs/devtron-fe-common-lib' +import { CIMaterialType, ConsequenceType, getWorkflowNodeStatusTitle } from '@devtron-labs/devtron-fe-common-lib' import { TriggerStatus } from '../../../../config' import { BUILD_STATUS, DEFAULT_STATUS, URLS } from '../../../../../../config' import { ReactComponent as IcLink } from '../../../../../../assets/icons/ic-link.svg' import { TriggerViewContext } from '../../config' import { DEFAULT_ENV } from '../../Constants' import { getLinkedCITippyContent } from '../../../../../../Pages/Shared/LinkedCIDetailsModal/utils' -import { getWorkflowNodeStatusTitle } from './workflow.utils' export interface TriggerCINodeProps extends RouteComponentProps<{ appId: string }> { x: number diff --git a/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx b/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx index 6b8fadfd46..20475a58c0 100644 --- a/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx +++ b/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx @@ -16,14 +16,14 @@ import { Component } from 'react' import { Link } from 'react-router-dom' -import { DeploymentAppTypes, stopPropagation } from '@devtron-labs/devtron-fe-common-lib' +import { DeploymentAppTypes, stopPropagation, getWorkflowNodeStatusTitle } from '@devtron-labs/devtron-fe-common-lib' import { TriggerPrePostCDNodeProps, TriggerPrePostCDNodeState } from '../../types' import { TriggerStatus } from '../../../../config' import { BUILD_STATUS, URLS, DEFAULT_STATUS } from '../../../../../../config' import { TriggerViewContext } from '../../config' import NoGitOpsRepoConfiguredWarning from '../../../../../workflowEditor/NoGitOpsRepoConfiguredWarning' import { gitOpsRepoNotConfiguredWithEnforcedEnv } from '../../../../../gitOps/constants' -import { getNodeSideHeadingAndClass, getWorkflowNodeStatusTitle } from './workflow.utils' +import { getNodeSideHeadingAndClass } from './workflow.utils' import { getAppGroupDeploymentHistoryLink } from '../../../../../ApplicationGroup/AppGroup.utils' export class TriggerPrePostCDNode extends Component { @@ -45,7 +45,7 @@ export class TriggerPrePostCDNode extends Component { return ( @@ -54,19 +53,3 @@ export const getNodeSideHeadingAndClass = ( return { heading: triggerType, className: '' } } - -export const getWorkflowNodeStatusTitle = (status: string) => { - if (!status) { - return null - } - - if (status.toLowerCase() === 'cancelled') { - return 'ABORTED' - } - - if (status === WorkflowStatusEnum.WAITING_TO_START) { - return 'Waiting to start' - } - - return status -} From fadb8263250596e7c9cf68557be7d45372d12adb Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 22 Jan 2025 19:06:02 +0530 Subject: [PATCH 04/12] feat: add grid layout for dc__icon-text-layout class in base.scss --- src/css/base.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/css/base.scss b/src/css/base.scss index b29bf46388..b41f0b3bf7 100644 --- a/src/css/base.scss +++ b/src/css/base.scss @@ -5116,6 +5116,12 @@ textarea::placeholder { display: grid; } +.dc__icon-text-layout { + display: grid; + grid-template-columns: 20px 1fr; + gap: 4px; +} + .dc__contents { display: contents; } From 76cbe680ee9c928f8ec478b33b84fd4486269a24 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 23 Jan 2025 12:30:31 +0530 Subject: [PATCH 05/12] refactor: clean up unused imports and consolidate helper functions --- src/components/common/helpers/Helpers.tsx | 32 +--------------------- src/components/gitProvider/GitProvider.tsx | 2 +- src/components/material/CreateMaterial.tsx | 3 +- src/components/material/MaterialView.tsx | 4 ++- src/components/material/UpdateMaterial.tsx | 3 +- 5 files changed, 7 insertions(+), 37 deletions(-) diff --git a/src/components/common/helpers/Helpers.tsx b/src/components/common/helpers/Helpers.tsx index 9fe45e2dc3..2336c4aa7e 100644 --- a/src/components/common/helpers/Helpers.tsx +++ b/src/components/common/helpers/Helpers.tsx @@ -19,7 +19,6 @@ import { showError, OptionType, DeploymentAppTypes, - APIOptions, useWindowSize, APPROVAL_MODAL_TYPE, YAMLStringify, @@ -31,7 +30,7 @@ import { useMainContext, } from '@devtron-labs/devtron-fe-common-lib' import YAML from 'yaml' -import { Link, PromptProps } from 'react-router-dom' +import { Link } from 'react-router-dom' import ReactGA from 'react-ga4' import { getDateInMilliseconds } from '../../../Pages/GlobalConfigurations/Authorization/APITokens/apiToken.utils' import { ClusterImageList, ImageList, SelectGroupType } from '../../ClusterNodes/types' @@ -45,11 +44,6 @@ import { getAggregator } from '../../app/details/appDetails/utils' import { JUMP_TO_KIND_SHORT_NAMES, SIDEBAR_KEYS } from '../../ResourceBrowser/Constants' import { AUTO_SELECT } from '../../ClusterNodes/constants' import { PATTERNS } from '../../../config/constants' -import { ReactComponent as GitLab } from '../../../assets/icons/git/gitlab.svg' -import { ReactComponent as Git } from '../../../assets/icons/git/git.svg' -import { ReactComponent as GitHub } from '../../../assets/icons/git/github.svg' -import { ReactComponent as BitBucket } from '../../../assets/icons/git/bitbucket.svg' -import { ReactComponent as ICAWSCodeCommit } from '../../../assets/icons/ic-aws-codecommit.svg' import { AppEnvLocalStorageKeyType, FilterParentType } from '@Components/ApplicationGroup/AppGroup.types' import { APP_GROUP_LOCAL_STORAGE_KEY, ENV_GROUP_LOCAL_STORAGE_KEY } from '@Components/ApplicationGroup/Constants' import { GetAndSetAppGroupFiltersParamsType, SetFiltersInLocalStorageParamsType } from './types' @@ -1132,30 +1126,6 @@ export const getPluginIdsFromBuildStage = ( return pluginIds } -// Should contain git-codecommit.*.amazonaws.com -export const isAWSCodeCommitURL = (url: string = ''): boolean => { - return url.includes('git-codecommit.') && url.includes('.amazonaws.com') -} - -export const renderMaterialIcon = (url: string = '') => { - if (url.includes('gitlab')) { - return - } - - if (url.includes('github')) { - return - } - - if (url.includes('bitbucket')) { - return - } - - if (isAWSCodeCommitURL(url)) { - return - } - - return -} export const getSeverityWithCount = (severityCount: SeverityCount) => { if (severityCount.critical) { diff --git a/src/components/gitProvider/GitProvider.tsx b/src/components/gitProvider/GitProvider.tsx index 5badc30590..b0ab9f3c7c 100644 --- a/src/components/gitProvider/GitProvider.tsx +++ b/src/components/gitProvider/GitProvider.tsx @@ -33,6 +33,7 @@ import { ToastManager, SelectPicker, ComponentSizeType, + renderMaterialIcon, } from '@devtron-labs/devtron-fe-common-lib' import Tippy from '@tippyjs/react' import { @@ -46,7 +47,6 @@ import { handleOnBlur, handleOnFocus, parsePassword, - renderMaterialIcon, TLSConnectionForm, } from '@Components/common' import { getGitHostList, getGitProviderList } from '../../services/service' diff --git a/src/components/material/CreateMaterial.tsx b/src/components/material/CreateMaterial.tsx index 1a5b364f42..f514a3be1c 100644 --- a/src/components/material/CreateMaterial.tsx +++ b/src/components/material/CreateMaterial.tsx @@ -15,11 +15,10 @@ */ import { Component } from 'react' -import { showError, ToastManager, ToastVariantType } from '@devtron-labs/devtron-fe-common-lib' +import { showError, ToastManager, ToastVariantType, isAWSCodeCommitURL } from '@devtron-labs/devtron-fe-common-lib' import { createMaterial } from './material.service' import { MaterialView } from './MaterialView' import { CreateMaterialState } from './material.types' -import { isAWSCodeCommitURL } from '../common' interface CreateMaterialProps { appId: number diff --git a/src/components/material/MaterialView.tsx b/src/components/material/MaterialView.tsx index 54986b1607..e928288199 100644 --- a/src/components/material/MaterialView.tsx +++ b/src/components/material/MaterialView.tsx @@ -30,6 +30,8 @@ import { ComponentSizeType, SelectPickerProps, DeleteComponent, + renderMaterialIcon, + isAWSCodeCommitURL, } from '@devtron-labs/devtron-fe-common-lib' import { NavLink } from 'react-router-dom' import Tippy from '@tippyjs/react' @@ -41,7 +43,7 @@ import { ReactComponent as ICHelpOutline } from '../../assets/icons/ic-help-outl import { ReactComponent as Help } from '../../assets/icons/ic-help.svg' import { ReactComponent as Check } from '../../assets/icons/ic-check-circle-green.svg' import { ReactComponent as Wrong } from '../../assets/icons/ic-close-circle.svg' -import { isAWSCodeCommitURL, renderMaterialIcon, sortObjectArrayAlphabetically } from '../common/helpers/Helpers' +import { sortObjectArrayAlphabetically } from '../common/helpers/Helpers' import { deleteMaterial } from './material.service' import { DeleteComponentsName, diff --git a/src/components/material/UpdateMaterial.tsx b/src/components/material/UpdateMaterial.tsx index e522990149..4f4fea6a62 100644 --- a/src/components/material/UpdateMaterial.tsx +++ b/src/components/material/UpdateMaterial.tsx @@ -15,11 +15,10 @@ */ import React, { Component } from 'react' -import { showError, ToastManager, ToastVariantType } from '@devtron-labs/devtron-fe-common-lib' +import { showError, ToastManager, ToastVariantType, isAWSCodeCommitURL } from '@devtron-labs/devtron-fe-common-lib' import { updateMaterial } from './material.service' import { GitMaterialType, UpdateMaterialState } from './material.types' import { MaterialView } from './MaterialView' -import { isAWSCodeCommitURL } from '../common' interface UpdateMaterialProps { appId: number From 5de2cf99494223e6ef4ad93457408215735c7426 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 23 Jan 2025 14:01:12 +0530 Subject: [PATCH 06/12] fix: simplify condition for rendering empty state in SecurityTab component --- src/components/app/details/cIDetails/CIDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/app/details/cIDetails/CIDetails.tsx b/src/components/app/details/cIDetails/CIDetails.tsx index 3e37f6012f..116bdf6793 100644 --- a/src/components/app/details/cIDetails/CIDetails.tsx +++ b/src/components/app/details/cIDetails/CIDetails.tsx @@ -663,7 +663,7 @@ const SecurityTab = ({ artifactId, status, appIdFromParent }: SecurityTabType) = return } - if (!artifactId || ['failed', 'cancelled'].includes(status.toLowerCase())) { + if (!artifactId) { return ( Date: Thu, 23 Jan 2025 17:38:30 +0530 Subject: [PATCH 07/12] refactor: remove unused styles from ciDetails.scss --- src/components/app/details/cIDetails/ciDetails.scss | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/components/app/details/cIDetails/ciDetails.scss b/src/components/app/details/cIDetails/ciDetails.scss index 44dbdadaa1..18713d7aaa 100644 --- a/src/components/app/details/cIDetails/ciDetails.scss +++ b/src/components/app/details/cIDetails/ciDetails.scss @@ -127,16 +127,6 @@ border-bottom: 1px solid var(--N100); } -.build-card-popup { - box-shadow: 0 2px 4px -1px rgba(0, 56, 112, 0.3); - - .ci-material-detail { - display: grid; - grid-template-columns: 20px 1fr; - column-gap: 8px; - } -} - .ci-details__build-card-container { text-decoration: unset; padding: 0 16px; From 9b8d6bb99bde953f33f82f31b92b35c209090eb8 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 28 Jan 2025 15:56:34 +0530 Subject: [PATCH 08/12] feat: add handling for TIMED_OUT status in app overview and update color mapping --- src/components/app/Overview/Overview.tsx | 1 + src/components/app/config.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/app/Overview/Overview.tsx b/src/components/app/Overview/Overview.tsx index 08dc1ebc95..e331eb1e63 100644 --- a/src/components/app/Overview/Overview.tsx +++ b/src/components/app/Overview/Overview.tsx @@ -379,6 +379,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn switch (status) { case 'Succeeded': return + case WorkflowStatusEnum.TIMED_OUT: case 'Failed': case 'Error': return diff --git a/src/components/app/config.tsx b/src/components/app/config.tsx index 2955f2fd2d..a54438ff0f 100644 --- a/src/components/app/config.tsx +++ b/src/components/app/config.tsx @@ -42,7 +42,8 @@ export const TriggerStatus = { succeeded: Colors.green, failed: Colors.red, error: Colors.red, - cancelled: Colors.gray, + cancelled: Colors.red, + [WorkflowStatusEnum.TIMED_OUT.toLowerCase()]: Colors.red, notbuilt: Colors.gray, nottriggered: Colors.gray, [WorkflowStatusEnum.WAITING_TO_START.toLowerCase()]: Colors.orange, From 33fd21ecd522e8dddca0778844f48d8af9804e48 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 28 Jan 2025 16:51:15 +0530 Subject: [PATCH 09/12] feat: add new button style variation with border-left for anchor buttons --- src/css/base.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/css/base.scss b/src/css/base.scss index d5ae3f998e..27db94ec54 100644 --- a/src/css/base.scss +++ b/src/css/base.scss @@ -2221,6 +2221,10 @@ button.anchor { &--n7 { border-left: solid 1px var(--N700); } + + &--n3 { + border-left: solid 1px var(--N300); + } } .dc__border-left-n0 { From 81617cfdb02695a5fc62524bb84b8be0d540e6d2 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 29 Jan 2025 00:16:43 +0530 Subject: [PATCH 10/12] chore: update devtron-fe-common-lib to version 1.5.11-beta-4 in package.json and yarn.lock --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c5b8243ea7..b702e9abfe 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.5.11", + "@devtron-labs/devtron-fe-common-lib": "1.5.11-beta-4", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index 3e2d4dfc66..4a7354c893 100644 --- a/yarn.lock +++ b/yarn.lock @@ -981,10 +981,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.5.11": - version "1.5.11" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.5.11.tgz#80b8fd9e87dc458f84a0789cfe3e741b150aa044" - integrity sha512-TpxebttA3Z+SlHvleXVzSV7vDeyGNpOG90zWoqGT0Q0CJc2W0dEHhzSf1DHsO69efa7AZ4oVamocTraBjaCxaQ== +"@devtron-labs/devtron-fe-common-lib@1.5.11-beta-4": + version "1.5.11-beta-4" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.5.11-beta-4.tgz#4c9d78616b1c0da9950de53e91118da2cc0b868a" + integrity sha512-Cho68ImbaYzt6voREgvIqlyKgluq4B9XPi27WmsFg+/Ycyi0i7Grqd/HJnrryioZwveAf1gkK4MtyVoaf/c1CA== dependencies: "@types/react-dates" "^21.8.6" ansi_up "^5.2.1" From 983304806863a00219509ac26ce925011e076a84 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 5 Feb 2025 19:25:45 +0530 Subject: [PATCH 11/12] chore: update devtron-fe-common-lib to version 1.6.11-beta-1 --- package.json | 2 +- yarn.lock | 248 +++++++++++++++++++++++++-------------------------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/package.json b/package.json index 70c192e9dc..d0e975da3b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.6.11", + "@devtron-labs/devtron-fe-common-lib": "1.6.11-beta-1", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index 40a346840c..19c27759e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1096,10 +1096,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.6.11": - version "1.6.11" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.11.tgz#8f093131fd5e632c7d2176eaf5709c73da1703fc" - integrity sha512-mVjsC/m+YeglZtCXyIWxc9Y2/XHoMzmfuequiWOBfJJDLV3L7hZLOFV+L9O+E7vYbjgosNvuqHb4SqwID84Nhg== +"@devtron-labs/devtron-fe-common-lib@1.6.11-beta-1": + version "1.6.11-beta-1" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.11-beta-1.tgz#2e78026d3318209e52a2e9cc3877ba03445e36eb" + integrity sha512-jnelGzsa3RlmJigu+l65NhQMJinszqqHbnxZtaV082Qqznw7ieOnK19MQH0De2pnCtTUO3yrpVcnrRXf9Vc+/Q== dependencies: "@codemirror/lang-json" "6.0.1" "@codemirror/lang-yaml" "6.1.2" @@ -1891,100 +1891,100 @@ estree-walker "^2.0.2" picomatch "^2.3.1" -"@rollup/rollup-android-arm-eabi@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.2.tgz#a1b26b73f873172f70f45d02849be085d6809479" - integrity sha512-6Fyg9yQbwJR+ykVdT9sid1oc2ewejS6h4wzQltmJfSW53N60G/ah9pngXGANdy9/aaE/TcUFpWosdm7JXS1WTQ== - -"@rollup/rollup-android-arm64@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.2.tgz#17f9a9a9ee57e47839a697275d9149c065f8b7d7" - integrity sha512-K5GfWe+vtQ3kyEbihrimM38UgX57UqHp+oME7X/EX9Im6suwZfa7Hsr8AtzbJvukTpwMGs+4s29YMSO3rwWtsw== - -"@rollup/rollup-darwin-arm64@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.2.tgz#55507d6a92985abadf2868cfcbd77297e989b8e6" - integrity sha512-PSN58XG/V/tzqDb9kDGutUruycgylMlUE59f40ny6QIRNsTEIZsrNQTJKUN2keMMSmlzgunMFqyaGLmly39sug== - -"@rollup/rollup-darwin-x64@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.2.tgz#3e75b09993a3584c613d7c100cfa62992d8907ab" - integrity sha512-gQhK788rQJm9pzmXyfBB84VHViDERhAhzGafw+E5mUpnGKuxZGkMVDa3wgDFKT6ukLC5V7QTifzsUKdNVxp5qQ== - -"@rollup/rollup-freebsd-arm64@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.2.tgz#d30e642542d82423628e06841a3a0704b5a1be37" - integrity sha512-eiaHgQwGPpxLC3+zTAcdKl4VsBl3r0AiJOd1Um/ArEzAjN/dbPK1nROHrVkdnoE6p7Svvn04w3f/jEZSTVHunA== - -"@rollup/rollup-freebsd-x64@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.2.tgz#5a511de732cf2f58e302a79926383960a280c277" - integrity sha512-lhdiwQ+jf8pewYOTG4bag0Qd68Jn1v2gO1i0mTuiD+Qkt5vNfHVK/jrT7uVvycV8ZchlzXp5HDVmhpzjC6mh0g== - -"@rollup/rollup-linux-arm-gnueabihf@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.2.tgz#abe62406d7864499e35e36563ddca0168508f816" - integrity sha512-lfqTpWjSvbgQP1vqGTXdv+/kxIznKXZlI109WkIFPbud41bjigjNmOAAKoazmRGx+k9e3rtIdbq2pQZPV1pMig== - -"@rollup/rollup-linux-arm-musleabihf@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.2.tgz#943057ec7ef19ef50ba7ea5467508abedbb1a04c" - integrity sha512-RGjqULqIurqqv+NJTyuPgdZhka8ImMLB32YwUle2BPTDqDoXNgwFjdjQC59FbSk08z0IqlRJjrJ0AvDQ5W5lpw== - -"@rollup/rollup-linux-arm64-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.2.tgz#1b96e68b1569484158b91ef48738aa87cbd3a1d7" - integrity sha512-ZvkPiheyXtXlFqHpsdgscx+tZ7hoR59vOettvArinEspq5fxSDSgfF+L5wqqJ9R4t+n53nyn0sKxeXlik7AY9Q== - -"@rollup/rollup-linux-arm64-musl@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.2.tgz#ea2ae28fa8cbb2af0f1bc2e45c8853a6a340f72d" - integrity sha512-UlFk+E46TZEoxD9ufLKDBzfSG7Ki03fo6hsNRRRHF+KuvNZ5vd1RRVQm8YZlGsjcJG8R252XFK0xNPay+4WV7w== - -"@rollup/rollup-linux-loongarch64-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.2.tgz#ae81c19fd33f2377ee0407b3179fd1d301598453" - integrity sha512-hJhfsD9ykx59jZuuoQgYT1GEcNNi3RCoEmbo5OGfG8RlHOiVS7iVNev9rhLKh7UBYq409f4uEw0cclTXx8nh8Q== - -"@rollup/rollup-linux-powerpc64le-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.2.tgz#0a39be62918231b09ffa8417f1128fd01180f2ab" - integrity sha512-g/O5IpgtrQqPegvqopvmdCF9vneLE7eqYfdPWW8yjPS8f63DNam3U4ARL1PNNB64XHZDHKpvO2Giftf43puB8Q== - -"@rollup/rollup-linux-riscv64-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.2.tgz#130cfaaceffd581dad94e93102a6d34eded10eb4" - integrity sha512-bSQijDC96M6PuooOuXHpvXUYiIwsnDmqGU8+br2U7iPoykNi9JtMUpN7K6xml29e0evK0/g0D1qbAUzWZFHY5Q== - -"@rollup/rollup-linux-s390x-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.2.tgz#844807d9bf486b319b75a0dcecb355093af25edf" - integrity sha512-49TtdeVAsdRuiUHXPrFVucaP4SivazetGUVH8CIxVsNsaPHV4PFkpLmH9LeqU/R4Nbgky9lzX5Xe1NrzLyraVA== - -"@rollup/rollup-linux-x64-gnu@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.2.tgz#2a59f28be83f134f600c9bc41f7a343e29d7ab80" - integrity sha512-j+jFdfOycLIQ7FWKka9Zd3qvsIyugg5LeZuHF6kFlXo6MSOc6R1w37YUVy8VpAKd81LMWGi5g9J25P09M0SSIw== - -"@rollup/rollup-linux-x64-musl@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.2.tgz#11545b2f17c8fe70809dafd6c128b547b44aa000" - integrity sha512-aDPHyM/D2SpXfSNCVWCxyHmOqN9qb7SWkY1+vaXqMNMXslZYnwh9V/UCudl6psyG0v6Ukj7pXanIpfZwCOEMUg== - -"@rollup/rollup-win32-arm64-msvc@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.2.tgz#8bbf8dfb84aac3a013baaa15c1d5340a84326cea" - integrity sha512-LQRkCyUBnAo7r8dbEdtNU08EKLCJMgAk2oP5H3R7BnUlKLqgR3dUjrLBVirmc1RK6U6qhtDw29Dimeer8d5hzQ== - -"@rollup/rollup-win32-ia32-msvc@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.2.tgz#cbba6c7c6cefdd632137bee4d47afb8ec9285bfe" - integrity sha512-wt8OhpQUi6JuPFkm1wbVi1BByeag87LDFzeKSXzIdGcX4bMLqORTtKxLoCbV57BHYNSUSOKlSL4BYYUghainYA== - -"@rollup/rollup-win32-x64-msvc@4.34.2": - version "4.34.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.2.tgz#87e27b5da4ae743567df2988e5975bb876bdaa32" - integrity sha512-rUrqINax0TvrPBXrFKg0YbQx18NpPN3NNrgmaao9xRNbTwek7lOXObhx8tQy8gelmQ/gLaGy1WptpU2eKJZImg== +"@rollup/rollup-android-arm-eabi@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.3.tgz#eb1b0a1d75c5f048b8d41eb30188c22292676c02" + integrity sha512-8kq/NjMKkMTGKMPldWihncOl62kgnLYk7cW+/4NCUWfS70/wz4+gQ7rMxMMpZ3dIOP/xw7wKNzIuUnN/H2GfUg== + +"@rollup/rollup-android-arm64@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.3.tgz#850f0962a7a98a698dfc4b7530a3932b486d84c0" + integrity sha512-1PqMHiuRochQ6++SDI7SaRDWJKr/NgAlezBi5nOne6Da6IWJo3hK0TdECBDwd92IUDPG4j/bZmWuwOnomNT8wA== + +"@rollup/rollup-darwin-arm64@4.34.3": + version "4.34.3" + resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.3.tgz" + integrity sha512-fqbrykX4mGV3DlCDXhF4OaMGcchd2tmLYxVt3On5oOZWVDFfdEoYAV2alzNChl8OzNaeMAGqm1f7gk7eIw/uDg== + +"@rollup/rollup-darwin-x64@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.3.tgz#27501960a733043c2b0634c884d20cd456d1cdef" + integrity sha512-8Wxrx/KRvMsTyLTbdrMXcVKfpW51cCNW8x7iQD72xSEbjvhCY3b+w83Bea3nQfysTMR7K28esc+ZFITThXm+1w== + +"@rollup/rollup-freebsd-arm64@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.3.tgz#a54caebb98ab71aaf67e826cc9e6a145fb30ffb5" + integrity sha512-lpBmV2qSiELh+ATQPTjQczt5hvbTLsE0c43Rx4bGxN2VpnAZWy77we7OO62LyOSZNY7CzjMoceRPc+Lt4e9J6A== + +"@rollup/rollup-freebsd-x64@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.3.tgz#2312f47788b3e334b14edb7eee748e9d545fd856" + integrity sha512-sNPvBIXpgaYcI6mAeH13GZMXFrrw5mdZVI1M9YQPRG2LpjwL8DSxSIflZoh/B5NEuOi53kxsR/S2GKozK1vDXA== + +"@rollup/rollup-linux-arm-gnueabihf@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.3.tgz#aaaa3f678ab3bcdf8ebda600ed2a9f04fe00d9cc" + integrity sha512-MW6N3AoC61OfE1VgnN5O1OW0gt8VTbhx9s/ZEPLBM11wEdHjeilPzOxVmmsrx5YmejpGPvez8QwGGvMU+pGxpw== + +"@rollup/rollup-linux-arm-musleabihf@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.3.tgz#ec7c8d98c79091afda6804fdf72d1d202217b9e4" + integrity sha512-2SQkhr5xvatYq0/+H6qyW0zvrQz9LM4lxGkpWURLoQX5+yP8MsERh4uWmxFohOvwCP6l/+wgiHZ1qVwLDc7Qmw== + +"@rollup/rollup-linux-arm64-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.3.tgz#df198a61a48db932426eee593f3699aa289e90f5" + integrity sha512-R3JLYt8YoRwKI5shJsovLpcR6pwIMui/MGG/MmxZ1DYI3iRSKI4qcYrvYgDf4Ss2oCR3RL3F3dYK7uAGQgMIuQ== + +"@rollup/rollup-linux-arm64-musl@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.3.tgz#97b231d2ca6fdeaa8d0e02de2f1f3896bedf14a3" + integrity sha512-4XQhG8v/t3S7Rxs7rmFUuM6j09hVrTArzONS3fUZ6oBRSN/ps9IPQjVhp62P0W3KhqJdQADo/MRlYRMdgxr/3w== + +"@rollup/rollup-linux-loongarch64-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.3.tgz#a1149b186e16d009d8fd715285e84ed63ba3cbbc" + integrity sha512-QlW1jCUZ1LHUIYCAK2FciVw1ptHsxzApYVi05q7bz2A8oNE8QxQ85NhM4arLxkAlcnS42t4avJbSfzSQwbIaKg== + +"@rollup/rollup-linux-powerpc64le-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.3.tgz#df3c2c25f800bc0bdf5e8cfc00372b5ac761bc5b" + integrity sha512-kMbLToizVeCcN69+nnm20Dh0hrRIAjgaaL+Wh0gWZcNt8e542d2FUGtsyuNsHVNNF3gqTJrpzUGIdwMGLEUM7g== + +"@rollup/rollup-linux-riscv64-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.3.tgz#c57b3e2c12969586f3513295cb36da96746edbf6" + integrity sha512-YgD0DnZ3CHtvXRH8rzjVSxwI0kMTr0RQt3o1N92RwxGdx7YejzbBO0ELlSU48DP96u1gYYVWfUhDRyaGNqJqJg== + +"@rollup/rollup-linux-s390x-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.3.tgz#e6ac0788471a9f7400b358eb5f91292efcc900c4" + integrity sha512-dIOoOz8altjp6UjAi3U9EW99s8nta4gzi52FeI45GlPyrUH4QixUoBMH9VsVjt+9A2RiZBWyjYNHlJ/HmJOBCQ== + +"@rollup/rollup-linux-x64-gnu@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.3.tgz#017bb2808665d69ba55740cae02708ea8cb45885" + integrity sha512-lOyG3aF4FTKrhpzXfMmBXgeKUUXdAWmP2zSNf8HTAXPqZay6QYT26l64hVizBjq+hJx3pl0DTEyvPi9sTA6VGA== + +"@rollup/rollup-linux-x64-musl@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.3.tgz#ac3de953f8e31b08f1528e17f0524af15b2df38c" + integrity sha512-usztyYLu2i+mYzzOjqHZTaRXbUOqw3P6laNUh1zcqxbPH1P2Tz/QdJJCQSnGxCtsRQeuU2bCyraGMtMumC46rw== + +"@rollup/rollup-win32-arm64-msvc@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.3.tgz#183fb4b849accdf68d430894ada2b88eea95a140" + integrity sha512-ojFOKaz/ZyalIrizdBq2vyc2f0kFbJahEznfZlxdB6pF9Do6++i1zS5Gy6QLf8D7/S57MHrmBLur6AeRYeQXSA== + +"@rollup/rollup-win32-ia32-msvc@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.3.tgz#3fd1b93867442ecd3d2329b902b111853600cc6c" + integrity sha512-K/V97GMbNa+Da9mGcZqmSl+DlJmWfHXTuI9V8oB2evGsQUtszCl67+OxWjBKpeOnYwox9Jpmt/J6VhpeRCYqow== + +"@rollup/rollup-win32-x64-msvc@4.34.3": + version "4.34.3" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.3.tgz#2cd47d213ddd921bab1470a3e31312ee37aac08a" + integrity sha512-CUypcYP31Q8O04myV6NKGzk9GVXslO5EJNfmARNSzLF2A+5rmZUlDJ4et6eoJaZgBT9wrC2p4JZH04Vkic8HdQ== "@sagold/json-pointer@^5.1.1", "@sagold/json-pointer@^5.1.2": version "5.1.2" @@ -7663,31 +7663,31 @@ rollup-pluginutils@^2.8.1: estree-walker "^0.6.1" rollup@^2.43.1, rollup@^4.20.0, rollup@^4.22.4: - version "4.34.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.34.2.tgz#7b2ced65732ed6b42df0aadcea50f908de7e61e8" - integrity sha512-sBDUoxZEaqLu9QeNalL8v3jw6WjPku4wfZGyTU7l7m1oC+rpRihXc/n/H+4148ZkGz5Xli8CHMns//fFGKvpIQ== + version "4.34.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.34.3.tgz#319a3c3065d9f80fef2faef24ef8aba7773e7f77" + integrity sha512-ORCtU0UBJyiAIn9m0llUXJXAswG/68pZptCrqxHG7//Z2DDzAUeyyY5hqf4XrsGlUxscMr9GkQ2QI7KTLqeyPw== dependencies: "@types/estree" "1.0.6" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.34.2" - "@rollup/rollup-android-arm64" "4.34.2" - "@rollup/rollup-darwin-arm64" "4.34.2" - "@rollup/rollup-darwin-x64" "4.34.2" - "@rollup/rollup-freebsd-arm64" "4.34.2" - "@rollup/rollup-freebsd-x64" "4.34.2" - "@rollup/rollup-linux-arm-gnueabihf" "4.34.2" - "@rollup/rollup-linux-arm-musleabihf" "4.34.2" - "@rollup/rollup-linux-arm64-gnu" "4.34.2" - "@rollup/rollup-linux-arm64-musl" "4.34.2" - "@rollup/rollup-linux-loongarch64-gnu" "4.34.2" - "@rollup/rollup-linux-powerpc64le-gnu" "4.34.2" - "@rollup/rollup-linux-riscv64-gnu" "4.34.2" - "@rollup/rollup-linux-s390x-gnu" "4.34.2" - "@rollup/rollup-linux-x64-gnu" "4.34.2" - "@rollup/rollup-linux-x64-musl" "4.34.2" - "@rollup/rollup-win32-arm64-msvc" "4.34.2" - "@rollup/rollup-win32-ia32-msvc" "4.34.2" - "@rollup/rollup-win32-x64-msvc" "4.34.2" + "@rollup/rollup-android-arm-eabi" "4.34.3" + "@rollup/rollup-android-arm64" "4.34.3" + "@rollup/rollup-darwin-arm64" "4.34.3" + "@rollup/rollup-darwin-x64" "4.34.3" + "@rollup/rollup-freebsd-arm64" "4.34.3" + "@rollup/rollup-freebsd-x64" "4.34.3" + "@rollup/rollup-linux-arm-gnueabihf" "4.34.3" + "@rollup/rollup-linux-arm-musleabihf" "4.34.3" + "@rollup/rollup-linux-arm64-gnu" "4.34.3" + "@rollup/rollup-linux-arm64-musl" "4.34.3" + "@rollup/rollup-linux-loongarch64-gnu" "4.34.3" + "@rollup/rollup-linux-powerpc64le-gnu" "4.34.3" + "@rollup/rollup-linux-riscv64-gnu" "4.34.3" + "@rollup/rollup-linux-s390x-gnu" "4.34.3" + "@rollup/rollup-linux-x64-gnu" "4.34.3" + "@rollup/rollup-linux-x64-musl" "4.34.3" + "@rollup/rollup-win32-arm64-msvc" "4.34.3" + "@rollup/rollup-win32-ia32-msvc" "4.34.3" + "@rollup/rollup-win32-x64-msvc" "4.34.3" fsevents "~2.3.2" run-parallel@^1.1.9: @@ -7756,9 +7756,9 @@ semver@^7.3.7, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3: integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== semver@^7.5.3: - version "7.7.0" - resolved "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz" - integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ== + version "7.7.1" + resolved "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz" + integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA== serialize-javascript@^6.0.1: version "6.0.2" @@ -8767,7 +8767,7 @@ vite-tsconfig-paths@5.0.1: vite@5.4.14: version "5.4.14" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408" + resolved "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz" integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA== dependencies: esbuild "^0.21.3" From 8aa5a0edafed287f0942d51ab0e50cc5082d9c62 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 7 Feb 2025 18:15:01 +0530 Subject: [PATCH 12/12] chore: bump devtron-fe-common-lib to version 1.6.13 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c2c87a8fb7..928994f23f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.6.12", + "@devtron-labs/devtron-fe-common-lib": "1.6.13", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index c714e377f9..4fe36cda3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1096,10 +1096,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.6.12": - version "1.6.12" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.12.tgz#c0a5e664c7327d3d2e94ce46b2a68410666b951c" - integrity sha512-uCFB8Chg9ze2kt+Vvr03qWv1HxqYUHJtHKyMDRAEIoMmyzG6y7Be9JQIV+P2oszAfSRCHbszh4l8R8kOv4f7Tg== +"@devtron-labs/devtron-fe-common-lib@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.13.tgz#c34a09e65192e25fc9cff572f76dfe4e20fef482" + integrity sha512-j6aiX9W7BgY2EDs663T9QWqgYIf7C9LQOBEyCCkmdiIg0PpkcWL3IB1yJOpdJ+MFYe9MmAWlNKQ/3lcgmm3l+g== dependencies: "@codemirror/lang-json" "6.0.1" "@codemirror/lang-yaml" "6.1.2"