Merge global search.

client/src/components/Dashboard/Dashboard.js

@@ -1,27 +1,30 @@
 import React from 'react';
-import {Switch, Route} from 'react-router';
+import { Switch, Route } from 'react-router';
 import Sidebar from 'components/Sidebar/Sidebar';
 import DashboardContent from 'components/Dashboard/DashboardContent';
 import DialogsContainer from 'components/DialogsContainer';
 import PreferencesContent from 'components/Preferences/PreferencesContent';
 import PreferencesSidebar from 'components/Preferences/PreferencesSidebar';
+import Search from 'containers/Dashboard/GeneralSearch/Search';
 
-export default function() {
+export default function () {
   return (
-    <div className="dashboard">
+    <div className='dashboard'>
       <Switch>
-        <Route path="/dashboard/preferences">
+        <Route path='/dashboard/preferences'>
           <Sidebar />
           <PreferencesSidebar />
           <PreferencesContent />
         </Route>
 
-        <Route path="/dashboard">
+        <Route path='/dashboard'>
           <Sidebar />
           <DashboardContent />
         </Route>
       </Switch>
+
+      <Search />
       <DialogsContainer />
     </div>
   );
-}
+}

client/src/components/Dashboard/DashboardTopbar.js

@@ -6,17 +6,20 @@ import {
   NavbarGroup,
   Button,
   Classes,
-  MenuDivider,
-  MenuItem,
-  Menu,
-  Popover,
 } from '@blueprintjs/core';
 import DashboardBreadcrumbs from 'components/Dashboard/DashboardBreadcrumbs';
 import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
 import Icon from 'components/Icon';
-import Search from 'containers/Dashboard/GeneralSearch/Search';
+import SearchConnect from 'connectors/Search.connect';
+import { compose } from 'utils';
 
