+import { JsonObject, JsonProperty } from 'json2typescript';
+
/*
* ============LICENSE_START=======================================================
* ONAP : CDS
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
+@JsonObject()
export class MetaData {
+ @JsonProperty('name')
public name: string;
- public dataType: string;
- public description: string;
- public entrySchema: string;
- public updatedBy: string;
public tags: string;
- public required: string;
+ @JsonProperty('updated-by')
+ public updatedBy: string;
+ public property: Property;
- public createdDate: string;
- public libraryInstance: string;
- public derivedFrom: string;
+ constructor() {
+ this.name = '';
+ this.tags = '';
+ this.updatedBy = '';
+ this.property = new Property();
+ }
+}
+
+@JsonObject()
+export class Property {
+ public description: string;
+ type: string;
+ required: boolean;
+ @JsonProperty('entry_schema')
+ // tslint:disable-next-line: variable-name
+ entry_schema: EntrySchema = new EntrySchema();
+
+ constructor() {
+ this.description = '';
+ this.type = '';
+ this.entry_schema = new EntrySchema();
+ this.required = false;
+ }
+
+}
+@JsonObject()
+export class EntrySchema {
+ type: string;
+ constraints: [];
+ constructor() {
+ this.type = '';
+ this.constraints = [];
+ }
}
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+import { JsonPipe } from '@angular/common';
import { Component, OnInit } from '@angular/core';
import { DictionaryCreationService } from '../dictionary-creation.service';
import { DictionaryCreationStore } from '../dictionary-creation.store';
text = '';
constructor(
private dictionaryStore: DictionaryCreationStore,
- private dictionaryService: DictionaryCreationService
+ private dictionaryService: DictionaryCreationService,
+ private pipe: JsonPipe
) {
}
ngOnInit() {
+ this.dictionaryStore.state$.subscribe(element => {
+ if (element && element.metaData) {
+ this.text = this.pipe.transform(element.metaData);
+ }
+ });
}
textChanged(event) {
<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> -->
<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>
class="fa fa-times-circle"></i></span>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
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);
}
}
}
saveDictionaryToStore() {
+ this.metadataTabComponent.saveMetaDataToStore();
// console.log('00000000000');
// this.dictionaryCreationStore.getSources();
// this.dictionaryCreationStore.state$.subscribe(dd => {
import { Component, OnInit } from '@angular/core';
import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
import { SourcesStore } from './sources.store';
+import { DictionaryCreationService } from '../dictionary-creation.service';
@Component({
selector: 'app-sources-template',
export class SourcesTemplateComponent implements OnInit {
private searchQuery = '';
lang = 'json';
- sources = [];
+ sources = {};
option = [];
sourcesOptions = [];
textValue: any;
searchText = '';
text = '';
selectedArray = [];
- constructor(private sourcesStore: SourcesStore) {
- this.sourcesStore.state$.subscribe(sources => {
- this.sources = sources.sources;
+ constructor(
+ private sourcesStore: SourcesStore,
+ private dictionaryCreationService: DictionaryCreationService
+ ) {
+
+ }
+
+ ngOnInit() {
+ // this.sourcesStore.getAllSources();
+ this.dictionaryCreationService.getSources().subscribe(sources => {
+ // console.log(sources);
+ this.sources = sources[0];
+ // this.sources = {
+ // "input": "source-input", "rest": "source-rest", "default":"source-default", "capability": "source-capability",
+ // "sdnc": "source-rest", "vault-data": "source-rest", "processor-db": "source-db", "aai-data": "source-rest",
+ // "script": "source-capability"
+ // };
for (const key in this.sources) {
if (key) {
- const sourceObj = { name: key, value: JSON.stringify(this.sources[key]) };
+ console.log(key + ' - ' + this.sources[key]);
+ const sourceObj = { name: key, value: this.sources[key] };
this.option.push(sourceObj);
}
}
- });
- }
- ngOnInit() {
- this.sourcesStore.getAllSources();
+ });
}
saveSorcesDataToStore() {
}
drop(event: CdkDragDrop<string[]>) {
+ console.log('-------------');
+ console.log(event);
this.ddSource = [];
if (event.previousContainer === event.container) {
moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
if (key2) {
const originalSources = this.sourcesOptions;
for (const key of originalSources) {
- if (key.name === key2) {
+ /* tslint:disable:no-string-literal */
+ if (key.name === key2['name']) {
const obj = `{${key.name}: ${key.value}}`;
this.ddSource.push(obj);
}
Code Review / ccsdk / cds.git / commitdiff