show a default sidebar for resources which doesn't have sidebar

openshift · Aug 20, 2021 · ad85bf9 · ad85bf9
1 parent 0a20908
commit ad85bf9
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 31 deletions.
diff --git a/frontend/packages/topology/src/components/side-bar/TopologyResourcePanel.tsx b/frontend/packages/topology/src/components/side-bar/TopologyResourcePanel.tsx
@@ -1,7 +1,9 @@
 import * as React from 'react';
 import { GraphElement } from '@patternfly/react-topology';
 import * as _ from 'lodash';
+import { ResourceOverviewPage } from '@console/internal/components/overview/resource-overview-page';
 import KnativeResourceOverviewPage from '@console/knative-plugin/src/components/overview/KnativeResourceOverviewPage';
+import { TYPE_WORKLOAD } from '../../const';
 import TopologySideBarContent from './TopologySideBarContent';
 
 type TopologyResourcePanelProps = {
@@ -10,14 +12,21 @@ type TopologyResourcePanelProps = {
 
 const TopologyResourcePanel: React.FC<TopologyResourcePanelProps> = ({ element }) => {
   const item = element.getData();
-
+  const resourceItemToShowOnSideBar = item && item.resources;
   // adds extra check, custom sidebar for all knative resources excluding deployment
   const itemKind = item?.resource?.kind ?? null;
   if (_.get(item, 'data.isKnativeResource', false) && itemKind && itemKind !== 'Deployment') {
     return <KnativeResourceOverviewPage item={item.resources} />;
   }
-
-  return <TopologySideBarContent element={element} />;
+  if (element.getType() === TYPE_WORKLOAD) return <TopologySideBarContent element={element} />;
+  return (
+    resourceItemToShowOnSideBar && (
+      <ResourceOverviewPage
+        item={resourceItemToShowOnSideBar}
+        kind={resourceItemToShowOnSideBar.obj.kind}
+      />
+    )
+  );
 };
 
 export default TopologyResourcePanel;
diff --git a/frontend/packages/topology/src/components/side-bar/providers/useDetailsResourceLink.tsx b/frontend/packages/topology/src/components/side-bar/providers/useDetailsResourceLink.tsx
@@ -17,7 +17,7 @@ export const useDetailsResourceLink = (
       ? resurceLinkExtension
           .sort((a, b) => a.properties.priority - b.properties.priority)
           .find(({ properties: { link } }) => !!link(element))
-          .properties?.link?.(element)
+          ?.properties?.link?.(element)
       : null;
   }, [resurceLinkExtension, resolved, element]);
   return resourceLink;

diff --git a/frontend/public/components/overview/resource-overview-page.tsx b/frontend/public/components/overview/resource-overview-page.tsx
@@ -8,16 +8,18 @@ import {
   usePluginsOverviewTabSection,
   useBuildConfigsWatcher,
 } from '@console/shared';
+import { K8sKind } from '@console/dynamic-plugin-sdk';
 import { connectToModel } from '../../kinds';
 import { modelFor, referenceFor, referenceForModel } from '../../module/k8s';
-import { AsyncComponent, Kebab, ResourceOverviewHeading, ResourceSummary } from '../utils';
-
+import { AsyncComponent, Kebab, KebabAction, ResourceSummary } from '../utils';
 import { BuildOverview } from './build-overview';
 import { HPAOverview } from './hpa-overview';
 import { NetworkingOverview } from './networking-overview';
 import { PodsOverview } from './pods-overview';
 import { resourceOverviewPages } from './resource-overview-pages';
 import { ManagedByOperatorLink } from '../utils/managed-by';
+import { useTranslation } from 'react-i18next';
+import { ResourceOverviewDetails } from './resource-overview-details';
 
 const { common } = Kebab.factory;
 
@@ -42,40 +44,53 @@ export const OverviewDetailsResourcesTab: React.SFC<OverviewDetailsResourcesTabP
   );
 };
 
-export const DefaultOverviewPage = connectToModel(
-  ({ kindObj: kindObject, item, customActions }) => {
-    if (!kindObject && !item?.obj) {
-      return null;
-    }
-    const resourceModel = kindObject || modelFor(referenceFor(item.obj));
-    return (
-      <div className="overview__sidebar-pane resource-overview">
-        <ResourceOverviewHeading
-          actions={[
-            ...(customActions ? customActions : []),
-            ...Kebab.getExtensionsActionsForKind(resourceModel),
-            ...common,
-          ]}
-          kindObj={resourceModel}
-          resources={item}
-        />
-        <div className="overview__sidebar-pane-body resource-overview__body">
-          <div className="resource-overview__summary">
-            <ResourceSummary resource={item.obj} />
-          </div>
+export const DefaultOverviewPage: React.FC<{ item: OverviewItem }> = ({ item }) => {
+  return (
+    <div className="overview__sidebar-pane resource-overview">
+      <div className="overview__sidebar-pane-body resource-overview__body">
+        <div className="resource-overview__summary">
+          <ResourceSummary resource={item.obj} />
         </div>
       </div>
-    );
-  },
-);
+    </div>
+  );
+};
+
+const DefaultSideBar: React.FC<{
+  kindObj: K8sKind;
+  item: OverviewItem;
+  customActions?: KebabAction[];
+}> = ({ kindObj, item, customActions }) => {
+  const { t } = useTranslation();
+
+  const tabs = [
+    {
+      name: t('public~Details'),
+      component: DefaultOverviewPage,
+    },
+  ];
+  const menuActions = [
+    ...(customActions ? customActions : []),
+    ...Kebab.getExtensionsActionsForKind(kindObj),
+    ...common,
+  ];
+  return (
+    <ResourceOverviewDetails
+      item={item}
+      kindObj={kindObj}
+      menuActions={customActions ? [...customActions, ...menuActions] : menuActions}
+      tabs={tabs}
+    />
+  );
+};
 
 export const ResourceOverviewPage = connectToModel(({ kindObj, item, customActions }) => {
   if (!kindObj && !item?.obj) {
     return null;
   }
   const resourceModel = kindObj || modelFor(referenceFor(item.obj));
   const ref = referenceForModel(resourceModel);
-  const loader = resourceOverviewPages.get(ref, () => Promise.resolve(DefaultOverviewPage));
+  const loader = resourceOverviewPages.get(ref, () => Promise.resolve(DefaultSideBar));
   return (
     <AsyncComponent
       loader={loader}