App Search: Result Component Updates

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/index.ts

@@ -6,4 +6,5 @@
  */
 
 export { ResultFieldValue } from './result_field_value';
+export { ResultToken } from './result_token';
 export { Result } from './result';

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.scss

@@ -6,6 +6,7 @@
     'drag content actions'
     'drag toggle actions';
   overflow: hidden; // Prevents child background-colors from clipping outside of panel border-radius
+  border: $euiBorderThin; // TODO: Remove after EUI version is bumped beyond 31.8.0
 
   &__content {
     grid-area: content;
@@ -44,9 +45,13 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    width: $euiSizeL * 2;
+    width: $euiSize * 2;
     border-left: $euiBorderThin;
 
+    &:first-child {
+      border-left: none;
+    }
+
     &:hover,
     &:focus {
       background-color: $euiPageBackgroundColor;
@@ -62,22 +67,3 @@
     border-right: $euiBorderThin;
   }
 }
-
-/**
- * CSS for hover specific logic
- * It's mildly horrific, so I pulled it out to its own section here
- */
-
-.appSearchResult--link {
-  &:hover,
-  &:focus {
-    @include euiSlightShadowHover;
-  }
-}
-.appSearchResult__content--link:hover {
-  cursor: pointer;
-
-  & ~ .appSearchResult__actionButtons .appSearchResult__actionButton--link {
-    background-color: $euiPageBackgroundColor;
-  }
-}

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.tsx

@@ -8,16 +8,15 @@
 import React, { useState, useMemo } from 'react';
 import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
 
-import classNames from 'classnames';
-
 import './result.scss';
 
