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 - - - + + +