aboutsummaryrefslogtreecommitdiffstats
path: root/cds-ui/designer-client/src
diff options
context:
space:
mode:
Diffstat (limited to 'cds-ui/designer-client/src')
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts2
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.ts17
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts8
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html17
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts2
-rw-r--r--cds-ui/designer-client/src/styles.css29
6 files changed, 35 insertions, 40 deletions
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 7ab8ad7bc..0d92aadfb 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
@@ -175,7 +175,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
bluePrintDetailModels => {
if (bluePrintDetailModels) {
const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1];
- this.toastService.info('Package Updated Successfully ');
+ this.toastService.success('Package Updated Successfully ');
this.isSaveEnabled = false;
this.router.navigate(['/packages/package/' + id]);
this.refreshCurrentPackage(id);
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 15f2ce456..6873f8948 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
@@ -120,7 +120,9 @@ export class ActionAttributesComponent implements OnInit {
console.log(input);
if (input && input.type && input.name) {
const insertedInputActionAttribute = Object.assign({}, input);
- this.newInputs.push(insertedInputActionAttribute);
+ if (!this.newInputs.includes(insertedInputActionAttribute)) {
+ this.newInputs.push(insertedInputActionAttribute);
+ }
}
}
@@ -166,7 +168,7 @@ export class ActionAttributesComponent implements OnInit {
this.storeOutputs(this.newOutputs);
this.storeInputs((this.newInputs));
this.newInputs.forEach(input => {
- if (!this.inputs.includes(input)) {
+ if (!this.inputs.includes(input.name)) {
this.inputs.push(input);
}
});
@@ -392,16 +394,7 @@ export class ActionAttributesComponent implements OnInit {
this.convertToObject(originalAttributes.substr(0, originalAttributes.length - 1)
+ newAttributes + '}');
}
- const action = this.designerState.template.workflows[this.actionName] as Action;
- this.inputs = [];
- if (action.inputs) {
- const namesOfInput = Object.keys(action.inputs);
- this.inputs = this.extractFields(namesOfInput, action.inputs);
- }
- /* console.log(originalAttributes.substr(0, originalAttributes.length - 1) + ',' + newAttributes + '}');
- this.designerState.template.workflows[this.actionName][attributeType] =
- this.convertToObject(originalAttributes.substr(0, originalAttributes.length - 1)
- + ',' + newAttributes + '}');*/
+
}
private removeTheLastComma(newInputs: string): string {
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
index cc7de5f41..652d235a0 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
@@ -535,12 +535,12 @@ export class DesignerComponent implements OnInit, OnDestroy {
.then(blob => {
this.packageCreationService.savePackage(blob).subscribe(
bluePrintDetailModels => {
- this.toastService.info('success updating the package');
+ this.toastService.success('Package is updated successfully');
const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1];
this.router.navigate(['/packages/designer/' + id]);
console.log('success');
}, error => {
- this.toastService.error('error happened when editing ' + error.message);
+ this.toastService.error('Error Occured during editing process' + error.message);
console.log('Error -' + error.message);
}, () => {
this.ngxService.stop();
@@ -591,11 +591,11 @@ export class DesignerComponent implements OnInit, OnDestroy {
saveAs(blob, this.viewedPackage.artifactName + '-' + this.viewedPackage.artifactVersion + '-CBA.zip');
}, err => {
- this.toastService.error('package ' + this.viewedPackage.artifactName + 'has error when downloading' +
+ this.toastService.error('Package ' + this.viewedPackage.artifactName + 'has error when downloading' +
err.message);
this.ngxService.stop();
}, () => {
- this.toastService.success('package ' + this.viewedPackage.artifactName + 'downloaded successfully');
+ this.toastService.success('Package ' + this.viewedPackage.artifactName + 'downloaded successfully');
this.ngxService.stop();
});
}
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 a38027ff5..6782998db 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
@@ -1,16 +1,11 @@
<div class="import-container-all">
- <div class="import-container">
- <div class="import-container-input">
- <input class="ng-pristine ng-valid ng-touched" placeholder="Enter file URL then ENTER" type="input">
- <a class="enter-link" href="#"><i class="icon-enter-link"></i></a>
- </div>
+ <div class="mb-4">
+ <!--Create Script File-->
+ <button type="button" data-target="#createScriptsModal" data-toggle="modal" class="btn mb-2 mr-2 create-script-button"><i class="fa fa-plus"></i> <span></span>Create Script
+ </button>
<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>
-
</div>
- <!--Create Script File-->
- <button type="button" data-target="#createScriptsModal" data-toggle="modal" class="btn btn-info mb-2">Create
- </button>
<!---->
<div class="accordion">
@@ -135,7 +130,7 @@
<!-- create script modal -->
<div aria-hidden="true" aria-labelledby="createScriptsModalLabel" class="modal fade" id="createScriptsModal"
role="dialog" tabindex="-1">
- <div class="modal-dialog modal-xl" role="document">
+ <div class="modal-dialog" style="max-width: 60%" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="createScriptsModalLabel">Create Script File</h5>
@@ -210,7 +205,7 @@
</button>
<button (click)="textCurrentChanges()" data-dismiss="modal" [disabled]="currentFileName?.length == 0 ||
this.currentFileContent?.length == 0" title="Save script file"
- class="btn btn-sm btn-primary">Save
+ class="btn btn-sm btn-primary">Create Script
</button>
</div>
</div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
index 0f5210230..2f151d1bf 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
@@ -68,7 +68,7 @@ export class PackageListComponent implements OnInit {
this.router.navigate(['/packages']);
this.packagesStore.getAll();
}, err => {
- this.toastService.error('Error occured during deleting package ' + err.message);
+ this.toastService.error('Error has occured during deleting package ' + err.message);
});
}
diff --git a/cds-ui/designer-client/src/styles.css b/cds-ui/designer-client/src/styles.css
index 88c6159f1..0055520a7 100644
--- a/cds-ui/designer-client/src/styles.css
+++ b/cds-ui/designer-client/src/styles.css
@@ -3243,19 +3243,23 @@ padding: 0 10px 0 0;
padding-bottom: 5px !important;
overflow: auto;
}
-.create-template-mapping-button{
- background: #C3CDDB;
- border-radius: 50px;
- font-size: 12px;
- font-weight: bold;
- padding: 10px 20px;
+.create-template-mapping-button,
+.create-script-button{
+ background: #C3CDDB !important;
+ border-radius: 50px !important;
+ font-size: 12px !important;
+ font-weight: bold !important;
+ padding: 10px 20px !important;
margin-bottom: 20px;
- display: inline-block;
- cursor: pointer;
+ display: inline-block;
+ cursor: pointer;
+ color: #1B3E6F !important;
+}
+.create-template-mapping-button i,
+.create-script-button i{
+ margin-right: 5px;
+
}
-.create-template-mapping-button i{
-margin-right: 5px;
- }
.view-package-container{
padding: 20px 56px;
}
@@ -3391,6 +3395,9 @@ margin-right: 5px;
.mat-table{
border-top: solid 1px #ECEDF2;
}
+.mat-row:last-child td {
+ border-bottom: 0 !important;
+}
.mat-paginator{
/* display: inline-block; */
width: 36%;