From d35f906ecb9e42c0b55d10987ff9b1f4ece2af0e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 29 Nov 2021 13:33:01 -0300 Subject: fix #7109 pending operations on developer page --- .../src/components/styled/index.tsx | 12 +++ .../taler-wallet-webextension/src/popup/Debug.tsx | 67 ------------ .../src/popup/DeveloperPage.stories.tsx | 47 +++++++++ .../src/popup/DeveloperPage.tsx | 116 +++++++++++++++++++++ .../src/popupEntryPoint.tsx | 2 +- .../src/walletEntryPoint.tsx | 2 +- packages/taler-wallet-webextension/src/wxApi.ts | 5 + 7 files changed, 182 insertions(+), 69 deletions(-) delete mode 100644 packages/taler-wallet-webextension/src/popup/Debug.tsx create mode 100644 packages/taler-wallet-webextension/src/popup/DeveloperPage.stories.tsx create mode 100644 packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx diff --git a/packages/taler-wallet-webextension/src/components/styled/index.tsx b/packages/taler-wallet-webextension/src/components/styled/index.tsx index 4c2367008..a5c9f2837 100644 --- a/packages/taler-wallet-webextension/src/components/styled/index.tsx +++ b/packages/taler-wallet-webextension/src/components/styled/index.tsx @@ -304,6 +304,18 @@ export const Overlay = styled.div` cursor: pointer; `; +export const NotifyUpdateFadeOut = styled.div` + border: 2px solid red; + transition: all 0.4s ease-out; + animation: fadeout 1s forwards; + animation-delay: 0.1s; + @keyframes fadeout { + to { + border-color: #f5f5f5; + } + } +`; + export const CenteredDialog = styled.div` position: absolute; text-align: left; diff --git a/packages/taler-wallet-webextension/src/popup/Debug.tsx b/packages/taler-wallet-webextension/src/popup/Debug.tsx deleted file mode 100644 index 8b5d41657..000000000 --- a/packages/taler-wallet-webextension/src/popup/Debug.tsx +++ /dev/null @@ -1,67 +0,0 @@ -/* - This file is part of TALER - (C) 2016 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see - */ - -import { h, VNode } from "preact"; -import { Diagnostics } from "../components/Diagnostics"; -import { useDiagnostics } from "../hooks/useDiagnostics"; -import * as wxApi from "../wxApi"; - -export function DeveloperPage(): VNode { - const [status, timedOut] = useDiagnostics(); - return ( -
-

Debug tools:

