Merge pull request #5 from RobDWaller/update-fixes

Fixed tableau workflow so it loads correctly
RobDWaller · Jul 13, 2018 · dd5d87c · dd5d87c
2 parents 8bad493 + 4792b30
commit dd5d87c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/src/js/helper/ajax.js b/src/js/helper/ajax.js
@@ -35,6 +35,8 @@ class Ajax
             request.open('GET', url, true);
             request.send();
 
+        }).catch(e => {
+            tableau.abortWithError(e);
         });
 
         return data.then(function(result){

diff --git a/src/js/init.js b/src/js/init.js
@@ -21,6 +21,21 @@ import '../scss/main.scss';
  * @author Rob Waller <rdwaller1984@googlemail.com>
  */
 
+ /**
+  * Initiate and Load Tableau
+  */
+(function () {
+    var tableauBuilder = new TableauBuilder(tableau, new Ajax);
+
+    try {
+        tableauBuilder.init();
+        var connector = tableauBuilder.makeSchema();
+        connector = tableauBuilder.getData(connector);
+        tableauBuilder.registerConnector(connector);
+    } catch (e) {
+        tableau.abortWithError(e);
+    }
+})();
 
 /**
  * Starting place for all functionality, events, etc.
@@ -48,20 +63,6 @@ window.onload = function(){
         fjs.parentNode.insertBefore(js, fjs);
     }(document, 'script', 'facebook-jssdk'));
 
-    /**
-     * Initiate and Load Tableau
-     */
-    var tableauBuilder = new TableauBuilder(tableau, new Ajax);
-
-    try {
-        tableauBuilder.init();
-        var connector = tableauBuilder.makeSchema();
-        connector = tableauBuilder.getData(connector);
-        tableauBuilder.registerConnector(connector);
-    } catch (e) {
-        tableau.abortWithError(e);
-    }
-
     /**
      * Initiate simple wrapper for working with the DOM
      */
@@ -105,6 +106,7 @@ window.onload = function(){
      * before auth data is submitted to Tableau.
      */
     async function submitTableau() {
+        var tableauBuilder = new TableauBuilder(tableau, new Ajax);
         await tableauBuilder.setConnectionData(app.getFacebookAccessToken());
         tableauBuilder.setConnectionName("Fableau Facebook Metrics");
         tableauBuilder.submit();

diff --git a/src/js/tableau/builder.js b/src/js/tableau/builder.js
@@ -181,20 +181,18 @@ class TableauBuilder
         let data = [];
 
         return Promise.all(pageIds.map((id) => {
-            this.tableau.log('here');
             return this.ajax.getData(`https://graph.facebook.com/${id.page_id}?access_token=${accessToken}&fields=access_token`).then((result) => {
                 data.push(result);
             });
         })).then(() => {
             this.tableau.connectionData = JSON.stringify(data);
-            return;
         });
     }
 
     /**
      * Name the Tableau Web Data Connector
      *
-     * @param string connectionName 
+     * @param string connectionName
      */
     setConnectionName(connectionName)
     {