Shows share menu only if firebase has been initialized properly.

material-foundation · Mar 22, 2017 · 8ef2372 · 8ef2372
1 parent 3818f26
commit 8ef2372
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/lib/Remote.ts b/src/lib/Remote.ts
@@ -95,6 +95,17 @@ export class Remote  {
     return `https://${authDomain}/${this._remoteId}`;
   }
 
+  private _initialized: boolean = false;
+
+  /**
+   * Returns whether the remote has been initialized with Firebase credentials.
+   * @readonly
+   * @return {boolean} Returns true if has Firebase credentials.
+   */
+  get initialized(): boolean {
+    return this._initialized;
+  }
+
   /**
    * Initializes the remote controller.
    *
@@ -127,6 +138,7 @@ export class Remote  {
     }
 
     firebase.initializeApp(config);
+    instance._initialized = Object.keys(config).length !== 0;
   }
 
   /**

diff --git a/src/ui/OverlayController.tsx b/src/ui/OverlayController.tsx
@@ -28,7 +28,7 @@ import { Variable } from "../core/variables/Variable";
  * @interface
  */
 interface IControllerProps {
-  remote: Remote;
+  remote?: Remote;
   updateVariable(variable: Variable, selectedValue: any): void;
   toggleRemoteEnabled(): void;
   variables: Variable[];
@@ -114,40 +114,46 @@ export class OverlayController extends React.Component<IControllerProps, IContro
       updateVariable,
       variables
     } = this.props;
-
     const { shareMenuIsVisible } = this.state;
+    const remoteInitialized = remote ? remote.initialized : false;
 
     let shareIcon: string = shareMenuIsVisible ? "up" : "down";
     return (
       <div className="mdl-card mdl-shadow--6dp">
         <div className="mdl-card__title">
           <h2 className="mdl-card__title-text">Remixer</h2>
         </div>
-        <OverlayShareMenu
-          visible={shareMenuIsVisible}
-          remoteId={remote.remoteId}
-          remoteUrl={remote.remoteUrl}
-          isEnabled={remote.isEnabled}
-          toggleRemoteEnabled={toggleRemoteEnabled}
-        />
+        {remoteInitialized ?
+          <OverlayShareMenu
+            visible={shareMenuIsVisible}
+            remoteId={remote.remoteId}
+            remoteUrl={remote.remoteUrl}
+            isEnabled={remote.isEnabled}
+            toggleRemoteEnabled={toggleRemoteEnabled}
+          />
+          : ""
+        }
         <div className={`mdl-card__actions mdl-card--border`}>
           <OverlayVariables
             variables={variables}
             updateVariable={updateVariable}
           />
         </div>
-        <div className="mdl-card__menu">
-          {remote.isEnabled ?
-            <a onClick={this.toggleShareMenu}>SHARED</a>
-            : ""
-          }
-          <button
-            className="mdl-button mdl-button--icon mdl-js-button mdl-js-ripple-effect"
-            onClick={this.toggleShareMenu}
-          >
-            <i className="material-icons">{`keyboard_arrow_${shareIcon}`}</i>
-          </button>
-        </div>
+        {remoteInitialized ?
+          <div className="mdl-card__menu">
+            {remote.isEnabled ?
+              <a onClick={this.toggleShareMenu}>SHARED</a>
+              : ""
+            }
+            <button
+              className="mdl-button mdl-button--icon mdl-js-button mdl-js-ripple-effect"
+              onClick={this.toggleShareMenu}
+            >
+              <i className="material-icons">{`keyboard_arrow_${shareIcon}`}</i>
+            </button>
+          </div>
+          : ""
+        }
       </div>
     );
   }