From 581dcca2b287256e5aecdf8f206f327cba8b8e3a Mon Sep 17 00:00:00 2001
From: Tymoteusz Czech <2625371+Tymek@users.noreply.github.com>
Date: Fri, 27 May 2022 16:15:32 +0200
Subject: [PATCH] Fix: global filter table rules (#1016)

---
 .../FeatureToggleList/FeatureToggleListTable.tsx       | 10 +++++++++-
 .../ProjectFeatureToggles/ProjectFeatureToggles.tsx    |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx
index 59d28b1384..7d15f353a7 100644
--- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx
+++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx
@@ -52,6 +52,7 @@ const columns = [
         sortType: 'date',
         align: 'center',
         maxWidth: 85,
+        disableGlobalFilter: true,
     },
     {
         Header: 'Type',
@@ -59,6 +60,7 @@ const columns = [
         Cell: FeatureTypeCell,
         align: 'center',
         maxWidth: 85,
+        disableGlobalFilter: true,
     },
     {
         Header: 'Feature toggle name',
@@ -73,6 +75,7 @@ const columns = [
         Cell: DateCell,
         sortType: 'date',
         maxWidth: 150,
+        disableGlobalFilter: true,
     },
     {
         Header: 'Project ID',
@@ -89,6 +92,7 @@ const columns = [
         Cell: FeatureStaleCell,
         sortType: 'boolean',
         maxWidth: 120,
+        disableGlobalFilter: true,
     },
     // Always hidden -- for search
     {
@@ -210,7 +214,11 @@ export const FeatureToggleListTable: VFC = () => {
             isLoading={loading}
             header={
                 <PageHeader
-                    title={`Feature toggles (${data.length})`}
+                    title={`Feature toggles (${
+                        rows.length < data.length
+                            ? `${rows.length} of ${data.length}`
+                            : data.length
+                    })`}
                     actions={
                         <>
                             <TableSearch
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
index 1e17ce6ecd..d676d10d37 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -181,12 +181,14 @@ export const ProjectFeatureToggles = ({
                 Cell: FeatureSeenCell,
                 sortType: 'date',
                 align: 'center',
+                disableGlobalFilter: true,
             },
             {
                 Header: 'Type',
                 accessor: 'type',
                 Cell: FeatureTypeCell,
                 align: 'center',
+                disableGlobalFilter: true,
             },
             {
                 Header: 'Feature toggle name',
@@ -208,6 +210,7 @@ export const ProjectFeatureToggles = ({
                 Cell: DateCell,
                 sortType: 'date',
                 align: 'center',
+                disableGlobalFilter: true,
             },
             ...environments.map(name => ({
                 Header: loading ? () => '' : name,
@@ -215,6 +218,7 @@ export const ProjectFeatureToggles = ({
                 minWidth: 90,
                 accessor: `environments.${name}`,
                 align: 'center',
+                disableGlobalFilter: true,
                 Cell: ({
                     value,
                     row: { original: feature },
@@ -244,6 +248,7 @@ export const ProjectFeatureToggles = ({
                     <ActionsCell projectId={projectId} {...props} />
                 ),
                 disableSortBy: true,
+                disableGlobalFilter: true,
             },
         ],
         [projectId, environments, onToggle, loading]