From e911d9e4b4236797a30915056675ec0f414b17f5 Mon Sep 17 00:00:00 2001
From: Matheus Veleci <matheusveleci@aluno.unb.br>
Date: Thu, 1 Jun 2017 14:23:39 -0300
Subject: [PATCH 1/5] Create a generic name for search and page size label
---
src/PartialTable.js | 7 ++++---
src/dataReducer.js | 2 ++
src/enhanceDataTable.js | 4 ++++
src/types.js | 2 ++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/PartialTable.js b/src/PartialTable.js
index c358e81..f32a4db 100644
--- a/src/PartialTable.js
+++ b/src/PartialTable.js
@@ -7,7 +7,8 @@ export default class PartialTable extends Component {
render() {
const {
onFilter, onPageSizeChange, onPageNumberChange, onSort,
- pageLengthOptions, columns, keys, buildRowOptions,
+ pageLengthOptions, columns, keys, searchText
+ pageSizeText, buildRowOptions,
} = this.props;
const {
@@ -20,7 +21,7 @@ export default class PartialTable extends Component {
<div className="row">
<div className="col-xs-4">
<div>
- <label htmlFor="page-menu">Page size:</label>
+ <label htmlFor="page-menu">{searchText}:</label>
<select
id="page-menu"
value={pageSize}
@@ -34,7 +35,7 @@ export default class PartialTable extends Component {
</select>
</div>
<div>
- <label htmlFor="search-field">Search:</label>
+ <label htmlFor="search-field">{pageSizeText}:</label>
<input
id="search-field"
type="search"
diff --git a/src/dataReducer.js b/src/dataReducer.js
index 0dd1e18..8ee089a 100644
--- a/src/dataReducer.js
+++ b/src/dataReducer.js
@@ -15,6 +15,8 @@ const initialState: State = {
sortBy: null,
pageNumber: 0,
pageSize: 5,
+ searchText: "Search",
+ pageSizeText: "Page size",
};
function calculatePage(data, pageSize, pageNumber) {
diff --git a/src/enhanceDataTable.js b/src/enhanceDataTable.js
index 241f9e9..ddb1561 100644
--- a/src/enhanceDataTable.js
+++ b/src/enhanceDataTable.js
@@ -15,6 +15,8 @@ type Props = {
keys: Array<string>;
buildRowOptions: any;
filters: any;
+ searchText: string;
+ pageSizeText: string;
};
const mapPropsToState = (props) => ({
@@ -30,6 +32,8 @@ export default function enhanceDataTable(ComposedComponent) {
filters: {
globalSearch: { filter: containsIgnoreCase },
},
+ searchText: "Search",
+ pageSizeText: "Page size",
};
constructor(props: Props) {
diff --git a/src/types.js b/src/types.js
index 2b9ba86..37b5594 100644
--- a/src/types.js
+++ b/src/types.js
@@ -24,6 +24,8 @@ export type State = {
pageSize: number;
pageNumber: number;
totalPages: number;
+ searchText: string;
+ pageSizeText: string;
filterValues: {
[key: string]: string;
};
From d132184cf52750097f7df25e52aa2634df0bb844 Mon Sep 17 00:00:00 2001
From: Matheus Veleci <matheusveleci@aluno.unb.br>
Date: Thu, 1 Jun 2017 14:31:23 -0300
Subject: [PATCH 2/5] Update files
---
example/table/main.js | 2 ++
src/PartialTable.js | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/example/table/main.js b/example/table/main.js
index 6123f9c..cc59ad3 100644
--- a/example/table/main.js
+++ b/example/table/main.js
@@ -26,6 +26,8 @@ function buildTable(data) {
initialPageLength={5}
initialSortBy={{ prop: 'city', order: 'descending' }}
pageLengthOptions={[ 5, 20, 50 ]}
+ searchText="Buscar"
+ pageSizeText="Paginação"
/>
);
}
diff --git a/src/PartialTable.js b/src/PartialTable.js
index f32a4db..2b1dc03 100644
--- a/src/PartialTable.js
+++ b/src/PartialTable.js
@@ -7,7 +7,7 @@ export default class PartialTable extends Component {
render() {
const {
onFilter, onPageSizeChange, onPageNumberChange, onSort,
- pageLengthOptions, columns, keys, searchText
+ pageLengthOptions, columns, keys, searchText,
pageSizeText, buildRowOptions,
} = this.props;
@@ -21,7 +21,7 @@ export default class PartialTable extends Component {
<div className="row">
<div className="col-xs-4">
<div>
- <label htmlFor="page-menu">{searchText}:</label>
+ <label htmlFor="page-menu">{pageSizeText}:</label>
<select
id="page-menu"
value={pageSize}
@@ -35,7 +35,7 @@ export default class PartialTable extends Component {
</select>
</div>
<div>
- <label htmlFor="search-field">{pageSizeText}:</label>
+ <label htmlFor="search-field">{searchText}:</label>
<input
id="search-field"
type="search"
From 27ffab85aaeca85e281eedbd40f8265420095fb1 Mon Sep 17 00:00:00 2001
From: Matheus Veleci dos Santos <matheusveleci@aluno.unb.br>
Date: Thu, 1 Jun 2017 14:39:41 -0300
Subject: [PATCH 3/5] Update example
---
example/table/main.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/table/main.js b/example/table/main.js
index cc59ad3..1e9a6db 100644
--- a/example/table/main.js
+++ b/example/table/main.js
@@ -26,8 +26,8 @@ function buildTable(data) {
initialPageLength={5}
initialSortBy={{ prop: 'city', order: 'descending' }}
pageLengthOptions={[ 5, 20, 50 ]}
- searchText="Buscar"
- pageSizeText="Paginação"
+ searchText="Search Everything"
+ pageSizeText="Per page"
/>
);
}
From 4904c72c3eb0b5a5e368f9a329833f639622077f Mon Sep 17 00:00:00 2001
From: Matheus Veleci <matheusveleci@aluno.unb.br>
Date: Thu, 1 Jun 2017 14:47:48 -0300
Subject: [PATCH 4/5] Fix strings for single quotes
---
example/table/main.js | 4 ++--
src/dataReducer.js | 4 ++--
src/enhanceDataTable.js | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/example/table/main.js b/example/table/main.js
index cc59ad3..c4e131f 100644
--- a/example/table/main.js
+++ b/example/table/main.js
@@ -26,8 +26,8 @@ function buildTable(data) {
initialPageLength={5}
initialSortBy={{ prop: 'city', order: 'descending' }}
pageLengthOptions={[ 5, 20, 50 ]}
- searchText="Buscar"
- pageSizeText="Paginação"
+ searchText='Search Everything'
+ pageSizeText='Per page'
/>
);
}
diff --git a/src/dataReducer.js b/src/dataReducer.js
index 8ee089a..823f5b6 100644
--- a/src/dataReducer.js
+++ b/src/dataReducer.js
@@ -15,8 +15,8 @@ const initialState: State = {
sortBy: null,
pageNumber: 0,
pageSize: 5,
- searchText: "Search",
- pageSizeText: "Page size",
+ searchText: 'Search',
+ pageSizeText: 'Page size',
};
function calculatePage(data, pageSize, pageNumber) {
diff --git a/src/enhanceDataTable.js b/src/enhanceDataTable.js
index ddb1561..da71d19 100644
--- a/src/enhanceDataTable.js
+++ b/src/enhanceDataTable.js
@@ -32,8 +32,8 @@ export default function enhanceDataTable(ComposedComponent) {
filters: {
globalSearch: { filter: containsIgnoreCase },
},
- searchText: "Search",
- pageSizeText: "Page size",
+ searchText: 'Search',
+ pageSizeText: 'Page size',
};
constructor(props: Props) {
From 0e735b2054e76504a7ec986cf653246511ba2a2a Mon Sep 17 00:00:00 2001
From: Matheus Veleci <matheusveleci@aluno.unb.br>
Date: Thu, 1 Jun 2017 14:57:49 -0300
Subject: [PATCH 5/5] Update dataReducer-test.js for new initial states
---
src/__tests__/dataReducer-test.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/__tests__/dataReducer-test.js b/src/__tests__/dataReducer-test.js
index e19dc1d..0866bfc 100644
--- a/src/__tests__/dataReducer-test.js
+++ b/src/__tests__/dataReducer-test.js
@@ -24,6 +24,8 @@ describe('dataReducer', () => {
pageNumber: 0,
pageSize: 5,
totalPages: 1,
+ searchText: 'Search',
+ pageSizeText: 'Page size',
};
expect(dataReducer(undefined, action)).toEqual(expected);