Web Actions Tab: Remove Tooltip from MetadataCollapse (#833)

* Confusing interaction with a redundant tooltip on a Metadata item which when clicked reveals a Collapse component
cashapp · Mar 8, 2019 · e414106 · e414106
1 parent a7b87f9
commit e414106
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/misk/web/tabs/web-actions/src/containers/WebActionsContainer.tsx b/misk/web/tabs/web-actions/src/containers/WebActionsContainer.tsx
@@ -120,15 +120,27 @@ const Metadata = (
   props: {
     content: string | JSX.Element
     label: string
-    tooltip: string | JSX.Element
+    tooltip?: string | JSX.Element
   } & any
-) => (
-  <MenuItem
-    label={props.label}
-    text={<Tooltip content={props.tooltip}>{props.content}</Tooltip>}
-    {...props}
-  />
-)
+) => {
+  if (props.tooltip) {
+    return (
+      <MenuItem
+        label={props.label}
+        text={<Tooltip content={props.tooltip}>{props.content}</Tooltip>}
+        {...props}
+      />
+    )
+  } else {
+    return (
+      <MenuItem
+        label={props.label}
+        text={<Tooltip>{props.content}</Tooltip>}
+        {...props}
+      />
+    )
+  }
+}
 
 /**
  * Metadata that slides out content below when clicked
@@ -146,7 +158,7 @@ const MetadataCollapse = (
     content: string | JSX.Element
     label: string
     tag: string
-    tooltip: string | JSX.Element
+    tooltip?: string | JSX.Element
   } & IState &
     IDispatchProps
 ) => (
@@ -168,16 +180,6 @@ const MetadataCollapse = (
         props.tag,
         props.simpleForm
       )}
-      tooltip={
-        <span>
-          {simpleSelect(props.simpleForm, props.tag, "data") ? (
-            <Icon icon={IconNames.CARET_DOWN} />
-          ) : (
-            <Icon icon={IconNames.CARET_RIGHT} />
-          )}{" "}
-          {props.content}
-        </span>
-      }
     />
     <Collapse isOpen={simpleSelect(props.simpleForm, props.tag, "data")}>
       {props.children}
@@ -353,7 +355,6 @@ const WebAction = (
               tag={`${tag}::${
                 props.action.pathPattern
               }::ApplicationInterceptors`}
-              tooltip={"Application Interceptors"}
               {...props}
             >
               {props.action.applicationInterceptors.map(i => (
@@ -364,7 +365,6 @@ const WebAction = (
               content={"Network Interceptors"}
               label={`(${props.action.networkInterceptors.length})`}
               tag={`${tag}::${props.action.pathPattern}::NetworkInterceptors`}
-              tooltip={"Network Interceptors"}
               {...props}
             >
               {props.action.networkInterceptors.map(i => (
@@ -375,7 +375,6 @@ const WebAction = (
               content={"Send a Request"}
               label={""}
               tag={`${tag}::${props.action.pathPattern}::Request`}
-              tooltip={"Send a Request"}
               {...props}
             >
               <span />