Skip to content

fix: Use correct paths for cluster urls #3652

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 11 commits into from
Feb 4, 2025
Merged

fix: Use correct paths for cluster urls #3652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
71e46e7
use correct paths
dbadura Jan 31, 2025
a73c398
remove unused vars
dbadura Jan 31, 2025
e43aaca
Correct test
KonradPietocha Feb 3, 2025
350363e
Correct test
KonradPietocha Feb 3, 2025
06de874
Correct test
KonradPietocha Feb 3, 2025
5f7f079
Correct test
KonradPietocha Feb 3, 2025
6c0229b
Correct test
KonradPietocha Feb 3, 2025
c521c28
Correct test
KonradPietocha Feb 3, 2025
586574a
Back to previous
KonradPietocha Feb 3, 2025
0cbc3ef
Correct test
KonradPietocha Feb 4, 2025
563acb0
Correct test
KonradPietocha Feb 4, 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
2 changes: 1 addition & 1 deletion src/components/CustomResources/CustomResources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function CustomResources({
}) {
const { group, names } = crd.spec;
const name = names.plural;
const customUrl = useCustomResourceUrl(crd, true);
const customUrl = useCustomResourceUrl(crd);
const { namespace } = useUrl();
const resourceUrl =
namespace && namespace !== '-all-'
Expand Down
9 changes: 2 additions & 7 deletions src/resources/CustomResourceDefinitions/CRCreate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,11 @@ function CRCreate({
const [initialResource] = useState(
initialCustomResource || createTemplate(crd),
);
const currUrl = window.location.href;

const customUrl = useCustomResourceUrl(
crd,
currUrl.includes('customresources/'),
);
const customUrl = useCustomResourceUrl(crd);

const navigate = useNavigate();
const { nextQuery, currentQuery } = usePrepareLayout(layoutNumber);
const goToLayoutQuery = customUrl(cr).includes('customresources/')
const goToLayoutQuery = customUrl(cr)?.includes('customresources/')
? nextQuery
: currentQuery;

Expand Down
10 changes: 3 additions & 7 deletions src/resources/CustomResourceDefinitions/useCustomResourceUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useRecoilValue } from 'recoil';
import { allNodesSelector } from 'state/navigation/allNodesSelector';
import { useUrl } from 'hooks/useUrl';

export function useCustomResourceUrl(crd, columnLayout = false) {
const { resourceUrl, clusterUrl, namespaceUrl } = useUrl();
export function useCustomResourceUrl(crd) {
const { clusterUrl, namespaceUrl } = useUrl();
const clusterNodes = useRecoilValue(allNodesSelector).filter(
node => !node.namespaced,
);
Expand All @@ -22,14 +22,10 @@ export function useCustomResourceUrl(crd, columnLayout = false) {
);

if (clusterNode) {
return resourceUrl(cr, { resourceType: clusterNode.pathSegment });
} else if (namespaceNode && !columnLayout) {
return resourceUrl(cr, { resourceType: namespaceNode.pathSegment });
} else if (crd.spec.scope === 'Cluster') {
return clusterUrl(
`customresources/${crd.metadata.name}/${cr.metadata.name}`,
);
} else {
} else if (namespaceNode) {
return namespaceUrl(
`customresources/${crd.metadata.name}/${cr.metadata.name}`,
{ namespace: cr.metadata.namespace },
Expand Down
Loading