Merge development into marketplace #2529

spencern · 2017-07-06T05:53:14Z

Merges latest development into marketplace
Resolves all conflicts (a lot!)

private/data/Shops.json

I _swear_ this worked before, but I’m not sure what got changed and when I go back to older commits, the same issue is present. The apparent problem is that the Security.permit / Security.deny collection permission security methods are running before a users Id has been loaded. The fix here is to create a new security method `ifHasRoleForActiveShop` that moves checking `Reaction.getShopId()` to the security method instead of on the `permit` or `deny` method.

spencern · 2017-07-07T22:18:31Z

I swear this worked before, but I’m not sure what got changed and when I go back to older commits, the same issue is present.
The apparent problem is that the Security.permit / Security.deny collection permission security methods are running before a users Id has been loaded.

The fix here is to create a new security method ifHasRoleForActiveShop that moves checking Reaction.getShopId() to the security method instead of on the permit or deny method.

@zenweasel would you check this out when you get a chance. I think it's ready to merge to marketplace now and would you review the changes in /server/security/collections.js specifically.

After this merges I think we should be able to get the team to start working off of the marketplace branch instead of development for most tasks.

* correct order action workflow change * always update selected order

brent-hoover · 2017-07-10T07:52:39Z

@spencern What exactly did you want me to review? Ddi you want me to test it?

spencern · 2017-07-10T13:30:11Z

@zenweasel Yeah, I should have put "to test" steps up.

I was specifically hoping you could look at the new security method I added to make the active shop admin permissions work correctly for client side database ops.

https://github.com/reactioncommerce/reaction/blob/spencer-merge-dev-marketplace/server/security/collections.js#L43-L53

I'm pretty sure it's fine, but seems like the type of code that should be reviewed.

spencern · 2017-07-10T13:31:19Z

Additionally,

To test:

Start server
Create a new account
Click "Become a Seller" in the users profile
Change the name or other shop details of the new shop that gets created.

* Update Eslint * Auto-fix eslint errors

brent-hoover · 2017-07-11T03:25:11Z

imports/plugins/included/shippo/client/settings/shippoTableColumn.js

