Skip to content

Commit 81456cb

Browse files
committed
Fix all react warnings
1 parent d582cc9 commit 81456cb

File tree

18 files changed

+262
-214
lines changed

18 files changed

+262
-214
lines changed

portal-ui/bindata_assetfs.go

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

portal-ui/src/ProtectedRoutes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const ProtectedRoute = ({
6363
}
6464
})
6565
.catch(() => setSessionLoading(false));
66-
}, [saveSessionResponse]);
66+
}, [saveSessionResponse, consoleOperatorMode, userLoggedIn]);
6767

6868
// if we still trying to retrieve user session render nothing
6969
if (sessionLoading) {

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

Lines changed: 25 additions & 27 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, { useState, useEffect } from "react";
17+
import React, { useEffect, useState } from "react";
1818
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
1919
import Grid from "@material-ui/core/Grid";
2020
import TextField from "@material-ui/core/TextField";
@@ -33,7 +33,6 @@ import {
3333
searchField,
3434
} from "../../../../Common/FormComponents/common/styleLibrary";
3535
import PageHeader from "../../../../Common/PageHeader/PageHeader";
36-
import storage from "local-storage-fallback";
3736
import { isNullOrUndefined } from "util";
3837
import { Button, Input } from "@material-ui/core";
3938
import * as reactMoment from "react-moment";
@@ -166,6 +165,29 @@ const ListObjects = ({
166165
const bucketName = match.params["bucket"];
167166
const internalPaths = match.params[0];
168167

168+
const verifyIfIsFile = () => {
169+
const bucketName = match.params["bucket"];
170+
const internalPaths = match.params[0];
171+
172+
api
173+
.invoke(
174+
"GET",
175+
`/api/v1/buckets/${bucketName}/objects?prefix=${internalPaths}`
176+
)
177+
.then((res: BucketObjectsList) => {
178+
//It is a file since it has elements in the object, setting file flag and waiting for component mount
179+
if (res.objects !== null) {
180+
setLastAsFile();
181+
} else {
182+
// It is a folder, we remove loader
183+
setLoading(false);
184+
}
185+
})
186+
.catch((err: any) => {
187+
setLoading(false);
188+
});
189+
};
190+
169191
let extraPath = "";
170192
if (internalPaths) {
171193
extraPath = `?prefix=${internalPaths}/`;
@@ -186,7 +208,7 @@ const ListObjects = ({
186208
.catch((err: any) => {
187209
setLoading(false);
188210
});
189-
}, [loading, match]);
211+
}, [loading, match, setLastAsFile]);
190212

191213
useEffect(() => {
192214
const url = get(match, "url", "/object-browser");
@@ -195,29 +217,6 @@ const ListObjects = ({
195217
}
196218
}, [match, routesList, setAllRoutes]);
197219

198-
const verifyIfIsFile = () => {
199-
const bucketName = match.params["bucket"];
200-
const internalPaths = match.params[0];
201-
202-
api
203-
.invoke(
204-
"GET",
205-
`/api/v1/buckets/${bucketName}/objects?prefix=${internalPaths}`
206-
)
207-
.then((res: BucketObjectsList) => {
208-
//It is a file since it has elements in the object, setting file flag and waiting for component mount
209-
if (res.objects !== null) {
210-
setLastAsFile();
211-
} else {
212-
// It is a folder, we remove loader
213-
setLoading(false);
214-
}
215-
})
216-
.catch((err: any) => {
217-
setLoading(false);
218-
});
219-
};
220-
221220
const closeDeleteModalAndRefresh = (refresh: boolean) => {
222221
setDeleteOpen(false);
223222

@@ -245,7 +244,6 @@ const ListObjects = ({
245244
if (isNullOrUndefined(e) || isNullOrUndefined(e.target)) {
246245
return;
247246
}
248-
const token: string = storage.getItem("token")!;
249247
e.preventDefault();
250248
let file = e.target.files[0];
251249
const fileName = file.name;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ const ObjectDetails = ({
194194
setLoadObjectData(false);
195195
});
196196
}
197-
}, [loadObjectData]);
197+
}, [loadObjectData, bucketName, pathInBucket]);
198198

199199
let tagKeys: string[] = [];
200200

@@ -341,6 +341,11 @@ const ObjectDetails = ({
341341
)}
342342
<Grid container>
343343
<Grid item xs={12} className={classes.container}>
344+
{error !== "" && (
345+
<Grid item xs={12}>
346+
{error}
347+
</Grid>
348+
)}
344349
<Grid item xs={12} className={classes.obTitleSection}>
345350
<div>
346351
<BrowserBreadcrumbs />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const SetLegalHoldModal = ({
5050
useEffect(() => {
5151
const status = get(actualInfo, "legal_hold_status", "OFF");
5252
setLegalHoldEnabled(status === "ON");
53-
}, []);
53+
}, [actualInfo]);
5454

5555
const onSubmit = (e: React.FormEvent) => {
5656
e.preventDefault();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const SetRetention = ({
7777
setType(objectInfo.retention_mode.toLowerCase());
7878
setAlreadyConfigured(true);
7979
}
80-
}, []);
80+
}, [objectInfo]);
8181

