From 22eda038b6cb646d63bfaf617372fce2b5d98631 Mon Sep 17 00:00:00 2001
From: "Manor, Yanir (ym903w)" <ym903w@intl.att.com>
Date: Thu, 20 Sep 2018 14:18:38 +0300
Subject: update code to latest

update code to latest

Change-Id: I6ed427434b0da47e0d33507a0992b09fe48f9c52
Issue-ID: DCAEGEN2-821
Signed-off-by: Manor, Yanir (ym903w) <ym903w@intl.att.com>
---
 public/src/app/main/main.component.html |  3 ++-
 public/src/app/main/main.component.scss | 11 +++++++++++
 public/src/app/main/main.component.ts   | 11 ++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'public/src/app/main')

diff --git a/public/src/app/main/main.component.html b/public/src/app/main/main.component.html
index 4c71a37..87ee2bf 100644
--- a/public/src/app/main/main.component.html
+++ b/public/src/app/main/main.component.html
@@ -42,8 +42,9 @@
           <button mat-raised-button color="primary" style="width: 95px; height: 36px; border-radius: 2px;" (click)="saveAndCreateBlueprint()">Submit</button>
         </div>
       </div>
+
       <div *ngIf='store.generalflow === "import"'>
-        <button mat-raised-button color="primary" (click)="importMC(this.generalComponent.newVfcmt)" [disabled]="this.generalComponent.generalForm.invalid"
+        <button mat-raised-button color="primary" (click)="importMC(this.generalComponent.newVfcmt)" [disabled]="this.generalComponent.generalForm.invalid || this.generalComponent.importBtnDisabled"
           data-tests-id="importMonitoring" style="width: 95px;height: 36px;">Import</button>
       </div>
     </div>
diff --git a/public/src/app/main/main.component.scss b/public/src/app/main/main.component.scss
index 47f1bd9..eba643c 100644
--- a/public/src/app/main/main.component.scss
+++ b/public/src/app/main/main.component.scss
@@ -31,3 +31,14 @@
 .ui-tabview .ui-tabview-nav li.ui-tabview-selected .ui-tabview-title {
   color: #009fdb;
 }
+
+.ui-tabview .ui-tabview-nav {
+  white-space: nowrap;
+  overflow-x: auto;
+}
+
+.ui-tabview .ui-tabview-nav li {
+  display: inline-block;
+  float: none;
+  margin-right: -4px;
+}
diff --git a/public/src/app/main/main.component.ts b/public/src/app/main/main.component.ts
index a3f2271..3070435 100644
--- a/public/src/app/main/main.component.ts
+++ b/public/src/app/main/main.component.ts
@@ -138,7 +138,12 @@ export class MainComponent {
 
   setDataFromMapToRuleEngine(cdump) {
     this.store.tabParmasForRule = cdump.nodes
-      .filter(x => x.name.toLowerCase().includes('map'))
+      .filter(
+        x =>
+          x.name.toLowerCase().includes('map') ||
+          x.name.toLowerCase().includes('highlandpark') ||
+          x.name.toLowerCase().includes('hp')
+      )
       .map(y => {
         return { name: y.name, nid: y.nid };
       });
@@ -156,6 +161,7 @@ export class MainComponent {
 
   saveCDUMP() {
     this.store.loader = true;
+
     this.restApi
       .saveMonitoringComponent({
         contextType: this.store.sdcParmas.contextType,
@@ -224,8 +230,7 @@ export class MainComponent {
       .subscribe(
         success => {
           this.store.loader = false;
-
-          this.toastr.success('', 'Save succeeded');
+          this.toastr.success('', 'Blueprint was successfully submitted');
         },
         error => {
           this.store.loader = false;
-- 
cgit 1.2.3-korg