diff options
author | KAPIL SINGAL <ks220y@att.com> | 2021-01-14 04:21:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-01-14 04:21:41 +0000 |
commit | 424fcd63ca57bd8cfa8b46001021c29e020a8a6d (patch) | |
tree | a01ea339509880ea337ef4290eba008af964766b /cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata | |
parent | cae13f9196921c1b854d2f199db4dfbdd5868a62 (diff) | |
parent | 50b86c6a59e2a65c4a2ff5c97997bba21da6a98b (diff) |
Merge "enable 2-way binding between metadata and editor tabs"
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata')
2 files changed, 34 insertions, 23 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.html index bea6081c0..add21e9e1 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.html @@ -21,10 +21,9 @@ <div class="single-line-model"> <label class="label-name">Name</label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.name" - placeholder="Topology name.vLB.CDS"> + <input type="input" [(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> --> @@ -41,39 +40,40 @@ <div class="single-line-model"> <label class="label-name">Entry Schema</label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.entrySchema" placeholder="Entry Schema"> + <input type="input" [(ngModel)]="metaDataTab.property.entry_schema.type" placeholder="Entry Schema"> </div> </div> <div class="single-line-model"> <label class="label-name">Data Type</label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.dataType" placeholder="Data Type"> + <input type="input" [(ngModel)]="metaDataTab.property.type" placeholder="Data Type"> </div> </div> <div class="single-line-model"> <label class="label-name">Description</label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.description" placeholder="Descripe the package"> + <input type="input" [(ngModel)]="metaDataTab.property.description" placeholder="Descripe the package"> </div> </div> <div class="single-line-model"> <label class="label-name">Required</label> <div class="label-input"> - <input type="input" [(ngModel)]="metaDataTab.updatedBy" placeholder="required"> + <input type="checkbox" [checked]="metaDataTab.property.required" style="width: auto;" + (change)="metaDataTab.property.required = !metaDataTab.property.required" placeholder="required"> </div> </div> - <div class="single-line-model"> + <!-- <div class="single-line-model"> <label class="label-name">Library Instance</label> <div class="label-input"> <input type="input" [(ngModel)]="metaDataTab.libraryInstance" placeholder="Library Instance"> </div> - </div> - <div class="single-line-model"> + </div> --> + <!-- <div class="single-line-model"> <label class="label-name">Derived From</label> <div class="label-input"> <input type="input" [(ngModel)]="metaDataTab.derivedFrom" placeholder="Derived From"> </div> - </div> + </div> --> <div class="single-line-model"> <label class="label-name">Tags</label> @@ -88,4 +88,4 @@ class="fa fa-times-circle"></i></span> </div> </div> -</div> +</div>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.ts index caeac83f1..631a0fffd 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/resource-dictionary/resource-dictionary-creation/dictionary-metadata/dictionary-metadata.component.ts @@ -44,36 +44,47 @@ export class DictionaryMetadataComponent implements OnInit { ngOnInit() { this.dictionaryCreationStore.state$.subscribe(element => { + console.log(this.metaDataTab); if (element && element.metaData) { - this.metaDataTab.name = element.metaData.name; - this.metaDataTab.description = element.metaData.description; - this.metaDataTab.dataType = element.metaData.dataType; - this.metaDataTab.tags = element.metaData.tags; - this.metaDataTab.entrySchema = element.metaData.entrySchema; - this.metaDataTab.required = element.metaData.required; - this.metaDataTab.libraryInstance = element.metaData.libraryInstance; - this.metaDataTab.derivedFrom = element.metaData.derivedFrom; - console.log(element); + this.metaDataTab = element.metaData; + this.metaDataTab.property.entry_schema = element.metaData.property.entry_schema; + this.tags = new Set(element.metaData.tags.split(',')); + this.tags.delete(''); + this.tags.delete(' '); + + // console.log(element); + // console.log(element.metaData.property['entry_schema']); } }); - console.log(this.metaDataTab.name); + } + // getSources() { + // this.dictionaryCreationService.getSources().subscribe(res => { + // console.log(res); + // }); + // } + removeTag(value) { this.tags.delete(value); } + addTag(event) { const value = event.target.value; console.log(value); if (value && value.trim().length > 0) { + let tag = ''; event.target.value = ''; this.tags.add(value); + this.tags.forEach(val => { + tag += val + ', '; + }); } } saveMetaDataToStore() { console.log(this.metaDataTab); - // this.dictionaryCreationStore.changeMetaData(this.metaDataTab); + this.dictionaryCreationStore.changeMetaData(this.metaDataTab); } } |