Fetch and use custom search queries

client/src/store/actions/actionTypes.ts

@@ -26,8 +26,9 @@ import {
   ClearNotificationAction,
   // Config
   GetConfigAction,
-  UpdateConfigAction
+  UpdateConfigAction,
 } from './';
+import { FetchQueriesAction } from './config';
 
 export enum ActionTypes {
   // Theme
@@ -62,35 +63,37 @@ export enum ActionTypes {
   clearNotification = 'CLEAR_NOTIFICATION',
   // Config
   getConfig = 'GET_CONFIG',
-  updateConfig = 'UPDATE_CONFIG'
+  updateConfig = 'UPDATE_CONFIG',
+  fetchQueries = 'FETCH_QUERIES',
 }
 
-export type Action = 
+export type Action =
   // Theme
-  SetThemeAction |
+  | SetThemeAction
   // Apps
-  GetAppsAction<any> |
-  PinAppAction |
-  AddAppAction |
-  DeleteAppAction |
-  UpdateAppAction |
-  ReorderAppsAction |
-  SortAppsAction |
+  | GetAppsAction<any>
+  | PinAppAction
+  | AddAppAction
+  | DeleteAppAction
+  | UpdateAppAction
+  | ReorderAppsAction
+  | SortAppsAction
   // Categories
-  GetCategoriesAction<any> |
-  AddCategoryAction |
-  PinCategoryAction |
-  DeleteCategoryAction |
-  UpdateCategoryAction |
-  SortCategoriesAction |
-  ReorderCategoriesAction |
+  | GetCategoriesAction<any>
+  | AddCategoryAction
+  | PinCategoryAction
+  | DeleteCategoryAction
+  | UpdateCategoryAction
+  | SortCategoriesAction
+  | ReorderCategoriesAction
   // Bookmarks
-  AddBookmarkAction |
-  DeleteBookmarkAction |
-  UpdateBookmarkAction |
+  | AddBookmarkAction
+  | DeleteBookmarkAction
+  | UpdateBookmarkAction
   // Notifications
-  CreateNotificationAction |
-  ClearNotificationAction |
+  | CreateNotificationAction
+  | ClearNotificationAction
   // Config
-  GetConfigAction |
-  UpdateConfigAction;
+  | GetConfigAction
+  | UpdateConfigAction
+  | FetchQueriesAction;

client/src/store/actions/config.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { Dispatch } from 'redux';
 import { ActionTypes } from './actionTypes';
-import { Config, ApiResponse } from '../../interfaces';
+import { Config, ApiResponse, Query } from '../../interfaces';
 import { CreateNotificationAction } from './notification';
 import { searchConfig } from '../../utility';
 
@@ -13,18 +13,18 @@ export interface GetConfigAction {
 export const getConfig = () => async (dispatch: Dispatch) => {
   try {
     const res = await axios.get<ApiResponse<Config[]>>('/api/config');
-   
+
     dispatch<GetConfigAction>({
       type: ActionTypes.getConfig,
-      payload: res.data.data
-    })
+      payload: res.data.data,
+    });
 
     // Set custom page title if set
     document.title = searchConfig('customTitle', 'Flame');
   } catch (err) {
-    console.log(err)
+    console.log(err);
   }
-}
+};
 
 export interface UpdateConfigAction {
   type: ActionTypes.updateConfig;
@@ -34,19 +34,41 @@ export interface UpdateConfigAction {
 export const updateConfig = (formData: any) => async (dispatch: Dispatch) => {
   try {
     const res = await axios.put<ApiResponse<Config[]>>('/api/config', formData);
+
     dispatch<CreateNotificationAction>({
       type: ActionTypes.createNotification,
       payload: {
         title: 'Success',
-        message: 'Settings updated'
-      }
-    })
+        message: 'Settings updated',
+      },
+    });
 
     dispatch<UpdateConfigAction>({
       type: ActionTypes.updateConfig,
-      payload: res.data.data
-    })
+      payload: res.data.data,
+    });
   } catch (err) {
     console.log(err);
   }
-}
+};
+
+export interface FetchQueriesAction {
+  type: ActionTypes.fetchQueries;
+  payload: Query[];
+}
+
+export const fetchQueries =
+  () => async (dispatch: Dispatch<FetchQueriesAction>) => {
+    try {
+      const res = await axios.get<ApiResponse<Query[]>>(
+        '/api/config/0/queries'
+      );
+
+      dispatch<FetchQueriesAction>({
+        type: ActionTypes.fetchQueries,
+        payload: res.data.data,
+      });
+    } catch (err) {
+      console.log(err);
+    }
+  };

client/src/store/reducers/config.ts

@@ -1,36 +1,50 @@
 import { ActionTypes, Action } from '../actions';
-import { Config } from '../../interfaces';
+import { Config, Query } from '../../interfaces';
 
 export interface State {
   loading: boolean;
   config: Config[];
+  customQueries: Query[];
 }
 
 const initialState: State = {
   loading: true,
-  config: []
-}
+  config: [],
+  customQueries: [],
+};
 
 const getConfig = (state: State, action: Action): State => {
   return {
+    ...state,
     loading: false,
-    config: action.payload
-  }
-}
+  };
+};
 
 const updateConfig = (state: State, action: Action): State => {
   return {
     ...state,
-    config: action.payload
-  }
-}
+    config: action.payload,
+  };
+};
+
+const fetchQueries = (state: State, action: Action): State => {
+  return {
+    ...state,
+    customQueries: action.payload,
+  };
+};
 
 const configReducer = (state: State = initialState, action: Action) => {
-  switch(action.type) {
-    case ActionTypes.getConfig: return getConfig(state, action);
-    case ActionTypes.updateConfig: return updateConfig(state, action);
-    default: return state;
+  switch (action.type) {
+    case ActionTypes.getConfig:
+      return getConfig(state, action);
+    case ActionTypes.updateConfig:
+      return updateConfig(state, action);
+    case ActionTypes.fetchQueries:
+      return fetchQueries(state, action);
+    default:
+      return state;
   }
-}
+};
 
-export default configReducer;
+export default configReducer;