adapt UI to select ArtifactType

winery · Jun 3, 2020 · 43f57ce · 43f57ce
1 parent d5c8990
commit 43f57ce
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/...gement/src/app/instance/refinementModels/attributeMappings/attributeMappings.component.ts b/...gement/src/app/instance/refinementModels/attributeMappings/attributeMappings.component.ts
@@ -39,7 +39,6 @@ export class AttributeMappingsComponent implements OnInit {
 
     loading = true;
     columns: Array<WineryTableColumn> = [
-        { title: 'Id', name: 'id', sort: true },
         { title: 'Detector Node', name: 'detectorNode', sort: true },
         { title: 'Refinement Node', name: 'refinementNode', sort: true },
         { title: 'Type', name: 'type', sort: true },
@@ -71,7 +70,7 @@ export class AttributeMappingsComponent implements OnInit {
 
     constructor(private service: RefinementMappingsService,
                 private notify: WineryNotificationService,
-                private sharedData: InstanceService,
+                public sharedData: InstanceService,
                 private modalService: BsModalService) {
     }
 

diff --git a/...rc/app/instance/refinementModels/deploymentArtifactsMappings/deploymentArtifactMapping.ts b/...rc/app/instance/refinementModels/deploymentArtifactsMappings/deploymentArtifactMapping.ts
@@ -17,7 +17,7 @@ export class DeploymentArtifactMapping extends RefinementMappings {
 
     public static readonly idPrefix = 'artifactMap';
 
-    public artifactName: string;
+    public artifactType: string;
 
     constructor(id: number) {
         super(id);

diff --git a/...e/refinementModels/deploymentArtifactsMappings/deploymentArtifactsMappings.component.html b/...e/refinementModels/deploymentArtifactsMappings/deploymentArtifactsMappings.component.html
@@ -31,12 +31,14 @@
                            (selected)="mapping.detectorNode = $event.id">
                 </ng-select>
             </div>
-            
+
             <div class="form-group">
-                <label for="artifactName" class="control-label">Required DA Name</label>
-                <input type="text" id="artifactName" [(ngModel)]="mapping.artifactName" name="artifactName" class="form-control">
+                <label for="artifactType" class="control-label">Required DA Type</label>
+                <ng-select id="artifactType" [items]="artifactTypes"
+                           (selected)="mapping.artifactType = $event.id">
+                </ng-select>
             </div>
-            
+
             <div class="form-group">
                 <label for="refinementNode" class="control-label">Refinement Structure Node</label>
                 <ng-select id="refinementNode" [items]="refinementNodes" [textField]="'name'"
@@ -48,7 +50,7 @@
     </winery-modal-body>
     <winery-modal-footer [modalRef]="addModalRef"
                          [okButtonLabel]="'Add'"
-                         [disableOkButton]="!mapping.detectorNode || !mapping.refinementNode"
+                         [disableOkButton]="!mapping.detectorNode || !mapping.refinementNode || !mapping.artifactType"
                          (onOk)="onAddRelationMapping()">
     </winery-modal-footer>
 </ng-template>

diff --git a/...nce/refinementModels/deploymentArtifactsMappings/deploymentArtifactsMappings.component.ts b/...nce/refinementModels/deploymentArtifactsMappings/deploymentArtifactsMappings.component.ts
@@ -33,15 +33,15 @@ export class DeploymentArtifactsMappingsComponent implements OnInit {
 
     loading = true;
     columns: Array<WineryTableColumn> = [
-        { title: 'Id', name: 'id', sort: true },
+        { title: 'Deployment Artifact Type', name: 'artifactType', sort: true },
         { title: 'Detector Element', name: 'detectorNode', sort: true },
-        { title: 'Deployment Artifact Name', name: 'artifactName', sort: true },
         { title: 'Refinement Element', name: 'refinementNode', sort: true },
     ];
 
     deploymentArtifactMappings: DeploymentArtifactMapping[];
     detectorNodes: NodeTemplate[];
     refinementNodes: NodeTemplate[];
+    artifactTypes: SelectData[];
 
     mapping: DeploymentArtifactMapping;
 
@@ -61,6 +61,7 @@ export class DeploymentArtifactsMappingsComponent implements OnInit {
             this.service.getDeploymentArtifactMappings(),
             this.service.getDetectorNodeTemplates(),
             this.service.getRefinementTopologyNodeTemplates(),
+            this.service.getArtifactTypes(),
         ).subscribe(
             data => this.handleData(data),
             error => this.handleError(error)
@@ -113,11 +114,12 @@ export class DeploymentArtifactsMappingsComponent implements OnInit {
         this.notify.error(error.message);
     }
 
-    private handleData(data: [DeploymentArtifactMapping[], NodeTemplate[], NodeTemplate[]]) {
+    private handleData(data: [DeploymentArtifactMapping[], NodeTemplate[], NodeTemplate[], SelectData[]]) {
         this.loading = false;
         this.deploymentArtifactMappings = data[0];
         this.detectorNodes = data[1];
         this.refinementNodes = data[2];
+        this.artifactTypes = data[3];
     }
 
     // endregion

diff --git a/...ends/app/tosca-management/src/app/instance/refinementModels/refinementMappings.service.ts b/...ends/app/tosca-management/src/app/instance/refinementModels/refinementMappings.service.ts
@@ -60,6 +60,10 @@ export class RefinementMappingsService {
         return this.http.get<SelectData[]>(backendBaseURL + '/nodetypes/?grouped=angularSelect');
     }
 
+    public getArtifactTypes(): Observable<SelectData[]> {
+        return this.http.get<SelectData[]>(backendBaseURL + '/artifacttypes/?grouped=angularSelect');
+    }
+
     public getRelationshipMappings(): Observable<RelationMapping[]> {
         return this.http.get<RelationMapping[]>(this.path + '/relationmappings');
     }

diff --git a/...ment/src/app/instance/refinementModels/relationshipMappings/relationMappings.component.ts b/...ment/src/app/instance/refinementModels/relationshipMappings/relationMappings.component.ts
@@ -37,7 +37,6 @@ export class RelationMappingsComponent implements OnInit {
 
     loading = true;
     columns: Array<WineryTableColumn> = [
-        { title: 'Id', name: 'id', sort: true },
         { title: 'Direction', name: 'direction', sort: true },
         { title: 'Detector Node', name: 'detectorNode', sort: true },
         { title: 'Refinement Node', name: 'refinementNode', sort: true },

diff --git a/...tosca-management/src/app/instance/refinementModels/stayMappings/stayMappings.component.ts b/...tosca-management/src/app/instance/refinementModels/stayMappings/stayMappings.component.ts
@@ -23,7 +23,6 @@ import { SelectData } from '../../../model/selectData';
 import { InstanceService } from '../../instance.service';
 import { PrmModelElementType, StayMapping } from './stayMapping';
 import { forkJoin } from 'rxjs';
-import { RelationMapping } from '../relationshipMappings/relationMapping';
 
 @Component({
     templateUrl: 'stayMappings.component.html',
@@ -38,7 +37,6 @@ export class StayMappingsComponent implements OnInit {
     loading = true;
     loadingElements = false;
     columns: Array<WineryTableColumn> = [
-        { title: 'Id', name: 'id', sort: true },
         { title: 'Element Type', name: 'modelElementType', sort: true },
         { title: 'Detector Element', name: 'detectorNode', sort: true },
         { title: 'Refinement Element', name: 'refinementNode', sort: true },