Skip to content

Commit 8404bae

Browse files
bexsoftBenjamin Perezdvaldivia
authored
Removed unused pagination items (#470)
Removed unused pagination items, also updated dependencies of material-ui Co-authored-by: Benjamin Perez <[email protected]> Co-authored-by: Daniel Valdivia <[email protected]>
1 parent 3c0e3a1 commit 8404bae

File tree

22 files changed

+293
-1745
lines changed

22 files changed

+293
-1745
lines changed

‎portal-ui/bindata_assetfs.go‎

Lines changed: 123 additions & 123 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@babel/helper-create-regexp-features-plugin": "^7.7.4",
7-
"@babel/plugin-transform-react-jsx-development": "^7.9.0",
8-
"@hot-loader/react-dom": "^16.9.0",
6+
"@hot-loader/react-dom": "17.0.1",
97
"@material-ui/core": "^4.9.12",
108
"@material-ui/icons": "^4.9.1",
119
"@types/history": "^4.7.3",
@@ -30,14 +28,14 @@
3028
"local-storage-fallback": "^4.1.1",
3129
"lodash": "^4.17.19",
3230
"moment": "^2.24.0",
33-
"react": "17.0.0",
31+
"react": "17.0.1",
3432
"react-app-rewire-hot-loader": "^2.0.1",
3533
"react-app-rewired": "^2.1.6",
3634
"react-async-hook": "^3.6.1",
3735
"react-chartjs-2": "^2.9.0",
3836
"react-codemirror2": "^7.1.0",
3937
"react-copy-to-clipboard": "^5.0.2",
40-
"react-dom": "17.0.0",
38+
"react-dom": "17.0.1",
4139
"react-hot-loader": "^4.13.0",
4240
"react-moment": "^0.9.7",
4341
"react-redux": "^7.1.3",

‎portal-ui/src/ProtectedRoutes.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { connect } from "react-redux";
2020
import { AppState } from "./store";
2121
import { userLoggedIn } from "./actions";
2222
import api from "./common/api";
23-
import { clearSession } from "./common/utils";
2423
import { saveSessionResponse } from "./screens/Console/actions";
2524

2625
const mapState = (state: AppState) => ({

‎portal-ui/src/screens/Console/Buckets/Buckets.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

1717
import React from "react";
18-
import { createStyles, Theme } from "@material-ui/core/styles";
19-
2018
import history from "../../../history";
2119
import { Route, Router, Switch, withRouter } from "react-router-dom";
2220
import { connect } from "react-redux";

‎portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { Bucket, BucketList } from "../types";
2727
import TableWrapper from "../../Common/TableWrapper/TableWrapper";
2828
import AddBucket from "./AddBucket";
2929
import DeleteBucket from "./DeleteBucket";
30-
import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
3130
import { CreateIcon } from "../../../../icons";
3231
import { niceBytes } from "../../../../common/utils";
3332
import { AppState } from "../../../../store";
@@ -89,11 +88,8 @@ const ListBuckets = ({
8988
addBucketReset,
9089
}: IListBucketsProps) => {
9190
const [records, setRecords] = useState<Bucket[]>([]);
92-
const [totalRecords, setTotalRecords] = useState<number>(0);
9391
const [loading, setLoading] = useState<boolean>(false);
9492
const [error, setError] = useState<string>("");
95-
const [page, setPage] = useState<number>(0);
96-
const [rowsPerPage, setRowsPerPage] = useState<number>(10);
9793
const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
9894
const [selectedBucket, setSelectedBucket] = useState<string>("");
9995
const [filterBuckets, setFilterBuckets] = useState<string>("");
@@ -102,28 +98,12 @@ const ListBuckets = ({
10298
if (loading) {
10399
const fetchRecords = () => {
104100
setLoading(true);
105-
const offset = page * rowsPerPage;
106101
api
107-
.invoke(
108-
"GET",
109-
`/api/v1/buckets?offset=${offset}&limit=${rowsPerPage}`
110-
)
102+
.invoke("GET", `/api/v1/buckets`)
111103
.then((res: BucketList) => {
112104
setLoading(false);
113105
setRecords(res.buckets || []);
114-
setTotalRecords(!res.buckets ? 0 : res.total);
115106
setError("");
116-
// if we get 0 results, and page > 0 , go down 1 page
117-
if (
118-
(res.buckets === undefined ||
119-
res.buckets == null ||
120-
res.buckets.length === 0) &&
121-
page > 0
122-
) {
123-
const newPage = page - 1;
124-
setPage(newPage);
125-
setLoading(true);
126-
}
127107
})
128108
.catch((err: any) => {
129109
setLoading(false);
@@ -132,7 +112,7 @@ const ListBuckets = ({
132112
};
133113
fetchRecords();
134114
}
135-
}, [loading, page, rowsPerPage]);
115+
}, [loading]);
136116

137117
const closeAddModalAndRefresh = (refresh: boolean) => {
138118
addBucketOpen(false);
@@ -156,31 +136,18 @@ const ListBuckets = ({
156136

157137
useEffect(() => {
158138
setLoading(true);
159-
}, [page, rowsPerPage]);
139+
}, []);
160140

161141
const confirmDeleteBucket = (bucket: string) => {
162142
setDeleteOpen(true);
163143
setSelectedBucket(bucket);
164144
};
165145

166-
const handleChangePage = (event: unknown, newPage: number) => {
167-
setPage(newPage);
168-
};
169-
170-
const handleChangeRowsPerPage = (
171-
event: React.ChangeEvent<HTMLInputElement>
172-
) => {
173-
const rPP = parseInt(event.target.value, 10);
174-
setPage(0);
175-
setRowsPerPage(rPP);
176-
};
177146
const tableActions = [
178147
{ type: "view", to: `/buckets`, sendOnlyId: true },
179148
{ type: "delete", onClick: confirmDeleteBucket, sendOnlyId: true },
180149
];
181150

182-
const offset = page * rowsPerPage;
183-
184151
const displayParsedDate = (date: string) => {
185152
return <Moment>{date}</Moment>;
186153
};
@@ -197,8 +164,6 @@ const ListBuckets = ({
197164
}
198165
});
199166

200-
const showInPage = filteredRecords;
201-
202167
return (
203168
<React.Fragment>
204169
{addBucketModalOpen && (
@@ -271,7 +236,7 @@ const ListBuckets = ({
271236
},
272237
]}
273238
isLoading={loading}
274-
records={showInPage}
239+
records={filteredRecords}
275240
entityName="Buckets"
276241
idField="name"
277242
/>

‎portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/DeleteTagModal.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
// This file is part of MinIO Console Server
2+
// Copyright (c) 2020 MinIO, Inc.
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Affero General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Affero General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Affero General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
117
import React, { useState } from "react";
218
import {
319
Button,

‎portal-ui/src/screens/Console/Buckets/ViewBucket/ViewBucket.tsx‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import {
3737
} from "../types";
3838
import { Button } from "@material-ui/core";
3939
import SetAccessPolicy from "./SetAccessPolicy";
40-
import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
4140
import { CreateIcon } from "../../../../icons";
4241
import AddEvent from "./AddEvent";
4342
import DeleteEvent from "./DeleteEvent";
@@ -181,16 +180,13 @@ interface IViewBucketState {
181180
info: BucketInfo | null;
182181
records: BucketEvent[];
183182
replicationRules: BucketReplicationRule[];
184-
totalRecords: number;
185183
loadingBucket: boolean;
186184
loadingEvents: boolean;
187185
loadingSize: boolean;
188186
error: string;
189187
deleteError: string;
190188
errBucket: string;
191189
setAccessPolicyScreenOpen: boolean;
192-
page: number;
193-
rowsPerPage: number;
194190
curTab: number;
195191
addScreenOpen: boolean;
196192
enableEncryptionScreenOpen: boolean;
@@ -210,17 +206,14 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
210206
info: null,
211207
records: [],
212208
replicationRules: [],
213-
totalRecords: 0,
214209
loadingBucket: true,
215210
loadingEvents: true,
216211
loadingSize: true,
217212
error: "",
218213
deleteError: "",
219214
errBucket: "",
220215
setAccessPolicyScreenOpen: false,
221-
page: 0,
222216
curTab: 0,
223-
rowsPerPage: 10,
224217
addScreenOpen: false,
225218
enableEncryptionScreenOpen: false,
226219
deleteOpen: false,
@@ -236,28 +229,18 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
236229

237230
fetchEvents() {
238231
this.setState({ loadingBucket: true }, () => {
239-
const { page } = this.state;
240232
const { match } = this.props;
241233
const bucketName = match.params["bucketName"];
242234
api
243235
.invoke("GET", `/api/v1/buckets/${bucketName}/events`)
244236
.then((res: BucketEventList) => {
245237
const events = get(res, "events", []);
246-
const total = get(res, "total", 0);
247238

248239
this.setState({
249240
loadingEvents: false,
250241
records: events || [],
251-
totalRecords: total,
252242
error: "",
253243
});
254-
// if we get 0 results, and page > 0 , go down 1 page
255-
if ((!events || res.events.length === 0) && page > 0) {
256-
const newPage = page - 1;
257-
this.setState({ page: newPage }, () => {
258-
this.fetchEvents();
259-
});
260-
}
261244
})
262245
.catch((err: any) => {
263246
this.setState({ loadingEvents: false, error: err });
@@ -374,12 +357,9 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
374357
const {
375358
info,
376359
records,
377-
totalRecords,
378360
setAccessPolicyScreenOpen,
379361
loadingEvents,
380362
loadingBucket,
381-
page,
382-
rowsPerPage,
383363
deleteOpen,
384364
addScreenOpen,
385365
enableEncryptionScreenOpen,
@@ -393,21 +373,8 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
393373
encryptionEnabled,
394374
} = this.state;
395375

396-
const offset = page * rowsPerPage;
397-
398376
const bucketName = match.params["bucketName"];
399377

400-
const handleChangePage = (event: unknown, newPage: number) => {
401-
this.setState({ page: newPage });
402-
};
403-
404-
const handleChangeRowsPerPage = (
405-
event: React.ChangeEvent<HTMLInputElement>
406-
) => {
407-
const rPP = parseInt(event.target.value, 10);
408-
this.setState({ page: 0, rowsPerPage: rPP });
409-
};
410-
411378
const confirmDeleteEvent = (evnt: BucketEvent) => {
412379
this.setState({ deleteOpen: true, selectedEvent: evnt });
413380
};
@@ -457,9 +424,6 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
457424

458425
const tableActions = [{ type: "delete", onClick: confirmDeleteEvent }];
459426

460-
const filteredRecords = records.slice(offset, offset + rowsPerPage);
461-
const filteredRules = replicationRules.slice(offset, offset + rowsPerPage);
462-
463427
return (
464428
<React.Fragment>
465429
{addScreenOpen && (
@@ -639,7 +603,7 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
639603
{ label: "Suffix", elementKey: "suffix" },
640604
]}
641605
isLoading={loadingEvents}
642-
records={filteredRecords}
606+
records={records}
643607
entityName="Events"
644608
idField="id"
645609
/>
@@ -666,7 +630,7 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
666630
{ label: "Status", elementKey: "status" },
667631
]}
668632
isLoading={loadingEvents}
669-
records={filteredRules}
633+
records={replicationRules}
670634
entityName="Replication Rules"
671635
idField="id"
672636
/>

‎portal-ui/src/screens/Console/Console.tsx‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// You should have received a copy of the GNU Affero General Public License
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
import React, { useEffect } from "react";
17+
import React from "react";
1818
import clsx from "clsx";
1919
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
2020
import CssBaseline from "@material-ui/core/CssBaseline";
@@ -31,7 +31,6 @@ import {
3131
} from "../../actions";
3232
import Buckets from "./Buckets/Buckets";
3333
import Policies from "./Policies/Policies";
34-
import Permissions from "./Permissions/Permissions";
3534
import Dashboard from "./Dashboard/Dashboard";
3635
import Menu from "./Menu/Menu";
3736
import api from "../../common/api";
@@ -46,8 +45,6 @@ import ListTenants from "./Tenants/ListTenants/ListTenants";
4645
import { ISessionResponse } from "./types";
4746
import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
4847
import ObjectBrowser from "./ObjectBrowser/ObjectBrowser";
49-
import ListObjects from "./Buckets/ListBuckets/Objects/ListObjects/ListObjects";
50-
import ObjectDetails from "./Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails";
5148
import ObjectRouting from "./Buckets/ListBuckets/Objects/ListObjects/ObjectRouting";
5249
import License from "./License/License";
5350

@@ -239,10 +236,6 @@ const Console = ({
239236
component: ConfigurationsList,
240237
path: "/configurations-list",
241238
},
242-
{
243-
component: Permissions,
244-
path: "/permissions",
245-
},
246239
{
247240
component: ServiceAccounts,
248241
path: "/service-accounts",

0 commit comments

Comments
 (0)