[Marketplace] Feature - Dashboards for multiple shops #2429

spencern · 2017-06-13T18:15:50Z

Change the context of a users dashboard shortcuts and user dropdown shortcuts based on active shop.

For a user with the following roles for the secondary shop:

"FXybdgAYSKYndkRef" : [ 
  "notifications", 
  "dashboard", 
  "seller", 
  "guest", 
  "manage-users", 
  "orders", 
  "account/profile", 
  "accounts", 
  "account/verify", 
  "dashboard/accounts", 
  "product", 
  "createProduct", 
  "tag", 
  "index", 
  "cart/checkout", 
  "cart/completed", 
  "shop"
]

Their dashboard and shortcuts dropdown looks like the following:

* Modifies Shops publication to return all shops with matching domain by removing limit * Rewrite of shop selector dropdown * Use Shops publication instead of SellerShops publication in dropdown * Remove requirement for marketplace ownership to see shop selector * Change Reaction.ShopId when shop selector is changed * TODO: Convert shop selector to React

* Eliminates console warnings

…ShopId

…ive shop

spencern · 2017-06-13T18:24:24Z

@impactmass
Assigning you to this PR since you're working on permissions also. I think it'd be good if you are I are reviewing all permissions related PRs

…etShopId now checks for user selected shop

impactmass · 2017-06-15T09:52:16Z

These are the items I see in the dropdown with the permissions set as listed in above description (shown on the side). Taken while on the secondary shop too.

I added the permissions directly on the user in the DB as going through the Accounts dashboard wasn't adding the permissions under the secondary shop. Is this the right way to test the PR?

spencern · 2017-06-15T16:27:25Z

@impactmass While we don't have identical permissions available, I think we probably went about setting it up slightly differently. I don't think that's an issue as what this PR is trying to accomplish is changing the dashboard contextually based on the active shop and enabled permissions. It looks like that is working for you as well.

If you can do a code review for me as well, I think we can probably go ahead and merge this one in.

We can figure out why the same set of permissions are granting different options for the dashboard later, but my guess would be something that changed in the base marketplace branch that you merged in.

impactmass · 2017-06-15T16:30:58Z

ok, I'll do a code review, plus test it while stepping back that last commit. Will update in a shortly

…lable

…d rely on the implicit shopId

…op-dashboards

…sts to fail

# Conflicts: # server/publications/collections/packages.js

…ated

… on the fly when a new shop is created

spencern · 2017-06-23T18:24:01Z

This PR got out of hand, and is a lot bigger than I'd like, but the issues kept cascading.

This solves a number of issues now:

