farmbot import cleanup

pull/944/head
gabrielburnworth 2018-08-01 17:20:50 -07:00
parent 4d1640f4b3
commit 9b08fc9fc3
20 changed files with 38 additions and 49 deletions

View File

@ -1,13 +1,9 @@
import {
TaggedResource, SpecialStatus
TaggedResource, SpecialStatus, ResourceName, TaggedSequence
} from "farmbot";
import {
isTaggedResource,
} from "../resources/tagged_resources";
import {
ResourceName,
TaggedSequence,
} from "farmbot";
import { GetState, ReduxAction } from "../redux/interfaces";
import { API } from "./index";
import axios from "axios";

View File

@ -1,7 +1,7 @@
import { fetchNewDevice, getDevice } from "../device";
import { dispatchNetworkUp, dispatchNetworkDown } from "./index";
import { Log } from "../interfaces";
import { Farmbot, BotStateTree } from "farmbot";
import { Farmbot, BotStateTree, TaggedResource, SpecialStatus } from "farmbot";
import { noop, throttle } from "lodash";
import { success, error, info, warning } from "farmbot-toastr";
import { HardwareState } from "../devices/interfaces";
@ -17,7 +17,6 @@ import {
} from "../devices/actions";
import { init } from "../api/crud";
import { AuthState } from "../auth/interfaces";
import { TaggedResource, SpecialStatus } from "farmbot";
import { autoSync } from "./auto_sync";
import { startPinging } from "./ping_mqtt";
import { talk } from "browser-speech";

View File

