From 5159597ddb90fe7cab2b8b9d2a692545d12867c9 Mon Sep 17 00:00:00 2001 From: subnub Date: Mon, 22 Jul 2024 00:44:54 -0400 Subject: [PATCH] rename --- src/components/UploadItem/index.jsx | 101 ------------------ .../UploadItem/{UploadItem.jsx => index.tsx} | 3 +- src/reducers/uploader.ts | 2 +- 3 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 src/components/UploadItem/index.jsx rename src/components/UploadItem/{UploadItem.jsx => index.tsx} (94%) diff --git a/src/components/UploadItem/index.jsx b/src/components/UploadItem/index.jsx deleted file mode 100644 index 2673371..0000000 --- a/src/components/UploadItem/index.jsx +++ /dev/null @@ -1,101 +0,0 @@ -import UploadItem from "./UploadItem" -import {cancelUpload} from "../../actions/uploads"; -import {connect} from "react-redux"; -import React from "react"; - -class UploadItemContainer extends React.Component { - - constructor(props) { - super(props); - - const completed = this.props.completed; - const canceled = this.props.canceled; - - this.uploadFinished = false; - - this.state = { - progressBarStyle: {visibility: (completed || canceled) ? "hidden" : "visible"}, - stopUploadButtonStyle: (completed || canceled) ? {visibility:"visible", opacity: 1} : {visibility: "hidden", opacity: 0} - } - } - - hideProgress = () => { - - this.setState(() => ({ - ...this.state, - progressBarStyle: {visibility: "hidden"}, - stopUploadButtonStyle: {opacity: 1, visibility: "visible"} - - })) - } - - showProgress = () => { - - this.setState(() => ({ - ...this.state, - progressBarStyle: {visibility: "visible"}, - stopUploadButtonStyle: {opacity: 0, visibility: "hidden"} - - })) - } - - cancelUploadEvent = () => { - - if (!this.props.completed) { - this.props.source.cancel("User Canceled Upload") - this.props.dispatch(cancelUpload(this.props.id)) - } - - } - - getUploadImage = () => { - - if (this.props.canceled) { - return "/images/error-red.png" - } else if (this.props.completed) { - return "/images/check-green.png" - } else { - return "/images/close-circle-outline.svg" - } - } - - componentDidUpdate = () => { - - if (this.props.completed && !this.uploadFinished) { - - this.uploadFinished = true; - - this.setState(() => ({ - ...this.state, - progressBarStyle: {visibility: "hidden"}, - stopUploadButtonStyle: {opacity: 1, visibility: "visible"} - - })) - } - - if (this.props.canceled && !this.uploadFinished) { - - this.uploadFinished = true; - const completed = this.props.completed; - const canceled = this.props.canceled; - - this.setState(() => { - return {progressBarStyle: {visibility: (completed || canceled) ? "hidden" : "visible"}, - stopUploadButtonStyle: (completed || canceled) ? {visibility:"visible", opacity: 1} : {visibility: "hidden", opacity: 0}} - }) - } - } - - render() { - - return - } -} - -export default connect()(UploadItemContainer) \ No newline at end of file diff --git a/src/components/UploadItem/UploadItem.jsx b/src/components/UploadItem/index.tsx similarity index 94% rename from src/components/UploadItem/UploadItem.jsx rename to src/components/UploadItem/index.tsx index c625c42..c912848 100644 --- a/src/components/UploadItem/UploadItem.jsx +++ b/src/components/UploadItem/index.tsx @@ -5,8 +5,9 @@ import { getCancelToken } from "../../utils/cancelTokenManager"; import CloseIcon from "../../icons/CloseIcon"; import CheckCircleIcon from "../../icons/CheckCircleIcon"; import AlertIcon from "../../icons/AlertIcon"; +import { UploadItemType } from "../../reducers/uploader"; -const UploadItem = (props) => { +const UploadItem: React.FC = (props) => { const filesRefreshed = useRef(false); const { invalidateFilesCache } = useFilesClient(); const { invalidateQuickFilesCache } = useQuickFilesClient(); diff --git a/src/reducers/uploader.ts b/src/reducers/uploader.ts index f259efc..cf8f87c 100644 --- a/src/reducers/uploader.ts +++ b/src/reducers/uploader.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; -interface UploadItemType { +export interface UploadItemType { id: string; progress: number; name: string;