diff --git a/packages/merchant-backoffice-ui/src/Application.tsx b/packages/merchant-backoffice-ui/src/Application.tsx index c871b1633..82329974f 100644 --- a/packages/merchant-backoffice-ui/src/Application.tsx +++ b/packages/merchant-backoffice-ui/src/Application.tsx @@ -26,7 +26,6 @@ import { useTranslationContext, } from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; -import { route } from "preact-router"; import { useMemo } from "preact/hooks"; import { ApplicationReadyRoutes } from "./ApplicationReadyRoutes.js"; import { Loading } from "./components/exception/loading.js"; @@ -41,8 +40,7 @@ import { import { ConfigContextProvider } from "./context/config.js"; import { useBackendConfig } from "./hooks/backend.js"; import { strings } from "./i18n/strings.js"; -import { ConnectionPage, LoginPage } from "./paths/login/index.js"; -import { LoginToken } from "./declaration.js"; +import { LoginPage } from "./paths/login/index.js"; export function Application(): VNode { return ( @@ -60,7 +58,6 @@ export function Application(): VNode { * @returns */ function ApplicationStatusRoutes(): VNode { - const { changeBackend, selected: backendSelected } = useBackendContext(); const result = useBackendConfig(); const { i18n } = useTranslationContext(); @@ -69,15 +66,6 @@ function ApplicationStatusRoutes(): VNode { : { currency: "unknown", version: "unknown" }; const ctx = useMemo(() => ({ currency, version }), [currency, version]); - if (!backendSelected) { - return ( - - - - - ); - } - if (!result.ok) { if (result.loading) return ; if ( @@ -87,7 +75,13 @@ function ApplicationStatusRoutes(): VNode { return ( - + ); } @@ -100,12 +94,11 @@ function ApplicationStatusRoutes(): VNode { - ); } @@ -119,7 +112,6 @@ function ApplicationStatusRoutes(): VNode { description: i18n.str`Got message "${result.message}" from ${result.info?.url}`, }} /> - ; } if (result.type === ErrorType.UNREADABLE) { @@ -132,7 +124,6 @@ function ApplicationStatusRoutes(): VNode { description: i18n.str`Got message "${result.message}" from ${result.info?.url}`, }} /> - ; } return ( @@ -145,7 +136,6 @@ function ApplicationStatusRoutes(): VNode { description: i18n.str`Got message "${result.message}" from ${result.info?.url}`, }} /> - ); } @@ -164,9 +154,7 @@ function ApplicationStatusRoutes(): VNode { description: i18n.str`Merchant backend server version ${result.data.version} is not compatible with the supported version ${SUPPORTED_VERSION}`, }} /> - - } return ( diff --git a/packages/merchant-backoffice-ui/src/ApplicationReadyRoutes.tsx b/packages/merchant-backoffice-ui/src/ApplicationReadyRoutes.tsx index ebfa2b6d6..55accd989 100644 --- a/packages/merchant-backoffice-ui/src/ApplicationReadyRoutes.tsx +++ b/packages/merchant-backoffice-ui/src/ApplicationReadyRoutes.tsx @@ -26,13 +26,14 @@ import { Route, Router, route } from "preact-router"; import { useState } from "preact/hooks"; import { InstanceRoutes } from "./InstanceRoutes.js"; import { + NotConnectedAppMenu, NotYetReadyAppMenu, NotificationCard, } from "./components/menu/index.js"; import { useBackendContext } from "./context/backend.js"; import { LoginToken } from "./declaration.js"; import { useBackendInstancesTestForAdmin } from "./hooks/backend.js"; -import { ConnectionPage, LoginPage } from "./paths/login/index.js"; +import { LoginPage } from "./paths/login/index.js"; import { Settings } from "./paths/settings/index.js"; import { INSTANCE_ID_LOOKUP } from "./utils/constants.js"; @@ -42,10 +43,11 @@ import { INSTANCE_ID_LOOKUP } from "./utils/constants.js"; */ export function ApplicationReadyRoutes(): VNode { const { i18n } = useTranslationContext(); - const { url: backendURL, changeBackend } = useBackendContext() const [unauthorized, setUnauthorized] = useState(false) const { + url: backendURL, updateToken, + alreadyTriedLogin, } = useBackendContext(); function updateLoginStatus(token: LoginToken | undefined) { @@ -64,6 +66,15 @@ export function ApplicationReadyRoutes(): VNode { && result.type === ErrorType.CLIENT && result.status === HttpStatusCode.Unauthorized; + if (!alreadyTriedLogin) { + return ( + + + + + ); + } + if (showSettings) { return setShowSettings(true)} title="UI Settings" onLogout={clearTokenAndGoToRoot} isPasswordOk={false} /> @@ -100,7 +111,7 @@ export function ApplicationReadyRoutes(): VNode { type: "ERROR", }} /> - + {/* */} ); } diff --git a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx index 95be49c9d..5d33655ff 100644 --- a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx +++ b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx @@ -205,7 +205,7 @@ export function InstanceRoutes({ diff --git a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx index 6905cb4d0..d6c4ce4b2 100644 --- a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx +++ b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx @@ -49,7 +49,7 @@ export function Sidebar({ isPasswordOk }: Props): VNode { const config = useConfigContext(); - const { url: backendURL, resetBackend } = useBackendContext() + const { url: backendURL } = useBackendContext() const { i18n } = useTranslationContext(); const kycStatus = useInstanceKYCDetails(); const needKYC = kycStatus.ok && kycStatus.data.type === "redirect"; @@ -283,21 +283,8 @@ export function Sidebar({ Log out - : -
  • - resetBackend()} - > - - - - - Change server - - -
    • - } + : undefined + } diff --git a/packages/merchant-backoffice-ui/src/context/backend.ts b/packages/merchant-backoffice-ui/src/context/backend.ts index d4a9abd5f..9b1a37be6 100644 --- a/packages/merchant-backoffice-ui/src/context/backend.ts +++ b/packages/merchant-backoffice-ui/src/context/backend.ts @@ -19,56 +19,39 @@ * @author Sebastian Javier Marchano (sebasjm) */ +import { useMemoryStorage } from "@gnu-taler/web-util/browser"; import { createContext, h, VNode } from "preact"; -import { useContext, useState } from "preact/hooks"; +import { useContext } from "preact/hooks"; import { LoginToken } from "../declaration.js"; import { useBackendDefaultToken, useBackendURL } from "../hooks/index.js"; -import { buildStorageKey, useLocalStorage } from "@gnu-taler/web-util/browser"; -import { codecForBoolean } from "@gnu-taler/taler-util"; interface BackendContextType { url: string, - selected: boolean; + alreadyTriedLogin: boolean; token?: LoginToken; updateToken: (token: LoginToken | undefined) => void; - changeBackend: (url: string) => void; - resetBackend: () => void; } const BackendContext = createContext({ url: "", - selected: false, + alreadyTriedLogin: false, token: undefined, updateToken: () => null, - changeBackend: () => null, - resetBackend: () => null, }); -const BACKEND_SELECTED = buildStorageKey("backend-selected", codecForBoolean()); - function useBackendContextState( defaultUrl?: string, ): BackendContextType { - const [url, changeBackend2] = useBackendURL(defaultUrl); + const [url] = useBackendURL(defaultUrl); const [token, updateToken] = useBackendDefaultToken(); - const {value, update} = useLocalStorage(BACKEND_SELECTED) - function changeBackend(s:string) { - changeBackend2(s) - update(true) - } - - function resetBackend() { - update(false) - } + console.log(JSON.stringify(token)) return { url, token, - selected: value ?? false, + alreadyTriedLogin: token !== undefined, updateToken, - changeBackend, - resetBackend }; } diff --git a/packages/merchant-backoffice-ui/src/hooks/backend.ts b/packages/merchant-backoffice-ui/src/hooks/backend.ts index 4515f0557..054c074f1 100644 --- a/packages/merchant-backoffice-ui/src/hooks/backend.ts +++ b/packages/merchant-backoffice-ui/src/hooks/backend.ts @@ -345,7 +345,7 @@ export function useBackendInstanceRequest(): useBackendInstanceRequestType { //and avoid network return Promise.resolve({ ok: true, - data: {orders:[]} as T, + data: { orders: [] } as T, }) } return requestHandler(baseUrl, endpoint, { params, token }); @@ -398,7 +398,7 @@ export function useBackendInstanceRequest(): useBackendInstanceRequestType { //and avoid network return Promise.resolve({ ok: true, - data: {transfers:[]} as T, + data: { transfers: [] } as T, }) } if (delta !== undefined) { @@ -424,7 +424,7 @@ export function useBackendInstanceRequest(): useBackendInstanceRequestType { //and avoid network return Promise.resolve({ ok: true, - data: {templates:[]} as T, + data: { templates: [] } as T, }) } if (delta !== undefined) { @@ -450,7 +450,7 @@ export function useBackendInstanceRequest(): useBackendInstanceRequestType { //and avoid network return Promise.resolve({ ok: true, - data: {webhooks:[]} as T, + data: { webhooks: [] } as T, }) } if (delta !== undefined) { diff --git a/packages/merchant-backoffice-ui/src/paths/login/index.tsx b/packages/merchant-backoffice-ui/src/paths/login/index.tsx index e37ef4bef..1c98b7c9b 100644 --- a/packages/merchant-backoffice-ui/src/paths/login/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/login/index.tsx @@ -36,7 +36,7 @@ function normalizeToken(r: string): AccessToken { } export function LoginPage({ onConfirm }: Props): VNode { - const { url: backendURL, changeBackend, resetBackend } = useBackendContext(); + const { url: backendURL } = useBackendContext(); const { admin, id } = useInstanceContext(); const { requestNewLoginToken } = useCredentialsChecker(); const [token, setToken] = useState(""); @@ -54,11 +54,7 @@ export function LoginPage({ onConfirm }: Props): VNode { } else { onConfirm(undefined); } - }, [backendURL, id, token]) - - async function changeServer() { - resetBackend() - } + }, [id, token]) if (admin && id !== "default") { //admin trying to access another instance @@ -139,26 +135,7 @@ export function LoginPage({ onConfirm }: Props): VNode { style={{ border: "1px solid", borderTop: 0, borderBottom: 0 }} > Please enter your access token. -
    -
    - -
    -
    -
    -

    - -

    -
    -
    -
    +