@ -1,6 +1,5 @@
import { BotPosition, BotState } from "../../devices/interfaces";
import { McuParams, Xyz } from "farmbot";
import { TaggedUser } from "farmbot";
import { McuParams, Xyz, TaggedUser } from "farmbot";
import { NetworkState } from "../../connectivity/interfaces";
import { GetWebAppConfigValue } from "../../config_storage/actions";
import {

View File

@ -47,8 +47,7 @@ import { Actions } from "../../constants";
import { buildResourceIndex } from "../../__test_support__/resource_index_builder";
import { API } from "../../api/index";
import axios from "axios";
import { SpecialStatus } from "farmbot";
import { McuParamName } from "farmbot";
import { SpecialStatus, McuParamName } from "farmbot";
import { bot } from "../../__test_support__/fake_state/bot";
import { success, error, warning, info } from "farmbot-toastr";

View File

@ -8,13 +8,17 @@ import {
GithubRelease, MoveRelProps, MinOsFeatureLookup, SourceFwConfig, Axis
} from "./interfaces";
import { Thunk, ReduxAction } from "../redux/interfaces";
import { McuParams, Configuration, rpcRequest } from "farmbot";
import {
McuParams, Configuration, rpcRequest, TaggedDevice,
TaggedFirmwareConfig
} from "farmbot";
import { Sequence } from "../sequences/interfaces";
import { ControlPanelState } from "../devices/interfaces";
import { API } from "../api/index";
import { User } from "../auth/interfaces";
import { getDeviceAccountSettings, getFirmwareConfig } from "../resources/selectors";
import { TaggedDevice, TaggedFirmwareConfig } from "farmbot";
import {
getDeviceAccountSettings, getFirmwareConfig
} from "../resources/selectors";
import { oneOf, versionOK, trim } from "../util";
import { Actions, Content } from "../constants";
import { mcuParamValidator } from "./update_interceptor";

View File

@ -3,13 +3,12 @@ import { Widget, WidgetHeader, WidgetBody, Row, Col } from "../../ui/index";
import { t } from "i18next";
import { ConnectivityRow, StatusRowProps } from "./connectivity_row";
import { RetryBtn } from "./retry_btn";
import { SpecialStatus } from "farmbot";
import { SpecialStatus, InformationalSettings } from "farmbot";
import { ConnectivityDiagram } from "./diagram";
import { ToolTips } from "../../constants";
import {
ChipTemperatureDisplay, WiFiStrengthDisplay
} from "../components/fbos_settings/fbos_details";
import { InformationalSettings } from "farmbot";
interface Props {
onRefresh(): void;

View File

@ -1,7 +1,7 @@
import { BotStateTree, ConfigurationName } from "farmbot";
import { McuParamName, SyncStatus, LocationName } from "farmbot";
import { AuthState } from "../auth/interfaces";
import {
BotStateTree, ConfigurationName,
McuParamName, SyncStatus, LocationName,
TaggedImage,
TaggedPeripheral,
TaggedDevice,

View File

@ -1,7 +1,6 @@
import { TaggedImage } from "farmbot";
import { TaggedImage, SyncStatus } from "farmbot";
import { WD_ENV } from "../weed_detector/remote_env/interfaces";
import { NetworkState } from "../../connectivity/interfaces";
import { SyncStatus } from "farmbot";
export interface CameraCalibrationProps {
dispatch: Function;

View File

@ -28,9 +28,8 @@ import * as React from "react";
import { mount } from "enzyme";
import { Logs } from "../index";
import { ToolTips } from "../../constants";
import { TaggedLog } from "farmbot";
import { TaggedLog, Dictionary } from "farmbot";
import { bot } from "../../__test_support__/fake_state/bot";
import { Dictionary } from "farmbot";
import { NumericSetting } from "../../session_keys";
import { fakeLog } from "../../__test_support__/fake_state/resources";
import { LogsProps } from "../interfaces";

View File

@ -7,9 +7,8 @@ import { t } from "i18next";
import { formatLogTime } from "../logs/index";
import { Session, safeNumericSetting } from "../session";
import { ErrorBoundary } from "../error_boundary";
import { ALLOWED_MESSAGE_TYPES } from "farmbot";
import { ALLOWED_MESSAGE_TYPES, TaggedLog, SpecialStatus } from "farmbot";
import { filterByVerbosity } from "../logs/components/logs_table";
import { TaggedLog, SpecialStatus } from "farmbot";
import { isNumber } from "lodash";
/** Get current verbosity filter level for a message type from WebAppConfig. */

View File

@ -1,7 +1,6 @@
import { SequenceBodyItem } from "farmbot";
import { SequenceBodyItem, TaggedSequence } from "farmbot";
import { SelectSequence } from "./interfaces";
import { edit, init, overwrite } from "../api/crud";
import { TaggedSequence } from "farmbot";
import { defensiveClone } from "../util";
import { push } from "../history";
import { urlFriendly } from "../util";

View File

@ -1,12 +1,11 @@
import * as React from "react";
import { t } from "i18next";
import { SequenceBodyItem as Step } from "farmbot";
import { SequenceBodyItem as Step, TaggedSequence } from "farmbot";
import { error } from "farmbot-toastr";
import { StepDragger, NULL_DRAGGER_ID } from "../../draggable/step_dragger";
import { pushStep } from "../actions";
import { StepButtonParams } from "../interfaces";
import { Col } from "../../ui/index";
import { TaggedSequence } from "farmbot";
export const stepClick =
(dispatch: Function, step: Step, seq: TaggedSequence | undefined) =>

View File

@ -27,8 +27,9 @@ import {
fakeSequence
} from "../../../__test_support__/fake_state/resources";
import { DropDownItem } from "../../../ui";
import { NamedPin, AllowedPinTypes } from "farmbot";
import { TaggedSensor, TaggedSequence } from "farmbot";
import {
NamedPin, AllowedPinTypes, TaggedSensor, TaggedSequence
} from "farmbot";
import { StepParams } from "../../interfaces";
describe("Pin and Peripheral support files", () => {

View File

@ -1,5 +1,8 @@
import * as React from "react";
import { SequenceBodyItem as Step } from "farmbot";
import {
CeleryNode, LegalArgString, If, Execute, Nothing,
SequenceBodyItem as Step, TaggedSequence
} from "farmbot";
import { FLOAT_NUMERIC_FIELDS, NUMERIC_FIELDS } from "../interfaces";
import { ExecuteBlock } from "./tile_execute";
import { StepParams, StepInputProps, StepTitleBarProps } from "../interfaces";
@ -14,8 +17,6 @@ import { TileWritePin } from "./tile_write_pin";
import { TileExecuteScript } from "./tile_execute_script";
import { TileTakePhoto } from "./tile_take_photo";
import * as _ from "lodash";
import { CeleryNode, LegalArgString, If, Execute, Nothing } from "farmbot";
import { TaggedSequence } from "farmbot";
import { overwrite } from "../../api/crud";
import { TileFindHome } from "./tile_find_home";
import { t } from "i18next";

View File

@ -1,8 +1,7 @@
import * as React from "react";
import { t } from "i18next";
import { FindHome, ALLOWED_AXIS, Xyz } from "farmbot";
import { FindHome, ALLOWED_AXIS, Xyz, TaggedSequence } from "farmbot";
import { StepParams, HardwareFlags } from "../interfaces";
import { TaggedSequence } from "farmbot";
import { ResourceIndex } from "../../resources/interfaces";
import { overwrite } from "../../api/crud";
import { defensiveClone } from "../../util";

View File

@ -15,10 +15,11 @@ import {
import {
buildResourceIndex, FAKE_RESOURCES
} from "../../../../__test_support__/resource_index_builder";
import { Execute, If } from "farmbot";
import { TaggedSequence } from "farmbot";
import { Execute, If, TaggedSequence } from "farmbot";
import { overwrite } from "../../../../api/crud";
import { fakeSensor, fakePeripheral } from "../../../../__test_support__/fake_state/resources";
import {
fakeSensor, fakePeripheral
} from "../../../../__test_support__/fake_state/resources";
const fakeResourceIndex = buildResourceIndex(FAKE_RESOURCES).index;
const fakeTaggedSequence = fakeResourceIndex

View File

@ -4,14 +4,14 @@ import {
import {
SpecialStatus,
TaggedSequence,
TaggedPeripheral
TaggedPeripheral,
If
} from "farmbot";
import {
selectAllSequences,
selectAllPeripherals
} from "../../../../resources/selectors";
import { updateLhs } from "../update_lhs";
import { If } from "farmbot";
import { PinGroupName } from "../../pin_and_peripheral_support";
import { Actions } from "../../../../constants";
import { get } from "lodash";

View File

@ -10,16 +10,14 @@ import {
LegalSequenceKind,
Point,
Identifier,
MoveAbsolute
MoveAbsolute,
TaggedTool,
TaggedToolSlotPointer
} from "farmbot";
import { Row, Col } from "../../ui/index";
import {
isTaggedSequence,
} from "../../resources/tagged_resources";
import {
TaggedTool,
TaggedToolSlotPointer
} from "farmbot";
import {
findToolById,
findSlotByToolId,

View File

@ -2,10 +2,9 @@ import * as React from "react";
import { FBSelect, DropDownItem, Row, Col } from "../../ui/index";
import { t } from "i18next";
import { StepInputBox } from "../inputs/step_input_box";
import { SendMessage } from "farmbot";
import { SendMessage, TaggedSequence } from "farmbot";
import * as _ from "lodash";
import { StepParams, ChannelName } from "../interfaces";
import { TaggedSequence } from "farmbot";
import { ResourceIndex } from "../../resources/interfaces";
import { editStep } from "../../api/crud";
import { ToolTips } from "../../constants";

View File

@ -1,8 +1,7 @@
import * as React from "react";
import { t } from "i18next";
import { Row, Col } from "../../ui/index";
import { TaggedSequence } from "farmbot";
import { SequenceBodyItem } from "farmbot";
import { TaggedSequence, SequenceBodyItem } from "farmbot";
import { StepTitleBar } from "../step_tiles/step_title_bar";
import { StepIconGroup } from "../step_icon_group";
import { splice, remove } from "../step_tiles/index";