spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

FIX: Fix route precendence

pull/991/head
Rick Carlino 2018-09-18 15:26:13 -05:00
parent 9b2cb7762c
commit 836e96b8bc
2 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webpack/farm_designer/plants/plant_info_base.tsx
View File

@ -14,14 +14,8 @@ export abstract class PlantInfoBase extends
return this.templates ? "saved_gardens/templates" : "plants";
}
get stringyID() {
const aha = getPathArray()[this.templates ? 5 : 4] || "";
console.log(" === " + aha);
return aha;
}
get stringyID() { return getPathArray()[this.templates ? 5 : 4] || ""; }
get plant() { return this.props.findPlant(this.stringyID); }
destroy = (plantUUID: string) => {
this.props.dispatch(destroy(plantUUID))
.then(() =>

61
webpack/route_config.tsx
View File

@ -123,12 +123,7 @@ export const UNBOUND_ROUTES = [
key: "Devices"
}),
route({
$: "/farmware/*",
getModule: () => import("./farmware"),
key: "FarmwarePage"
}),
route({
$: "/farmware",
$: "/farmware(/:name)",
getModule: () => import("./farmware"),
key: "FarmwarePage"
}),
@ -138,12 +133,7 @@ export const UNBOUND_ROUTES = [
key: "Logs"
}),
route({
$: "/regimens",
getModule: () => import("./regimens"),
key: "Regimens"
}),
route({
$: "/regimens/:regimen",
$: "/regimens(/:regimen)",
getModule: () => import("./regimens"),
key: "Regimens"
}),
@ -172,15 +162,36 @@ export const UNBOUND_ROUTES = [
getChild: () => import("./farm_designer/farm_events/farm_events"),
key: "FarmEvents"
}),
legacyRoute({
$: "/designer/farm_events/add",
getChild: () => import("./farm_designer/farm_events/add_farm_event"),
key: "AddFarmEvent"
}),
legacyRoute({
$: "/designer/farm_events/:farm_event_id",
getChild: () => import("./farm_designer/farm_events/edit_farm_event"),
key: "EditFarmEvent"
}),
// =================== PLANT ROUTES
legacyRoute({
$: "/designer/farm_events/add",
getChild: () => import("./farm_designer/farm_events/add_farm_event"),
key: "AddFarmEvent"
$: "/designer/plants/move_to",
getChild: () => import("./farm_designer/plants/move_to"),
key: "MoveTo"
}),
legacyRoute({
$: "/designer/plants/saved_gardens",
getChild: () => import("./farm_designer/saved_gardens/saved_gardens"),
key: "SavedGardens"
}),
legacyRoute({
$: "/designer/plants/select",
getChild: () => import("./farm_designer/plants/select_plants"),
key: "SelectPlants"
}),
legacyRoute({
$: "/designer/plants/create_point",
getChild: () => import("./farm_designer/plants/create_points"),
key: "CreatePoints"
}),
legacyRoute({
$: "/designer/plants/crop_search",
@ -197,11 +208,6 @@ export const UNBOUND_ROUTES = [
getChild: () => import("./farm_designer/plants/crop_info"),
key: "CropInfo"
}),
legacyRoute({
$: "/designer/plants/create_point",
getChild: () => import("./farm_designer/plants/create_points"),
key: "CreatePoints"
}),
legacyRoute({
$: "/designer/plants/:plant_id/edit",
getChild: () => import("./farm_designer/plants/edit_plant_info"),
@ -212,19 +218,4 @@ export const UNBOUND_ROUTES = [
getChild: () => import("./farm_designer/plants/plant_info"),
key: "PlantInfo"
}),
legacyRoute({
$: "/designer/plants/move_to",
getChild: () => import("./farm_designer/plants/move_to"),
key: "MoveTo"
}),
legacyRoute({
$: "/designer/plants/saved_gardens",
getChild: () => import("./farm_designer/saved_gardens/saved_gardens"),
key: "SavedGardens"
}),
legacyRoute({
$: "/designer/plants/select",
getChild: () => import("./farm_designer/plants/select_plants"),
key: "SelectPlants"
}),
].concat([NOT_FOUND]);