-
} />
-
-
- dispatch({
- type: Actions.SET_CROP_STAGE,
- payload: ddi.value,
- })} />
-
-
-
- dispatch({
- type: Actions.SET_CROP_PLANTED_AT,
- payload: e.currentTarget.value,
- })
- } />
-
-
-
- dispatch({
- type: Actions.SET_CROP_RADIUS,
- payload: parseInt(e.currentTarget.value),
- })
- } />
-
-
+
} />
+
+
+ dispatch({
+ type: Actions.SET_CROP_STAGE,
+ payload: ddi.value,
+ })} />
+
+
+
+ dispatch({
+ type: Actions.SET_CROP_PLANTED_AT,
+ payload: e.currentTarget.value,
+ })
+ } />
+
+
+
+ dispatch({
+ type: Actions.SET_CROP_RADIUS,
+ payload: parseInt(e.currentTarget.value),
+ })
+ } />
+
+
{
const number = parseInt(value, 10);
!isNaN(number) && onChange(gridKey, number);
- isNaN(number)
- ? setValue("" + grid[gridKey])
- : preview();
+ isNaN(number) && setValue("" + grid[gridKey]);
}}
onChange={e => setValue(e.currentTarget.value)} />
;
@@ -76,14 +74,12 @@ export function GridInput(props: GridInputProps) {
xy_swap={props.xy_swap}
gridKey={left}
onChange={props.onChange}
- preview={props.preview}
grid={props.grid} />
{this.props.collapsible &&
this.setState({ isOpen: !this.state.isOpen })} />}
+ onClick={() => {
+ !this.state.isOpen ? this.performPreview()() : this.unmount();
+ this.setState({ isOpen: !this.state.isOpen });
+ }} />}
{
grid={this.state.grid}
botPosition={this.props.botPosition}
onChange={this.onChange}
- onUseCurrentPosition={this.onUseCurrentPosition}
- preview={this.performPreview()} />
+ onUseCurrentPosition={this.onUseCurrentPosition} />
this.setState({
offsetPacking: !this.state.offsetPacking,
@@ -200,17 +219,6 @@ export class PlantGrid extends React.Component {
this.setState({ cameraView: !this.state.cameraView },
this.performPreview());
}} />}
-
;
diff --git a/frontend/plants/grid/thunks.ts b/frontend/plants/grid/thunks.ts
index bbb62749b0..ccd321d677 100644
--- a/frontend/plants/grid/thunks.ts
+++ b/frontend/plants/grid/thunks.ts
@@ -2,7 +2,8 @@ import { GetState } from "../../redux/interfaces";
import { ResourceIndex } from "../../resources/interfaces";
import { selectAllActivePoints } from "../../resources/selectors";
import { TaggedPoint } from "farmbot";
-import { destroy, saveAll } from "../../api/crud";
+import { saveAll } from "../../api/crud";
+import { Actions } from "../../constants";
const filterByGridId = (gridId: string) =>
(p: TaggedPoint) => p.body.meta["gridId"] === gridId;
@@ -24,7 +25,10 @@ export function saveGrid(gridId: string) {
export function stashGrid(gridId: string) {
return function (dispatch: Function, getState: GetState) {
const plants = findPlantByGridId(getState().resources.index, gridId);
- const all = plants.map((x): Promise<{}> => dispatch(destroy(x.uuid, true)));
- return Promise.all(all);
+ dispatch({
+ type: Actions.BATCH_DESTROY_RESOURCE_OK,
+ payload: plants,
+ });
+ return Promise.all([]);
};
}
diff --git a/frontend/resources/__tests__/reducer_test.ts b/frontend/resources/__tests__/reducer_test.ts
index cf29edb802..5eba8346d9 100644
--- a/frontend/resources/__tests__/reducer_test.ts
+++ b/frontend/resources/__tests__/reducer_test.ts
@@ -196,6 +196,17 @@ describe("resource reducer", () => {
.map((kind: ResourceName) => testResourceDestroy(kind));
});
+ it("destroys resources", () => {
+ const state = fakeState().resources;
+ const plant = fakePlant();
+ const action = {
+ type: Actions.BATCH_DESTROY_RESOURCE_OK,
+ payload: [plant],
+ };
+ const newState = resourceReducer(state, action);
+ expect(newState.index.references[plant.uuid]).toEqual(undefined);
+ });
+
it("toggles folder open state", () => {
const folder = fakeFolder();
folder.body.id = 1;
diff --git a/frontend/resources/reducer.ts b/frontend/resources/reducer.ts
index cd7fd615fe..724600e5e2 100644
--- a/frontend/resources/reducer.ts
+++ b/frontend/resources/reducer.ts
@@ -159,6 +159,13 @@ export const resourceReducer =
folderIndexer(payload, s.index);
return s;
})
+ .add{t("Add Grid or Row")}
-
- {
- const enabled = this.state.autoPreview;
- if (!enabled) { this.performPreview(true); }
- this.setState({ autoPreview: !enabled });
- }}
- title={t("automatically update preview")} />
-