Fixes #36924 - Added breadcrumb bar to the header of subscription det…

…ails pages. (#10801) Additionally, updated neccesary snapshots.
Katello · Nov 17, 2023 · db9e0c2 · db9e0c2
1 parent 9309d12
commit db9e0c2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js b/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js
@@ -59,24 +59,21 @@ class SubscriptionDetails extends Component {
 
     return (
       <div id="subscription-details">
-        {!subscriptionDetails.loading &&
-          <BreadcrumbsBar
-            onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
-            data={{
-              isSwitchable: true,
-              breadcrumbItems: [
-                {
-                  caption: __('Subscriptions'),
-                  onClick: () =>
-                    this.props.history.push('/subscriptions'),
-                },
-                {
-                  caption: String(subscriptionDetails.name || __('Subscription Details')),
-                },
-              ],
-              resource,
-            }}
-          />}
+        {!subscriptionDetails.loading && <BreadcrumbsBar
+          isLoadingResources={subscriptionDetails.loading}
+          onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
+          isSwitchable
+          breadcrumbItems={[
+            {
+              caption: __('Subscriptions'),
+              url: '/subscriptions/',
+            },
+            {
+              caption: String(subscriptionDetails.name || __('Subscription Details')),
+            },
+          ]}
+          resource={resource}
+        />}
 
         <TabContainer id="subscription-tabs-container" defaultActiveKey={1}>
           <div>

diff --git a/webpack/scenes/Subscriptions/Details/SubscriptionDetails.scss b/webpack/scenes/Subscriptions/Details/SubscriptionDetails.scss
@@ -1,4 +1,6 @@
 #subscription-details {
+  margin: 24px;
+
   .scrolld-list {
     max-height: 400px;
     overflow-y: auto;
@@ -8,4 +10,4 @@
     max-height: 20px;
     padding: 0;
   }
-}
+}
diff --git a/...ack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap b/...ack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap
@@ -5,26 +5,27 @@ exports[`subscriptions details page should render and contain appropiate compone
   id="subscription-details"
 >
   <BreadcrumbsBar
-    data={
-      Object {
-        "breadcrumbItems": Array [
-          Object {
-            "caption": "Subscriptions",
-            "onClick": [Function],
-          },
-          Object {
-            "caption": "OpenShift Employee Subscription",
-          },
-        ],
-        "isSwitchable": true,
-        "resource": Object {
-          "nameField": "name",
-          "resourceUrl": "/katello/api/v2/organizations/1/subscriptions",
-          "switcherItemUrl": "/subscriptions/:id",
+    breadcrumbItems={
+      Array [
+        Object {
+          "caption": "Subscriptions",
+          "url": "/subscriptions/",
         },
-      }
+        Object {
+          "caption": "OpenShift Employee Subscription",
+        },
+      ]
     }
+    isLoadingResources={false}
+    isSwitchable={true}
     onSwitcherItemClick={[Function]}
+    resource={
+      Object {
+        "nameField": "name",
+        "resourceUrl": "/katello/api/v2/organizations/1/subscriptions",
+        "switcherItemUrl": "/subscriptions/:id",
+      }
+    }
   />
   <ForwardRef
     defaultActiveKey={1}