From 800625e8a1e1e0c1e0518a9e086fd668c01872ce Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Fri, 28 Feb 2020 08:34:28 -0800 Subject: [PATCH] improve element annotation --- .../components/dangerous_delete_widget.tsx | 3 +- .../components/export_account_panel.tsx | 3 +- frontend/account/index.tsx | 11 +- .../account/labs/labs_features_list_ui.tsx | 3 +- frontend/account/request_account_export.ts | 5 +- frontend/controls/axis_display_group.tsx | 14 +-- frontend/controls/key_val_edit_row.tsx | 2 + frontend/controls/move/bot_position_rows.tsx | 2 +- frontend/controls/move/jog_controls_group.tsx | 2 +- .../controls/move/motor_position_plot.tsx | 24 ++--- frontend/controls/move/settings_menu.tsx | 2 +- frontend/controls/move/step_size_selector.tsx | 7 +- frontend/controls/peripherals/index.tsx | 10 +- frontend/controls/pin_form_fields.tsx | 1 + .../__tests__/filter_readings_test.ts | 14 +-- .../__tests__/location_selection_test.tsx | 8 +- .../__tests__/sensor_readings_test.tsx | 8 +- .../sensor_readings/filter_readings.ts | 6 +- .../controls/sensor_readings/interfaces.ts | 6 +- .../sensor_readings/location_selection.tsx | 14 +-- .../sensor_readings/sensor_readings.tsx | 16 +-- .../sensor_readings/time_period_selection.tsx | 1 + frontend/controls/sensors/index.tsx | 10 +- .../controls/webcam/__tests__/show_test.tsx | 2 +- frontend/controls/webcam/edit.tsx | 3 + frontend/controls/webcam/show.tsx | 5 +- .../farm_designer/farm_designer_panels.scss | 4 +- frontend/demo/demo_iframe.tsx | 7 +- frontend/devices/actions.ts | 4 +- .../__tests__/pin_guard_input_group_test.tsx | 2 +- .../__tests__/pin_number_dropdown_test.tsx | 2 +- .../components/farmbot_os_settings.tsx | 8 +- .../components/fbos_settings/board_type.tsx | 14 ++- .../fbos_settings/camera_selection.tsx | 14 ++- .../fbos_settings/change_ownership_form.tsx | 1 + .../fbos_settings/factory_reset_row.tsx | 7 +- .../fbos_settings/fbos_button_row.tsx | 1 + .../components/fbos_settings/fbos_details.tsx | 2 +- .../firmware_hardware_status.tsx | 1 + .../components/fbos_settings/interfaces.ts | 2 +- .../fbos_settings/power_and_reset.tsx | 4 +- .../devices/components/hardware_settings.tsx | 2 + .../hardware_settings/calibration_row.tsx | 1 + .../hardware_settings/danger_zone.tsx | 1 + .../components/hardware_settings/motors.tsx | 2 +- .../hardware_settings/pin_guard.tsx | 10 +- frontend/devices/components/interfaces.ts | 2 +- .../devices/components/lockable_button.tsx | 4 +- .../components/pin_guard_input_group.tsx | 4 +- .../devices/connectivity/connectivity.tsx | 4 +- frontend/devices/connectivity/diagnosis.tsx | 2 +- frontend/devices/connectivity/diagram.tsx | 5 +- frontend/devices/must_be_online.tsx | 2 +- .../pin_binding_input_group_test.tsx | 8 +- .../pin_bindings/pin_binding_input_group.tsx | 3 +- .../devices/pin_bindings/pin_bindings.tsx | 4 +- .../pin_bindings/tagged_pin_binding_init.tsx | 1 + frontend/error_boundary.tsx | 2 +- .../farm_events/edit_fe_form.tsx | 28 ++--- .../farm_events/farm_event_repeat_form.tsx | 102 +++++++++--------- .../farm_designer/farm_events/farm_events.tsx | 1 + frontend/farm_designer/index.tsx | 14 +-- .../farm_designer/map/easter_eggs/bugs.tsx | 3 +- .../farmbot/__tests__/bot_figure_test.tsx | 6 +- .../layers/farmbot/__tests__/index_test.tsx | 9 +- .../map/layers/farmbot/bot_figure.tsx | 8 +- .../map/layers/farmbot/index.tsx | 4 +- .../map/layers/images/map_image.tsx | 10 +- frontend/farm_designer/map_size_setting.tsx | 1 + frontend/farm_designer/move_to.tsx | 10 +- .../plants/__tests__/plant_panel_test.tsx | 2 +- frontend/farm_designer/plants/add_plant.tsx | 2 +- .../farm_designer/plants/crop_catalog.tsx | 1 + frontend/farm_designer/plants/crop_info.tsx | 15 +-- .../plants/grid/__tests__/plant_grid_test.tsx | 7 +- .../farm_designer/plants/grid/plant_grid.tsx | 18 ++-- .../plants/openfarm_search_results.tsx | 54 +++++----- .../farm_designer/plants/plant_inventory.tsx | 2 +- frontend/farm_designer/plants/plant_panel.tsx | 17 +-- .../farm_designer/plants/select_plants.tsx | 4 + .../__tests__/point_group_sort_test.ts | 4 +- .../point_groups/criteria/add.tsx | 15 ++- .../point_groups/criteria/component.tsx | 18 ++-- .../point_groups/criteria/show.tsx | 59 ++++++---- .../point_groups/group_list_panel.tsx | 1 + .../__tests__/point_edit_actions_test.tsx | 2 +- .../farm_designer/points/create_points.tsx | 4 +- .../points/point_edit_actions.tsx | 15 ++- .../farm_designer/points/point_inventory.tsx | 2 +- .../farm_designer/points/weeds_inventory.tsx | 2 +- .../__tests__/garden_edit_test.tsx | 1 + .../__tests__/garden_snapshot_test.tsx | 6 +- .../farm_designer/saved_gardens/actions.ts | 13 +-- .../saved_gardens/garden_edit.tsx | 8 +- .../saved_gardens/garden_snapshot.tsx | 22 ++-- .../saved_gardens/saved_gardens.tsx | 6 +- frontend/farm_designer/tools/add_tool.tsx | 3 + frontend/farm_designer/tools/index.tsx | 2 +- .../tools/tool_slot_edit_components.tsx | 4 +- .../farm_designer/zones/zones_inventory.tsx | 2 +- frontend/farmware/farmware_config_menu.tsx | 3 + frontend/farmware/farmware_forms.tsx | 3 +- frontend/farmware/farmware_info.tsx | 59 +++++----- frontend/farmware/farmware_list.tsx | 3 +- frontend/farmware/images/image_flipper.tsx | 4 +- frontend/farmware/images/photos.tsx | 3 +- frontend/farmware/index.tsx | 4 +- frontend/farmware/state_to_props.ts | 6 +- frontend/farmware/weed_detector/config.tsx | 3 +- .../farmware/weed_detector/farmbot_picker.tsx | 2 +- frontend/farmware/weed_detector/index.tsx | 1 + frontend/folders/actions.ts | 4 +- frontend/folders/component.tsx | 11 +- frontend/front_page/create_account.tsx | 16 +-- frontend/front_page/forgot_password.tsx | 2 + frontend/front_page/front_page.tsx | 14 ++- frontend/front_page/login.tsx | 7 +- frontend/front_page/resend_panel_body.tsx | 1 + frontend/front_page/resend_verification.tsx | 1 + frontend/front_page/terms_checkbox.tsx | 2 +- frontend/help/__tests__/tour_test.tsx | 2 +- frontend/help/docs.tsx | 8 +- frontend/help/tour.tsx | 4 +- frontend/help/tour_list.tsx | 1 + frontend/logs/components/filter_menu.tsx | 9 +- frontend/logs/components/settings_menu.tsx | 6 +- frontend/logs/index.tsx | 25 ++--- frontend/nav/additional_menu.tsx | 8 +- frontend/nav/index.tsx | 12 +-- frontend/nav/mobile_menu.tsx | 2 +- frontend/nav/sync_button.tsx | 1 + frontend/password_reset/password_reset.tsx | 1 + .../__tests__/read_only_icon_test.tsx | 6 +- frontend/read_only_mode/index.tsx | 2 +- .../set_active_regimen_by_name_test.ts | 4 +- .../__tests__/add_button_test.tsx | 2 +- .../regimens/bulk_scheduler/add_button.tsx | 4 +- frontend/regimens/bulk_scheduler/index.tsx | 4 +- .../regimens/bulk_scheduler/week_grid.tsx | 10 +- frontend/regimens/bulk_scheduler/week_row.tsx | 1 + frontend/regimens/editor/active_editor.tsx | 2 + frontend/regimens/editor/copy_button.tsx | 1 + .../regimens/editor/regimen_name_input.tsx | 1 + frontend/regimens/list/add_button.tsx | 1 + frontend/regimens/list/index.tsx | 4 +- frontend/regimens/list/regimen_list_item.tsx | 5 +- .../regimens/set_active_regimen_by_name.ts | 4 +- frontend/resources/selectors.ts | 3 +- frontend/resources/selectors_by_id.ts | 6 +- .../set_active_sequence_by_name_test.ts | 4 +- frontend/sequences/inputs/input_unknown.tsx | 2 +- .../locals_list/default_value_form.tsx | 2 +- .../location_form_coordinate_input_boxes.tsx | 2 +- .../locals_list/location_form_list.ts | 6 +- .../sequence_editor_middle_active.tsx | 3 + .../sequences/set_active_sequence_by_name.ts | 4 +- frontend/sequences/step_button_cluster.tsx | 18 ++-- frontend/sequences/step_buttons.tsx | 1 + .../step_tiles/mark_as/unpack_step.ts | 4 +- .../step_tiles/tile_assertion/lua_part.tsx | 2 +- .../step_tiles/tile_execute_script.tsx | 14 +-- .../tile_execute_script_support.tsx | 58 +++++----- .../tile_move_absolute_conflict_check.tsx | 2 +- .../step_tiles/tile_send_message.tsx | 17 ++- frontend/sequences/step_ui/step_radio.tsx | 2 +- frontend/sequences/step_ui/step_warning.tsx | 2 +- frontend/sequences/test_button.tsx | 6 +- frontend/session.ts | 16 +-- frontend/tos_update/component.tsx | 11 +- frontend/ui/back_arrow.tsx | 3 +- frontend/ui/color_picker.tsx | 2 + frontend/ui/empty_state_wrapper.tsx | 2 +- frontend/ui/help.tsx | 2 +- frontend/ui/input_error.tsx | 2 +- frontend/ui/save_button.tsx | 3 +- 175 files changed, 741 insertions(+), 556 deletions(-) diff --git a/frontend/account/components/dangerous_delete_widget.tsx b/frontend/account/components/dangerous_delete_widget.tsx index 635c050e9..09e304fe1 100644 --- a/frontend/account/components/dangerous_delete_widget.tsx +++ b/frontend/account/components/dangerous_delete_widget.tsx @@ -20,7 +20,7 @@ export class DangerousDeleteWidget extends return -
+
{t(this.props.warning)}

