Added progress reporting in simulator

tableau · Nov 29, 2016 · d87b955 · d87b955
1 parent 53a1358
commit d87b955
Show file tree

Hide file tree

Showing 12 changed files with 567 additions and 561 deletions.
diff --git a/Examples/OAuthProxyExample/public/index.html b/Examples/OAuthProxyExample/public/index.html
@@ -13,7 +13,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
 
     <!-- Latest WDC Library -->
-    <script src="https://connectors.tableau.com/libs/tableauwdc-2.0.latest.js" type="text/javascript"></script>
+    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
 
     <!-- Use to access cookie storage to grab access token -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.0.2/js.cookie.min.js" type="text/javascript"></script>

diff --git a/Examples/html/IncrementalRefreshConnector.html b/Examples/html/IncrementalRefreshConnector.html
@@ -6,7 +6,7 @@
 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
-<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
 <script src="../js/IncrementalRefreshConnector.js" type="text/javascript"></script>
 
 </head>

diff --git a/Examples/html/MadMoneyScraper.html b/Examples/html/MadMoneyScraper.html
@@ -6,7 +6,7 @@
 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
-<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
 <script src="../js/MadMoneyScraper.js" type="text/javascript"></script>
 
 </head>

diff --git a/Examples/html/StandardConnectionsExample.html b/Examples/html/StandardConnectionsExample.html
@@ -6,7 +6,7 @@
     <!--  In order to use promises, like this example, you will need to include this polyfill to add promises
           functionality to the built in Tableau WDC browser (it does not have ES6 functionality by default)    -->
     <script src="https://www.promisejs.org/polyfills/promise-7.0.4.min.js"></script>
-    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
     <script src="../js/StandardConnectionsExample.js"></script>
     <style>
       * {

diff --git a/Examples/html/StockQuoteConnector_promises.html b/Examples/html/StockQuoteConnector_promises.html
@@ -7,7 +7,7 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore.js"></script>
-<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+<script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
 <script src="../js/es6-promise.min.js" type="text/javascript"></script>
 <script src="../js/StockQuoteConnector_promises.js" type="text/javascript"></script>
 

diff --git a/Examples/html/earthquakeMultilingual.html b/Examples/html/earthquakeMultilingual.html
@@ -7,7 +7,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 
-    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
     <script src="../js/earthquakeMultilingual.js" type="text/javascript"></script>
 </head>
 

diff --git a/Examples/html/earthquakeMultitable.html b/Examples/html/earthquakeMultitable.html
@@ -7,7 +7,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 
-    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
     <script src="../js/earthquakeMultitable.js" type="text/javascript"></script>
 </head>
 

diff --git a/Examples/html/earthquakeUSGS.html b/Examples/html/earthquakeUSGS.html
@@ -7,7 +7,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 
-    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.1.js" type="text/javascript"></script>
+    <script src="https://connectors.tableau.com/libs/tableauwdc-2.1.latest.js" type="text/javascript"></script>
     <script src="../js/earthquakeUSGS.js" type="text/javascript"></script>
 </head>
 

diff --git a/Examples/js/StandardConnectionsExample.js b/Examples/js/StandardConnectionsExample.js
@@ -82,7 +82,7 @@ function loadJSON(path, cb, isLocal) {
     obj.open("GET", "../json/" + path + ".json", true);
   }
   else {
-    obj.open("GET", "https://crossorigin.me/http://jsonplaceholder.typicode.com/" + path, true);
+    obj.open("GET", "http://jsonplaceholder.typicode.com/" + path, true);
   }
   obj.onreadystatechange = function() {
     if (obj.readyState == 4 && obj.status == "200"){

diff --git a/Simulator/actions/messaging_actions.js b/Simulator/actions/messaging_actions.js
@@ -80,6 +80,13 @@ export function receiveMessage(payload) {
           dispatch(handleAbortForAuth(errorMsg));
           break;
         }
+
+        case eventNames.REPORT_PROGRESS: {
+          const progressMsg = msgData.progressMsg;
+          dispatch(handleReportProgress(progressMsg));
+          break;
+        }
+
         default: {
           // The message was not for the simulator, ignore it.
           break;
@@ -223,6 +230,16 @@ export function handleAbortForAuth(msg) {
   };
 }
 
+export function handleReportProgress(progressMsg) {
+  return () => {
+    // The WDC has reported a progress message, display in toast
+    /* eslint-disable no-console */
+    console.log(progressMsg);
+    /* eslint-enable no-console */
+    toastr.info(progressMsg, 'The WDC reported a progress message:');
+  };
+}
+
 // Send message thunks
 export function sendMessage(messageName, payload = {}) {
   return (dispatch, getState) => {

diff --git a/Simulator/utils/consts.js b/Simulator/utils/consts.js
@@ -17,6 +17,7 @@ export const eventNames = {
   SHUTDOWN_CB: 'shutdownCallback',
   ABORT: 'abortWithError',
   ABORT_AUTH: 'abortForAuth',
+  REPORT_PROGRESS: 'reportProgress',
 };
 
 export const phases = {