From 2959e01d1e0455926db2799b189bd11bccb808b4 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 17 Feb 2023 03:55:17 -0800 Subject: [PATCH 01/13] Add support for specifying orderNumber for ClusterPageMenus (#7166) Signed-off-by: Sebastian Malton --- ...ab-navigation-for-extensions.test.tsx.snap | 494 ++++++++++++++++++ ...and-tab-navigation-for-extensions.test.tsx | 137 ++++- .../components/layout/cluster-page-menu.ts | 1 + ...on-sidebar-item-registrator.injectable.tsx | 2 +- 4 files changed, 627 insertions(+), 7 deletions(-) diff --git a/packages/core/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/packages/core/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap index 0936bd6264..3ad0ba73e9 100644 --- a/packages/core/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap +++ b/packages/core/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap @@ -4507,3 +4507,497 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit `; + +exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus with explicit 'orderNumber' given no state for expanded sidebar items exists, and navigated to child sidebar item, when rendered renders 1`] = ` +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
- some-namespace + + some-namespace +
@@ -1306,7 +1314,11 @@ exports[`disable kube object detail items when cluster is not relevant given not - some-namespace + + some-namespace +
diff --git a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap index 9222e8a538..a1c528bf78 100644 --- a/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap +++ b/packages/core/src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap @@ -79,7 +79,11 @@ exports[`reactively hide kube object detail item renders 1`] = ` - some-namespace + + some-namespace +
@@ -690,7 +694,11 @@ exports[`reactively hide kube object detail item when the item is shown renders - some-namespace + + some-namespace +
{ +const NonInjectedKubeObjectMeta = observer(( + { + apiManager, + getDetailsUrl, + object, + hideFields = [ + "uid", + "resourceVersion", + "selfLink", + ], + logger, + namespaceApi, + } + : Dependencies & KubeObjectMetaProps) => { if (!object) { return null; } @@ -59,6 +65,10 @@ const NonInjectedKubeObjectMeta = observer(({ getFinalizers, getId, getName, metadata: { creationTimestamp }, } = object; const ownerRefs = object.getOwnerRefs(); + const namespace = getNs(); + const namespaceDetailsUrl = namespace ? getDetailsUrl( + namespaceApi.formatUrlForNotListing({ name: namespace }), + ) : ""; return ( <> @@ -71,8 +81,8 @@ const NonInjectedKubeObjectMeta = observer(({ {getName()} -