[4254] Limit Products when in Edit Mode #4256
Conversation
| isBackorder: false | ||
| }); | ||
|
|
||
| collector = new PublicationCollector({ userId: Random.id() }); |
There was a problem hiding this comment.
all tests did this, so I moved it to a before block
| }); | ||
| }); | ||
|
|
||
| it("returns products from only the shops for which an admin has createProduct Role", function (done) { |
There was a problem hiding this comment.
the diff is a little strange here, but this is a new test.
the user does not have the createProduct role in the "current" shop but does for other.
It is a bit of a contrived example, but I will make it more realistic in the next PR addressing the #4092
| @@ -88,14 +108,35 @@ describe("Publication", function () { | |||
| sandbox.stub(Reaction, "getShopId", () => shopId); | |||
| sandbox.stub(Roles, "userIsInRole", () => true); | |||
| sandbox.stub(Reaction, "hasPermission", () => true); | |||
| sandbox.stub(Reaction, "getShopsWithRoles", () => [shopId]); | |||
| sandbox.stub(Reaction, "getShopsWithRoles", () => [shopId, primaryShopId]); | |||
There was a problem hiding this comment.
user has access to all shops
| @@ -320,14 +320,6 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so | |||
| return this.ready(); | |||
| } | |||
|
|
|||
| // Get active shop id's to use for filtering | |||
There was a problem hiding this comment.
with the fix, I was able to move this code down, saving a query when in editMode
| @@ -343,13 +335,17 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so | |||
| $in: [true, false, null, undefined] | |||
| }; | |||
| selector.shopId = { | |||
| $in: activeShopsIds | |||
| $in: userAdminShopIds | |||
| }; | ||
|
|
||
| // Get _ids of top-level products | ||
| const productIds = Products.find(selector, { | ||
| sort, | ||
| limit: productScrollLimit | ||
| }, { | ||
| fields: { | ||
| _id: 1 |
There was a problem hiding this comment.
not relevant to this PR, but since we only care about the _id I figured I'd save some data transfer and request only the _id field
| }).map((product) => product._id); | ||
|
|
||
| let newSelector = { ...selector }; | ||
| let newSelector = _.omit(...selector, ["hashtags", "ancestors"]); |
There was a problem hiding this comment.
both branches of the conditional below perform the omit operation, so I moved it here and combined it with the initial spread/clone
| { _id: primaryShopId } | ||
| ] | ||
| }, { | ||
| fields: { |
There was a problem hiding this comment.
this is a copy/paste from above with the fields added
pmn4
force-pushed
the
pmn4/product-publication--edit-mode
branch
2 times, most recently
from
8555ab8
to
c4078fb
Compare
| }).map((product) => product._id); | ||
|
|
||
| let newSelector = { ...selector }; | ||
| let newSelector = _.omit(selector, ["hashtags", "ancestors"]); |
There was a problem hiding this comment.
both branches of the conditional below perform the omit operation
pmn4
force-pushed
the
pmn4/product-publication--edit-mode
branch
from
c4078fb
to
c758804
Compare
pmn4
force-pushed
the
pmn4/product-publication--edit-mode
branch
from
c758804
to
c02255f
Compare
Resolves #4254
Impact: major/minor
Type: bugfix
Issue
When in Edit Mode, a grid will show all products from all shops**, editable or not.
** - whether it is correct that all products from all shops should be displayed is a different issue, which I will be addressing shortly.
Solution
We fetch a list of shops for which you have the
"createProduct"role, but then return the products from all active shops. This PR changes that to only show the products from the shops where you have the role wheneditModeistrue.Breaking changes
none.
Testing