Merge branch 'feature/METRON-1856-parser-aggregation' into METRON-2139

apache · Aug 22, 2019 · 4794d78 · 4794d78
2 parents 2215b04 + a815a07
commit 4794d78
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 93 deletions.
diff --git a/metron-interface/metron-config/src/app/sensors/effects/index.ts b/metron-interface/metron-config/src/app/sensors/effects/index.ts
diff --git a/metron-interface/metron-config/src/app/sensors/models/parser.model.ts b/metron-interface/metron-config/src/app/sensors/models/parser.model.ts
diff --git a/metron-interface/metron-config/src/app/sensors/reducers/sensors.reducers.spec.ts b/metron-interface/metron-config/src/app/sensors/reducers/sensors.reducers.spec.ts
@@ -534,7 +534,11 @@ describe('sensors: selectors', () => {
     expect(merged[1].status).toEqual(state.sensors.statuses.items[1]);
     expect(merged[2].status).toEqual(state.sensors.statuses.items[2]);
 
+<<<<<<< HEAD
     // no status belongs to it but got a status instance witn no name
+=======
+    // no status belongs to it but got a status instance with no name
+>>>>>>> feature/METRON-1856-parser-aggregation
     expect(merged[3].status).toBeTruthy();
     expect(merged[3].status.name).toBeFalsy();
   });

diff --git a/metron-interface/metron-config/src/app/sensors/sensor-parser-list/sensor-status.pipe.ts b/metron-interface/metron-config/src/app/sensors/sensor-parser-list/sensor-status.pipe.ts
diff --git a/metron-interface/metron-config/src/app/shared/metron-alerts.spec.ts b/metron-interface/metron-config/src/app/shared/metron-alerts.spec.ts
@@ -22,11 +22,11 @@ import {MetronAlerts} from './metron-alerts';
 describe('MetronAlerts', () => {
 
   beforeEach(function() {
-    MetronAlerts.SUCCESS_MESSAGE_DISPALY_TIME = 500;
+    MetronAlerts.SUCCESS_MESSAGE_DISPLAY_TIME = 500;
   });
 
   afterEach(function() {
-    MetronAlerts.SUCCESS_MESSAGE_DISPALY_TIME = 5000;
+    MetronAlerts.SUCCESS_MESSAGE_DISPLAY_TIME = 5000;
   });
 
   it('should create an instance', () => {
@@ -41,7 +41,7 @@ describe('MetronAlerts', () => {
     setTimeout(() => {
       expect($(document).find('.alert .alert-success').length).toEqual(0);
       done();
-    }, MetronAlerts.SUCCESS_MESSAGE_DISPALY_TIME);
+    }, MetronAlerts.SUCCESS_MESSAGE_DISPLAY_TIME);
   });
 
   it('should close success message on click of close', (done) => {
@@ -56,7 +56,7 @@ describe('MetronAlerts', () => {
     setTimeout(() => {
       expect($(document).find('.alert .alert-success').length).toEqual(0);
       done();
-    }, MetronAlerts.SUCCESS_MESSAGE_DISPALY_TIME);
+    }, MetronAlerts.SUCCESS_MESSAGE_DISPLAY_TIME);
 
   });
 

diff --git a/metron-interface/metron-config/src/app/shared/metron-alerts.ts b/metron-interface/metron-config/src/app/shared/metron-alerts.ts
@@ -20,7 +20,7 @@ import { Injectable } from "@angular/core";
 @Injectable()
 export class MetronAlerts {
 
-  public static SUCCESS_MESSAGE_DISPALY_TIME = 5000;
+  public static SUCCESS_MESSAGE_DISPLAY_TIME = 5000;
 
   private createMessage(message: string, type: string): Node {
     let element = document.createElement('div');
@@ -50,6 +50,6 @@ export class MetronAlerts {
 
       document.body.removeChild(element);
 
-    }, MetronAlerts.SUCCESS_MESSAGE_DISPALY_TIME);
+    }, MetronAlerts.SUCCESS_MESSAGE_DISPLAY_TIME);
   }
 }