Merge remote-tracking branch 'upstream/master' into kbn-77020-migrate-optimizer-mixin

Author: pgayvallet

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

@@ -54,7 +54,7 @@ export const EnginesTable: React.FC<EnginesTableProps> = ({
   const { navigateToUrl } = useValues(KibanaLogic);
   const { hasPlatinumLicense } = useValues(LicensingLogic);
 
-  const generteEncodedEnginePath = (engineName: string) =>
+  const generateEncodedEnginePath = (engineName: string) =>
     generateEncodedPath(ENGINE_PATH, { engineName });
   const sendEngineTableLinkClickTelemetry = () =>
     sendAppSearchTelemetry({
@@ -71,7 +71,7 @@ export const EnginesTable: React.FC<EnginesTableProps> = ({
       render: (name: string) => (
         <EuiLinkTo
           data-test-subj="EngineNameLink"
-          to={generteEncodedEnginePath(name)}
+          to={generateEncodedEnginePath(name)}
           onClick={sendEngineTableLinkClickTelemetry}
         >
           {name}
@@ -159,7 +159,7 @@ export const EnginesTable: React.FC<EnginesTableProps> = ({
         icon: 'eye',
         onClick: (engineDetails) => {
           sendEngineTableLinkClickTelemetry();
-          navigateToUrl(generteEncodedEnginePath(engineDetails.name));
+          navigateToUrl(generateEncodedEnginePath(engineDetails.name));
         },
       },
       {

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/boost_item_content.tsx

@@ -13,7 +13,7 @@ import { EuiButton, EuiFormRow, EuiPanel, EuiRange, EuiSpacer } from '@elastic/e
 import { i18n } from '@kbn/i18n';
 
 import { RelevanceTuningLogic } from '../..';
-import { Boost, BoostType } from '../../types';
+import { Boost, BoostType, FunctionalBoost, ProximityBoost, ValueBoost } from '../../types';
 
 import { FunctionalBoostForm } from './functional_boost_form';
 import { ProximityBoostForm } from './proximity_boost_form';
@@ -32,11 +32,11 @@ export const BoostItemContent: React.FC<Props> = ({ boost, index, name }) => {
   const getBoostForm = () => {
     switch (type) {
       case BoostType.Value:
-        return <ValueBoostForm boost={boost} index={index} name={name} />;
+        return <ValueBoostForm boost={boost as ValueBoost} index={index} name={name} />;
       case BoostType.Functional:
-        return <FunctionalBoostForm boost={boost} index={index} name={name} />;
+        return <FunctionalBoostForm boost={boost as FunctionalBoost} index={index} name={name} />;
       case BoostType.Proximity:
-        return <ProximityBoostForm boost={boost} index={index} name={name} />;
+        return <ProximityBoostForm boost={boost as ProximityBoost} index={index} name={name} />;
     }
   };
 

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.test.tsx

@@ -13,12 +13,13 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiSelect } from '@elastic/eui';
 
-import { Boost, BoostOperation, BoostType, FunctionalBoostFunction } from '../../types';
+import { FunctionalBoost, BoostOperation, BoostType, FunctionalBoostFunction } from '../../types';
 
 import { FunctionalBoostForm } from './functional_boost_form';
 
 describe('FunctionalBoostForm', () => {
-  const boost: Boost = {
+  const boost: FunctionalBoost = {
+    value: undefined,
     factor: 2,
     type: 'functional' as BoostType,
     function: 'logarithmic' as FunctionalBoostFunction,

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.tsx

@@ -19,15 +19,15 @@ import {
   FUNCTIONAL_BOOST_FUNCTION_DISPLAY_MAP,
 } from '../../constants';
 import {
-  Boost,
+  FunctionalBoost,
   BoostFunction,
   BoostOperation,
   BoostType,
   FunctionalBoostFunction,
 } from '../../types';
 
 interface Props {
-  boost: Boost;
+  boost: FunctionalBoost;
   index: number;
   name: string;
 }
@@ -39,7 +39,7 @@ const functionOptions = Object.values(FunctionalBoostFunction).map((boostFunctio
 
 const operationOptions = Object.values(BoostOperation).map((boostOperation) => ({
   value: boostOperation,
-  text: BOOST_OPERATION_DISPLAY_MAP[boostOperation as BoostOperation],
+  text: BOOST_OPERATION_DISPLAY_MAP[boostOperation],
 }));
 
 export const FunctionalBoostForm: React.FC<Props> = ({ boost, index, name }) => {

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.test.tsx

@@ -13,12 +13,14 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiFieldText, EuiSelect } from '@elastic/eui';
 
-import { Boost, BoostType, ProximityBoostFunction } from '../../types';
+import { ProximityBoost, BoostType, ProximityBoostFunction } from '../../types';
 
 import { ProximityBoostForm } from './proximity_boost_form';
 
 describe('ProximityBoostForm', () => {
-  const boost: Boost = {
+  const boost: ProximityBoost = {
+    value: undefined,
+    operation: undefined,
     factor: 2,
     type: 'proximity' as BoostType,
     function: 'linear' as ProximityBoostFunction,
@@ -46,8 +48,8 @@ describe('ProximityBoostForm', () => {
 
   describe('various boost values', () => {
     const renderWithBoostValues = (boostValues: {
-      center?: Boost['center'];
-      function?: Boost['function'];
+      center?: ProximityBoost['center'];
+      function?: ProximityBoost['function'];
     }) => {
       return shallow(
         <ProximityBoostForm

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.tsx

@@ -14,10 +14,10 @@ import { i18n } from '@kbn/i18n';
 
 import { RelevanceTuningLogic } from '../..';
 import { PROXIMITY_BOOST_FUNCTION_DISPLAY_MAP } from '../../constants';
-import { Boost, BoostType, ProximityBoostFunction } from '../../types';
+import { BoostType, ProximityBoost, ProximityBoostFunction } from '../../types';
 
 interface Props {
-  boost: Boost;
+  boost: ProximityBoost;
   index: number;
   name: string;
 }

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.test.tsx

@@ -13,12 +13,14 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiButton, EuiButtonIcon, EuiFieldText } from '@elastic/eui';
 
-import { Boost, BoostType } from '../../types';
+import { ValueBoost, BoostType } from '../../types';
 
 import { ValueBoostForm } from './value_boost_form';
 
 describe('ValueBoostForm', () => {
-  const boost: Boost = {
+  const boost: ValueBoost = {
+    operation: undefined,
+    function: undefined,
     factor: 2,
     type: 'value' as BoostType,
     value: ['bar', '', 'baz'],

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx

@@ -20,10 +20,10 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { RelevanceTuningLogic } from '../..';
-import { Boost } from '../../types';
+import { ValueBoost } from '../../types';
 
 interface Props {
-  boost: Boost;
+  boost: ValueBoost;
   index: number;
   name: string;
 }

x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boosts.test.tsx

@@ -78,6 +78,24 @@ describe('Boosts', () => {
     expect(select.prop('options').map((o: any) => o.value)).toEqual(['add-boost', 'proximity']);
   });
 
+  it('will not render functional option if "type" prop is "date"', () => {
+    const wrapper = shallow(
+      <Boosts
+        {...{
+          ...props,
+          type: 'date' as SchemaTypes,
+        }}
+      />
+    );
+
+    const select = wrapper.find(EuiSuperSelect);
+    expect(select.prop('options').map((o: any) => o.value)).toEqual([
+      'add-boost',
+      'proximity',
+      'value',
+    ]);
+  });
+
   it('will add a boost of the selected type when a selection is made', () => {
     const wrapper = shallow(<Boosts {...props} />);
 

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

@@ -13,7 +13,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle, EuiSuperSelect } from '@
 
 import { i18n } from '@kbn/i18n';
 
-import { GEOLOCATION, TEXT } from '../../../../shared/constants/field_types';
+import { GEOLOCATION, TEXT, DATE } from '../../../../shared/constants/field_types';
 import { SchemaTypes } from '../../../../shared/types';
 
 import { BoostIcon } from '../boost_icon';
@@ -70,6 +70,8 @@ const filterInvalidOptions = (value: BoostType, type: SchemaTypes) => {
   if (type === TEXT && [BoostType.Proximity, BoostType.Functional].includes(value)) return false;
   // Value and Functional boost types are not valid for geolocation fields
   if (type === GEOLOCATION && [BoostType.Functional, BoostType.Value].includes(value)) return false;
+  // Functional boosts are not valid for date fields
+  if (type === DATE && value === BoostType.Functional) return false;
   return true;
 };