+import PropTypes from "prop-types";
+import { Icon } from "/imports/plugins/core/ui/client/components";
+
+class EmailTableColumn extends Component {


This is probably in development but why is this called EmailTableColumn?

brent-hoover · 2017-07-11T03:32:11Z

If I create an account and then click "Become a seller" I get a bunch of console errors:

TypeError: Cannot read property 'brandAssets' of undefined
    at Brand.getLogo (brand.js:21)
    at Brand.render (brand.js:30)
    at modules.js?hash=1e7eb5b…:107993
    at measureLifeCyclePerf (modules.js?hash=1e7eb5b…:107272)
    at ReactCompositeComponentWrapper._renderValidatedComponentWithoutOwnerOrContext (modules.js?hash=1e7eb5b…:107992)
    at ReactCompositeComponentWrapper._renderValidatedComponent (modules.js?hash=1e7eb5b…:108019)
    at ReactCompositeComponentWrapper._updateRenderedComponent (modules.js?hash=1e7eb5b…:107943)
    at ReactCompositeComponentWrapper._performComponentUpdate (modules.js?hash=1e7eb5b…:107921)
    at ReactCompositeComponentWrapper.updateComponent (modules.js?hash=1e7eb5b…:107842)
    at ReactCompositeComponentWrapper.receiveComponent (modules.js?hash=1e7eb5b…:107744)

It repeats with can't find locales, language of undefined

spencern · 2017-07-11T04:14:21Z

@zenweasel I'd seen those errors before but couldn't reproduce them. I'll see if I can address those now

brent-hoover · 2017-07-11T04:15:32Z

Testing this again with a full reset I am not seeing it and can't reproduce it either. I had done a full reset before as well so I don't know what the deal it.

brent-hoover · 2017-07-11T04:20:14Z

package.json

      "^meteor/aldeed:simple-schema": "<rootDir>/imports/test-utils/__mocks__/meteor/aldeed-simple-schema",
+      "^meteor/tmeasday:publish-counts": "<rootDir>/imports/test-utils/__mocks__/meteor/aldeed-simple-schema",


I think this is wrong. Should be tmeasday:publish-counts

Nice catch.

Looks like this is wrong in development too

Identical to dev.. https://github.com/reactioncommerce/reaction/blob/development/package.json#L144-L149
Still feels wrong though

brent-hoover · 2017-07-11T04:26:04Z

server/api/core/core.js

@@ -85,7 +89,7 @@ export default {
  },
  /**
   * registerTemplate
-   * registers Templates into the Templates Collection
+   * registers Templates into the Tempaltes Collection


brent-hoover · 2017-07-11T04:29:04Z

server/api/core/core.js

+    const packages = this.Packages;
+    // for each shop, we're loading packages in a unique registry
+    // Object.keys(pkgConfigs).forEach((pkgName) => {
+    for (const packageName in packages) {


if packages is an array can you just use for..of to iterate?

probably could, seems like that would be better. Could lose the guard then I think.

actually, packages is an object where the keys are the packageName, not an array.

brent-hoover · 2017-07-11T04:37:20Z

server/publications/collections/product.js

+  };
+
+  // Authorized content curators fo the shop get special publication of the product
+  // all all relevant revisions all is one package


Typo in comment

brent-hoover · 2017-07-11T04:39:05Z

server/publications/collections/product.js

@@ -271,7 +216,7 @@ Meteor.publish("Product", function (productId) {
    ];
  }

-  // Everyone else gets the standard, visible products and variants
+  // Everyone else gets the standard, visibile products and variants


Changed from correctly spelled to incorrect

hah, wonder how that snuck in.

brent-hoover · 2017-07-11T04:45:52Z

I expect that everything I noted is probably also on development so this looks good to me. I checked the code you noted @spencern and it seems fine to me as far as my understanding of what it's supposed to do.

brent-hoover and others added 30 commits April 17, 2017 10:30

Allow customer to move past validation after one pass

b9a5237

Silencing needless warning

6917f5c

Add missing imports

cca678a

When we get a "GetTax" error, revert to addressbook

433bef6

Capture and parse errors

5b64575

Creating a "review and fix" address review screen

564dfdf

Show highlited diff. Copy over values on click.

7f7a02a

Removing "debug" HTML

9a56646

Add "review address" translation

28db441

Basic "review address" flow working

f5c7c9e

Remove console.log

c5c79a4

Merge branch 'development' into brent-fix-issue-2104

540c24e

Fix missing import

9393e16

Fix import error

9218f31

Return to edit and refresh address when you cancel out of review

4ac11b2

Make edit behave the same as add

9f8da99

Tweak styling

3d972d0

Merge branch 'development' into brent-fix-issue-2104

5ce8394

Merge branch 'development' into brent-fix-issue-2104

de48f0b

More and more style changes

7e330d9

Use proper color variables

4729320

Create proper behaviors

31c0349

Merge branch 'development' into brent-fix-issue-2104

62b9c45

Fix bad evaluation

1de63a3

Fix import order

e263769

Add i18n

239680d

Don't throwback a step if tax fails

c72247a

Make this more of an "exception" flag

0d069d7

Adding the license description with link on README (#2365)

c1c4b3f

added Nigerian Naira to currency list in (#2366)

df6739d

private/data/Shops.json

spencern changed the title ~~Spencer merge dev marketplace~~ [WIP] Spencer merge dev marketplace Jul 7, 2017

spencern added 2 commits July 7, 2017 16:14

Remove leftover console.log

442aef4

jshimko and others added 2 commits July 8, 2017 15:30

update Docker base to v2.0.2 (#2537)

b1fae31

Fix order action button reverting status to processing (#2541)

ce7d8a1

* correct order action workflow change * always update selected order

spencern changed the title ~~[WIP] Spencer merge dev marketplace~~ Spencer merge dev marketplace Jul 10, 2017

spencern changed the title ~~Spencer merge dev marketplace~~ Merge development into marketplace Jul 10, 2017

brent-hoover and others added 2 commits July 10, 2017 14:35

Update eslint to v4 (#2542)

0bc04f0

* Update Eslint * Auto-fix eslint errors

Merge branch 'development' into spencer-merge-dev-marketplace

9568cf2

brent-hoover reviewed Jul 11, 2017

View reviewed changes

spencern added 2 commits July 10, 2017 22:27

Fix publish-counts module name map for jest

96f40ab

Fixes typo

044a647

brent-hoover reviewed Jul 11, 2017

View reviewed changes

brent-hoover approved these changes Jul 11, 2017

View reviewed changes

Fix more typos

198e694

spencern merged commit 1d35b29 into marketplace Jul 11, 2017

spencern deleted the spencer-merge-dev-marketplace branch July 11, 2017 05:01

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

Merge development into marketplace #2529

Merge development into marketplace #2529

spencern commented Jul 6, 2017

spencern commented Jul 7, 2017

brent-hoover commented Jul 10, 2017

spencern commented Jul 10, 2017

spencern commented Jul 10, 2017

brent-hoover Jul 11, 2017

brent-hoover commented Jul 11, 2017

spencern commented Jul 11, 2017

brent-hoover commented Jul 11, 2017

brent-hoover Jul 11, 2017 •

edited

Loading

spencern Jul 11, 2017

brent-hoover Jul 11, 2017

spencern Jul 11, 2017 •

edited

Loading

brent-hoover Jul 11, 2017

brent-hoover Jul 11, 2017

spencern Jul 11, 2017

spencern Jul 11, 2017

brent-hoover Jul 11, 2017

brent-hoover Jul 11, 2017

spencern Jul 11, 2017

brent-hoover commented Jul 11, 2017

		"^meteor/aldeed:simple-schema": "<rootDir>/imports/test-utils/__mocks__/meteor/aldeed-simple-schema",
		"^meteor/tmeasday:publish-counts": "<rootDir>/imports/test-utils/__mocks__/meteor/aldeed-simple-schema",

Merge development into marketplace #2529

Merge development into marketplace #2529

Conversation

spencern commented Jul 6, 2017

spencern commented Jul 7, 2017

brent-hoover commented Jul 10, 2017

spencern commented Jul 10, 2017

spencern commented Jul 10, 2017

Choose a reason for hiding this comment

brent-hoover commented Jul 11, 2017

spencern commented Jul 11, 2017

brent-hoover commented Jul 11, 2017

brent-hoover Jul 11, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spencern Jul 11, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brent-hoover commented Jul 11, 2017

brent-hoover Jul 11, 2017 •

edited

Loading

spencern Jul 11, 2017 •

edited

Loading