diff --git a/app/src/components/Admin.js b/app/src/components/Admin.js index d1bf3371..22687488 100644 --- a/app/src/components/Admin.js +++ b/app/src/components/Admin.js @@ -9,7 +9,6 @@ import { Header, Loader, Placeholder, - Tab, Table } from "semantic-ui-react"; import { diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js index 52490895..78add301 100644 --- a/app/src/components/Archive.js +++ b/app/src/components/Archive.js @@ -256,9 +256,13 @@ class ManageArchives extends React.Component { return (<> + ) } } diff --git a/app/src/components/Common.js b/app/src/components/Common.js index 167278ad..5ee771a6 100644 --- a/app/src/components/Common.js +++ b/app/src/components/Common.js @@ -1,5 +1,5 @@ import React, {useEffect, useState} from "react"; -import {Card, Container, Form, Icon, Image, Input, Menu, Pagination, Progress, Responsive} from 'semantic-ui-react'; +import {Card, Container, Form, Icon, Image, Input, Menu, Pagination, Responsive} from 'semantic-ui-react'; import {Link, NavLink} from "react-router-dom"; import Button from "semantic-ui-react/dist/commonjs/elements/Button"; import Grid from "semantic-ui-react/dist/commonjs/collections/Grid"; @@ -397,61 +397,6 @@ export class APIForm extends React.Component { } -export class Progresses extends React.Component { - - constructor(props) { - super(props); - this.state = { - progresses: [], - } - this.socket = null; - } - - componentDidMount() { - this.socket = new WebSocket(this.props.streamUrl); - this.socket.onmessage = this.handleMessage; - } - - handleMessage = async (e) => { - let data = await JSON.parse(e.data); - if (data.progresses) { - let progresses = []; - for (let i = 0; i < data.progresses.length; i++) { - let progress = data.progresses[i]; - // Add a key to each progress. - progress.key = i; - - if (progress.percent === 100) { - progress.active = false; - progress.success = true; - } else { - progress.active = true; - progress.success = false; - } - - progresses = progresses.concat([progress]); - } - this.setState({progresses: progresses}); - } - } - - render() { - return <> - {this.state.progresses.map((i) => - {i.message || ''} - )} - - } - -} - export function replaceNullValues(obj, newValue) { newValue = newValue === undefined ? '' : newValue; let keys = Object.keys(obj); diff --git a/app/src/components/Videos.js b/app/src/components/Videos.js index 321ac9d3..06bf309b 100644 --- a/app/src/components/Videos.js +++ b/app/src/components/Videos.js @@ -1,12 +1,12 @@ import React from 'react'; -import {Link, NavLink, Route} from "react-router-dom"; +import {Link, Route} from "react-router-dom"; import Paginator, { changePageHistory, DEFAULT_LIMIT, defaultSearchOrder, defaultVideoOrder, - humanFileSize, PageContainer, - Progresses, + humanFileSize, + PageContainer, scrollToTop, searchOrders, secondsToString, @@ -67,26 +67,17 @@ class ManageVideos extends React.Component { -

- - -
-

-

- +

- - {this.state.streamUrl && }
) } diff --git a/app/src/hooks/customHooks.js b/app/src/hooks/customHooks.js index 0d92950f..95def379 100644 --- a/app/src/hooks/customHooks.js +++ b/app/src/hooks/customHooks.js @@ -16,7 +16,7 @@ export const useSearchParam = (key, defaultValue = null) => { params.append(key, value); } history.push({search: params.toString()}); - }, [value]) + }, [value, history, key]) return [value, setValue]; } @@ -29,13 +29,13 @@ export const useSearch = () => { const localSearchArchives = async (term) => { setArchives(null); - const [archives, total] = await searchArchives(0, 6, null, term); + const [archives] = await searchArchives(0, 6, null, term); setArchives(archives); } const localSearchVideos = async (term) => { setVideos(null); - const [videos, total] = await searchVideos(0, 6, null, term); + const [videos] = await searchVideos(0, 6, null, term); setVideos(videos); }