LPS-106598 Move components to management-toolbar root folder

brunofarache · Mar 12, 2020 · bcbd4ee · bcbd4ee
1 parent f6fa3a3
commit bcbd4ee
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 39 deletions.
diff --git a/...-builder-web/src/main/resources/META-INF/resources/js/components/list-view/ListView.es.js b/...-builder-web/src/main/resources/META-INF/resources/js/components/list-view/ListView.es.js
@@ -18,11 +18,9 @@ import {withRouter} from 'react-router-dom';
 
 import useQuery from '../../hooks/useQuery.es';
 import {getURL} from '../../utils/client.es';
-import {SearchBar} from '../management-toolbar/index.es';
-import SearchContext, {
-	reducer,
-} from '../management-toolbar/search/SearchContext.es';
-import SearchSubnavigationBar from '../management-toolbar/search/SearchSubnavigationBar.es';
+import ManagementToolbar from '../management-toolbar/ManagementToolbar.es';
+import ManagementToolbarResultsBar from '../management-toolbar/ManagementToolbarResultsBar.es';
+import SearchContext, {reducer} from '../management-toolbar/SearchContext.es';
 import TableWithPagination from '../table/TableWithPagination.es';
 
 export default withRouter(
@@ -101,13 +99,13 @@ export default withRouter(
 
 		return (
 			<SearchContext.Provider value={[query, dispatch]}>
-				<SearchBar
+				<ManagementToolbar
 					addButton={addButton}
 					columns={columns}
 					totalCount={totalCount}
 				/>
 
-				<SearchSubnavigationBar
+				<ManagementToolbarResultsBar
 					isLoading={isLoading}
 					totalCount={totalCount}
 				/>

diff --git a/...management-toolbar/search/SearchBar.es.js → ...anagement-toolbar/ManagementToolbar.es.js b/...management-toolbar/search/SearchBar.es.js → ...anagement-toolbar/ManagementToolbar.es.js
@@ -15,10 +15,10 @@
 import ClayManagementToolbar from '@clayui/management-toolbar';
 import React, {useContext, useState} from 'react';
 
-import SearchBarActions from './SearchBarActions.es';
+import ManagementToolbarLeft from './ManagementToolbarLeft.es';
+import ManagementToolbarRight from './ManagementToolbarRight.es';
+import ManagementToolbarSearch from './ManagementToolbarSearch';
 import SearchContext from './SearchContext.es';
-import SearchInput from './SearchInput.es';
-import SearchSort from './SearchSort.es';
 
 export default ({addButton, columns, totalCount}) => {
 	const [{keywords}, dispatch] = useContext(SearchContext);
@@ -27,8 +27,9 @@ export default ({addButton, columns, totalCount}) => {
 
 	return (
 		<ClayManagementToolbar>
-			<SearchSort columns={columns} disabled={disabled} />
-			<SearchInput
+			<ManagementToolbarLeft columns={columns} disabled={disabled} />
+
+			<ManagementToolbarSearch
 				disabled={disabled}
 				onSubmit={searchText =>
 					dispatch({keywords: searchText, type: 'SEARCH'})
@@ -37,7 +38,8 @@ export default ({addButton, columns, totalCount}) => {
 				setShowMobile={setShowMobile}
 				showMobile={showMobile}
 			/>
-			<SearchBarActions
+
+			<ManagementToolbarRight
 				addButton={addButton}
 				setShowMobile={setShowMobile}
 			/>

diff --git a/...anagement-toolbar/search/SearchSort.es.js → ...ement-toolbar/ManagementToolbarLeft.es.js b/...anagement-toolbar/search/SearchSort.es.js → ...ement-toolbar/ManagementToolbarLeft.es.js
@@ -18,7 +18,7 @@ import ClayManagementToolbar from '@clayui/management-toolbar';
 import classNames from 'classnames';
 import React, {useContext, useState} from 'react';
 
-import Button from '../../../components/button/Button.es';
+import Button from '../../components/button/Button.es';
 import SearchContext from './SearchContext.es';
 
 const {Group, Item, ItemList} = ClayDropDown;

diff --git a/...olbar/search/SearchSubnavigationBar.es.js → ...toolbar/ManagementToolbarResultsBar.es.js b/...olbar/search/SearchSubnavigationBar.es.js → ...toolbar/ManagementToolbarResultsBar.es.js
@@ -15,8 +15,8 @@
 import {ClayResultsBar} from '@clayui/management-toolbar';
 import React, {useContext} from 'react';
 
-import lang from '../../../utils/lang.es';
-import Button from '../../button/Button.es';
+import lang from '../../utils/lang.es';
+import Button from '../button/Button.es';
 import SearchContext from './SearchContext.es';
 
 export default ({isLoading, totalCount}) => {

diff --git a/...ent-toolbar/search/SearchBarActions.es.js → ...ment-toolbar/ManagementToolbarRight.es.js b/...ent-toolbar/search/SearchBarActions.es.js → ...ment-toolbar/ManagementToolbarRight.es.js
@@ -17,7 +17,7 @@ import ClayIcon from '@clayui/icon';
 import ClayManagementToolbar from '@clayui/management-toolbar';
 import React from 'react';
 
-export default function SearchOptions({addButton, setShowMobile}) {
+export default ({addButton, setShowMobile}) => {
 	return (
 		<ClayManagementToolbar.ItemList>
 			<ClayManagementToolbar.Item className="navbar-breakpoint-d-none">
@@ -36,4 +36,4 @@ export default function SearchOptions({addButton, setShowMobile}) {
 			)}
 		</ClayManagementToolbar.ItemList>
 	);
-}
+};
diff --git a/...nagement-toolbar/search/SearchInput.es.js → ...gement-toolbar/ManagementToolbarSearch.js b/...nagement-toolbar/search/SearchInput.es.js → ...gement-toolbar/ManagementToolbarSearch.js
@@ -17,7 +17,7 @@ import {ClayInput} from '@clayui/form';
 import ClayManagementToolbar from '@clayui/management-toolbar';
 import React, {useEffect, useState} from 'react';
 
-const SearchInput = ({
+export default ({
 	onSubmit,
 	searchText = '',
 	setShowMobile,
@@ -68,5 +68,3 @@ const SearchInput = ({
 		</ClayManagementToolbar.Search>
 	);
 };
-
-export default SearchInput;
diff --git a/...gement-toolbar/search/SearchContext.es.js → ...ts/management-toolbar/SearchContext.es.js b/...gement-toolbar/search/SearchContext.es.js → ...ts/management-toolbar/SearchContext.es.js
diff --git a/...er-web/src/main/resources/META-INF/resources/js/components/management-toolbar/index.es.js b/...er-web/src/main/resources/META-INF/resources/js/components/management-toolbar/index.es.js
diff --git a/...r-web/src/main/resources/META-INF/resources/js/components/table/TableWithPagination.es.js b/...r-web/src/main/resources/META-INF/resources/js/components/table/TableWithPagination.es.js
@@ -16,7 +16,7 @@ import {ClayPaginationBarWithBasicItems} from '@clayui/pagination-bar';
 import React, {useContext} from 'react';
 
 import {withLoading} from '../loading/Loading.es';
-import SearchContext from '../management-toolbar/search/SearchContext.es';
+import SearchContext from '../management-toolbar/SearchContext.es';
 import {withEmpty} from './EmptyState.es';
 import Table from './Table.es';