Merge branch 'master' into fleet-install-security-rule-asset

kibanamachine · web-flow · commit c7b49e01452f · 2021-04-06T21:16:26.000-04:00
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.ts b/x-pack/plugins/apm/server/routes/create_api/index.ts
@@ -120,6 +120,7 @@ export function createApi() {
 
               return response.ok({ body });
             } catch (error) {
+              logger.error(error);
               const opts = {
                 statusCode: 500,
                 body: {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.ts b/x-pack/plugins/transform/public/app/hooks/use_index_data.ts
@@ -23,6 +23,7 @@ import { useApi } from './use_api';
 
 import { useAppDependencies, useToastNotifications } from '../app_dependencies';
 import type { StepDefineExposedState } from '../sections/create_transform/components/step_define/common';
+import { isRuntimeMappings } from '../../../common/shared_imports';
 
 export const useIndexData = (
   indexPattern: SearchItems['indexPattern'],
@@ -120,8 +121,7 @@ export const useIndexData = (
         from: pagination.pageIndex * pagination.pageSize,
         size: pagination.pageSize,
         ...(Object.keys(sort).length > 0 ? { sort } : {}),
-        ...(typeof combinedRuntimeMappings === 'object' &&
-        Object.keys(combinedRuntimeMappings).length > 0
+        ...(isRuntimeMappings(combinedRuntimeMappings)
           ? { runtime_mappings: combinedRuntimeMappings }
           : {}),
       },
@@ -189,7 +189,12 @@ export const useIndexData = (
     }
     // custom comparison
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [chartsVisible, indexPattern.title, JSON.stringify([query, dataGrid.visibleColumns])]);
+  }, [
+    chartsVisible,
+    indexPattern.title,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    JSON.stringify([query, dataGrid.visibleColumns, combinedRuntimeMappings]),
+  ]);
 
   const renderCellValue = useRenderCellValue(indexPattern, pagination, tableItems);
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx
@@ -124,7 +124,10 @@ export const AdvancedRuntimeMappingsSettings: FC<StepDefineFormHook> = (props) =
                     <AdvancedRuntimeMappingsEditorSwitch {...props.runtimeMappingsEditor} />
                   </EuiFlexItem>
                   <EuiFlexItem grow={false}>
-                    <EuiCopy beforeMessage={COPY_TO_CLIPBOARD_RUNTIME_MAPPINGS} textToCopy={''}>
+                    <EuiCopy
+                      beforeMessage={COPY_TO_CLIPBOARD_RUNTIME_MAPPINGS}
+                      textToCopy={advancedRuntimeMappingsConfig ?? ''}
+                    >
                       {(copy: () => void) => (
                         <EuiButtonIcon
                           onClick={copy}
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
@@ -41,10 +41,6 @@ export const useAdvancedRuntimeMappingsEditor = (defaults: StepDefineExposedStat
     setAdvancedEditorRuntimeMappingsLastApplied,
   ] = useState(stringifiedRuntimeMappings);
 
-  const [advancedEditorRuntimeMappings, setAdvancedEditorRuntimeMappings] = useState(
-    stringifiedRuntimeMappings
-  );
-
   const {
     convertToJson,
     setXJson: setAdvancedRuntimeMappingsConfig,
@@ -57,7 +53,7 @@ export const useAdvancedRuntimeMappingsEditor = (defaults: StepDefineExposedStat
     const prettySourceConfig = JSON.stringify(parsedRuntimeMappings, null, 2);
     setRuntimeMappingsUpdated(true);
     setRuntimeMappings(parsedRuntimeMappings);
-    setAdvancedEditorRuntimeMappings(prettySourceConfig);
+    setAdvancedRuntimeMappingsConfig(prettySourceConfig);
     setAdvancedEditorRuntimeMappingsLastApplied(prettySourceConfig);
     setRuntimeMappingsEditorApplyButtonEnabled(false);
   };
@@ -68,7 +64,7 @@ export const useAdvancedRuntimeMappingsEditor = (defaults: StepDefineExposedStat
       setRuntimeMappingsUpdated(false);
     }
     if (isRuntimeMappingsEditorEnabled === false) {
-      setAdvancedEditorRuntimeMappingsLastApplied(advancedEditorRuntimeMappings);
+      setAdvancedEditorRuntimeMappingsLastApplied(advancedRuntimeMappingsConfig);
     }
 
     setRuntimeMappingsEditorEnabled(!isRuntimeMappingsEditorEnabled);
@@ -80,7 +76,6 @@ export const useAdvancedRuntimeMappingsEditor = (defaults: StepDefineExposedStat
       applyRuntimeMappingsEditorChanges,
       setRuntimeMappingsEditorApplyButtonEnabled,
       setRuntimeMappingsEditorEnabled,
-      setAdvancedEditorRuntimeMappings,
       setAdvancedEditorRuntimeMappingsLastApplied,
       setRuntimeMappingsEditorSwitchModalVisible,
       setRuntimeMappingsUpdated,
@@ -89,7 +84,6 @@ export const useAdvancedRuntimeMappingsEditor = (defaults: StepDefineExposedStat
       setAdvancedRuntimeMappingsConfig,
     },
     state: {
-      advancedEditorRuntimeMappings,
       advancedEditorRuntimeMappingsLastApplied,
       isRuntimeMappingsEditorApplyButtonEnabled,
       isRuntimeMappingsEditorEnabled,
