From da89e2f82e59ff295acb8d1b685a228a0a98e64c Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 29 Jun 2022 20:42:12 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20unable=20to=20filter=20fo?=
 =?UTF-8?q?r=20terminated=20sessions=20(#1169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 🐛 unable to filter for terminated sessions

* fix: 🐛 reenable sessions mocks
---
 .../templates/scopes/scope/sessions/index.hbs | 102 ++++-----
 .../scopes/scope/projects/sessions/index.hbs  | 201 +++++++++---------
 2 files changed, 143 insertions(+), 160 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index d16f8c035..0e948fad7 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -14,65 +14,57 @@
 
   <page.body>
     {{#if (feature-flag 'filter')}}
-      {{#if
-        (or
-          @model
-          (has-resource-filter-selections 'scopes.scope.sessions' 'status')
-        )
-      }}
-        <Rose::Toolbar as |toolbar|>
-          <toolbar.primary>
-            <Rose::Form as |form|>
-              {{#with
-                (resource-filter 'scopes.scope.sessions' 'status')
-                as |filter|
-              }}
-                <Rose::Dropdown
-                  @text={{t (concat 'form.' filter.name '.label')}}
-                  @count={{filter.selectedValue.length}}
-                  @ignoreClickInside={{true}}
-                  as |dropdown|
+      <Rose::Toolbar as |toolbar|>
+        <toolbar.primary>
+          <Rose::Form as |form|>
+            {{#with
+              (resource-filter '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|
                 >
-                  <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}}
+                  <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-selections
-                  'scopes.scope.sessions' 'status'
-                )
-              }}
-                <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>
-          </toolbar.primary>
+            {{#if
+              (has-resource-filter-selections 'scopes.scope.sessions' 'status')
+            }}
+              <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>
+        </toolbar.primary>
 
-          <toolbar.secondary>
-            <ToolbarRefresher @onClick={{route-action 'refreshSessions'}} />
-          </toolbar.secondary>
+        <toolbar.secondary>
+          <ToolbarRefresher @onClick={{route-action 'refreshSessions'}} />
+        </toolbar.secondary>
+
+      </Rose::Toolbar>
 
-        </Rose::Toolbar>
-      {{/if}}
     {{/if}}
     {{#if @model}}
       <Rose::Table as |table|>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
index caeb0c36f..9b63dd557 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
@@ -10,116 +10,107 @@
 
   <page.body>
     {{#if (feature-flag 'filter')}}
-      {{#if
-        (or
-          @model
-          (has-resource-filter-selections
-            'scopes.scope.projects.sessions' 'status' 'project'
-          )
-        )
-      }}
-        <Rose::Toolbar as |toolbar|>
-          <toolbar.primary>
-            <Rose::Form as |form|>
-              {{#with
-                (resource-filter 'scopes.scope.projects.sessions' 'status')
-                as |filter|
-              }}
-                <Rose::Dropdown
-                  @text={{t (concat 'form.' filter.name '.label')}}
-                  @count={{filter.selectedValue.length}}
-                  @ignoreClickInside={{true}}
-                  as |dropdown|
+      <Rose::Toolbar as |toolbar|>
+        <toolbar.primary>
+          <Rose::Form as |form|>
+            {{#with
+              (resource-filter 'scopes.scope.projects.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|
                 >
-                  <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}}
+                  <dropdown.item>
+                    <group.checkbox
+                      @label={{t
+                        (concat 'resources.session.status.' group.item)
+                      }}
+                      value={{group.item}}
+                    />
+                  </dropdown.item>
+                </form.checkboxGroup>
+              </Rose::Dropdown>
+            {{/with}}
 
-              {{#with
-                (resource-filter 'scopes.scope.projects.sessions' 'project')
-                as |filter|
-              }}
-                <Rose::Dropdown
-                  @text={{t (concat 'resources.' filter.name '.title')}}
-                  @count={{filter.selectedValue.length}}
-                  @ignoreClickInside={{true}}
-                  as |dropdown|
-                >
-                  <ul>
-                    {{#with
-                      (group-by filter.allowedValues 'scopeModel')
-                      as |groups|
-                    }}
-                      {{#each groups as |groupedItems|}}
-                        <li>
-                          <dropdown.item>
-                            <Rose::Icon
-                              @name='flight-icons/svg/org-16'
-                              @size='medium'
-                            />
-                            {{groupedItems.key.displayName}}
-                          </dropdown.item>
-                          <ul class='indent-label-2'>
-                            <form.checkboxGroup
-                              @name={{filter.name}}
-                              @items={{groupedItems.items}}
-                              @selectedItems={{filter.selectedValue}}
-                              @onChange={{route-action 'filterBy' filter.name}}
-                              as |group|
-                            >
-                              <li>
-                                <dropdown.item>
-                                  <group.checkbox
-                                    @label={{group.item.displayName}}
-                                    value={{group.item}}
-                                  />
-                                </dropdown.item>
-                              </li>
-                            </form.checkboxGroup>
-                          </ul>
-                        </li>
-                      {{/each}}
-                    {{/with}}
-                  </ul>
-                </Rose::Dropdown>
-              {{/with}}
+            {{#with
+              (resource-filter 'scopes.scope.projects.sessions' 'project')
+              as |filter|
+            }}
+              <Rose::Dropdown
+                @text={{t (concat 'resources.' filter.name '.title')}}
+                @count={{filter.selectedValue.length}}
+                @ignoreClickInside={{true}}
+                as |dropdown|
+              >
+                <ul>
+                  {{#with
+                    (group-by filter.allowedValues 'scopeModel')
+                    as |groups|
+                  }}
+                    {{#each groups as |groupedItems|}}
+                      <li>
+                        <dropdown.item>
+                          <Rose::Icon
+                            @name='flight-icons/svg/org-16'
+                            @size='medium'
+                          />
+                          {{groupedItems.key.displayName}}
+                        </dropdown.item>
+                        <ul class='indent-label-2'>
+                          <form.checkboxGroup
+                            @name={{filter.name}}
+                            @items={{groupedItems.items}}
+                            @selectedItems={{filter.selectedValue}}
+                            @onChange={{route-action 'filterBy' filter.name}}
+                            as |group|
+                          >
+                            <li>
+                              <dropdown.item>
+                                <group.checkbox
+                                  @label={{group.item.displayName}}
+                                  value={{group.item}}
+                                />
+                              </dropdown.item>
+                            </li>
+                          </form.checkboxGroup>
+                        </ul>
+                      </li>
+                    {{/each}}
+                  {{/with}}
+                </ul>
+              </Rose::Dropdown>
+            {{/with}}
 
-              {{#if
-                (has-resource-filter-selections
-                  'scopes.scope.projects.sessions' 'status' 'project'
-                )
-              }}
-                <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>
-          </toolbar.primary>
+            {{#if
+              (has-resource-filter-selections
+                'scopes.scope.projects.sessions' 'status' 'project'
+              )
+            }}
+              <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>
+        </toolbar.primary>
 
-          <toolbar.secondary>
-            <ToolbarRefresher @onClick={{route-action 'refreshSessions'}} />
-          </toolbar.secondary>
+        <toolbar.secondary>
+          <ToolbarRefresher @onClick={{route-action 'refreshSessions'}} />
+        </toolbar.secondary>
 
-        </Rose::Toolbar>
-      {{/if}}
+      </Rose::Toolbar>
     {{/if}}
 
     {{#if this.sorted}}