From 35b1dff31d69436795c848db05da63c80d20f734 Mon Sep 17 00:00:00 2001 From: Robbie Carlton Date: Thu, 18 Feb 2021 13:18:49 -0700 Subject: [PATCH 1/4] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d1173c..aad94440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## unreleased -## [0.1.2] +## [0.1.2] - 2021-02-18 ### Added - Mock Hpos Api server, for use as both as a standalone server (via npm package scripts) and as a customizable test mock. This is specifically useful for testing auth. - Implementation of login and auth logic From 171b51e54da17e0d6c3b646b58cd2eeca728ed07 Mon Sep 17 00:00:00 2001 From: Robbie Carlton Date: Thu, 18 Feb 2021 14:25:28 -0700 Subject: [PATCH 2/4] small changes --- CHANGELOG.md | 6 ++++++ src/pages/Login.vue | 7 ++++++- src/pages/Settings.vue | 6 ++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aad94440..3dee28b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## unreleased +## [0.1.3] - 2021-02-18 +### Changed +- Edit device name disabled and pencil icon grayed out +### Fixed +- Correct version number shown on login page + ## [0.1.2] - 2021-02-18 ### Added - Mock Hpos Api server, for use as both as a standalone server (via npm package scripts) and as a customizable test mock. This is specifically useful for testing auth. diff --git a/src/pages/Login.vue b/src/pages/Login.vue index 54c0bc2c..06ce9ccf 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -36,7 +36,7 @@
Learn more about controlling your own data.
-
UI v0.1.1
+
Host Console version {{ uiVersion }}
@@ -100,6 +100,11 @@ export default { return false } }, + computed: { + uiVersion () { + return process.env.VUE_APP_UI_VERSION + } + }, watch: { email (email) { this.banner = '' diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index 3c86b6f9..8add0a6c 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -96,8 +96,9 @@ export default { }, methods: { editDeviceName () { - this.editedDeviceName = this.settings.deviceName - this.isEditingDeviceName = true + // temporarily disabled until hpos bug is fixed + // this.editedDeviceName = this.settings.deviceName + // this.isEditingDeviceName = true }, saveDeviceName () { HposInterface.updateSettings({ @@ -179,6 +180,7 @@ export default { .pencil { margin-left: 5px; cursor: pointer; + opacity: 0.2; } .filled-check { margin-left: 5px; From 0dc62371b23cfa6d2a4dd105217cde83bc4a7892 Mon Sep 17 00:00:00 2001 From: Robbie Carlton Date: Thu, 18 Feb 2021 14:25:35 -0700 Subject: [PATCH 3/4] 0.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4d4f74a..fbf4d4cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "host-console", - "version": "0.1.2", + "version": "0.1.3", "private": true, "scripts": { "serve": "VUE_APP_UI_VERSION=$npm_package_version vue-cli-service serve", From 7574a20e8f35bec9eb7542f44cc449fdb386e0f9 Mon Sep 17 00:00:00 2001 From: Robbie Carlton Date: Thu, 18 Feb 2021 14:57:59 -0700 Subject: [PATCH 4/4] skip test --- src/pages/__tests__/Settings.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/__tests__/Settings.test.js b/src/pages/__tests__/Settings.test.js index 616917eb..c376fe8e 100644 --- a/src/pages/__tests__/Settings.test.js +++ b/src/pages/__tests__/Settings.test.js @@ -55,7 +55,8 @@ describe('Settings page', () => { await waitFor(() => getAllByText(defaultSettings.holoportos.network)) }) - it('handles devicename interactions correctly', async () => { + // this is skipped until the hpos config update is fixed. See also Settings.vue + it.skip('handles devicename interactions correctly', async () => { axios.put.mockImplementationOnce(() => Promise.resolve(defaultSettingsResult)) const newDeviceName = "Sean's HP"