Skip to content
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

Jump to bottom

[release-4.9] Bug 2047350: Fix TypeError when application has HelmRelease #10990

Merged
merged 2 commits into from Feb 10, 2022
Merged

[release-4.9] Bug 2047350: Fix TypeError when application has HelmRelease #10990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05533cc
Fix TypeError when application has HelmRelease
vikram-raj Dec 27, 2021
b2a3ee2
Fix error when selecting an application with just an Helm Release
jerolimov Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions frontend/packages/topology/src/actions/groupActions.ts
View file
Open in desktop
Expand Up @@ -32,7 +32,10 @@ const cleanUpWorkloadNode = async (workload: OdcNodeModel): Promise<K8sResourceK
const deleteGroup = (application: TopologyApplicationObject) => {
// accessReview needs a resource but group is not a k8s resource,
// so currently picking the first resource to do the rbac checks (might change in future)
const primaryResource = application.resources[0].resource;
const primaryResource = application.resources?.find((node) => node.resource)?.resource;
if (!primaryResource) {
return null;
}
const resourceModel = modelFor(primaryResource.kind)
? modelFor(primaryResource.kind)
: modelFor(referenceFor(primaryResource));
Expand Down Expand Up @@ -62,7 +65,10 @@ const addResourcesMenu = (
application: TopologyApplicationObject,
connectorSource?: Node,
) => {
const primaryResource = application.resources[0].resource;
const primaryResource = application.resources?.find((node) => node.resource)?.resource;
if (!primaryResource) {
return [];
}
const connectorSourceObj = getResource(connectorSource) || {};
let resourceMenu: MenuOptions = addGroupResourceMenu;
resourceMenu = getKnativeContextMenuAction(graphData, resourceMenu, connectorSource, true);
Expand Down Expand Up @@ -95,6 +101,7 @@ export const groupActions = (
application: TopologyApplicationObject,
connectorSource?: Node,
): KebabOption[] => {
const deleteItem = deleteGroup(application);
const addItems = graphData ? addResourcesMenu(graphData, application, connectorSource) : [];
return !connectorSource ? [deleteGroup(application), ...addItems] : addItems;
return !connectorSource && deleteItem ? [deleteItem, ...addItems] : addItems;
};
4 changes: 3 additions & 1 deletion frontend/packages/topology/src/components/application-panel/TopologyApplicationResources.tsx
View file
Open in desktop
Expand Up @@ -19,7 +19,9 @@ const TopologyApplicationResources: React.FC<TopologyApplicationResourcesProps>
}) => {
const { t } = useTranslation();
const resourcesData = resources.reduce((acc, { resource }) => {
acc[resource.kind] = [...(acc[resource.kind] ? acc[resource.kind] : []), resource];
if (resource?.kind) {
acc[resource.kind] = [...(acc[resource.kind] ? acc[resource.kind] : []), resource];
}
return acc;
}, {});

Expand Down