add owner section in resource tab for operator backed services

openshift · Jan 24, 2020 · fa97c2b · fa97c2b
1 parent 1c774e6
commit fa97c2b
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 3 deletions.
diff --git a/frontend/packages/console-shared/src/types/resource.ts b/frontend/packages/console-shared/src/types/resource.ts
@@ -22,6 +22,7 @@ export type OverviewItem<T = K8sResourceKind> = {
   ksservices?: K8sResourceKind[];
   revisions?: K8sResourceKind[];
   events?: EventKind[];
+  isOperatorBackedService?: boolean;
 };
 
 export type DeploymentStrategy = DEPLOYMENT_STRATEGY.recreate | DEPLOYMENT_STRATEGY.rolling;
diff --git a/...s/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap b/...s/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap
@@ -383,6 +383,7 @@ Object {
           "revision": undefined,
         },
         "events": undefined,
+        "isOperatorBackedService": false,
         "isRollingOut": undefined,
         "obj": Object {
           "apiVersion": "apps.openshift.io/v1",
@@ -1244,6 +1245,7 @@ Object {
           "revision": 1,
         },
         "events": undefined,
+        "isOperatorBackedService": false,
         "isRollingOut": false,
         "obj": Object {
           "apiVersion": "apps/v1",
@@ -2216,6 +2218,7 @@ Object {
           "revision": 1,
         },
         "events": undefined,
+        "isOperatorBackedService": false,
         "isRollingOut": false,
         "obj": Object {
           "apiVersion": "apps/v1",
@@ -2645,6 +2648,7 @@ Object {
         "buildConfigs": Array [],
         "current": undefined,
         "events": undefined,
+        "isOperatorBackedService": true,
         "isRollingOut": false,
         "obj": Object {
           "apiVersion": "apps/v1",

diff --git a/frontend/packages/dev-console/src/components/topology/topology-utils.ts b/frontend/packages/dev-console/src/components/topology/topology-utils.ts
@@ -161,7 +161,7 @@ export const createTopologyNodeData = (
     name:
       _.get(deploymentConfig, 'metadata.name') || deploymentsLabels['app.kubernetes.io/instance'],
     type: type || 'workload',
-    resources: { ...dc },
+    resources: { ...dc, isOperatorBackedService: operatorBackedService },
     pods: dc.pods,
     operatorBackedService,
     data: {

diff --git a/...nd/packages/knative-plugin/src/components/overview/OverviewDetailsKnativeResourcesTab.tsx b/...nd/packages/knative-plugin/src/components/overview/OverviewDetailsKnativeResourcesTab.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { K8sResourceKind } from '@console/internal/module/k8s';
 import { OverviewItem } from '@console/shared';
+import OperatorBackedOwnerReferences from '@console/internal/components/utils';
 import {
   RevisionModel,
   ServiceModel,
@@ -45,6 +46,11 @@ const getSidebarResources = ({ obj, ksroutes, revisions, configurations }: Overv
 };
 const OverviewDetailsKnativeResourcesTab: React.FC<OverviewDetailsResourcesTabProps> = ({
   item,
-}) => <div className="overview__sidebar-pane-body"> {getSidebarResources(item)} </div>;
+}) => (
+  <div className="overview__sidebar-pane-body">
+    <OperatorBackedOwnerReferences item={item} />
+    {getSidebarResources(item)}
+  </div>
+);
 
 export default OverviewDetailsKnativeResourcesTab;
diff --git a/...tive-plugin/src/components/overview/__tests__/OverviewDetailsKnativeResourcesTab.spec.tsx b/...tive-plugin/src/components/overview/__tests__/OverviewDetailsKnativeResourcesTab.spec.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { shallow } from 'enzyme';
 import { MockKnativeResources } from '@console/dev-console/src/components/topology/__tests__/topology-knative-test-data';
+import OperatorBackedOwnerReferences from '@console/internal/components/utils';
 import OverviewDetailsKnativeResourcesTab from '../OverviewDetailsKnativeResourcesTab';
 import KnativeServiceResources from '../KnativeServiceResources';
 import KnativeRevisionResources from '../KnativeRevisionResources';
@@ -23,6 +24,7 @@ describe('OverviewDetailsKnativeResourcesTab', () => {
         buildConfigs: [],
         routes: [],
         services: [],
+        isOperatorBackedService: false,
       },
     };
   });
@@ -42,4 +44,15 @@ describe('OverviewDetailsKnativeResourcesTab', () => {
     const wrapper = shallow(<OverviewDetailsKnativeResourcesTab {...knItem} />);
     expect(wrapper.find(EventSinkServicesOverviewList)).toHaveLength(1);
   });
+
+  it('should render OperatorBackedOwnerReferences with proper props', () => {
+    const wrapper = shallow(<OverviewDetailsKnativeResourcesTab item={knItem.item} />);
+    expect(wrapper.find(OperatorBackedOwnerReferences)).toHaveLength(1);
+    expect(
+      wrapper
+        .find(OperatorBackedOwnerReferences)
+        .at(0)
+        .props().item,
+    ).toEqual(knItem.item);
+  });
 });
diff --git a/frontend/public/components/overview/_overview.scss b/frontend/public/components/overview/_overview.scss
@@ -105,3 +105,11 @@ $overview-sidebar-width: 550px;
   font-size: 14px;
   margin-left: var(--pf-global--spacer--sm);
 }
+
+.sidebar__section-owner-operator-heading {
+  display: flex;
+}
+
+.sidebar__section-owner-reference-operator {
+  padding-left: var(--pf-global--spacer--sm);
+}
diff --git a/frontend/public/components/overview/resource-overview-details.tsx b/frontend/public/components/overview/resource-overview-details.tsx
@@ -87,6 +87,7 @@ type OwnProps = {
     name: string;
     component: any;
   }[];
+  isOperatorBacked?: boolean;
 };
 
 export type ResourceOverviewDetailsProps = PropsFromState & PropsFromDispatch & OwnProps;
