From e50452b22e3fe42afc6091d522f82dc67552839d Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 4 Dec 2025 15:20:49 +0530 Subject: [PATCH 01/40] feat: add ResourceConflictDeployDialog for handling resource ownership conflicts during redeployments --- .../ResourceConflictDeployDialog.tsx | 59 +++++ src/Shared/Components/CICDHistory/Sidebar.tsx | 53 +++-- .../Components/CICDHistory/TriggerDetails.tsx | 221 +++++++++++------- .../Components/CICDHistory/TriggerOutput.tsx | 23 +- .../Components/CICDHistory/constants.tsx | 2 + src/Shared/Components/CICDHistory/service.tsx | 8 + src/Shared/Components/CICDHistory/types.tsx | 22 ++ src/Shared/Components/CICDHistory/utils.tsx | 3 + 8 files changed, 267 insertions(+), 124 deletions(-) create mode 100644 src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx new file mode 100644 index 000000000..d96e4a18d --- /dev/null +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -0,0 +1,59 @@ +import { useState } from 'react' +import { useHistory, useParams } from 'react-router-dom' + +import { URLS } from '@Common/Constants' +import { showError } from '@Common/Helper' +import { ToastManager, ToastVariantType } from '@Shared/Services' + +import { ConfirmationModal, ConfirmationModalVariantType } from '../ConfirmationModal' +import { resourceConflictRedeploy } from './service' +import { ResourceConflictDeployDialogProps, ResourceConflictDeployDialogURLParamsType } from './types' + +const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: ResourceConflictDeployDialogProps) => { + const history = useHistory() + const { appId, envId, pipelineId, triggerId } = useParams() + const [isLoading, setIsLoading] = useState(false) + + const handleDeploy = async () => { + setIsLoading(true) + try { + await resourceConflictRedeploy({ + pipelineId, + triggerId, + }) + ToastManager.showToast({ + variant: ToastVariantType.success, + title: 'Redeploy initiated', + description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, + }) + handleClose() + history.push(`${URLS.APP}/${appId}/details/${envId}`) + } catch (error) { + showError(error) + } finally { + setIsLoading(false) + } + } + + return ( + + ) +} + +export default ResourceConflictDeployDialog diff --git a/src/Shared/Components/CICDHistory/Sidebar.tsx b/src/Shared/Components/CICDHistory/Sidebar.tsx index 16e9e1cf7..11395f673 100644 --- a/src/Shared/Components/CICDHistory/Sidebar.tsx +++ b/src/Shared/Components/CICDHistory/Sidebar.tsx @@ -41,7 +41,12 @@ import { HistorySummaryCardType, SidebarType, } from './types' -import { getHistoryItemStatusIconFromWorkflowStages, getTriggerStatusIcon, getWorkflowNodeStatusTitle } from './utils' +import { + getHistoryItemStatusIconFromWorkflowStages, + getSortedTriggerHistory, + getTriggerStatusIcon, + getWorkflowNodeStatusTitle, +} from './utils' /** * @description To be shown on deployment history or when we don't have workflowExecutionStages @@ -378,30 +383,28 @@ const Sidebar = React.memo( {fetchIdData === FetchIdDataStatus.SUCCESS && ( )} - {Array.from(triggerHistory) - .sort(([a], [b]) => b - a) - .map(([triggerId, triggerDetails], index) => ( - - ))} + {getSortedTriggerHistory(triggerHistory).map(([triggerId, triggerDetails], index) => ( + + ))} {hasMore && (fetchIdData === FetchIdDataStatus.SUSPEND || !fetchIdData) && ( )} diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index ffd7738ca..6f3dc3a8c 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -34,15 +34,18 @@ import { GitTriggers } from '../../types' import { Button, ButtonStyleType, ButtonVariantType } from '../Button' import { ConfirmationModal, ConfirmationModalVariantType } from '../ConfirmationModal' import { Icon } from '../Icon' +import { InfoBlock } from '../InfoBlock' import { DEFAULT_CLUSTER_ID, DEFAULT_ENV, EXECUTION_FINISHED_TEXT_MAP, PROGRESSING_STATUS, PULSATING_STATUS_MAP, + RESOURCE_CONFLICT_DEPLOY_ERROR, statusColor as colorMap, TERMINAL_STATUS_COLOR_CLASS_MAP, } from './constants' +import ResourceConflictDeployDialog from './ResourceConflictDeployDialog' import { cancelCiTrigger, cancelPrePostCdTrigger } from './service' import { CurrentStatusIconProps, @@ -445,128 +448,172 @@ const TriggerDetails = memo( renderTargetConfigInfo, workflowExecutionStages, namespace, + isLatest, + appName, }: TriggerDetailsType) => { + const [showRedeployModal, setShowRedeployModal] = useState(false) + const executionInfo = useMemo( () => sanitizeWorkflowExecutionStages(workflowExecutionStages), [workflowExecutionStages], ) - return ( -
-
-
-
-
-
- {renderDetailsSuccessIconBlock()} -
-
+ const errorMessage = executionInfo?.workerDetails.message || message -
- -
-
+ const showResourceConflictInfoBlock = + isLatest && + (type === HistoryComponentType.CD || type === HistoryComponentType.GROUP_CD) && + stage === DeploymentStageType.DEPLOY && + errorMessage?.includes(RESOURCE_CONFLICT_DEPLOY_ERROR) + + const handleShowRedeployModal = () => { + setShowRedeployModal(true) + } + + const handleCloseRedeployModal = () => { + setShowRedeployModal(false) + } - {!!triggerMetadata && !!renderDeploymentHistoryTriggerMetaText && ( + return ( + <> +
+
- {renderBlockWithBorder()} - {renderDeploymentHistoryTriggerMetaText(triggerMetadata, true)} - {renderBlockWithBorder()} +
+ {renderDetailsSuccessIconBlock()}
- {renderDeploymentHistoryTriggerMetaText(triggerMetadata)} +
+ +
- )} - {isJobView && ( -
-
-
- {renderBlockWithBorder()} - - {renderBlockWithBorder()} + {!!triggerMetadata && !!renderDeploymentHistoryTriggerMetaText && ( +
+
+
+ {renderBlockWithBorder()} + {renderDeploymentHistoryTriggerMetaText(triggerMetadata, true)} + {renderBlockWithBorder()} +
+ + {renderDeploymentHistoryTriggerMetaText(triggerMetadata)}
+ )} + + {isJobView && ( +
+
+
+ {renderBlockWithBorder()} + + {renderBlockWithBorder()} +
+
-
- Env - - {environmentName !== '' ? environmentName : DEFAULT_ENV} - - {environmentName === '' && (Default)} +
+ Env + + {environmentName !== '' ? environmentName : DEFAULT_ENV} + + {environmentName === '' && (Default)} +
-
- )} + )} + + {!!executionInfo?.executionStartedOn && ( +
+
+
+ {renderBlockWithBorder()} + {renderDetailsSuccessIconBlock()} +
+
+ +
+

Execution started

+ +
+
+ )} - {!!executionInfo?.executionStartedOn && (
{renderBlockWithBorder()} - {renderDetailsSuccessIconBlock()} + + + +
-
-

Execution started

- -
+
- )} -
-
-
- {renderBlockWithBorder()} +
+ +
- + , + onClick: handleShowRedeployModal, + }} /> - -
-
- - -
- -
- + )}
-
+ + {showRedeployModal && ( + + )} + ) }, ) diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx index f3929c229..7f5c94c14 100644 --- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx +++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx @@ -47,8 +47,9 @@ import { statusSet, terminalStatus, TriggerOutputProps, + TriggerOutputURLParamsType, } from './types' -import { getTriggerOutputTabs } from './utils' +import { getSortedTriggerHistory, getTriggerOutputTabs } from './utils' import './cicdHistory.scss' @@ -250,12 +251,7 @@ const TriggerOutput = ({ renderTargetConfigInfo, appName, }: TriggerOutputProps) => { - const { appId, triggerId, envId, pipelineId } = useParams<{ - appId: string - triggerId: string - envId: string - pipelineId: string - }>() + const { appId, triggerId, envId, pipelineId } = useParams() const triggerDetails = triggerHistory.get(+triggerId) const [triggerDetailsLoading, triggerDetailsResult, triggerDetailsError, reloadTriggerDetails] = useAsync( () => getTriggerDetails({ appId, envId, pipelineId, triggerId, fetchIdData }), @@ -265,6 +261,7 @@ const TriggerOutput = ({ ) const targetPlatforms = sanitizeTargetPlatforms(triggerDetails?.targetPlatforms) + const artifactId = triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId // Function to sync the trigger details as trigger details is also fetched with another api const syncState = (syncTriggerId: number, syncTriggerDetail: History, syncTriggerDetailsError: ServerError) => { @@ -311,12 +308,10 @@ const TriggerOutput = ({ () => getTagDetails({ pipelineId, - artifactId: triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId, + artifactId, }), [pipelineId, triggerId], - areTagDetailsRequired && - !!pipelineId && - (!!triggerDetailsResult?.result?.artifactId || !!triggerDetails?.artifactId), + areTagDetailsRequired && !!pipelineId && !!artifactId, ) useEffect(() => { @@ -363,6 +358,8 @@ const TriggerOutput = ({ useInterval(reloadTriggerDetails, timeout) + const latestTriggerHistoryId = useMemo(() => getSortedTriggerHistory(triggerHistory)?.[0]?.[0], [triggerHistory]) + if ( (!areTagDetailsRequired && triggerDetailsLoading && !triggerDetails) || !triggerId || @@ -411,6 +408,8 @@ const TriggerOutput = ({ renderTargetConfigInfo={renderTargetConfigInfo} workflowExecutionStages={triggerDetails.workflowExecutionStages} namespace={triggerDetails.namespace} + isLatest={latestTriggerHistoryId === triggerDetails.id} + appName={appName} />
@@ -430,7 +429,7 @@ const TriggerOutput = ({ setFullScreenView={setFullScreenView} deploymentAppType={deploymentAppType} isBlobStorageConfigured={isBlobStorageConfigured} - artifactId={triggerDetailsResult?.result?.artifactId} + artifactId={artifactId} ciPipelineId={triggerDetailsResult?.result?.ciPipelineId} appReleaseTags={appReleaseTags} tagsEditable={tagsEditable} diff --git a/src/Shared/Components/CICDHistory/constants.tsx b/src/Shared/Components/CICDHistory/constants.tsx index 9d3d366f5..6cb82374f 100644 --- a/src/Shared/Components/CICDHistory/constants.tsx +++ b/src/Shared/Components/CICDHistory/constants.tsx @@ -170,3 +170,5 @@ export const FAILED_WORKFLOW_STAGE_STATUS_MAP: Record< } export const APP_HEALTH_DROP_DOWN_LIST = ['inprogress', 'failed', 'disconnect', 'timed_out'] + +export const RESOURCE_CONFLICT_DEPLOY_ERROR = 'cannot be imported into the current release: invalid ownership metadata;' diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index 6a130c68c..ad20efc2b 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -28,6 +28,7 @@ import { DeploymentStatusDetailsResponse, FetchIdDataStatus, ModuleConfigResponse, + ResourceConflictDeployDialogURLParamsType, TriggerDetailsResponseType, TriggerHistoryParamsType, } from './types' @@ -292,3 +293,10 @@ export const getTriggerHistory = async ({ export const getModuleConfigured = (moduleName: string): Promise => get(`${ROUTES.MODULE_CONFIGURED}?name=${moduleName}`) + +export const resourceConflictRedeploy = async ({ + pipelineId, + triggerId, +}: Pick) => + // TODO: Fix the route + get(`cd-pipeline/re-deploy/${pipelineId}/${triggerId}`) diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index 7f6f8483f..d9a5e595c 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -35,6 +35,7 @@ import { DeploymentStageType } from '../../constants' import { AggregationKeys, AppDetails, + BaseURLParams, DeploymentStatusDetailsBreakdownDataType, DeploymentStatusDetailsType, DeploymentStatusTimelineType, @@ -331,8 +332,29 @@ export interface TriggerDetailsType workerPodName?: string triggerMetadata?: string renderDeploymentHistoryTriggerMetaText: (triggerMetaData: string, onlyRenderIcon?: boolean) => JSX.Element + /** + * Only present in case of CD trigger details as of now + */ + isLatest?: boolean + /** + * Only present in case of CD trigger details as of now + */ + appName?: string +} + +export interface ResourceConflictDeployDialogProps + extends Required> { + handleClose: () => void } +export interface TriggerOutputURLParamsType extends Pick { + triggerId: string + pipelineId: string +} + +export interface ResourceConflictDeployDialogURLParamsType + extends Pick {} + export type ProgressingStatusType = { stage: DeploymentStageType type: HistoryComponentType diff --git a/src/Shared/Components/CICDHistory/utils.tsx b/src/Shared/Components/CICDHistory/utils.tsx index be3071c7f..d24e486f4 100644 --- a/src/Shared/Components/CICDHistory/utils.tsx +++ b/src/Shared/Components/CICDHistory/utils.tsx @@ -460,3 +460,6 @@ export const getTriggerOutputTabs = ( ] : []), ] + +export const getSortedTriggerHistory = (triggerHistory: Map) => + Array.from(triggerHistory).sort(([a], [b]) => b - a) From c9f566fcbbe04b86d4374aa385dd45a67ad23fbc Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 4 Dec 2025 18:06:09 +0530 Subject: [PATCH 02/40] feat: implement ResourceConflictDetailsModal and ConflictedResourcesTable for managing resource conflicts --- .../CICDHistory/ConflictedResourcesTable.tsx | 47 +++++++ .../ResourceConflictDetailsModal.tsx | 121 ++++++++++++++++++ .../Components/CICDHistory/TriggerDetails.tsx | 57 +++++++-- .../Components/CICDHistory/constants.tsx | 43 ++++++- src/Shared/Components/CICDHistory/service.tsx | 58 ++++++++- src/Shared/Components/CICDHistory/types.tsx | 29 ++++- 6 files changed, 340 insertions(+), 15 deletions(-) create mode 100644 src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx create mode 100644 src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx diff --git a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx new file mode 100644 index 000000000..3183b54e4 --- /dev/null +++ b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx @@ -0,0 +1,47 @@ +import { useMemo } from 'react' + +import { noop } from '@Common/Helper' + +import { FiltersTypeEnum, PaginationEnum, Table, TableViewWrapperProps } from '../Table' +import { RowsType } from '../Table/types' +import { CONFLICTED_RESOURCES_COLUMNS } from './constants' +import { ConflictedResourcesTableProps, ResourceConflictItemType } from './types' + +const Wrapper = ({ children }: TableViewWrapperProps) =>
{children}
+ +const ConflictedResourcesTable = ({ resourceConflictDetails }: ConflictedResourcesTableProps) => { + const rows: RowsType = useMemo( + () => + (resourceConflictDetails || []).map[number]>((resource) => ({ + data: resource, + id: resource.id, + })), + [resourceConflictDetails], + ) + + return ( + + id="table__resource-conflict-details" + columns={CONFLICTED_RESOURCES_COLUMNS} + rows={rows} + emptyStateConfig={{ + noRowsConfig: { + title: 'No resource found', + }, + noRowsForFilterConfig: { + title: 'No results', + subTitle: "We couldn't find any matching results", + }, + }} + paginationVariant={PaginationEnum.NOT_PAGINATED} + additionalFilterProps={{ + initialSortKey: 'name' satisfies keyof ResourceConflictItemType, + }} + filtersVariant={FiltersTypeEnum.STATE} + ViewWrapper={Wrapper} + filter={noop} + /> + ) +} + +export default ConflictedResourcesTable diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx new file mode 100644 index 000000000..8206783b3 --- /dev/null +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -0,0 +1,121 @@ +import { useState } from 'react' +import { useHistory, useParams } from 'react-router-dom' + +import { useQuery } from '@Common/API' +import { URLS } from '@Common/Constants' +import { Drawer } from '@Common/Drawer' +import { showError, stopPropagation } from '@Common/Helper' +import { ComponentSizeType } from '@Shared/constants' +import { ToastManager, ToastVariantType } from '@Shared/Services' + +import { APIResponseHandler } from '../APIResponseHandler' +import { Button, ButtonStyleType, ButtonVariantType } from '../Button' +import { Icon } from '../Icon' +import ConflictedResourcesTable from './ConflictedResourcesTable' +import { getResourceConflictDetails, resourceConflictRedeploy } from './service' +import { ResourceConflictDeployDialogURLParamsType, ResourceConflictDetailsModalProps } from './types' + +const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: ResourceConflictDetailsModalProps) => { + const { appId, envId, pipelineId, triggerId } = useParams() + const history = useHistory() + + const { + isFetching: isLoadingResourceData, + data: resourceConflictDetails, + refetch: refetchResourceConflictDetails, + error: resourceConflictDetailsError, + } = useQuery({ + queryKey: ['getResourceConflictDetails'], + // TODO: Signal + queryFn: () => getResourceConflictDetails(), + select: (data) => data.result, + }) + + const [isDeploying, setIsDeploying] = useState(false) + + const handleDeploy = async () => { + setIsDeploying(true) + try { + await resourceConflictRedeploy({ + pipelineId, + triggerId, + }) + ToastManager.showToast({ + variant: ToastVariantType.success, + title: 'Redeploy initiated', + description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, + }) + handleClose() + history.push(`${URLS.APP}/${appId}/details/${envId}`) + } catch (error) { + showError(error) + } finally { + setIsDeploying(false) + } + } + + return ( + +
+
+
+

Resources with conflict

+ +
+ +
+ + + +
+
+ +
+
+
+ + ) +} + +export default ResourceConflictDetailsModal diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index 6f3dc3a8c..034d038bb 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -46,6 +46,7 @@ import { TERMINAL_STATUS_COLOR_CLASS_MAP, } from './constants' import ResourceConflictDeployDialog from './ResourceConflictDeployDialog' +import ResourceConflictDetailsModal from './ResourceConflictDetailsModal' import { cancelCiTrigger, cancelPrePostCdTrigger } from './service' import { CurrentStatusIconProps, @@ -53,6 +54,7 @@ import { FinishedType, HistoryComponentType, ProgressingStatusType, + ResourceConflictModalType, StartDetailsType, TriggerDetailsType, WorkflowStageStatusType, @@ -451,7 +453,7 @@ const TriggerDetails = memo( isLatest, appName, }: TriggerDetailsType) => { - const [showRedeployModal, setShowRedeployModal] = useState(false) + const [resourceConflictModal, setResourceConflictModal] = useState(null) const executionInfo = useMemo( () => sanitizeWorkflowExecutionStages(workflowExecutionStages), @@ -467,11 +469,50 @@ const TriggerDetails = memo( errorMessage?.includes(RESOURCE_CONFLICT_DEPLOY_ERROR) const handleShowRedeployModal = () => { - setShowRedeployModal(true) + setResourceConflictModal(ResourceConflictModalType.DEPLOY_DIALOG) } const handleCloseRedeployModal = () => { - setShowRedeployModal(false) + setResourceConflictModal(null) + } + + const renderInfoBlockDescription = () => ( +
+
+ ) + + const renderDialogs = () => { + if (resourceConflictModal === ResourceConflictModalType.DEPLOY_DIALOG) { + return ( + + ) + } + + if (resourceConflictModal === ResourceConflictModalType.RESOURCE_DETAIL_MODAL) { + return ( + + ) + } + + return null } return ( @@ -593,7 +634,7 @@ const TriggerDetails = memo( {showResourceConflictInfoBlock && (
- {showRedeployModal && ( - - )} + {renderDialogs()} ) }, diff --git a/src/Shared/Components/CICDHistory/constants.tsx b/src/Shared/Components/CICDHistory/constants.tsx index 6cb82374f..52fb78d09 100644 --- a/src/Shared/Components/CICDHistory/constants.tsx +++ b/src/Shared/Components/CICDHistory/constants.tsx @@ -17,7 +17,8 @@ import { WorkflowStatusEnum } from '@Shared/types' import { multiSelectStyles } from '../../../Common/MultiSelectCustomization' -import { WorkflowStageStatusType } from './types' +import { FiltersTypeEnum, TableProps } from '../Table' +import { ResourceConflictItemType, WorkflowStageStatusType } from './types' export const HISTORY_LABEL = { APPLICATION: 'Application', @@ -172,3 +173,43 @@ export const FAILED_WORKFLOW_STAGE_STATUS_MAP: Record< export const APP_HEALTH_DROP_DOWN_LIST = ['inprogress', 'failed', 'disconnect', 'timed_out'] export const RESOURCE_CONFLICT_DEPLOY_ERROR = 'cannot be imported into the current release: invalid ownership metadata;' + +export const CONFLICTED_RESOURCES_COLUMNS: TableProps['columns'] = [ + { + field: 'name' satisfies keyof ResourceConflictItemType, + label: 'Name', + size: { + range: { + startWidth: 250, + maxWidth: 400, + minWidth: 120, + }, + }, + isSortable: true, + horizontallySticky: true, + }, + { + field: 'namespace' satisfies keyof ResourceConflictItemType, + label: 'Namespace', + size: { + range: { + startWidth: 150, + maxWidth: 400, + minWidth: 100, + }, + }, + isSortable: true, + }, + { + field: 'gvkTitle' satisfies keyof ResourceConflictItemType, + label: 'GVK', + size: { + range: { + startWidth: 250, + maxWidth: 400, + minWidth: 100, + }, + }, + isSortable: true, + }, +] diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index ad20efc2b..f8994a864 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -19,7 +19,7 @@ import moment from 'moment' import { get, getUrlWithSearchParams, ResponseType, ROUTES, sanitizeUserApprovalMetadata, trash } from '../../../Common' import { DATE_TIME_FORMAT_STRING, DEPLOYMENT_HISTORY_CONFIGURATION_LIST_MAP, EXTERNAL_TYPES } from '../../constants' -import { decode, isNullOrUndefined } from '../../Helpers' +import { decode, getUniqueId, isNullOrUndefined } from '../../Helpers' import { ResourceKindType, ResourceVersionType } from '../../types' import { DeploymentHistoryDetail, @@ -29,6 +29,7 @@ import { FetchIdDataStatus, ModuleConfigResponse, ResourceConflictDeployDialogURLParamsType, + ResourceConflictItemType, TriggerDetailsResponseType, TriggerHistoryParamsType, } from './types' @@ -300,3 +301,58 @@ export const resourceConflictRedeploy = async ({ }: Pick) => // TODO: Fix the route get(`cd-pipeline/re-deploy/${pipelineId}/${triggerId}`) + +export const getResourceConflictDetails = async (): Promise> => ({ + code: 200, + result: [ + { + name: 'resource-1', + namespace: 'default', + gvk: { + Group: 'apps', + Version: 'v1', + Kind: 'Deployment', + }, + gvkTitle: 'Deployment', + clusterId: 1, + id: getUniqueId(), + }, + { + name: 'resource-2', + namespace: 'default', + gvk: { + Group: '', + Version: 'v1', + Kind: 'Service', + }, + gvkTitle: 'Service', + clusterId: 1, + id: getUniqueId(), + }, + { + name: 'resource-3', + namespace: 'default', + gvk: { + Group: 'apps', + Version: 'v1', + Kind: 'StatefulSet', + }, + gvkTitle: 'StatefulSet', + clusterId: 1, + id: getUniqueId(), + }, + { + name: 'resource-4', + namespace: 'default', + gvk: { + Group: 'batch', + Version: 'v1', + Kind: 'Job', + }, + gvkTitle: 'Job', + clusterId: 1, + id: getUniqueId(), + }, + ], + status: 'OK', +}) diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index d9a5e595c..bd9adbf22 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -17,6 +17,7 @@ import { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react' import { SupportedKeyboardKeysType } from '@Common/Hooks/UseRegisterShortcut/types' +import { GVKType } from '@Pages/ResourceBrowser' import { DeploymentAppTypes, @@ -342,11 +343,35 @@ export interface TriggerDetailsType appName?: string } -export interface ResourceConflictDeployDialogProps - extends Required> { +export enum ResourceConflictModalType { + DEPLOY_DIALOG = 'DEPLOY_DIALOG', + RESOURCE_DETAIL_MODAL = 'RESOURCE_DETAIL_MODAL', +} + +interface ResourceConflictDialogBaseProps extends Required> { handleClose: () => void } +export interface ResourceConflictDeployDialogProps extends ResourceConflictDialogBaseProps {} + +export interface ResourceConflictDetailsModalProps extends ResourceConflictDialogBaseProps {} + +export interface ResourceConflictItemType { + name: string + namespace: string + gvk: GVKType + gvkTitle: string + clusterId: number + /** + * Generated at ui + */ + id: string +} + +export interface ConflictedResourcesTableProps { + resourceConflictDetails: ResourceConflictItemType[] +} + export interface TriggerOutputURLParamsType extends Pick { triggerId: string pipelineId: string From 7f658c5a834d1d148ad9e95e0aeeb547a2c9a281 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 13:08:03 +0530 Subject: [PATCH 03/40] feat: enhance resource conflict handling with redeploy functionality and UI improvements --- .../ResourceConflictDeployDialog.tsx | 9 ++++- .../ResourceConflictDetailsModal.tsx | 3 +- .../Components/CICDHistory/TriggerDetails.tsx | 39 +++++++++++-------- .../Components/CICDHistory/WorkerStatus.tsx | 3 ++ src/Shared/Components/CICDHistory/service.tsx | 26 +++++++++---- src/Shared/Components/CICDHistory/types.tsx | 11 ++++++ 6 files changed, 64 insertions(+), 27 deletions(-) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx index d96e4a18d..4ff391ea4 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -5,7 +5,9 @@ import { URLS } from '@Common/Constants' import { showError } from '@Common/Helper' import { ToastManager, ToastVariantType } from '@Shared/Services' +import { ButtonStyleType } from '../Button' import { ConfirmationModal, ConfirmationModalVariantType } from '../ConfirmationModal' +import { Icon } from '../Icon' import { resourceConflictRedeploy } from './service' import { ResourceConflictDeployDialogProps, ResourceConflictDeployDialogURLParamsType } from './types' @@ -20,6 +22,7 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: await resourceConflictRedeploy({ pipelineId, triggerId, + appId, }) ToastManager.showToast({ variant: ToastVariantType.success, @@ -27,7 +30,7 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, }) handleClose() - history.push(`${URLS.APP}/${appId}/details/${envId}`) + history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) } catch (error) { showError(error) } finally { @@ -37,7 +40,8 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: return ( } title="Take resource ownership and redeploy" subtitle={`Ensure the resources belong to the '${appName}' application and the '${environmentName}' environment to avoid destructive changes.`} handleClose={handleClose} @@ -50,6 +54,7 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: isLoading, text: 'Re-deploy', onClick: handleDeploy, + style: ButtonStyleType.warning, }, }} /> diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 8206783b3..1959e4ffa 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -39,6 +39,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: await resourceConflictRedeploy({ pipelineId, triggerId, + appId, }) ToastManager.showToast({ variant: ToastVariantType.success, @@ -46,7 +47,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, }) handleClose() - history.push(`${URLS.APP}/${appId}/details/${envId}`) + history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) } catch (error) { showError(error) } finally { diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index 034d038bb..c29852e9e 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -472,6 +472,10 @@ const TriggerDetails = memo( setResourceConflictModal(ResourceConflictModalType.DEPLOY_DIALOG) } + const handleShowResourceConflictDetailsModal = () => { + setResourceConflictModal(ResourceConflictModalType.RESOURCE_DETAIL_MODAL) + } + const handleCloseRedeployModal = () => { setResourceConflictModal(null) } @@ -483,8 +487,9 @@ const TriggerDetails = memo( text="Some Resources" variant={ButtonVariantType.text} size={ComponentSizeType.medium} + onClick={handleShowResourceConflictDetailsModal} /> - +   have ownership conflict. Take resource ownership and re-deploy @@ -628,22 +633,24 @@ const TriggerDetails = memo( clusterId={executionInfo?.workerDetails.clusterId || DEFAULT_CLUSTER_ID} workerPodName={workerPodName} namespace={namespace} - /> + > + {showResourceConflictInfoBlock && ( +
+ , + onClick: handleShowRedeployModal, + variant: ButtonVariantType.text, + size: ComponentSizeType.medium, + }} + /> +
+ )} +
- - {showResourceConflictInfoBlock && ( -
- , - onClick: handleShowRedeployModal, - }} - /> -
- )}
diff --git a/src/Shared/Components/CICDHistory/WorkerStatus.tsx b/src/Shared/Components/CICDHistory/WorkerStatus.tsx index ccf7c79fa..69ce4d7bd 100644 --- a/src/Shared/Components/CICDHistory/WorkerStatus.tsx +++ b/src/Shared/Components/CICDHistory/WorkerStatus.tsx @@ -41,6 +41,7 @@ const WorkerStatus = memo( titleClassName = 'cn-9 fs-13 fw-4 lh-20', viewWorkerPodClassName = 'fs-13', hideShowMoreMessageButton = false, + children, }: WorkerStatusType): JSX.Element | null => { if (!message && !podStatus) { return null @@ -98,6 +99,8 @@ const WorkerStatus = memo( hideShowMore={hideShowMoreMessageButton} /> )} + + {children}
) diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index f8994a864..ae3508fa8 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -17,7 +17,15 @@ /* eslint-disable dot-notation */ import moment from 'moment' -import { get, getUrlWithSearchParams, ResponseType, ROUTES, sanitizeUserApprovalMetadata, trash } from '../../../Common' +import { + get, + getUrlWithSearchParams, + post, + ResponseType, + ROUTES, + sanitizeUserApprovalMetadata, + trash, +} from '../../../Common' import { DATE_TIME_FORMAT_STRING, DEPLOYMENT_HISTORY_CONFIGURATION_LIST_MAP, EXTERNAL_TYPES } from '../../constants' import { decode, getUniqueId, isNullOrUndefined } from '../../Helpers' import { ResourceKindType, ResourceVersionType } from '../../types' @@ -28,8 +36,9 @@ import { DeploymentStatusDetailsResponse, FetchIdDataStatus, ModuleConfigResponse, - ResourceConflictDeployDialogURLParamsType, ResourceConflictItemType, + ResourceConflictRedeployParamsType, + ResourceConflictRedeployPayloadType, TriggerDetailsResponseType, TriggerHistoryParamsType, } from './types' @@ -295,12 +304,13 @@ export const getTriggerHistory = async ({ export const getModuleConfigured = (moduleName: string): Promise => get(`${ROUTES.MODULE_CONFIGURED}?name=${moduleName}`) -export const resourceConflictRedeploy = async ({ - pipelineId, - triggerId, -}: Pick) => - // TODO: Fix the route - get(`cd-pipeline/re-deploy/${pipelineId}/${triggerId}`) +export const resourceConflictRedeploy = async ({ pipelineId, triggerId, appId }: ResourceConflictRedeployParamsType) => + post(ROUTES.CD_TRIGGER_POST, { + pipelineId: +pipelineId, + wfrId: +triggerId, + appId: +appId, + redeployHelmReleaseWithTakeOwnership: true, + }) export const getResourceConflictDetails = async (): Promise> => ({ code: 200, diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index bd9adbf22..44a008c1e 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -409,6 +409,7 @@ export interface WorkerStatusType * @default false */ hideShowMoreMessageButton?: boolean + children?: ReactNode } export type FinishedType = { artifact: string; type: HistoryComponentType } & ( @@ -903,3 +904,13 @@ export interface CIPipelineSourceConfigInterface { primaryBranchAfterRegex?: string rootClassName?: string } + +export interface ResourceConflictRedeployParamsType + extends Pick {} + +export interface ResourceConflictRedeployPayloadType { + pipelineId: number + appId: number + wfrId: number + redeployHelmReleaseWithTakeOwnership: true +} From 60936efdb04e7039882658488176088761a665a9 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 14:53:47 +0530 Subject: [PATCH 04/40] feat: add resource conflict management components and enhance related functionality --- src/Common/API/reactQueryHooks.ts | 14 +- src/Common/Constants.ts | 1 + .../CICDHistory/ConflictedResourcesTable.scss | 9 ++ .../CICDHistory/ConflictedResourcesTable.tsx | 7 +- .../ResourceConflictDeployDialog.tsx | 2 +- .../ResourceConflictDetailsModal.tsx | 62 +++++---- .../Components/CICDHistory/TriggerDetails.tsx | 5 +- .../Components/CICDHistory/constants.tsx | 4 + src/Shared/Components/CICDHistory/service.tsx | 127 +++++++++++------- src/Shared/Components/CICDHistory/types.tsx | 62 ++++++--- src/Shared/Helpers.tsx | 23 +++- 11 files changed, 212 insertions(+), 104 deletions(-) create mode 100644 src/Shared/Components/CICDHistory/ConflictedResourcesTable.scss diff --git a/src/Common/API/reactQueryHooks.ts b/src/Common/API/reactQueryHooks.ts index 43d6fad14..4b1ceed8d 100644 --- a/src/Common/API/reactQueryHooks.ts +++ b/src/Common/API/reactQueryHooks.ts @@ -28,8 +28,18 @@ import { import { ServerErrors } from '@Common/ServerError' import { ResponseType } from '@Common/Types' -export const useQuery = ( - options: UseQueryOptions, ServerErrors, TData, TQueryKey>, +export const useQuery = < + TQueryFnData = unknown, + TData = TQueryFnData, + TQueryKey extends QueryKey = QueryKey, + WrapWithResponseType extends boolean = true, +>( + options: UseQueryOptions< + WrapWithResponseType extends true ? ResponseType : TQueryFnData, + ServerErrors, + TData, + TQueryKey + >, ): UseQueryResult => rqUseQuery(options) export const useMutation = ( diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index ce392ca05..2436e2b84 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -162,6 +162,7 @@ export const ROUTES = { LICENSE_DATA: 'license/data', ENV: 'env', APP_METADATA: 'app-metadata', + RESOURCE_CONFLICTS_LIST: 'app/template/helm-ownership-conflicts', } as const export enum KEY_VALUE { diff --git a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.scss b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.scss new file mode 100644 index 000000000..73ac26c03 --- /dev/null +++ b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.scss @@ -0,0 +1,9 @@ +[id*="table__resource-conflict-details"] { + .generic-table__row { + .generic-table__cell { + display: flex; + align-items: center; + padding: 10px 0; + } + } +} \ No newline at end of file diff --git a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx index 3183b54e4..b8bd44ac6 100644 --- a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx +++ b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx @@ -1,13 +1,14 @@ import { useMemo } from 'react' -import { noop } from '@Common/Helper' - import { FiltersTypeEnum, PaginationEnum, Table, TableViewWrapperProps } from '../Table' import { RowsType } from '../Table/types' import { CONFLICTED_RESOURCES_COLUMNS } from './constants' import { ConflictedResourcesTableProps, ResourceConflictItemType } from './types' +import './ConflictedResourcesTable.scss' + const Wrapper = ({ children }: TableViewWrapperProps) =>
{children}
+const filter = () => true const ConflictedResourcesTable = ({ resourceConflictDetails }: ConflictedResourcesTableProps) => { const rows: RowsType = useMemo( @@ -39,7 +40,7 @@ const ConflictedResourcesTable = ({ resourceConflictDetails }: ConflictedResourc }} filtersVariant={FiltersTypeEnum.STATE} ViewWrapper={Wrapper} - filter={noop} + filter={filter} /> ) } diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx index 4ff391ea4..7ff71c212 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -30,7 +30,7 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, }) handleClose() - history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) + history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) } finally { diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 1959e4ffa..85a4e7e30 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -13,7 +13,11 @@ import { Button, ButtonStyleType, ButtonVariantType } from '../Button' import { Icon } from '../Icon' import ConflictedResourcesTable from './ConflictedResourcesTable' import { getResourceConflictDetails, resourceConflictRedeploy } from './service' -import { ResourceConflictDeployDialogURLParamsType, ResourceConflictDetailsModalProps } from './types' +import { + ResourceConflictDeployDialogURLParamsType, + ResourceConflictDetailsModalProps, + ResourceConflictItemType, +} from './types' const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: ResourceConflictDetailsModalProps) => { const { appId, envId, pipelineId, triggerId } = useParams() @@ -24,11 +28,9 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: data: resourceConflictDetails, refetch: refetchResourceConflictDetails, error: resourceConflictDetailsError, - } = useQuery({ - queryKey: ['getResourceConflictDetails'], - // TODO: Signal - queryFn: () => getResourceConflictDetails(), - select: (data) => data.result, + } = useQuery({ + queryKey: ['getResourceConflictDetails', pipelineId, triggerId, appId], + queryFn: ({ signal }) => getResourceConflictDetails({ pipelineId, triggerId, appId, signal }), }) const [isDeploying, setIsDeploying] = useState(false) @@ -47,7 +49,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, }) handleClose() - history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) + history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) } finally { @@ -77,7 +79,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: />
-
+
-
-
diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index c29852e9e..52532acd3 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -491,7 +491,7 @@ const TriggerDetails = memo( />   - have ownership conflict. Take resource ownership and re-deploy + have ownership conflicts. Resolve by taking ownership and redeploying.
) @@ -635,8 +635,9 @@ const TriggerDetails = memo( namespace={namespace} > {showResourceConflictInfoBlock && ( -
+
> => ({ - code: 200, - result: [ - { - name: 'resource-1', - namespace: 'default', - gvk: { - Group: 'apps', - Version: 'v1', - Kind: 'Deployment', +export const getResourceConflictDetails = async ({ + // eslint-disable-next-line @typescript-eslint/no-unused-vars + appId, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + pipelineId, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + triggerId, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + signal, +}: GetResourceConflictDetailsParamsType): Promise => { + // const { result } = await post( + // ROUTES.RESOURCE_CONFLICTS_LIST, + // { + // appId: +appId, + // pipelineId: +pipelineId, + // wfrId: +triggerId, + // }, + // { signal }, + // ) + + const MOCK_RESULT: ResourceConflictListItemDTO = { + clusterId: 1, + conflictingResources: [ + { + name: 'resource-1', + namespace: 'default', + groupVersionKind: { + Group: 'apps', + Version: 'v1', + Kind: 'Deployment', + }, }, - gvkTitle: 'Deployment', - clusterId: 1, - id: getUniqueId(), - }, - { - name: 'resource-2', - namespace: 'default', - gvk: { - Group: '', - Version: 'v1', - Kind: 'Service', + { + name: 'resource-2', + namespace: 'default', + groupVersionKind: { + Group: '', + Version: 'v1', + Kind: 'Service', + }, }, - gvkTitle: 'Service', - clusterId: 1, - id: getUniqueId(), - }, - { - name: 'resource-3', - namespace: 'default', - gvk: { - Group: 'apps', - Version: 'v1', - Kind: 'StatefulSet', + { + name: 'resource-3', + namespace: 'default', + groupVersionKind: { + Group: 'apps', + Version: 'v1', + Kind: 'StatefulSet', + }, }, - gvkTitle: 'StatefulSet', - clusterId: 1, - id: getUniqueId(), - }, - { - name: 'resource-4', - namespace: 'default', - gvk: { - Group: 'batch', - Version: 'v1', - Kind: 'Job', + { + name: 'resource-4', + namespace: 'default', + groupVersionKind: { + Group: 'batch', + Version: 'v1', + Kind: 'Job', + }, }, - gvkTitle: 'Job', - clusterId: 1, - id: getUniqueId(), + ], + } + + return (MOCK_RESULT?.conflictingResources || []).map((resource) => ({ + name: resource.name || '', + namespace: resource.namespace || '', + gvk: { + Group: resource.groupVersionKind.Group || K8S_EMPTY_GROUP, + Version: resource.groupVersionKind.Version || '', + Kind: resource.groupVersionKind.Kind || ('' as GVKType['Kind']), }, - ], - status: 'OK', -}) + gvkTitle: getGVKTitle(resource.groupVersionKind), + clusterId: MOCK_RESULT.clusterId, + id: getUniqueId(), + })) +} diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index 44a008c1e..56beb9d31 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -356,30 +356,11 @@ export interface ResourceConflictDeployDialogProps extends ResourceConflictDialo export interface ResourceConflictDetailsModalProps extends ResourceConflictDialogBaseProps {} -export interface ResourceConflictItemType { - name: string - namespace: string - gvk: GVKType - gvkTitle: string - clusterId: number - /** - * Generated at ui - */ - id: string -} - -export interface ConflictedResourcesTableProps { - resourceConflictDetails: ResourceConflictItemType[] -} - export interface TriggerOutputURLParamsType extends Pick { triggerId: string pipelineId: string } -export interface ResourceConflictDeployDialogURLParamsType - extends Pick {} - export type ProgressingStatusType = { stage: DeploymentStageType type: HistoryComponentType @@ -905,6 +886,25 @@ export interface CIPipelineSourceConfigInterface { rootClassName?: string } +export interface ResourceConflictItemType { + name: string + namespace: string + gvk: GVKType + gvkTitle: string + clusterId: number + /** + * Generated at ui + */ + id: string +} + +export interface ConflictedResourcesTableProps { + resourceConflictDetails: ResourceConflictItemType[] +} + +export interface ResourceConflictDeployDialogURLParamsType + extends Pick {} + export interface ResourceConflictRedeployParamsType extends Pick {} @@ -914,3 +914,27 @@ export interface ResourceConflictRedeployPayloadType { wfrId: number redeployHelmReleaseWithTakeOwnership: true } + +export interface GetResourceConflictDetailsParamsType + extends Pick { + signal: AbortSignal +} + +export interface GetResourceListItemPayloadType { + pipelineId: number + appId: number + wfrId: number +} + +export interface ResourceConflictListItemDTO { + clusterId: number + conflictingResources: { + name: string + namespace: string + groupVersionKind: { + Group: string + Version: string + Kind: NodeType + } + }[] +} diff --git a/src/Shared/Helpers.tsx b/src/Shared/Helpers.tsx index cfad6edf5..5863e920f 100644 --- a/src/Shared/Helpers.tsx +++ b/src/Shared/Helpers.tsx @@ -51,7 +51,7 @@ import { UserApprovalInfo, ZERO_TIME_STRING, } from '../Common' -import { getAggregator } from '../Pages' +import { getAggregator, GVKType } from '../Pages' import { AggregatedNodes, PodMetadatum } from './Components' import { CUBIC_BEZIER_CURVE, UNSAVED_CHANGES_PROMPT_MESSAGE } from './constants' import { @@ -727,3 +727,24 @@ export const getGroupVersionFromApiVersion = (apiVersion: string): Pick { + if (!gvk) { + return '' + } + + let title: string = '' + if (gvk.Group) { + title += gvk.Group + } + + if (gvk.Version) { + title += title ? ` / ${gvk.Version}` : gvk.Version + } + + if (gvk.Kind) { + title += title ? ` / ${gvk.Kind}` : gvk.Kind + } + + return title +} From 2236a28212060e9ae7ac69651ace2e1d71cc8b65 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 15:13:22 +0530 Subject: [PATCH 05/40] feat: enhance ConflictedResourcesTable styling and improve resource conflict details fetching --- .../CICDHistory/ConflictedResourcesTable.tsx | 4 +- src/Shared/Components/CICDHistory/service.tsx | 69 +++---------------- 2 files changed, 14 insertions(+), 59 deletions(-) diff --git a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx index b8bd44ac6..238293eae 100644 --- a/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx +++ b/src/Shared/Components/CICDHistory/ConflictedResourcesTable.tsx @@ -7,7 +7,9 @@ import { ConflictedResourcesTableProps, ResourceConflictItemType } from './types import './ConflictedResourcesTable.scss' -const Wrapper = ({ children }: TableViewWrapperProps) =>
{children}
+const Wrapper = ({ children }: TableViewWrapperProps) => ( +
{children}
+) const filter = () => true const ConflictedResourcesTable = ({ resourceConflictDetails }: ConflictedResourcesTableProps) => { diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index 73cc71af2..91d458157 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -38,7 +38,6 @@ import { DeploymentStatusDetailsResponse, FetchIdDataStatus, GetResourceConflictDetailsParamsType, - // eslint-disable-next-line @typescript-eslint/no-unused-vars GetResourceListItemPayloadType, ModuleConfigResponse, ResourceConflictItemType, @@ -319,68 +318,22 @@ export const resourceConflictRedeploy = async ({ pipelineId, triggerId, appId }: }) export const getResourceConflictDetails = async ({ - // eslint-disable-next-line @typescript-eslint/no-unused-vars appId, - // eslint-disable-next-line @typescript-eslint/no-unused-vars pipelineId, - // eslint-disable-next-line @typescript-eslint/no-unused-vars triggerId, - // eslint-disable-next-line @typescript-eslint/no-unused-vars signal, }: GetResourceConflictDetailsParamsType): Promise => { - // const { result } = await post( - // ROUTES.RESOURCE_CONFLICTS_LIST, - // { - // appId: +appId, - // pipelineId: +pipelineId, - // wfrId: +triggerId, - // }, - // { signal }, - // ) - - const MOCK_RESULT: ResourceConflictListItemDTO = { - clusterId: 1, - conflictingResources: [ - { - name: 'resource-1', - namespace: 'default', - groupVersionKind: { - Group: 'apps', - Version: 'v1', - Kind: 'Deployment', - }, - }, - { - name: 'resource-2', - namespace: 'default', - groupVersionKind: { - Group: '', - Version: 'v1', - Kind: 'Service', - }, - }, - { - name: 'resource-3', - namespace: 'default', - groupVersionKind: { - Group: 'apps', - Version: 'v1', - Kind: 'StatefulSet', - }, - }, - { - name: 'resource-4', - namespace: 'default', - groupVersionKind: { - Group: 'batch', - Version: 'v1', - Kind: 'Job', - }, - }, - ], - } + const { result } = await post( + ROUTES.RESOURCE_CONFLICTS_LIST, + { + appId: +appId, + pipelineId: +pipelineId, + wfrId: +triggerId, + }, + { signal }, + ) - return (MOCK_RESULT?.conflictingResources || []).map((resource) => ({ + return (result?.conflictingResources || []).map((resource) => ({ name: resource.name || '', namespace: resource.namespace || '', gvk: { @@ -389,7 +342,7 @@ export const getResourceConflictDetails = async ({ Kind: resource.groupVersionKind.Kind || ('' as GVKType['Kind']), }, gvkTitle: getGVKTitle(resource.groupVersionKind), - clusterId: MOCK_RESULT.clusterId, + clusterId: result.clusterId, id: getUniqueId(), })) } From 13407fd56a035ef78d26dc37ba83ce16d53fe954 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 15:14:14 +0530 Subject: [PATCH 06/40] fix: update alignment of content in ResourceConflictDetailsModal --- .../Components/CICDHistory/ResourceConflictDetailsModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 85a4e7e30..3562020b6 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -97,7 +97,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }:
-
+
From ddf9e212b707b4e9e48e0abdeee331530ed39360 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 16:35:17 +0530 Subject: [PATCH 07/40] fix: disable deploy button when no resource conflict details are available --- .../Components/CICDHistory/ResourceConflictDetailsModal.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 3562020b6..be01fc32a 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -119,7 +119,11 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: text="Re-deploy" startIcon={} isLoading={isDeploying} - disabled={!!resourceConflictDetailsError || isLoadingResourceData} + disabled={ + !!resourceConflictDetailsError || + isLoadingResourceData || + resourceConflictDetails?.length === 0 + } onClick={handleDeploy} />
From b907e3f0a085987d2bb3f1e6081ed7962b2d665d Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 16:51:12 +0530 Subject: [PATCH 08/40] fix: rename wfrId to wfrIdForDeploymentWithSpecificTrigger in redeploy payload --- src/Shared/Components/CICDHistory/service.tsx | 2 +- src/Shared/Components/CICDHistory/types.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index 91d458157..12e140f9d 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -312,7 +312,7 @@ export const getModuleConfigured = (moduleName: string): Promise post(ROUTES.CD_TRIGGER_POST, { pipelineId: +pipelineId, - wfrId: +triggerId, + wfrIdForDeploymentWithSpecificTrigger: +triggerId, appId: +appId, redeployHelmReleaseWithTakeOwnership: true, }) diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index 56beb9d31..c3f476c03 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -911,7 +911,7 @@ export interface ResourceConflictRedeployParamsType export interface ResourceConflictRedeployPayloadType { pipelineId: number appId: number - wfrId: number + wfrIdForDeploymentWithSpecificTrigger: number redeployHelmReleaseWithTakeOwnership: true } From 2bb1aede0f5bdb3a3ae3fd46248b5037b523a80f Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 17:38:06 +0530 Subject: [PATCH 09/40] fix: remove toast notifications from redeploy functions and update artifactId handling --- .../CICDHistory/ResourceConflictDeployDialog.tsx | 7 ------- .../CICDHistory/ResourceConflictDetailsModal.tsx | 13 +------------ .../Components/CICDHistory/TriggerDetails.tsx | 4 ++-- .../Components/CICDHistory/TriggerOutput.tsx | 9 +++++---- src/Shared/Components/CICDHistory/service.tsx | 16 ++++++++++++++-- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx index 7ff71c212..f9a9ec421 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -3,7 +3,6 @@ import { useHistory, useParams } from 'react-router-dom' import { URLS } from '@Common/Constants' import { showError } from '@Common/Helper' -import { ToastManager, ToastVariantType } from '@Shared/Services' import { ButtonStyleType } from '../Button' import { ConfirmationModal, ConfirmationModalVariantType } from '../ConfirmationModal' @@ -24,12 +23,6 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: triggerId, appId, }) - ToastManager.showToast({ - variant: ToastVariantType.success, - title: 'Redeploy initiated', - description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, - }) - handleClose() history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index be01fc32a..461240e24 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -6,7 +6,6 @@ import { URLS } from '@Common/Constants' import { Drawer } from '@Common/Drawer' import { showError, stopPropagation } from '@Common/Helper' import { ComponentSizeType } from '@Shared/constants' -import { ToastManager, ToastVariantType } from '@Shared/Services' import { APIResponseHandler } from '../APIResponseHandler' import { Button, ButtonStyleType, ButtonVariantType } from '../Button' @@ -43,12 +42,6 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: triggerId, appId, }) - ToastManager.showToast({ - variant: ToastVariantType.success, - title: 'Redeploy initiated', - description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`, - }) - handleClose() history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) @@ -119,11 +112,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: text="Re-deploy" startIcon={} isLoading={isDeploying} - disabled={ - !!resourceConflictDetailsError || - isLoadingResourceData || - resourceConflictDetails?.length === 0 - } + disabled={!resourceConflictDetails?.length} onClick={handleDeploy} />
diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index 52532acd3..b3c59649f 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -468,7 +468,7 @@ const TriggerDetails = memo( stage === DeploymentStageType.DEPLOY && errorMessage?.includes(RESOURCE_CONFLICT_DEPLOY_ERROR) - const handleShowRedeployModal = () => { + const handleShowRedeployDialog = () => { setResourceConflictModal(ResourceConflictModalType.DEPLOY_DIALOG) } @@ -643,7 +643,7 @@ const TriggerDetails = memo( dataTestId: 'resource-conflict-re-deploy', text: 'Re-deploy', startIcon: , - onClick: handleShowRedeployModal, + onClick: handleShowRedeployDialog, variant: ButtonVariantType.text, size: ComponentSizeType.medium, }} diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx index 7f5c94c14..df565dcae 100644 --- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx +++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx @@ -261,7 +261,6 @@ const TriggerOutput = ({ ) const targetPlatforms = sanitizeTargetPlatforms(triggerDetails?.targetPlatforms) - const artifactId = triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId // Function to sync the trigger details as trigger details is also fetched with another api const syncState = (syncTriggerId: number, syncTriggerDetail: History, syncTriggerDetailsError: ServerError) => { @@ -308,10 +307,12 @@ const TriggerOutput = ({ () => getTagDetails({ pipelineId, - artifactId, + artifactId: triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId, }), [pipelineId, triggerId], - areTagDetailsRequired && !!pipelineId && !!artifactId, + areTagDetailsRequired && + !!pipelineId && + (!!triggerDetailsResult?.result?.artifactId || !!triggerDetails?.artifactId), ) useEffect(() => { @@ -429,7 +430,7 @@ const TriggerOutput = ({ setFullScreenView={setFullScreenView} deploymentAppType={deploymentAppType} isBlobStorageConfigured={isBlobStorageConfigured} - artifactId={artifactId} + artifactId={triggerDetailsResult?.result?.artifactId} ciPipelineId={triggerDetailsResult?.result?.ciPipelineId} appReleaseTags={appReleaseTags} tagsEditable={tagsEditable} diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index 12e140f9d..48b710908 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -17,6 +17,7 @@ /* eslint-disable dot-notation */ import moment from 'moment' +import { ToastManager, ToastVariantType } from '@Shared/Services' import { GVKType, K8S_EMPTY_GROUP } from '@Pages/ResourceBrowser' import { @@ -309,14 +310,25 @@ export const getTriggerHistory = async ({ export const getModuleConfigured = (moduleName: string): Promise => get(`${ROUTES.MODULE_CONFIGURED}?name=${moduleName}`) -export const resourceConflictRedeploy = async ({ pipelineId, triggerId, appId }: ResourceConflictRedeployParamsType) => - post(ROUTES.CD_TRIGGER_POST, { +export const resourceConflictRedeploy = async ({ + pipelineId, + triggerId, + appId, +}: ResourceConflictRedeployParamsType) => { + await post(ROUTES.CD_TRIGGER_POST, { pipelineId: +pipelineId, wfrIdForDeploymentWithSpecificTrigger: +triggerId, appId: +appId, redeployHelmReleaseWithTakeOwnership: true, }) + ToastManager.showToast({ + variant: ToastVariantType.success, + title: 'Redeployment initiated', + description: 'Redeployment for application has been successfully initiated.', + }) +} + export const getResourceConflictDetails = async ({ appId, pipelineId, From a9545eebe784577c7cdf7cda04ad8f35d93d9df0 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 10 Dec 2025 16:57:06 +0530 Subject: [PATCH 10/40] refactor: Extract navigation types into a dedicated module and refine SelectPickerTextArea component logic. --- package-lock.json | 4 +- package.json | 2 +- src/Pages-Devtron-2.0/Navigation/index.ts | 1 + src/Pages-Devtron-2.0/Navigation/types.ts | 116 ++++++++++++++++++ src/Pages-Devtron-2.0/index.ts | 1 + .../SelectPickerTextArea.component.tsx | 4 +- src/Shared/Hooks/useUserPreferences/types.ts | 69 +---------- 7 files changed, 123 insertions(+), 74 deletions(-) create mode 100644 src/Pages-Devtron-2.0/Navigation/index.ts create mode 100644 src/Pages-Devtron-2.0/Navigation/types.ts diff --git a/package-lock.json b/package-lock.json index 35c03b3bc..be9407117 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-2", + "version": "1.21.0-pre-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-2", + "version": "1.21.0-pre-3", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 64a08f45d..108dd10fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-2", + "version": "1.21.0-pre-3", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Pages-Devtron-2.0/Navigation/index.ts b/src/Pages-Devtron-2.0/Navigation/index.ts new file mode 100644 index 000000000..c9f6f047d --- /dev/null +++ b/src/Pages-Devtron-2.0/Navigation/index.ts @@ -0,0 +1 @@ +export * from './types' diff --git a/src/Pages-Devtron-2.0/Navigation/types.ts b/src/Pages-Devtron-2.0/Navigation/types.ts new file mode 100644 index 000000000..9316ef810 --- /dev/null +++ b/src/Pages-Devtron-2.0/Navigation/types.ts @@ -0,0 +1,116 @@ +import { customEnv, Never } from 'src' + +import { IconsProps } from '@Shared/Components' + +export type NavigationItemID = + | 'application-management-overview' + | 'application-management-devtron-applications' + | 'application-management-application-groups' + | 'application-management-bulk-edit' + | 'application-management-application-templates' + | 'application-management-projects' + | 'application-management-configurations' + | 'application-management-policies' + | 'infrastructure-management-overview' + | 'infrastructure-management-applications' + | 'infrastructure-management-chart-store' + | 'infrastructure-management-resource-browser' + | 'infrastructure-management-resource-watcher' + | 'infrastructure-management-catalog-framework' + | 'software-release-management-overview' + | 'software-release-management-release-hub' + | 'software-release-management-tenants' + | 'cost-visibility-overview' + | 'cost-visibility-cost-breakdown' + | 'cost-visibility-configurations' + | 'security-center-overview' + | 'security-center-security-vulnerabilities' + | 'security-center-security-enablement' + | 'security-center-security-policy' + | 'automation-and-enablement-jobs' + | 'automation-and-enablement-alerting' + | 'automation-and-enablement-incident-response' + | 'automation-and-enablement-api-portal' + | 'automation-and-enablement-runbook-automation' + | 'global-configuration-sso-login-services' + | 'global-configuration-host-urls' + | 'global-configuration-cluster-and-environments' + | 'global-configuration-container-oci-registry' + | 'global-configuration-authorization' + | 'data-protection-overview' + | 'data-protection-backup-and-schedule' + | 'data-protection-restores' + | 'data-protection-backup-repositories' + | 'data-protection-backup-locations' + | 'data-protection-history-and-logs' + +export type NavigationSubMenuItemID = + | 'application-management-configurations-gitops' + | 'application-management-configurations-git-accounts' + | 'application-management-configurations-external-links' + | 'application-management-configurations-chart-repository' + | 'application-management-configurations-deployment-charts' + | 'application-management-configurations-notifications' + | 'application-management-configurations-catalog-frameworks' + | 'application-management-configurations-scoped-variables' + | 'application-management-configurations-build-infra' + | 'application-management-policies-deployment-window' + | 'application-management-policies-approval-policy' + | 'application-management-policies-plugin-policy' + | 'application-management-policies-pull-image-digest' + | 'application-management-policies-tag-policy' + | 'application-management-policies-filter-conditions' + | 'application-management-policies-image-promotion' + | 'application-management-policies-lock-deployment-configuration' + | 'cost-visibility-cost-breakdown-clusters' + | 'cost-visibility-cost-breakdown-environments' + | 'cost-visibility-cost-breakdown-projects' + | 'cost-visibility-cost-breakdown-applications' + | 'global-configuration-authorization-user-permissions' + | 'global-configuration-authorization-permission-groups' + | 'global-configuration-authorization-api-tokens' + +export type NavigationRootItemID = + | 'application-management' + | 'infrastructure-management' + | 'software-release-management' + | 'cost-visibility' + | 'security-center' + | 'automation-and-enablement' + | 'data-protection-management' + | 'global-configuration' + +export type CommonNavigationItemType = { + title: string + dataTestId: string + icon: IconsProps['name'] + href: string + disabled?: boolean + keywords?: string[] + forceHideEnvKey?: keyof customEnv + hideNav?: boolean + isAvailableInEA?: boolean +} + +export type NavigationItemType = Pick< + CommonNavigationItemType, + 'dataTestId' | 'title' | 'disabled' | 'keywords' | 'hideNav' | 'forceHideEnvKey' | 'isAvailableInEA' +> & { + id: NavigationItemID +} & ( + | (Pick & { + hasSubMenu?: false + subItems?: never + }) + | (Never> & { + hasSubMenu: true + subItems: (Omit & { id: NavigationSubMenuItemID })[] + }) + ) + +export interface NavigationGroupType + extends Pick { + id: NavigationRootItemID + items: NavigationItemType[] + disabled?: boolean +} diff --git a/src/Pages-Devtron-2.0/index.ts b/src/Pages-Devtron-2.0/index.ts index 12ea29ca5..900f8bd9b 100644 --- a/src/Pages-Devtron-2.0/index.ts +++ b/src/Pages-Devtron-2.0/index.ts @@ -2,4 +2,5 @@ export * from './ApplicationManagement' export * from './CostVisibility' export * from './DataProtectionManagement' export * from './InfrastructureManagement' +export * from './Navigation' export * from './SecurityCenter' diff --git a/src/Shared/Components/SelectPicker/SelectPickerTextArea.component.tsx b/src/Shared/Components/SelectPicker/SelectPickerTextArea.component.tsx index 5fe8fdb38..2f7181d94 100644 --- a/src/Shared/Components/SelectPicker/SelectPickerTextArea.component.tsx +++ b/src/Shared/Components/SelectPicker/SelectPickerTextArea.component.tsx @@ -183,10 +183,8 @@ export const SelectPickerTextArea = ({ selectRef.current.inputRef.selectionEnd = selectionStart + 1 }) - return + updateValueIfOnlyDirty() } - - updateValueIfOnlyDirty() } return ( diff --git a/src/Shared/Hooks/useUserPreferences/types.ts b/src/Shared/Hooks/useUserPreferences/types.ts index a3c2db55d..a03c7eb10 100644 --- a/src/Shared/Hooks/useUserPreferences/types.ts +++ b/src/Shared/Hooks/useUserPreferences/types.ts @@ -17,74 +17,7 @@ import { USER_PREFERENCES_ATTRIBUTE_KEY } from '@Shared/Hooks/useUserPreferences/constants' import { AppThemeType, ThemeConfigType, ThemePreferenceType } from '@Shared/Providers/ThemeProvider/types' import { ResourceKindType } from '@Shared/types' - -export type NavigationItemID = - | 'application-management-overview' - | 'application-management-devtron-applications' - | 'application-management-application-groups' - | 'application-management-bulk-edit' - | 'application-management-application-templates' - | 'application-management-projects' - | 'application-management-configurations' - | 'application-management-policies' - | 'infrastructure-management-overview' - | 'infrastructure-management-applications' - | 'infrastructure-management-chart-store' - | 'infrastructure-management-resource-browser' - | 'infrastructure-management-resource-watcher' - | 'infrastructure-management-catalog-framework' - | 'software-release-management-overview' - | 'software-release-management-release-hub' - | 'software-release-management-tenants' - | 'cost-visibility-overview' - | 'cost-visibility-cost-breakdown' - | 'cost-visibility-configurations' - | 'security-center-overview' - | 'security-center-security-vulnerabilities' - | 'security-center-security-enablement' - | 'security-center-security-policy' - | 'automation-and-enablement-jobs' - | 'automation-and-enablement-alerting' - | 'automation-and-enablement-incident-response' - | 'automation-and-enablement-api-portal' - | 'automation-and-enablement-runbook-automation' - | 'global-configuration-sso-login-services' - | 'global-configuration-host-urls' - | 'global-configuration-cluster-and-environments' - | 'global-configuration-container-oci-registry' - | 'global-configuration-authorization' - | 'data-protection-overview' - | 'data-protection-backup-and-schedule' - | 'data-protection-restores' - | 'data-protection-backup-repositories' - | 'data-protection-backup-locations' - | 'data-protection-history-and-logs' - -export type NavigationSubMenuItemID = - | 'application-management-configurations-gitops' - | 'application-management-configurations-git-accounts' - | 'application-management-configurations-external-links' - | 'application-management-configurations-chart-repository' - | 'application-management-configurations-deployment-charts' - | 'application-management-configurations-notifications' - | 'application-management-configurations-catalog-frameworks' - | 'application-management-configurations-scoped-variables' - | 'application-management-configurations-build-infra' - | 'application-management-policies-deployment-window' - | 'application-management-policies-approval-policy' - | 'application-management-policies-plugin-policy' - | 'application-management-policies-pull-image-digest' - | 'application-management-policies-tag-policy' - | 'application-management-policies-filter-conditions' - | 'application-management-policies-image-promotion' - | 'application-management-policies-lock-deployment-configuration' - | 'cost-visibility-cost-breakdown-clusters' - | 'cost-visibility-cost-breakdown-environments' - | 'cost-visibility-cost-breakdown-projects' - | 'cost-visibility-cost-breakdown-applications' - | 'global-configuration-authorization-user-permissions' - | 'global-configuration-authorization-permission-groups' - | 'global-configuration-authorization-api-tokens' +import { NavigationItemID, NavigationSubMenuItemID } from '@PagesDevtron2.0/Navigation' export interface GetUserPreferencesQueryParamsType { key: typeof USER_PREFERENCES_ATTRIBUTE_KEY From cef8fd000a1408dea55fbdf34e4450f97200c700 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 10 Dec 2025 18:09:56 +0530 Subject: [PATCH 11/40] chore: remove external links and chart repository from navigation sub-menu item IDs --- src/Pages-Devtron-2.0/Navigation/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Pages-Devtron-2.0/Navigation/types.ts b/src/Pages-Devtron-2.0/Navigation/types.ts index 9316ef810..53f6eadf4 100644 --- a/src/Pages-Devtron-2.0/Navigation/types.ts +++ b/src/Pages-Devtron-2.0/Navigation/types.ts @@ -47,8 +47,6 @@ export type NavigationItemID = export type NavigationSubMenuItemID = | 'application-management-configurations-gitops' | 'application-management-configurations-git-accounts' - | 'application-management-configurations-external-links' - | 'application-management-configurations-chart-repository' | 'application-management-configurations-deployment-charts' | 'application-management-configurations-notifications' | 'application-management-configurations-catalog-frameworks' From d8f791135c33f52ede53473bd96577b998037ffe Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 10 Dec 2025 18:22:39 +0530 Subject: [PATCH 12/40] fix: update resource conflict routes and payload structure for redeployment --- src/Common/Constants.ts | 2 +- src/Shared/Components/CICDHistory/service.tsx | 17 ++++++++--------- src/Shared/Components/CICDHistory/types.tsx | 8 +------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 2436e2b84..39127a5a9 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -162,7 +162,7 @@ export const ROUTES = { LICENSE_DATA: 'license/data', ENV: 'env', APP_METADATA: 'app-metadata', - RESOURCE_CONFLICTS_LIST: 'app/template/helm-ownership-conflicts', + RESOURCE_CONFLICTS_LIST: 'app/:appId/cd-pipeline/:pipelineId/history/:wfrId/helm-ownership-conflicts', } as const export enum KEY_VALUE { diff --git a/src/Shared/Components/CICDHistory/service.tsx b/src/Shared/Components/CICDHistory/service.tsx index 48b710908..1a85c464d 100644 --- a/src/Shared/Components/CICDHistory/service.tsx +++ b/src/Shared/Components/CICDHistory/service.tsx @@ -15,6 +15,7 @@ */ /* eslint-disable dot-notation */ +import { generatePath } from 'react-router-dom' import moment from 'moment' import { ToastManager, ToastVariantType } from '@Shared/Services' @@ -39,7 +40,6 @@ import { DeploymentStatusDetailsResponse, FetchIdDataStatus, GetResourceConflictDetailsParamsType, - GetResourceListItemPayloadType, ModuleConfigResponse, ResourceConflictItemType, ResourceConflictListItemDTO, @@ -319,7 +319,7 @@ export const resourceConflictRedeploy = async ({ pipelineId: +pipelineId, wfrIdForDeploymentWithSpecificTrigger: +triggerId, appId: +appId, - redeployHelmReleaseWithTakeOwnership: true, + helmRedeploymentRequest: true, }) ToastManager.showToast({ @@ -335,13 +335,12 @@ export const getResourceConflictDetails = async ({ triggerId, signal, }: GetResourceConflictDetailsParamsType): Promise => { - const { result } = await post( - ROUTES.RESOURCE_CONFLICTS_LIST, - { - appId: +appId, - pipelineId: +pipelineId, - wfrId: +triggerId, - }, + const { result } = await get( + generatePath(ROUTES.RESOURCE_CONFLICTS_LIST, { + appId, + pipelineId, + wfrId: triggerId, + }), { signal }, ) diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx index c3f476c03..58a299b95 100644 --- a/src/Shared/Components/CICDHistory/types.tsx +++ b/src/Shared/Components/CICDHistory/types.tsx @@ -912,7 +912,7 @@ export interface ResourceConflictRedeployPayloadType { pipelineId: number appId: number wfrIdForDeploymentWithSpecificTrigger: number - redeployHelmReleaseWithTakeOwnership: true + helmRedeploymentRequest: true } export interface GetResourceConflictDetailsParamsType @@ -920,12 +920,6 @@ export interface GetResourceConflictDetailsParamsType signal: AbortSignal } -export interface GetResourceListItemPayloadType { - pipelineId: number - appId: number - wfrId: number -} - export interface ResourceConflictListItemDTO { clusterId: number conflictingResources: { From dfa9ec452b0bca31fc363a70e186c6399a298a7e Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 10 Dec 2025 18:48:25 +0530 Subject: [PATCH 13/40] feat: add external links and chart repository to global configuration navigation types --- src/Pages-Devtron-2.0/Navigation/types.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Pages-Devtron-2.0/Navigation/types.ts b/src/Pages-Devtron-2.0/Navigation/types.ts index 53f6eadf4..a542583ac 100644 --- a/src/Pages-Devtron-2.0/Navigation/types.ts +++ b/src/Pages-Devtron-2.0/Navigation/types.ts @@ -34,6 +34,8 @@ export type NavigationItemID = | 'automation-and-enablement-runbook-automation' | 'global-configuration-sso-login-services' | 'global-configuration-host-urls' + | 'global-configuration-external-links' + | 'global-configuration-chart-repository' | 'global-configuration-cluster-and-environments' | 'global-configuration-container-oci-registry' | 'global-configuration-authorization' From c4c75154f23233634303c60de748cedd1b120a92 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 11 Dec 2025 13:24:24 +0530 Subject: [PATCH 14/40] fix: update version to 1.21.0-beta-4 in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db4615668..9a3b93b6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 8a89ce40c..16d2554b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 10080675b1b3eea4c92aa6762756edc5362c8876 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 11 Dec 2025 19:53:20 +0530 Subject: [PATCH 15/40] fix: remove 'isAvailableInEA' from subItems type definition in NavigationItemType --- package-lock.json | 4 ++-- package.json | 2 +- src/Pages-Devtron-2.0/Navigation/types.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index be9407117..85e4e7a82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-3", + "version": "1.21.0-pre-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-3", + "version": "1.21.0-pre-4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 108dd10fa..cf29ee9ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-3", + "version": "1.21.0-pre-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Pages-Devtron-2.0/Navigation/types.ts b/src/Pages-Devtron-2.0/Navigation/types.ts index a542583ac..fb8fb1f65 100644 --- a/src/Pages-Devtron-2.0/Navigation/types.ts +++ b/src/Pages-Devtron-2.0/Navigation/types.ts @@ -104,7 +104,7 @@ export type NavigationItemType = Pick< }) | (Never> & { hasSubMenu: true - subItems: (Omit & { id: NavigationSubMenuItemID })[] + subItems: (Omit & { id: NavigationSubMenuItemID })[] }) ) From 084ac494232041727a37a00fbc1d3d17bff3a689 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Fri, 12 Dec 2025 16:18:48 +0530 Subject: [PATCH 16/40] feat: add components for overview section --- package-lock.json | 4 +- package.json | 2 +- .../Shared/Overview/components.tsx | 128 ++++++++++++++++++ .../Shared/Overview/constants.ts | 27 ++++ .../Shared/Overview/index.ts | 3 + .../Shared/Overview/types.ts | 29 ++++ src/Pages-Devtron-2.0/Shared/index.ts | 1 + src/Pages-Devtron-2.0/index.ts | 1 + 8 files changed, 192 insertions(+), 3 deletions(-) create mode 100644 src/Pages-Devtron-2.0/Shared/Overview/components.tsx create mode 100644 src/Pages-Devtron-2.0/Shared/Overview/constants.ts create mode 100644 src/Pages-Devtron-2.0/Shared/Overview/index.ts create mode 100644 src/Pages-Devtron-2.0/Shared/Overview/types.ts create mode 100644 src/Pages-Devtron-2.0/Shared/index.ts diff --git a/package-lock.json b/package-lock.json index 85e4e7a82..85301cabc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index cf29ee9ad..104dde616 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Pages-Devtron-2.0/Shared/Overview/components.tsx b/src/Pages-Devtron-2.0/Shared/Overview/components.tsx new file mode 100644 index 000000000..82e343284 --- /dev/null +++ b/src/Pages-Devtron-2.0/Shared/Overview/components.tsx @@ -0,0 +1,128 @@ +import { ReactNode, useState } from 'react' +import { NavLink } from 'react-router-dom' +import { motion } from 'framer-motion' + +import { ConditionalWrap } from '@Common/Helper' +import { Tooltip } from '@Common/Tooltip' +import { Button, ButtonStyleType, ButtonVariantType, Icon } from '@Shared/Components' + +import { MetricsInfoCardProps, SectionEmptyStateProps } from './types' + +export const SectionEmptyState = ({ + iconName = 'ic-priority-medium-fill', + iconColor, + title, + subtitle, + buttonConfig, +}: SectionEmptyStateProps) => ( +
+ +
+ {title} + {subtitle && {subtitle}} +
+ {buttonConfig &&
+) + +const navLinkWrap = (redirectionLink: string) => (children: ReactNode) => ( + {children} +) + +export const MetricsInfoLoadingCard = ({ withSubtitle }: { withSubtitle?: boolean }) => ( +
+
+
+ + +
+
+
+ {withSubtitle && ( +
+ +
+ )} +
+) + +export const MetricsInfoCard = ({ + dataTestId, + metricTitle, + metricValue, + metricUnit, + valueOutOf, + iconName, + subtitle, + redirectionLink, + tooltipContent, + subtitleRedirection, +}: MetricsInfoCardProps) => { + const [isHovering, setIsHovering] = useState(false) + + const handleHoverStart = () => setIsHovering(true) + const handleHoverEnd = () => setIsHovering(false) + + return ( + + +
+
+ + + {metricTitle} + + +
+ {metricValue} + {valueOutOf && ( + / {valueOutOf} + )} + {metricUnit && ( + {metricUnit} + )} +
+
+
+ {redirectionLink && isHovering ? ( +
+
+ {subtitle && ( +
+ + + {subtitle} + + +
+ )} + + + ) +} + +export const LoadingDonutChart = () => ( +
+
+
+ + +
+
+) diff --git a/src/Pages-Devtron-2.0/Shared/Overview/constants.ts b/src/Pages-Devtron-2.0/Shared/Overview/constants.ts new file mode 100644 index 000000000..c83e60d16 --- /dev/null +++ b/src/Pages-Devtron-2.0/Shared/Overview/constants.ts @@ -0,0 +1,27 @@ +const OVERVIEW_DEFAULT_PAGE_SIZE = { + SMALL: 5, + MEDIUM: 10, + LARGE: 20, +} + +export const OVERVIEW_PAGE_SIZE_OPTIONS = [ + { + value: OVERVIEW_DEFAULT_PAGE_SIZE.MEDIUM, + selected: true, + }, + { + value: OVERVIEW_DEFAULT_PAGE_SIZE.LARGE, + selected: false, + }, +] + +export const OVERVIEW_PAGE_SIZE_OPTIONS_SMALL = [ + { + value: OVERVIEW_DEFAULT_PAGE_SIZE.SMALL, + selected: true, + }, + { + value: OVERVIEW_DEFAULT_PAGE_SIZE.MEDIUM, + selected: false, + }, +] diff --git a/src/Pages-Devtron-2.0/Shared/Overview/index.ts b/src/Pages-Devtron-2.0/Shared/Overview/index.ts new file mode 100644 index 000000000..d3f2deaa4 --- /dev/null +++ b/src/Pages-Devtron-2.0/Shared/Overview/index.ts @@ -0,0 +1,3 @@ +export * from './components' +export * from './constants' +export { type MetricsInfoCardProps, ProdNonProdSelectValueTypes } from './types' diff --git a/src/Pages-Devtron-2.0/Shared/Overview/types.ts b/src/Pages-Devtron-2.0/Shared/Overview/types.ts new file mode 100644 index 000000000..bf8556b87 --- /dev/null +++ b/src/Pages-Devtron-2.0/Shared/Overview/types.ts @@ -0,0 +1,29 @@ +import { ButtonComponentType, ButtonProps, IconName } from '@Shared/Components' +import { IconBaseColorType } from '@Shared/types' + +export interface SectionEmptyStateProps { + iconColor?: IconBaseColorType + iconName?: IconName + title: string + subtitle?: string + buttonConfig?: ButtonProps +} + +export interface MetricsInfoCardProps { + dataTestId: string + metricTitle: string + metricValue: string + metricUnit?: string + valueOutOf?: string + iconName: IconName + subtitle?: string + tooltipContent: string + redirectionLink?: string + subtitleRedirection?: string +} + +export enum ProdNonProdSelectValueTypes { + ALL = 'All', + PRODUCTION = 'Prod', + NON_PRODUCTION = 'Non-Prod', +} diff --git a/src/Pages-Devtron-2.0/Shared/index.ts b/src/Pages-Devtron-2.0/Shared/index.ts new file mode 100644 index 000000000..bb81fdde1 --- /dev/null +++ b/src/Pages-Devtron-2.0/Shared/index.ts @@ -0,0 +1 @@ +export * from './Overview' diff --git a/src/Pages-Devtron-2.0/index.ts b/src/Pages-Devtron-2.0/index.ts index 900f8bd9b..df634e1ce 100644 --- a/src/Pages-Devtron-2.0/index.ts +++ b/src/Pages-Devtron-2.0/index.ts @@ -4,3 +4,4 @@ export * from './DataProtectionManagement' export * from './InfrastructureManagement' export * from './Navigation' export * from './SecurityCenter' +export * from './Shared' From a45a0970d692a7e98085d6fb61746569a9665037 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 12 Dec 2025 16:40:39 +0530 Subject: [PATCH 17/40] fix: integrate useMainContext to conditionally display resource conflict info in TriggerDetails --- src/Shared/Components/CICDHistory/TriggerDetails.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index b3c59649f..f6077a595 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -26,6 +26,7 @@ import { ZERO_TIME_STRING } from '@Common/Constants' import { CommitChipCell } from '@Shared/Components/CommitChipCell' import { ImageChipCell } from '@Shared/Components/ImageChipCell' import { getHandleOpenURL } from '@Shared/Helpers' +import { useMainContext } from '@Shared/Providers' import { ToastManager, ToastVariantType } from '@Shared/Services' import { getDeploymentStageTitle } from '@Pages/Applications' @@ -453,6 +454,8 @@ const TriggerDetails = memo( isLatest, appName, }: TriggerDetailsType) => { + const { isFELibAvailable } = useMainContext() + const [resourceConflictModal, setResourceConflictModal] = useState(null) const executionInfo = useMemo( @@ -463,6 +466,7 @@ const TriggerDetails = memo( const errorMessage = executionInfo?.workerDetails.message || message const showResourceConflictInfoBlock = + isFELibAvailable && isLatest && (type === HistoryComponentType.CD || type === HistoryComponentType.GROUP_CD) && stage === DeploymentStageType.DEPLOY && From 87b59cc06ed1dd71040dd780e1cee89fca0eaea2 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 12 Dec 2025 16:41:34 +0530 Subject: [PATCH 18/40] fix: update version to 1.21.1 in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a3b93b6f..f4bb8517d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-4", + "version": "1.21.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-4", + "version": "1.21.1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 16d2554b7..e3506004c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-4", + "version": "1.21.1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 4c73a760210a6402f7d9807a40d054f6c86a6785 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 12 Dec 2025 16:46:19 +0530 Subject: [PATCH 19/40] fix: streamline loading state handling in ResourceConflictDeployDialog and ResourceConflictDetailsModal --- .../Components/CICDHistory/ResourceConflictDeployDialog.tsx | 2 +- .../Components/CICDHistory/ResourceConflictDetailsModal.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx index f9a9ec421..7310d994e 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -23,10 +23,10 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: triggerId, appId, }) + setIsLoading(false) history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) - } finally { setIsLoading(false) } } diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 461240e24..8ca373b72 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -42,10 +42,10 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: triggerId, appId, }) + setIsDeploying(false) history.push(`${URLS.APP}/${appId}/details/${envId}`) } catch (error) { showError(error) - } finally { setIsDeploying(false) } } From 0f1d57f454dec0e1928b9f329679fadfc546bdf5 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 12 Dec 2025 16:49:45 +0530 Subject: [PATCH 20/40] fix: update button styles to warning in TriggerDetails component --- src/Shared/Components/CICDHistory/TriggerDetails.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Shared/Components/CICDHistory/TriggerDetails.tsx b/src/Shared/Components/CICDHistory/TriggerDetails.tsx index f6077a595..c6166c105 100644 --- a/src/Shared/Components/CICDHistory/TriggerDetails.tsx +++ b/src/Shared/Components/CICDHistory/TriggerDetails.tsx @@ -491,6 +491,7 @@ const TriggerDetails = memo( text="Some Resources" variant={ButtonVariantType.text} size={ComponentSizeType.medium} + style={ButtonStyleType.warning} onClick={handleShowResourceConflictDetailsModal} />   @@ -649,6 +650,7 @@ const TriggerDetails = memo( startIcon: , onClick: handleShowRedeployDialog, variant: ButtonVariantType.text, + style: ButtonStyleType.warning, size: ComponentSizeType.medium, }} /> From 4eb6140c2588fcde2458ebc184a14fb7761a9a22 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 8 Dec 2025 16:18:26 +0530 Subject: [PATCH 21/40] fix: update class name from 'flex' to 'flexbox' in InfoBlock component for layout consistency --- src/Shared/Components/InfoBlock/InfoBlock.component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/InfoBlock/InfoBlock.component.tsx b/src/Shared/Components/InfoBlock/InfoBlock.component.tsx index 9ebecb106..194cd67a1 100644 --- a/src/Shared/Components/InfoBlock/InfoBlock.component.tsx +++ b/src/Shared/Components/InfoBlock/InfoBlock.component.tsx @@ -98,7 +98,7 @@ const InfoBlock = ({ if (layout === 'row') { return (
-
+
{renderIcon()} {renderContent()}
From a81c2b12b18ec1468ba15c088bb14ee601a6203c Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Fri, 12 Dec 2025 17:47:56 +0530 Subject: [PATCH 22/40] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85e4e7a82..85301cabc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index cf29ee9ad..104dde616 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-4", + "version": "1.21.0-pre-5", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From cb1ab3b9bc2ef71c3373a63680c7d5a0fff849c7 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 16 Dec 2025 12:02:36 +0530 Subject: [PATCH 23/40] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85301cabc..9548bd586 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-5", + "version": "1.21.0-beta-10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-5", + "version": "1.21.0-beta-10", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 104dde616..ae16c82a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-pre-5", + "version": "1.21.0-beta-10", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 8f667252fb20b32580d721d4605209e0f1a15005 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 16 Dec 2025 15:27:42 +0530 Subject: [PATCH 24/40] fix: remove unused bulk selection identifiers for multi page selection --- src/Shared/Components/Table/InternalTable.tsx | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/Shared/Components/Table/InternalTable.tsx b/src/Shared/Components/Table/InternalTable.tsx index fc93f5203..d179c91a4 100644 --- a/src/Shared/Components/Table/InternalTable.tsx +++ b/src/Shared/Components/Table/InternalTable.tsx @@ -24,7 +24,7 @@ import { UseRegisterShortcutProvider } from '@Common/Hooks' import { NO_ROWS_OR_GET_ROWS_ERROR } from './constants' import TableContent from './TableContent' -import { FiltersTypeEnum, InternalTableProps, PaginationEnum, RowsResultType } from './types' +import { FiltersTypeEnum, InternalTableProps, RowsResultType } from './types' import { getFilteringPromise, searchAndSortRows } from './utils' const InternalTable = < @@ -79,8 +79,6 @@ const InternalTable = < const wrapperDivRef = useRef(null) - const { setIdentifiers } = bulkSelectionReturnValue ?? {} - const searchSortTimeoutRef = useRef(-1) useEffect(() => { @@ -182,26 +180,6 @@ const InternalTable = < const areFilteredRowsLoading = _areFilteredRowsLoading || filteredRowsError === NO_ROWS_OR_GET_ROWS_ERROR - const visibleRows = useMemo(() => { - const normalizedFilteredRows = filteredRows ?? [] - - const paginatedRows = - paginationVariant !== PaginationEnum.PAGINATED - ? normalizedFilteredRows - : normalizedFilteredRows.slice(offset, offset + pageSize) - - return paginatedRows - }, [paginationVariant, offset, pageSize, filteredRows]) - - useEffect(() => { - setIdentifiers?.( - visibleRows.reduce((acc, row) => { - acc[row.id] = row - return acc - }, {}), - ) - }, [visibleRows]) - const Wrapper = ViewWrapper ?? Fragment const renderContent = () => { From 6f0fcebdb54ca6e8aa0f97a29ee5c3122e3719fa Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 17 Dec 2025 06:57:59 +0530 Subject: [PATCH 25/40] feat: Help action menu dynamic doc link support added --- src/Shared/Components/Header/HelpButton.tsx | 9 ++++++++- src/Shared/Components/Header/PageHeader.tsx | 2 ++ src/Shared/Components/Header/constants.ts | 8 +++++--- src/Shared/Components/Header/types.ts | 8 +++++++- src/Shared/Components/Header/utils.ts | 12 +++++------- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/Shared/Components/Header/HelpButton.tsx b/src/Shared/Components/Header/HelpButton.tsx index 975f046ea..0b760d850 100644 --- a/src/Shared/Components/Header/HelpButton.tsx +++ b/src/Shared/Components/Header/HelpButton.tsx @@ -55,7 +55,13 @@ const CheckForUpdates = ({
) -export const HelpButton = ({ serverInfo, fetchingServerInfo, onClick, hideGettingStartedCard }: HelpButtonProps) => { +export const HelpButton = ({ + serverInfo, + fetchingServerInfo, + onClick, + hideGettingStartedCard, + docPath, +}: HelpButtonProps) => { // STATES const [isActionMenuOpen, setIsActionMenuOpen] = useState(false) const [expiryDate, setExpiryDate] = useState(0) @@ -150,6 +156,7 @@ export const HelpButton = ({ serverInfo, fetchingServerInfo, onClick, hideGettin options={getHelpActionMenuOptions({ isTrialOrFreemium: (licenseData?.isTrial || licenseData?.isFreemium) ?? false, isEnterprise, + docPath, })} onClick={handleActionMenuClick} onOpen={setIsActionMenuOpen} diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx index 2ccb423ff..fd3f84b5d 100644 --- a/src/Shared/Components/Header/PageHeader.tsx +++ b/src/Shared/Components/Header/PageHeader.tsx @@ -50,6 +50,7 @@ const PageHeader = ({ onClose, tippyProps, closeIcon, + docPath, }: PageHeaderType) => { const { setLoginCount, setShowGettingStartedCard, setSidePanelConfig, sidePanelConfig, tempAppWindowConfig } = useMainContext() @@ -158,6 +159,7 @@ const PageHeader = ({ fetchingServerInfo={currentServerInfo.fetchingServerInfo} onClick={handleHelpButtonClick} hideGettingStartedCard={hideGettingStartedCard} + docPath={docPath} /> {!window._env_.K8S_CLIENT && ( ): HelpButtonActionMenuProps['options'][number]['items'] => [ ...((!window._env_?.K8S_CLIENT ? [ { @@ -36,7 +38,7 @@ export const COMMON_HELP_ACTION_MENU_ITEMS: HelpButtonActionMenuProps['options'] label: 'View documentation', startIcon: { name: 'ic-book-open' }, componentType: 'anchor', - href: DOCUMENTATION_HOME_PAGE, + href: `${DOCUMENTATION_HOME_PAGE}${docPath ? `/${docPath}` : ''}`, }, { id: HelpMenuItems.DEVTRON_GPT, diff --git a/src/Shared/Components/Header/types.ts b/src/Shared/Components/Header/types.ts index c97da44dc..4065c8a4e 100644 --- a/src/Shared/Components/Header/types.ts +++ b/src/Shared/Components/Header/types.ts @@ -39,6 +39,7 @@ export interface PageHeaderType { } onClose?: () => void closeIcon?: JSX.Element + docPath?: string } export interface ServerInfo { @@ -52,7 +53,7 @@ export interface ServerInfoResponse extends ResponseType { result?: ServerInfo } -export interface HelpButtonProps { +export interface HelpButtonProps extends Pick { serverInfo: ServerInfo fetchingServerInfo: boolean onClick: () => void @@ -79,3 +80,8 @@ export interface ProfileMenuProps { user: string onClick?: () => void } + +export interface HelpActionOptionTypes extends Pick { + isEnterprise: boolean + isTrialOrFreemium: boolean +} diff --git a/src/Shared/Components/Header/utils.ts b/src/Shared/Components/Header/utils.ts index 50dae36d9..af79adaf6 100644 --- a/src/Shared/Components/Header/utils.ts +++ b/src/Shared/Components/Header/utils.ts @@ -17,13 +17,13 @@ import { LOGIN_COUNT } from '@Common/Constants' import { - COMMON_HELP_ACTION_MENU_ITEMS, ENTERPRISE_HELP_ACTION_MENU_ITEMS, ENTERPRISE_TRIAL_HELP_ACTION_MENU_ITEMS, + getCommonHelpActionMenuItems, OSS_HELP_ACTION_MENU_ITEMS, } from './constants' import { updatePostHogEvent } from './service' -import { HelpButtonActionMenuProps } from './types' +import { HelpActionOptionTypes, HelpButtonActionMenuProps } from './types' const millisecondsInDay = 86400000 export const getDateInMilliseconds = (days) => 1 + new Date().valueOf() + (days ?? 0) * millisecondsInDay @@ -45,12 +45,10 @@ export const setActionWithExpiry = (key: string, days: number): void => { export const getHelpActionMenuOptions = ({ isEnterprise, isTrialOrFreemium, -}: { - isEnterprise: boolean - isTrialOrFreemium: boolean -}): HelpButtonActionMenuProps['options'] => [ + docPath, +}: HelpActionOptionTypes): HelpButtonActionMenuProps['options'] => [ { - items: COMMON_HELP_ACTION_MENU_ITEMS, + items: getCommonHelpActionMenuItems({ docPath }), }, ...(isEnterprise ? [ From 0053c7cc18aed27448cbdd1df9a45c58084fd0c0 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Wed, 17 Dec 2025 12:02:31 +0530 Subject: [PATCH 26/40] feat: add ic-chart-repo and ic-external-link SVG icons to the icon library --- src/Assets/IconV2/ic-chart-repo.svg | 5 +++++ src/Assets/IconV2/ic-external-link.svg | 4 ++++ src/Shared/Components/Icon/Icon.tsx | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 src/Assets/IconV2/ic-chart-repo.svg create mode 100644 src/Assets/IconV2/ic-external-link.svg diff --git a/src/Assets/IconV2/ic-chart-repo.svg b/src/Assets/IconV2/ic-chart-repo.svg new file mode 100644 index 000000000..8d0dff3f9 --- /dev/null +++ b/src/Assets/IconV2/ic-chart-repo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Assets/IconV2/ic-external-link.svg b/src/Assets/IconV2/ic-external-link.svg new file mode 100644 index 000000000..ddcdbcf6f --- /dev/null +++ b/src/Assets/IconV2/ic-external-link.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 4d80ff930..f9517d50e 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -64,6 +64,7 @@ import { ReactComponent as ICCaretLeft } from '@IconsV2/ic-caret-left.svg' import { ReactComponent as ICCaretRight } from '@IconsV2/ic-caret-right.svg' import { ReactComponent as ICCd } from '@IconsV2/ic-cd.svg' import { ReactComponent as ICChartLineUp } from '@IconsV2/ic-chart-line-up.svg' +import { ReactComponent as ICChartRepo } from '@IconsV2/ic-chart-repo.svg' import { ReactComponent as ICChatCircleDots } from '@IconsV2/ic-chat-circle-dots.svg' import { ReactComponent as ICChatCircleOnline } from '@IconsV2/ic-chat-circle-online.svg' import { ReactComponent as ICCheck } from '@IconsV2/ic-check.svg' @@ -129,6 +130,7 @@ import { ReactComponent as ICError } from '@IconsV2/ic-error.svg' import { ReactComponent as ICExitFullscreen } from '@IconsV2/ic-exit-fullscreen.svg' import { ReactComponent as ICExpandRightSm } from '@IconsV2/ic-expand-right-sm.svg' import { ReactComponent as ICExpandSm } from '@IconsV2/ic-expand-sm.svg' +import { ReactComponent as ICExternalLink } from '@IconsV2/ic-external-link.svg' import { ReactComponent as ICFailure } from '@IconsV2/ic-failure.svg' import { ReactComponent as ICFastForward } from '@IconsV2/ic-fast-forward.svg' import { ReactComponent as ICFile } from '@IconsV2/ic-file.svg' @@ -378,6 +380,7 @@ export const iconMap = { 'ic-caret-right': ICCaretRight, 'ic-cd': ICCd, 'ic-chart-line-up': ICChartLineUp, + 'ic-chart-repo': ICChartRepo, 'ic-chat-circle-dots': ICChatCircleDots, 'ic-chat-circle-online': ICChatCircleOnline, 'ic-check-all': ICCheckAll, @@ -443,6 +446,7 @@ export const iconMap = { 'ic-exit-fullscreen': ICExitFullscreen, 'ic-expand-right-sm': ICExpandRightSm, 'ic-expand-sm': ICExpandSm, + 'ic-external-link': ICExternalLink, 'ic-failure': ICFailure, 'ic-fast-forward': ICFastForward, 'ic-file-code': ICFileCode, From cb8524c787a451a185cc964e936e9f0291fb2f90 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 10:15:45 +0530 Subject: [PATCH 27/40] feat: constants link updfated --- src/Shared/Components/DocLink/constants.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index c4775d779..5e7668233 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -18,6 +18,9 @@ import { DOCUMENTATION_HOME_PAGE } from '@Common/Constants' export const DOCUMENTATION = { ADMIN_PASSWORD: 'install/install-devtron#devtron-admin-credentials', + AI_RECOMMENDATIONS: 'usage/ai-recommendations', + APPLICATIONS: 'usage/applications', + APP_CONFIGURATION: 'docs/user-guide/app-configurations', APP_CI_CONFIG_BUILD_WITHOUT_DOCKER: 'usage/applications/creating-application/docker-build-configuration#build-docker-image-without-dockerfile', APP_CREATE: 'usage/applications/create-application', @@ -31,10 +34,13 @@ export const DOCUMENTATION = { APP_EPHEMERAL_CONTAINER: 'usage/applications/app-details/ephemeral-containers', APP_GROUP: 'usage/application-groups', APP_METRICS: 'usage/applications/app-details/app-metrics', + APP_OVERVIEW: 'usage/overview', APP_OVERVIEW_TAGS: 'usage/applications/overview#manage-tags', + APP_POLICIES: 'usage/policies', APP_ROLLOUT_DEPLOYMENT_TEMPLATE: 'usage/applications/creating-application/deployment-template/rollout-deployment', BUILD_STAGE: 'usage/applications/creating-application/workflow/ci-pipeline#build-stage', APP_TAGS: 'usage/applications/create-application#tags', + APP_TEMPLATE: 'docs/user-guide/app-management/application-template', BLOB_STORAGE: 'configurations-overview/installation-configuration#configuration-of-blob-storage', BULK_UPDATE: 'usage/bulk-update', CHART_GROUP: 'usage/deploy-chart/chart-group', @@ -42,23 +48,24 @@ export const DOCUMENTATION = { CHART_STORE: 'usage/deploy-chart', CHART_STORE_METRICS_SERVER: 'dashboard//chart-store/discover?appStoreName=metrics-server', CUSTOM_VALUES: 'usage/deploy-chart/overview-of-charts#custom-values', + CONFIGURING_WEBHOOK: 'usage/applications/creating-application/workflow/ci-pipeline#configuring-webhook', DEPLOYMENT: 'usage/applications/creating-application/deployment-template/deployment', DEPLOYMENT_TEMPLATE: 'usage/applications/creating-application/deployment-template', DEVTRON_UPGRADE: 'getting-started/upgrade', - CONFIGURING_WEBHOOK: 'usage/applications/creating-application/workflow/ci-pipeline#configuring-webhook', + DOC_HOME_PAGE: DOCUMENTATION_HOME_PAGE, ENTERPRISE_LICENSE: 'enterprise-license', EXECUTE_CUSTOM_SCRIPT: 'usage/applications/creating-application/workflow/ci-pipeline/ci-build-pre-post-plugins#execute-custom-script', EXTERNAL_LINKS: 'getting-started/global-configurations/external-links', EXTERNAL_SECRET: 'usage/applications/creating-application/secrets#external-secrets', HOME_PAGE: 'https://devtron.ai', - DOC_HOME_PAGE: DOCUMENTATION_HOME_PAGE, - KUBE_CONFIG: 'usage/resource-browser#running-kubectl-commands-locally', JOBS: 'usage/jobs', - TAINT: 'usage/resource-browser#taint-a-node', + KUBE_CONFIG: 'usage/resource-browser#running-kubectl-commands-locally', RESOURCE_BROWSER: 'usage/resource-browser', + TAINT: 'usage/resource-browser#taint-a-node', // Global Configurations + GLOBAL_CONFIGUDATIONS: 'getting-started/global-configurations', GLOBAL_CONFIG_API_TOKEN: 'getting-started/global-configurations/authorization/api-tokens', GLOBAL_CONFIG_BUILD_INFRA: 'global-configurations/build-infra', GLOBAL_CONFIG_CHART: 'getting-started/global-configurations/chart-repo', @@ -127,7 +134,11 @@ export const DOCUMENTATION = { // Infrastructure Management AUTOSCALER_DETECTION: 'user-guide/infra-management/infrastructure-overview#troubleshooting-autoscaler-detection', + HELM_APPS: 'user-guide/infra-management/other-applications', + INFRA_OVERVIEW: 'user-guide/infra-management/overview', // Cost Visibility + COST_BREAKDOWN: 'user-guide/finops/cost-breakdown', COST_CALCULATION: 'user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated', + COST_VISIBILITY_OVERVIEW: 'user-guide/finops/overview-cost-visibility', } as const From 547084dfad227ba70f63f7952d342fa225530866 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 12:52:13 +0530 Subject: [PATCH 28/40] fix: doc path fix for internal click --- src/Shared/Components/Header/HelpButton.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Components/Header/HelpButton.tsx b/src/Shared/Components/Header/HelpButton.tsx index 0b760d850..e6ad41163 100644 --- a/src/Shared/Components/Header/HelpButton.tsx +++ b/src/Shared/Components/Header/HelpButton.tsx @@ -18,7 +18,7 @@ import { useEffect, useRef, useState } from 'react' import Tippy from '@tippyjs/react' import { SliderButton } from '@typeform/embed-react' -import { DOCUMENTATION_HOME_PAGE, MAX_LOGIN_COUNT, URLS } from '@Common/Constants' +import { MAX_LOGIN_COUNT, URLS } from '@Common/Constants' import { handleAnalyticsEvent } from '@Shared/Analytics' import { ComponentSizeType } from '@Shared/constants' import { useIsSecureConnection } from '@Shared/Hooks' @@ -102,7 +102,7 @@ export const HelpButton = ({ setSidePanelConfig((prev) => ({ ...prev, state: SidePanelTab.DOCUMENTATION, - docLink: DOCUMENTATION_HOME_PAGE, + docLink: docPath, reinitialize: true, })) } From 10da12e5a3bf668244266a76a8ca9e167d995b34 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 13:25:44 +0530 Subject: [PATCH 29/40] fix: foc path fix --- src/Shared/Components/Header/HelpButton.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Components/Header/HelpButton.tsx b/src/Shared/Components/Header/HelpButton.tsx index e6ad41163..7e745eb14 100644 --- a/src/Shared/Components/Header/HelpButton.tsx +++ b/src/Shared/Components/Header/HelpButton.tsx @@ -18,7 +18,7 @@ import { useEffect, useRef, useState } from 'react' import Tippy from '@tippyjs/react' import { SliderButton } from '@typeform/embed-react' -import { MAX_LOGIN_COUNT, URLS } from '@Common/Constants' +import { DOCUMENTATION_HOME_PAGE, MAX_LOGIN_COUNT, URLS } from '@Common/Constants' import { handleAnalyticsEvent } from '@Shared/Analytics' import { ComponentSizeType } from '@Shared/constants' import { useIsSecureConnection } from '@Shared/Hooks' @@ -102,7 +102,7 @@ export const HelpButton = ({ setSidePanelConfig((prev) => ({ ...prev, state: SidePanelTab.DOCUMENTATION, - docLink: docPath, + docLink: `${DOCUMENTATION_HOME_PAGE}${docPath ? `/${docPath}` : ''}`, reinitialize: true, })) } From 38221aa0af6e3335736a19f3c39da31a82fdfed1 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 17:32:47 +0530 Subject: [PATCH 30/40] fix: doc link updated --- src/Shared/Components/DocLink/constants.ts | 17 ++++++++++++++--- .../HeaderWithCreateButon.tsx | 13 +++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index 5e7668233..7c8073438 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -18,7 +18,6 @@ import { DOCUMENTATION_HOME_PAGE } from '@Common/Constants' export const DOCUMENTATION = { ADMIN_PASSWORD: 'install/install-devtron#devtron-admin-credentials', - AI_RECOMMENDATIONS: 'usage/ai-recommendations', APPLICATIONS: 'usage/applications', APP_CONFIGURATION: 'docs/user-guide/app-configurations', APP_CI_CONFIG_BUILD_WITHOUT_DOCKER: @@ -124,6 +123,9 @@ export const DOCUMENTATION = { GLOBAL_CONFIG_PULL_IMAGE_DIGEST: 'global-configurations/pull-image-digest', GLOBAL_CONFIG_TAGS: 'getting-started/global-configurations/tags-policy', + // Application Management + APP_MANAGEMENT: 'docs/user-guide/app-management', + // Software Release Management SOFTWARE_DISTRIBUTION_HUB: 'usage/software-distribution-hub', RELEASE_TRACKS: 'usage/software-distribution-hub/release-hub#creating-release-tracks-and-versions', @@ -135,10 +137,19 @@ export const DOCUMENTATION = { // Infrastructure Management AUTOSCALER_DETECTION: 'user-guide/infra-management/infrastructure-overview#troubleshooting-autoscaler-detection', HELM_APPS: 'user-guide/infra-management/other-applications', - INFRA_OVERVIEW: 'user-guide/infra-management/overview', + INFRA_MANAGEMENT: 'docs/user-guide/infra-management', // Cost Visibility - COST_BREAKDOWN: 'user-guide/finops/cost-breakdown', + COST_BREAKDOWN: 'user-guide/finops', COST_CALCULATION: 'user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated', COST_VISIBILITY_OVERVIEW: 'user-guide/finops/overview-cost-visibility', + + // Security Center + SECURITY_CENTER: 'docs/user-guide/security-features', + + // AI Recommendations + AI_RECOMMENDATIONS: 'usage/ai-recommendations', + + // Automation & Enablement + AUTOMATION_AND_ENABLEMENT: 'docs/user-guide/automation', } as const diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx index 9301b40e3..c8cadae16 100644 --- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx +++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx @@ -22,6 +22,7 @@ import { BreadCrumb, BreadcrumbText, useBreadcrumb } from '@Common/index' import { ActionMenu } from '@Shared/Components/ActionMenu' import { ButtonComponentType } from '@Shared/Components/Button' import Button from '@Shared/Components/Button/Button.component' +import { DOCUMENTATION } from '@Shared/Components/DocLink' import { Icon } from '@Shared/Components/Icon' import { ComponentSizeType } from '@Shared/constants' import { useMainContext } from '@Shared/Providers' @@ -93,6 +94,17 @@ export const HeaderWithCreateButton = ({ viewType }: HeaderWithCreateButtonProps ) const renderBreadcrumbs = () => + const getDocPath = () => { + let docPath: string = DOCUMENTATION.APP_MANAGEMENT + + if (viewType === 'jobs') { + docPath = DOCUMENTATION.AUTOMATION_AND_ENABLEMENT + } else if (viewType === 'infra-apps') { + docPath = DOCUMENTATION.INFRA_MANAGEMENT + } + return docPath + } + return (
) From 29a3fde4a3039e20af3a1eb2295d3478e540568b Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 17:37:12 +0530 Subject: [PATCH 31/40] fix: code cleanup --- src/Shared/Components/DocLink/constants.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index 7c8073438..3e7da774d 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -18,8 +18,6 @@ import { DOCUMENTATION_HOME_PAGE } from '@Common/Constants' export const DOCUMENTATION = { ADMIN_PASSWORD: 'install/install-devtron#devtron-admin-credentials', - APPLICATIONS: 'usage/applications', - APP_CONFIGURATION: 'docs/user-guide/app-configurations', APP_CI_CONFIG_BUILD_WITHOUT_DOCKER: 'usage/applications/creating-application/docker-build-configuration#build-docker-image-without-dockerfile', APP_CREATE: 'usage/applications/create-application', @@ -33,13 +31,10 @@ export const DOCUMENTATION = { APP_EPHEMERAL_CONTAINER: 'usage/applications/app-details/ephemeral-containers', APP_GROUP: 'usage/application-groups', APP_METRICS: 'usage/applications/app-details/app-metrics', - APP_OVERVIEW: 'usage/overview', APP_OVERVIEW_TAGS: 'usage/applications/overview#manage-tags', - APP_POLICIES: 'usage/policies', APP_ROLLOUT_DEPLOYMENT_TEMPLATE: 'usage/applications/creating-application/deployment-template/rollout-deployment', BUILD_STAGE: 'usage/applications/creating-application/workflow/ci-pipeline#build-stage', APP_TAGS: 'usage/applications/create-application#tags', - APP_TEMPLATE: 'docs/user-guide/app-management/application-template', BLOB_STORAGE: 'configurations-overview/installation-configuration#configuration-of-blob-storage', BULK_UPDATE: 'usage/bulk-update', CHART_GROUP: 'usage/deploy-chart/chart-group', From 8fc902412fe90f57b372225fb0f3298b33e9d364 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 17:58:27 +0530 Subject: [PATCH 32/40] fix: code refactoring --- .../HeaderWithCreateButton/HeaderWithCreateButon.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx index c8cadae16..f7000d997 100644 --- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx +++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx @@ -95,14 +95,13 @@ export const HeaderWithCreateButton = ({ viewType }: HeaderWithCreateButtonProps const renderBreadcrumbs = () => const getDocPath = () => { - let docPath: string = DOCUMENTATION.APP_MANAGEMENT - if (viewType === 'jobs') { - docPath = DOCUMENTATION.AUTOMATION_AND_ENABLEMENT - } else if (viewType === 'infra-apps') { - docPath = DOCUMENTATION.INFRA_MANAGEMENT + return DOCUMENTATION.AUTOMATION_AND_ENABLEMENT + } + if (viewType === 'infra-apps') { + return DOCUMENTATION.INFRA_MANAGEMENT } - return docPath + return DOCUMENTATION.APP_MANAGEMENT } return ( From 5b4cb2b5462284140f8513852e9649c1a0b35e72 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 18:30:25 +0530 Subject: [PATCH 33/40] chore: version bump --- package-lock.json | 157 ++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 63 insertions(+), 96 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9548bd586..b55bbbd8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-10", + "version": "1.21.1-beta-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-10", + "version": "1.21.1-beta-3", "hasInstallScript": true, "license": "ISC", "dependencies": { @@ -308,6 +308,7 @@ "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -519,6 +520,7 @@ "version": "7.25.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "peer": true, "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -576,6 +578,7 @@ "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz", "integrity": "sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==", "license": "MIT", + "peer": true, "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -587,6 +590,7 @@ "version": "6.8.0", "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.0.tgz", "integrity": "sha512-q8VPEFaEP4ikSlt6ZxjB3zW72+7osfAYW9i8Zu943uqbKuz6utc1+F170hyLUCUltXORjQXRyYQNfkckzA/bPQ==", + "peer": true, "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.4.0", @@ -621,6 +625,7 @@ "version": "6.10.8", "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.8.tgz", "integrity": "sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", @@ -642,6 +647,7 @@ "version": "6.8.4", "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz", "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.35.0", @@ -664,6 +670,7 @@ "version": "6.5.8", "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz", "integrity": "sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==", + "peer": true, "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -674,6 +681,7 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.1.tgz", "integrity": "sha512-3rA9lcwciEB47ZevqvD8qgbzhM9qMb8vCcQCNmDfVRPQG4JT9mSb0Jg8H7YjKGGQcFnLN323fj9jdnG59Kx6bg==", + "peer": true, "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } @@ -693,6 +701,7 @@ "version": "6.36.2", "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.2.tgz", "integrity": "sha512-DZ6ONbs8qdJK0fdN7AB82CgI6tYXf4HWk1wSVa0+9bhVznCuuvhQtX8bFBoy3dv8rZSQqUd8GvhVAcielcidrA==", + "peer": true, "dependencies": { "@codemirror/state": "^6.5.0", "style-mod": "^4.1.0", @@ -720,7 +729,6 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz", "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==", - "peer": true, "dependencies": { "@babel/helper-module-imports": "^7.16.7", "@babel/runtime": "^7.18.3", @@ -738,14 +746,12 @@ "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "peer": true + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "node_modules/@emotion/cache": { "version": "11.13.1", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz", "integrity": "sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==", - "peer": true, "dependencies": { "@emotion/memoize": "^0.9.0", "@emotion/sheet": "^1.4.0", @@ -757,8 +763,7 @@ "node_modules/@emotion/hash": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", - "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", - "peer": true + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==" }, "node_modules/@emotion/is-prop-valid": { "version": "0.8.8", @@ -780,14 +785,12 @@ "node_modules/@emotion/memoize": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz", - "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==", - "peer": true + "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==" }, "node_modules/@emotion/react": { "version": "11.13.3", "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz", "integrity": "sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==", - "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.12.0", @@ -811,7 +814,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.2.tgz", "integrity": "sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==", - "peer": true, "dependencies": { "@emotion/hash": "^0.9.2", "@emotion/memoize": "^0.9.0", @@ -823,20 +825,17 @@ "node_modules/@emotion/sheet": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz", - "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==", - "peer": true + "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==" }, "node_modules/@emotion/unitless": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz", - "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==", - "peer": true + "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz", "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==", - "peer": true, "peerDependencies": { "react": ">=16.8.0" } @@ -844,14 +843,12 @@ "node_modules/@emotion/utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.1.tgz", - "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==", - "peer": true + "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==" }, "node_modules/@emotion/weak-memoize": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz", - "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==", - "peer": true + "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==" }, "node_modules/@esbuild-plugins/node-globals-polyfill": { "version": "0.2.3", @@ -1422,7 +1419,6 @@ "version": "1.6.8", "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz", "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==", - "peer": true, "dependencies": { "@floating-ui/utils": "^0.2.8" } @@ -1431,7 +1427,6 @@ "version": "1.6.11", "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz", "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==", - "peer": true, "dependencies": { "@floating-ui/core": "^1.6.0", "@floating-ui/utils": "^0.2.8" @@ -1440,8 +1435,7 @@ "node_modules/@floating-ui/utils": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", - "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==", - "peer": true + "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" }, "node_modules/@humanwhocodes/config-array": { "version": "0.13.0", @@ -2073,7 +2067,8 @@ "node_modules/@lezer/common": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz", - "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==" + "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==", + "peer": true }, "node_modules/@lezer/highlight": { "version": "1.2.1", @@ -3626,6 +3621,7 @@ "resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz", "integrity": "sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==", "dev": true, + "peer": true, "dependencies": { "@babel/core": "^7.19.6", "@svgr/babel-preset": "^6.5.1", @@ -3726,6 +3722,7 @@ "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.40.1.tgz", "integrity": "sha512-mgD07S5N8e5v81CArKDWrHE4LM7HxZ9k/KLeD3+NUD9WimGZgKIqojUZf/rXkfAMYZU9p0Chzj2jOXm7xpgHHQ==", "license": "MIT", + "peer": true, "dependencies": { "@tanstack/query-core": "4.40.0", "use-sync-external-store": "^1.2.0" @@ -4213,7 +4210,6 @@ "version": "4.4.11", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz", "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==", - "peer": true, "dependencies": { "@types/react": "*" } @@ -4302,6 +4298,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz", "integrity": "sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.3.0", "@typescript-eslint/types": "8.3.0", @@ -4695,8 +4692,7 @@ "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "peer": true + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" }, "node_modules/acorn": { "version": "8.15.0", @@ -4704,6 +4700,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4766,7 +4763,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -4797,7 +4793,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "peer": true, "dependencies": { "ajv": "^8.0.0" }, @@ -5061,7 +5056,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "peer": true, "engines": { "node": ">= 4.0.0" } @@ -5102,7 +5096,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.5", "cosmiconfig": "^7.0.0", @@ -5175,6 +5168,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001718", "electron-to-chromium": "^1.5.160", @@ -5221,7 +5215,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "peer": true, "dependencies": { "call-bind-apply-helpers": "^1.0.1", "get-intrinsic": "^1.2.6" @@ -5549,7 +5542,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.1.tgz", "integrity": "sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==", - "peer": true, "dependencies": { "validate.io-array": "^1.0.3", "validate.io-function": "^1.0.2", @@ -5560,7 +5552,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.2.tgz", "integrity": "sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==", - "peer": true, "dependencies": { "compute-gcd": "^1.2.1", "validate.io-array": "^1.0.3", @@ -5812,6 +5803,7 @@ "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", "license": "ISC", + "peer": true, "engines": { "node": ">=12" } @@ -6111,7 +6103,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", - "peer": true, "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -6450,6 +6441,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -6511,6 +6503,7 @@ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6615,6 +6608,7 @@ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -6708,6 +6702,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, + "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.8", @@ -6793,6 +6788,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.1.tgz", "integrity": "sha512-zHByM9WTUMnfsDTafGXRiqxp6lFtNoSOWBY6FonVRn3A+BUwN1L/tdBXT40BcBJi0cZjOGTXZ0eD/rTG9fEJ0g==", "dev": true, + "peer": true, "dependencies": { "aria-query": "^5.3.2", "array-includes": "^3.1.8", @@ -6875,6 +6871,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz", "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==", "dev": true, + "peer": true, "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", @@ -6907,6 +6904,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz", "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==", "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -7279,8 +7277,7 @@ "node_modules/fast-uri": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", - "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", - "peer": true + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==" }, "node_modules/fastq": { "version": "1.17.1", @@ -7317,8 +7314,7 @@ "node_modules/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", - "peer": true + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "node_modules/find-up": { "version": "5.0.0", @@ -7340,7 +7336,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "peer": true, "dependencies": { "micromatch": "^4.0.2" } @@ -7810,7 +7805,6 @@ "version": "4.10.1", "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", - "peer": true, "dependencies": { "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", @@ -8100,7 +8094,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "peer": true, "bin": { "is-docker": "cli.js" }, @@ -8379,7 +8372,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "peer": true, "dependencies": { "is-docker": "^2.0.0" }, @@ -8675,6 +8667,7 @@ "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz", "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==", "license": "MIT", + "peer": true, "engines": { "node": ">= 10.16.0" } @@ -8710,7 +8703,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz", "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==", - "peer": true, "dependencies": { "lodash": "^4.17.4" } @@ -8741,7 +8733,6 @@ "version": "0.8.1", "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.8.1.tgz", "integrity": "sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==", - "peer": true, "dependencies": { "compute-lcm": "^1.1.2", "json-schema-compare": "^0.2.2", @@ -8760,7 +8751,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz", "integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==", - "peer": true, "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -8809,7 +8799,6 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", - "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8836,7 +8825,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz", "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -8869,7 +8857,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "peer": true, "dependencies": { "graceful-fs": "^4.1.11" } @@ -9166,8 +9153,7 @@ "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "peer": true + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "node_modules/lodash.merge": { "version": "4.6.2", @@ -9325,7 +9311,6 @@ "version": "7.5.0", "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.5.0.tgz", "integrity": "sha512-RrBNcMHiFPcz/iqIj0n3wclzHXjwS7mzjBNWecKKVhNTIxQepIix6Il/wZCn2Cg5Y1ow2Qi84+eJrryFRWBEWw==", - "peer": true, "engines": { "node": ">= 10" }, @@ -9388,8 +9373,7 @@ "node_modules/memoize-one": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", - "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", - "peer": true + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" }, "node_modules/merge-stream": { "version": "2.0.0", @@ -9595,6 +9579,7 @@ "version": "2.30.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "peer": true, "engines": { "node": "*" } @@ -9879,7 +9864,6 @@ "version": "7.4.2", "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "peer": true, "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" @@ -9912,7 +9896,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -10000,7 +9983,6 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", - "peer": true, "dependencies": { "@yarnpkg/lockfile": "^1.1.0", "chalk": "^4.1.2", @@ -10030,7 +10012,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10040,7 +10021,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -10056,7 +10036,6 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "peer": true, "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -10072,7 +10051,6 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", - "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -10092,7 +10070,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "peer": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -10105,7 +10082,6 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "deprecated": "Rimraf versions prior to v4 are no longer supported", - "peer": true, "dependencies": { "glob": "^7.1.3" }, @@ -10117,7 +10093,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "peer": true, "engines": { "node": ">=6" } @@ -10185,7 +10160,6 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", - "peer": true, "dependencies": { "isarray": "0.0.1" } @@ -10193,8 +10167,7 @@ "node_modules/path-to-regexp/node_modules/isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "peer": true + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" }, "node_modules/path-type": { "version": "4.0.0", @@ -10319,6 +10292,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -10377,6 +10351,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -10686,7 +10661,6 @@ "version": "5.3.4", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz", "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -10723,8 +10697,7 @@ "node_modules/react-router/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "peer": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/react-select": { "version": "5.8.0", @@ -10764,7 +10737,6 @@ "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", - "peer": true, "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -10811,6 +10783,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/react-with-styles/-/react-with-styles-4.2.0.tgz", "integrity": "sha512-tZCTY27KriRNhwHIbg1NkSdTTOSfXDg6Z7s+Q37mtz0Ym7Sc7IOr3PzVt4qJhJMW6Nkvfi3g34FuhtiGAJCBQA==", + "peer": true, "dependencies": { "airbnb-prop-types": "^2.14.0", "hoist-non-react-statics": "^3.2.1", @@ -10989,8 +10962,7 @@ "node_modules/resolve-pathname": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", - "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==", - "peer": true + "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" }, "node_modules/resolve-pkg-maps": { "version": "1.0.0", @@ -11109,6 +11081,7 @@ "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.7" }, @@ -11170,6 +11143,7 @@ "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -11211,6 +11185,7 @@ "version": "1.80.3", "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.3.tgz", "integrity": "sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==", + "peer": true, "dependencies": { "@parcel/watcher": "^2.4.1", "chokidar": "^4.0.0", @@ -11228,7 +11203,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -11457,7 +11431,6 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -11796,8 +11769,7 @@ "node_modules/stylis": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", - "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==", - "peer": true + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" }, "node_modules/superjson": { "version": "1.13.3", @@ -11922,14 +11894,12 @@ "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", - "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", - "peer": true + "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==" }, "node_modules/tiny-warning": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", - "peer": true + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" }, "node_modules/tinyglobby": { "version": "0.2.14", @@ -11969,6 +11939,7 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -11989,7 +11960,6 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "peer": true, "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -12176,6 +12146,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12332,7 +12303,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz", "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==", - "peer": true, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" }, @@ -12359,20 +12329,17 @@ "node_modules/validate.io-array": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz", - "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==", - "peer": true + "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==" }, "node_modules/validate.io-function": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz", - "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==", - "peer": true + "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==" }, "node_modules/validate.io-integer": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz", "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==", - "peer": true, "dependencies": { "validate.io-number": "^1.0.3" } @@ -12381,7 +12348,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz", "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==", - "peer": true, "dependencies": { "validate.io-array": "^1.0.3", "validate.io-integer": "^1.0.4" @@ -12390,14 +12356,12 @@ "node_modules/validate.io-number": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz", - "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==", - "peer": true + "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==" }, "node_modules/value-equal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", - "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==", - "peer": true + "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" }, "node_modules/vfile": { "version": "6.0.3", @@ -12431,6 +12395,7 @@ "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -12594,6 +12559,7 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -12832,6 +12798,7 @@ "version": "2.6.0", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", + "peer": true, "bin": { "yaml": "bin.mjs" }, diff --git a/package.json b/package.json index ae16c82a9..25a2b68ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-10", + "version": "1.21.1-beta-3", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From aed107b551fc8ce2d0dc127c9ee7c04b05f9451a Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 18:37:21 +0530 Subject: [PATCH 34/40] chore: link fix --- src/Shared/Components/DocLink/constants.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index 3e7da774d..326488649 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -130,20 +130,20 @@ export const DOCUMENTATION = { TENANTS_INSTALLATION: 'usage/software-distribution-hub/tenants', // Infrastructure Management - AUTOSCALER_DETECTION: 'user-guide/infra-management/infrastructure-overview#troubleshooting-autoscaler-detection', - HELM_APPS: 'user-guide/infra-management/other-applications', + AUTOSCALER_DETECTION: + 'docs/user-guide/infra-management/infrastructure-overview#troubleshooting-autoscaler-detection', INFRA_MANAGEMENT: 'docs/user-guide/infra-management', // Cost Visibility - COST_BREAKDOWN: 'user-guide/finops', - COST_CALCULATION: 'user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated', + COST_BREAKDOWN: 'docs/user-guide/finops', + COST_CALCULATION: 'docs/user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated', COST_VISIBILITY_OVERVIEW: 'user-guide/finops/overview-cost-visibility', // Security Center SECURITY_CENTER: 'docs/user-guide/security-features', // AI Recommendations - AI_RECOMMENDATIONS: 'usage/ai-recommendations', + AI_RECOMMENDATIONS: 'docs/usage/ai-recommendations', // Automation & Enablement AUTOMATION_AND_ENABLEMENT: 'docs/user-guide/automation', From d8bd1b39d208853119f1b15882c7fc88047b8a59 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 18:40:39 +0530 Subject: [PATCH 35/40] chore: link fix --- src/Shared/Components/DocLink/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index 326488649..4957fb19c 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -137,7 +137,7 @@ export const DOCUMENTATION = { // Cost Visibility COST_BREAKDOWN: 'docs/user-guide/finops', COST_CALCULATION: 'docs/user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated', - COST_VISIBILITY_OVERVIEW: 'user-guide/finops/overview-cost-visibility', + COST_VISIBILITY_OVERVIEW: 'docs/user-guide/finops/overview-cost-visibility', // Security Center SECURITY_CENTER: 'docs/user-guide/security-features', From c64b6ca7652d6ca6e0c31b6a54f967d3f2c83087 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 18:42:04 +0530 Subject: [PATCH 36/40] chore: link fix --- src/Shared/Components/DocLink/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/DocLink/constants.ts b/src/Shared/Components/DocLink/constants.ts index 4957fb19c..029e3d3af 100644 --- a/src/Shared/Components/DocLink/constants.ts +++ b/src/Shared/Components/DocLink/constants.ts @@ -143,7 +143,7 @@ export const DOCUMENTATION = { SECURITY_CENTER: 'docs/user-guide/security-features', // AI Recommendations - AI_RECOMMENDATIONS: 'docs/usage/ai-recommendations', + AI_RECOMMENDATIONS: 'docs/user-guide/ai-recommendations', // Automation & Enablement AUTOMATION_AND_ENABLEMENT: 'docs/user-guide/automation', From e1482dad11523eb0dc6540df162d5de4999309e3 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 18 Dec 2025 18:47:52 +0530 Subject: [PATCH 37/40] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b55bbbd8b..07777bb22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 25a2b68ab..6907cb6b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From d9a84f0c18983e44160fff0acb1b66cae0cd959a Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 18 Dec 2025 19:00:50 +0530 Subject: [PATCH 38/40] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bac236d1..fd1534c88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-4", + "version": "1.22.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-4", + "version": "1.22.0", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 6907cb6b6..745d27b21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-4", + "version": "1.22.0", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 9cba76ec6bfbf14cdee29dbd3e13981e96e7d905 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Thu, 18 Dec 2025 19:11:47 +0530 Subject: [PATCH 39/40] chore: update routing for application management in conflict dialogs --- src/Common/Constants.ts | 1 - .../Components/CICDHistory/ResourceConflictDeployDialog.tsx | 2 +- .../Components/CICDHistory/ResourceConflictDetailsModal.tsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 4db6ca9e9..9d8c58914 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -69,7 +69,6 @@ export const URLS = { LOGIN: '/login', LOGIN_SSO: '/login/sso', APP_LIST: 'list', - APP: '/app', CREATE_JOB: 'create-job', GETTING_STARTED: 'getting-started', STACK_MANAGER_ABOUT: '/stack-manager/about', diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx index 7310d994e..b102547cf 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx @@ -24,7 +24,7 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }: appId, }) setIsLoading(false) - history.push(`${URLS.APP}/${appId}/details/${envId}`) + history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) } catch (error) { showError(error) setIsLoading(false) diff --git a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx index 8ca373b72..3b9e49982 100644 --- a/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx +++ b/src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx @@ -43,7 +43,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }: appId, }) setIsDeploying(false) - history.push(`${URLS.APP}/${appId}/details/${envId}`) + history.push(`${URLS.APPLICATION_MANAGEMENT_APP}/${appId}/details/${envId}`) } catch (error) { showError(error) setIsDeploying(false) From 6a63597a9b38359a71f973183932b725f6725923 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Fri, 19 Dec 2025 10:29:58 +0530 Subject: [PATCH 40/40] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd1534c88..de97d1a0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0", + "version": "1.22.0-pre-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0", + "version": "1.22.0-pre-0", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 745d27b21..c18a3d755 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0", + "version": "1.22.0-pre-0", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",