Apply hidden descriptor to details view

openshift · Apr 17, 2020 · 734a65f · 734a65f
1 parent 05bd033
commit 734a65f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/descriptors/spec/index.tsx b/frontend/packages/operator-lifecycle-manager/src/components/descriptors/spec/index.tsx
@@ -225,7 +225,8 @@ const capabilityComponents = ImmutableMap<
   .set(SpecCapability.booleanSwitch, BooleanSwitch)
   .set(SpecCapability.password, Secret)
   .set(SpecCapability.updateStrategy, UpdateStrategy)
-  .set(SpecCapability.checkbox, CheckboxUIComponent);
+  .set(SpecCapability.checkbox, CheckboxUIComponent)
+  .set(SpecCapability.hidden, null);
 
 const capabilityFor = (specCapability: SpecCapability) => {
   if (_.isEmpty(specCapability)) {
@@ -255,7 +256,7 @@ export const SpecDescriptor = withFallback((props: DescriptorProps) => {
   ) as SpecCapability;
   const Capability = capabilityFor(capability);
 
-  return (
+  return Capability ? (
     <dl className="olm-descriptor">
       <Tooltip content={descriptor.description}>
         <dt className="olm-descriptor__title" data-test-descriptor-label={descriptor.displayName}>
@@ -273,7 +274,7 @@ export const SpecDescriptor = withFallback((props: DescriptorProps) => {
         />
       </dd>
     </dl>
-  );
+  ) : null;
 });
 
 type SpecCapabilityProps = CapabilityProps<SpecCapability>;
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/descriptors/status/index.tsx b/frontend/packages/operator-lifecycle-manager/src/components/descriptors/status/index.tsx
@@ -89,7 +89,8 @@ const capabilityComponents = ImmutableMap<
   .set(StatusCapability.w3Link, Link)
   .set(StatusCapability.k8sPhase, K8sPhase)
   .set(StatusCapability.k8sPhaseReason, K8sPhaseReason)
-  .set(StatusCapability.k8sResourcePrefix, K8sResourceLink);
+  .set(StatusCapability.k8sResourcePrefix, K8sResourceLink)
+  .set(StatusCapability.hidden, null);
 
 const capabilityFor = (statusCapability: StatusCapability) => {
   if (_.isEmpty(statusCapability)) {
@@ -112,7 +113,7 @@ export const StatusDescriptor = withFallback((props: DescriptorProps) => {
   const Capability = capabilityFor(capability);
 
   return (
-    <dl className="olm-descriptor">
+    Capability ? <dl className="olm-descriptor">
       <Tooltip content={descriptor.description}>
         <dt className="olm-descriptor__title" data-test-descriptor-label={descriptor.displayName}>
           {descriptor.displayName}
@@ -134,7 +135,7 @@ export const StatusDescriptor = withFallback((props: DescriptorProps) => {
           />
         )}
       </dd>
-    </dl>
+    </dl> : null;
   );
 });
 

diff --git a/frontend/packages/operator-lifecycle-manager/src/components/descriptors/types.ts b/frontend/packages/operator-lifecycle-manager/src/components/descriptors/types.ts
@@ -38,6 +38,7 @@ export enum StatusCapability {
   k8sPhaseReason = 'urn:alm:descriptor:io.kubernetes.phase:reason',
   // Prefix for all kubernetes resource status descriptors.
   k8sResourcePrefix = 'urn:alm:descriptor:io.kubernetes:',
+  hidden = 'urn:alm:descriptor:com.tectonic.ui:hidden',
 }
 
 export type Descriptor<T = any> = {