From 309737dd33f70dab9894151e46abf7a0251ad56f Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Tue, 17 Mar 2020 08:34:32 -0700 Subject: [PATCH] remove plants from default criteria --- frontend/farm_designer/point_groups/criteria/apply.ts | 5 +++-- frontend/farm_designer/point_groups/criteria/interfaces.ts | 2 +- frontend/farm_designer/point_groups/criteria/show.tsx | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/farm_designer/point_groups/criteria/apply.ts b/frontend/farm_designer/point_groups/criteria/apply.ts index 530871890..c284ad2ff 100644 --- a/frontend/farm_designer/point_groups/criteria/apply.ts +++ b/frontend/farm_designer/point_groups/criteria/apply.ts @@ -1,7 +1,7 @@ -import { every, get, uniq, gt, lt, isNumber } from "lodash"; +import { every, get, uniq, gt, lt, isNumber, isEqual } from "lodash"; import { TaggedPoint, TaggedPointGroup } from "farmbot"; import moment from "moment"; -import { PointGroupCriteria } from "./interfaces"; +import { PointGroupCriteria, DEFAULT_CRITERIA } from "./interfaces"; /** Check if a string or number criteria field is empty. */ const eqCriteriaEmpty = @@ -45,6 +45,7 @@ export const selectPointsByCriteria = ( allPoints: TaggedPoint[], now = moment(), ): TaggedPoint[] => { + if (isEqual(criteria, DEFAULT_CRITERIA)) { return []; } const check = checkCriteria(criteria, now); return allPoints.filter(point => every(Object.keys(criteria).map((key: keyof PointGroupCriteria) => diff --git a/frontend/farm_designer/point_groups/criteria/interfaces.ts b/frontend/farm_designer/point_groups/criteria/interfaces.ts index 403454f67..587f0b575 100644 --- a/frontend/farm_designer/point_groups/criteria/interfaces.ts +++ b/frontend/farm_designer/point_groups/criteria/interfaces.ts @@ -15,7 +15,7 @@ export const DEFAULT_CRITERIA: Readonly = { number_eq: {}, number_gt: {}, number_lt: {}, - string_eq: { pointer_type: ["Plant"] }, + string_eq: {}, }; export interface GroupCriteriaProps { diff --git a/frontend/farm_designer/point_groups/criteria/show.tsx b/frontend/farm_designer/point_groups/criteria/show.tsx index ba4fd005f..bb403735f 100644 --- a/frontend/farm_designer/point_groups/criteria/show.tsx +++ b/frontend/farm_designer/point_groups/criteria/show.tsx @@ -83,8 +83,8 @@ export const NumberCriteriaSelection = (props: NumberCriteriaProps) => { }; const DAY_OPERATOR_DDI_LOOKUP = (): { [x: string]: DropDownItem } => ({ - ["<"]: { label: t("less than"), value: "<" }, - [">"]: { label: t("greater than"), value: ">" }, + ["<"]: { label: t("Less than"), value: "<" }, + [">"]: { label: t("Greater than"), value: ">" }, }); /** Edit and view day criteria. */