From b3f93dd6786d1f02f692111f6728011116847deb Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Thu, 23 Apr 2020 15:58:33 -0700 Subject: [PATCH 1/3] update fallback --- .../devices/components/fbos_settings/fbos_details.tsx | 3 ++- frontend/util/version.ts | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/devices/components/fbos_settings/fbos_details.tsx b/frontend/devices/components/fbos_settings/fbos_details.tsx index 9ddc7de29..3f39e61da 100644 --- a/frontend/devices/components/fbos_settings/fbos_details.tsx +++ b/frontend/devices/components/fbos_settings/fbos_details.tsx @@ -263,7 +263,7 @@ export function FbosDetails(props: FbosDetailsProps) { soc_temp, wifi_level, uptime, memory_usage, disk_usage, throttled, wifi_level_percent, cpu_usage, private_ip, } = props.botInfoSettings; - const { last_ota, last_ota_checkup } = props.deviceAccount.body; + const { last_ota, last_ota_checkup, fbos_version } = props.deviceAccount.body; const infoFwCommit = firmware_version?.includes(".") ? firmware_commit : "---"; const firmwareCommit = firmware_version?.split("-")[1] || infoFwCommit; @@ -273,6 +273,7 @@ export function FbosDetails(props: FbosDetailsProps) { botToMqttLastSeen={props.botToMqttLastSeen} timeSettings={props.timeSettings} device={props.deviceAccount} /> +

{t("Version last seen")}: {fbos_version}

{t("Environment")}: {env}

diff --git a/frontend/util/version.ts b/frontend/util/version.ts index b6178b7d3..7fefa328a 100644 --- a/frontend/util/version.ts +++ b/frontend/util/version.ts @@ -120,7 +120,7 @@ export function createShouldDisplayFn( const fallback = globalConfig.FBOS_END_OF_LIFE_VERSION || FbosVersionFallback.NULL; const target = override || current || fallback; - const table = lookupData || {}; + const table = lookupData || fallbackData; const min = table[feature] || MinVersionOverride.NEVER; switch (semverCompare(target, min)) { case SemverResult.LEFT_IS_GREATER: @@ -132,6 +132,13 @@ export function createShouldDisplayFn( }; } +// Temporary hotfix fallback data. Please remove. +const fallbackData: MinOsFeatureLookup = {}; +Object.values(Feature).map(feature => + fallbackData[feature] = globalConfig.FBOS_END_OF_LIFE_VERSION); +fallbackData.criteria_groups = "9.2.2"; +fallbackData.boot_sequence = MinVersionOverride.NEVER; + /** * Compare the current FBOS version in the bot's * state with the API's fbos_version string and return the greatest version. */ From d931cd1b84735c35db0bcd206547693ce1bf5194 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Thu, 23 Apr 2020 16:49:00 -0700 Subject: [PATCH 2/3] update coverage task --- lib/tasks/coverage.rake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tasks/coverage.rake b/lib/tasks/coverage.rake index bd71428b7..75f9a3bc1 100644 --- a/lib/tasks/coverage.rake +++ b/lib/tasks/coverage.rake @@ -44,7 +44,9 @@ end def get_base_branch(pull_data) current_branch = BASE_BRANCHES.empty? || BASE_BRANCHES.include?(CURRENT_BRANCH) ? CURRENT_BRANCH : "staging" - pull_data.dig("base", "ref") || current_branch + provided_base_branch = + CURRENT_BRANCH.start_with?("master-hotfix/") ? "master" : nil; + pull_data.dig("base", "ref") || provided_base_branch || current_branch end # Gather relevant coverage data. From 14bf5216e0a3e243b4ac3b2e359518107fd76355 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Fri, 24 Apr 2020 08:22:24 -0700 Subject: [PATCH 3/3] dep updates (fe) --- frontend/util/version.ts | 7 ------- package.json | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/frontend/util/version.ts b/frontend/util/version.ts index 87f1afa50..9079c6556 100644 --- a/frontend/util/version.ts +++ b/frontend/util/version.ts @@ -141,13 +141,6 @@ export function createShouldDisplayFn( }; } -// Temporary hotfix fallback data. Please remove. -const fallbackData: MinOsFeatureLookup = {}; -Object.values(Feature).map(feature => - fallbackData[feature] = globalConfig.FBOS_END_OF_LIFE_VERSION); -fallbackData.criteria_groups = "9.2.2"; -fallbackData.boot_sequence = MinVersionOverride.NEVER; - /** * Compare the current FBOS version in the bot's * state with the API's fbos_version string and return the greatest version. */ diff --git a/package.json b/package.json index b570b17fd..6c33826c9 100644 --- a/package.json +++ b/package.json @@ -25,15 +25,15 @@ "license": "MIT", "dependencies": { "@babel/core": "7.9.0", - "@blueprintjs/core": "3.25.0", - "@blueprintjs/datetime": "3.16.0", - "@blueprintjs/select": "3.12.1", + "@blueprintjs/core": "3.26.0", + "@blueprintjs/datetime": "3.16.1", + "@blueprintjs/select": "3.12.2", "@types/enzyme": "3.10.5", "@types/jest": "25.2.1", - "@types/lodash": "4.14.149", + "@types/lodash": "4.14.150", "@types/markdown-it": "10.0.0", "@types/moxios": "0.4.9", - "@types/node": "13.11.1", + "@types/node": "13.13.2", "@types/promise-timeout": "1.3.0", "@types/react": "16.9.34", "@types/react-color": "3.0.1", @@ -42,11 +42,11 @@ "axios": "0.19.2", "boxed_value": "1.0.0", "browser-speech": "1.1.1", - "coveralls": "3.0.11", + "coveralls": "3.0.14", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.2", "farmbot": "10.0.0-rc1", - "i18next": "19.4.1", + "i18next": "19.4.3", "install": "0.13.0", "lodash": "4.17.15", "markdown-it": "10.0.0", @@ -71,19 +71,19 @@ "redux-thunk": "2.3.0", "sass-lint": "1.13.1", "takeme": "0.11.3", - "ts-jest": "25.3.1", + "ts-jest": "25.4.0", "ts-lint": "4.5.1", "tslint": "6.1.1", "typescript": "3.8.3", "which": "2.0.2" }, "devDependencies": { - "jest": "25.3.0", - "jest-cli": "25.3.0", + "jest": "25.4.0", + "jest-cli": "25.4.0", "jest-junit": "10.0.0", "jest-skipped-reporter": "0.0.5", "jshint": "2.11.0", "madge": "3.8.0", - "sass": "1.26.3" + "sass": "1.26.5" } }