diff options
Diffstat (limited to 'cds-ui')
4 files changed, 16 insertions, 7 deletions
diff --git a/cds-ui/designer-client/src/app/app-routing.module.ts b/cds-ui/designer-client/src/app/app-routing.module.ts index 2610dc59f..d0a8e2a28 100644 --- a/cds-ui/designer-client/src/app/app-routing.module.ts +++ b/cds-ui/designer-client/src/app/app-routing.module.ts @@ -20,13 +20,17 @@ limitations under the License. */ import {NgModule} from '@angular/core'; -import {Routes, RouterModule} from '@angular/router'; +import {RouterModule, Routes} from '@angular/router'; const routes: Routes = [ - {path: 'packages', - loadChildren: './modules/feature-modules/packages/packages.module#PackagesModule'}, - {path: 'resource-dictionary', - loadChildren: './modules/feature-modules/resource-dictionary/resource-dictionary.module#ResourceDictionaryModule'}, + { + path: 'packages', + loadChildren: './modules/feature-modules/packages/packages.module#PackagesModule' + }, + { + path: 'resource-dictionary', + loadChildren: './modules/feature-modules/resource-dictionary/resource-dictionary.module#ResourceDictionaryModule' + }, // { path: '', component: MainAppComponent }, { path: '', @@ -36,7 +40,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, {useHash: true})], exports: [RouterModule] }) export class AppRoutingModule { diff --git a/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts index e0dac0dc3..3435b10d3 100644 --- a/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts +++ b/cds-ui/designer-client/src/app/common/core/canDactivate/ComponentCanDeactivate.ts @@ -7,7 +7,7 @@ export abstract class ComponentCanDeactivate { @HostListener('window:beforeunload', ['$event']) unloadNotification($event: any) { - if (!this.canDeactivate()) { + if (this.canDeactivate()) { $event.returnValue = true; } } 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 a4a11371e..449312f99 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 @@ -217,6 +217,8 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl if (bluePrintDetailModels) { const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1]; this.toastService.info('package updated successfully '); + this.isSaveEnabled = false; + this.id = id; this.router.navigate(['/packages/package/' + id]); } }, error => { @@ -230,6 +232,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl this.configurationDashboardService.deletePackage(this.id).subscribe(res => { console.log('Deleted'); console.log(res); + this.isSaveEnabled = false; this.router.navigate(['/packages']); }, err => { console.log(err); @@ -316,6 +319,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl this.packageCreationService.deploy(blob).subscribe(response => { this.toastService.info('deployed successfully '); const id = response.toString().split('id')[1].split(':')[1].split('"')[1]; + this.isSaveEnabled = false; this.router.navigate(['/packages/package/' + id]); }); }, error => { diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts index d2f2e0a8b..6b29ec4fd 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.ts @@ -128,6 +128,7 @@ export class PackageCreationComponent extends ComponentCanDeactivate implements if (bluePrintDetailModels) { const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1]; this.toastService.info('package updated successfully '); + this.isSaveEnabled = false; this.router.navigate(['/packages/package/' + id]); } }, error => { |