Merge branch 'main' into chore-update-vagrantfile

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": {

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.1] (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)
 

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') {

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);

ui/desktop/electron-app/config/cli/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.1

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"