From aa9e42bd47e651c57d4d3d97d7cfadeba98f92cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Cutzach?= <gregoire@cutzach.com>
Date: Thu, 12 Sep 2024 15:36:51 +0200
Subject: [PATCH] fix: following fflorent review

---
 app/client/models/DocPageModel.ts  |  2 +-
 app/client/ui/DocumentSettings.ts  | 12 +++---------
 test/nbrowser/DocTypeConversion.ts |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/client/models/DocPageModel.ts b/app/client/models/DocPageModel.ts
index 78069d81..696ce357 100644
--- a/app/client/models/DocPageModel.ts
+++ b/app/client/models/DocPageModel.ts
@@ -149,7 +149,7 @@ export class DocPageModelImpl extends Disposable implements DocPageModel {
   public readonly isTemplate = Computed.create(this, this.currentDoc,
     (use, doc) => doc ? doc.isTemplate : false);
   public readonly type = Computed.create(this, this.currentDoc,
-    (use, doc) => doc?.type?? null);
+    (use, doc) => doc?.type ?? null);
 
   public readonly importSources: ImportSource[] = [];
 
diff --git a/app/client/ui/DocumentSettings.ts b/app/client/ui/DocumentSettings.ts
index 302114ca..4cb97092 100644
--- a/app/client/ui/DocumentSettings.ts
+++ b/app/client/ui/DocumentSettings.ts
@@ -310,9 +310,6 @@ export class DocSettingsPage extends Disposable {
       const currentDocType = docPageModel.type.get() as string;
       let currentDocTypeOption;
       switch (currentDocType) {
-        case "":
-          currentDocTypeOption = DocTypeOption.Regular;
-          break;
         case "Template":
           currentDocTypeOption = DocTypeOption.Template;
           break;
@@ -335,11 +332,8 @@ export class DocSettingsPage extends Disposable {
         } else {
           docType = "Tutorial";
         }
-        persistType(docType, docId)
-        .then(()=>window.location.reload())
-        .catch(err=>console.log(err));
-
-        ctl.close();
+        await persistType(docType, docId);
+        window.location.reload();
       };
 
       const documentTypeOptions = () => [
@@ -415,7 +409,7 @@ function persistType(type: string|null, docId: string|undefined){
       headers: {"Content-Type": "application/json"},
       credentials: 'include',
       body:JSON.stringify({type})
-    }).catch((err)=>{ console.log(err); });
+    });
 }
 
 function getApiConsoleLink(docPageModel: DocPageModel) {
diff --git a/test/nbrowser/DocTypeConversion.ts b/test/nbrowser/DocTypeConversion.ts
index 8b0ef6ad..583ef48d 100644
--- a/test/nbrowser/DocTypeConversion.ts
+++ b/test/nbrowser/DocTypeConversion.ts
@@ -1,4 +1,5 @@
 import { UserAPI } from "app/common/UserAPI";
+//import { assert, By, driver, until } from "mocha-webdriver";
 import { assert, driver } from "mocha-webdriver";
 import * as gu from "test/nbrowser/gristUtils";
 import { setupTestSuite } from "test/nbrowser/testUtils";
@@ -57,8 +58,7 @@ describe("Document Type Conversion", function () {
     // Confirm the choice
     await modalConfirm.click();
 
-    // await for the page reload
-    await driver.sleep(1000);
+    await driver.sleep(3000);
 
     // check that the displayedLabel is now equal to convert destination
     assert.equal(await displayedLabel.element().getText(), to);