Removed markets with no available trade

aminmarashi · aminmarashi · commit bb5c2e7a5d17 · 2016-10-19T16:25:02.000+08:00
diff --git a/src/botPage/view/blockly/blocks/trade/markets.js b/src/botPage/view/blockly/blocks/trade/markets.js
@@ -7,43 +7,42 @@ import { BlocklyError } from '../../../../../common/error';
 export default () => {
   const symbolNames = bot.symbol.activeSymbols.getSymbolNames();
   for (const symbol of Object.keys(symbolNames)) {
-    Blockly.Blocks[symbol.toLowerCase()] = {
-      init: function init() {
-        this.appendDummyInput()
-          .appendField(symbolNames[symbol]);
-        this.appendDummyInput()
-          .appendField(`${translator.translateText('Accepts')}: (${
-          bot.symbol.getAllowedCategoryNames(symbol)})`);
-        this.appendStatementInput('CONDITION')
-          .setCheck('Condition');
-        this.setInputsInline(false);
-        this.setPreviousStatement(true, null);
-        this.setColour('#f2f2f2');
-        this.setTooltip(`${translator.translateText('Chooses the symbol:')} ${symbolNames[symbol]}`); // eslint-disable-line max-len
-        this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
-      },
-      onchange: function onchange(ev) {
-        submarket(this, ev);
-      },
-    };
-  }
-
-  for (const symbol of Object.keys(symbolNames)) {
-    Blockly.JavaScript[symbol.toLowerCase()] = function market(block) {
-      const condition = Blockly.JavaScript.statementToCode(block, 'CONDITION');
-      if (!condition) {
-        return new BlocklyError(
-          translator.translateText('A trade type has to be defined for the symbol')).emit();
-      }
-      const code = `
+    const allowedCategories = bot.symbol.getAllowedCategoryNames(symbol);
+    if (allowedCategories.length) {
+      Blockly.Blocks[symbol.toLowerCase()] = {
+        init: function init() {
+          this.appendDummyInput()
+            .appendField(symbolNames[symbol]);
+          this.appendDummyInput()
+            .appendField(`${translator.translateText('Accepts')}: (${allowedCategories})`);
+          this.appendStatementInput('CONDITION')
+            .setCheck('Condition');
+          this.setInputsInline(false);
+          this.setPreviousStatement(true, null);
+          this.setColour('#f2f2f2');
+          this.setTooltip(`${translator.translateText('Chooses the symbol:')} ${symbolNames[symbol]}`); // eslint-disable-line max-len
+          this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki');
+        },
+        onchange: function onchange(ev) {
+          submarket(this, ev);
+        },
+      };
+      Blockly.JavaScript[symbol.toLowerCase()] = function market(block) {
+        const condition = Blockly.JavaScript.statementToCode(block, 'CONDITION');
+        if (!condition) {
+          return new BlocklyError(
+            translator.translateText('A trade type has to be defined for the symbol')).emit();
+        }
+        const code = `
       getTradeOptions = function getTradeOptions() {
         var tradeOptions = {};
         tradeOptions = ${condition.trim()};
         tradeOptions.symbol = '${symbol}'
         return tradeOptions;
       };
       `;
-      return code;
-    };
+        return code;
+      };
+    }
   }
 };
diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js
@@ -66,6 +66,26 @@ const cleanUp = (newBlocks) => {
   Blockly.mainWorkspace.resizeContents();
 };
 
+const createXmlTag = (obj) => {
+  let xmlStr = '<category name="Markets" colour="#2a3052" i18n-text="Markets">\n';
+  for (const market of Object.keys(obj)) {
+    xmlStr += `\t<category name="${obj[market].name}" colour="#2a3052">`;
+    for (const submarket of Object.keys(obj[market].submarkets)) {
+      xmlStr += `\t\t<category name="${
+        obj[market].submarkets[submarket].name}" colour="#2a3052">`;
+      for (const symbol of Object.keys(obj[market].submarkets[submarket].symbols)) {
+        if (bot.symbol.getAllowedCategoryNames(symbol).length) {
+          xmlStr += `\t\t\t<block type="${symbol.toLowerCase()}"></block>`;
+        }
+      }
+      xmlStr += '\t\t</category>\n';
+    }
+    xmlStr += '\t</category>\n';
+  }
+  xmlStr += '</category>\n';
+  return xmlStr;
+};
+
 export default class _Blockly {
   constructor() {
     this.blocksXmlStr = '';
@@ -106,30 +126,13 @@ export default class _Blockly {
   cleanUp() {
     Blockly.mainWorkspace.cleanUp();
   }
-  createXmlTag(obj) {
-    let xmlStr = '<category name="Markets" colour="#2a3052" i18n-text="Markets">\n';
-    for (const market of Object.keys(obj)) {
-      xmlStr += `\t<category name="${obj[market].name}" colour="#2a3052">`;
-      for (const submarket of Object.keys(obj[market].submarkets)) {
-        xmlStr += `\t\t<category name="${
-        obj[market].submarkets[submarket].name}" colour="#2a3052">`;
-        for (const symbol of Object.keys(obj[market].submarkets[submarket].symbols)) {
-          xmlStr += `\t\t\t<block type="${symbol.toLowerCase()}"></block>`;
-        }
-        xmlStr += '\t\t</category>\n';
-      }
-      xmlStr += '\t</category>\n';
-    }
-    xmlStr += '</category>\n';
-    return xmlStr;
-  }
   xmlToStr(xml) {
     const serializer = new XMLSerializer();
     return serializer.serializeToString(xml);
   }
   marketsToXml(xml) {
     const xmlStr = this.xmlToStr(xml);
-    const marketXml = this.createXmlTag(
+    const marketXml = createXmlTag(
       bot.symbol.activeSymbols.getMarkets(), bot.symbol.assetIndex);
     return xmlStr.replace('<!--Markets-->', marketXml);
   }
