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

Render `name` of selected PointGroup

pull/1463/head
Rick Carlino 2019-09-26 11:34:22 -05:00
parent ba0503ef00
commit 0785ee979a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/resources/selectors_by_kind.ts
View File

@ -58,6 +58,7 @@ export let findSequence = uuidFinder<TaggedSequence>("Sequence");
export let findRegimen = uuidFinder<TaggedRegimen>("Regimen");
export let findFarmEvent = uuidFinder<TaggedFarmEvent>("FarmEvent");
export let findPoints = uuidFinder<TaggedPoint>("Point");
export let findPointGroup = uuidFinder<TaggedPoint>("Point");
export const selectAllCrops =
(i: ResourceIndex) => findAll<TaggedCrop>(i, "Crop");

13
frontend/resources/sequence_meta.ts
View File

@ -5,8 +5,8 @@ import {
ScopeDeclarationBodyItem,
} from "farmbot";
import { DropDownItem } from "../ui";
import { findPointerByTypeAndId } from "./selectors";
import { findSlotByToolId, findToolById } from "./selectors_by_id";
import { findPointerByTypeAndId, findPointGroup } from "./selectors";
import { findSlotByToolId, findToolById, findResourceById } from "./selectors_by_id";
import {
formatPoint, safeEveryPointType, everyPointDDI, NO_VALUE_SELECTED_DDI,
formatTool,
@ -116,8 +116,13 @@ export const determineDropdown =
const toolSlot = findSlotByToolId(resources, tool_id);
return formatTool(findToolById(resources, tool_id), toolSlot);
case "point_group":
const { resource_id } = data_value.args;
return { label: "--- WIP ---", value: "" + resource_id };
const value = data_value.args.resource_id;
const uuid2 = findResourceById(resources, "PointGroup", value);
const group = findPointGroup(resources, uuid2);
return {
label: group.body.name,
value
};
case "nothing" as unknown:
return NO_VALUE_SELECTED_DDI();
}