Skip to content

2459 router range error fix #2476

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 20, 2017
Merged

2459 router range error fix #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b371df
simple fix
prosf Jun 20, 2017
48fedea
fix typo & linting
prosf Jun 20, 2017
fd711c6
fix linting issues
prosf Jun 20, 2017
82a872f
Merge branch 'development' into 2459-Router-range-Error-fix
kieckhafer Jun 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion imports/plugins/core/router/client/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ import { Router } from "../lib";
Meteor.startup(function () {
Tracker.autorun(function () {
// initialize client routing

if (Reaction.Subscriptions.Packages.ready() && Reaction.Subscriptions.Shops.ready()) {
initBrowserRouter();
// initBrowserRouter calls Router.initPackageRoutes which calls shopSub.ready which is reactive,
// So we have to call initBrowserRouter in a non reactive context.
// Otherwise initBrowserRouter is called twice each time a Reaction.Subscriptions.Packages.ready() and
// Reaction.Subscriptions.Shops.ready() are true

Tracker.nonreactive(()=> {
initBrowserRouter();
});
}
});

Expand Down
272 changes: 148 additions & 124 deletions imports/plugins/core/router/lib/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,20 +166,36 @@ Router.pathFor = (path, options = {}) => {
Router.go = (path, params, query) => {
let actualPath;

if (typeof path === "string" && path.startsWith("/")) {
actualPath = path;
} else {
actualPath = Router.pathFor(path, {
hash: {
...params,
query
const routerGo = () => {
if (typeof path === "string" && path.startsWith("/")) {
actualPath = path;
} else {
actualPath = Router.pathFor(path, {
hash: {
...params,
query
}
});
}

if (window) {
history.push(actualPath);
}
};

// if Router is in a non ready/initialized state yet ,wait until it is
if (!Router.ready()) {
Tracker.autorun(routerReadyWaitFor => {
if (Router.ready()) {
routerReadyWaitFor.stop();
routerGo();
}
});
}

if (window) {
history.push(actualPath);
return;
}

routerGo();
};

Router.replace = (path, params, query) => {
Expand Down Expand Up @@ -408,6 +424,10 @@ export function ReactionLayout(options = {}) {
* @returns {undefined} returns undefined
*/
Router.initPackageRoutes = (options) => {
// make _initialized = false in case router is reinitialized
Router._initialized = false;
routerReadyDependency.changed();

Router.Reaction = options.reactionContext;
Router.routes = [];

Expand All @@ -419,130 +439,134 @@ Router.initPackageRoutes = (options) => {
// but we need to bypass the current
// subscription to determine this.
const shopSub = Meteor.subscribe("shopsCount");
if (shopSub.ready()) {
// using tmeasday:publish-counts
const shopCount = Counts.get("shops-count");

// Default layouts
const indexLayout = ReactionLayout(options.indexRoute);
const notFoundLayout = ReactionLayout({ template: "notFound" });

// Index route
routeDefinitions.push({
route: "/",
name: "index",
options: {

Tracker.autorun(shopSubWaitFor => {
if (shopSub.ready()) {
shopSubWaitFor.stop();
// using tmeasday:publish-counts
const shopCount = Counts.get("shops-count");

// Default layouts
const indexLayout = ReactionLayout(options.indexRoute);
const notFoundLayout = ReactionLayout({ template: "notFound" });

// Index route
routeDefinitions.push({
route: "/",
name: "index",
...options.indexRoute,
component: indexLayout.component,
structure: indexLayout.structure
}
});
options: {
name: "index",
...options.indexRoute,
component: indexLayout.component,
structure: indexLayout.structure
}
});

// Not found route
routeDefinitions.push({
route: "/not-found",
name: "not-found",
options: {
// Not found route
routeDefinitions.push({
route: "/not-found",
name: "not-found",
...notFoundLayout.indexRoute,
component: notFoundLayout.component,
structure: notFoundLayout.structure
}
});

// get package registry route configurations
for (const pkg of pkgs) {
const newRoutes = [];
// pkg registry
if (pkg.registry && pkg.enabled) {
const registry = Array.from(pkg.registry);
for (const registryItem of registry) {
// registryItems
if (registryItem.route) {
const {
meta,
route,
permissions,
template,
layout,
workflow
} = registryItem;

// get registry route name
const name = getRegistryRouteName(pkg.name, registryItem);

// define new route
// we could allow the options to be passed in the registry if we need to be more flexible
const reactionLayout = ReactionLayout({ template, workflow, layout, permissions });
const newRouteConfig = {
route,
name,
options: {
options: {
name: "not-found",
...notFoundLayout.indexRoute,
component: notFoundLayout.component,
structure: notFoundLayout.structure
}
});

// get package registry route configurations
for (const pkg of pkgs) {
const newRoutes = [];
// pkg registry
if (pkg.registry && pkg.enabled) {
const registry = Array.from(pkg.registry);
for (const registryItem of registry) {
// registryItems
if (registryItem.route) {
const {
meta,
name,
route,
permissions,
template,
layout,
triggersEnter: Router.Hooks.get("onEnter", name),
triggersExit: Router.Hooks.get("onExit", name),
component: reactionLayout.component,
structure: reactionLayout.structure
}
};

// push new routes
newRoutes.push(newRouteConfig);
} // end registryItems
} // end package.registry

//
// add group and routes to routing table
//
for (const route of newRoutes) {
// allow overriding of prefix in route definitions
// define an "absolute" url by excluding "/"
route.group = {};

if (route.route.substring(0, 1) !== "/") {
route.route = "/" + route.route;
route.group.prefix = "";
} else if (shopCount <= 1) {
route.group.prefix = "";
} else {
route.group.prefix = prefix;
route.route = `${prefix}${route.route}`;
}
workflow
} = registryItem;

routeDefinitions.push(route);
}
}
} // end package loop
// get registry route name
const name = getRegistryRouteName(pkg.name, registryItem);

// Uniq-ify routes
// Take all route definitions in the order that were received, and reverse it.
// Routes defined later, like in the case of custom routes will then have a
// higher precedence. Any duplicates after the first instance will be removed.
//
// TODO: In the future, sort by priority
// TODO: Allow duplicated routes with a prefix / suffix / flag
const uniqRoutes = uniqBy(routeDefinitions.reverse(), "route");
const reactRouterRoutes = uniqRoutes.map((route, index) => {
return (
<Route
key={`${route.name}-${index}`}
path={route.route}
exact={true}
render={route.options.component}
/>
);
});
// define new route
// we could allow the options to be passed in the registry if we need to be more flexible
const reactionLayout = ReactionLayout({ template, workflow, layout, permissions });
const newRouteConfig = {
route,
name,
options: {
meta,
name,
template,
layout,
triggersEnter: Router.Hooks.get("onEnter", name),
triggersExit: Router.Hooks.get("onExit", name),
component: reactionLayout.component,
structure: reactionLayout.structure
}
};

// push new routes
newRoutes.push(newRouteConfig);
} // end registryItems
} // end package.registry

//
// add group and routes to routing table
//
for (const route of newRoutes) {
// allow overriding of prefix in route definitions
// define an "absolute" url by excluding "/"
route.group = {};

if (route.route.substring(0, 1) !== "/") {
route.route = "/" + route.route;
route.group.prefix = "";
} else if (shopCount <= 1) {
route.group.prefix = "";
} else {
route.group.prefix = prefix;
route.route = `${prefix}${route.route}`;
}

routeDefinitions.push(route);
}
}
} // end package loop

// Uniq-ify routes
// Take all route definitions in the order that were received, and reverse it.
// Routes defined later, like in the case of custom routes will then have a
// higher precedence. Any duplicates after the first instance will be removed.
//
// TODO: In the future, sort by priority
// TODO: Allow duplicated routes with a prefix / suffix / flag
const uniqRoutes = uniqBy(routeDefinitions.reverse(), "route");
const reactRouterRoutes = uniqRoutes.map((route, index) => {
return (
<Route
key={`${route.name}-${index}`}
path={route.route}
exact={true}
render={route.options.component}
/>
);
});

Router._initialized = true;
Router.reactComponents = reactRouterRoutes;
Router._routes = uniqRoutes;
Router._initialized = true;
Router.reactComponents = reactRouterRoutes;
Router._routes = uniqRoutes;

routerReadyDependency.changed();
}
routerReadyDependency.changed();
}
});
};


Expand Down