fixing merge-error

3 files changed, 0 insertions, 320 deletions

diff --git a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/Update.stories.tsx b/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/Update.stories.tsx
deleted file mode 100644
index 06ea9d07a..000000000
--- a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/Update.stories.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2021-2024 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 <http://www.gnu.org/licenses/>
- */
-
-/**
- *
- * @author Sebastian Javier Marchano (sebasjm)
- */
-
-import { h, VNode, FunctionalComponent } from "preact";
-import { UpdatePage as TestedComponent } from "./UpdatePage.js";
-
-export default {
-  title: "Pages/OtpDevices/Update",
-  component: TestedComponent,
-  argTypes: {
-    onUpdate: { action: "onUpdate" },
-    onBack: { action: "onBack" },
-  },
-};
diff --git a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx b/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx
deleted file mode 100644
index 310810576..000000000
--- a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2021-2024 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 <http://www.gnu.org/licenses/>
- */
-
-/**
- *
- * @author Sebastian Javier Marchano (sebasjm)
- */
-
-import { randomRfc3548Base32Key } from "@gnu-taler/taler-util";
-import { useTranslationContext } from "@gnu-taler/web-util/browser";
-import { Fragment, h, VNode } from "preact";
-import { useState } from "preact/hooks";
-import { AsyncButton } from "../../../../components/exception/AsyncButton.js";
-import {
-  FormErrors,
-  FormProvider,
-} from "../../../../components/form/FormProvider.js";
-import { Input } from "../../../../components/form/Input.js";
-import { InputSelector } from "../../../../components/form/InputSelector.js";
-import { InputWithAddon } from "../../../../components/form/InputWithAddon.js";
-import { MerchantBackend, WithId } from "../../../../declaration.js";
-
-type Entity = MerchantBackend.OTP.OtpDevicePatchDetails & WithId;
-
-interface Props {
-  onUpdate: (d: Entity) => Promise<void>;
-  onBack?: () => void;
-  device: Entity;
-}
-const algorithms = [0, 1, 2];
-const algorithmsNames = ["off", "30s 8d TOTP-SHA1", "30s 8d eTOTP-SHA1"];
-export function UpdatePage({ device, onUpdate, onBack }: Props): VNode {
-  const { i18n } = useTranslationContext();
-
-  const [state, setState] = useState<Partial<Entity>>(device);
-  const [showKey, setShowKey] = useState(false);
-
-  const errors: FormErrors<Entity> = {};
-
-  const hasErrors = Object.keys(errors).some(
-    (k) => (errors as any)[k] !== undefined,
-  );
-
-  const submitForm = () => {
-    if (hasErrors) return Promise.reject();
-    return onUpdate(state as any);
-  };
-
-  return (
-    <div>
-      <section class="section">
-        <section class="hero is-hero-bar">
-          <div class="hero-body">
-            <div class="level">
-              <div class="level-left">
-                <div class="level-item">
-                  <span class="is-size-4">
-                    Device: <b>{device.id}</b>
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
-        <hr />
-
-        <section class="section is-main-section">
-          <div class="columns">
-            <div class="column is-four-fifths">
-              <FormProvider
-                object={state}
-                valueHandler={setState}
-                errors={errors}
-              >
-                <Input<Entity>
-                  name="otp_device_description"
-                  label={i18n.str`Description`}
-                  tooltip={i18n.str`Useful to identify the device physically`}
-                />
-                <InputSelector<Entity>
-                  name="otp_algorithm"
-                  label={i18n.str`Verification algorithm`}
-                  tooltip={i18n.str`Algorithm to use to verify transaction in offline mode`}
-                  values={algorithms}
-                  toStr={(v) => algorithmsNames[v]}
-                  fromStr={(v) => Number(v)}
-                />
-                {state.otp_algorithm && state.otp_algorithm > 0 ? (
-                  <Fragment>
-                    <InputWithAddon<Entity>
-                      name="otp_key"
-                      label={i18n.str`Device key`}
-                      readonly={state.otp_key === undefined}
-                      inputType={showKey ? "text" : "password"}
-                      help={
-                        state.otp_key === undefined
-                          ? "Not modified"
-                          : "Be sure to be very hard to guess or use the random generator"
-                      }
-                      tooltip={i18n.str`Your device need to have exactly the same value`}
-                      fromStr={(v) => v.toUpperCase()}
-                      addonAfterAction={() => {
-                        setShowKey(!showKey);
-                      }}
-                      addonAfter={
-                        <span
-                          class="icon"
-                          onClick={() => {
-                            setShowKey(!showKey);
-                          }}
-                        >
-                          {showKey ? (
-                            <i class="mdi mdi-eye" />
-                          ) : (
-                            <i class="mdi mdi-eye-off" />
-                          )}
-                        </span>
-                      }
-                      side={
-                        state.otp_key === undefined ? (
-                          <button
-                            onClick={(e) => {
-                              setState((s) => ({ ...s, otp_key: "" }));
-                            }}
-                            class="button"
-                          >
-                            change key
-                          </button>
-                        ) : (
-                          <button
-                            data-tooltip={i18n.str`generate random secret key`}
-                            class="button is-info mr-3"
-                            onClick={(e) => {
-                              setState((s) => ({
-                                ...s,
-                                otp_key: randomRfc3548Base32Key(),
-                              }));
-                            }}
-                          >
-                            <i18n.Translate>random</i18n.Translate>
-                          </button>
-                        )
-                      }
-                    />
-                  </Fragment>
-                ) : undefined}{" "}
-              </FormProvider>
-
-              <div class="buttons is-right mt-5">
-                {onBack && (
-                  <button class="button" onClick={onBack}>
-                    <i18n.Translate>Cancel</i18n.Translate>
-                  </button>
-                )}
-                <AsyncButton
-                  disabled={hasErrors}
-                  data-tooltip={
-                    hasErrors
-                      ? i18n.str`Need to complete marked fields`
-                      : "confirm operation"
-                  }
-                  onClick={submitForm}
-                >
-                  <i18n.Translate>Confirm</i18n.Translate>
-                </AsyncButton>
-              </div>
-            </div>
-          </div>
-        </section>
-      </section>
-    </div>
-  );
-}
diff --git a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx b/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx
deleted file mode 100644
index 3128608e1..000000000
--- a/packages/auditor-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2021-2024 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 <http://www.gnu.org/licenses/>
- */
-
-/**
- *
- * @author Sebastian Javier Marchano (sebasjm)
- */
-
-import {
-  ErrorType,
-  HttpError,
-  useTranslationContext,
-} from "@gnu-taler/web-util/browser";
-import { Fragment, h, VNode } from "preact";
-import { useState } from "preact/hooks";
-import { Loading } from "../../../../components/exception/loading.js";
-import { NotificationCard } from "../../../../components/menu/index.js";
-import { MerchantBackend, WithId } from "../../../../declaration.js";
-import { Notification } from "../../../../utils/types.js";
-import { UpdatePage } from "./UpdatePage.js";
-import { HttpStatusCode } from "@gnu-taler/taler-util";
-import { useOtpDeviceAPI, useOtpDeviceDetails } from "../../../../hooks/otp.js";
-
-export type Entity = MerchantBackend.OTP.OtpDevicePatchDetails & WithId;
-
-interface Props {
-  onBack?: () => void;
-  onConfirm: () => void;
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (e: HttpError<MerchantBackend.ErrorDetail>) => VNode;
-  vid: string;
-}
-export default function UpdateValidator({
-  vid,
-  onConfirm,
-  onBack,
-  onUnauthorized,
-  onNotFound,
-  onLoadError,
-}: Props): VNode {
-  const { updateOtpDevice } = useOtpDeviceAPI();
-  const result = useOtpDeviceDetails(vid);
-  const [notif, setNotif] = useState<Notification | undefined>(undefined);
-
-  const { i18n } = useTranslationContext();
-
-  if (result.loading) return <Loading />;
-  if (!result.ok) {
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(result);
-  }
-
-  return (
-    <Fragment>
-      <NotificationCard notification={notif} />
-      <UpdatePage
-        device={{
-          id: vid,
-          otp_algorithm: result.data.otp_algorithm,
-          otp_device_description: result.data.device_description,
-          otp_key: undefined,
-          otp_ctr: result.data.otp_ctr
-        }}
-        onBack={onBack}
-        onUpdate={(data) => {
-          return updateOtpDevice(vid, data)
-            .then(onConfirm)
-            .catch((error) => {
-              setNotif({
-                message: i18n.str`could not update template`,
-                type: "ERROR",
-                description: error.message,
-              });
-            });
-        }}
-      />
-    </Fragment>
-  );
-}