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

Use point_group_id instead of resource_id. Fix typos.

pull/1492/head
Rick Carlino 2019-10-03 14:06:36 -05:00
parent 42d931ad3e
commit f09b1eba87
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/farm_designer/point_groups/point_group_sort_selector.tsx
View File

@ -18,9 +18,9 @@ interface Props {
const optionsTable: Record<PointGroupSortType, string> = {
"random": "Random Order",
"xy_ascending": "X/Y, Ascending",
"xy_decending": "X/Y, Descending",
"xy_descending": "X/Y, Descending",
"yx_ascending": "Y/X, Ascending",
"yx_decending": "Y/X Descending",
"yx_descending": "Y/X Descending",
}; // Typechecker will remind us when this needs an update. Don't simplify - RC
const optionPlusDescriptions =
@ -81,13 +81,13 @@ const SORT_OPTIONS: SortDictionary = {
xy_ascending(plants) {
return sortBy(plants, ["body.x", "body.y"]);
},
xy_decending(plants) {
xy_descending(plants) {
return sortBy(plants, ["body.x", "body.y"]).reverse();
},
yx_ascending(plants) {
return sortBy(plants, ["body.y", "body.x"]);
},
yx_decending(plants) {
yx_descending(plants) {
return sortBy(plants, ["body.y", "body.x"]).reverse();
}
};

2
package.json
View File

@ -45,7 +45,7 @@
"coveralls": "3.0.6",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"farmbot": "8.3.0-rc4",
"farmbot": "8.3.0-rc5",
"i18next": "17.0.16",
"lodash": "4.17.15",
"markdown-it": "10.0.0",