From 2abe3caa73e875a53f590667c1a19da88c4f9dc9 Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 14 May 2019 18:45:31 -0300 Subject: [PATCH] Multiple team support --- Panels/ProductsPanel.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index 5f690130c..f59909faa 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -61,12 +61,9 @@ function newProductsPanel () { let storedTeams = window.localStorage.getItem('userTeams') let userTeams - let userTeam = {slug: ''} if (storedTeams !== null && storedTeams !== undefined && storedTeams !== '') { userTeams = JSON.parse(storedTeams) - userTeam = userTeams[0] // Currently we assume a user can be at only one team. } - if (userTeam === undefined) { userTeam = {slug: ''} } /* First thing is to build the productCards array */ @@ -77,16 +74,16 @@ function newProductsPanel () { for (let j = 0; j < devTeam.bots.length; j++) { let bot = devTeam.bots[j] - + let userTeam = isUserTeam(devTeam.codeName, userTeams) if (bot.type !== 'Indicator' && bot.cloneId === undefined) { continue } - if (bot.type === 'Indicator' && (devTeam.codeName !== 'AAMasters' && devTeam.codeName !== userTeam.slug)) { continue } + if (bot.type === 'Indicator' && (devTeam.codeName !== 'AAMasters' && !userTeam)) { continue } if (bot.products !== undefined) { for (let k = 0; k < bot.products.length; k++) { let product = bot.products[k] if (window.localStorage.getItem('Show AAMaster Layers') === null) { - if (product.shareWith !== 'Public' && devTeam.codeName !== userTeam.slug) { continue } + if (product.shareWith !== 'Public' && !userTeam) { continue } } /* Now we create Product objects */ @@ -256,5 +253,14 @@ function newProductsPanel () { panelTabButton.draw() } + + function isUserTeam(team, userTeams){ + for (let index = 0; index < userTeams.length; index++) { + if(team === userTeams[index].slug){ + return true + } + } + return false + } }