From 72b7b85ad1ee2c726792b0a5d528725264c9c87c Mon Sep 17 00:00:00 2001
From: lisbet-alvarez <107949262+lisbet-alvarez@users.noreply.github.com>
Date: Fri, 12 Aug 2022 10:02:05 -0700
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20filter=20featu?=
 =?UTF-8?q?re=20flag=20(#1252)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: ICU-5599
---
 .../templates/scopes/scope/sessions/index.hbs |  92 ++++-----
 ui/admin/config/environment.js                |   1 -
 .../scopes/scope/projects/sessions/index.hbs  | 192 +++++++++---------
 .../scopes/scope/projects/targets/index.hbs   | 154 +++++++-------
 4 files changed, 214 insertions(+), 225 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 0e948fad7..0316e728d 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -13,59 +13,55 @@
   </page.header>
 
   <page.body>
-    {{#if (feature-flag 'filter')}}
-      <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 @model}}
       <Rose::Table as |table|>
         <table.header as |header|>
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 5041b4b98..000947a3f 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -8,7 +8,6 @@ const EDITION = process.env.EDITION || 'oss'; // Default edition is OSS
 const featureEditions = {
   oss: {
     search: false,
-    filter: true,
     'static-credentials': false,
     byow: false,
   },
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 9b63dd557..e392a8a49 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
@@ -9,109 +9,105 @@
   </page.header>
 
   <page.body>
-    {{#if (feature-flag 'filter')}}
-      <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 this.sorted}}
       <Rose::Table as |table|>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
index e15d6b4d2..5c4eb372e 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
@@ -9,88 +9,86 @@
   </page.header>
 
   <page.body>
-    {{#if (feature-flag 'filter')}}
-      {{#if
-        (or
-          @model
-          (has-resource-filter-selections
-            'scopes.scope.projects.targets' 'project'
-          )
+    {{#if
+      (or
+        @model
+        (has-resource-filter-selections
+          'scopes.scope.projects.targets' 'project'
         )
-      }}
-        <Rose::Toolbar as |toolbar|>
-          <toolbar.primary>
-            <Rose::Form as |form|>
-              {{#with
-                (resource-filter 'scopes.scope.projects.targets' '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}}
+      )
+    }}
+      <Rose::Toolbar as |toolbar|>
+        <toolbar.primary>
+          <Rose::Form as |form|>
+            {{#with
+              (resource-filter 'scopes.scope.projects.targets' '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.targets' '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.targets' '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 'refreshTargets'}} />
-          </toolbar.secondary>
+        <toolbar.secondary>
+          <ToolbarRefresher @onClick={{route-action 'refreshTargets'}} />
+        </toolbar.secondary>
 
-        </Rose::Toolbar>
-      {{/if}}
+      </Rose::Toolbar>
     {{/if}}
 
     {{#if @model}}