diff options
Diffstat (limited to 'cds-ui/designer-client')
7 files changed, 42 insertions, 36 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html index 3efc68838..b0f6a34ca 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html @@ -734,7 +734,7 @@ role="tab" aria-controls="nav-imports" aria-selected="false">DEFINITIONS</a> <a class="nav-item nav-link" id="nav-authentication-tab" data-toggle="tab" href="#nav-authentication" role="tab" aria-controls="nav-authentication" - aria-selected="false">EXTERNAL SYSTEM AUTHENTICATION PROPERTIES</a> + aria-selected="false">DSL PROPERTIES</a> <a class="nav-item nav-link" id="nav-topologytemplate-tab" data-toggle="tab" href="#nav-topologytemplate" role="tab" aria-controls="nav-authentication" aria-selected="false">Topology Template</a> @@ -860,4 +860,4 @@ </div> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts index b3894fe94..c69bf1b5f 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts @@ -252,8 +252,6 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl this.packageCreationStore.addTopologyTemplate(this.cbaPackage.templateTopology); this.formTreeData(); this.enrichPackage(); - this.designerStore.clear(); - this.packageCreationStore.clear(); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.ts index 97ab4411e..5dd123103 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.ts @@ -434,7 +434,6 @@ export class ActionAttributesComponent implements OnInit { if (currentFunction.definition['attributes']) { Object.keys(currentFunction.definition['attributes']).forEach(attribute => { this.suggestedAttributes.push(attribute); - this.suggestedAttributes.push('assignment-map'); }); } console.log(this.suggestedAttributes); diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html index 238906e2b..d188dbfa2 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html @@ -110,9 +110,7 @@ role="tab" aria-controls="nav-imports" aria-selected="false">DEFINITIONS</a> --> <a (click)="openTourGuide('dslTab')" tourAnchor="dslTab" class="nav-item nav-link" id="nav-authentication-tab" data-toggle="tab" href="#nav-authentication" role="tab" - aria-controls="nav-authentication" aria-selected="false">EXTERNAL - SYSTEM AUTHENTICATION - PROPERTIES</a> + aria-controls="nav-authentication" aria-selected="false">DSL PROPERTIES</a> </div> </div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html index 5027c5c02..490eef394 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html @@ -5,7 +5,9 @@ <a class="enter-link" href="#"><i class="icon-enter-link"></i></a> </div> <span tourAnchor="st-scriptsImport" class="import-container-span">Or you can also <a data-target="#scriptsModal" - data-toggle="modal" (click)="resetTheUploadedFiles()" href="#"><b>Import File</b></a></span> + data-toggle="modal" + (click)="resetTheUploadedFiles()" + href="#"><b>Import File</b></a></span> </div> @@ -21,22 +23,22 @@ <div [id]="'head-script-'+mapIndex" class="card-header"> <h5 class="mb-0 d-flex justify-content-between"> <button (click)="changeDivShow(mapIndex)" aria-expanded="false" class="btn btn-link collapsed" - data-toggle="collapse"> + data-toggle="collapse"> <i class="icon-file-code"></i> {{file.key}} </button> <a data-toggle="modal" (click)="initDelete(file)" data-target="#exampleModal" - class="accordion-delete"><i class="icon-delete-sm"></i></a> + class="accordion-delete"><i class="icon-delete-sm"></i></a> <!-- <a (click)="removeFile(file.key,mapIndex)" data-toggle="modal" data-target="#exampleModal" class="accordion-delete"><i class="icon-delete-sm"></i></a> --> <!-- Delete Modal --> <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" - aria-labelledby="exampleModalLabel" aria-hidden="true"> + aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title" id="exampleModalLabel">Delete Script</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <img src="assets/img/icon-close.svg" /> + <img src="assets/img/icon-close.svg"/> </button> </div> <div class="modal-body"> @@ -45,9 +47,11 @@ </div> <div class="modal-footer"> <button type="button" class="btn btn-secondary" - data-dismiss="modal">Cancel</button> + data-dismiss="modal">Cancel + </button> <button type="button" (click)="removeFile(fileToDelete?.key,0)" - data-dismiss="modal" class="btn btn-danger">Delete</button> + data-dismiss="modal" class="btn btn-danger">Delete + </button> </div> </div> </div> @@ -57,11 +61,12 @@ </h5> </div> <div [attr.aria-labelledby]="'head-script-'+mapIndex" [id]="'id-script-'+mapIndex" class="collapse" - data-parent="#accordion-script"> + data-parent="#accordion-script"> <div class="card-body"> <ace-editor [(text)]="file.value" (textChange)="textChanges($event,file.key)" [mode]="'kotlin'" - [autoUpdateContent]="true" [durationBeforeCallback]="1000" [theme]="'eclipse'" #editor - style="height:300px;"> + [autoUpdateContent]="true" [durationBeforeCallback]="5000" [theme]="'eclipse'" + #editor + style="height:300px;"> </ace-editor> </div> </div> @@ -73,21 +78,21 @@ </div> <div aria-hidden="true" aria-labelledby="scriptsModalLabel" class="modal fade" id="scriptsModal" role="dialog" - tabindex="-1"> + tabindex="-1"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title" id="scriptsModalLabel">Import File</h5> <button aria-label="Close" class="close" data-dismiss="modal" type="button"> - <img src="assets/img/icon-close.svg" /> + <img src="assets/img/icon-close.svg"/> </button> </div> <div class="modal-body"> <ngx-file-drop accept=".kt,.py" (onFileDrop)="dropped($event)" (onFileLeave)="fileLeave($event)" - (onFileOver)="fileOver($event)" dropZoneLabel="Drop files here"> + (onFileOver)="fileOver($event)" dropZoneLabel="Drop files here"> <ng-template let-openFileSelector="openFileSelector" ngx-file-drop-content-tmp> <div class="folder-upload"> - <img src="assets/img/folder-upload.svg" /> + <img src="assets/img/folder-upload.svg"/> </div> <div class="folder-upload-text"> Drag & Drop file @@ -103,25 +108,25 @@ <div class="upload-table"> <table class="table"> <thead> - <tr *ngFor="let item of uploadedFiles; let i=index"> - <th width="40"><img src="assets/img/icon-file-code.svg" /></th> - <th>{{ item.name }}</th> - <th (click)="removeInitFile(i)" width="40" class="text-right"><img - src="assets/img/icon-remove-file.svg" /></th> - </tr> + <tr *ngFor="let item of uploadedFiles; let i=index"> + <th width="40"><img src="assets/img/icon-file-code.svg"/></th> + <th>{{ item.name }}</th> + <th (click)="removeInitFile(i)" width="40" class="text-right"><img + src="assets/img/icon-remove-file.svg"/></th> + </tr> </thead> </table> </div> </div> <div class="modal-footer"> <button (click)="resetTheUploadedFiles()" class="btn btn-sm btn-secondary" data-dismiss="modal" - type="button">Cancel + type="button">Cancel </button> <button (click)="setFilesToStore()" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0" - data-dismiss="modal" type="button"> + data-dismiss="modal" type="button"> Import </button> </div> </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/scripts-tab/scripts-tab.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.ts index 2653d739c..fb275a04a 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.ts @@ -1,8 +1,10 @@ -import { Component, OnInit } from '@angular/core'; -import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop'; -import { PackageCreationStore } from '../package-creation.store'; +import {Component, OnInit} from '@angular/core'; +import {FileSystemFileEntry, NgxFileDropEntry} from 'ngx-file-drop'; +import {PackageCreationStore} from '../package-creation.store'; import 'ace-builds/src-noconflict/ace'; import 'ace-builds/webpack-resolver'; +import {ToastrService} from 'ngx-toastr'; + declare var $: any; @Component({ @@ -20,7 +22,9 @@ export class ScriptsTabComponent implements OnInit { constructor( private packageCreationStore: PackageCreationStore, - ) { } + private toastService: ToastrService + ) { + } ngOnInit() { @@ -53,6 +57,7 @@ export class ScriptsTabComponent implements OnInit { initDelete(file) { this.fileToDelete = file; } + removeFile(filePath: string, FileIndex: number) { const filename = filePath.split('/')[2] || ''; // const filename = 'Scripts/' + this.getFileType(this.uploadedFiles[fileIndex].name) + '/' + this.uploadedFiles[fileIndex].name; @@ -107,6 +112,7 @@ export class ScriptsTabComponent implements OnInit { textChanges(code: any, key: string) { this.packageCreationStore.addScripts(key, code); + this.toastService.success(key + ' is updated successfully'); } changeDivShow(mapIndex: number) { diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/topology-template/topology-template.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/topology-template/topology-template.component.html index f67364421..fc8abd3c4 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/topology-template/topology-template.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/topology-template/topology-template.component.html @@ -1,4 +1,4 @@ -<p>topology-template works!</p> + <ul class="defintionsNote"> <li><b>To add new property: </b></li> <li>1. Use Copy and paste option or</li> |