From 9fb3a56303b45df83fd9d1040ae1866a78a318e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20B=C3=BCchele?= <danielbuechele@fb.com>
Date: Tue, 6 Nov 2018 05:36:20 -0800
Subject: [PATCH] persist notification filter

Summary:
persist the state of the redux store of `blacklistedPlugins`, so we don't show notifications for them.

This also fixes a bug where defaultFilters were not shown in the filterbar.

Reviewed By: passy

Differential Revision: D12924356

fbshipit-source-id: ebc5d2f5d2d3acfb5ed63d4085b65b7a78a7b05a
---
 src/reducers/index.js                      |  9 ++++-
 src/ui/components/searchable/Searchable.js | 43 ++++++++++------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/reducers/index.js b/src/reducers/index.js
index b03ed1941..6f3ff4062 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -60,5 +60,12 @@ export default combineReducers({
     connections,
   ),
   pluginStates,
-  notifications,
+  notifications: persistReducer(
+    {
+      key: 'notifications',
+      storage,
+      whitelist: ['blacklistedPlugins'],
+    },
+    notifications,
+  ),
 });
diff --git a/src/ui/components/searchable/Searchable.js b/src/ui/components/searchable/Searchable.js
index ab75bb7fa..cad952f66 100644
--- a/src/ui/components/searchable/Searchable.js
+++ b/src/ui/components/searchable/Searchable.js
@@ -15,11 +15,8 @@ import Text from '../Text.js';
 import FlexBox from '../FlexBox.js';
 import Glyph from '../Glyph.js';
 import FilterToken from './FilterToken.js';
-import PropTypes from 'prop-types';
 import styled from '../../styled/index.js';
 
-const SEARCHABLE_STORAGE_KEY = (key: string) => `SEARCHABLE_STORAGE_KEY_${key}`;
-
 const SearchBar = styled(Toolbar)({
   height: 42,
   padding: 6,
@@ -110,12 +107,8 @@ const Searchable = (
       placeholder: 'Search...',
     };
 
-    static contextTypes = {
-      plugin: PropTypes.string,
-    };
-
     state = {
-      filters: [],
+      filters: this.props.defaultFilters || [],
       focusedToken: -1,
       searchTerm: '',
       hasFocus: false,
@@ -127,19 +120,20 @@ const Searchable = (
       window.document.addEventListener('keydown', this.onKeyDown);
       const {defaultFilters} = this.props;
       let savedState;
-      let key = this.context.plugin + this.props.tableKey;
-      try {
-        savedState = JSON.parse(
-          window.localStorage.getItem(SEARCHABLE_STORAGE_KEY(key)) || 'null',
-        );
-      } catch (e) {
-        window.localStorage.removeItem(SEARCHABLE_STORAGE_KEY(key));
-      }
-      if (savedState) {
-        if (this.props.onFilterChange != null) {
-          this.props.onFilterChange(savedState.filters);
+
+      if (this.props.tableKey) {
+        try {
+          savedState = JSON.parse(
+            window.localStorage.getItem(this.getPersistKey()) || 'null',
+          );
+        } catch (e) {
+          window.localStorage.removeItem(this.getPersistKey());
         }
+      }
+
+      if (savedState) {
         if (defaultFilters != null) {
+          // merge default filter with persisted filters
           const savedStateFilters = savedState.filters;
           defaultFilters.forEach(defaultFilter => {
             const filterIndex = savedStateFilters.findIndex(
@@ -160,21 +154,20 @@ const Searchable = (
           });
         }
         this.setState({
-          searchTerm: savedState.searchTerm || '',
-          filters: savedState.filters || [],
+          searchTerm: savedState.searchTerm || this.state.searchTerm,
+          filters: savedState.filters || this.state.filters,
         });
       }
     }
 
     componentDidUpdate(prevProps: Props, prevState: State) {
       if (
-        this.context.plugin &&
+        this.props.tableKey &&
         (prevState.searchTerm !== this.state.searchTerm ||
           prevState.filters !== this.state.filters)
       ) {
-        let key = this.context.plugin + this.props.tableKey;
         window.localStorage.setItem(
-          SEARCHABLE_STORAGE_KEY(key),
+          this.getPersistKey(),
           JSON.stringify({
             searchTerm: this.state.searchTerm,
             filters: this.state.filters,
@@ -343,6 +336,8 @@ const Searchable = (
         searchTerm: '',
       });
 
+    getPersistKey = () => `SEARCHABLE_STORAGE_KEY_${this.props.tableKey || ''}`;
+
     render(): React.Node {
       const {placeholder, actions, ...props} = this.props;
       return [