- -
- - -
- ); -} - -export function reload(): void { - try { - // eslint-disable-next-line no-undef - chrome.runtime.reload(); - window.close(); - } catch (e) { - // Functionality missing in firefox, ignore! - } -} - -export async function confirmReset(): Promise { - if ( - confirm( - "Do you want to IRREVOCABLY DESTROY everything inside your" + - " wallet and LOSE ALL YOUR COINS?", - ) - ) { - await wxApi.resetDb(); - window.close(); - } -} - -export function openExtensionPage(page: string) { - return () => { - // eslint-disable-next-line no-undef - chrome.tabs.create({ - // eslint-disable-next-line no-undef - url: chrome.extension.getURL(page), - }); - }; -} diff --git a/packages/taler-wallet-webextension/src/popup/DeveloperPage.stories.tsx b/packages/taler-wallet-webextension/src/popup/DeveloperPage.stories.tsx new file mode 100644 index 000000000..1239a03e9 --- /dev/null +++ b/packages/taler-wallet-webextension/src/popup/DeveloperPage.stories.tsx @@ -0,0 +1,47 @@ +/* + This file is part of GNU Taler + (C) 2021 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { PendingTaskType } from "@gnu-taler/taler-wallet-core"; +import { createExample } from "../test-utils"; +import { View as TestedComponent } from "./DeveloperPage"; + +export default { + title: "wallet/developer", + component: TestedComponent, + argTypes: { + setDeviceName: () => Promise.resolve(), + }, +}; + +export const AllOff = createExample(TestedComponent, { + operations: [ + { + type: PendingTaskType.ExchangeUpdate, + exchangeBaseUrl: "http://exchange.url.", + givesLifeness: false, + lastError: undefined, + timestampDue: { + t_ms: 123123213, + }, + retryInfo: undefined, + }, + ], +}); diff --git a/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx b/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx new file mode 100644 index 000000000..494f8ecbf --- /dev/null +++ b/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx @@ -0,0 +1,116 @@ +/* + This file is part of TALER + (C) 2016 GNUnet e.V. + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see + */ + +import { NotificationType } from "@gnu-taler/taler-util"; +import { PendingTaskInfo } from "@gnu-taler/taler-wallet-core"; +import { Fragment, h, VNode } from "preact"; +import { Diagnostics } from "../components/Diagnostics"; +import { NotifyUpdateFadeOut } from "../components/styled/index"; +import { useAsyncAsHook } from "../hooks/useAsyncAsHook"; +import { useDiagnostics } from "../hooks/useDiagnostics"; +import * as wxApi from "../wxApi"; + +export function DeveloperPage(): VNode { + const [status, timedOut] = useDiagnostics(); + const listenAllEvents = Array.from({ length: 1 }); + listenAllEvents.includes = () => true; // includes every event + const operationsResponse = useAsyncAsHook( + wxApi.getPendingOperations, + listenAllEvents, + ); + + const operations = + operationsResponse === undefined + ? [] + : operationsResponse.hasError + ? [] + : operationsResponse.response.pendingOperations; + + return ; +} +export interface Props { + status: any; + timedOut: boolean; + operations: PendingTaskInfo[]; +} + +function hashObjectId(o: any): string { + return JSON.stringify(o); +} + +export function View({ status, timedOut, operations }: Props): VNode { + return ( +
+

Debug tools:

+ + + +
+ + {operations && operations.length > 0 && ( + +

Pending operations

+
+ {operations.reverse().map((o) => { + return ( + +
{o.type}
+
+ 
{JSON.stringify(o, undefined, 2)}
+
+ + ); + })} +
+ + )} +
+ ); +} + +export function reload(): void { + try { + // eslint-disable-next-line no-undef + chrome.runtime.reload(); + window.close(); + } catch (e) { + // Functionality missing in firefox, ignore! + } +} + +export async function confirmReset(): Promise { + if ( + confirm( + "Do you want to IRREVOCABLY DESTROY everything inside your" + + " wallet and LOSE ALL YOUR COINS?", + ) + ) { + await wxApi.resetDb(); + window.close(); + } +} + +export function openExtensionPage(page: string) { + return () => { + // eslint-disable-next-line no-undef + chrome.tabs.create({ + // eslint-disable-next-line no-undef + url: chrome.extension.getURL(page), + }); + }; +} diff --git a/packages/taler-wallet-webextension/src/popupEntryPoint.tsx b/packages/taler-wallet-webextension/src/popupEntryPoint.tsx index c6c872f21..568913753 100644 --- a/packages/taler-wallet-webextension/src/popupEntryPoint.tsx +++ b/packages/taler-wallet-webextension/src/popupEntryPoint.tsx @@ -32,7 +32,7 @@ import { strings } from "./i18n/strings"; import { Pages, WalletNavBar } from "./NavigationBar"; import { BackupPage } from "./wallet/BackupPage"; import { BalancePage } from "./popup/BalancePage"; -import { DeveloperPage } from "./popup/Debug"; +import { DeveloperPage } from "./popup/DeveloperPage"; import { HistoryPage } from "./popup/History"; import { ProviderAddPage } from "./wallet/ProviderAddPage"; import { ProviderDetailPage } from "./wallet/ProviderDetailPage"; diff --git a/packages/taler-wallet-webextension/src/walletEntryPoint.tsx b/packages/taler-wallet-webextension/src/walletEntryPoint.tsx index 73000c9ae..8ba0a7b9c 100644 --- a/packages/taler-wallet-webextension/src/walletEntryPoint.tsx +++ b/packages/taler-wallet-webextension/src/walletEntryPoint.tsx @@ -39,7 +39,7 @@ import { SettingsPage } from "./wallet/Settings"; import { TransactionPage } from "./wallet/Transaction"; import { WelcomePage } from "./wallet/Welcome"; import { BackupPage } from "./wallet/BackupPage"; -import { DeveloperPage } from "./popup/Debug"; +import { DeveloperPage } from "./popup/DeveloperPage"; import { ManualWithdrawPage } from "./wallet/ManualWithdrawPage"; import { WalletBox } from "./components/styled"; import { ProviderDetailPage } from "./wallet/ProviderDetailPage"; diff --git a/packages/taler-wallet-webextension/src/wxApi.ts b/packages/taler-wallet-webextension/src/wxApi.ts index 31fbd5b45..46a175afa 100644 --- a/packages/taler-wallet-webextension/src/wxApi.ts +++ b/packages/taler-wallet-webextension/src/wxApi.ts @@ -33,6 +33,7 @@ import { } from "@gnu-taler/taler-util"; import { AddBackupProviderRequest, BackupInfo, OperationFailedError, + PendingOperationsResponse, RemoveBackupProviderRequest } from "@gnu-taler/taler-wallet-core"; import { ExchangeWithdrawDetails } from "@gnu-taler/taler-wallet-core/src/operations/withdraw"; @@ -338,6 +339,10 @@ export function getExchangeTos( }); } +export function getPendingOperations(): Promise { + return callBackend("getPendingOperations", {}); +} + export function addExchange(req: AddExchangeRequest): Promise { return callBackend("addExchange", req); } -- cgit v1.2.3