Made use of ng2-bootstrap-modal.
This will remove all the duplicate code of ng-bootstrap popup.
Made following changes to the below files,
1. app.module.ts:
a. added the confirm modal component to declarations and entryComponents section because component will be created dynamically.
b. imported BootstrapModalModule from ng2-bootstrap-modal
2. vnfs.module.ts:
a. removed the confirm modal component from declarations and
entryComponents section as it is already declared as part of
app.module.ts.
3. confirm.component.ts:
a. added two more varibles 'cancelButtonText' and
'confirmButtonText' to ConfirmModel interface. these values will
be sent by the caller code and the button lables will be set
dynamically.
b. implemented cancel method that sets the modal result value to
false, this is called on click of close
button.
4. about.component.ts:
a. Made use of confirm.component.ts.
b. on click of 'view change log' buton we are calling open()
method which inturn opens the confirm modal component.
5. about.component.html:
a. Removed call to versionLogFile() method as this method is
called from open() method.
b. Removed the ng-template code of ng-bootstrap which is no more
required.
Issue-ID: APPC-1088
Change-Id: I9de545debed145ef35e31807acd1e9bd9cc2bad4
Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index df9bf07..2be6544 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,6 +2,8 @@
============LICENSE_START==========================================
===================================================================
Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+
+Copyright (C) 2018 IBM Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
@@ -19,29 +21,32 @@
============LICENSE_END============================================
*/
-import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {SimpleNotificationsModule} from 'angular2-notifications';
-import {HomeModule} from './home/home.module';
-import {AppComponent} from './app.component';
-import {AppRoutingModule} from './app.routing';
-import {SharedModule} from './shared/shared.module';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
-import {HashLocationStrategy, LocationStrategy} from '@angular/common';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {RouterModule} from '@angular/router';
-import {TestComponent} from './test/test.component';
-import {AboutUsComponent} from './about-us/aboutus.component';
-import {NgProgressModule} from 'ngx-progressbar';
-import {LoginGuardService} from './vnfs/LoginGuardService/Login-guard-service';
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { SimpleNotificationsModule } from 'angular2-notifications';
+import { BootstrapModalModule } from 'ng2-bootstrap-modal';
+import { HomeModule } from './home/home.module';
+import { AppComponent } from './app.component';
+import { AppRoutingModule } from './app.routing';
+import { SharedModule } from './shared/shared.module';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { HashLocationStrategy, LocationStrategy } from '@angular/common';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterModule } from '@angular/router';
+import { TestComponent } from './test/test.component';
+import { AboutUsComponent } from './about-us/aboutus.component';
+import { NgProgressModule } from 'ngx-progressbar';
+import { LoginGuardService } from './vnfs/LoginGuardService/Login-guard-service';
+import { ConfirmComponent } from './shared/confirmModal/confirm.component';
@NgModule({
- declarations: [AppComponent, TestComponent, AboutUsComponent],
+ declarations: [AppComponent, TestComponent, AboutUsComponent, ConfirmComponent],
imports: [BrowserModule, FormsModule, HomeModule, SharedModule.forRoot(),
- NgbModule.forRoot(), NoopAnimationsModule, AppRoutingModule, SimpleNotificationsModule, NgProgressModule],
+ NgbModule.forRoot(), NoopAnimationsModule, AppRoutingModule, SimpleNotificationsModule, NgProgressModule, BootstrapModalModule],
exports: [RouterModule],
- providers: [{provide: LocationStrategy, useClass: HashLocationStrategy}, LoginGuardService],
+ providers: [{ provide: LocationStrategy, useClass: HashLocationStrategy }, LoginGuardService],
+ entryComponents: [ConfirmComponent],
bootstrap: [AppComponent]
})