Skip to content

fix(ui): prevent crash when deleting ReplicaSet from grouped list #26167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
choejwoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ui): prevent crash when deleting ReplicaSet from grouped list #26167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions ui/src/app/applications/components/application-details/application-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import * as AppUtils from '../utils';
import {ApplicationResourceList} from './application-resource-list';
import {Filters, FiltersProps} from './application-resource-filter';
import {getAppDefaultSource, getAppCurrentVersion, urlPattern} from '../utils';
import {ChartDetails, OCIMetadata, ResourceStatus} from '../../../shared/models';
import {ChartDetails, OCIMetadata} from '../../../shared/models';
import {ApplicationsDetailsAppDropdown} from './application-details-app-dropdown';
import {useSidebarTarget} from '../../../sidebar/sidebar';

Expand All @@ -35,7 +35,7 @@ import {ApplicationHydrateOperationState} from '../application-hydrate-operation
interface ApplicationDetailsState {
page: number;
revision?: string; // Which type of revision panelto show SYNC_STATUS_REVISION or OPERATION_STATE_REVISION
groupedResources?: ResourceStatus[];
groupedResourceIds?: string[];
slidingPanelPage?: number;
filteredGraph?: any[];
truncateNameOnRight?: boolean;
Expand Down Expand Up @@ -103,7 +103,7 @@ export const ApplicationDetails: FC<RouteComponentProps<{appnamespace: string; n

const [state, setState] = useState<ApplicationDetailsState>(() => ({
page: 0,
groupedResources: [],
groupedResourceIds: [],
slidingPanelPage: 0,
filteredGraph: [],
truncateNameOnRight: false,
Expand Down Expand Up @@ -193,7 +193,7 @@ export const ApplicationDetails: FC<RouteComponentProps<{appnamespace: string; n
const closeGroupedNodesPanel = useCallback(() => {
setState(prevState => ({
...prevState,
groupedResources: [],
groupedResourceIds: [],
slidingPanelPage: 0
}));
}, []);
Expand Down Expand Up @@ -691,18 +691,20 @@ Are you sure you want to disable auto-sync and rollback application '${props.mat
return resourcesRef;
};

const filteredRes = resourceNodes().filter(res => {
const allResources = resourceNodes();
const filteredRes = allResources.filter(res => {
const resNode: ResourceTreeNode = {...res, root: null, info: null, parentRefs: [], resourceVersion: '', uid: ''};
resNode.root = resNode;
return filterTreeNode(resNode, treeFilter);
});
const groupedResources = state.groupedResourceIds?.length
? allResources.filter(res => state.groupedResourceIds.includes(res.uid) || state.groupedResourceIds.includes(AppUtils.nodeKey(res)))
: [];
const openGroupNodeDetails = (groupdedNodeIds: string[]) => {
const resources = resourceNodes();
setState(prevState => ({
...prevState,
groupedResources: groupdedNodeIds
? resources.filter(res => groupdedNodeIds.includes(res.uid) || groupdedNodeIds.includes(AppUtils.nodeKey(res)))
: []
groupedResourceIds: groupdedNodeIds || [],
slidingPanelPage: 0
}));
};
const {Tree, Pods, Network, List} = AppsDetailsViewKey;
Expand Down Expand Up @@ -1040,11 +1042,11 @@ Are you sure you want to disable auto-sync and rollback application '${props.mat
)}
</div>
</div>
<SlidingPanel isShown={state.groupedResources.length > 0} onClose={() => closeGroupedNodesPanel()}>
<SlidingPanel isShown={groupedResources.length > 0} onClose={() => closeGroupedNodesPanel()}>
<div className='application-details__sliding-panel-pagination-wrap'>
<Paginate
page={state.slidingPanelPage}
data={state.groupedResources}
data={groupedResources}
onPageChange={page => setState(prevState => ({...prevState, slidingPanelPage: page}))}
preferencesKey='grouped-nodes-details'>
{data => (
Expand Down Expand Up @@ -1072,6 +1074,7 @@ Are you sure you want to disable auto-sync and rollback application '${props.mat
selectedNode={selectedNode}
appCxt={{...appContext, apis: appContext} as unknown as AppContext}
tab={tab}
appChanged={appChanged.current}
/>
</SlidingPanel>
<ApplicationSyncPanel
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/applications/components/application-details/application-resource-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export const ApplicationResourceList = (props: ApplicationResourceListProps) =>
</Tooltip>
{isSameKind &&
res.kind === 'ReplicaSet' &&
((nodeByKey.get(nodeKey(res)) as ResourceNode).info || [])
(((nodeByKey.get(nodeKey(res)) as ResourceNode | undefined)?.info || (res as unknown as ResourceNode).info || []) as models.InfoItem[])
.filter(tag => !tag.name.includes('Node'))
.slice(0, 4)
.map((tag, i) => {
Expand Down
4 changes: 3 additions & 1 deletion ui/src/app/applications/components/resource-details/resource-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {DataLoader, DropDown, Tab, Tabs} from 'argo-ui';
import * as React from 'react';
import {useState} from 'react';
import {BehaviorSubject} from 'rxjs';
import {EventsList, YamlEditor} from '../../../shared/components';
import * as models from '../../../shared/models';
import {ErrorBoundary} from '../../../shared/components/error-boundary/error-boundary';
Expand Down Expand Up @@ -32,6 +33,7 @@ interface ResourceDetailsProps {
tree: ApplicationTree;
tab?: string;
appCxt: AppContext;
appChanged?: BehaviorSubject<any>;
}

export const ResourceDetails = (props: ResourceDetailsProps) => {
Expand Down Expand Up @@ -308,7 +310,7 @@ export const ResourceDetails = (props: ResourceDetailsProps) => {
<i className='fa fa-sync-alt' /> <span className='show-for-large'>SYNC</span>
</button>
<button
onClick={() => AppUtils.deletePopup(appContext, selectedNode, application, !!data.controlledState, data.childResources)}
onClick={() => AppUtils.deletePopup(appContext, selectedNode, application, !!data.controlledState, data.childResources, props.appChanged)}
style={{marginRight: '5px'}}
className='argo-button argo-button--base'>
<i className='fa fa-trash' /> <span className='show-for-large'>DELETE</span>
Expand Down
Loading