Added feature gate for CSV Actions in Installed Operators

openshift · Mar 5, 2020 · d047b3b · d047b3b
1 parent d98fd56
commit d047b3b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/src/plugin.ts b/frontend/packages/ceph-storage-plugin/src/plugin.ts
@@ -224,6 +224,7 @@ const plugin: Plugin<ConsumedExtensions> = [
             throw e;
           });
       },
+      disallowed: [OCS_INDEPENDENT_FLAG],
     },
   },
   // Download External Cluster Metadata
@@ -238,6 +239,7 @@ const plugin: Plugin<ConsumedExtensions> = [
         import(
           './components/converged-credentials/credentials' /* webpackChunkName: "ceph-storage-export-credentials" */
         ).then((m) => m.default({})),
+      disallowed: [OCS_INDEPENDENT_FLAG],
     },
   },
   // Independent mode dashboard

diff --git a/frontend/packages/console-plugin-sdk/src/typings/clusterserviceversions.ts b/frontend/packages/console-plugin-sdk/src/typings/clusterserviceversions.ts
@@ -11,6 +11,8 @@ namespace ExtensionProperties {
     apiGroup: string;
     /** action callback */
     callback: (kind: K8sResourceKindReference, obj: any) => () => any;
+    required?: string | string[];
+    disallowed?: string | string[];
   }
 }
 

diff --git a/frontend/packages/operator-lifecycle-manager/src/components/operand.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/operand.spec.tsx
@@ -264,6 +264,7 @@ describe(OperandDetailsPage.displayName, () => {
       <OperandDetailsPage.WrappedComponent
         modelRef={referenceFor(testResourceInstance)}
         match={match}
+        flags={{}}
       />,
     );
   });

diff --git a/frontend/packages/operator-lifecycle-manager/src/components/operand.tsx b/frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { match } from 'react-router-dom';
 import * as _ from 'lodash';
 import { connect } from 'react-redux';
+import { compose } from 'redux';
 import * as classNames from 'classnames';
 import { sortable } from '@patternfly/react-table';
 import { Status, SuccessStatus } from '@console/shared';
@@ -54,6 +55,7 @@ import { SpecDescriptor } from './descriptors/spec';
 import { StatusCapability, Descriptor } from './descriptors/types';
 import { Resources } from './k8s-resource';
 import { referenceForProvidedAPI, OperandLink } from './index';
+import { FlagsObject, connectToFlags, WithFlagsProps } from '@console/internal/reducers/features';
 
 const csvName = () =>
   window.location.pathname
@@ -64,9 +66,10 @@ const csvName = () =>
         allParts[i - 1] === ClusterServiceVersionModel.plural,
     );
 
-const getActions = (ref: K8sResourceKindReference) => {
+const getActions = (ref: K8sResourceKindReference, flags: FlagsObject) => {
   const actions = plugins.registry
     .getClusterServiceVersionActions()
+    .filter((action) => plugins.registry.isExtensionInUse(action, flags))
     .filter(
       (action) =>
         action.properties.kind === kindForReference(ref) &&
@@ -245,7 +248,9 @@ export const OperandStatusIconAndText: React.FunctionComponent<OperandStatusIcon
   return iconAndText;
 };
 
-export const OperandTableRow: React.FC<OperandTableRowProps> = ({ obj, index, key, style }) => {
+export const OperandTableRow = connectToFlags<OperandTableRowProps & WithFlagsProps>(
+  ...plugins.registry.getGatingFlagNames([plugins.isClusterServiceVersionAction]),
+)(({ obj, index, key, style, flags }) => {
   return (
     <TableRow id={obj.metadata.uid} index={index} trKey={key} style={style}>
       <TableData className={tableColumnClasses[0]}>
@@ -271,16 +276,17 @@ export const OperandTableRow: React.FC<OperandTableRowProps> = ({ obj, index, ke
       </TableData>
       <TableData className={tableColumnClasses[6]}>
         <ResourceKebab
-          actions={getActions(referenceFor(obj))}
+          actions={getActions(referenceFor(obj), flags)}
           kind={referenceFor(obj)}
           resource={obj}
         />
       </TableData>
     </TableRow>
   );
-};
+});
 
 export const OperandList: React.SFC<OperandListProps> = (props) => {
+  const Row = (rowProps: OperandTableRowProps) => <OperandTableRow {...rowProps} />;
   const ensureKind = (data: K8sResourceKind[]) =>
     data.map((obj) => {
       if (obj.apiVersion && obj.kind) {
@@ -307,7 +313,7 @@ export const OperandList: React.SFC<OperandListProps> = (props) => {
       EmptyMsg={EmptyMsg}
       aria-label="Operands"
       Header={OperandTableHeader}
-      Row={OperandTableRow}
+      Row={Row}
       virtualize
     />
   );
@@ -578,7 +584,12 @@ const ResourcesTab = (resourceProps) => (
   <Resources {...resourceProps} clusterServiceVersion={resourceProps.csv} />
 );
 
-export const OperandDetailsPage = connectToPlural((props: OperandDetailsPageProps) => (
+export const OperandDetailsPage = compose(
+  connectToFlags<OperandDetailsPageProps & WithFlagsProps>(
+    ...plugins.registry.getGatingFlagNames([plugins.isClusterServiceVersionAction]),
+  ),
+  connectToPlural,
+)((props: OperandDetailsPageProps & WithFlagsProps) => (
   <DetailsPage
     match={props.match}
     name={props.match.params.name}
@@ -593,7 +604,7 @@ export const OperandDetailsPage = connectToPlural((props: OperandDetailsPageProp
         prop: 'csv',
       },
     ]}
-    menuActions={getActions(props.modelRef)}
+    menuActions={getActions(props.modelRef, props.flags)}
     breadcrumbsFor={() => [
       {
         name: 'Installed Operators',