Add topic filter

app/src/reducers/Settings.ts

@@ -0,0 +1,84 @@
+import { Action } from 'redux'
+import { createReducer } from './lib'
+
+export enum TopicOrder {
+  none = 'none',
+  messages = '#messages',
+  abc = 'abc',
+  topics = '#topics',
+}
+
+export interface SettingsState {
+  autoExpandLimit: number
+  visible: boolean
+  topicOrder: TopicOrder
+  topicFilter?: string
+}
+export type Action = SetAutoExpandLimit | ToggleVisibility | SetTopicOrder | FilterTopics
+
+export enum ActionTypes {
+  SETTINGS_SET_AUTO_EXPAND_LIMIT = 'SETTINGS_SET_AUTO_EXPAND_LIMIT',
+  SETTINGS_TOGGLE_VISIBILITY = 'SETTINGS_TOGGLE_VISIBILITY',
+  SETTINGS_SET_TOPIC_ORDER = 'SETTINGS_SET_TOPIC_ORDER',
+  SETTINGS_FILTER_TOPICS = 'SETTINGS_FILTER_TOPICS',
+}
+
+const initialState: SettingsState = {
+  autoExpandLimit: 0,
+  topicOrder: TopicOrder.none,
+  visible: false,
+}
+
+export const settingsReducer = createReducer(initialState, {
+  SETTINGS_SET_AUTO_EXPAND_LIMIT: setAutoExpandLimit,
+  SETTINGS_TOGGLE_VISIBILITY: toggleVisibility,
+  SETTINGS_SET_TOPIC_ORDER: setTopicOrder,
+  SETTINGS_FILTER_TOPICS: filterTopics,
+})
+
+function setAutoExpandLimit(state: SettingsState, action: SetAutoExpandLimit) {
+  return {
+    ...state,
+    autoExpandLimit: action.autoExpandLimit,
+  }
+}
+
+export interface SetAutoExpandLimit {
+  type: ActionTypes.SETTINGS_SET_AUTO_EXPAND_LIMIT
+  autoExpandLimit: number
+}
+
+function toggleVisibility(state: SettingsState, action: ToggleVisibility) {
+  return {
+    ...state,
+    visible: !state.visible,
+  }
+}
+
+export interface ToggleVisibility {
+  type: ActionTypes.SETTINGS_TOGGLE_VISIBILITY
+}
+
+function setTopicOrder(state: SettingsState, action: SetTopicOrder) {
+  return {
+    ...state,
+    topicOrder: action.topicOrder,
+  }
+}
+
+export interface SetTopicOrder {
+  type: ActionTypes.SETTINGS_SET_TOPIC_ORDER
+  topicOrder: string
+}
+
+function filterTopics(state: SettingsState, action: FilterTopics) {
+  return {
+    ...state,
+    topicFilter: action.topicFilter,
+  }
+}
+
+export interface FilterTopics {
+  type: ActionTypes.SETTINGS_FILTER_TOPICS
+  topicFilter: string
+}

app/src/reducers/Tree.ts

@@ -0,0 +1,49 @@
+import * as q from '../../../backend/src/Model'
+import { Action } from 'redux'
+import { createReducer } from './lib'
+
+export interface TreeState {
+  tree?: q.Tree
+  selectedTopic?: q.TreeNode
+  filter?: string
+}
+
+export type Action = ShowTree | SelectTopic
+
+export enum ActionTypes {
+  TREE_SHOW_TREE = 'TREE_SHOW_TREE',
+  TREE_SELECT_TOPIC = 'TREE_SELECT_TOPIC',
+}
+
+export interface ShowTree {
+  type: ActionTypes.TREE_SHOW_TREE
+  tree?: q.Tree
+  filter?: string
+}
+
+export interface SelectTopic {
+  type: ActionTypes.TREE_SELECT_TOPIC
+  selectedTopic?: q.TreeNode
+}
+
+const initialState: TreeState = { }
+
+export const treeReducer = createReducer(initialState, {
+  TREE_SHOW_TREE: showTree,
+  TREE_SELECT_TOPIC: selectTopic,
+})
+
+function showTree(state: TreeState, action: ShowTree) {
+  return {
+    ...state,
+    tree: action.tree,
+    filter: action.filter,
+  }
+}
+
+function selectTopic(state: TreeState, action: SelectTopic) {
+  return {
+    ...state,
+    selectedTopic: action.selectedTopic,
+  }
+}

app/src/reducers/index.ts

@@ -6,35 +6,33 @@ import { trackEvent } from '../tracking'
 import { PublishState, publishReducer } from './Publish'
 import { ConnectionState, connectionReducer } from './Connection'
 import { SettingsState, settingsReducer } from './Settings'
+import { TreeState, treeReducer } from './Tree'
 
 export enum ActionTypes {
-  selectTopic = 'SELECT_TOPIC',
   showUpdateNotification = 'SHOW_UPDATE_NOTIFICATION',
   showUpdateDetails = 'SHOW_UPDATE_DETAILS',
 }
 
 export interface CustomAction extends Action {
   type: ActionTypes,
-  selectedTopic?: q.TreeNode
   showUpdateNotification?: boolean
   showUpdateDetails?: boolean
 }
 
 export interface AppState {
   tooBigReducer: TooBigOfState
+  tree: TreeState
   settings: SettingsState,
   publish: PublishState
   connection: ConnectionState
 }
 
 export interface TooBigOfState {
-  selectedTopic?: q.TreeNode
   showUpdateNotification?: boolean
   showUpdateDetails: boolean
 }
 
 const initialBigState: TooBigOfState = {
-  selectedTopic: undefined,
   showUpdateDetails: false,
 }
 
@@ -43,17 +41,8 @@ const tooBigReducer: Reducer<TooBigOfState | undefined, CustomAction> = (state =
     throw Error('No initial state')
   }
   trackEvent(action.type)
-  console.log(action, state)
-  switch (action.type) {
-    case ActionTypes.selectTopic:
-      if (!action.selectedTopic) {
-        return state
-      }
-      return {
-        ...state,
-        selectedTopic: action.selectedTopic,
-      }
 
+  switch (action.type) {
     case ActionTypes.showUpdateNotification:
       return {
         ...state,
@@ -79,6 +68,7 @@ const reducer = combineReducers({
   publish: publishReducer,
   connection: connectionReducer,
   settings: settingsReducer,
+  tree: treeReducer,
 })
 
 export default reducer