Skip to content

Commit 9a2b322

Browse files
dechdevdechdev
authored
Merge pull request #218 from kaleido-io/remove-timepickers
[remove-timepickers]
2 parents b9ab254 + 0661a50 commit 9a2b322

8 files changed

Lines changed: 30 additions & 53 deletions

File tree

‎src/pages/Blockchain/views/Apis.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { ApiSlide } from '../../../components/Slides/ApiSlide';
2828
import { FFTableText } from '../../../components/Tables/FFTableText';
2929
import { DataTable } from '../../../components/Tables/Table';
3030
import { ApplicationContext } from '../../../contexts/ApplicationContext';
31-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
3231
import { FilterContext } from '../../../contexts/FilterContext';
3332
import { SlideContext } from '../../../contexts/SlideContext';
3433
import { SnackbarContext } from '../../../contexts/SnackbarContext';
@@ -46,7 +45,6 @@ import { hasApiEvent } from '../../../utils/wsEvents';
4645
export const BlockchainApis: () => JSX.Element = () => {
4746
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
4847
useContext(ApplicationContext);
49-
const { dateFilter } = useContext(DateFilterContext);
5048
const { filterAnchor, setFilterAnchor, filterString } =
5149
useContext(FilterContext);
5250
const { setSlideSearchParam, slideID } = useContext(SlideContext);
@@ -88,13 +86,12 @@ export const BlockchainApis: () => JSX.Element = () => {
8886
// APIs
8987
useEffect(() => {
9088
isMounted &&
91-
dateFilter &&
9289
fetchCatcher(
9390
`${FF_Paths.nsPrefix}/${selectedNamespace}${
9491
FF_Paths.apis
9592
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
96-
dateFilter.filterString
97-
}${filterString ?? ''}`
93+
filterString ?? ''
94+
}`
9895
)
9996
.then((apis: IPagedFireFlyApiResponse) => {
10097
if (isMounted) {
@@ -109,7 +106,6 @@ export const BlockchainApis: () => JSX.Element = () => {
109106
rowsPerPage,
110107
currentPage,
111108
selectedNamespace,
112-
dateFilter,
113109
filterString,
114110
lastRefreshTime,
115111
isMounted,
@@ -187,6 +183,7 @@ export const BlockchainApis: () => JSX.Element = () => {
187183
subtitle={t('blockchain')}
188184
showRefreshBtn={hasApiEvent(newEvents)}
189185
onRefresh={clearNewEvents}
186+
noDateFilter
190187
></Header>
191188
<FFPageLayout>
192189
<DataTable

‎src/pages/Blockchain/views/Interfaces.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ import { InterfaceSlide } from '../../../components/Slides/InterfaceSlide';
2525
import { FFTableText } from '../../../components/Tables/FFTableText';
2626
import { DataTable } from '../../../components/Tables/Table';
2727
import { ApplicationContext } from '../../../contexts/ApplicationContext';
28-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
2928
import { FilterContext } from '../../../contexts/FilterContext';
3029
import { SlideContext } from '../../../contexts/SlideContext';
3130
import { SnackbarContext } from '../../../contexts/SnackbarContext';
3231
import {
3332
FF_Paths,
3433
IContractInterface,
3534
IDataTableRecord,
36-
InterfaceFilters,
3735
IPagedContractInterfaceResponse,
36+
InterfaceFilters,
3837
} from '../../../interfaces';
3938
import { DEFAULT_PAGE_LIMITS } from '../../../theme';
4039
import { fetchCatcher } from '../../../utils';
@@ -43,7 +42,6 @@ import { hasInterfaceEvent } from '../../../utils/wsEvents';
4342
export const BlockchainInterfaces: () => JSX.Element = () => {
4443
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
4544
useContext(ApplicationContext);
46-
const { dateFilter } = useContext(DateFilterContext);
4745
const { filterAnchor, setFilterAnchor, filterString } =
4846
useContext(FilterContext);
4947
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -87,13 +85,12 @@ export const BlockchainInterfaces: () => JSX.Element = () => {
8785
// Interfaces
8886
useEffect(() => {
8987
isMounted &&
90-
dateFilter &&
9188
fetchCatcher(
9289
`${FF_Paths.nsPrefix}/${selectedNamespace}${
9390
FF_Paths.contractInterfaces
9491
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
95-
dateFilter.filterString
96-
}${filterString ?? ''}`
92+
filterString ?? ''
93+
}`
9794
)
9895
.then((interfaceRes: IPagedContractInterfaceResponse) => {
9996
if (isMounted) {
@@ -108,7 +105,6 @@ export const BlockchainInterfaces: () => JSX.Element = () => {
108105
rowsPerPage,
109106
currentPage,
110107
selectedNamespace,
111-
dateFilter,
112108
filterString,
113109
lastRefreshTime,
114110
isMounted,
@@ -160,6 +156,7 @@ export const BlockchainInterfaces: () => JSX.Element = () => {
160156
subtitle={t('blockchain')}
161157
showRefreshBtn={hasInterfaceEvent(newEvents)}
162158
onRefresh={clearNewEvents}
159+
noDateFilter
163160
></Header>
164161
<FFPageLayout>
165162
<DataTable

‎src/pages/Blockchain/views/Listeners.tsx‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { ListenerSlide } from '../../../components/Slides/ListenerSlide';
2525
import { FFTableText } from '../../../components/Tables/FFTableText';
2626
import { DataTable } from '../../../components/Tables/Table';
2727
import { ApplicationContext } from '../../../contexts/ApplicationContext';
28-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
2928
import { FilterContext } from '../../../contexts/FilterContext';
3029
import { SlideContext } from '../../../contexts/SlideContext';
3130
import { SnackbarContext } from '../../../contexts/SnackbarContext';
@@ -41,7 +40,6 @@ import { fetchCatcher, getFFTime } from '../../../utils';
4140

4241
export const BlockchainListeners: () => JSX.Element = () => {
4342
const { selectedNamespace } = useContext(ApplicationContext);
44-
const { dateFilter } = useContext(DateFilterContext);
4543
const { filterAnchor, setFilterAnchor, filterString } =
4644
useContext(FilterContext);
4745
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -85,13 +83,12 @@ export const BlockchainListeners: () => JSX.Element = () => {
8583
// Listeners
8684
useEffect(() => {
8785
isMounted &&
88-
dateFilter &&
8986
fetchCatcher(
9087
`${FF_Paths.nsPrefix}/${selectedNamespace}${
9188
FF_Paths.contractListeners
9289
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
93-
dateFilter.filterString
94-
}${filterString ?? ''}`
90+
filterString ?? ''
91+
}`
9592
)
9693
.then((listeners: IPagedContractListenerResponse) => {
9794
if (isMounted) {
@@ -102,14 +99,7 @@ export const BlockchainListeners: () => JSX.Element = () => {
10299
.catch((err) => {
103100
reportFetchError(err);
104101
});
105-
}, [
106-
rowsPerPage,
107-
currentPage,
108-
selectedNamespace,
109-
dateFilter,
110-
filterString,
111-
isMounted,
112-
]);
102+
}, [rowsPerPage, currentPage, selectedNamespace, filterString, isMounted]);
113103

114104
const listenerColHeaders = [
115105
t('eventName'),
@@ -165,7 +155,11 @@ export const BlockchainListeners: () => JSX.Element = () => {
165155

166156
return (
167157
<>
168-
<Header title={t('listeners')} subtitle={t('blockchain')}></Header>
158+
<Header
159+
title={t('listeners')}
160+
subtitle={t('blockchain')}
161+
noDateFilter
162+
></Header>
169163
<FFPageLayout>
170164
<DataTable
171165
onHandleCurrPageChange={(currentPage: number) =>

‎src/pages/Off-Chain/views/Batches.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { BatchSlide } from '../../../components/Slides/BatchSlide';
2626
import { FFTableText } from '../../../components/Tables/FFTableText';
2727
import { DataTable } from '../../../components/Tables/Table';
2828
import { ApplicationContext } from '../../../contexts/ApplicationContext';
29-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
3029
import { FilterContext } from '../../../contexts/FilterContext';
3130
import { SlideContext } from '../../../contexts/SlideContext';
3231
import { SnackbarContext } from '../../../contexts/SnackbarContext';
@@ -44,7 +43,6 @@ import { hasDataEvent } from '../../../utils/wsEvents';
4443
export const OffChainBatches: () => JSX.Element = () => {
4544
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
4645
useContext(ApplicationContext);
47-
const { dateFilter } = useContext(DateFilterContext);
4846
const { filterAnchor, setFilterAnchor, filterString } =
4947
useContext(FilterContext);
5048
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -86,13 +84,12 @@ export const OffChainBatches: () => JSX.Element = () => {
8684
// Batch
8785
useEffect(() => {
8886
isMounted &&
89-
dateFilter &&
9087
fetchCatcher(
9188
`${FF_Paths.nsPrefix}/${selectedNamespace}${
9289
FF_Paths.batches
9390
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
94-
dateFilter.filterString
95-
}${filterString ?? ''}`
91+
filterString ?? ''
92+
}`
9693
)
9794
.then((batchRes: IPagedBatchResponse) => {
9895
if (isMounted) {
@@ -107,7 +104,6 @@ export const OffChainBatches: () => JSX.Element = () => {
107104
rowsPerPage,
108105
currentPage,
109106
selectedNamespace,
110-
dateFilter,
111107
filterString,
112108
lastRefreshTime,
113109
isMounted,
@@ -170,6 +166,7 @@ export const OffChainBatches: () => JSX.Element = () => {
170166
subtitle={t('offChain')}
171167
showRefreshBtn={hasDataEvent(newEvents)}
172168
onRefresh={clearNewEvents}
169+
noDateFilter
173170
></Header>
174171
<FFPageLayout>
175172
<DataTable

‎src/pages/Off-Chain/views/Data.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17+
import prettyBytes from 'pretty-bytes';
1718
import React, { useContext, useEffect, useState } from 'react';
1819
import { useTranslation } from 'react-i18next';
1920
import { DownloadButton } from '../../../components/Buttons/DownloadButton';
@@ -26,11 +27,9 @@ import { DataSlide } from '../../../components/Slides/DataSlide';
2627
import { FFTableText } from '../../../components/Tables/FFTableText';
2728
import { DataTable } from '../../../components/Tables/Table';
2829
import { ApplicationContext } from '../../../contexts/ApplicationContext';
29-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
3030
import { FilterContext } from '../../../contexts/FilterContext';
3131
import { SlideContext } from '../../../contexts/SlideContext';
3232
import { SnackbarContext } from '../../../contexts/SnackbarContext';
33-
import prettyBytes from 'pretty-bytes';
3433
import {
3534
DataFilters,
3635
FF_Paths,
@@ -45,7 +44,6 @@ import { hasDataEvent } from '../../../utils/wsEvents';
4544
export const OffChainData: () => JSX.Element = () => {
4645
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
4746
useContext(ApplicationContext);
48-
const { dateFilter } = useContext(DateFilterContext);
4947
const { filterAnchor, setFilterAnchor, filterString } =
5048
useContext(FilterContext);
5149
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -85,13 +83,12 @@ export const OffChainData: () => JSX.Element = () => {
8583
// Data
8684
useEffect(() => {
8785
isMounted &&
88-
dateFilter &&
8986
fetchCatcher(
9087
`${FF_Paths.nsPrefix}/${selectedNamespace}${
9188
FF_Paths.data
9289
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
93-
dateFilter.filterString
94-
}${filterString ?? ''}`
90+
filterString ?? ''
91+
}`
9592
)
9693
.then((dataRes: IPagedDataResponse) => {
9794
if (isMounted) {
@@ -106,7 +103,6 @@ export const OffChainData: () => JSX.Element = () => {
106103
rowsPerPage,
107104
currentPage,
108105
selectedNamespace,
109-
dateFilter,
110106
filterString,
111107
lastRefreshTime,
112108
isMounted,
@@ -181,6 +177,7 @@ export const OffChainData: () => JSX.Element = () => {
181177
subtitle={t('offChain')}
182178
showRefreshBtn={hasDataEvent(newEvents)}
183179
onRefresh={clearNewEvents}
180+
noDateFilter
184181
></Header>
185182
<FFPageLayout>
186183
<DataTable

‎src/pages/Off-Chain/views/Groups.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ export const OffChainGroups: () => JSX.Element = () => {
174174
subtitle={t('offChain')}
175175
showRefreshBtn={hasOffchainEvent(newEvents)}
176176
onRefresh={clearNewEvents}
177+
noDateFilter
177178
></Header>
178179
<FFPageLayout>
179180
<DataTable

‎src/pages/Tokens/views/Approvals.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { ApprovalSlide } from '../../../components/Slides/ApprovalSlide';
2525
import { FFTableText } from '../../../components/Tables/FFTableText';
2626
import { DataTable } from '../../../components/Tables/Table';
2727
import { ApplicationContext } from '../../../contexts/ApplicationContext';
28-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
2928
import { FilterContext } from '../../../contexts/FilterContext';
3029
import { PoolContext } from '../../../contexts/PoolContext';
3130
import { SlideContext } from '../../../contexts/SlideContext';
@@ -50,7 +49,6 @@ import { hasApprovalEvent } from '../../../utils/wsEvents';
5049
export const TokensApprovals: () => JSX.Element = () => {
5150
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
5251
useContext(ApplicationContext);
53-
const { dateFilter } = useContext(DateFilterContext);
5452
const { filterAnchor, setFilterAnchor, filterString } =
5553
useContext(FilterContext);
5654
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -106,13 +104,12 @@ export const TokensApprovals: () => JSX.Element = () => {
106104
useEffect(() => {
107105
setTokenApprovals(undefined);
108106
isMounted &&
109-
dateFilter &&
110107
fetchCatcher(
111108
`${FF_Paths.nsPrefix}/${selectedNamespace}${
112109
FF_Paths.tokenApprovals
113-
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
114-
dateFilter.filterString
115-
}${filterString ?? ''}`
110+
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}$${
111+
filterString ?? ''
112+
}`
116113
)
117114
.then(async (tokenApprovalRes: IPagedTokenApprovalResponse) => {
118115
setTokenApprovalsTotal(tokenApprovalRes.total);
@@ -144,7 +141,6 @@ export const TokensApprovals: () => JSX.Element = () => {
144141
rowsPerPage,
145142
currentPage,
146143
selectedNamespace,
147-
dateFilter,
148144
filterString,
149145
lastRefreshTime,
150146
isMounted,
@@ -214,6 +210,7 @@ export const TokensApprovals: () => JSX.Element = () => {
214210
subtitle={t('tokens')}
215211
showRefreshBtn={hasApprovalEvent(newEvents)}
216212
onRefresh={clearNewEvents}
213+
noDateFilter
217214
></Header>
218215
<FFPageLayout>
219216
<DataTable

‎src/pages/Tokens/views/Balances.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { BalanceSlide } from '../../../components/Slides/BalanceSlide';
2525
import { FFTableText } from '../../../components/Tables/FFTableText';
2626
import { DataTable } from '../../../components/Tables/Table';
2727
import { ApplicationContext } from '../../../contexts/ApplicationContext';
28-
import { DateFilterContext } from '../../../contexts/DateFilterContext';
2928
import { FilterContext } from '../../../contexts/FilterContext';
3029
import { PoolContext } from '../../../contexts/PoolContext';
3130
import { SlideContext } from '../../../contexts/SlideContext';
@@ -53,7 +52,6 @@ export const KEY_POOL_DELIM = '||';
5352
export const TokensBalances: () => JSX.Element = () => {
5453
const { newEvents, lastRefreshTime, clearNewEvents, selectedNamespace } =
5554
useContext(ApplicationContext);
56-
const { dateFilter } = useContext(DateFilterContext);
5755
const { filterAnchor, setFilterAnchor, filterString } =
5856
useContext(FilterContext);
5957
const { slideID, setSlideSearchParam } = useContext(SlideContext);
@@ -115,13 +113,12 @@ export const TokensBalances: () => JSX.Element = () => {
115113
useEffect(() => {
116114
setTokenBalances(undefined);
117115
isMounted &&
118-
dateFilter &&
119116
fetchCatcher(
120117
`${FF_Paths.nsPrefix}/${selectedNamespace}${
121118
FF_Paths.tokenBalances
122119
}?limit=${rowsPerPage}&count&skip=${rowsPerPage * currentPage}${
123-
dateFilter.filterString
124-
}${filterString ?? ''}`
120+
filterString ?? ''
121+
}`
125122
)
126123
.then(async (tokenBalancesRes: IPagedTokenBalanceResponse) => {
127124
setTokenBalancesTotal(tokenBalancesRes.total);
@@ -150,7 +147,6 @@ export const TokensBalances: () => JSX.Element = () => {
150147
rowsPerPage,
151148
currentPage,
152149
selectedNamespace,
153-
dateFilter,
154150
filterString,
155151
lastRefreshTime,
156152
isMounted,
@@ -239,6 +235,7 @@ export const TokensBalances: () => JSX.Element = () => {
239235
<Header
240236
title={t('balances')}
241237
subtitle={t('tokens')}
238+
noDateFilter
242239
showRefreshBtn={hasTransferEvent(newEvents)}
243240
onRefresh={clearNewEvents}
244241
></Header>

0 commit comments

Comments
 (0)