PagerDuty · gsreynolds · Jul 17, 2023 · Jul 16, 2023
diff --git a/src/components/SettingsModal/SettingsModalComponent.js b/src/components/SettingsModal/SettingsModalComponent.js
@@ -55,7 +55,6 @@ import {
   toggleSettingsModal as toggleSettingsModalConnected,
   setDefaultSinceDateTenor as setDefaultSinceDateTenorConnected,
   setMaxRateLimit as setMaxRateLimitConnected,
-  setServerSideFiltering as setServerSideFilteringConnected,
   setSearchAllCustomDetails as setSearchAllCustomDetailsConnected,
   setRespondersInEpFilter as setRespondersInEpFilterConnected,
   setRelativeDates as setRelativeDatesConnected,
@@ -72,7 +71,6 @@ const SettingsModalComponent = () => {
     displaySettingsModal,
     defaultSinceDateTenor,
     maxRateLimit,
-    serverSideFiltering,
     searchAllCustomDetails,
     respondersInEpFilter,
     relativeDates,
@@ -88,9 +86,6 @@ const SettingsModalComponent = () => {
   const setMaxRateLimit = (newMaxRateLimit) => {
     dispatch(setMaxRateLimitConnected(newMaxRateLimit));
   };
-  const setServerSideFiltering = (newServerSideFiltering) => {
-    dispatch(setServerSideFilteringConnected(newServerSideFiltering));
-  };
   const setSearchAllCustomDetails = (newSearchAllCustomDetails) => {
     dispatch(setSearchAllCustomDetailsConnected(newSearchAllCustomDetails));
   };
@@ -110,7 +105,6 @@ const SettingsModalComponent = () => {
 
   const [tempMaxRateLimit, setTempMaxRateLimit] = useState(maxRateLimit);
 
-  const [tempServerSideFiltering, setTempServerSideFiltering] = useState(serverSideFiltering);
   const [tempSearchAllCustomDetails, setTempSearchAllCustomDetails] = useState(searchAllCustomDetails);
   const [tempRespondersInEpFilter, setTempRespondersInEpFilter] = useState(respondersInEpFilter);
   const [tempRelativeDates, setTempRelativeDates] = useState(relativeDates);
@@ -125,9 +119,6 @@ const SettingsModalComponent = () => {
     if (tempMaxRateLimit !== maxRateLimit) {
       setMaxRateLimit(tempMaxRateLimit);
     }
-    if (tempServerSideFiltering !== serverSideFiltering) {
-      setServerSideFiltering(tempServerSideFiltering);
-    }
     if (tempSearchAllCustomDetails !== searchAllCustomDetails) {
       setSearchAllCustomDetails(tempSearchAllCustomDetails);
     }
@@ -210,27 +201,12 @@ const SettingsModalComponent = () => {
                 </InputGroup>
               </Box>
             </FormControl>
-            <FormControl>
-              <FormLabel htmlFor="server-side-filtering-switch">
-                {t('Server Side Filtering')}
-              </FormLabel>
-              <Switch
-                id="server-side-filtering-switch"
-                isChecked={tempServerSideFiltering}
-                aria-label={t('Server Side Filtering')}
-                onChange={(e) => {
-                  setTempServerSideFiltering(e.target.checked);
-                }}
-              >
-                {t('Server Side Filtering')}
-              </Switch>
-            </FormControl>
             <FormControl>
               <FormLabel htmlFor="search-all-custom-details-switch">{t('Global Search')}</FormLabel>
               <Switch
                 id="search-all-custom-details-switch"
                 isChecked={tempSearchAllCustomDetails}
-                aria-label={t('Server Side Filtering')}
+                aria-label={t('Search all alert custom details in global search')}
                 onChange={(e) => {
                   setTempSearchAllCustomDetails(e.target.checked);
                 }}

diff --git a/src/components/SettingsModal/SettingsModalComponent.test.js b/src/components/SettingsModal/SettingsModalComponent.test.js
@@ -20,7 +20,6 @@ describe('SettingsModalComponent', () => {
         displaySettingsModal: true,
         defaultSinceDateTenor: '1 Day',
         maxRateLimit: MAX_RATE_LIMIT_LOWER,
-        serverSideFiltering: true,
         searchAllCustomDetails: true,
         respondersInEpFilter: true,
         relativeDates: true,
@@ -47,7 +46,6 @@ describe('SettingsModalComponent', () => {
       MAX_RATE_LIMIT_LOWER,
     );
 
-    expect(wrapper.find('input#server-side-filtering-switch').prop('checked')).toBeTruthy();
     expect(wrapper.find('input#search-all-custom-details-switch').prop('checked')).toBeTruthy();
     expect(wrapper.find('input#responders-in-ep-filter-switch').prop('checked')).toBeTruthy();
     expect(wrapper.find('input#relative-dates-switch').prop('checked')).toBeTruthy();

diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Auswählen...",
   "Selected": "Ausgewählt",
   "Selected Incidents": "Ausgewählte Vorfälle",
-  "Server Side Filtering": "Serverseitige Filterung",
   "Service": "Service",
   "Services": "Services",
   "Settings": "Einstellungen",

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Select...",
   "Selected": "Selected",
   "Selected Incidents": "Selected Incidents",
-  "Server Side Filtering": "Server Side Filtering",
   "Service": "Service",
   "Services": "Services",
   "Settings": "Settings",

diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Seleccione...",
   "Selected": "Seleccionado",
   "Selected Incidents": "Incidentes seleccionados",
-  "Server Side Filtering": "Filtrado del lado del servidor",
   "Service": "Servicio",
   "Services": "Servicios",
   "Settings": "Configuración",

diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Sélectionner...",
   "Selected": "Sélectionné",
   "Selected Incidents": "Incidents sélectionnés",
-  "Server Side Filtering": "Filtrage côté serveur",
   "Service": "Service",
   "Services": "Services",
   "Settings": "Paramètres",

diff --git a/src/locales/id/translation.json b/src/locales/id/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Pilih...",
   "Selected": "Terpilih",
   "Selected Incidents": "Insiden Terpilih",
-  "Server Side Filtering": "Filtering Sisi Server",
   "Service": "Layanan",
   "Services": "Layanan",
   "Settings": "Pengaturan",

diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "...を選択",
   "Selected": "選択中",
   "Selected Incidents": "選択したインシデント",
-  "Server Side Filtering": "サーバーサイドフィルタリング",
   "Service": "サービス",
   "Services": "サービス",
   "Settings": "設定",

diff --git a/src/locales/pt-br/translation.json b/src/locales/pt-br/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Selecione...",
   "Selected": "Selecionado",
   "Selected Incidents": "Incidentes Selecionados",
-  "Server Side Filtering": "Filtragem do Lado do Servidor",
   "Service": "Serviço",
   "Services": "Serviços",
   "Settings": "Configurações",

diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
@@ -132,7 +132,6 @@
   "Select dotdotdot": "Selecione...",
   "Selected": "Selecionado",
   "Selected Incidents": "Incidentes Selecionados",
-  "Server Side Filtering": "Filtragem do Lado do Servidor",
   "Service": "Serviço",
   "Services": "Serviços",
   "Settings": "Configurações",

diff --git a/src/redux/incidents/sagas.js b/src/redux/incidents/sagas.js
@@ -113,9 +113,6 @@ export function* getIncidentsImpl() {
     const {
       sinceDate, incidentStatus, incidentUrgency, teamIds, serviceIds, userIds,
     } = yield select(selectQuerySettings);
-    const {
-      serverSideFiltering,
-    } = yield select(selectSettings);
 
     const baseParams = {
       since: DEBUG_SINCE_DATE ? new Date(DEBUG_SINCE_DATE).toISOString() : sinceDate.toISOString(),
@@ -125,13 +122,11 @@ export function* getIncidentsImpl() {
       sort_by: 'created_at:desc',
     };
 
-    if (serverSideFiltering) {
-      if (incidentStatus) baseParams.statuses = incidentStatus;
-      if (incidentUrgency) baseParams.urgencies = incidentUrgency;
-      if (teamIds.length) baseParams.team_ids = teamIds;
-      if (serviceIds.length) baseParams.service_ids = serviceIds;
-      if (userIds.length) baseParams.user_ids = userIds;
-    }
+    if (incidentStatus) baseParams.statuses = incidentStatus;
+    if (incidentUrgency) baseParams.urgencies = incidentUrgency;
+    if (teamIds.length) baseParams.team_ids = teamIds;
+    if (serviceIds.length) baseParams.service_ids = serviceIds;
+    if (userIds.length) baseParams.user_ids = userIds;
 
     incidents = yield call(pdParallelFetch, 'incidents', baseParams, null, {
       priority: 5,

diff --git a/src/redux/query_settings/sagas.js b/src/redux/query_settings/sagas.js
@@ -9,8 +9,6 @@ import i18next from 'i18n';
 //   throttledPdAxiosRequest,
 // } from 'util/pd-api-wrapper';
 
-import selectSettings from 'redux/settings/selectors';
-
 import {
   UPDATE_CONNECTION_STATUS_REQUESTED,
 } from 'redux/connection/actions';
@@ -112,20 +110,14 @@ export function* updateQuerySettingsIncidentStatusImpl(action) {
     incidentStatus,
   } = action;
 
-  const {
-    serverSideFiltering,
-  } = yield select(selectSettings);
-
   yield put({
     type: UPDATE_QUERY_SETTING_INCIDENT_STATUS_COMPLETED,
     incidentStatus,
   });
 
-  if (serverSideFiltering) {
-    yield put({
-      type: FETCH_INCIDENTS_REQUESTED,
-    });
-  }
+  yield put({
+    type: FETCH_INCIDENTS_REQUESTED,
+  });
 
   yield put({
     type: FILTER_INCIDENTS_LIST,
@@ -145,20 +137,14 @@ export function* updateQuerySettingsIncidentUrgencyImpl(action) {
     incidentUrgency,
   } = action;
 
-  const {
-    serverSideFiltering,
-  } = yield select(selectSettings);
-
   yield put({
     type: UPDATE_QUERY_SETTING_INCIDENT_URGENCY_COMPLETED,
     incidentUrgency,
   });
 
-  if (serverSideFiltering) {
-    yield put({
-      type: FETCH_INCIDENTS_REQUESTED,
-    });
-  }
+  yield put({
+    type: FETCH_INCIDENTS_REQUESTED,
+  });
 
   yield put({
     type: FILTER_INCIDENTS_LIST,
@@ -197,19 +183,13 @@ export function* updateQuerySettingsTeamsImpl(action) {
     teamIds,
   } = action;
 
-  const {
-    serverSideFiltering,
-  } = yield select(selectSettings);
-
   // yield put({ type: FETCH_SERVICES_REQUESTED, teamIds });
   // yield put({ type: GET_USERS_REQUESTED, teamIds });
   yield put({ type: UPDATE_QUERY_SETTINGS_TEAMS_COMPLETED, teamIds });
 
-  if (serverSideFiltering) {
-    yield put({
-      type: FETCH_INCIDENTS_REQUESTED,
-    });
-  }
+  yield put({
+    type: FETCH_INCIDENTS_REQUESTED,
+  });
 
   yield put({
     type: FILTER_INCIDENTS_LIST,
@@ -246,17 +226,11 @@ export function* updateQuerySettingsServicesImpl(action) {
     serviceIds,
   } = action;
 
-  const {
-    serverSideFiltering,
-  } = yield select(selectSettings);
-
   yield put({ type: UPDATE_QUERY_SETTINGS_SERVICES_COMPLETED, serviceIds });
 
-  if (serverSideFiltering) {
-    yield put({
-      type: FETCH_INCIDENTS_REQUESTED,
-    });
-  }
+  yield put({
+    type: FETCH_INCIDENTS_REQUESTED,
+  });
 
   yield put({
     type: FILTER_INCIDENTS_LIST,
@@ -274,17 +248,11 @@ export function* updateQuerySettingsUsersImpl(action) {
     userIds,
   } = action;
 
-  const {
-    serverSideFiltering,
-  } = yield select(selectSettings);
-
   yield put({ type: UPDATE_QUERY_SETTINGS_USERS_COMPLETED, userIds });
 
-  if (serverSideFiltering) {
-    yield put({
-      type: FETCH_INCIDENTS_REQUESTED,
-    });
-  }
+  yield put({
+    type: FETCH_INCIDENTS_REQUESTED,
+  });
 
   yield put({
     type: FILTER_INCIDENTS_LIST,

diff --git a/src/redux/query_settings/sagas.test.js b/src/redux/query_settings/sagas.test.js
@@ -73,7 +73,6 @@ describe('Sagas: Query Settings', () => {
   };
   const mockSettings = {
     autoAcceptIncidentsQuery: true,
-    serverSideFiltering: true,
   };
 
   xit('validateIncidentQueryImpl: API Error', () => {

diff --git a/src/redux/rootSaga.js b/src/redux/rootSaga.js
@@ -122,7 +122,6 @@ import {
   setAutoAcceptIncidentsQuery,
   setAutoRefreshInterval,
   setDarkMode,
-  setServerSideFiltering,
   setRelativeDates,
   clearLocalCache,
 } from './settings/sagas';
@@ -244,7 +243,6 @@ export default function* rootSaga() {
     setAutoAcceptIncidentsQuery(),
     setAutoRefreshInterval(),
     setDarkMode(),
-    setServerSideFiltering(),
     setRelativeDates(),
     clearLocalCache(),
 

diff --git a/src/redux/settings/actions.js b/src/redux/settings/actions.js
@@ -33,9 +33,6 @@ export const CLEAR_LOCAL_CACHE_COMPLETED = 'CLEAR_LOCAL_CACHE_COMPLETED';
 export const SET_DARK_MODE_REQUESTED = 'SET_DARK_MODE_REQUESTED';
 export const SET_DARK_MODE_COMPLETED = 'SET_DARK_MODE_COMPLETED';
 
-export const SET_SERVER_SIDE_FILTERING_REQUESTED = 'SET_SERVER_SIDE_FILTERING_REQUESTED';
-export const SET_SERVER_SIDE_FILTERING_COMPLETED = 'SET_SERVER_SIDE_FILTERING_COMPLETED';
-
 export const SET_RELATIVE_DATES_REQUESTED = 'SET_RELATIVE_DATES_REQUESTED';
 export const SET_RELATIVE_DATES_COMPLETED = 'SET_RELATIVE_DATES_COMPLETED';
 
@@ -92,11 +89,6 @@ export const setDarkMode = (darkMode) => ({
   darkMode,
 });
 
-export const setServerSideFiltering = (serverSideFiltering) => ({
-  type: SET_SERVER_SIDE_FILTERING_REQUESTED,
-  serverSideFiltering,
-});
-
 export const setRelativeDates = (relativeDates) => ({
   type: SET_RELATIVE_DATES_REQUESTED,
   relativeDates,

diff --git a/src/redux/settings/reducers.js b/src/redux/settings/reducers.js
@@ -25,8 +25,6 @@ import {
   CLEAR_LOCAL_CACHE_COMPLETED,
   SET_DARK_MODE_REQUESTED,
   SET_DARK_MODE_COMPLETED,
-  SET_SERVER_SIDE_FILTERING_REQUESTED,
-  SET_SERVER_SIDE_FILTERING_COMPLETED,
   SET_RELATIVE_DATES_REQUESTED,
   SET_RELATIVE_DATES_COMPLETED,
 } from './actions';
@@ -132,15 +130,6 @@ const settings = produce(
         draft.status = SET_DARK_MODE_COMPLETED;
         break;
 
-      case SET_SERVER_SIDE_FILTERING_REQUESTED:
-        draft.status = SET_SERVER_SIDE_FILTERING_REQUESTED;
-        break;
-
-      case SET_SERVER_SIDE_FILTERING_COMPLETED:
-        draft.serverSideFiltering = action.serverSideFiltering;
-        draft.status = SET_SERVER_SIDE_FILTERING_COMPLETED;
-        break;
-
       case SET_RELATIVE_DATES_REQUESTED:
         draft.status = SET_RELATIVE_DATES_REQUESTED;
         break;
@@ -161,7 +150,6 @@ const settings = produce(
     maxRateLimit: 200,
     autoAcceptIncidentsQuery: true,
     autoRefreshInterval: 5,
-    serverSideFiltering: true,
     searchAllCustomDetails: false,
     respondersInEpFilter: false,
     alertCustomDetailFields: [