1696 footer white space (#1762)

* Fixed white space at the bottom of screen problem - make footer absolutely positioned - create new class "main-view-content" which adds a scrollbar at the appropriate time (which doesn't include the footer) - wrap the sidebar-menu with a scroll bar * fix protractor tests for slow page load, and historian in safari * fixes for safari styles
hyperledger-archives · Aug 7, 2017 · 8f981c6 · 8f981c6
1 parent 1ff1866
commit 8f981c6
Show file tree

Hide file tree

Showing 14 changed files with 577 additions and 523 deletions.
diff --git a/packages/composer-playground/e2e/component/editor.ts b/packages/composer-playground/e2e/component/editor.ts
@@ -35,7 +35,7 @@ export class Editor {
       return OperationsHelper.retriveMatchingElementsByCSS('.side-bar-nav', '.flex-container')
       .map((elm) => { browser.executeScript(scrollMe, elm);
                       browser.wait(ExpectedConditions.visibilityOf(elm), 5000);
-                      return elm.getText(); });
+                      return OperationsHelper.retriveTextFromElement(elm); });
   }
 
   // Retrieve Editor Side Navigation File Action buttons (Add/Deploy)
@@ -61,7 +61,7 @@ export class Editor {
   }
 
   // Retrieve current 'active' file from navigator
-  static retrieveNavigatorActiveFile() {
+  static retrieveNavigatorActiveFiles() {
     return OperationsHelper.retriveMatchingElementsByCSS('.files', '.active')
     .map((elm) => { browser.executeScript(scrollMe, elm);
                     browser.wait(ExpectedConditions.visibilityOf(elm), 5000);

diff --git a/packages/composer-playground/e2e/specs/editor-define.spec.ts b/packages/composer-playground/e2e/specs/editor-define.spec.ts
@@ -294,7 +294,7 @@ describe('Editor Define', (() => {
             });
 
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Script File\nlib/script.js');
@@ -330,7 +330,7 @@ describe('Editor Define', (() => {
                 expect(buttonlist[1]).to.deep.equal({text: 'Deploy', enabled: true});
             });
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Script File\nlib/importScript.js');
@@ -349,7 +349,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Model File\nmodels/org.acme.model.cto');
@@ -397,7 +397,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Model File\nmodels/importModel.cto');
@@ -444,7 +444,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Access Control\npermissions.acl');
@@ -502,7 +502,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Access Control\npermissions.acl');
@@ -551,7 +551,7 @@ describe('Editor Define', (() => {
         .then((startFiles) => {
             // Check for new contents (we only have one readme file)
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('About\nREADME.md');
@@ -602,7 +602,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Query File\nqueries.qry');
@@ -648,7 +648,7 @@ describe('Editor Define', (() => {
         })
         .then((startFiles) => {
             // -active file
-            Editor.retrieveNavigatorActiveFile()
+            Editor.retrieveNavigatorActiveFiles()
             .then((list: any) => {
                 expect(list).to.be.an('array').lengthOf(1);
                 expect(list).to.include('Query File\nqueries.qry');

diff --git a/packages/composer-playground/e2e/utils/operations-helper.ts b/packages/composer-playground/e2e/utils/operations-helper.ts
@@ -19,7 +19,7 @@ export class OperationsHelper {
     });
   }
 
-  // Retrieve text
+  // Retrieve text from an element
   static retriveTextFromElement(elm: ElementFinder) {
       browser.wait(ExpectedConditions.presenceOf(elm), 10000);
       browser.wait(ExpectedConditions.visibilityOf(elm), 10000);
@@ -28,14 +28,23 @@ export class OperationsHelper {
     });
   }
 
-  // Retrieve text
+  // Retrieve an array of matching elements
   static retriveMatchingElementsByCSS(type: string, subset: string) {
-      let elm = element(by.css(type));
-      browser.wait(ExpectedConditions.presenceOf(elm), 10000);
-      browser.wait(ExpectedConditions.visibilityOf(elm), 10000);
+      browser.wait(this.elementsPresent(element(by.css(type)).all(by.css(subset))), 5000);
       return element(by.css(type)).all(by.css(subset));
   }
 
+  // Custom ExpectedCondition to be used to ensure that ArrayFinder count is non-zero
+  static elementsPresent(elementArrayFinder) {
+      let hasCount = (() => {
+          return elementArrayFinder.count()
+          .then((count) => {
+              return count > 0;
+          });
+      });
+      return ExpectedConditions.and(ExpectedConditions.presenceOf(elementArrayFinder), hasCount);
+  };
+
   // Navigate to Editor base page and move past welcome splash
   static navigatePastWelcome() {
     browser.get(browser.baseUrl);

diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.component.html b/packages/composer-playground/src/app/connection-profile/connection-profile.component.html
@@ -25,7 +25,8 @@
   </div>
 </section>
 <section class="main-view">
-    <div class="flex">
+    <div class="main-view-content">
+        <div class="flex">
         <div class="playground-profile-warning" *ngIf="warningVisible">
             <div class="profile-warning-content">
             <div>
@@ -54,5 +55,6 @@ <h3>Connection Profiles are not available in Web Playground</h3>
             <connection-profile-data (profileUpdated)="profileUpdated($event)" [connectionProfile]="currentConnectionProfile"></connection-profile-data>
         </div>
     </div>
+    </div>
     <app-footer></app-footer>
 </section>