-import { EuiPanel, EuiIcon } from '@elastic/eui';
+import { EuiButtonIcon, EuiPanel, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { ReactRouterHelper } from '../../../shared/react_router_helpers/eui_components';
 
 import { Schema } from '../../../shared/types';
+
 import { ENGINE_DOCUMENT_DETAIL_PATH } from '../../routes';
 import { generateEncodedPath } from '../../utils/encode_path_params';
 
@@ -56,34 +55,53 @@ export const Result: React.FC<Props> = ({
     [result]
   );
   const numResults = resultFields.length;
-  const typeForField = (fieldName: string) => {
-    if (schemaForTypeHighlights) return schemaForTypeHighlights[fieldName];
-  };
-
   const documentLink = generateEncodedPath(ENGINE_DOCUMENT_DETAIL_PATH, {
     engineName: resultMeta.engine,
     documentId: resultMeta.id,
   });
-  const conditionallyLinkedArticle = (children: React.ReactNode) => {
-    return shouldLinkToDetailPage ? (
-      <ReactRouterHelper to={documentLink}>
-        <article className="appSearchResult__content appSearchResult__content--link">
-          {children}
-        </article>
-      </ReactRouterHelper>
-    ) : (
-      <article className="appSearchResult__content">{children}</article>
-    );
+
+  const typeForField = (fieldName: string) => {
+    if (schemaForTypeHighlights) return schemaForTypeHighlights[fieldName];
   };
 
-  const classes = classNames('appSearchResult', {
-    'appSearchResult--link': shouldLinkToDetailPage,
-  });
+  const ResultActions = () => {
+    if (!shouldLinkToDetailPage && !actions.length) return null;
+    return (
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup gutterSize="s">
+          {shouldLinkToDetailPage && (
+            <ReactRouterHelper to={documentLink}>
+              <EuiFlexItem grow={false}>
+                <EuiButtonIcon
+                  iconType="eye"
+                  aria-label={i18n.translate(
+                    'xpack.enterpriseSearch.appSearch.result.documentDetailLink',
+                    { defaultMessage: 'Visit document details' }
+                  )}
+                />
+              </EuiFlexItem>
+            </ReactRouterHelper>
+          )}
+          {actions.map(({ onClick, title, iconType, iconColor }) => (
+            <EuiFlexItem key={title}>
+              <EuiButtonIcon
+                iconType={iconType}
+                onClick={onClick}
+                color={iconColor ? 'primary' : undefined}
+                aria-label={title}
+              />
+            </EuiFlexItem>
+          ))}
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    );
+  };
 
   return (
     <EuiPanel
       paddingSize="none"
-      className={classes}
+      hasShadow={false}
+      className="appSearchResult"
       data-test-subj="AppSearchResult"
       title={i18n.translate('xpack.enterpriseSearch.appSearch.result.title', {
         defaultMessage: 'Document {id}',
@@ -95,26 +113,26 @@ export const Result: React.FC<Props> = ({
           <EuiIcon type="grab" />
         </div>
       )}
-      {conditionallyLinkedArticle(
-        <>
-          <ResultHeader
-            resultMeta={resultMeta}
-            showScore={!!showScore}
-            isMetaEngine={isMetaEngine}
-          />
-          {resultFields
-            .slice(0, isOpen ? resultFields.length : RESULT_CUTOFF)
-            .map(([field, value]: [string, FieldValue]) => (
-              <ResultField
-                key={field}
-                field={field}
-                raw={value.raw}
-                snippet={value.snippet}
-                type={typeForField(field)}
-              />
-            ))}
-        </>
-      )}
+      <article className="appSearchResult__content">
+        <ResultHeader
+          resultMeta={resultMeta}
+          showScore={!!showScore}
+          isMetaEngine={isMetaEngine}
+          shouldLinkToDetailPage={shouldLinkToDetailPage}
+          actions={<ResultActions />}
+        />
+        {resultFields
+          .slice(0, isOpen ? resultFields.length : RESULT_CUTOFF)
+          .map(([field, value]: [string, FieldValue]) => (
+            <ResultField
+              key={field}
+              field={field}
+              raw={value.raw}
+              snippet={value.snippet}
+              type={typeForField(field)}
+            />
+          ))}
+      </article>
       {numResults > RESULT_CUTOFF && (
         <button
           type="button"
@@ -138,33 +156,6 @@ export const Result: React.FC<Props> = ({
           />
         </button>
       )}
-      <div className="appSearchResult__actionButtons">
-        {shouldLinkToDetailPage && (
-          <ReactRouterHelper to={documentLink}>
-            <a
-              className="appSearchResult__actionButton appSearchResult__actionButton--link"
-              aria-label={i18n.translate(
-                'xpack.enterpriseSearch.appSearch.result.documentDetailLink',
-                { defaultMessage: 'Visit document details' }
-              )}
-            >
-              <EuiIcon type="eye" />
-            </a>
-          </ReactRouterHelper>
-        )}
-        {actions.map(({ onClick, title, iconType, iconColor }) => (
-          <button
-            key={title}
-            aria-label={title}
-            title={title}
-            onClick={onClick}
-            className="appSearchResult__actionButton"
-            type="button"
-          >
-            <EuiIcon type={iconType} color={iconColor} />
-          </button>
-        ))}
-      </div>
     </EuiPanel>
   );
 };

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_field.scss

@@ -14,6 +14,16 @@
     }
   }
 
+  &__key {
+    display: flex;
+    align-items: center;
+    @include euiCodeFont;
+
+    .euiToken {
+      margin-right: $euiSizeS;
+    }
+  }
+
   &__value {
     padding-left: $euiSize;
     overflow: hidden;

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_field.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 
 import { FieldType, Raw, Snippet } from './types';
 
-import { ResultFieldValue } from '.';
+import { ResultFieldValue, ResultToken } from '.';
 
 import './result_field.scss';
 
@@ -23,7 +23,10 @@ interface Props {
 export const ResultField: React.FC<Props> = ({ field, raw, snippet, type }) => {
   return (
     <div className="appSearchResultField">
-      <div className="appSearchResultField__key eui-textTruncate">{field}</div>
+      <div className="appSearchResultField__key eui-textTruncate">
+        {type && <ResultToken fieldType={type} />}
+        {field}
+      </div>
       <div className="appSearchResultField__separator" aria-hidden />
       <div className="appSearchResultField__value">
         <ResultFieldValue className="eui-textTruncate" raw={raw} snippet={snippet} type={type} />

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.scss

@@ -1,7 +1,5 @@
 .appSearchResultHeader {
   display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
   margin-bottom: $euiSizeS;
 
   @include euiBreakpoint('xs') {

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.tsx

@@ -7,6 +7,11 @@
 
 import React from 'react';
 
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import { ENGINE_DOCUMENT_DETAIL_PATH } from '../../routes';
+import { generateEncodedPath } from '../../utils/encode_path_params';
+
 import { ResultHeaderItem } from './result_header_item';
 import { ResultMeta } from './types';
 
@@ -16,33 +21,58 @@ interface Props {
   showScore: boolean;
   isMetaEngine: boolean;
   resultMeta: ResultMeta;
+  actions?: React.ReactNode;
+  shouldLinkToDetailPage: boolean;
 }
 
-export const ResultHeader: React.FC<Props> = ({ showScore, resultMeta, isMetaEngine }) => {
+export const ResultHeader: React.FC<Props> = ({
+  showScore,
+  resultMeta,
+  isMetaEngine,
+  actions,
+  shouldLinkToDetailPage,
+}) => {
+  const documentLink = generateEncodedPath(ENGINE_DOCUMENT_DETAIL_PATH, {
+    engineName: resultMeta.engine,
+    documentId: resultMeta.id,
+  });
+
   return (
-    <header className="appSearchResultHeader">
-      {showScore && (
-        <div className="appSearchResultHeader__column">
+    <header style={{ margin: '0 0 .75rem 0' }}>
+      <EuiFlexGroup alignItems="center" gutterSize="s" justifyContent="spaceBetween">
+        <EuiFlexItem grow>
           <ResultHeaderItem
-            data-test-subj="ResultScore"
-            field="score"
-            value={resultMeta.score}
-            type="score"
+            href={shouldLinkToDetailPage ? documentLink : undefined}
+            data-test-subj="ResultId"
+            field="ID"
+            value={resultMeta.id}
+            type="id"
           />
-        </div>
-      )}
-
-      <div className="appSearchResultHeader__column">
+        </EuiFlexItem>
+        {/* Score */}
+        {showScore && (
+          <EuiFlexItem grow={false}>
+            <ResultHeaderItem
+              data-test-subj="ResultScore"
+              field="Score"
+              value={resultMeta.score}
+              type="score"
+            />
+          </EuiFlexItem>
+        )}
+        {/* Engine Name */}
         {isMetaEngine && (
-          <ResultHeaderItem
-            data-test-subj="ResultEngine"
-            field="engine"
-            value={resultMeta.engine}
-            type="string"
-          />
+          <EuiFlexItem grow={false}>
+            <ResultHeaderItem
+              data-test-subj="ResultEngine"
+              field="Engine"
+              value={resultMeta.engine}
+              type="string"
+            />
+          </EuiFlexItem>
         )}
-        <ResultHeaderItem data-test-subj="ResultId" field="id" value={resultMeta.id} type="id" />
-      </div>
+        {actions}
+      </EuiFlexGroup>
     </header>
   );
 };

x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header_item.scss

@@ -1,16 +1,12 @@
-.appSearchResultHeaderItem {
-  display: flex;
+.euiFlexItem:not(:first-child):not(:last-child) .appSearchResultHeaderItem {
+  padding-right: .75rem;
+  box-shadow: inset -1px 0 0 0 $euiBorderColor;
+}
 
-  &__key,
-  &__value {
-    line-height: $euiLineHeight;
-    font-size: $euiFontSizeXS;
-  }
+.appSearchResultHeaderItem {
+  @include euiCodeFont;
 
-  &__key {
-    text-transform: uppercase;
-    font-weight: $euiFontWeightLight;
-    color: $euiColorDarkShade;
-    margin-right: $euiSizeXS;
+  &__score {
+    color: $euiColorSuccessText;
   }
-}
+}