Merge pull request #1 from nchaulet/ts-update-beats-cm

Fix ts errors for beats management
mshustov · May 29, 2020 · baa6209 · baa6209
2 parents a7bcdcf + 626b710
commit baa6209
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.../legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts b/.../legacy/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts
@@ -11,6 +11,15 @@ import { DatabaseAdapter } from '../database/adapter_types';
 import { FrameworkUser } from '../framework/adapter_types';
 import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types';
 
+function formatWithTags(beat: CMBeat) {
+  const { tags, ...rest } = beat;
+
+  return {
+    tags: tags || [],
+    ...rest,
+  };
+}
+
 export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
   private database: DatabaseAdapter;
 
@@ -97,10 +106,9 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     if (beats.length === 0) {
       return [];
     }
-    return beats.map((beat: any) => ({
-      tags: [] as string[],
-      ...(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat),
-    }));
+    return beats.map((beat: any) =>
+      formatWithTags(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat)
+    );
   }
 
   public async getBeatWithToken(
@@ -124,7 +132,7 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     if (beats.length === 0) {
       return null;
     }
-    return omit<CMBeat, {}>(_get<CMBeat>({ tags: [], ...beats[0] }, '_source.beat'), [
+    return omit<CMBeat, {}>(_get<CMBeat>(formatWithTags(beats[0]), '_source.beat'), [
       'access_token',
     ]);
   }
@@ -165,10 +173,9 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
     }
     const beats = _get<any>(response, 'hits.hits', []);
 
-    return beats.map((beat: any) => ({
-      tags: [] as string[],
-      ...(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat),
-    }));
+    return beats.map((beat: any) =>
+      formatWithTags(omit(beat._source.beat as CMBeat, ['access_token']) as CMBeat)
+    );
   }
 
   public async removeTagsFromBeats(

diff --git a/...ent/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts b/...ent/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts
@@ -137,12 +137,13 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
   public async create(user: FrameworkUser, configs: ConfigurationBlock[]): Promise<string[]> {
     const body = flatten(
       configs.map((config) => {
-        const id = config.id || uuidv4();
+        const { id: configId, ...configWithoutId } = config;
+        const id = configId || uuidv4();
         return [
           { index: { _id: `configuration_block:${id}` } },
           {
             type: 'configuration_block',
-            configuration_block: { id, ...config, config: JSON.stringify(config.config) },
+            configuration_block: { id, ...configWithoutId, config: JSON.stringify(config.config) },
           },
         ];
       })