Add CDS version and apply minor css style changes

Issue-ID: CCSDK-2292

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: Ie06a5d6fa3e0e52aad50ef5ce501b324f39ab2b1

8 files changed, 14 insertions, 26 deletions

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
index f2aaf5d3a..19db27fb4 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.html
@@ -1,22 +1,7 @@
 <div class="dropdown packagesFilter w-100">
     <input class="dropdown-toggle" type="text">
     <div class="dropdown-text">Filter By Tags <span
-            class="fillteredTags">{{checkBoxTages.substr(0,checkBoxTages.length-1)}}</span></div>
-    <!-- <ul class="dropdown-content w-100">
-        <li>
-            <div class="form-group">
-                <input type="text" (input)="reloadChanges($event)" class="form-control" placeholder="Search" autofocus>
-            </div>
-        </li>
-        <li *ngFor="let tag of viewedTags">
-            <div class="custom-control custom-checkbox">
-                <input type="checkbox" (click)="reloadPackages($event)" class="custom-control-input" id={{tag}} #checkboxes>
-                <label class="custom-control-label" for={{tag}}>{{tag}}</label>
-            </div>
-        </li>
-        <li class="reset-filter"><a (click)="resetFilter()">Reset filter</a></li>
-    </ul> -->
-
+            class="fillteredTags">{{checkBoxTages.substr(0,checkBoxTages.length-2)}}</span></div>
     <div class="dropdown-content w-100">
         <div class="form-group">
             <input type="text" (input)="reloadChanges($event)" class="form-control" placeholder="Search" autofocus>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts
index 6f02bbab8..4939e940b 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/filter-by-tags/filter-by-tags.component.ts
@@ -96,7 +96,7 @@ export class TagsFilteringComponent implements OnInit {
             this.checkBoxTages = this.checkBoxTages.replace(event.target.id + ',', '')
                 .replace(event.target.id, '');
         } else {
-            this.checkBoxTages += event.target.id.trim() + ',';
+            this.checkBoxTages += event.target.id.trim() + ', ';
         }
         const tagsSelected = this.checkBoxTages.split(',').filter(item => {
             if (item) {
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html
index 0632fb47d..2d5591106 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.html
@@ -46,11 +46,11 @@
                 </button>
                 <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0"
                         data-dismiss="modal" (click)="importAndSave()">
-                    Import&Save
+                    Import & Save
                 </button>
                 <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0"
                         data-dismiss="modal" (click)="importAndDeploy()">
-                    Import&Deploy
+                    Import & Deploy
                 </button>
                 <button type="button" class="btn btn-sm btn-primary" [disabled]="uploadedFiles?.length<=0"
                         data-dismiss="modal" (click)="importPackageAndViewIt()">
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts
index 5797d18d5..c6c75eb9c 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/import-package/import-package.component.ts
@@ -115,11 +115,11 @@ export class ImportPackageComponent implements OnInit {
             this.zipFile.generateAsync({type: 'blob'}).then(blob => {
                 this.packageCreationService.savePackage(blob).subscribe(
                     bluePrintDetailModels => {
-                        this.toastService.info('package is imported and saved successfully ');
+                        this.toastService.info('Package is imported and saved successfully ');
                         this.router.navigate(['/packages']);
                         this.packagesStore.getAll();
                     }, error =>
-                        this.toastService.error('there is an error happened ' + error));
+                        this.toastService.error('Errot occured ' + error));
             });
         });
     }
@@ -134,11 +134,11 @@ export class ImportPackageComponent implements OnInit {
             this.zipFile.generateAsync({type: 'blob'}).then(blob => {
                 this.packageCreationService.deploy(blob).subscribe(
                     bluePrintDetailModels => {
-                        this.toastService.info('package is imported and deployed successfully ');
+                        this.toastService.info('Package is imported and deployed successfully ');
                         this.router.navigate(['/packages']);
                         this.packagesStore.getAll();
                     }, error =>
-                        this.toastService.error('there is an error happened ' + error));
+                        this.toastService.error('Errot occured ' + error));
             });
         });
     }
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 dea94dbe6..b824058d4 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
@@ -82,7 +82,7 @@
                         <p class="mb-2">By {{bluePrint.updatedBy.split('<')[0]}}</p>
                         <p class="package-desc" [delay]="300" tooltip="{{bluePrint.artifactDescription}}"
                            placement="bottom left">{{bluePrint.artifactDescription}}</p>
-                        <p>{{bluePrint.tags}}</p>
+                        <span class="packageTag">{{bluePrint.tags}}</span>
                         <ul class="package-contributers">
                             <li>
                                 <button type="button" class="border-fade" data-toggle="tooltip" data-placement="bottom"
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 7e6bbbe59..0f5210230 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
@@ -64,11 +64,11 @@ export class PackageListComponent implements OnInit {
 
     deletePackage(id: string) {
         this.configurationDashboardService.deletePackage(id).subscribe(res => {
-            this.toastService.info('package deleted successfully ');
+            this.toastService.success('Package Deleted Successfully ');
             this.router.navigate(['/packages']);
             this.packagesStore.getAll();
         }, err => {
-            this.toastService.error('error deleting package' + err.message);
+            this.toastService.error('Error occured during deleting package ' + err.message);
         });
 
     }
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html
index 4efb9a20e..25604cd3a 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-dashboard.component.html
@@ -60,4 +60,5 @@
             <app-sort-packages></app-sort-packages>
         </div>
     </div>
+    <!-- <div class="copyright text-center w-100 m-auto">Copyright &#64;2020 CDS Designer UI - v1.0.0</div> -->
 </div>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html
index 17955ec4e..4b428032f 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/packages-header/packages-header.component.html
@@ -7,6 +7,8 @@
     <div class="col profile-help">
       <nav class="navbar navbar-expand-lg navbar-light">
         <ul class="navbar-nav ml-auto">
+          <!--Version-->
+          <div class="nav-item copyright">v1.0.0</div>
           <!--Help Menu-->
           <div class="nav-item dropdown helpMenu">
             <input class="dropdown-toggle" type="text">