diff --git a/frontend/public/components/overview/resource-overview-page.tsx b/frontend/public/components/overview/resource-overview-page.tsx
@@ -2,7 +2,12 @@ import * as React from 'react';
 
 import { connectToModel } from '../../kinds';
 import { referenceForModel } from '../../module/k8s';
-import { AsyncComponent, Kebab, ResourceOverviewHeading, ResourceSummary } from '../utils';
+import OperatorBackedOwnerReferences, {
+  AsyncComponent,
+  Kebab,
+  ResourceOverviewHeading,
+  ResourceSummary,
+} from '../utils';
 
 import { BuildOverview } from './build-overview';
 import { NetworkingOverview } from './networking-overview';
@@ -34,6 +39,7 @@ export const OverviewDetailsResourcesTab: React.SFC<OverviewDetailsResourcesTabP
   const pluginComponents = getPluginTabSectionResource(item);
   return (
     <div className="overview__sidebar-pane-body">
+      <OperatorBackedOwnerReferences item={item} />
       <PodsOverview pods={pods} obj={obj} />
       <BuildOverview buildConfigs={buildConfigs} />
       {pluginComponents.map(({ Component, key }) => (

diff --git a/frontend/public/components/utils/index.tsx b/frontend/public/components/utils/index.tsx
@@ -56,6 +56,7 @@ export * from './skeleton-catalog';
 export * from './dom-utils';
 export * from './hint-block';
 export * from './owner-references';
+export { default } from './operator-backed-owner-references';
 export * from './field-level-help';
 export * from './details-item';
 export * from './types';
diff --git a/frontend/public/components/utils/operator-backed-owner-references.tsx b/frontend/public/components/utils/operator-backed-owner-references.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { OverviewItem } from '@console/shared';
+import { OwnerReferences } from './owner-references';
+
+const OperatorBackedOwnerReferences: React.FC<OperatorBackedOwnerReferencesProps> = ({ item }) => {
+  return item.isOperatorBackedService ? (
+    <span className="sidebar__section-owner-operator-heading">
+      Managed by:
+      <span className="sidebar__section-owner-reference-operator">
+        <OwnerReferences resource={item.obj} />
+      </span>
+    </span>
+  ) : null;
+};
+
+type OperatorBackedOwnerReferencesProps = {
+  item: OverviewItem;
+};
+
+OperatorBackedOwnerReferences.displayName = 'OperatorBackedOwnerReferences';
+
+export default OperatorBackedOwnerReferences;