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

Issue FarmBot#1379 Updates to Execute sequence step.

pull/1432/head
Ascend 2019-09-09 12:38:41 +02:00
parent 427cbab172
commit cfc7baf587
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/sequences/__tests__/sequence_select_box_test.tsx
View File

@ -25,7 +25,7 @@ describe("<SequenceSelectBox />", () => {
it("renders", () => { it("renders", () => {
const wrapper = mount(<SequenceSelectBox {...fakeProps()} />); const wrapper = mount(<SequenceSelectBox {...fakeProps()} />);
expect(wrapper.text()).toEqual("None"); expect(wrapper.text()).toEqual("Select a sequence");
}); });
it("returns list: none selected", () => { it("returns list: none selected", () => {

4
frontend/sequences/sequence_select_box.tsx
View File

@ -3,6 +3,7 @@ import { isNumber } from "lodash";
import { ResourceIndex } from "../resources/interfaces"; import { ResourceIndex } from "../resources/interfaces";
import { selectAllSequences, findSequenceById } from "../resources/selectors"; import { selectAllSequences, findSequenceById } from "../resources/selectors";
import { FBSelect, DropDownItem } from "../ui/index"; import { FBSelect, DropDownItem } from "../ui/index";
import { t } from "../i18next_wrapper";
export interface SequenceSelectBoxProps { export interface SequenceSelectBoxProps {
onChange(selection: DropDownItem): void; onChange(selection: DropDownItem): void;
@ -40,5 +41,6 @@ export function SequenceSelectBox(props: SequenceSelectBoxProps) {
return <FBSelect return <FBSelect
onChange={props.onChange} onChange={props.onChange}
selectedItem={selectedSequence()} selectedItem={selectedSequence()}
list={sequenceDropDownList()} />; list={sequenceDropDownList()}
customNullLabel={t("Select a sequence")} />;
} }

2
frontend/sequences/step_tiles/__tests__/index_test.ts
View File

@ -114,7 +114,7 @@ describe("renderCeleryNode()", () => {
}, },
{ {
node: { kind: "execute", args: { sequence_id: 0 } } as Execute, node: { kind: "execute", args: { sequence_id: 0 } } as Execute,
expected: "Sequence" expected: "Select a sequence"
}, },
{ {
node: { node: {

10
frontend/sequences/step_tiles/__tests__/tile_execute_test.tsx
View File

@ -43,12 +43,9 @@ describe("<ExecuteBlock/>", () => {
it("renders inputs", () => { it("renders inputs", () => {
const block = mount(<ExecuteBlock {...fakeProps()} />); const block = mount(<ExecuteBlock {...fakeProps()} />);
const inputs = block.find("input"); const inputs = block.find("input");
const labels = block.find("label");
expect(inputs.length).toEqual(1); expect(inputs.length).toEqual(1);
expect(labels.length).toEqual(1);
expect(inputs.first().props().placeholder).toEqual("Execute Sequence"); expect(inputs.first().props().placeholder).toEqual("Execute Sequence");
expect(labels.at(0).text()).toEqual("Sequence"); expect(block.text()).toContain("Select a sequence");
expect(block.text()).toContain("None");
}); });
it("renders inputs when sequence has a variable", () => { it("renders inputs when sequence has a variable", () => {
@ -56,12 +53,9 @@ describe("<ExecuteBlock/>", () => {
p.shouldDisplay = () => true; p.shouldDisplay = () => true;
const block = mount(<ExecuteBlock {...p} />); const block = mount(<ExecuteBlock {...p} />);
const inputs = block.find("input"); const inputs = block.find("input");
const labels = block.find("label");
expect(inputs.length).toEqual(1); expect(inputs.length).toEqual(1);
expect(labels.length).toEqual(1);
expect(inputs.first().props().placeholder).toEqual("Execute Sequence"); expect(inputs.first().props().placeholder).toEqual("Execute Sequence");
expect(labels.at(0).text()).toEqual("Sequence"); expect(block.text()).toContain("Select a sequence");
expect(block.text()).toContain("None");
}); });
}); });

6
frontend/sequences/step_tiles/tile_execute.tsx
View File

@ -17,7 +17,6 @@ import {
} from "../locals_list/variable_support"; } from "../locals_list/variable_support";
import { AllowedVariableNodes } from "../locals_list/locals_list_support"; import { AllowedVariableNodes } from "../locals_list/locals_list_support";
import { isNumber } from "lodash"; import { isNumber } from "lodash";
import { t } from "../../i18next_wrapper";
/** Replaces the execute step body with a new array of variables. */ /** Replaces the execute step body with a new array of variables. */
const assignVariable = (props: ExecBlockParams) => const assignVariable = (props: ExecBlockParams) =>
@ -102,8 +101,7 @@ export class RefactoredExecuteBlock
confirmStepDeletion={this.props.confirmStepDeletion} /> confirmStepDeletion={this.props.confirmStepDeletion} />
<StepContent className={className}> <StepContent className={className}>
<Row> <Row>
<Col xs={12}> <Col xs={6}>
<label>{t("Sequence")}</label>
<SequenceSelectBox <SequenceSelectBox
onChange={this.changeSelection} onChange={this.changeSelection}
resources={resources} resources={resources}
@ -112,7 +110,7 @@ export class RefactoredExecuteBlock
</Row> </Row>
<Row> <Row>
{!!calledSequenceVariableData && {!!calledSequenceVariableData &&
<Col xs={12}> <Col xs={6}>
<LocalsList <LocalsList
bodyVariables={currentStep.body} bodyVariables={currentStep.body}
variableData={calledSequenceVariableData} variableData={calledSequenceVariableData}