Merge branch 'dev' into download-support-variables-loops

Aaron · web-flow · commit 21a97c0cf9b1 · 2019-06-25T13:29:30.000+08:00
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
@@ -511,9 +511,11 @@ export default class View {
         });
 
         const startBot = limitations => {
-            $('#stopButton, #summaryStopButton').show();
-            $('#runButton, #summaryRunButton').hide();
-            $('#runButton, #summaryRunButton').prop('disabled', true);
+            const $runButtons = $('#runButton, #summaryRunButton');
+            const $stopButtons = $('#stopButton, #summaryStopButton');
+            $stopButtons.show();
+            $runButtons.hide();
+            $runButtons.prop('disabled', true);
             globalObserver.emit('summary.disable_clear');
             showSummary();
             this.blockly.run(limitations);
@@ -641,7 +643,15 @@ export default class View {
         });
 
         globalObserver.register('bot.stop', () => {
-            $('#runButton, #summaryRunButton').prop('disabled', false);
+            const $runButtons = $('#runButton, #summaryRunButton');
+            const $stopButtons = $('#stopButton, #summaryStopButton');
+            if ($runButtons.is(':visible') || $stopButtons.is(':visible')) {
+                $runButtons.show();
+                $stopButtons.hide();
+
+                $stopButtons.prop('disabled', false);
+                $runButtons.prop('disabled', false);
+            }
         });
 
         globalObserver.register('bot.info', info => {
diff --git a/src/botPage/view/blockly/blocks/shared.js b/src/botPage/view/blockly/blocks/shared.js
@@ -409,3 +409,7 @@ export const getPredictionForContracts = (contracts, selectedContractType) => {
     }
     return predictionRange;
 };
+
+export const disableRunButton = isDisabled => {
+    $('#runButton, #summaryRunButton').attr('disabled', isDisabled);
+};
diff --git a/src/botPage/view/blockly/blocks/trade/tradeOptions.js b/src/botPage/view/blockly/blocks/trade/tradeOptions.js
@@ -5,6 +5,7 @@ import {
     getDurationsForContracts,
     getBarriersForContracts,
     getPredictionForContracts,
+    disableRunButton,
 } from '../shared';
 import { insideTrade } from '../../relationChecker';
 import { findTopParentBlock, hideInteractionsFromBlockly, getBlocksByType } from '../../utils';
@@ -102,33 +103,40 @@ export default () => {
             }
         },
         pollForContracts(symbol) {
+            disableRunButton(true);
             return new Promise(resolve => {
                 const contractsForSymbol = haveContractsForSymbol(symbol);
+
+                const resolveContracts = resolveObj => {
+                    disableRunButton(false);
+                    resolve(resolveObj);
+                };
+
                 if (!contractsForSymbol) {
                     // Register an event and use as a lock to avoid spamming API
                     const event = `contractsLoaded.${symbol}`;
                     if (!globalObserver.isRegistered(event)) {
                         globalObserver.register(event, () => {});
                         getContractsAvailableForSymbol(symbol).then(contracts => {
                             globalObserver.unregisterAll(event); // Release the lock
-                            resolve(contracts);
+                            resolveContracts(contracts);
                         });
                     } else {
                         // Request in progress, start polling localStorage until contracts are available.
                         const pollingFn = setInterval(() => {
                             const contracts = haveContractsForSymbol(symbol);
                             if (contracts) {
                                 clearInterval(pollingFn);
-                                resolve(contracts.available);
+                                resolveContracts(contracts.available);
                             }
                         }, 100);
                         setTimeout(() => {
                             clearInterval(pollingFn);
-                            resolve([]);
+                            resolveContracts([]);
                         }, 10000);
                     }
                 } else {
-                    resolve(contractsForSymbol.available);
+                    resolveContracts(contractsForSymbol.available);
                 }
             });
         },
diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js
@@ -409,12 +409,7 @@ while(true) {
     }
     stop(stopBeforeStart) {
         if (!stopBeforeStart) {
-            const $runButtons = $('#runButton, #summaryRunButton');
-            const $stopButtons = $('#stopButton, #summaryStopButton');
-            if ($runButtons.is(':visible') || $stopButtons.is(':visible')) {
-                $runButtons.show();
-                $stopButtons.hide();
-            }
+            $('#stopButton, #summaryStopButton').prop('disabled', true);
         }
         if (this.interpreter) {
             this.interpreter.stop();
diff --git a/static/css/_toolbox.scss b/static/css/_toolbox.scss
@@ -27,7 +27,7 @@
     z-index: 0;
     overflow: auto;
 
-    #runButton[disabled], #runButton[disabled]:hover {
+    #runButton[disabled], #runButton[disabled]:hover, #stopButton[disabled], #stopButton[disabled] {
         @include toolbox-runButton-disabled;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -409,3 +409,7 @@ export const getPredictionForContracts = (contracts, selectedContractType) => {`
`409`	`409`	`}`
`410`	`410`	`return predictionRange;`
`411`	`411`	`};`
	`412`	`+`
	`413`	`+export const disableRunButton = isDisabled => {`
	`414`	`+ $('#runButton, #summaryRunButton').attr('disabled', isDisabled);`
	`415`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -409,12 +409,7 @@ while(true) {`
`409`	`409`	`}`
`410`	`410`	`stop(stopBeforeStart) {`
`411`	`411`	`if (!stopBeforeStart) {`
`412`		`- const $runButtons = $('#runButton, #summaryRunButton');`
`413`		`- const $stopButtons = $('#stopButton, #summaryStopButton');`
`414`		`- if ($runButtons.is(':visible') \|\| $stopButtons.is(':visible')) {`
`415`		`- $runButtons.show();`
`416`		`- $stopButtons.hide();`
`417`		`- }`
	`412`	`+ $('#stopButton, #summaryStopButton').prop('disabled', true);`
`418`	`413`	`}`
`419`	`414`	`if (this.interpreter) {`
`420`	`415`	`this.interpreter.stop();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`z-index: 0;`
`28`	`28`	`overflow: auto;`
`29`	`29`
`30`		`- #runButton[disabled], #runButton[disabled]:hover {`
	`30`	`+ #runButton[disabled], #runButton[disabled]:hover, #stopButton[disabled], #stopButton[disabled] {`
`31`	`31`	`@include toolbox-runButton-disabled;`
`32`	`32`	`}`
`33`	`33`