From ed58e43d27561457513c6a7eeae5c4b0adc7d586 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Wed, 5 Jun 2019 19:06:42 -0500 Subject: [PATCH] Test release of new v8 detection heuristic (still has old heuristic, also CC: @connorRigby) --- db/structure.sql | 16 ++++++++-------- .../__test_support__/fake_state/resources.ts | 1 + .../sequences/sequence_editor_middle_active.tsx | 4 ++-- frontend/session_keys.ts | 2 +- package.json | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index ce1dcff84..3ca426edb 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2758,6 +2758,14 @@ ALTER TABLE ONLY public.points ADD CONSTRAINT fk_rails_a62cbb8aca FOREIGN KEY (tool_id) REFERENCES public.tools(id); +-- +-- Name: farmware_envs fk_rails_ab55c3a1d1; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.farmware_envs + ADD CONSTRAINT fk_rails_ab55c3a1d1 FOREIGN KEY (device_id) REFERENCES public.devices(id); + + -- -- Name: primary_nodes fk_rails_bca7fee3b9; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2766,14 +2774,6 @@ ALTER TABLE ONLY public.primary_nodes ADD CONSTRAINT fk_rails_bca7fee3b9 FOREIGN KEY (sequence_id) REFERENCES public.sequences(id); --- --- Name: farmware_envs fk_rails_bdadc396eb; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.farmware_envs - ADD CONSTRAINT fk_rails_bdadc396eb FOREIGN KEY (device_id) REFERENCES public.devices(id); - - -- -- Name: alerts fk_rails_c0132c78be; Type: FK CONSTRAINT; Schema: public; Owner: - -- diff --git a/frontend/__test_support__/fake_state/resources.ts b/frontend/__test_support__/fake_state/resources.ts index 1fadc3332..164ed6d90 100644 --- a/frontend/__test_support__/fake_state/resources.ts +++ b/frontend/__test_support__/fake_state/resources.ts @@ -301,6 +301,7 @@ export function fakeWebAppConfig(): TaggedWebAppConfig { debug_log: 3, stub_config: false, show_first_party_farmware: false, + expand_step_options: false, enable_browser_speak: false, photo_filter_begin: "2018-01-11T20:20:38.362Z", photo_filter_end: "2018-01-22T15:32:41.970Z", diff --git a/frontend/sequences/sequence_editor_middle_active.tsx b/frontend/sequences/sequence_editor_middle_active.tsx index e507f8f49..a5df57489 100644 --- a/frontend/sequences/sequence_editor_middle_active.tsx +++ b/frontend/sequences/sequence_editor_middle_active.tsx @@ -90,7 +90,7 @@ export const SequenceSettingsMenu = label={t("Show pins")} description={Content.SHOW_PINS} /> ; @@ -222,7 +222,7 @@ export class SequenceEditorMiddleActive extends shouldDisplay: this.props.shouldDisplay, confirmStepDeletion: !!getConfig(BooleanSetting.confirm_step_deletion), showPins: !!getConfig(BooleanSetting.show_pins), - expandStepOptions: !!getConfig("expand_step_options" as BooleanConfigKey), + expandStepOptions: !!getConfig("expand_step_options"), }; } diff --git a/frontend/session_keys.ts b/frontend/session_keys.ts index f4cc3b983..8bfcec7ae 100644 --- a/frontend/session_keys.ts +++ b/frontend/session_keys.ts @@ -23,7 +23,7 @@ export const BooleanSetting: Record = { time_format_24_hour: "time_format_24_hour", show_pins: "show_pins", disable_emergency_unlock_confirmation: "disable_emergency_unlock_confirmation", - // expand_step_options: "expand_step_options", + expand_step_options: "expand_step_options", /** "Labs" feature names. (App preferences) */ stub_config: "stub_config", diff --git a/package.json b/package.json index 6fd7379d0..1a65c68a7 100644 --- a/package.json +++ b/package.json @@ -41,10 +41,10 @@ "boxed_value": "1.0.0", "browser-speech": "1.1.1", "coveralls": "3.0.3", - "enzyme-adapter-react-16": "1.14.0", "enzyme": "3.10.0", + "enzyme-adapter-react-16": "1.14.0", + "farmbot": "git+https://github.com/RickCarlino/farmbot-js.git", "farmbot-toastr": "1.0.3", - "farmbot": "file:../farmbot-js", "i18next": "17.0.1", "jest": "24.8.0", "jest-cli": "24.8.0",