From 981573b5b00cdb47cd9f2bbd002735ccc0c362fc Mon Sep 17 00:00:00 2001 From: Sarah Abouzainah Date: Tue, 15 Dec 2020 02:15:46 +0200 Subject: Add CDS version and apply minor css style changes Issue-ID: CCSDK-2292 Signed-off-by: Sarah Abouzainah Change-Id: Ie06a5d6fa3e0e52aad50ef5ce501b324f39ab2b1 --- .../configuration-dashboard.component.html | 329 ++++++++++----------- .../configuration-dashboard.component.ts | 14 +- .../action-attributes.component.html | 2 +- .../packages/designer/designer.component.css | 32 +- .../packages/designer/designer.component.html | 7 +- .../packages/designer/designer.component.ts | 10 +- .../functions-attribute.component.html | 13 +- .../source-view/source-view.component.html | 14 +- .../dsl-definitions-tab.component.html | 6 +- .../metadata-tab/metadata-tab.component.html | 2 +- .../package-creation.component.html | 2 + .../package-creation/package-creation.component.ts | 4 +- .../templ-mapp-creation.component.html | 2 +- .../filter-by-tags/filter-by-tags.component.html | 17 +- .../filter-by-tags/filter-by-tags.component.ts | 2 +- .../import-package/import-package.component.html | 4 +- .../import-package/import-package.component.ts | 8 +- .../package-list/package-list.component.html | 2 +- .../package-list/package-list.component.ts | 4 +- .../packages-dashboard.component.html | 1 + .../packages-header/packages-header.component.html | 2 + .../shared-modules/header/header.component.html | 3 +- cds-ui/designer-client/src/styles.css | 35 ++- 23 files changed, 256 insertions(+), 259 deletions(-) (limited to 'cds-ui/designer-client/src') 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 305ffa6f3..3efc68838 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 @@ -18,6 +18,8 @@ --> + +
v1.0.0
@@ -26,7 +28,7 @@

  • - +

    • - - -
    - +
    @@ -91,7 +90,7 @@ Save @@ -108,7 +107,7 @@ + (click)="downloadPackage(viewedPackage.artifactName,viewedPackage.artifactVersion)"> Download @@ -118,7 +117,6 @@ Delete
    -
    @@ -149,19 +147,19 @@
    @@ -628,11 +606,10 @@
    + class="custom-control-input" + id="customControlValidation5" required> + for="customControlValidation5">config-assign1
    @@ -640,11 +617,10 @@
    + class="custom-control-input" + id="customControlValidation5" required> + for="customControlValidation5">config-assign1
    @@ -661,30 +637,30 @@

    Import Action(s)

    + dropZoneLabel="Drop files here" + (onFileDrop)="dropped($event)" + (onFileOver)="fileOver($event)" + (onFileLeave)="fileLeave($event)"> + let-openFileSelector="openFileSelector">
    + src="assets/img/folder-upload.svg" />
    Drag & Drop file
    or @@ -698,17 +674,17 @@
    - - - - - + + + +
    - {{ item.name }} - -
    + {{ item.name }} + +
    @@ -728,9 +704,8 @@
    - @@ -749,20 +724,20 @@
    METADATA + href="#nav-metadata" role="tab" aria-controls="nav-metadata" aria-selected="true" + autofocus #nameit (focusout)="saveMetaData()">METADATA TEMPLATE & MAPPING + role="tab" aria-controls="nav-template" aria-selected="false">TEMPLATE & MAPPING SCRIPTS + role="tab" aria-controls="nav-scripts" aria-selected="false">SCRIPTS DEFINITIONS + role="tab" aria-controls="nav-imports" aria-selected="false">DEFINITIONS EXTERNAL SYSTEM AUTHENTICATION PROPERTIES + href="#nav-authentication" role="tab" aria-controls="nav-authentication" + aria-selected="false">EXTERNAL SYSTEM AUTHENTICATION PROPERTIES Topology Template + href="#nav-topologytemplate" role="tab" aria-controls="nav-authentication" + aria-selected="false">Topology Template
    @@ -771,24 +746,24 @@
    @@ -165,9 +164,9 @@
    • - +
      • 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 0c70a497b..0f6e38c38 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 @@ -510,7 +510,7 @@ export class DesignerComponent implements OnInit, OnDestroy { this.ngxService.stop(); }); }, error => { - this.toastService.error(error.mesasge, 'error happened '); + this.toastService.error(error.mesasge, 'Error occurs during enrichment process'); console.error('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -532,12 +532,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 successfully updated '); 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 when editing ' + error.message); console.log('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -583,11 +583,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 + 'has been downloaded successfully'); this.ngxService.stop(); }); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html index 8879d539d..ea17f888d 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html @@ -59,7 +59,8 @@
      + (click)="setArtifact(true)" + class="custom-control-input">
      @@ -205,6 +206,7 @@
    +
    @@ -221,20 +223,21 @@
    -
    +
    +

    {{file}}

    Mapping Template     - +
    - + + Template
    diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html index 1042024f3..30f657d12 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html @@ -126,24 +126,23 @@
  • -
    +
    - + class="btn btn-secondary topologySource"> Designer +
    • - - +
    - +
    @@ -157,4 +156,5 @@ [theme]="'tomorrow_night_bright'" #editor style="height:500px"> - \ No newline at end of file + +     \ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html index e93ee72ca..51cf9f974 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/dsl-definitions-tab/dsl-definitions-tab.component.html @@ -1,10 +1,10 @@
      -
    • To add new property:
      • +
    • To add new dsl_definitions:
    • 1. Use Copy and paste option or
      • -
    • 2. Write them manually
      • +
    • 2. Write them manually in the editor below
    + [durationBeforeCallback]="1000" (textChanged)="textChanged($event)" [theme]="'eclipse'" #editor style="height:340px;"> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html index e011d47cd..cca0dbcc1 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html @@ -61,7 +61,7 @@
    - +
    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 fb21d3bd7..238906e2b 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 @@ -14,6 +14,8 @@