Changes the context of the dashboard based on active shop
When creating a shop, automatically add packages, setup permissions, and create layouts so a server restart is not necessary (Resolves [Marketplace] Packages are not added for new shop until server restart #2212)
Removes the dependency on getSellerShopId through out the app, with the exception of leaving it in the marketplace plugin specific templates.
Modifies the getShopId method on the server to return the users active shop
Fixes an issue where routes were not loading on a direct route because the packages were not found for the shop.

@impactmass - If you could give this another review asap, we can merge it and get cranking on the rest of marketplace

impactmass · 2017-06-23T22:14:01Z

client/modules/core/helpers/permissions.js

@@ -59,6 +59,10 @@ Template.registerHelper("hasDashboardAccess", function () {
  return Reaction.hasDashboardAccess();
 });

+Template.registerHelper("hasDashboardAccessForAnyShop", function () {
+  return Reaction.hasPermissionsForAnyShop();


I searched for this function hasPermissionsForAnyShop and couldn't find it. Is it already on the marketplace branch? Or there's some typo here? Is it meant to be

Template.registerHelper("hasDashboardAccessForAnyShop", function () { return Reaction.hasDashboardAccessForAnyShop(); });

Good catch. I think I added this before the navbar was fully converted to react and have since removed the rest of it.

This is fixed now.

spencern · 2017-06-24T00:46:51Z

Pretty sure this is ready to merge. Waiting on a final 'ok' from @impactmass, which I'll get whenever he gets back. We're planning to walk through the PR at that point, anyone is welcome to join. Will be some time next week. (Monday hopefully). In the mean time if anyone else wants to review, we can go ahead and merge.

impactmass

Tested the dashboard context switching, when different shops are selected. Works as the PR said.
Also worked through parts of the PR that I wasn't familiar with yet with Spencer.
This is good to merge

spencern added 12 commits June 6, 2017 12:20

Set ShopId on shop selector change

ac4494a

Merge branch 'spencer-code-cleanup' into marketplace-shop-switcher

8b3df17

* Eliminates console warnings

Regular Shop Selector should just adjust only the route.

44ed9bc

Remove empty line at top of navbar

150514f

Change Reaction.shopId to be a ReactiveVar

8947d2c

Add closeOnClick option to DropDownMenu

9cc050d

Add shop selector to admin toolbar.

6af82e8

WIP - tons of code not committed - Init switching away from getSeller…

deae717

…ShopId

Switches dashboard context as well as published packages based on act…

6db6fe1

…ive shop

jsDoc for hasDashboardAccessForAnyShop

6f5399c

Helper method for hasShopSwitcherAccess

60b5757

spencern requested a review from aaronjudd June 13, 2017 18:15

spencern assigned impactmass and unassigned impactmass Jun 13, 2017

spencern requested review from impactmass and removed request for aaronjudd June 13, 2017 18:16

spencern changed the title ~~Spencer multi shop dashboards~~ [Marketplace] Feature - Dashboards for multiple shops Jun 13, 2017

Save user selected shopId into user preferences in database. Server g…

c6b16a6

…etShopId now checks for user selected shop

spencern mentioned this pull request Jun 14, 2017

[Marketplace] Feature - getShopId server side #2435

Closed

spencern and others added 6 commits June 14, 2017 13:07

Change collection security definitions to use active shop

84e7411

fix typo in main.js

8697f0b

Return the correct shop when editing shop details

eb8cfc5

Check permissions for correct shop in inventory methods

cc3faf5

Check permissions for correct shop in inventory statusChanges methods

a422f3c

Merge branch 'marketplace' into spencer-multi-shop-dashboards

f0e2731

impactmass approved these changes Jun 19, 2017

View reviewed changes

spencern added 16 commits June 19, 2017 08:34

Add new helper method to get userId

93c595e

refactor getShopId to use the helper method to get the userId if avai…

a07bbe4

…lable

Refactor changed hasPermission checks to pass the permissions only an…

92985ef

…d rely on the implicit shopId

Merge branch 'spencer-multi-shop-haspermission' into spencer-multi-sh…

65b78ed

…op-dashboards

Revert Access Denied error indexing on orders.js

4d9e211

Revert getSellerShopId to getShopId in lib helper that was causing te…

f408778

…sts to fail

Merge branch 'marketplace' into spencer-multi-shop-dashboards

694928f

# Conflicts: # server/publications/collections/packages.js

Fix issue in marketplace where routes are not loaded on initial load.

ed33d7b

Remove sellerShopId dependency in product publication

f603ddd

Fix typo in browser router comment

ed54f59

Remove dependency on sellerShopId in analytics publication

c113643

Remove lodash dependency in sellerShopSettings.js

44c7ef6

Remove SellerShopId dependency in orders publication

aa5c22a

Fix issue where creating a new user without an active shop would fail

56b9d5a

[WIP] Add insert packages to Packages collection when new shop is cre…

4eeba6e

…ated

Fixes #2212 - adds packages, creates layouts, and assigns permissions…

a81ee9f

… on the fly when a new shop is created

spencern added 2 commits June 23, 2017 12:53

Change package creation log when shop is created to debug

a96c0ff

Fix failing products publication test

4341061

impactmass reviewed Jun 23, 2017

View reviewed changes

spencern added 2 commits June 23, 2017 18:36

Switch context to the new shop when a user creates a shop

8820f10

Remove unused hasDashboardAccessForAnyShop blaze template helper

7a9bf86

impactmass approved these changes Jun 26, 2017

View reviewed changes

spencern merged commit 5cca54a into marketplace Jun 26, 2017

spencern mentioned this pull request Jun 29, 2017

[EPIC][Marketplace] Marketplace Permissions #2183

Closed

12 tasks

spencern mentioned this pull request Jul 28, 2017

[Marketplace] Packages are not added for new shop until server restart #2212

Closed

spencern deleted the spencer-multi-shop-dashboards branch August 14, 2017 14:30

spencern mentioned this pull request Oct 11, 2017

Release 1.5.0 #3089

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Marketplace] Feature - Dashboards for multiple shops #2429

[Marketplace] Feature - Dashboards for multiple shops #2429

spencern commented Jun 13, 2017

spencern commented Jun 13, 2017

impactmass commented Jun 15, 2017

spencern commented Jun 15, 2017

impactmass commented Jun 15, 2017

spencern commented Jun 23, 2017

impactmass Jun 23, 2017

spencern Jun 23, 2017

spencern Jun 24, 2017

spencern commented Jun 24, 2017

impactmass left a comment

[Marketplace] Feature - Dashboards for multiple shops #2429

[Marketplace] Feature - Dashboards for multiple shops #2429

Conversation

spencern commented Jun 13, 2017

spencern commented Jun 13, 2017

impactmass commented Jun 15, 2017

spencern commented Jun 15, 2017

impactmass commented Jun 15, 2017

spencern commented Jun 23, 2017

impactmass Jun 23, 2017

Choose a reason for hiding this comment

spencern Jun 23, 2017

Choose a reason for hiding this comment

spencern Jun 24, 2017

Choose a reason for hiding this comment

spencern commented Jun 24, 2017

impactmass left a comment

Choose a reason for hiding this comment