feat: filter active symbols function

Author: cakasuma

src/assetindex/assetIndex.es6

@@ -82,7 +82,7 @@ const initTable = () => {
 
     function populateTable(result) {
         const active_symbols_data = local_storage.get('active_symbols');
-        const filtered_active_symbols = active_symbols_data.filter(item => !isRestrictedSymbol(item.symbol))
+        const filtered_active_symbols = filterRestrictedSymbols(active_symbols_data);
         const asset_index_data = [...result[0].asset_index];
 
         if($.isEmptyObject(filtered_active_symbols) && $.isEmptyObject(asset_index_data)) return;

src/common/util.js

@@ -1,5 +1,5 @@
-function isRestrictedSymbol(symbol) {
-  return /^(BOOM|CRASH|STEP).+/i.test(symbol)
+function filterRestrictedSymbols(active_symbols) {
+  return active_symbols.filter(function(item) { return !/^(BOOM|CRASH|STP).+/i.test(item.symbol)});
 }
 
 function isTick(ohlc) {

src/instruments/instruments.es6

@@ -15,7 +15,7 @@ function refresh_active_symbols() {
             const active_symbols = [];
             const active_markets = _(data.active_symbols).groupBy('market').map(function(symbols) {
 
-                const filtered_symbols = symbols.filter(item => !isRestrictedSymbol(item.symbol))
+                const filtered_symbols = filterRestrictedSymbols(symbols)
 
                 const sym = _.head(filtered_symbols);
 

src/navigation/menu.es6

@@ -45,7 +45,7 @@ export const extractFilteredMarkets = (trading_times_data, options) => {
 
 export const extractChartableMarkets = (trading_times_data) => {
    return extractFilteredMarkets(trading_times_data, {
-      filter: (sym) => (sym.feed_license !== 'chartonly') && !isRestrictedSymbol(sym.symbol)
+      filter: (sym) => (sym.feed_license !== 'chartonly')
    }) || [];
 };
 

src/trade/tradeMenu.es6

@@ -15,7 +15,7 @@ const refresh_active_symbols = () => {
       .then((data) => {
          /* clean up the data! */
          let markets = _(data.active_symbols).groupBy('market').map((symbols) => {
-            const filtered_symbols = symbols.filter(item => !isRestrictedSymbol(item.symbol))
+            const filtered_symbols = filterRestrictedSymbols(symbols);
             const sym = _.head(filtered_symbols);
             const market = { name: sym.market, display_name: sym.market_display_name };
             market.submarkets = _(filtered_symbols).groupBy('submarket').map((symbols) => {  

src/tradingtimes/tradingTimes.es6

@@ -50,10 +50,7 @@ const processData = (markets) => {
       submarket_names[market.display_name] = [];
       market.submarkets.forEach(
         (submarket) => {
-           if (!isRestrictedSymbol(submarket.name)) {
-
             submarket_names[market.display_name].push(submarket.display_name)
-           }
          }
      )
    });
@@ -152,18 +149,21 @@ const initTradingWin = ($html) => {
       const refresh = (data) => {
         const result = processData(menu.extractFilteredMarkets(data[0]));
         const active_symbols = local_storage.get('active_symbols');
-        let header = getObjectMarketSubmarkets(active_symbols);
-        const markets_sorted_list = getSortedMarkets(active_symbols);
+        const filtered_symbols = filterRestrictedSymbols(active_symbols)
+        let header = getObjectMarketSubmarkets(filtered_symbols);
+        const markets_sorted_list = getSortedMarkets(filtered_symbols);
 
         if($.isEmptyObject(header)) return;
 
         function changed() {
           const val = $(this).val();
-          header = getObjectMarketSubmarkets(local_storage.get('active_symbols'));
+          const new_active_symbols = local_storage.get('active_symbols');
+          const new_filtered_symbols = filterRestrictedSymbols(new_active_symbols)
+          header = getObjectMarketSubmarkets(new_filtered_symbols);
 
 
           if (header[val]) {
-             const cumulative_submarkets = Object.keys(header[val]).filter(item => !isRestrictedSymbol(item))
+             const cumulative_submarkets = Object.keys(header[val])
              submarket_names.update_list(getSortedSubmarkets(cumulative_submarkets))
             };