diff --git a/client/src/components/Dashboard/Dashboard.js b/client/src/components/Dashboard/Dashboard.js
index e710485a6..255262b44 100644
--- a/client/src/components/Dashboard/Dashboard.js
+++ b/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 (
-
+
);
-}
\ No newline at end of file
+}
diff --git a/client/src/components/Dashboard/DashboardTopbar.js b/client/src/components/Dashboard/DashboardTopbar.js
index 7b551f7fa..4259107e1 100644
--- a/client/src/components/Dashboard/DashboardTopbar.js
+++ b/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 }) {
- {/* */}
-
+