{t(this.props.confirmation)} @@ -42,6 +42,7 @@ export class DangerousDeleteWidget extends diff --git a/frontend/account/components/export_account_panel.tsx b/frontend/account/components/export_account_panel.tsx index d431f0b8c..111e278f2 100644 --- a/frontend/account/components/export_account_panel.tsx +++ b/frontend/account/components/export_account_panel.tsx @@ -7,7 +7,7 @@ export function ExportAccountPanel(props: { onClick: () => void }) { return -
+
{t(Content.EXPORT_DATA_DESC)}
@@ -19,6 +19,7 @@ export function ExportAccountPanel(props: { onClick: () => void }) { diff --git a/frontend/account/index.tsx b/frontend/account/index.tsx index 658704fae..dac34ae48 100644 --- a/frontend/account/index.tsx +++ b/frontend/account/index.tsx @@ -47,12 +47,13 @@ export class RawAccount extends React.Component { (key: keyof User) => (key === "email") && this.setState({ warnThem: true }); onChange = (e: React.FormEvent) => { - const { name, value } = e.currentTarget; - if (isKey(name)) { - this.tempHack(name); - this.props.dispatch(edit(this.props.user, { [name]: value })); + const { value } = e.currentTarget; + const field = e.currentTarget.name; + if (isKey(field)) { + this.tempHack(field); + this.props.dispatch(edit(this.props.user, { [field]: value })); } else { - throw new Error("Bad key: " + name); + throw new Error("Bad key: " + field); } }; diff --git a/frontend/account/labs/labs_features_list_ui.tsx b/frontend/account/labs/labs_features_list_ui.tsx index f9dfafb84..1640ddda2 100644 --- a/frontend/account/labs/labs_features_list_ui.tsx +++ b/frontend/account/labs/labs_features_list_ui.tsx @@ -11,7 +11,7 @@ interface LabsFeaturesListProps { } export function LabsFeaturesList(props: LabsFeaturesListProps) { - return
+ return
{fetchLabFeatures(props.getConfigValue).map((feature, i) => { const displayValue = feature.displayInvert ? !feature.value : feature.value; return @@ -23,6 +23,7 @@ export function LabsFeaturesList(props: LabsFeaturesListProps) { props.onToggle(feature) .then(() => feature.callback && feature.callback())} diff --git a/frontend/account/request_account_export.ts b/frontend/account/request_account_export.ts index 95bc0d568..703e41fc8 100644 --- a/frontend/account/request_account_export.ts +++ b/frontend/account/request_account_export.ts @@ -9,9 +9,8 @@ interface DataDumpExport { device?: DeviceAccountSettings; } type Response = AxiosResponse; export function generateFilename({ device }: DataDumpExport): string { - let name: string; - name = device ? (device.name + "_" + device.id) : "farmbot"; - return `export_${name}.json`.toLowerCase(); + const nameAndId = device ? (device.name + "_" + device.id) : "farmbot"; + return `export_${nameAndId}.json`.toLowerCase(); } // Thanks, @KOL - https://stackoverflow.com/a/19328891/1064917 diff --git a/frontend/controls/axis_display_group.tsx b/frontend/controls/axis_display_group.tsx index 601e8b812..13583749c 100644 --- a/frontend/controls/axis_display_group.tsx +++ b/frontend/controls/axis_display_group.tsx @@ -3,17 +3,19 @@ import { Row, Col } from "../ui/index"; import { AxisDisplayGroupProps } from "./interfaces"; import { isNumber } from "lodash"; import { t } from "../i18next_wrapper"; +import { Xyz } from "farmbot"; -const Axis = ({ val }: { val: number | undefined }) => - -; +const Axis = ({ axis, val }: { val: number | undefined, axis: Xyz }) => + + + ; export const AxisDisplayGroup = ({ position, label }: AxisDisplayGroupProps) => { const { x, y, z } = position; return - - - + + +