From f2de26ea0e68b9d0a23f8ec0c31445858ddbd5e9 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Fri, 5 May 2023 11:12:33 +0200
Subject: [PATCH] Resolve some typescript errors

---
 ui/src/lib/api/service_specs.ts                           | 2 +-
 ui/src/lib/components/Header.svelte                       | 8 +++++---
 ui/src/lib/components/RecoverAccountForm.svelte           | 5 +++--
 ui/src/lib/components/domains/ModalHeader.svelte          | 1 +
 ui/src/lib/components/domains/NewSubdomainModal.svelte    | 3 ++-
 .../lib/components/providers/CardImportableDomains.svelte | 3 ++-
 ui/src/lib/model/provider.ts                              | 1 +
 ui/src/lib/model/toast.ts                                 | 2 +-
 ui/src/routes/+layout.svelte                              | 2 +-
 ui/src/routes/+layout.ts                                  | 5 ++++-
 ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte   | 3 ++-
 ui/src/routes/email-validation/+page.svelte               | 2 +-
 ui/src/routes/forgotten-password/+page.svelte             | 8 ++++----
 13 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/ui/src/lib/api/service_specs.ts b/ui/src/lib/api/service_specs.ts
index 2b20094..c9dde22 100644
--- a/ui/src/lib/api/service_specs.ts
+++ b/ui/src/lib/api/service_specs.ts
@@ -11,7 +11,7 @@ export async function listServiceSpecs(): Promise<Record<string, ServiceInfos>>
 
 export async function getServiceSpec(ssid: string): Promise<ServiceSpec> {
     if (ssid == "string") {
-        return Promise.resolve(new ServiceSpec({}));
+        return Promise.resolve(<ServiceSpec>{});
     } else {
         const res = await fetch(`/api/service_specs/` + ssid, {
             method: 'GET',
diff --git a/ui/src/lib/components/Header.svelte b/ui/src/lib/components/Header.svelte
index a7ec50b..a4b507a 100644
--- a/ui/src/lib/components/Header.svelte
+++ b/ui/src/lib/components/Header.svelte
@@ -26,12 +26,14 @@
  let className = '';
 
  export let routeId: string | null;
- export let sw_state: boolean;
+ export let sw_state: {triedUpdate: boolean; hasUpdate: boolean;};
  let helpLink = "";
- $: if (routeId.startsWith("/providers/new/[ptype]")) {
+ $: if (routeId && routeId.startsWith("/providers/new/[ptype]")) {
      helpLink = getHelpPathFromProvider($page.url.pathname.split("/")[3]);
- } else {
+ } else if (routeId) {
      helpLink = 'https://help.happydomain.org/' + encodeURIComponent($locale) + getHelpPathFromRoute(routeId);
+ } else {
+     helpLink = 'https://help.happydomain.org/' + encodeURIComponent($locale);
  }
 
  function getHelpPathFromProvider(ptype: string): string {
diff --git a/ui/src/lib/components/RecoverAccountForm.svelte b/ui/src/lib/components/RecoverAccountForm.svelte
index 9354074..47bb860 100644
--- a/ui/src/lib/components/RecoverAccountForm.svelte
+++ b/ui/src/lib/components/RecoverAccountForm.svelte
@@ -14,7 +14,8 @@
  import { t } from '$lib/translations';
  import { toasts } from '$lib/stores/toasts';
 
- export let data: {user: string; key: string};
+ export let user: string;
+ export let key: string;
  let value = "";
  let passwordConfirmation = "";
  let passwordState: boolean|undefined;
@@ -34,7 +35,7 @@
 
      if (valid && passwordState && passwordConfirmState) {
          formSent = true;
-         recoverAccount(data.user, data.key, value)
+         recoverAccount(user, key, value)
          .then(
              () => {
                  formSent = false;
diff --git a/ui/src/lib/components/domains/ModalHeader.svelte b/ui/src/lib/components/domains/ModalHeader.svelte
index 4c2c25c..374ee56 100644
--- a/ui/src/lib/components/domains/ModalHeader.svelte
+++ b/ui/src/lib/components/domains/ModalHeader.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+ // @ts-ignore
  import { escape } from 'html-escaper';
  import {
      ModalHeader,
diff --git a/ui/src/lib/components/domains/NewSubdomainModal.svelte b/ui/src/lib/components/domains/NewSubdomainModal.svelte
index 50c4c87..e5372f9 100644
--- a/ui/src/lib/components/domains/NewSubdomainModal.svelte
+++ b/ui/src/lib/components/domains/NewSubdomainModal.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
  import { createEventDispatcher } from 'svelte';
 
- import { escape } from 'html-escaper'; // @ts-ignore
+ // @ts-ignore
+ import { escape } from 'html-escaper';
  import {
      Input,
      InputGroup,
diff --git a/ui/src/lib/components/providers/CardImportableDomains.svelte b/ui/src/lib/components/providers/CardImportableDomains.svelte
index db58bfc..ce55ac2 100644
--- a/ui/src/lib/components/providers/CardImportableDomains.svelte
+++ b/ui/src/lib/components/providers/CardImportableDomains.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
- import { escape } from 'html-escaper'; // @ts-ignore
+ // @ts-ignore
+ import { escape } from 'html-escaper';
  import {
      Badge,
      Button,
diff --git a/ui/src/lib/model/provider.ts b/ui/src/lib/model/provider.ts
index 988358e..eaa76d1 100644
--- a/ui/src/lib/model/provider.ts
+++ b/ui/src/lib/model/provider.ts
@@ -2,6 +2,7 @@ export interface ProviderInfos {
     name: string;
     description: string;
     capabilities: Array<string>;
+    helplink: string;
 };
 
 export function getAvailableResourceTypes(pi: ProviderInfos): Array<number> {
diff --git a/ui/src/lib/model/toast.ts b/ui/src/lib/model/toast.ts
index 9e28cc4..e98355d 100644
--- a/ui/src/lib/model/toast.ts
+++ b/ui/src/lib/model/toast.ts
@@ -18,7 +18,7 @@ export class Toast implements NewToast {
     timeout: number | undefined = undefined;
     timeoutInterval: ReturnType<typeof setTimeout> | undefined = undefined;
     dismissFunc: (id: string) => void;
-    onclick: () => void;
+    onclick: undefined | (() => void) = undefined;
 
     constructor(obj: NewToast, dismiss: (id: string) => void) {
         if (obj.type !== undefined) this.type = obj.type;
diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte
index 6a12c87..dffcde9 100644
--- a/ui/src/routes/+layout.svelte
+++ b/ui/src/routes/+layout.svelte
@@ -18,7 +18,7 @@
  import { toasts } from '$lib/stores/toasts';
  import { t } from '$lib/translations';
 
- export let data: {route: {id: string | null;};};
+ export let data: {route: {id: string | null;}; sw_state: {triedUpdate: boolean; hasUpdate: boolean;};};
 
  window.onunhandledrejection = (e) => {
      if (e.reason.name == "NotAuthorizedError") {
diff --git a/ui/src/routes/+layout.ts b/ui/src/routes/+layout.ts
index e0a765a..16f09e4 100644
--- a/ui/src/routes/+layout.ts
+++ b/ui/src/routes/+layout.ts
@@ -14,7 +14,7 @@ function onSWupdate(sw_state: {hasUpdate: boolean}) {
         toasts.addToast({
             title: get_store_value(t)('upgrade.title'),
             message: get_store_value(t)('upgrade.content'),
-            onclick: () => location.reload(true),
+            onclick: () => location.reload(),
         });
     }
     sw_state.hasUpdate = true;
@@ -35,6 +35,9 @@ export const load: Load = async({ fetch, route, url }) => {
 
             registration.onupdatefound = () => {
                 const installingWorker = registration.installing
+
+                if (installingWorker === null) return;
+
                 installingWorker.onstatechange = () => {
                     if (installingWorker.state === 'installed' && navigator.serviceWorker.controller) {
                         onSWupdate(sw_state);
diff --git a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
index 34e8c2b..233c7c3 100644
--- a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
+++ b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
  import { goto } from '$app/navigation';
 
- import { escape } from 'html-escaper'; // @ts-ignore
+ // @ts-ignore
+ import { escape } from 'html-escaper';
  import {
      Button,
      ButtonGroup,
diff --git a/ui/src/routes/email-validation/+page.svelte b/ui/src/routes/email-validation/+page.svelte
index cd0c954..b554eb8 100644
--- a/ui/src/routes/email-validation/+page.svelte
+++ b/ui/src/routes/email-validation/+page.svelte
@@ -13,7 +13,7 @@
  import { toasts } from '$lib/stores/toasts';
 
  let error = "";
- export let data = { user: null, key: null };
+ export let data;
 
  if (data.user || data.key) {
      if (!data.user || !data.key) {
diff --git a/ui/src/routes/forgotten-password/+page.svelte b/ui/src/routes/forgotten-password/+page.svelte
index b50bc0a..86aeec6 100644
--- a/ui/src/routes/forgotten-password/+page.svelte
+++ b/ui/src/routes/forgotten-password/+page.svelte
@@ -8,7 +8,7 @@
  import RecoverAccountForm from '$lib/components/RecoverAccountForm.svelte';
 
  let error = "";
- export let data = { user: "", key: "" };
+ export let data;
 </script>
 
 <Container class="my-3">
@@ -16,9 +16,9 @@
         <Alert color="danger">
             {error}
         </Alert>
-    {:else if !data.user}
-        <ForgottenPasswordForm />
+    {:else if data.user && data.key}
+        <RecoverAccountForm user={data.user} key={data.key} />
     {:else}
-        <RecoverAccountForm {data} />
+        <ForgottenPasswordForm />
     {/if}
 </Container>