diff --git a/src/client/web/src/client/index.ts b/src/client/web/src/client/index.ts index f34b1d3..fdd6b1b 100644 --- a/src/client/web/src/client/index.ts +++ b/src/client/web/src/client/index.ts @@ -65,6 +65,10 @@ export interface ListSharingsResp { sharingDirs: string[]; } +export interface ClientConfigMsg { + clientCfg: ClientConfig; +} + export interface ClientConfig { siteName: string; siteDesc: string; diff --git a/src/client/web/src/client/settings_mock.ts b/src/client/web/src/client/settings_mock.ts index c95dde6..985ae31 100644 --- a/src/client/web/src/client/settings_mock.ts +++ b/src/client/web/src/client/settings_mock.ts @@ -1,12 +1,12 @@ // TODO: replace this with jest mocks -import { Response, Quota } from "."; +import { Response } from "."; -import { ClientConfig } from "./"; +import { ClientConfigMsg } from "./"; export interface SettingsClientResps { healthMockResp?: Response; setClientCfgMockResp?: Response; - getClientCfgMockResp?: Response; + getClientCfgMockResp?: Response; } export const resps = { @@ -16,14 +16,16 @@ export const resps = { status: 200, statusText: "", data: { - siteName: "", - siteDesc: "", - bg: { - url: "", - repeat: "", - position: "", - align: "", - }, + clientCfg: { + siteName: "", + siteDesc: "", + bg: { + url: "", + repeat: "", + position: "", + align: "", + }, + } }, }, }; diff --git a/src/client/web/src/components/__test__/panes.test.tsx b/src/client/web/src/components/__test__/panes.test.tsx index 8ee09ca..dc821f4 100644 --- a/src/client/web/src/components/__test__/panes.test.tsx +++ b/src/client/web/src/components/__test__/panes.test.tsx @@ -17,6 +17,7 @@ describe("Panes", () => { panes: coreState.panes, admin: coreState.admin, login: coreState.login, + ui: coreState.ui, msg: coreState.msg, update: (updater: (prevState: ICoreState) => ICoreState) => {}, }); 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 d37d9f0..3e77e86 100644 --- a/src/client/web/src/components/__test__/state_mgr.test.tsx +++ b/src/client/web/src/components/__test__/state_mgr.test.tsx @@ -6,6 +6,7 @@ import { initUploadMgr } from "../../worker/upload_mgr"; import { User, UploadInfo } from "../../client"; import { MockFilesClient, resps as filesResps } from "../../client/files_mock"; import { MockUsersClient, resps as usersResps } from "../../client/users_mock"; +import { MockSettingsClient, resps as settingsResps } from "../../client/settings_mock"; import { ICoreState, newState } from "../core_state"; import { MockWorker, UploadState, UploadEntry } from "../../worker/interface"; @@ -13,6 +14,7 @@ describe("State Manager", () => { test("initUpdater for admin", async () => { const usersCl = new MockUsersClient(""); const filesCl = new MockFilesClient(""); + const settingsCl = new MockSettingsClient(""); const mockWorkerClass = mock(MockWorker); const mockWorker = instance(mockWorkerClass); @@ -21,6 +23,7 @@ describe("State Manager", () => { const mgr = new StateMgr({}); // it will call initUpdater mgr.setUsersClient(usersCl); mgr.setFilesClient(filesCl); + mgr.setSettingsClient(settingsCl); // TODO: depress warning mgr.update = (apply: (prevState: ICoreState) => ICoreState): void => { @@ -98,6 +101,7 @@ describe("State Manager", () => { test("initUpdater for visitor in sharing mode", async () => { const usersCl = new MockUsersClient(""); const filesCl = new MockFilesClient(""); + const settingsCl = new MockSettingsClient(""); const mockSelfResp = { status: 200, statusText: "", @@ -128,6 +132,7 @@ describe("State Manager", () => { const mgr = new StateMgr({}); // it will call initUpdater mgr.setUsersClient(usersCl); mgr.setFilesClient(filesCl); + mgr.setSettingsClient(settingsCl); // TODO: depress warning mgr.update = (apply: (prevState: ICoreState) => ICoreState): void => { // no op diff --git a/src/client/web/src/components/pane_settings.tsx b/src/client/web/src/components/pane_settings.tsx index ce53093..d10ba03 100644 --- a/src/client/web/src/components/pane_settings.tsx +++ b/src/client/web/src/components/pane_settings.tsx @@ -10,7 +10,6 @@ import { alertMsg } from "../common/env"; export interface Props { login: LoginProps; msg: MsgProps; - update?: (updater: (prevState: ICoreState) => ICoreState) => void; }