From 425234148e31a106a692722c7870aca781791f17 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 16 Nov 2021 11:48:10 -0500 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20resolve=20jsonpoint?= =?UTF-8?q?er=20for=20dependabot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3fcf2f28a..e2280e4c0 100755 --- a/package.json +++ b/package.json @@ -82,7 +82,8 @@ "tmpl": "^1.0.5", "set-value": "^4.0.1", "ansi-regex": "^5.0.1", - "ember-cli-babel": "^7.26.6" + "ember-cli-babel": "^7.26.6", + "jsonpointer": "5.0.0" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index 8bcb1a8fc..2957eec5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14690,10 +14690,10 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= -jsonpointer@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc" - integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg== +jsonpointer@5.0.0, jsonpointer@^4.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072" + integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== jsprim@^1.2.2: version "1.4.1" From 8985528343053c516ee74faaeb38f288accbc9a7 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Wed, 17 Nov 2021 15:17:07 -0800 Subject: [PATCH 2/7] Change CLI version --- ui/desktop/electron-app/config/cli/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/electron-app/config/cli/VERSION b/ui/desktop/electron-app/config/cli/VERSION index 09a3acfa1..faef31a43 100644 --- a/ui/desktop/electron-app/config/cli/VERSION +++ b/ui/desktop/electron-app/config/cli/VERSION @@ -1 +1 @@ -0.6.0 \ No newline at end of file +0.7.0 From ee40b2bbefe3e6eff0c244c7d581fbe2c022f20a Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Nov 2021 09:39:42 -0500 Subject: [PATCH 3/7] Fix: remove newline in version file --- ui/desktop/electron-app/config/cli/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/electron-app/config/cli/VERSION b/ui/desktop/electron-app/config/cli/VERSION index faef31a43..bcaffe19b 100644 --- a/ui/desktop/electron-app/config/cli/VERSION +++ b/ui/desktop/electron-app/config/cli/VERSION @@ -1 +1 @@ -0.7.0 +0.7.0 \ No newline at end of file From 9191b413d50ec611deb966b9889eecfa3754ca78 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Nov 2021 09:45:46 -0500 Subject: [PATCH 4/7] fix: Trim cli version --- ui/desktop/electron-app/config/cli.js | 2 +- ui/desktop/electron-app/config/cli/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/desktop/electron-app/config/cli.js b/ui/desktop/electron-app/config/cli.js index 2cb9a4174..dfc9ea9e0 100644 --- a/ui/desktop/electron-app/config/cli.js +++ b/ui/desktop/electron-app/config/cli.js @@ -75,7 +75,7 @@ module.exports = { path.resolve(__dirname, 'cli', 'VERSION'), 'utf8' ); - const artifactPath = await downloadArtifact(artifactVersion); + const artifactPath = await downloadArtifact(artifactVersion.trim()); await extract(artifactPath, artifactDestination); } catch (e) { console.error('ERROR: Failed setting up CLI.', e); diff --git a/ui/desktop/electron-app/config/cli/VERSION b/ui/desktop/electron-app/config/cli/VERSION index bcaffe19b..faef31a43 100644 --- a/ui/desktop/electron-app/config/cli/VERSION +++ b/ui/desktop/electron-app/config/cli/VERSION @@ -1 +1 @@ -0.7.0 \ No newline at end of file +0.7.0 From da3321cd2dadc1923d46d95d6824b2c8c8f53d1a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 18 Nov 2021 09:59:47 -0500 Subject: [PATCH 5/7] docs: update changelog for 1.4.0 --- ui/desktop/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md index c02fcc34f..4f14ae1c3 100644 --- a/ui/desktop/CHANGELOG.md +++ b/ui/desktop/CHANGELOG.md @@ -2,7 +2,11 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop. -## Next +## v1.4.0 [CLI 0.7.0] (2021.11.18) + +### New + +- Sessions may now be filtered by status in the UI. ([PR](https://github.com/hashicorp/boundary-ui/pull/860)) ## v1.3.0 [CLI 0.6.0] (2021.09.09) From e5a12a99d0268f5760412d5c7a72c94dc4b4fbf5 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 18 Nov 2021 09:05:47 -0800 Subject: [PATCH 6/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20enable=20filters=20?= =?UTF-8?q?on=20desktop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/config/environment.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js index f794097d2..c2d5f9c19 100644 --- a/ui/desktop/config/environment.js +++ b/ui/desktop/config/environment.js @@ -57,7 +57,7 @@ module.exports = function (environment) { featureFlags: { oidc: true, search: false, - filter: false, + filter: true, capabilities: true, 'credential-store': false, }, @@ -80,8 +80,6 @@ module.exports = function (environment) { ENV.autoOrigin = true; // Enable features in development - ENV.featureFlags['capabilities'] = true; - ENV.featureFlags['filter'] = true; } if (environment === 'test') { @@ -106,8 +104,6 @@ module.exports = function (environment) { }; // Enable tests for development features - ENV.featureFlags['capabilities'] = true; - ENV.featureFlags['filter'] = true; } if (environment === 'production') { From 6f5e6e2b926a251cd9e14e4b8194ca18ef6aea02 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Thu, 18 Nov 2021 18:39:45 -0800 Subject: [PATCH 7/7] Bump desktop client version --- ui/desktop/CHANGELOG.md | 2 +- ui/desktop/electron-app/config/cli/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md index 4f14ae1c3..b28dbf3d8 100644 --- a/ui/desktop/CHANGELOG.md +++ b/ui/desktop/CHANGELOG.md @@ -2,7 +2,7 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop. -## v1.4.0 [CLI 0.7.0] (2021.11.18) +## v1.4.0 [CLI 0.7.1] (2021.11.18) ### New diff --git a/ui/desktop/electron-app/config/cli/VERSION b/ui/desktop/electron-app/config/cli/VERSION index faef31a43..39e898a4f 100644 --- a/ui/desktop/electron-app/config/cli/VERSION +++ b/ui/desktop/electron-app/config/cli/VERSION @@ -1 +1 @@ -0.7.0 +0.7.1