summaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
authorAhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>2020-04-08 15:59:21 +0200
committerDan Timoney <dtimoney@att.com>2020-04-09 15:41:30 +0000
commit49193c613eb3349dbd848eb2bf8b27d222a49aff (patch)
tree0eba1cc870f229b6702a8fc34b165cb9513dd7e1 /cds-ui
parente58a0a90ab901e537cb85b2cca396216767923e0 (diff)
Fixnig file import in script, import and template&mapping.
Fixing routes redirect Issue-ID: CCSDK-2258 Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com> Change-Id: Ibe9f4516884044adcea2e8e16ee59c4e1775120f (cherry picked from commit c78641087f481cb645096842a15efbb9feb77bfa)
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html10
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html2
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html2
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html3
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts12
-rw-r--r--cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html8
-rw-r--r--cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.ts7
7 files changed, 27 insertions, 17 deletions
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 499efcee7..bf86c46ea 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
@@ -5,7 +5,7 @@
<a class="enter-link" href="#"><i class="icon-enter"></i></a>
</div>
<span class="import-container-span">Or you can also <a href="#" data-toggle="modal"
- data-target="#importModal">Import File</a></span>
+ (click)="resetTheUploadedFiles()" data-target="#importModal">Import File</a></span>
</div>
@@ -47,9 +47,9 @@
<div [id]="'id-'+mapIndex" class="collapse" [attr.aria-labelledby]="'head-'+mapIndex"
data-parent="#accordion">
<div class="card-body">
- <ace-editor [(text)]="file.value" (textChange)="textChanges($event,file.key)" [mode]="'json'" [autoUpdateContent]="true"
- [durationBeforeCallback]="1000" [theme]="'tomorrow_night_bright'" #editor
- style="height:300px;">
+ <ace-editor [(text)]="file.value" (textChange)="textChanges($event,file.key)" [mode]="'json'"
+ [autoUpdateContent]="true" [durationBeforeCallback]="1000" [theme]="'tomorrow_night_bright'"
+ #editor style="height:300px;">
</ace-editor>
</div>
</div>
@@ -132,4 +132,4 @@
</div>
</div>
</div>
-</div>
+</div> \ No newline at end of file
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 525043a51..5b4e7c840 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,7 @@
<a class="enter-link" href="#"><i class="icon-enter"></i></a>
</div>
<span class="import-container-span">Or you can also <a data-target="#scriptsModal" data-toggle="modal"
- href="#">Import File</a></span>
+ (click)="resetTheUploadedFiles()" href="#">Import File</a></span>
</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 8a43b010b..86e713b9e 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
@@ -212,7 +212,7 @@
</button>
</div>
<div class="modal-body">
- <ngx-file-drop [accept]="allowedExt" dropZoneLabel="Drop files here" (onFileDrop)="dropped($event)"
+ <ngx-file-drop [multiple]="false" [accept]="allowedExt" dropZoneLabel="Drop files here" (onFileDrop)="dropped($event)"
(onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)">
<ng-template ngx-file-drop-content-tmp let-openFileSelector="openFileSelector">
<div class="folder-upload">
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 9322ee783..f33615dfe 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
@@ -92,7 +92,8 @@
</button>
</div>
<div class="col">
- <button type="button" class="btn btn-card-config">Configuration</button>
+ <button type="button" (click)="view(bluePrint.id)"
+ class="btn btn-card-config">Configuration</button>
</div>
</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 049801227..b7bc05ff9 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
@@ -1,6 +1,7 @@
-import {Component, OnInit} from '@angular/core';
-import {BlueprintModel} from '../../model/BluePrint.model';
-import {PackagesStore} from '../../packages.store';
+import { Component, OnInit } from '@angular/core';
+import { BlueprintModel } from '../../model/BluePrint.model';
+import { PackagesStore } from '../../packages.store';
+import { Router } from '@angular/router';
@Component({
selector: 'app-packages-list',
@@ -12,7 +13,7 @@ export class PackageListComponent implements OnInit {
viewedPackages: BlueprintModel[] = [];
- constructor(private packagesStore: PackagesStore) {
+ constructor(private packagesStore: PackagesStore, private router: Router) {
console.log('PackageListComponent');
this.packagesStore.state$.subscribe(state => {
console.log(state);
@@ -26,6 +27,9 @@ export class PackageListComponent implements OnInit {
this.packagesStore.getAll();
}
+ view(id) {
+ this.router.navigate(['/packages/package', id]);
+ }
testDispatch(bluePrint: BlueprintModel) {
console.log(bluePrint.id);
}
diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
index 502e098d3..b6dadf88a 100644
--- a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
+++ b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
@@ -5,14 +5,14 @@
<div class="overflow-container">
<ul class="menu-dropdown">
<li class="active">
- <a routerLink="/packages">Packages</a>
+ <a (click)="redirect()" routerLink="/packages">Packages</a>
<span class="icon">
<!-- <i class="fa fa-dashboard"></i> -->
<i class="icon-package"></i>
</span>
</li>
<li class="menu-hasdropdown">
- <a >Data Dictionary</a>
+ <a>Data Dictionary</a>
<span class="icon">
<i class="icon-dictionary"></i>
</span>
@@ -34,7 +34,7 @@
</li>
</ul>
</li> -->
- <!-- <li>
+ <!-- <li>
<a href="#">Favourites</a>
<span class="icon">
<i class="fa fa-heart"></i>
@@ -69,4 +69,4 @@
</ul>
</nav>
-</div>
+</div> \ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.ts b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.ts
index 3ee4d0f65..db87f8fdf 100644
--- a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.ts
+++ b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
@Component({
selector: 'app-header',
@@ -7,9 +8,13 @@ import { Component, OnInit } from '@angular/core';
})
export class HeaderComponent implements OnInit {
- constructor() { }
+ constructor(private router: Router) { }
ngOnInit() {
}
+ redirect() {
+ this.router.navigate(['/packages']);
+ }
+
}