diff options
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab')
2 files changed, 57 insertions, 38 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html index 6508c96de..0ae8efb47 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html @@ -3,10 +3,11 @@ <label class="label-name">Mode</label> <label name="trst" *ngFor="let mode of modes; let i = index"> <input class="form-check-input" [(ngModel)]="metaDataTab.mode" type="radio" name="exampleRadios" - id="exampleRadios1" value={{mode.name}}> + id="exampleRadios1" value={{mode.name}}> <span> - <i [className]="mode.style" aria-hidden="true" [id]="mode.name"></i> + <i [className]="mode.style" aria-hidden="true" + [id]="mode.name"></i> {{mode.name}} </span> </label> @@ -26,22 +27,23 @@ </div> <div class="card creat-card"> - <div class="single-line-model error"> + <div class="single-line-model"> <label class="label-name">Name <span>*</span></label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.name" placeholder="Topology name.vLB.CDS"> + <input type="input" [readOnly]="!packageNameAndVersionEnables" [(ngModel)]="metaDataTab.name" + placeholder="Topology name.vLB.CDS"> </div> - <div class="model-note-container error-message"> + <!--<div class="model-note-container error-message"> Package name already exists with this version. Please enter a different name or enter different version number. - </div> + </div>--> </div> <div class="single-line-model"> <label class="label-name">Version <span>*</span></label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.version" (input)="validatePackageNameAndVersion()" - placeholder="Example: 1.0.0"> + <input type="input" [readOnly]="!packageNameAndVersionEnables" [(ngModel)]="metaDataTab.version" (input)="validatePackageNameAndVersion()" + placeholder="Example: 1.0.0"> </div> <div class="model-note-container error-message">{{errorMessage}}</div> </div> @@ -56,13 +58,13 @@ <label class="label-name">tags</label> <div class="label-input"> <input type="input" (keyup.enter)="addTag($event)" [(ngModel)]="metaDataTab.tags" - placeholder="Ex., vDNS-CDS"> + placeholder="Ex., vDNS-CDS"> </div> <div class="model-note-container tag-notes">Seprate tags with comma or space</div> <div class="model-note-container tages-container"> <span *ngFor="let tag of tags" class="single-tage">{{tag}} <i (click)="removeTag(tag)" - class="fa fa-times-circle"></i></span> + class="fa fa-times-circle"></i></span> </div> </div> </div> @@ -77,7 +79,7 @@ </div> <div *ngFor="let map of customKeysMap | keyvalue; let i=index" class="single-custom-key"> <div class="single-line-custom-key"> - <label class="label-name"><span>{{i+1}}-</span> Name</label> + <label class="label-name"><span>{{i + 1}}-</span> Name</label> <div class="label-input"> <input value="{{map.key}}" name="key" type="input" placeholder="Enter name"> </div> @@ -88,23 +90,25 @@ <input value="{{map.value}}" name="value" type="input" placeholder="Enter value"> </div> </div> - <div class="single-line-custom-key-delete"><button (click)="removeKey($event,map.key)" - class="custom-key-delete"><i aria-hidden="true" class="icon-delete"></i></button></div> + <div class="single-line-custom-key-delete"> + <button (click)="removeKey($event,map.key)" + class="custom-key-delete"><i aria-hidden="true" class="icon-delete"></i></button> + </div> </div> <div class="single-custom-key"> <div class="single-line-custom-key"> - <label class="label-name"><span>{{customKeysMap.size+1}}.</span> Name</label> + <label class="label-name"><span>{{customKeysMap.size + 1}}.</span> Name</label> <div class="label-input"> <input (keyup.enter)="addCustomKey()" name="key" type="input" class="mapKey" - placeholder="Enter name"> + placeholder="Enter name"> </div> </div> <div class="single-line-custom-key"> <label class="label-name">Value</label> <div class="label-input"> <input (keyup.enter)="addCustomKey()" class="mapValue" name="value" type="input" - placeholder="Enter value"> + placeholder="Enter value"> </div> </div> <!-- <div class="single-line-custom-key-delete"><button (click)="removeKey($event)" @@ -113,4 +117,4 @@ </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts index eb486cf4f..b99925716 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.ts @@ -1,8 +1,9 @@ -import { Component, OnInit } from '@angular/core'; -import { PackageCreationService } from '../package-creation.service'; -import { MetaDataTabModel } from '../mapping-models/metadata/MetaDataTab.model'; -import { PackageCreationStore } from '../package-creation.store'; -import { PackageStore } from '../../configuration-dashboard/package.store'; +import {Component, OnInit} from '@angular/core'; +import {PackageCreationService} from '../package-creation.service'; +import {MetaDataTabModel} from '../mapping-models/metadata/MetaDataTab.model'; +import {PackageCreationStore} from '../package-creation.store'; +import {PackageStore} from '../../configuration-dashboard/package.store'; +import {ActivatedRoute} from '@angular/router'; @Component({ @@ -11,37 +12,47 @@ import { PackageStore } from '../../configuration-dashboard/package.store'; styleUrls: ['./metadata-tab.component.css'] }) export class MetadataTabComponent implements OnInit { - + packageNameAndVersionEnables = true; counter = 0; tags = new Set<string>(); customKeysMap = new Map(); modes: object[] = [ - { name: 'Designer Mode', style: 'mode-icon icon-designer-mode' }, - { name: 'Scripting Mode', style: 'mode-icon icon-scripting-mode' }, - { name: 'Generic Script Mode', style: 'mode-icon icon-generic-script-mode' }]; + {name: 'Designer Mode', style: 'mode-icon icon-designer-mode'}]; + /* {name: 'Scripting Mode', style: 'mode-icon icon-scripting-mode'}, + {name: 'Generic Script Mode', style: 'mode-icon icon-generic-script-mode'}];*/ private metaDataTab: MetaDataTabModel = new MetaDataTabModel(); private errorMessage: string; - constructor( - private packageCreationService: PackageCreationService, - private packageCreationStore: PackageCreationStore, - private packageStore: PackageStore) { + constructor(private route: ActivatedRoute, + private packageCreationService: PackageCreationService, + private packageCreationStore: PackageCreationStore, + private packageStore: PackageStore) { } ngOnInit() { this.metaDataTab.templateTags = this.tags; this.metaDataTab.mapOfCustomKey = this.customKeysMap; - this.packageCreationStore.changeMetaData(this.metaDataTab); - this.packageStore.state$.subscribe(element => { - if (element && element.configuration) { - console.log('from element2'); + const id = this.route.snapshot.paramMap.get('id'); + id ? this.packageNameAndVersionEnables = false : + this.packageNameAndVersionEnables = true; + this.packageCreationStore.state$.subscribe(element => { + + if (element && element.metaData) { + + this.metaDataTab.name = element.metaData.name; + this.metaDataTab.version = element.metaData.version; + this.metaDataTab.description = element.metaData.description; + this.tags = element.metaData.templateTags; + this.metaDataTab.templateTags = this.tags; console.log(element); - this.metaDataTab.name = element.configuration.artifactName; - this.metaDataTab.version = element.configuration.artifactVersion; - this.metaDataTab.description = element.configuration.artifactDescription; - this.tags = new Set(element.configuration.tags.split(',')); + if (element.metaData.mode && element.metaData.mode.includes(' DEFAULT')) { + this.metaDataTab.mode = 'Designer Mode'; + } + + this.customKeysMap = element.metaData.mapOfCustomKey; + // this.tags = element.metaData.templateTags; } }); @@ -95,4 +106,8 @@ export class MetadataTabComponent implements OnInit { } } + + saveMetaDataToStore() { + this.packageCreationStore.changeMetaData(this.metaDataTab); + } } |