Skip to content

Commit 872affd

Browse files
mukultayal135mukultayal135
authored
Merge pull request #1634 from devtron-labs/fix-argo-app-stream-api
fix: argo app stream api
2 parents ee88a9e + 4c406db commit 872affd

18 files changed

+37
-89
lines changed

‎src/components/app/details/appDetails/AppDetails.tsx‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { ReactComponent as StopButton } from '../../../../assets/icons/ic-stop.s
4949
import { ReactComponent as ForwardArrow } from '../../../../assets/icons/ic-arrow-forward.svg'
5050

5151
import { SourceInfo } from './SourceInfo'
52-
import { AppStreamData, Application, Nodes, AggregatedNodes, NodeDetailTabs } from '../../types'
52+
import { Application, Nodes, AggregatedNodes, NodeDetailTabs } from '../../types'
5353
import {
5454
aggregateNodes,
5555
getSelectedNodeItems,
@@ -228,7 +228,6 @@ export const Details: React.FC<DetailsType> = ({
228228
const params = useParams<{ appId: string; envId: string }>()
229229
const location = useLocation()
230230
// fixme: the state is not being set anywhere and just being drilled down
231-
const [streamData] = useState<AppStreamData>(null)
232231
const [detailedStatus, toggleDetailedStatus] = useState<boolean>(false)
233232
const [resourceTreeFetchTimeOut, setResourceTreeFetchTimeOut] = useState<boolean>(false)
234233
const [urlInfo, setUrlInfo] = useState<boolean>(false)
@@ -579,7 +578,6 @@ export const Details: React.FC<DetailsType> = ({
579578
<DeletedAppComponent
580579
resourceTreeFetchTimeOut={resourceTreeFetchTimeOut}
581580
showApplicationDetailedModal={showApplicationDetailedModal}
582-
appStreamData={streamData}
583581
/>
584582
) : (
585583
<AppNotConfigured
@@ -622,7 +620,6 @@ export const Details: React.FC<DetailsType> = ({
622620
<div className="w-100 pt-16 pr-20 pb-16 pl-20 app-info-bg-gradient">
623621
<SourceInfo
624622
appDetails={appDetails}
625-
appStreamData={streamData}
626623
setDetailed={toggleDetailedStatus}
627624
environment={environment}
628625
environments={environments}
@@ -676,15 +673,13 @@ export const Details: React.FC<DetailsType> = ({
676673
{detailedStatus && (
677674
<AppStatusDetailModal
678675
close={hideAppDetailsStatus}
679-
appStreamData={streamData}
680676
showAppStatusMessage={false}
681677
/>
682678
)}
683679
{location.search.includes(DEPLOYMENT_STATUS_QUERY_PARAM) && (
684680
<DeploymentStatusDetailModal
685681
appName={appDetails?.appName}
686682
environmentName={appDetails?.environmentName}
687-
streamData={streamData}
688683
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
689684
isVirtualEnvironment={isVirtualEnvRef.current}
690685
isLoading={isInitialTimelineDataLoading}
@@ -776,15 +771,13 @@ export const Details: React.FC<DetailsType> = ({
776771
const DeletedAppComponent: React.FC<DeletedAppComponentType> = ({
777772
resourceTreeFetchTimeOut,
778773
showApplicationDetailedModal,
779-
appStreamData,
780774
}) => {
781775
if (resourceTreeFetchTimeOut) {
782776
return (
783777
<>
784778
<div className="mt-16 mb-9">
785779
<SyncErrorComponent
786780
showApplicationDetailedModal={showApplicationDetailedModal}
787-
appStreamData={appStreamData}
788781
/>
789782
</div>
790783
<EmptyK8sResourceComponent emptyStateMessage={RESOURCES_NOT_FOUND} />

‎src/components/app/details/appDetails/DeploymentStatusBreakdown.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { ErrorInfoStatusBar } from './ErrorInfoStatusBar'
1010

1111
export default function DeploymentStatusDetailBreakdown({
1212
deploymentStatusDetailsBreakdownData,
13-
streamData,
1413
isVirtualEnvironment,
1514
}: DeploymentStatusDetailBreakdownType) {
1615
const _appDetails = IndexStore.getAppDetails()
@@ -71,7 +70,6 @@ export default function DeploymentStatusDetailBreakdown({
7170
type={TIMELINE_STATUS.APP_HEALTH}
7271
hideVerticalConnector
7372
deploymentDetailedData={deploymentStatusDetailsBreakdownData}
74-
streamData={streamData}
7573
/>
7674
</>
7775
) : (

‎src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Drawer, Progressing } from '@devtron-labs/devtron-fe-common-lib'
99
export default function DeploymentStatusDetailModal({
1010
appName,
1111
environmentName,
12-
streamData,
1312
deploymentStatusDetailsBreakdownData,
1413
isVirtualEnvironment,
1514
isLoading,
@@ -93,7 +92,6 @@ export default function DeploymentStatusDetailModal({
9392
) : (
9493
<DeploymentStatusDetailBreakdown
9594
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
96-
streamData={streamData}
9795
isVirtualEnvironment={isVirtualEnvironment}
9896
/>
9997
)}

‎src/components/app/details/appDetails/DeploymentStatusDetailRow.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import { statusIcon } from '../../config'
2727
export const DeploymentStatusDetailRow = ({
2828
type,
2929
hideVerticalConnector,
30-
deploymentDetailedData,
31-
streamData,
30+
deploymentDetailedData
3231
}: DeploymentStatusDetailRowType) => {
3332
const { appId, envId } = useParams<{ appId: string; envId: string }>()
3433
const statusBreakDownType = deploymentDetailedData.deploymentStatusBreakdown[type]
@@ -49,7 +48,6 @@ export const DeploymentStatusDetailRow = ({
4948
showError(error)
5049
}
5150
}
52-
5351
const toggleDropdown = () => {
5452
toggleCollapsed(!collapsed)
5553
}
@@ -145,7 +143,10 @@ export const DeploymentStatusDetailRow = ({
145143
</div>
146144
)}
147145
<div>
148-
<AppStatusDetailsChart appStreamData={streamData} filterRemoveHealth showFooter={false} />
146+
<AppStatusDetailsChart
147+
filterRemoveHealth
148+
showFooter={false}
149+
/>
149150
</div>
150151
</div>
151152
)

‎src/components/app/details/appDetails/IssuesCard.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState, useEffect, useMemo } from 'react'
1+
import React, { useState, useEffect } from 'react'
22
import Tippy from '@tippyjs/react'
33
import {
44
DeploymentAppTypes,
@@ -22,7 +22,7 @@ import IndexStore from '../../../v2/appDetails/index.store'
2222
import { renderErrorHeaderMessage } from '../../../common/error/error.utils'
2323
import LoadingCard from './LoadingCard'
2424

25-
const IssuesCard = ({ appStreamData, cardLoading, setErrorsList, toggleIssuesModal, setDetailed }: IssuesCardType) => {
25+
const IssuesCard = ({ cardLoading, setErrorsList, toggleIssuesModal, setDetailed }: IssuesCardType) => {
2626
const [forceDeleteDialog, showForceDeleteDialog] = useState(false)
2727
const [nonCascadeDeleteDialog, showNonCascadeDeleteDialog] = useState(false)
2828
const [clusterConnectionError, setClusterConnectionError] = useState(false)
@@ -31,8 +31,8 @@ const IssuesCard = ({ appStreamData, cardLoading, setErrorsList, toggleIssuesMod
3131
const [forceDeleteDialogMessage, setForceDeleteDialogMessage] = useState('')
3232
const [isImagePullBackOff, setIsImagePullBackOff] = useState(false)
3333

34-
const conditions = useMemo(() => appStreamData?.result?.application?.status?.conditions || [], [appStreamData])
35-
const appDetails = useMemo(() => IndexStore.getAppDetails(), [])
34+
const appDetails = IndexStore.getAppDetails()
35+
const conditions = appDetails?.resourceTree?.conditions || []
3636

3737
const showIssuesListingModal = () => {
3838
toggleIssuesModal(true)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const AppDetailsDownloadCard = importComponentFromFELibrary('AppDetailsDownloadC
2525

2626
export const SourceInfo = ({
2727
appDetails,
28-
appStreamData,
2928
setDetailed = null,
3029
environment,
3130
environments,
@@ -231,7 +230,6 @@ export const SourceInfo = ({
231230
{isVirtualEnvironment && renderGeneratedManifestDownloadCard()}
232231
{!loadingResourceTree && (
233232
<IssuesCard
234-
appStreamData={appStreamData}
235233
cardLoading={cardLoading}
236234
toggleIssuesModal={toggleIssuesModal}
237235
setErrorsList={setErrorsList}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ResponseType } from '@devtron-labs/devtron-fe-common-lib'
2-
import { AggregatedNodes, AppStreamData, OptionType } from '../../types'
2+
import { AggregatedNodes, OptionType } from '../../types'
33
import { SyncErrorType, AppDetails } from '../../../v2/appDetails/appDetails.type'
44

55
export enum AppMetricsTab {
@@ -100,15 +100,13 @@ export interface DeploymentStatusDetailsBreakdownDataType {
100100

101101
export interface DeploymentStatusDetailBreakdownType {
102102
deploymentStatusDetailsBreakdownData: DeploymentStatusDetailsBreakdownDataType
103-
streamData?: AppStreamData
104103
isVirtualEnvironment?: boolean
105104
}
106105

107106
export interface DeploymentStatusDetailModalType {
108107
appName: string
109108
environmentName: string
110109
deploymentStatusDetailsBreakdownData: DeploymentStatusDetailsBreakdownDataType
111-
streamData: AppStreamData
112110
isVirtualEnvironment: boolean
113111
/**
114112
* Loading state for the timeline data
@@ -139,7 +137,6 @@ export interface DeploymentStatusDetailRowType {
139137
type: string
140138
hideVerticalConnector?: boolean
141139
deploymentDetailedData: DeploymentStatusDetailsBreakdownDataType
142-
streamData?: AppStreamData
143140
}
144141

145142
export interface ErrorInfoStatusBarType {
@@ -213,7 +210,6 @@ export interface DeploymentStatusCardType {
213210
}
214211

215212
export interface IssuesCardType {
216-
appStreamData?: AppStreamData
217213
cardLoading?: boolean
218214
setErrorsList: React.Dispatch<React.SetStateAction<ErrorItem[]>>
219215
toggleIssuesModal?: React.Dispatch<React.SetStateAction<boolean>>

‎src/components/app/details/cdDetails/DeploymentDetailSteps.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export default function DeploymentDetailSteps({
143143
)}
144144
<DeploymentStatusDetailBreakdown
145145
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
146-
streamData={null}
147146
isVirtualEnvironment={isVirtualEnv.current}
148147
/>
149148
</div>

‎src/components/app/types.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ export interface TagChipsContainerType {
520520
}
521521
export interface SourceInfoType {
522522
appDetails: AppDetails
523-
appStreamData?: AppStreamData
524523
setDetailed?: React.Dispatch<React.SetStateAction<boolean>>
525524
environment: AppEnvironment
526525
environments: AppEnvironment[]

‎src/components/v2/appDetails/AppDetails.component.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react'
22
import './appDetails.scss'
33
import { useLocation, useParams } from 'react-router'
44
import { DeploymentAppTypes, Progressing } from '@devtron-labs/devtron-fe-common-lib'
5-
import { AppDetailsComponentType, AppStreamData, AppType } from './appDetails.type'
5+
import { AppDetailsComponentType, AppType } from './appDetails.type'
66
import IndexStore from './index.store'
77
import EnvironmentStatusComponent from './sourceInfo/environmentStatus/EnvironmentStatus.component'
88
import EnvironmentSelectorComponent from './sourceInfo/EnvironmentSelector.component'
@@ -39,7 +39,6 @@ const AppDetailsComponent = ({
3939
loadingResourceTree,
4040
}: AppDetailsComponentType) => {
4141
const params = useParams<{ appId: string; envId: string; nodeType: string }>()
42-
const [streamData] = useState<AppStreamData>(null)
4342
const [appDetails] = useSharedState(IndexStore.getAppDetails(), IndexStore.getAppDetailsObservable())
4443
const isVirtualEnv = useRef(appDetails?.isVirtualEnvironment)
4544
const location = useLocation()
@@ -174,7 +173,6 @@ const AppDetailsComponent = ({
174173
/>
175174
{!appDetails.deploymentAppDeleteRequest && (
176175
<EnvironmentStatusComponent
177-
appStreamData={streamData}
178176
loadingDetails={loadingDetails || !appDetails?.appType}
179177
loadingResourceTree={loadingResourceTree || !appDetails?.appType}
180178
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
@@ -204,7 +202,6 @@ const AppDetailsComponent = ({
204202
<DeploymentStatusDetailModal
205203
appName={appDetails.appName}
206204
environmentName={appDetails.environmentName}
207-
streamData={streamData}
208205
deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
209206
isVirtualEnvironment={isVirtualEnv.current}
210207
isLoading={isInitialTimelineDataLoading}

0 commit comments

Comments
 (0)