diff options
author | Stone, Avi (as206k) <as206k@att.com> | 2018-06-03 13:12:12 +0300 |
---|---|---|
committer | Avi Stone <as206k@att.com> | 2018-06-03 11:56:49 +0000 |
commit | 548c5a220333c7cd666b861e737bff0b45461f18 (patch) | |
tree | 13c60b67291bd8bada498ad73c02a9e35afb5c9e /public/src/app/bar-icons | |
parent | 193095b01daf094c78f7fafacdf1c1cc31f290fe (diff) |
Update FE project
Update FE to latest version so that fe can run on docker
Change-Id: I9c5dee756b567dbe64fac6d3d6fd89362813bdcc
Issue-ID: SDC-1359
Signed-off-by: Stone, Avi (as206k) <as206k@att.com>
Diffstat (limited to 'public/src/app/bar-icons')
-rw-r--r-- | public/src/app/bar-icons/bar-icons.component.html | 50 | ||||
-rw-r--r-- | public/src/app/bar-icons/bar-icons.component.scss | 6 | ||||
-rw-r--r-- | public/src/app/bar-icons/bar-icons.component.ts | 29 |
3 files changed, 59 insertions, 26 deletions
diff --git a/public/src/app/bar-icons/bar-icons.component.html b/public/src/app/bar-icons/bar-icons.component.html index 03129bf..2b5269d 100644 --- a/public/src/app/bar-icons/bar-icons.component.html +++ b/public/src/app/bar-icons/bar-icons.component.html @@ -1,40 +1,44 @@ -<div style="display: flex; position: relative; justify-content: flex-end;"> - <div style="display: flex; justify-content: flex-end;" [class]="genrateBarTestId()"> +<div style="display: flex; position: relative; justify-content: flex-end;" class="bars"> + <div style="display: flex; justify-content: flex-end; align-items:center;" [class]="genrateBarTestId()"> <button mat-icon-button> <span style="width: 100%; + color:#5a5a5a; height: 100%; display: flex; justify-content: center; - align-items: center;" [innerHTML]="'help-circle' | feather:18"></span> + align-items: center;" [innerHTML]="'help-circle' | feather:20"></span> </button> <hr> - <div *ngIf="tabName.includes('map')" style="display: flex;"> + <div *ngIf="tabName.includes('map')" style="display: flex; align-items: center;"> <button mat-icon-button> <span style="width: 100%; + color:#5a5a5a; height: 100%; display: flex; justify-content: center; - align-items: center;" [innerHTML]="'upload' | feather:18"></span> + align-items: center;" [innerHTML]="'upload' | feather:20"></span> </button> <hr> <button mat-icon-button> <span style="width: 100%; + color:#5a5a5a; height: 100%; display: flex; justify-content: center; - align-items: center;" [innerHTML]="'download' | feather:18"></span> + align-items: center;" [innerHTML]="'download' | feather:20"></span> </button> <hr> </div> <button mat-icon-button (click)="enableSetting()" data-tests-id="setting-gear" [style.color]="this.store.expandAdvancedSetting[store.tabIndex] ? '#009FDB' : 'black'"> <span style="width: 100%; + color:#5a5a5a; height: 100%; display: flex; justify-content: center; - align-items: center;" [innerHTML]="'settings' | feather:18"></span> + align-items: center;" [innerHTML]="'settings' | feather:20"></span> </button> </div> @@ -44,14 +48,32 @@ <div style="font-size: 1.5em; padding: 0 12px;">{{tabName}} Advanced Setting</div> <form #cdumpConfForm="ngForm"> <div *ngFor="let prop of store.configurationForm" class="field" [id]="prop.name"> - <p class="field-label">{{prop.name}}</p> - <input *ngIf="!isPropertyDdl(prop)" type="text" name="{{prop.name}}" class="field-text" [(ngModel)]="prop.assignment.value" + <div style="display: flex;"> + <p class="field-label"> + {{prop.name}} + </p> + <span *ngIf="prop.description" class="help-description" style="padding-left: 5px;" [innerHTML]="'help-circle' | feather:14" + pTooltip="{{prop.description}}" tooltipPosition="top"></span> + </div> + + <input *ngIf="isPropertyDdl(prop) === dropDownTypes.none" type="text" name="{{prop.name}}" class="field-text" [(ngModel)]="prop.value" + (ngModelChange)="onChange($event)"> + + <select *ngIf="isPropertyDdl(prop) === dropDownTypes.regularDDL" class="field-text" name="{{prop.name}}" [(ngModel)]="prop.value" (ngModelChange)="onChange($event)"> - <select *ngIf="isPropertyDdl(prop)" class="field-text" name="{{prop.name}}" [(ngModel)]="prop.assignment.value" (ngModelChange)="onChange($event)"> - <option *ngFor="let value of prop.constraints[0].valid_values" [value]="value"> - {{value}} - </option> - </select> + <option *ngFor="let value of prop.constraints[0].valid_values" [value]="value"> + {{value}} + </option> + </select> + <select *ngIf="isPropertyDdl(prop) === dropDownTypes.booleanDDL" class="field-text" name="{{prop.name}}" [(ngModel)]="prop.value" + (ngModelChange)="onChange($event)" data-tests-id="booleanDDL"> + <option value="false"> + false + </option> + <option value="true"> + true + </option> + </select> </div> </form> </div> diff --git a/public/src/app/bar-icons/bar-icons.component.scss b/public/src/app/bar-icons/bar-icons.component.scss index 893f757..006e650 100644 --- a/public/src/app/bar-icons/bar-icons.component.scss +++ b/public/src/app/bar-icons/bar-icons.component.scss @@ -1,3 +1,9 @@ +.bars { + hr { + height: 22px; + color: #d2d2d2; + } +} .setting { position: absolute; top: 47px; diff --git a/public/src/app/bar-icons/bar-icons.component.ts b/public/src/app/bar-icons/bar-icons.component.ts index adf4b88..bf930f3 100644 --- a/public/src/app/bar-icons/bar-icons.component.ts +++ b/public/src/app/bar-icons/bar-icons.component.ts @@ -1,7 +1,7 @@ import { Component, Input, ViewChild } from '@angular/core'; -import { Store } from '../store/store'; -import { includes } from 'lodash'; import { NgForm } from '@angular/forms'; +import { includes } from 'lodash'; +import { Store } from '../store/store'; @Component({ selector: 'app-bar-icons', @@ -12,6 +12,11 @@ export class BarIconsComponent { configuration; @Input() tabName: string; @ViewChild('cdumpConfForm') cdumpConfForm: NgForm; + dropDownTypes = { + none: 1, + regularDDL: 2, + booleanDDL: 3 + }; constructor(public store: Store) {} @@ -21,19 +26,19 @@ export class BarIconsComponent { isPropertyDdl(property) { if (property.hasOwnProperty('constraints')) { - if ( - includes( - property.constraints[0].valid_values, - property.assignment.value - ) + if (includes(property.constraints[0].valid_values, property.value)) { + return this.dropDownTypes.regularDDL; + } else if ( + property.hasOwnProperty('type') && + property.type === 'boolean' ) { - return true; - } else { - return false; + if (!(property.value === 'false')) { + property.value = true; + } + return this.dropDownTypes.booleanDDL; } - } else { - return false; } + return this.dropDownTypes.none; } genrateBarTestId() { |