Skip to content

fix: External nodes widget does not work #3854

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

Merged
mrCherry97 merged 6 commits into from
Apr 16, 2025
Merged

fix: External nodes widget does not work #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e9e366
Duplicate key fixed
KonradPietocha Apr 9, 2025
98a11a4
Merge branch 'main' into external-nodes-widget-does-not-work
KonradPietocha Apr 10, 2025
491644c
Merge branch 'main' into external-nodes-widget-does-not-work
KonradPietocha Apr 11, 2025
6e6266b
Correct url for all namespaces
KonradPietocha Apr 11, 2025
86d59a9
Assign all namespace when there is no certain given
KonradPietocha Apr 14, 2025
917c1c3
Merge branch 'main' into external-nodes-widget-does-not-work
KonradPietocha Apr 14, 2025
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
5 changes: 4 additions & 1 deletion src/components/Extensibility/contexts/DataSources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ export const DataSourcesContextProvider: FC<Props> = ({
}

const apiGroup = group ? `apis/${group}` : 'api';
let url = `/${apiGroup}/${version}${namespacePart}/${resourceType}`;
let url =
namespace === '-all-'
? `/${apiGroup}/${version}/${resourceType}`
: `/${apiGroup}/${version}${namespacePart}/${resourceType}`;
if (labelSelector) {
url += labelSelector;
} else if (name) {
Expand Down
27 changes: 24 additions & 3 deletions src/sidebar/CategoryItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import { isSidebarCondensedState } from 'state/preferences/isSidebarCondensedAto

import { ExpandedCategories } from 'state/navigation/expandedCategories/expandedCategoriesAtom';
import { NavItem } from './NavItem';
import { DataSourcesContextProvider } from 'components/Extensibility/contexts/DataSources';
import {
DataSources,
DataSourcesContextProvider,
} from 'components/Extensibility/contexts/DataSources';
import { cloneDeep } from 'lodash';

type CategoryItemProps = {
category: Category;
Expand All @@ -30,6 +34,7 @@ export function CategoryItem({

if (!isSidebarCondensed) {
if (categoryName === e.target.parentElement?.getAttribute('text')) {
return;
} else if (expanded) {
handleExpandedCategories(
expandedCategories.filter(el => el !== category.key),
Expand All @@ -40,10 +45,26 @@ export function CategoryItem({
}
};

const handleEmptyNamespace = (dataSources: DataSources) => {
// Some data is available only on a certain namespace. If we don't have a given namespace, we can still get it on all namespaces.
let clonedDataSources = cloneDeep(dataSources);
Object.keys(clonedDataSources).forEach(key => {
if (clonedDataSources?.[key]?.resource) {
clonedDataSources[key].resource = {
...clonedDataSources[key]?.resource,
namespace: clonedDataSources[key]?.resource?.namespace ?? '-all-',
};
}
});
return clonedDataSources;
};

const children = category.items?.map((nn, index) => (
<React.Fragment key={index}>
<React.Fragment key={`${nn.pathSegment}-${index}`}>
{nn.dataSources ? (
<DataSourcesContextProvider dataSources={nn.dataSources}>
<DataSourcesContextProvider
dataSources={handleEmptyNamespace(nn.dataSources)}
>
<NavItem node={nn} key={nn.pathSegment} subItem={true} />
</DataSourcesContextProvider>
) : (
Expand Down
Loading