diff options
Diffstat (limited to 'cds-ui/designer-client/src/app')
8 files changed, 60 insertions, 21 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 8e2ae5dbb..ba5eca973 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 @@ -106,16 +106,17 @@ </div> </div> </div> - <div class="col-2 package-view-button pt-3"> + <div class="col-2 package-view-button"> <!-- <button class="btn btn-sm btn-primary mb-2" (click)="goToDesignerMode()">Designer Mode </button> --> <!-- Button trigger modal - 1st Action --> + <button type="button" class="btn btn-sm btn-primary mb-2" data-toggle="modal" data-target="#exampleModalLong"> - Designer Mode + <i class="icon-topologyView-active"></i> Designer Mode </button> - <!-- Modal --> + <!-- Designer Modal --> <div class="modal fade createActionModal" id="exampleModalLong" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true"> <div class="modal-dialog" role="document"> @@ -658,7 +659,13 @@ </div> </div> </div> - <button class="btn btn-sm btn-outline-secondary" (click)="deployCurrentPackage()"><i + <button type="button" class="btn btn-sm mb-2 btn-enrich" data-toggle="modal" + data-target="#enrichModal"> + <i class="icon-enrich" aria-hidden="true"></i> Manual Enrich + </button> + + + <button class="btn btn-sm btn-deploy" (click)="deployCurrentPackage()"><i class="fa fa-play-circle"></i> Deploy </button> </div> @@ -722,7 +729,35 @@ </div> </div> - +<!-- Enrich Modal --> +<div class="modal fade enrichModal" id="enrichModal" tabindex="-1" role="dialog" aria-labelledby="enrichModalLabel" + aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title" id="enrichModalLabel">Manual Enrich</h5> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <img src="assets/img/icon-close.svg" /> + </button> + </div> + <div class="modal-body"> + <ul class="defintionsNote"> + <li><b>To do manual enrichment: </b></li> + <li>1. Copy and paste "workflows" and "node_templates"</li> + <li>2. Press <b>Enrich</b> button</li> + </ul> + <ace-editor [(text)]="dslDefinition.content" [mode]="'javascript'" [autoUpdateContent]="true" + [durationBeforeCallback]="1000" (textChanged)="textChanged($event)" [theme]="'eclipse'" #editor + style="height:300px;"> + </ace-editor> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="button" data-dismiss="modal" class="btn btn-primary btn-enrich">Enrich</button> + </div> + </div> + </div> +</div> <!-- Delete Modal --> <div class="modal fade" id="removePackageModal" tabindex="-1" role="dialog" aria-labelledby="removePackageModalLabel" aria-hidden="true"> @@ -731,7 +766,7 @@ <div class="modal-header"> <h5 class="modal-title" id="removePackageModalLabel">Delete Script</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <i class="icon-action-close"></i> </button> </div> <div class="modal-body"> @@ -744,4 +779,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 0e1d4cd11..fa127290c 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 @@ -39,6 +39,7 @@ export class ConfigurationDashboardComponent implements OnInit { id: any; currentBlob = new Blob(); + dslDefinition: DslDefinition = new DslDefinition(); constructor( private route: ActivatedRoute, @@ -248,4 +249,8 @@ export class ConfigurationDashboardComponent implements OnInit { public fileLeave(event) { console.log(event); } + + textChanged($event: {}) { + + } } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html index 940177e6a..9ac7a058a 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html @@ -53,7 +53,7 @@ <div class="modal-header"> <h5 class="modal-title" id="exampleModalLabel">Delete File</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <img src="assets/img/icon-close.svg" /> </button> </div> <div class="modal-body"> 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 e859062be..bd501c163 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 @@ -36,7 +36,7 @@ <div class="modal-header"> <h5 class="modal-title" id="exampleModalLabel">Delete Script</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <img src="assets/img/icon-close.svg" /> </button> </div> <div class="modal-body"> @@ -122,4 +122,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/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html index e1b0f83d6..f517cb108 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html @@ -5,14 +5,11 @@ class="fa fa-chevron-left mr-2"></i>Template List</button> </div> <div class="col text-right"> - <button data-toggle="modal" [hidden]="!edit" data-target="#templateDeletionModal2" class="btn btn-outline-danger" title="Delete Template">Delete</button> - - <button (click)="cancel()" [hidden]="fileName?.length <=0 || edit" class="btn btn-outline-secondary">Clear</button> - <button (click)="saveToStore()" [disabled]="fileName?.length <=0" class="btn btn-primary">Finish</button> + <button (click)="saveToStore()" [disabled]="fileName?.length <=0" title="Submit template and close" class="btn btn-primary">Finish</button> </div> </div> <div class="card creat-card"> @@ -74,7 +71,9 @@ <div class="create-template-import">Use the editor to add parameters or you can also <a href="#" data-toggle="modal" (click)="allowedExt=[getFileExtension()]" data-target="#templateModal"><b>Import - File</b></a></div> + File</b></a>. <br /> <span class="templateNote"><i class="icon-info" + aria-hidden="true"></i> When you import new file, the new attributes will replace + current attributes.</span></div> <div class="editor-container mb-4"> <app-source-editor [lang]="'velocity'" (textChange)="textChanges($event,templateInfo.fileName)" [(text)]="templateFileContent"></app-source-editor> @@ -259,7 +258,7 @@ <th width="40"><img src="assets/img/icon-file-code.svg" /></th> <th>{{ item.name }}</th> <th (click)="removeFile(i)" width="40" class="text-right"><img - src="assets/img/icon-remove-file.svg" /></th> + src="assets/img/icon-remove-file.svg" class="btn-modal-remove-file" /></th> </tr> </thead> </table> @@ -287,7 +286,7 @@ <div class="modal-header"> <h5 class="modal-title" id="templateDeletionModal2Label">Delete Script</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <img src="assets/img/icon-close.svg" /> </button> </div> <div class="modal-body"> @@ -301,4 +300,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/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.html index 3e377981e..bc87ae2c0 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.html @@ -48,7 +48,7 @@ <div class="modal-header"> <h5 class="modal-title" id="templateDeletionModalLabel">Delete Script</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <img src="assets/img/icon-close.svg" /> </button> </div> <div class="modal-body"> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html index 48a503321..48fd4806a 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html @@ -6,4 +6,4 @@ <div [hidden]="creationView"> <app-templ-mapp-creation (showListView)="openListView()" (showCreationView)="openCreationView()"> </app-templ-mapp-creation> -</div>
\ No newline at end of file +</div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html index 1e6959fdc..f5588bc43 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html @@ -78,7 +78,7 @@ <p class="mb-2">By {{bluePrint.updatedBy.split('<')[0]}}</p> <p class="package-desc" [delay]="300" tooltip="{{bluePrint.artifactDescription}}" - placement="auto">{{bluePrint.artifactDescription}}</p> + placement="bottom left">{{bluePrint.artifactDescription}}</p> <ul class="package-contributers"> <li> <button type="button" class="border-fade" data-toggle="tooltip" data-placement="bottom" |