Merge branch 'main' of github.com:kyma-project/busola into fix-acc-column-layout

Author: OliwiaGowor

.github/pull-request-template.md

@@ -27,6 +27,7 @@ Changes proposed in this pull request:
   - docs: Documentation only changes
   - refactor: A code change that neither fixes a bug nor adds a feature
   - test: Adding tests
+  - revert: Revert commit
   - chore: Maintainance changes to the build process or auxiliary tools, libraries, workflows, etc.
 - [ ] Related issues are linked. To link internal trackers, use the issue IDs like `backlog#4567`
 - [ ] Explain clearly why you created the PR and what changes it introduces

.github/workflows/pr-title-check.yml

@@ -1,6 +1,6 @@
 name: PR Title Check
 
-on: 
+on:
   pull_request:
     types: [opened, edited, synchronize, reopened, ready_for_review]
 
@@ -19,5 +19,6 @@ jobs:
             refactor
             test
             chore
+            revert
           requireScope: false
           subjectPattern: ^([A-Z].*[^.]|bump .*)$

src/components/CustomResources/CustomResources.js

@@ -19,7 +19,7 @@ export function CustomResources({
 }) {
   const { group, names } = crd.spec;
   const name = names.plural;
-  const customUrl = useCustomResourceUrl(crd);
+  const customUrl = useCustomResourceUrl(crd, true);
   const { namespace } = useUrl();
   const resourceUrl =
     namespace && namespace !== '-all-'

src/resources/CustomResourceDefinitions/CRCreate.js

@@ -28,11 +28,16 @@ function CRCreate({
   const [initialResource] = useState(
     initialCustomResource || createTemplate(crd),
   );
-  const customUrl = useCustomResourceUrl(crd);
+  const currUrl = window.location.href;
+
+  const customUrl = useCustomResourceUrl(
+    crd,
+    currUrl.includes('customresources/'),
+  );
 
   const navigate = useNavigate();
   const { nextQuery, currentQuery } = usePrepareLayout(layoutNumber);
-  const goToLayoutQuery = customUrl(cr)?.includes('customresources/')
+  const goToLayoutQuery = customUrl(cr).includes('customresources/')
     ? nextQuery
     : currentQuery;
 

src/resources/CustomResourceDefinitions/useCustomResourceUrl.js

@@ -3,8 +3,8 @@ import { useRecoilValue } from 'recoil';
 import { allNodesSelector } from 'state/navigation/allNodesSelector';
 import { useUrl } from 'hooks/useUrl';
 
-export function useCustomResourceUrl(crd) {
-  const { clusterUrl, namespaceUrl } = useUrl();
+export function useCustomResourceUrl(crd, columnLayout = false) {
+  const { resourceUrl, clusterUrl, namespaceUrl } = useUrl();
   const clusterNodes = useRecoilValue(allNodesSelector).filter(
     node => !node.namespaced,
   );
@@ -22,10 +22,14 @@ export function useCustomResourceUrl(crd) {
     );
 
     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 if (namespaceNode) {
+    } else {
       return namespaceUrl(
         `customresources/${crd.metadata.name}/${cr.metadata.name}`,
         { namespace: cr.metadata.namespace },