8282
const dateElement = useRef<IRefObject>(null);
8383

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ const ShareFile = ({
4242
bucketName,
4343
dataObject,
4444
}: IShareFileProps) => {
45-
const [shareURL, setShareURL] = useState("");
46-
const [isLoadingFile, setIsLoadingFile] = useState(false);
47-
const [error, setError] = useState("");
48-
const [selectedDate, setSelectedDate] = useState("");
49-
const [dateValid, setDateValid] = useState(true);
50-
const [openSnack, setOpenSnack] = useState(false);
51-
const [snackBarMessage, setSnackbarMessage] = useState("");
45+
const [shareURL, setShareURL] = useState<string>("");
46+
const [isLoadingFile, setIsLoadingFile] = useState<boolean>(false);
47+
const [error, setError] = useState<string>("");
48+
const [selectedDate, setSelectedDate] = useState<string>("");
49+
const [dateValid, setDateValid] = useState<boolean>(true);
50+
const [openSnack, setOpenSnack] = useState<boolean>(false);
51+
const [snackBarMessage, setSnackbarMessage] = useState<string>("");
5252

5353
const showSnackBarMessage = (text: string) => {
5454
setSnackbarMessage(text);
@@ -66,13 +66,13 @@ const ShareFile = ({
6666
setSelectedDate(newDate);
6767
return;
6868
}
69-
setShareURL("");
7069
setSelectedDate("");
7170
};
7271

7372
useEffect(() => {
7473
if (dateValid) {
7574
setIsLoadingFile(true);
75+
setShareURL("");
7676

7777
const slDate = new Date(`${selectedDate}T23:59:59`);
7878
const currDate = new Date();
@@ -116,9 +116,7 @@ const ShareFile = ({
116116
});
117117
return;
118118
}
119-
120-
setShareURL("");
121-
}, [dataObject, selectedDate]);
119+
}, [dataObject, selectedDate, bucketName, dateValid, setShareURL]);
122120

123121
const snackBarAction = (
124122
<Button

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const SetAccessPolicy = ({
7272

7373
useEffect(() => {
7474
setAccessPolicy(actualPolicy);
75-
}, []);
75+
}, [setAccessPolicy, actualPolicy]);
7676

7777
return (
7878
<ModalWrapper

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
229229
const [isVersioned, setIsVersioned] = useState<boolean>(false);
230230
const [encryptionEnabled, setEncryptionEnabled] = useState<boolean>(false);
231231

232-
const fetchEvents = () => {
232+
const fetchEvents = useCallback(() => {
233233
setLoadingBucket(true);
234234
const bucketName = match.params["bucketName"];
235235
api
@@ -263,7 +263,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
263263
.catch((err: any) => {
264264
setError(err);
265265
});
266-
};
266+
}, [match]);
267267

268268
const fetchBucketsSize = useCallback(() => {
269269
const bucketName = match.params["bucketName"];
@@ -287,7 +287,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
287287
setLoadingSize(false);
288288
setErrorSize(err);
289289
});
290-
}, []);
290+
}, [match]);
291291

292292
const loadInfo = useCallback(() => {
293293
const bucketName = match.params["bucketName"];
@@ -305,7 +305,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
305305
});
306306
}, [match]);
307307

308-
const fetchBucketEncryptionInfo = () => {
308+
const fetchBucketEncryptionInfo = useCallback(() => {
309309
const bucketName = match.params["bucketName"];
310310
api
311311
.invoke("GET", `/api/v1/buckets/${bucketName}/encryption/info`)
@@ -317,7 +317,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
317317
.catch((err) => {
318318
console.log(err);
319319
});
320-
};
320+
}, [match]);
321321

322322
const closeAddModalAndRefresh = () => {
323323
setAccessPolicyScreenOpen(false);
@@ -336,7 +336,7 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
336336
fetchEvents();
337337
fetchBucketsSize();
338338
fetchBucketEncryptionInfo();
339-
}, [loadInfo]);
339+
}, [loadInfo, fetchEvents, fetchBucketsSize, fetchBucketEncryptionInfo]);
340340

341341
const bucketName = match.params["bucketName"];
342342

@@ -439,6 +439,16 @@ const ViewBucket = ({ classes, match }: IViewBucketProps) => {
439439
{error}
440440
</Grid>
441441
)}
442+
{errBucket !== "" && (
443+
<Grid item xs={12}>
444+
{errBucket}
445+
</Grid>
446+
)}
447+
{errorSize !== "" && (
448+
<Grid item xs={12}>
449+
{errorSize}
450+
</Grid>
451+
)}
442452
<Grid item xs={12} className={classes.container}>
443453
<Grid item xs={12}>
444454
<div className={classes.headerContainer}>

portal-ui/src/screens/Console/Common/FormComponents/DateSelector/DateSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const DateSelector = forwardRef(
113113
useEffect(() => {
114114
const [isValid, dateString] = validDate(year, month, day);
115115
onDateChange(dateString, isValid);
116-
}, [month, day, year]);
116+
}, [month, day, year, onDateChange]);
117117

118118
const resetDate = () => {
119119
setMonth("");

0 commit comments

Comments
 (0)