-function DashboardTopbar({ pageTitle, pageSubtitle, editViewId }) {
+function DashboardTopbar({
+  pageTitle,
+  pageSubtitle,
+  editViewId,
+  globalSearchShow,
+  openGlobalSearch,
+}) {
   const history = useHistory();
 
   const handlerClickEditView = () => {
@@ -70,8 +73,13 @@ function DashboardTopbar({ pageTitle, pageSubtitle, editViewId }) {
       <div class='dashboard__topbar-right'>
         <Navbar class='dashboard__topbar-navbar'>
           <NavbarGroup>
-            {/* <Button className={Classes.MINIMAL} icon="home" text="Search" /> */}
+            <Button
-            <Search className />
+              onClick={() => openGlobalSearch(true)}
+              className={Classes.MINIMAL}
+              icon='home'
+              text='Search'
+            />
+
             <Button
               className={Classes.MINIMAL}
               icon='document'
@@ -100,4 +108,7 @@ const mapStateToProps = (state) => ({
   editViewId: state.dashboard.topbarEditViewId,
 });
 
-export default connect(mapStateToProps)(DashboardTopbar);
+export default compose(
+  SearchConnect,
+  connect(mapStateToProps)
+)(DashboardTopbar);

client/src/connectors/Search.connect.js

@@ -3,11 +3,13 @@ import t from 'store/types';
 import { generalSearch } from 'store/search/search.actions';
 
 export const mapStateToProps = (state, props) => ({
-  resultSearch: state.GeneralSearch,
+  resultSearch: state.globalSearch.searches,
+  globalSearchShow: state.globalSearch.isOpen,
 });
 
 export const mapDispatchToProps = (dispatch) => ({
-  generalSearch: (result) => dispatch(generalSearch(result)),
+  openGlobalSearch: (result) => dispatch({ type: t.OPEN_SEARCH, }),
+  closeGlobalSearch: (result) => dispatch({ type: t.CLOSE_SEARCH }),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps);

client/src/containers/Dashboard/GeneralSearch/Search.js

@@ -1,71 +1,41 @@
 import React, { useEffect, useState } from 'react';
 import { Omnibar } from '@blueprintjs/select';
-import { MenuItem, Button, Classes } from '@blueprintjs/core';
+import { MenuItem } from '@blueprintjs/core';
-import { useAsync } from 'react-use';
-import * as Yup from 'yup';
-import { useFormik } from 'formik';
-import Icon from 'components/Icon';
 import { compose } from 'utils';
 import SearchConnect from 'connectors/Search.connect';
 
-function Search({}) {
+function Search({
-  const [isOpen, setIsOpen] = useState(false);
+  resultSearch,
-
+  globalSearchShow,
+  openGlobalSearch,
+  closeGlobalSearch,
+}) {
   const items = [
     { title: 'The Shawshank Redemption', year: 1994 },
     { title: 'The Godfather', year: 1972 },
     { title: 'The Godfather: Part II', year: 1974 },
   ];
 
-  const validationSchema = Yup.object().shape({
+  const renderSearch = (search, { handleClick }) => (
-    name: Yup.string().required(),
-  });
-  const formik = useFormik({
-    enableReinitialize: true,
-    validationSchema: validationSchema,
-    initialValues: {},
-  });
-  const renderSearch = (search, { handleClick, modifiers }) => (
     <MenuItem
-      active={modifiers.active}
+      key={search.year}
-      key={search.id}
+      text={search.title}
-      text={search.name}
+      label={search.title}
-      label={search.name}
       onClick={handleClick}
     />
   );
 
-  const filterSearch = (query, search, _index, exactMatch) => {
-    // const normalizedTitle = search.toLowerCase();
-    // const normalizedQuery = query.toLowerCase();
-    // if (exactMatch) {
-    //   return normalizedTitle === normalizedQuery;
-    // } else {
-    //   return `${search} ${normalizedTitle}`.indexOf(normalizedQuery) >= 0;
-    // }
-    return search;
-  };
-  const handleClick = () => setIsOpen(true);
-  const handleClose = () => setIsOpen(false);
-
   return (
     <div>
-      <Button
-        className={Classes.MINIMAL}
-        icon='home'
-        text='Search'
-        onClick={handleClick}
-      />
       <Omnibar
-        isOpen={isOpen}
+        className={'navbar-omnibar'}
+        isOpen={globalSearchShow}
         noResults={<MenuItem disabled={true} text='No results.' />}
-        onClose={handleClose}
+        onClose={() => closeGlobalSearch(false)}
         resetOnSelect={true}
         itemRenderer={renderSearch}
         items={items}
-        // onItemSelect={}
+        // onItemSelect={onItemsSelect()}
-        itemListPredicate={filterSearch}
-        // style={{ position: 'absolute', canter: '50%' }}
       />
     </div>
   );

client/src/store/reducers.js

@@ -14,7 +14,7 @@ import financialStatements from './financialStatement/financialStatements.reduce
 import itemCategories from './itemCategories/itemsCategory.reducer';
 import settings from './settings/settings.reducer';
 import manualJournals from './manualJournals/manualJournals.reducers';
-import search from './search/search.reducer';
+import globalSearch from './search/search.reducer';
 
 export default combineReducers({
   authentication,
@@ -31,5 +31,5 @@ export default combineReducers({
   items,
   itemCategories,
   settings,
-  search,
+  globalSearch,
 });

client/src/store/search/search.actions.js

@@ -1,5 +1,19 @@
 import t from 'store/types';
 
+export function openSearch(result) {
+  return {
+    type: t.OPEN_SEARCH,
+    result,
+  };
+}
+
+export function closeSearch(result) {
+  return {
+    type: t.ClOSE_SEARCH,
+    result,
+  };
+}
+
 export function generalSearch(name, result) {
   return {
     type: t.SEARCH_SUCCESS,

client/src/store/search/search.reducer.js

@@ -8,26 +8,11 @@ const initialState = {
 };
 
 export default createReducer(initialState, {
-  [t.SEARCH_SUCCESS]: (state, action) => {
+  [t.OPEN_SEARCH]: (state, action) => {
-    const _result = {};
+    state.isOpen = true;
-
-    action.searches.forEach((search) => {
-      _result[search.id] = search;
-    });
-
-    state.searches = {
-      ...state.searches,
-      ..._result,
-    };
   },
-});
 
-//  return state = action.result;
+  [t.CLOSE_SEARCH]: (state, action) => {
-// if (typeof state === 'undefined') {
+    state.isOpen = false;
-//   return initialState;
+  }
-// }
+});
-
-// state.search[action.name] = {
-//   isOpen: true,
-//   payload: action.payload || {},
-// };

client/src/store/search/search.type.js

@@ -1,5 +1,5 @@
 export default {
-  SEARCH_SUCCESS: 'SEARCH_SUCCESS',
+  SEARCH_SUCCESS:'SEARCH_SUCCESS',
-  SEARCH_FAILURE: 'SEARCH_FAILURE',
+  OPEN_SEARCH: 'OPEN_SEARCH',
-  SEARCH_REQUEST: 'SEARCH_REQUEST',
+  CLOSE_SEARCH: 'CLOSE_SEARCH',
 };

client/src/store/types.js

@@ -14,6 +14,7 @@ import financialStatements from './financialStatement/financialStatements.types'
 import itemCategories from './itemCategories/itemsCategory.type';
 import settings from './settings/settings.type';
 import search from './search/search.type';
+
 export default {
   ...authentication,
   ...accounts,

client/src/style/pages/dashboard.scss

@@ -273,4 +273,20 @@
 .navbar--dashboard-views{
   box-shadow: 0 0 0;
   border-bottom: 1px solid #EAEAEA;
+}
+
+.navbar-omnibar{
+  -webkit-filter: blur(0);
+  filter: blur(0);
+  opacity: 1;
+  top: 20vh;
+  left: calc(50% - 250px);
+  z-index: 21;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.1),
+    0 4px 8px rgba(16, 22, 26, 0.2), 0 18px 46px 6px rgba(16, 22, 26, 0.2);
+  box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.1), 0 4px 8px rgba(16, 22, 26, 0.2),
+    0 18px 46px 6px rgba(16, 22, 26, 0.2);
+  background-color: #fff;
+  width: 500px;
 }