diff options
author | 2019-09-10 00:26:08 +0000 | |
---|---|---|
committer | 2019-09-10 00:26:08 +0000 | |
commit | 85f7fb219f6e1f4227ac1463290f6a6aafc2b84f (patch) | |
tree | 5ad10124076ce5fd5210075dd20046a3b7d78031 /cds-ui/client/src/app/feature-modules/resource-definition | |
parent | 98a00a5e3fac8b2ea7a23b8265fb5d70a8b9d35f (diff) | |
parent | 7918513759a4a6fd5ae90640c6b654a1a61f46b8 (diff) |
Merge "Resource Dictionary: fecthing data-type list"
Diffstat (limited to 'cds-ui/client/src/app/feature-modules/resource-definition')
3 files changed, 27 insertions, 4 deletions
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts index ed1ef6f37..f66a1c9c9 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts @@ -44,4 +44,8 @@ export class ResourceEditService { getModelType(name) { return this.api.get(ResourceDictionaryURLs.getModelType + '/' + name); } + + getDataTypes() { + return this.api.get(ResourceDictionaryURLs.getDataType); + } }
\ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html index d40dbd957..24bee2720 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html @@ -28,8 +28,9 @@ </mat-form-field> <mat-form-field class="form-field"> <mat-select matInput placeholder="Data Type" formControlName="_type"> - <mat-option value="string">string</mat-option> - <mat-option value="list">list</mat-option> + <!-- <mat-option value="string">string</mat-option> --> + <!-- <mat-option value="list">list</mat-option> --> + <mat-option value="string" *ngFor="let item of dataTypeList">{{item.modelName}}</mat-option> </mat-select> </mat-form-field> <mat-form-field class="form-field" > diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts index e155ec100..473b20038 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.ts @@ -24,13 +24,15 @@ import { Component, OnInit, EventEmitter, Output } from '@angular/core'; import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import { IResources } from 'src/app/common/core/store/models/resources.model'; import { IResourcesState } from 'src/app/common/core/store/models/resourcesState.model'; -import { Observable } from 'rxjs'; +import { Observable, from } from 'rxjs'; import { Store } from '@ngrx/store'; import { IAppState } from '../../../../common/core/store/state/app.state'; import { A11yModule } from '@angular/cdk/a11y'; + import { LoadResourcesSuccess } from 'src/app/common/core/store/actions/resources.action'; import { IPropertyData } from 'src/app/common/core/store/models/propertyData.model'; import { IEntrySchema } from 'src/app/common/core/store/models/entrySchema.model'; +import { ResourceEditService } from '../resource-edit.service'; @Component({ selector: 'app-resource-metadata', @@ -48,8 +50,13 @@ export class ResourceMetadataComponent implements OnInit { propertyValues = []; property = []; @Output() resourcesData = new EventEmitter(); + dataTypeList: any[] = [ + {modelName: 'String'}, {modelName: 'Boolean'}, {modelName: 'Integer'}, {modelName: 'Float'}, {modelName: 'Double'} + ]; - constructor(private formBuilder: FormBuilder, private store: Store<IAppState>) { + constructor(private formBuilder: FormBuilder, + private store: Store<IAppState>, + private resourceEditService: ResourceEditService) { this.rdState = this.store.select('resources'); this.ResourceMetadata = this.formBuilder.group({ Resource_Name: ['', Validators.required], @@ -62,6 +69,17 @@ export class ResourceMetadataComponent implements OnInit { } ngOnInit() { + this.resourceEditService.getDataTypes() + .subscribe(data=>{ + console.log(data); + if(data) { + data.forEach(element => { + this.dataTypeList.push(element); + }); + } + }, (error)=>{ + console.log("There is an error"); + }); this.rdState.subscribe( resourcesdata => { var resourcesState: IResourcesState = { resources: resourcesdata.resources, isLoadSuccess: resourcesdata.isLoadSuccess, isSaveSuccess: resourcesdata.isSaveSuccess, isUpdateSuccess: resourcesdata.isUpdateSuccess }; |