Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.2.0 #2258

Merged
merged 179 commits into from
May 17, 2017
Merged

Release 1.2.0 #2258

merged 179 commits into from
May 17, 2017

Conversation

aaronjudd
Copy link
Contributor

@aaronjudd aaronjudd commented May 12, 2017

impactmass and others added 30 commits March 1, 2017 22:05
impactmass and others added 13 commits May 9, 2017 11:59
* Initial test of filtering pkgs

* Filter showing packages by permissions

* Resolve issue with hasAccess check on registry items

* Comment

* Comment edit

* Call packages coll without filter

* Move audience addition to ReactionApps

* Better comment

* Check not needed again.Apps come based on access level

* space fix

* Test: Permissions on toolbar component

* hasProduct access on toolbar

* Fix data

* Use createProduct as filter

* Refactor toolbar permission check

* Improve Comment

* Add missing perms in pub

* remove comment

* Add comment on filter line
* Initial push for React Router conversion

* Implement more global router functions

- Added `Router.getQueryParam`
- Added `Router.isActiveClassName`
- Added shop prefix for routes
- Added blaze event for brand link to use `Router.go`
- Added `query-parse` nom module to parse query strings
- Added route to currentRoute on route change

* Route rendering

- Router initialize
- Rewrite reaction layout to better handle layout generation
- Add `App` component as router base component
- Add Router.replace function for push state replace

* Move rest of router from client dir, into router package

* Use Router.go for tagLink

* Fixes issue with browserRouter router initializing before router core
is ready.

* Fixed route resolution for to exact matches

* Updated dependencies and shrink-wrap

* Not found and unauthorized routes and redirects

* Rename admin template to coreLayout

- use layout name to get proper layout

* Fix broken import

* Fix redirect url for PayPal pay flow express

Double slash in url causes no route to be matched for react router.
Added new helper method that wraps Meteor.absoluteUrl() and fetches the
shop prefix without a leading slash.

* Enable onEnter and legacy enter hooks

* Added exit hooks and improved hook handling logic

Re-implement metadata hook

* Show package settings shortcuts only if requested

* Added Router.watchPathChange()

* Remove unused function

* Added router go for grid item click event

* Fix eslint issues

* Added router go for cart items

* Fix router context for hooks

* Added special handling for print layout

* Scrolling for content area as admin

* Fix router reload when auth state changes

* Fix lint issues

* Fix lint issues

* Fix blank pdf view

* Prevent route change when previous and next routes match.

-Remove reactivity from `Router.current()` to better align with flow
router api.
- Add reactive dependencies query and url param functions.

* Fixed reference for getShopName()

* Fixing broken blaze layout

- Extend the react-in-blaze component, and rename conflicting
`template` prop to `blazeTemplate` to avoid a naming collision with our
layouts.
- Added check for foundLayout, verify its defined before trying to
access
- Added support for blaze based layouts, if a react layout cannot be
found

* Removed unused packages

* Adjust width of container to alleviate some scrolling issues

* Higher zindex for cart slide out

* Fix getSlug reference

* Fixes issue with incorrectly displaying unauthorized template
* LingoHub Update 🚀

Manual push by LingoHub User: Aaron Judd.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Aaron Judd.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Aaron Judd.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Aaron Judd.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Brent Hoover.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Brent Hoover.
Project: reaction

Made with ❤️ by https://lingohub.com

* LingoHub Update 🚀

Manual push by LingoHub User: Brent Hoover.
Project: reaction

Made with ❤️ by https://lingohub.com
* add product name to invoice

* add Product name to title
* wip

* Use passed in audience for ReactionApps

* Remove debug
* fix dropdown z-index

* use z-index variable

* reduce zindex-select variable value

* override `react-select` select menu z-index

* remove commented out style

* fix improper variable value alignment

* move import to main.less
Adds `reaction-paypal/paypalDone` and `reaction-paypal/paypalCancel` roles to the defaultRoles and defaultVisitorRoles set
@aaronjudd aaronjudd changed the title [WIP] Release 1.2.0 Release 1.2.0 May 12, 2017
Copy link
Collaborator

@brent-hoover brent-hoover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bunch of small nitpick/style things

README.md Outdated
## Participation

If you are interested in participating in the development of Reaction, that's really great!
See our [Requirements Docs](https://docs.reactioncommerce.com/reaction-docs/master/requirements) for requirements that you may to install for Reaction.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this meant to say "you may need"?

README.md Outdated

### What's Next
We ensure that all releases are deployable as [Docker](https://www.docker.com/) containers. While we don't regularly test other methods of deployment, our community has documented deployment strategies for [Heroku](https://github.com/reactioncommerce/reaction/issues/1363), AWS, [Digital Ocean](https://gist.github.com/jshimko/745ca66748846551692e24c267a56060), and Galaxy.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to remove this references to Heroku?


Router.triggers.enter(Router.Hooks.get("onEnter", "GLOBAL"));
Router.triggers.exit(Router.Hooks.get("onExit", "GLOBAL"));
// Router.Hooks.onEnter(checkRouterPermissions);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to remove this commented code?

<span className="btn btn-success btn-lg btn-block" id="btn-checkout" data-i18n="cartDrawer.checkout"
onClick={this.props.onClick || this.props.checkout}
>
Checkout now
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to change this to be <TranslationProvider>?

if (Number(this.props.cartDiscount) > 0) {
return (
<tr>
<td data-i18n="cartSubTotals.discount">Discount</td>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikemurray Is the sort of use of data-i18n that we want to eliminate?

}
});

if (provider) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could just return !!provider

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to leave this how it is for better / easier code readability.

@@ -1,7 +1,8 @@
import url from "url";
import { slugify } from "transliteration";
import { Meteor } from "meteor/meteor";
import { FlowRouter } from "meteor/kadira:flow-router-ssr";
// import { FlowRouter } from "meteor/kadira:flow-router-ssr";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weren't we going to remove this rather than comment it out?

import { Shops } from "/lib/collections";
import { Reaction } from "/server/api";

import { sinon } from "meteor/practicalmeteor:sinon";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Import order

import { expect } from "meteor/practicalmeteor:chai";
import { sinon } from "meteor/practicalmeteor:sinon";
import Fixtures from "/server/imports/fixtures";
// import { examplePaymentMethod } from "/server/imports/fixtures/packages";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented code

@@ -0,0 +1,502 @@
import { Meteor } from "meteor/meteor";
import { Factory } from "meteor/dburles:factory";
import accounting from "accounting-js";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Import order

Copy link
Contributor

@spencern spencern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved - Lot's of issues, but not any regressions that I'm aware of.

kieckhafer and others added 6 commits May 16, 2017 11:42
* update Router to adjust when shop URL is in provided data

* update notification onClick to open dashboard panel when needed

* re-add markOneAsRead
* update import of Reaction

* readme updates

* import fixes

* add meteor import

* import order fix

* comment fixes

* add meteor import

* removed flow router import

* import order

* import fix

* update i18n key

* update translations

* wrap full app in translation provider
@aaronjudd
Copy link
Contributor Author

@mikemurray @kieckhafer @zenweasel is this ready -> seems to now have 3 pending reviews...

Copy link
Member

@kieckhafer kieckhafer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@brent-hoover
Copy link
Collaborator

I'm still testing. I will approve as soon as I am done.

Copy link
Collaborator

@brent-hoover brent-hoover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No blockers. Ship it.

@aaronjudd aaronjudd merged commit d9ae98b into master May 17, 2017
@aaronjudd aaronjudd deleted the release-1.2.0 branch August 23, 2017 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.