@@ -22,15 +33,5 @@ export default function FlingList(props) {
);
async function refreshFlingList() {
- let flings = await flingClient.getFlings();
- let newFlings = [];
-
- for (let fling of flings) {
- let flingTile =
;
- newFlings.push(flingTile);
- }
- setFlings(newFlings);
}
}
diff --git a/web/fling/src/components/admin/FlingTile.jsx b/web/fling/src/components/admin/FlingTile.jsx
index 499f7ca..8b9b7f0 100644
--- a/web/fling/src/components/admin/FlingTile.jsx
+++ b/web/fling/src/components/admin/FlingTile.jsx
@@ -1,7 +1,7 @@
import log from 'loglevel';
-import React, {useRef, useState} from 'react';
+import React, {useRef} from 'react';
import classNames from 'classnames';
-import {Switch, Route, Redirect, BrowserRouter, useLocation, useParams, NavLink} from "react-router-dom";
+import {NavLink} from "react-router-dom";
import {flingClient} from '../../util/flingclient';
@@ -10,9 +10,9 @@ function TileAction(props) {
return(
diff --git a/web/fling/src/components/admin/Login.jsx b/web/fling/src/components/admin/Login.jsx
index 28e8380..361dc46 100644
--- a/web/fling/src/components/admin/Login.jsx
+++ b/web/fling/src/components/admin/Login.jsx
@@ -76,6 +76,9 @@ export default function Login() {
case "password":
setPassword(val);
break;
+ default:
+ log.error(`Cannot handle change ${name}`);
+ break;
}
};
diff --git a/web/fling/src/components/admin/Navbar.jsx b/web/fling/src/components/admin/Navbar.jsx
index 4b3e837..a189f66 100644
--- a/web/fling/src/components/admin/Navbar.jsx
+++ b/web/fling/src/components/admin/Navbar.jsx
@@ -1,8 +1,6 @@
-import log from 'loglevel';
import React, {useState} from 'react';
import New from './New';
-import request from '../../util/request';
import send from '../resources/send.svg';
export default function Navbar() {
diff --git a/web/fling/src/components/admin/New.jsx b/web/fling/src/components/admin/New.jsx
index 1028393..7a8fb30 100644
--- a/web/fling/src/components/admin/New.jsx
+++ b/web/fling/src/components/admin/New.jsx
@@ -1,5 +1,5 @@
import log from 'loglevel';
-import React, {useState, useEffect, useRef} from 'react';
+import React, {useState} from 'react';
import {flingClient} from '../../util/flingclient';
diff --git a/web/fling/src/components/admin/Settings.jsx b/web/fling/src/components/admin/Settings.jsx
index a5783a6..a516792 100644
--- a/web/fling/src/components/admin/Settings.jsx
+++ b/web/fling/src/components/admin/Settings.jsx
@@ -1,8 +1,5 @@
import log from 'loglevel';
-import React, {useState, useEffect, useRef} from 'react';
-import {useLocation, useHistory} from 'react-router-dom';
-
-import classNames from 'classnames';
+import React, {useState, useEffect} from 'react';
import {flingClient} from '../../util/flingclient';
@@ -14,13 +11,10 @@ export default function Settings(props) {
let [fling, setFling] = useState(defaultState());
let [shareUrlUnique, setShareUrlUnique] = useState(true);
let [authCodeChangeable, setAuthCodeChangeable] = useState(false);
- let location = useLocation();
- let history = useHistory();
+ let [reload, setReload] = useState(true);
- useEffect(() => loadSettings(), [props.activeFling]);
-
- function loadSettings() {
- if(props.activeFling) {
+ useEffect(() => {
+ if(props.activeFling && reload) {
flingClient.getFling(props.activeFling)
.then(result => {
let f = {...fling, ...result};
@@ -32,14 +26,15 @@ export default function Settings(props) {
setFling(f);
setAuthCodeChangeable(!f.authCode);
+ setReload(false);
});
}
- }
+ }, [props.activeFling, reload, fling]);
function reloadSettings(ev) {
ev.preventDefault();
setFling(defaultState());
- loadSettings();
+ setReload(true);
}
function resetAuthCode(ev) {
diff --git a/web/fling/src/components/admin/Upload.jsx b/web/fling/src/components/admin/Upload.jsx
index e0296cc..edf034e 100644
--- a/web/fling/src/components/admin/Upload.jsx
+++ b/web/fling/src/components/admin/Upload.jsx
@@ -1,8 +1,5 @@
import log from 'loglevel';
import React, {useState, useEffect, useRef} from 'react';
-import {Switch, Route, Redirect, BrowserRouter, useLocation, useParams, Link} from "react-router-dom";
-
-import classNames from 'classnames';
import {artifactClient} from '../../util/flingclient';
@@ -155,8 +152,6 @@ export default function Upload(props) {
}
function handleUpload() {
- let f = [...files];
-
files.forEach((file, idx) => {
artifactClient.postArtifact(props.activeFling, file)
.then(response => {
diff --git a/web/fling/src/components/user/DirectDownload.jsx b/web/fling/src/components/user/DirectDownload.jsx
index aec7c78..1055018 100644
--- a/web/fling/src/components/user/DirectDownload.jsx
+++ b/web/fling/src/components/user/DirectDownload.jsx
@@ -1,4 +1,3 @@
-import log from 'loglevel';
import React, {useRef, useState, useEffect} from 'react';
import {flingClient} from '../../util/flingclient';
diff --git a/web/fling/src/components/user/FlingUser.jsx b/web/fling/src/components/user/FlingUser.jsx
index 4b6dc55..ec13db7 100644
--- a/web/fling/src/components/user/FlingUser.jsx
+++ b/web/fling/src/components/user/FlingUser.jsx
@@ -1,7 +1,6 @@
-import log from 'loglevel';
import React, {useState, useEffect} from 'react';
-import {useParams, BrowserRouter} from 'react-router-dom';
+import {useParams} from 'react-router-dom';
import {flingClient} from '../../util/flingclient';
diff --git a/web/fling/src/components/user/FlingUserList.jsx b/web/fling/src/components/user/FlingUserList.jsx
index c61e46a..8985435 100644
--- a/web/fling/src/components/user/FlingUserList.jsx
+++ b/web/fling/src/components/user/FlingUserList.jsx
@@ -1,7 +1,7 @@
import log from 'loglevel';
import React, {useState, useEffect, useRef} from 'react';
-import {Switch, Route, Redirect, BrowserRouter, useLocation, useParams, Link} from "react-router-dom";
+import {Switch, Route, useLocation, Link} from "react-router-dom";
import {flingClient, artifactClient} from '../../util/flingclient';
@@ -33,10 +33,6 @@ function Artifacts(props) {
return d.toLocaleDateString();
}
- function getArtifactInfo() {
- return `${readableBytes(artifact.size)}, ${localizedDate(artifact.uploadTime)}`;
- }
-
return(
@@ -208,8 +204,6 @@ function Upload(props) {
}
function handleUpload() {
- let f = [...files];
-
files.forEach((file, idx) => {
artifactClient.postArtifact(props.fling.id, file)
.then(response => {
@@ -280,11 +274,8 @@ export default function FlingUserList(props) {
let iframeContainer = useRef(null);
let [infoText, setInfoText] = useState("");
let [inProgress, setInProgress] = useState(false);
- let [downloadUrl, setDownloadUrl] = useState("");
- useEffect(() => flingInfo(props.fling.id), [props.fling.id]);
-
- function flingInfo(flingId) {
+ useEffect((flingId) => {
if(!flingId) return;
function readableBytes(bytes) {
@@ -313,7 +304,7 @@ export default function FlingUserList(props) {
setInfoText(`${localizedDate(props.fling.creationTime)} - ${countArtifacts} files - ${readableBytes(totalSize)}`);
});
- }
+ }, [props.fling.id, props.fling.creationTime]);
function handleDownload(ev) {
ev.preventDefault();
@@ -328,7 +319,6 @@ export default function FlingUserList(props) {
let frame = document.createElement("iframe");
frame.src = downloadUrl;
iframeContainer.current.appendChild(frame);
- setDownloadUrl(downloadUrl);
setInProgress(false);
});
}
diff --git a/web/fling/src/components/user/Unlock.jsx b/web/fling/src/components/user/Unlock.jsx
index 55c09d2..3dec25c 100644
--- a/web/fling/src/components/user/Unlock.jsx
+++ b/web/fling/src/components/user/Unlock.jsx
@@ -4,10 +4,7 @@ import {useHistory, useLocation} from 'react-router-dom';
import request, {setAuth} from '../../util/request';
-import Error from './Error';
-
export default function Unlock() {
- const [errors, setErrors] = useState([]);
const [authCode, setAuthCode] = useState("");
const history = useHistory();
const location = useLocation();
@@ -23,7 +20,7 @@ export default function Unlock() {
history.replace(location.state.from);
})
.catch(err => {/* ignored */});
- }, [location]);
+ }, [location, history]);
return (
@@ -54,8 +51,6 @@ export default function Unlock() {
})
.catch(error => {
log.error(error);
- let response = error.response;
- response.data && response.data.message && setErrors( prev => [response.data.message, ...prev] );
});
};
@@ -63,8 +58,4 @@ export default function Unlock() {
let val = ev.target.value;
setAuthCode(val);
};
-
- function clearErrors() {
- setErrors([]);
- }
}
diff --git a/web/fling/src/util/flingclient.js b/web/fling/src/util/flingclient.js
index 85b42e8..543ee43 100644
--- a/web/fling/src/util/flingclient.js
+++ b/web/fling/src/util/flingclient.js
@@ -1,5 +1,4 @@
import log from 'loglevel';
-import axios from 'axios';
import request from './request';
diff --git a/web/fling/src/util/request.js b/web/fling/src/util/request.js
index 673b171..22830e8 100644
--- a/web/fling/src/util/request.js
+++ b/web/fling/src/util/request.js
@@ -1,4 +1,3 @@
-import log from 'loglevel';
import axios from 'axios';
import jwtDecode from 'jwt-decode';