Merge pull request #1555 from mahdiyeh-fs/fix_mlt/mf_markets

Mahdiyeh/Fix: mlt/mf markets

Author: matin-deriv

src/assetindex/assetIndex.es6

@@ -73,22 +73,25 @@ const checkVolatility = (market_name, market_names) => {
 const initTable = () => {
     getActiveSymAndAssetsData()
         .then((result) => {
-            populateTable(result);
+            liveapi
+               .send({ active_symbols: "brief" })
+               .then(function (response) {
+                populateTable(result, response.active_symbols);
+               })
         })
         .catch((error) => {
             $.growl.error({ message: error.message });
             console.error(error);
         });
 
-    function populateTable(result) {
-        const active_symbols_data = local_storage.get('active_symbols');
-        const filtered_active_symbols = filterRestrictedSymbols(active_symbols_data);
+    function populateTable(result, symbols) {
+        const active_symbols_data = symbols;
         const asset_index_data = [...result[0].asset_index];
 
-        if($.isEmptyObject(filtered_active_symbols) && $.isEmptyObject(asset_index_data)) return;
+        if($.isEmptyObject(active_symbols_data) || $.isEmptyObject(asset_index_data)) return;
 
-        state.dropdown.market_submarkets = getObjectMarketSubmarkets(filtered_active_symbols);
-        state.dropdown.sorted_markets = getSortedMarkets(filtered_active_symbols);
+        state.dropdown.market_submarkets = getObjectMarketSubmarkets(active_symbols_data);
+        state.dropdown.sorted_markets = getSortedMarkets(active_symbols_data);
         state.table.asset_data = asset_index_data;
 
         header_el = asset_win_el.parent().find('.ui-dialog-title').addClass('with-content');

src/common/util.js

@@ -1,5 +1,8 @@
-function filterRestrictedSymbols(active_symbols) {
-  return active_symbols.filter(function(item) { return !/^(BOOM|CRASH|STP|CRY).+/i.test(item.symbol)});
+function isFinancialAccout() {
+  if (local_storage.get('authorize')) {
+     return /^(MF)/i.test(local_storage.get('authorize').loginid);
+  }
+  return false
 }
 
 function isTick(ohlc) {

src/instruments/instruments.es6

@@ -6,54 +6,57 @@ import { getSortedMarketSubmarkets } from '../common/marketUtils';
 import "jquery-growl";
 import "common/util";
 
-const get_active_symbol = () => {
+const get_active_symbol = (landing_company, country) => {
+
     liveapi
-        .cached
         .send({ active_symbols: 'brief' })
-        .then(function (data) {
-                local_storage.set('active_symbols', data.active_symbols);
-                const active_symbols = [];
-                const active_markets = _(filterRestrictedSymbols(data.active_symbols)).groupBy('market').map(function (symbols) {
-                            const filtered_symbols = symbols;
-                            const sym = _.head(filtered_symbols);
-                            const market = { name: sym.market, display_name: sym.market_display_name };
-                    market.submarkets = _(filtered_symbols).groupBy('submarket').map(function (symbols) {
-                        const sym = _.head(symbols);
-                        const submarket = { name: sym.submarket, display_name: sym.submarket_display_name };
-                        submarket.instruments = _.map(symbols, function (sym) {
-                            active_symbols.push(sym.symbol);
-                            return {
-                                symbol: sym.symbol,
-                                display_name: sym.display_name,
-                            };
-                        });
-                        return submarket;
-                    }).value();
-                    return market;
+        .then(function(data) {
+            const active_symbols = [];
+            let filtered_symbols;
+    
+            local_storage.set('active_symbols', data.active_symbols);
+
+            const active_markets = _(data.active_symbols).groupBy('market').map(function (symbols) {
+                const filtered_symbols = symbols;
+                const sym = _.head(filtered_symbols);
+                const market = { name: sym.market, display_name: sym.market_display_name };
+                market.submarkets = _(filtered_symbols).groupBy('submarket').map(function (symbols) {
+                    const sym = _.head(symbols);
+                    const submarket = { name: sym.submarket, display_name: sym.submarket_display_name };
+                    submarket.instruments = _.map(symbols, function (sym) {
+                        active_symbols.push(sym.symbol);
+                        return {
+                            symbol: sym.symbol,
+                            display_name: sym.display_name,
+                        };
+                    });
+                    return submarket;
                 }).value();
-                markets = chartable_markets.map(function (m) {
-                    return {
-                        display_name: m.display_name,
-                        name: m.name,
-                        submarkets: m.submarkets.map(function (sm) {
-                            return {
-                                display_name: sm.display_name,
-                                instruments: sm.instruments.filter(function (ins) {
-                                    return active_symbols.indexOf(ins.symbol) !== -1;
-                                })
-                            }
-                        }).filter(function (sm) {
-                            return sm.instruments.length !== 0;
-                        })
-                    }
-                }).filter(function (m) {
-                    return m.submarkets.length !== 0;
-                });
-                        markets = getSortedMarketSubmarkets(markets);
-                        const instruments = $("#nav-menu").find(".instruments");
-                instruments.find('> ul').remove();
-                menu.refreshMenu(instruments, markets, onMenuItemClick);
+                return market;
+            }).value();
+            markets = chartable_markets.map(function (m) {
+                return {
+                    display_name: m.display_name,
+                    name: m.name,
+                    submarkets: m.submarkets.map(function (sm) {
+                        return {
+                            display_name: sm.display_name,
+                            instruments: sm.instruments.filter(function (ins) {
+                                return active_symbols.indexOf(ins.symbol) !== -1;
+                            })
+                        }
+                    }).filter(function (sm) {
+                        return sm.instruments.length !== 0;
+                    })
+                }
+            }).filter(function (m) {
+                return m.submarkets.length !== 0;
             });
+            markets = getSortedMarketSubmarkets(active_markets);
+            const instruments = $("#nav-menu").find(".instruments");
+            instruments.find('> ul').remove();
+            menu.refreshMenu(instruments, markets, onMenuItemClick);
+        });
 }
 
 function refresh_active_symbols() {
@@ -62,7 +65,14 @@ function refresh_active_symbols() {
         .cached
         .authorize()
         .then(() => {
-            get_active_symbol();
+            const country = local_storage.get('authorize').country;
+            liveapi
+            .cached
+            .send({ landing_company: country })
+            .then((data) => {
+               const landing_company = data.landing_company
+               get_active_symbol(landing_company, country);
+            });
         });
     } else {
         get_active_symbol();

src/navigation/menu.es6

@@ -1,11 +1,23 @@
 import $ from 'jquery';
 import '../common/util';
+import "jquery-growl";
 
 /* you can filter the symbols with the options parameter, for example:
    options: {
        filter: (sym) => (sym.feed_license !== 'realtime')
    }
 */
+const menu_config = {
+   trade : '.trade a',
+   instruments : '.instruments a',
+   assetIndex : '.assetIndex',
+   tradingTimes : '.tradingTimes',
+};
+
+const trade_messages = {
+   no_symbol : () => "Binary options trading is not available.".i18n(),
+};
+
 export const extractFilteredMarkets = (trading_times_data, options) => {
    const markets = trading_times_data.trading_times.markets.map((m) => {
       const market = {
@@ -50,11 +62,15 @@ export const extractChartableMarkets = (trading_times_data) => {
 };
 
 export const refreshMenu = (root, markets, callback) => {
-   const is_not_crypto = symbol => !/^(cry|JD)/i.test(symbol);
-   const non_crypto_markets = markets.filter( m => is_not_crypto(m.name))
-
+   
+   if(markets.length == 0){
+      Object.values(menu_config).map( menu => $(menu).addClass('disabled'));
+      $.growl.error({message: trade_messages.no_symbol()});
+   } else {
+      Object.values(menu_config).map( menu => $(menu).removeClass('disabled'));
+   }
    const menu = `<ul>${
-      non_crypto_markets.map(m => `<li><div>${m.display_name}</div><ul>${
+      markets.map(m => `<li><div>${m.display_name}</div><ul>${
          m.submarkets.map(s => `<li><div>${s.display_name}</div><ul>${
             s.instruments.map(i => `<li symbol='${i.symbol}' pip='${i.pip}'><div>${i.display_name}</div></li>`).join('')
          }</ul></li>`).join('')

src/trade/tradeMenu.es6

@@ -9,17 +9,17 @@ const show_error = (err) => {
    console.error(err);
 };
 
-const get_active_symbol = () => {
+const get_active_symbol = (landing_company, country) => {
    liveapi
-      .cached
       .send({ active_symbols: 'brief' })
       .then((data) => {
          /* clean up the data! */
-         let markets = _(filterRestrictedSymbols(data.active_symbols)).groupBy('market').map((symbols) => {
-            const filtered_symbols = symbols;
-            const sym = _.head(filtered_symbols);
+         const active_symbols = data.active_symbols;
+         let markets = _(active_symbols).groupBy('market').map((symbols) => {
+            const active_symbols = symbols;
+            const sym = _.head(active_symbols);
             const market = { name: sym.market, display_name: sym.market_display_name };
-            market.submarkets = _(filtered_symbols).groupBy('submarket').map((symbols) => {
+            market.submarkets = _(active_symbols).groupBy('submarket').map((symbols) => {
                const sym = _.head(symbols);
                const submarket = { name: sym.submarket, display_name: sym.submarket_display_name };
                submarket.instruments = _.map(symbols, (sym) => ({
@@ -56,7 +56,14 @@ const refresh_active_symbols = () => {
          .cached
          .authorize()
          .then(() => {
-            get_active_symbol();
+            const country = local_storage.get('authorize').country;
+            liveapi
+            .cached
+            .send({ landing_company: country })
+            .then((data) => {
+               const landing_company = data.landing_company
+               get_active_symbol(landing_company, country);
+            });
          })
    } else{
       get_active_symbol();

src/tradingtimes/tradingTimes.es6

@@ -38,13 +38,6 @@ const processData = (markets) => {
    const market_names = [];
    const submarket_names = { };
    markets
-    .filter(eMarket => {
-      const loginId = (local_storage.get('authorize') || {}).loginid || '';
-      return (/MF/gi.test(loginId) && eMarket.name !== 'Synthetic Indices')
-        || (/MLT/gi.test(loginId) && eMarket.name === 'Synthetic Indices')
-        || (/MX/gi.test(loginId) && eMarket.name === 'Synthetic Indices')
-        || (!/MF/gi.test(loginId) && !/MLT/gi.test(loginId) && !/MX/gi.test(loginId));
-    })
     .forEach((market) => {
       market_names.push(market.display_name);
       submarket_names[market.display_name] = [];
@@ -146,61 +139,59 @@ const initTradingWin = ($html) => {
       }
 
       /* refresh the table with result of {trading_times:yyyy_mm_dd} from WS */
-      const refresh = (data) => {
-        const result = processData(menu.extractFilteredMarkets(data[0]));
-        const active_symbols = local_storage.get('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();
-          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]);
-             submarket_names.update_list(getSortedSubmarkets(cumulative_submarkets));
-          };
-
-          updateTable(result, market_names.val(), submarket_names.val());
-        };
-
-          if (market_names == null) {
-              const select = $('<select />');
-              select.appendTo(subheader);
-              market_names = windows.makeSelectmenu(select, {
-                list: markets_sorted_list,
-                inx: 0,
-              });
-              market_names.off('selectmenuchange', changed);
-              market_names.on('selectmenuchange', changed);
-          } else {
-            market_names.update_list(markets_sorted_list);
-            market_names.off('selectmenuchange', changed);
-            market_names.on('selectmenuchange', changed);
-        }
-
-          if (submarket_names == null) {
-              const sub_select = $('<select />');
-              sub_select.appendTo(subheader);
-              submarket_names = windows.makeSelectmenu(sub_select, {
-                list: getSortedSubmarkets(Object.keys(header[market_names.val()])),
-                inx: 0,
-                changed: changedFn,
-              });
-              submarket_names.off('selectmenuchange', changed);
-              submarket_names.on('selectmenuchange', changed);
-            } else {
-            submarket_names.update_list(getSortedSubmarkets(Object.keys(header[market_names.val()])));
-            submarket_names.off('selectmenuchange', changed);
-            submarket_names.on('selectmenuchange', changed);
-        }
-
-          updateTable(result, market_names.val(), submarket_names.val());
+      const refresh = (data, symbols) => {
+         const result = processData(menu.extractFilteredMarkets(data[0]));
+         const active_symbols = symbols;
+         let header = getObjectMarketSubmarkets(active_symbols);
+         const markets_sorted_list = getSortedMarkets(active_symbols);
+         
+         if($.isEmptyObject(header)) return;
+   
+         function changed() {
+           const val = $(this).val();
+           const new_active_symbols = symbols;
+           header = getObjectMarketSubmarkets(new_active_symbols);
+   
+           if (header[val]) {
+              const cumulative_submarkets = Object.keys(header[val]);
+              submarket_names.update_list(getSortedSubmarkets(cumulative_submarkets));
+           };
+   
+           updateTable(result, market_names.val(), submarket_names.val());
+         };
+   
+           if (market_names == null) {
+               const select = $('<select />');
+               select.appendTo(subheader);
+               market_names = windows.makeSelectmenu(select, {
+                 list: markets_sorted_list,
+                 inx: 0,
+               });
+               market_names.off('selectmenuchange', changed);
+               market_names.on('selectmenuchange', changed);
+           } else {
+             market_names.update_list(markets_sorted_list);
+             market_names.off('selectmenuchange', changed);
+             market_names.on('selectmenuchange', changed);
+         }
+   
+           if (submarket_names == null) {
+               const sub_select = $('<select />');
+               sub_select.appendTo(subheader);
+               submarket_names = windows.makeSelectmenu(sub_select, {
+                 list: getSortedSubmarkets(Object.keys(header[market_names.val()])),
+                 inx: 0,
+                 changed: changedFn,
+               });
+               submarket_names.off('selectmenuchange', changed);
+               submarket_names.on('selectmenuchange', changed);
+             } else {
+             submarket_names.update_list(getSortedSubmarkets(Object.keys(header[market_names.val()])));
+             submarket_names.off('selectmenuchange', changed);
+             submarket_names.on('selectmenuchange', changed);
+         }
+       
+         updateTable(result, market_names.val(), submarket_names.val());
       };
 
       const getCachedData = () => {
@@ -213,8 +204,12 @@ const initTradingWin = ($html) => {
                  liveapi.cached.send(trading_times_request),
              ])
              .then((results) => {
-                 refresh(results);
-                 $processing_msg.hide();
+               liveapi
+               .send({ active_symbols: "brief" })
+               .then(function (response) {
+                  refresh(results, response.active_symbols);
+               })
+               $processing_msg.hide();
              })
              .catch((error) => {
                  $.growl.error({ message: error.message });