diff --git a/src/client/web/src/components/__test__/pane_login.test.tsx b/src/client/web/src/components/__test__/pane_login.test.tsx index 7a15d26..0ae815a 100644 --- a/src/client/web/src/components/__test__/pane_login.test.tsx +++ b/src/client/web/src/components/__test__/pane_login.test.tsx @@ -72,7 +72,9 @@ describe("Login", () => { userName: "mockUser", userRole: "admin", authed: true, - usedSpace: "256", + extInfo: { + usedSpace: "256", + }, quota: { spaceLimit: "7", uploadSpeedLimit: 3, diff --git a/src/client/web/src/components/__test__/state_mgr.test.tsx b/src/client/web/src/components/__test__/state_mgr.test.tsx index bc2d65e..1e16ed6 100644 --- a/src/client/web/src/components/__test__/state_mgr.test.tsx +++ b/src/client/web/src/components/__test__/state_mgr.test.tsx @@ -1,5 +1,4 @@ import { List, Set, Map } from "immutable"; -import { mock, instance } from "ts-mockito"; import { initMockWorker } from "../../test/helpers"; import { StateMgr } from "../state_mgr"; @@ -72,7 +71,9 @@ describe("State Manager", () => { userID: "0", userName: "mockUser", userRole: "admin", - usedSpace: "256", + extInfo: { + usedSpace: "256", + }, quota: { spaceLimit: "7", uploadSpeedLimit: 3, @@ -189,7 +190,9 @@ describe("State Manager", () => { userName: mockSelfResp.data.name, userRole: mockSelfResp.data.role, quota: mockSelfResp.data.quota, - usedSpace: mockSelfResp.data.usedSpace, + extInfo: { + usedSpace: mockSelfResp.data.usedSpace, + }, authed: false, captchaID: "mockCaptchaID", preferences: { diff --git a/src/client/web/src/components/__test__/topbar.test.tsx b/src/client/web/src/components/__test__/topbar.test.tsx index 3ba5754..2b54b80 100644 --- a/src/client/web/src/components/__test__/topbar.test.tsx +++ b/src/client/web/src/components/__test__/topbar.test.tsx @@ -101,7 +101,9 @@ describe("TopBar", () => { userID: visitorID, userName: "visitor", userRole: roleVisitor, - usedSpace: "0", + extInfo: { + usedSpace: "0", + }, quota: { spaceLimit: "0", uploadSpeedLimit: 0, diff --git a/src/client/web/src/components/core_state.ts b/src/client/web/src/components/core_state.ts index 8e907e8..75c1574 100644 --- a/src/client/web/src/components/core_state.ts +++ b/src/client/web/src/components/core_state.ts @@ -74,7 +74,9 @@ export function initState(): ICoreState { userID: "", userName: "", userRole: "", - usedSpace: "0", + extInfo: { + usedSpace: "0", + }, quota: { spaceLimit: "0", uploadSpeedLimit: 0, diff --git a/src/client/web/src/components/pane_login.tsx b/src/client/web/src/components/pane_login.tsx index 248bd6b..7301443 100644 --- a/src/client/web/src/components/pane_login.tsx +++ b/src/client/web/src/components/pane_login.tsx @@ -8,14 +8,17 @@ import { alertMsg } from "../common/env"; import { Quota, Preferences } from "../client"; import { getErrMsg } from "../common/utils"; +export interface ExtInfo { + usedSpace: string; +} export interface LoginProps { + authed: boolean; + captchaID: string; userID: string; userName: string; userRole: string; - usedSpace: string; + extInfo: ExtInfo; quota: Quota; - authed: boolean; - captchaID: string; preferences: Preferences; } diff --git a/src/client/web/src/components/panel_files.tsx b/src/client/web/src/components/panel_files.tsx index f2695bd..d0a2760 100644 --- a/src/client/web/src/components/panel_files.tsx +++ b/src/client/web/src/components/panel_files.tsx @@ -796,7 +796,7 @@ export class FilesPanel extends React.Component { this.prepareTable(this.props.filesInfo.items, showOp) ); - const usedSpace = FileSize(parseInt(this.props.login.usedSpace, 10), { + const usedSpace = FileSize(parseInt(this.props.login.extInfo.usedSpace, 10), { round: 0, }); const spaceLimit = FileSize( diff --git a/src/client/web/src/components/state_updater.ts b/src/client/web/src/components/state_updater.ts index 7974749..5503933 100644 --- a/src/client/web/src/components/state_updater.ts +++ b/src/client/web/src/components/state_updater.ts @@ -458,7 +458,9 @@ export class Updater { return ""; }; - getParamMap = async (params: URLSearchParams): Promise> => { + getParamMap = async ( + params: URLSearchParams + ): Promise> => { let paramMap = Map(); paramMap = paramMap.set("sh", ""); paramMap = paramMap.set("dir", ""); @@ -466,7 +468,7 @@ export class Updater { let shareID = params.get("sh"); if (shareID != null && shareID !== "") { paramMap = paramMap.set("sh", shareID); - const resp = await this.filesClient.getSharingDir(shareID) + const resp = await this.filesClient.getSharingDir(shareID); if (resp.status === 200) { paramMap = paramMap.set("dir", resp.data.sharingDir); } @@ -478,7 +480,7 @@ export class Updater { }; initCwd = async (params: URLSearchParams): Promise => { - const paramMap = await this.getParamMap(params) + const paramMap = await this.getParamMap(params); const dir = paramMap.get("dir", ""); if (dir != null && dir !== "") { @@ -551,7 +553,7 @@ export class Updater { this.props.login.userID = visitorID; this.props.login.userName = "visitor"; this.props.login.userRole = roleVisitor; - this.props.login.usedSpace = "0"; + this.props.login.extInfo.usedSpace = "0"; this.props.login.quota = { uploadSpeedLimit: 0, downloadSpeedLimit: 0, @@ -579,7 +581,7 @@ export class Updater { this.props.login.userID = resp.data.id; this.props.login.userName = resp.data.name; this.props.login.userRole = resp.data.role; - this.props.login.usedSpace = resp.data.usedSpace; + this.props.login.extInfo.usedSpace = resp.data.usedSpace; this.props.login.quota = resp.data.quota; this.props.login.preferences = resp.data.preferences; return ""; diff --git a/src/client/web/src/components/topbar.tsx b/src/client/web/src/components/topbar.tsx index ef59d21..f8f8619 100644 --- a/src/client/web/src/components/topbar.tsx +++ b/src/client/web/src/components/topbar.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { List } from "immutable"; -import { alertMsg, confirmMsg } from "../common/env"; +import { alertMsg, confirmMsg } from "../common/env"; import { ICoreState, MsgProps, UIProps } from "./core_state"; import { LoginProps } from "./pane_login"; import { updater } from "./state_updater";