Dhfprod 662 qs stuck (#1726)

* Updated logic to enable finished button
Added finished method

* Updated UI test to click Finished button after Installation

Author: akshaysonvane

quick-start/e2e/page-objects/auth/login.ts

@@ -83,7 +83,7 @@ export class LoginPage extends AppPage {
   }
 
   get finishedButton() {
-    return element(by.css('#finished-button'));
+    return element(by.buttonText('Finished'));
   }
 
   get dataHubNameLabel() {
@@ -148,6 +148,10 @@ export class LoginPage extends AppPage {
     await element(by.css('#installer-button')).click();
   }
 
+  async clickFinished() {
+    await this.finishedButton.click();
+  }
+
   //get userName element
   get userName(){
     return element(by.css('input#username'))

quick-start/e2e/specs/auth/authenticated.ts

@@ -199,14 +199,15 @@ export default function(tmpDir) {
       console.log('modified jasmine timeout: ' + jasmine.DEFAULT_TIMEOUT_INTERVAL);
       browser.wait(EC.presenceOf(loginPage.installProgress), 600000, 'install progress is not present');
       expect(loginPage.installProgress.isDisplayed()).toBe(true);
-      browser.wait(EC.visibilityOf(appPage.flowsTab), 600000, 'dashboard page is not displayed');
+      browser.wait(EC.elementToBeClickable(loginPage.finishedButton), 600000, 'finished button is not displayed');
       jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
       console.log('changed back to original jasmine timeout: ' + jasmine.DEFAULT_TIMEOUT_INTERVAL);
     });
 
-    it ('should complete the install and go to the dashboard', function() {
-      console.log('refresh the browser');
-      browser.refresh();
+    it ('should complete the install and go to the dashboard',  async function() {
+      browser.driver.sleep(3000);
+      console.log('clicking Finished button');
+      await loginPage.clickFinished();
       console.log('loading dashboard page');
       dashboardPage.isLoaded();
       expect(appPage.flowsTab.isDisplayed()).toBe(true);

quick-start/src/main/ui/app/login/login.component.ts

@@ -36,6 +36,7 @@ import * as SemVer from 'semver';
       (onInstall)="this.install()"
       (onUninstall)="this.unInstall()"
       (onInstallNext)="this.installNext()"
+      (onFinished)="this.finished()"
       (onChooseProject)="this.chooseProject()"
       (onPostInitNext)="this.postInitNext()"
       (onLogin)="this.login()"
@@ -156,20 +157,26 @@ export class LoginComponent implements OnInit {
         this.installing = false;
         this.installationStatus = null;
         emitter.unsubscribe();
-
-        let installInfo = this.currentEnvironment.installInfo;
-        if (installInfo && installInfo.installed) {
-          // goto login tab
-          let redirect = this.auth.redirectUrl || '';
-          this.router.navigate([redirect]);
-        } else {
-          // go to install hub tab
-          this.loginUi.gotoTab('Installer');
-        }
       })
     });
   }
 
+  finished() {
+    this.projectService.getProjectEnvironment().subscribe((env: any) => {
+      this.currentEnvironment = env;
+
+      let installInfo = this.currentEnvironment.installInfo;
+      if (installInfo && installInfo.installed) {
+        // goto login tab
+        let redirect = this.auth.redirectUrl || '';
+        this.router.navigate([redirect]);
+      } else {
+        // go to install hub tab
+        this.loginUi.gotoTab('Installer');
+      }
+    });
+  }
+
   unInstall() {
     this.uninstalling = true;
 

quick-start/src/main/ui/app/shared/components/login/login-ui.component.html

@@ -374,7 +374,7 @@ <h3>DHF Project Version Mismatch!</h3>
 
           <div layout="row" layout-align="end center" class="init-buttons">
             <button type="button" mdl-button (click)="back()">&lt; Back</button>
-            <button id="finished-button" type="button" mdl-button mdl-button-type="raised" [disabled]="!currentEnvironment.installInfo.installed" (click)="onInstallNext.emit()">Finished</button>
+            <button id="finished-button" type="button" mdl-button mdl-button-type="raised" [disabled]="percentComplete!=100" (click)="onFinished.emit()">Finished</button>
           </div>
         </div>
       </div>

quick-start/src/main/ui/app/shared/components/login/login-ui.component.ts

@@ -33,6 +33,7 @@ export class LoginUIComponent {
   @Output() onInstall: EventEmitter<any> = new EventEmitter<any>();
   @Output() onUninstall: EventEmitter<any> = new EventEmitter<any>();
   @Output() onInstallNext: EventEmitter<any> = new EventEmitter<any>();
+  @Output() onFinished: EventEmitter<any> = new EventEmitter<any>();
   @Output() onLogin: EventEmitter<any> = new EventEmitter<any>();
   @Output() onHubNameChanged: EventEmitter<any> = new EventEmitter<any>();
   @Output() onGotEnvironment: EventEmitter<any> = new EventEmitter<any>();

quick-start/src/main/ui/app/shared/stories/components/login/login.component.stories.ts

@@ -46,6 +46,7 @@ storiesOf('Components|Login', module)
                 (onInstall)='onInstall'
                 (onUninstall)='onUninstall'
                 (onInstallNext)='onInstallNext'
+                (onFinished)='onFinished'
                 (onChooseProject)='onChooseProject'
                 (onPostInitNext)='onPostInitNext'
                 (onLogin)='onLogin'