From c0164f7e6679ecc4e0afbf03da46625935ddbc28 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 10:57:38 -0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/routes/scopes/scope/sessions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/admin/app/routes/scopes/scope/sessions.js b/ui/admin/app/routes/scopes/scope/sessions.js
index c2809b06d..402704e55 100644
--- a/ui/admin/app/routes/scopes/scope/sessions.js
+++ b/ui/admin/app/routes/scopes/scope/sessions.js
@@ -79,7 +79,7 @@ export default class ScopesScopeSessionsRoute extends Route {
               this.store.findRecord('target', session.target_id)
             )
           : null,
-          }))
+      }))
     );
     // Sort sessions by time created...
     let sortedSessionAggregates =

From 3ce3e598bf7661e56375aef380acc0b172828a47 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 11:06:16 -0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 1 -
 ui/admin/config/environment.js                         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 9b16b38ea..8aeb4ac3f 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -28,7 +28,6 @@
               @ignoreClickInside={{true}}
               as |dropdown|
             >
-
               <form.checkboxGroup
                 @name={{filter.name}}
                 @items={{filter.allowedValues}}
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index f3555e72b..613c6a3e8 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -35,7 +35,7 @@ module.exports = function (environment) {
     companyName: 'HashiCorp',
 
     notifyTimeout: 4000,
-    sessionPollingTimeoutSeconds: 111111112.5,
+    sessionPollingTimeoutSeconds: 2.5,
     oidcPollingTimeoutSeconds: 1,
 
     documentation: {
@@ -155,7 +155,7 @@ module.exports = function (environment) {
     // Notification timeout should be 0 for fast tests
     ENV.notifyTimeout = 0;
     // Polling timeouts should be short
-    ENV.sessionPollingTimeoutSeconds = 111111110.25;
+    ENV.sessionPollingTimeoutSeconds = 0.25;
     ENV.oidcPollingTimeoutSeconds = 0;
     ENV.enableConfirmService = false;
 

From 9c7b0e529ecab0801a0ec664c550019816dd2988 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 11:19:22 -0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint=20again!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 8aeb4ac3f..dd82de5bd 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -128,6 +128,7 @@
           {{/each}}
         </table.body>
       </Rose::Table>
+
     {{else if (has-resource-filter-param-selections 'scopes.scope.sessions')}}
       <Rose::Layout::Centered>
         <Rose::Message @title={{t 'titles.no-results'}} as |message|>

From 6310a266610512c45827da7501edcbe163c6a0ea Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 11:26:13 -0800
Subject: [PATCH 4/7] Update index.hbs

---
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index dd82de5bd..7e1df0092 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -150,4 +150,4 @@
       </Rose::Layout::Centered>
     {{/if}}
   </page.body>
-</Rose::Layout::Page>
\ No newline at end of file
+</Rose::Layout::Page>

From cdba23e4cc527f1e719914b891963b6a1ac291b4 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 11:26:48 -0800
Subject: [PATCH 5/7] Update index.hbs


From bfa240cc9ed6f591c836e7d77b270b7b8d9b5fc8 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 11:42:02 -0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 7e1df0092..dd82de5bd 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -150,4 +150,4 @@
       </Rose::Layout::Centered>
     {{/if}}
   </page.body>
-</Rose::Layout::Page>
+</Rose::Layout::Page>
\ No newline at end of file

From ac3d42ba413827b6f19be69d47f857746735c717 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 15 Nov 2021 13:49:19 -0800
Subject: [PATCH 7/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20feature=20fla?=
 =?UTF-8?q?g=20to=20toolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/scopes/scope/sessions/index.hbs | 89 ++++++++++---------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index dd82de5bd..d5052b1ee 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -13,50 +13,57 @@
   </page.header>
 
   <page.body>
-    {{#if
-      (or @model (has-resource-filter-param-selections 'scopes.scope.sessions'))
-    }}
-      <Rose::Toolbar>
-        <Rose::Form as |form|>
-          {{#with
-            (resource-filter-param 'scopes.scope.sessions' 'status')
-            as |filter|
-          }}
-            <Rose::Dropdown
-              @text={{t (concat 'form.' filter.name '.label')}}
-              @count={{filter.selectedValue.length}}
-              @ignoreClickInside={{true}}
-              as |dropdown|
-            >
-              <form.checkboxGroup
-                @name={{filter.name}}
-                @items={{filter.allowedValues}}
-                @selectedItems={{filter.selectedValue}}
-                @onChange={{route-action 'filterBy' filter.name}}
-                as |group|
+    {{#if (feature-flag 'filter')}}
+      {{#if
+        (or
+          @model (has-resource-filter-param-selections 'scopes.scope.sessions')
+        )
+      }}
+        <Rose::Toolbar>
+          <Rose::Form as |form|>
+            {{#with
+              (resource-filter-param 'scopes.scope.sessions' 'status')
+              as |filter|
+            }}
+              <Rose::Dropdown
+                @text={{t (concat 'form.' filter.name '.label')}}
+                @count={{filter.selectedValue.length}}
+                @ignoreClickInside={{true}}
+                as |dropdown|
               >
-                <dropdown.item>
-                  <group.checkbox
-                    @label={{t (concat 'resources.session.status.' group.item)}}
-                    value={{group.item}}
-                  />
-                </dropdown.item>
-              </form.checkboxGroup>
-            </Rose::Dropdown>
-          {{/with}}
+                <form.checkboxGroup
+                  @name={{filter.name}}
+                  @items={{filter.allowedValues}}
+                  @selectedItems={{filter.selectedValue}}
+                  @onChange={{route-action 'filterBy' filter.name}}
+                  as |group|
+                >
+                  <dropdown.item>
+                    <group.checkbox
+                      @label={{t
+                        (concat 'resources.session.status.' group.item)
+                      }}
+                      value={{group.item}}
+                    />
+                  </dropdown.item>
+                </form.checkboxGroup>
+              </Rose::Dropdown>
+            {{/with}}
 
-          {{#if (has-resource-filter-param-selections 'scopes.scope.sessions')}}
-            <Rose::Button
-              @style='inline-link-action'
-              @iconLeft='flight-icons/svg/x-16'
-              {{on 'click' (route-action 'clearAllFilters')}}
-            >{{t 'actions.clear-all-filters'}}
-            </Rose::Button>
-          {{/if}}
-        </Rose::Form>
-      </Rose::Toolbar>
+            {{#if
+              (has-resource-filter-param-selections 'scopes.scope.sessions')
+            }}
+              <Rose::Button
+                @style='inline-link-action'
+                @iconLeft='flight-icons/svg/x-16'
+                {{on 'click' (route-action 'clearAllFilters')}}
+              >{{t 'actions.clear-all-filters'}}
+              </Rose::Button>
+            {{/if}}
+          </Rose::Form>
+        </Rose::Toolbar>
+      {{/if}}
     {{/if}}
-
     {{#if @model}}
       <Rose::Table as |table|>
         <table.header as |header|>