From 8453a020d5f46a63cea5d1a7e42b60a9aca223cf Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Mon, 9 Dec 2024 22:39:20 -0500
Subject: [PATCH] (core) Revert "Document type conversion UX/UI (#1181)"

Summary:
The recently-landed document type conversion feature was broken, failing
to change the document's type in both Jenkins CI runs and during manual
testing of the SaaS build of Grist.

This reverts the feature until a fix is ready.

Test Plan: N/A

Reviewers: dsagal

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D4411
---
 app/client/models/DocPageModel.ts   |  13 +-
 app/client/ui/DocumentSettings.ts   | 201 ++--------------------------
 app/client/ui2018/cssVars.ts        |   1 -
 app/common/UserAPI.ts               |  17 +--
 app/gen-server/ApiServer.ts         |  19 +--
 static/locales/en.client.json       |  23 +---
 test/gen-server/ApiServer.ts        |  24 +---
 test/nbrowser/DocTypeConversion.ts  | 187 --------------------------
 test/nbrowser/SavePosition.ntest.js |   1 +
 test/nbrowser/Timing.ts             |  38 +++++-
 test/nbrowser/elementUtils.ts       |  48 -------
 11 files changed, 58 insertions(+), 514 deletions(-)
 delete mode 100644 test/nbrowser/DocTypeConversion.ts
 delete mode 100644 test/nbrowser/elementUtils.ts

diff --git a/app/client/models/DocPageModel.ts b/app/client/models/DocPageModel.ts
index 8c196e2ef5..f0a2683b63 100644
--- a/app/client/models/DocPageModel.ts
+++ b/app/client/models/DocPageModel.ts
@@ -29,7 +29,6 @@ import {Holder, Observable, subscribe} from 'grainjs';
 import {Computed, Disposable, dom, DomArg, DomElementArg} from 'grainjs';
 import {makeT} from 'app/client/lib/localization';
 import {logTelemetryEvent} from 'app/client/lib/telemetry';
-import {DocumentType} from 'app/common/UserAPI';
 
 // tslint:disable:no-console
 
@@ -88,7 +87,7 @@ export interface DocPageModel {
   isTutorialTrunk: Observable<boolean>;
   isTutorialFork: Observable<boolean>;
   isTemplate: Observable<boolean>;
-  type: Observable<DocumentType>;
+
   importSources: ImportSource[];
 
   undoState: Observable<IUndoState|null>;          // See UndoStack for details.
@@ -148,8 +147,6 @@ export class DocPageModelImpl extends Disposable implements DocPageModel {
     (use, doc) => doc ? doc.isTutorialFork : false);
   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);
 
   public readonly importSources: ImportSource[] = [];
 
@@ -502,8 +499,7 @@ function buildDocInfo(doc: Document, mode: OpenDocMode | undefined): DocInfo {
   const isFork = Boolean(idParts.forkId || idParts.snapshotId);
   const isBareFork = isFork && idParts.trunkId === NEW_DOCUMENT_CODE;
   const isSnapshot = Boolean(idParts.snapshotId);
-  const type = doc.type;
-  const isTutorial = type === 'tutorial';
+  const isTutorial = doc.type === 'tutorial';
   const isTutorialTrunk = isTutorial && !isFork && mode !== 'default';
   const isTutorialFork = isTutorial && isFork;
 
@@ -515,7 +511,7 @@ function buildDocInfo(doc: Document, mode: OpenDocMode | undefined): DocInfo {
       // mode. Since the document's 'openMode' has no effect, don't bother trying
       // to set it here, as it'll potentially be confusing for other code reading it.
       openMode = 'default';
-    } else if (!isFork && type === 'template') {
+    } else if (!isFork && doc.type === 'template') {
       // Templates should always open in fork mode by default.
       openMode = 'fork';
     } else {
@@ -525,7 +521,7 @@ function buildDocInfo(doc: Document, mode: OpenDocMode | undefined): DocInfo {
   }
 
   const isPreFork = openMode === 'fork';
-  const isTemplate = type === 'template' && (isFork || isPreFork);
+  const isTemplate = doc.type === 'template' && (isFork || isPreFork);
   const isEditable = !isSnapshot && (canEdit(doc.access) || isPreFork);
   return {
     ...doc,
@@ -538,7 +534,6 @@ function buildDocInfo(doc: Document, mode: OpenDocMode | undefined): DocInfo {
     isSnapshot,
     isTutorialTrunk,
     isTutorialFork,
-    type,
     isTemplate,
     isReadonly: !isEditable,
     idParts,
diff --git a/app/client/ui/DocumentSettings.ts b/app/client/ui/DocumentSettings.ts
index ff583067eb..b2c9ba287b 100644
--- a/app/client/ui/DocumentSettings.ts
+++ b/app/client/ui/DocumentSettings.ts
@@ -29,18 +29,7 @@ import {commonUrls, GristLoadConfig} from 'app/common/gristUrls';
 import {not, propertyCompare} from 'app/common/gutil';
 import {getCurrency, locales} from 'app/common/Locales';
 import {isOwner, isOwnerOrEditor} from 'app/common/roles';
-import {DOCTYPE_NORMAL, DOCTYPE_TEMPLATE, DOCTYPE_TUTORIAL, DocumentType, persistType} from 'app/common/UserAPI';
-import {
-  Computed,
-  Disposable,
-  dom,
-  DomElementMethod,
-  fromKo,
-  IDisposableOwner,
-  makeTestId,
-  Observable,
-  styled
-} from 'grainjs';
+import {Computed, Disposable, dom, fromKo, IDisposableOwner, makeTestId, Observable, styled} from 'grainjs';
 import * as moment from 'moment-timezone';
 
 const t = makeT('DocumentSettings');
@@ -96,22 +85,6 @@ export class DocSettingsPage extends Disposable {
               {defaultCurrencyLabel: t("Local currency ({{currency}})", {currency: getCurrency(l)})})
           )
         }),
-        dom.create(AdminSectionItem, {
-          id: 'templateMode',
-          name: t('Template mode'),
-          description: t('Change document type'),
-          value: cssDocTypeContainer(
-            dom.create(
-              displayCurrentType,
-              docPageModel.type,
-            ),
-            cssSmallButton(t('Edit'),
-              dom.on('click', this._buildDocumentTypeModal.bind(this, true)),
-              testId('doctype-edit')
-            ),
-          ),
-          disabled: isDocOwner ? false : t('Only available to document owners'),
-        }),
       ]),
 
       dom.create(AdminSection, t('Data Engine'), [
@@ -147,6 +120,7 @@ export class DocSettingsPage extends Disposable {
           )),
           disabled: isDocOwner ? false : t('Only available to document owners'),
         }),
+
         dom.create(AdminSectionItem, {
           id: 'reload',
           name: t('Reload'),
@@ -154,6 +128,7 @@ export class DocSettingsPage extends Disposable {
           value: cssSmallButton(t('Reload data engine'), dom.on('click', this._reloadEngine.bind(this, true))),
           disabled: isDocEditor ? false : t('Only available to document editors'),
         }),
+
         canChangeEngine ? dom.create(AdminSectionItem, {
           id: 'python',
           name: t('Python'),
@@ -211,6 +186,7 @@ export class DocSettingsPage extends Disposable {
             href: getApiConsoleLink(docPageModel),
           }),
         }),
+
         dom.create(AdminSectionItem, {
           id: 'webhooks',
           name: t('Webhooks'),
@@ -248,11 +224,11 @@ export class DocSettingsPage extends Disposable {
     const docPageModel = this._gristDoc.docPageModel;
     modal((ctl, owner) => {
       this.onDispose(() => ctl.close());
-      const selected = Observable.create<TimingModalOption>(owner, TimingModalOption.Adhoc);
+      const selected = Observable.create<Option>(owner, Option.Adhoc);
       const page = Observable.create<TimingModalPage>(owner, TimingModalPage.Start);
 
       const startTiming = async () => {
-        if (selected.get() === TimingModalOption.Reload) {
+        if (selected.get() === Option.Reload) {
           page.set(TimingModalPage.Spinner);
           await this._gristDoc.docApi.startTiming();
           await docPageModel.appModel.api.getDocAPI(docPageModel.currentDocId.get()!).forceReload();
@@ -267,7 +243,7 @@ export class DocSettingsPage extends Disposable {
       const startPage = () => [
         cssRadioCheckboxOptions(
           dom.style('max-width', '400px'),
-          radioCheckboxOption(selected, TimingModalOption.Adhoc, dom('div',
+          radioCheckboxOption(selected, Option.Adhoc, dom('div',
             dom('div',
               dom('strong', t('Start timing')),
             ),
@@ -277,7 +253,7 @@ export class DocSettingsPage extends Disposable {
             ),
             testId('timing-modal-option-adhoc'),
           )),
-          radioCheckboxOption(selected, TimingModalOption.Reload, dom('div',
+          radioCheckboxOption(selected, Option.Reload, dom('div',
             dom('div',
               dom('strong', t('Time reload')),
             ),
@@ -313,111 +289,6 @@ export class DocSettingsPage extends Disposable {
     });
   }
 
-  private _buildDocumentTypeModal() {
-    const docPageModel = this._gristDoc.docPageModel;
-    modal((ctl, owner) => {
-      this.onDispose(() => ctl.close());
-      const currentDocType = docPageModel.type.get() as string;
-      let currentDocTypeOption;
-      switch (currentDocType) {
-        case DOCTYPE_TEMPLATE:
-          currentDocTypeOption = DocTypeOption.Template;
-          break;
-        case DOCTYPE_TUTORIAL:
-          currentDocTypeOption = DocTypeOption.Tutorial;
-          break;
-        default:
-          currentDocTypeOption = DocTypeOption.Regular;
-      }
-
-      const selected = Observable.create<DocTypeOption>(owner, currentDocTypeOption);
-
-      const doSetDocumentType = async () => {
-        const docId = docPageModel.currentDocId.get();
-        let docType: DocumentType;
-        if (selected.get() === DocTypeOption.Regular) {
-          docType = DOCTYPE_NORMAL;
-        } else if (selected.get() === DocTypeOption.Template) {
-          docType = DOCTYPE_TEMPLATE;
-        } else {
-          docType = DOCTYPE_TUTORIAL;
-        }
-        await persistType(docType, docId);
-        const {trunkId} = docPageModel.currentDoc.get()!.idParts;
-        window.location.replace(urlState().makeUrl({
-          docPage: "settings",
-          fork: undefined, // will be automatically set once the page is reloaded
-          doc: trunkId,
-        }));
-      };
-
-      const docTypeOption = (
-        {
-          type,
-          label,
-          description,
-          itemTestId
-        }: {
-          type: DocTypeOption,
-          label: string | any,
-          description: string,
-          itemTestId: DomElementMethod | null
-        }) => {
-        return radioCheckboxOption(selected, type, dom('div',
-          dom('div',
-            dom('strong', label),
-          ),
-          dom('div',
-            dom.style('margin-top', '8px'),
-            dom('span', description)
-          ),
-          itemTestId,
-        ));
-      };
-
-      const documentTypeOptions = () => [
-        cssRadioCheckboxOptions(
-          dom.style('max-width', '400px'),
-          docTypeOption({
-            type: DocTypeOption.Regular,
-            label: t('Regular document'),
-            description: t('Normal document behavior. All users work on the same copy of the document.'),
-            itemTestId: testId('doctype-modal-option-regular'),
-          }),
-          docTypeOption({
-            type: DocTypeOption.Template,
-            label: t('Template'),
-            description:  t('Document automatically opens in {{fiddleModeDocUrl}}. ' +
-              'Anyone may edit, which will create a new unsaved copy.',
-              {
-                fiddleModeDocUrl: cssLink({href: commonUrls.helpAPI, target: '_blank'}, t('fiddle mode'))
-              }
-            ),
-            itemTestId: testId('doctype-modal-option-template'),
-          }),
-          docTypeOption({
-            type: DocTypeOption.Tutorial,
-            label: t('Tutorial'),
-            description: t('Document automatically opens as a user-specific copy.'),
-            itemTestId: testId('doctype-modal-option-tutorial'),
-          }),
-        ),
-        cssModalButtons(
-          bigBasicButton(t('Cancel'), dom.on('click', () => ctl.close()), testId('doctype-modal-cancel')),
-          bigPrimaryButton(t(`Confirm change`),
-            dom.on('click', doSetDocumentType),
-            testId('doctype-modal-confirm'),
-          ),
-        )
-      ];
-      return [
-        cssModalTitle(t(`Change document type`)),
-        documentTypeOptions(),
-        testId('doctype-modal'),
-      ];
-    });
-  }
-
   private async _doSetEngine(val: EngineCode|undefined) {
     const docPageModel = this._gristDoc.docPageModel;
     if (this._engine.get() !== val) {
@@ -427,6 +298,8 @@ export class DocSettingsPage extends Disposable {
   }
 }
 
+
+
 function getApiConsoleLink(docPageModel: DocPageModel) {
   const url = new URL(location.href);
   url.pathname = '/apiconsole';
@@ -470,39 +343,6 @@ function buildLocaleSelect(
   );
 }
 
-type DocumentTypeItem = ACSelectItem & {type?: string};
-
-const typeList: DocumentTypeItem[] = [{
-  label: t('Regular'),
-  type: ''
-}, {
-  label: t('Template'),
-  type: 'template'
-}, {
-  label: t('Tutorial'),
-  type: 'tutorial'
-}].map((el) => ({
-  ...el,
-  value: el.label,
-  cleanText: el.label.trim().toLowerCase()
-}));
-
-function displayCurrentType(
-  owner: IDisposableOwner,
-  type: Observable<DocumentType|null>,
-) {
-  const typeObs = Computed.create(owner, use => {
-    const typeCode = use(type) ?? "";
-    const typeName = typeList.find(ty => ty.type === typeCode)?.label || typeCode;
-    return typeName;
-  });
-  return dom(
-    'div',
-    typeObs.get(),
-    testId('doctype-value')
-  );
-}
-
 const cssContainer = styled('div', `
   overflow-y: auto;
   position: relative;
@@ -622,7 +462,7 @@ enum TimingModalPage {
 /**
  * Enum for the different options in the timing modal.
  */
-enum TimingModalOption {
+enum Option {
   /**
    * Start timing and immediately forces a reload of the document and waits for the
    * document to be loaded, to show the results.
@@ -634,15 +474,6 @@ enum TimingModalOption {
   Adhoc,
 }
 
-/**
- * Enum for the different options in the document type Modal.
- */
-enum DocTypeOption {
-  Regular,
-  Template,
-  Tutorial,
-}
-
 // A version that is not underlined, and on hover mouse pointer indicates that copy is available
 const cssCopyLink = styled(cssLink, `
   word-wrap: break-word;
@@ -678,13 +509,3 @@ const cssWrap = styled('p', `
 const cssRedText = styled('span', `
   color: ${theme.errorText};
 `);
-
-const cssDocTypeContainer = styled('div', `
-  display: flex;
-  width: 172px;
-  align-items: center;
-  justify-content: space-between;
-  & > * {
-    display: inline-block;
-  }
-`);
diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
index 88aaa8cc99..e23104ddb6 100644
--- a/app/client/ui2018/cssVars.ts
+++ b/app/client/ui2018/cssVars.ts
@@ -386,7 +386,6 @@ export const theme = {
 
   /* Checkboxes */
   checkboxBg: new CustomProp('theme-checkbox-bg', undefined, colors.light),
-  checkboxSelectedFg: new CustomProp('theme-checkbox-selected-bg', undefined, colors.lightGreen),
   checkboxDisabledBg: new CustomProp('theme-checkbox-disabled-bg', undefined, colors.darkGrey),
   checkboxBorder: new CustomProp('theme-checkbox-border', undefined, colors.darkGrey),
   checkboxBorderHover: new CustomProp('theme-checkbox-border-hover', undefined, colors.hover),
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index f58f05b8de..efc0804284 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -128,22 +128,7 @@ export interface Workspace extends WorkspaceProperties {
   isSupportWorkspace?: boolean;
 }
 
-export const DOCTYPE_NORMAL = null;
-export const DOCTYPE_TEMPLATE = 'template';
-export const DOCTYPE_TUTORIAL = 'tutorial';
-
-// null stands for normal document type, the one set by default at document creation.
-export type DocumentType = 'template'|'tutorial'|null;
-
-export function persistType(type: DocumentType, docId: string|undefined) {
-  docId = docId?.split("~")[0];
-  return fetch(`/o/docs/api/docs/${docId}`, {
-    method: 'PATCH',
-    headers: {"Content-Type": "application/json"},
-    credentials: 'include',
-    body: JSON.stringify({type})
-  });
-}
+export type DocumentType = 'tutorial'|'template';
 
 // Non-core options for a document.
 // "Non-core" means bundled into a single options column in the database.
diff --git a/app/gen-server/ApiServer.ts b/app/gen-server/ApiServer.ts
index 192bb8ed63..170fc8103a 100644
--- a/app/gen-server/ApiServer.ts
+++ b/app/gen-server/ApiServer.ts
@@ -8,11 +8,7 @@ import pick from 'lodash/pick';
 import {ApiError} from 'app/common/ApiError';
 import {FullUser} from 'app/common/LoginSessionAPI';
 import {BasicRole} from 'app/common/roles';
-import {DOCTYPE_NORMAL,
-  DOCTYPE_TEMPLATE,
-  DOCTYPE_TUTORIAL,
-  OrganizationProperties,
-  PermissionDelta} from 'app/common/UserAPI';
+import {OrganizationProperties, PermissionDelta} from 'app/common/UserAPI';
 import {Document} from "app/gen-server/entity/Document";
 import {Organization} from 'app/gen-server/entity/Organization';
 import {User} from 'app/gen-server/entity/User';
@@ -299,20 +295,7 @@ export class ApiServer {
     // PATCH /api/docs/:did
     // Update the specified doc.
     this._app.patch('/api/docs/:did', expressWrap(async (req, res) => {
-      const validDocTypes = [
-        DOCTYPE_NORMAL,
-        DOCTYPE_TEMPLATE,
-        DOCTYPE_TUTORIAL
-      ];
-
-      if ('type' in req.body && ! validDocTypes.includes(req.body.type)){
-        const errMsg = "Bad Request. 'type' key authorized values : "
-                        + `'${DOCTYPE_TEMPLATE}', '${DOCTYPE_TUTORIAL}' or ${DOCTYPE_NORMAL}`;
-        return res.status(400).send({error: errMsg});
-      }
-
       const {data, ...result} = await this._dbManager.updateDocument(getDocScope(req), req.body);
-
       if (data && 'name' in req.body) { this._logRenameDocumentEvents(req, data); }
       return sendReply(req, res, {...result, data: data?.current.id});
     }));
diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index c1350e5b95..c8fdbe8416 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -354,22 +354,7 @@
         "Timing is on": "Timing is on",
         "You can make changes to the document, then stop timing to see the results.": "You can make changes to the document, then stop timing to see the results.",
         "Only available to document editors": "Only available to document editors",
-        "Only available to document owners": "Only available to document owners",
-        "Template mode": "Template mode",
-        "Change document type": "Change document type",
-        "Edit": "Edit",
-        "Change nature of document": "Change nature of document",
-        "Regular document": "Regular document",
-        "Normal document behavior. All users work on the same copy of the document.": "Normal document behavior. All users work on the same copy of the document.",
-        "Regular": "Regular",
-        "Template": "Template",
-        "Document automatically opens in {{fiddleModeDocUrl}}. Anyone may edit, which will create a new unsaved copy.": "Document automatically opens in {{fiddleModeDocUrl}}. Anyone may edit, which will create a new unsaved copy.",
-        "fiddle mode": "fiddle mode",
-        "Tutorial": "Tutorial",
-        "Document automatically opens as a user-specific copy.": "Document automatically opens as a user-specific copy.",
-        "Confirm change": "Confirm change",
-        "This will perform a hard reload of the data engine. This may help if the data engine is stuck in an infinite loop, is indefinitely processing the latest change, or has crashed. No data will be lost, except possibly currently pending actions.": "This will perform a hard reload of the data engine. This may help if the data engine is stuck in an infinite loop, is indefinitely processing the latest change, or has crashed. No data will be lost, except possibly currently pending actions.",
-        "Once you start timing, Grist will measure the time it takes to evaluate each formula. This allows diagnosing which formulas are responsible for slow performance when a document is first opened, or when a document responds to changes.": "Once you start timing, Grist will measure the time it takes to evaluate each formula. This allows diagnosing which formulas are responsible for slow performance when a document is first opened, or when a document responds to changes."
+        "Only available to document owners": "Only available to document owners"
     },
     "DocumentUsage": {
         "Attachments Size": "Size of Attachments",
@@ -982,11 +967,7 @@
         "Reference": "Reference",
         "Reference List": "Reference List",
         "Attachment": "Attachment",
-        "Search columns": "Search columns",
-        "By Name": "By Name",
-        "By Date Modified": "By date Modified",
-        "Light": "Light",
-        "Custom": "Custom"
+        "Search columns": "Search columns"
     },
     "modals": {
         "Cancel": "Cancel",
diff --git a/test/gen-server/ApiServer.ts b/test/gen-server/ApiServer.ts
index 3f7d007ba6..c6ee2474d8 100644
--- a/test/gen-server/ApiServer.ts
+++ b/test/gen-server/ApiServer.ts
@@ -5,7 +5,7 @@ import {configForUser, configWithPermit, getRowCounts as getRowCountsForDb} from
 import * as testUtils from 'test/server/testUtils';
 
 import {createEmptyOrgUsageSummary, OrgUsageSummary} from 'app/common/DocUsage';
-import {DOCTYPE_NORMAL, DOCTYPE_TEMPLATE, DOCTYPE_TUTORIAL, Document, Workspace} from 'app/common/UserAPI';
+import {Document, Workspace} from 'app/common/UserAPI';
 import {Organization} from 'app/gen-server/entity/Organization';
 import {Product} from 'app/gen-server/entity/Product';
 import {HomeDBManager, UserChange} from 'app/gen-server/lib/homedb/HomeDBManager';
@@ -1274,21 +1274,6 @@ describe('ApiServer', function() {
     assert.deepEqual(resp.data?.options, undefined);
   });
 
-  it('PATCH /api/docs/{did} supports proper values for type key', async function() {
-    const did = await dbManager.testGetId('Surprise2');
-    // Check setting null for normal document type
-    let resp = await axios.patch(`${homeUrl}/api/docs/${did}`, {type: DOCTYPE_NORMAL}, chimpy);
-    assert.equal(resp.status, 200);
-
-    // check setting template as document type
-    resp = await axios.patch(`${homeUrl}/api/docs/${did}`, {type: DOCTYPE_TEMPLATE}, chimpy);
-    assert.equal(resp.status, 200);
-
-    // check setting tutorial as document type
-    resp = await axios.patch(`${homeUrl}/api/docs/${did}`, {type: DOCTYPE_TUTORIAL}, chimpy);
-    assert.equal(resp.status, 200);
-  });
-
   it('PATCH /api/docs/{did} returns 404 appropriately', async function() {
     // Attempt to rename a doc that doesn't exist.
     const resp = await axios.patch(`${homeUrl}/api/docs/9999`, {
@@ -1313,13 +1298,6 @@ describe('ApiServer', function() {
     assert.equal(resp.status, 400);
   });
 
-  it('PATCH /api/docs/{did} returns 400 on wrong type values', async function() {
-    // Use an unavailable property and check that the operation fails with 400.
-    const did = await dbManager.testGetId('Surprise2');
-    const resp = await axios.patch(`${homeUrl}/api/docs/${did}`, {"type": "invalid"}, chimpy);
-    assert.equal(resp.status, 400);
-  });
-
   it('DELETE /api/docs/{did} is operational', async function() {
     const oid = await dbManager.testGetId('NASA');
     const wid = await dbManager.testGetId('Rovers');
diff --git a/test/nbrowser/DocTypeConversion.ts b/test/nbrowser/DocTypeConversion.ts
deleted file mode 100644
index 26fd308941..0000000000
--- a/test/nbrowser/DocTypeConversion.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { UserAPI } from "app/common/UserAPI";
-import { assert, driver, until } from "mocha-webdriver";
-import * as gu from "test/nbrowser/gristUtils";
-import { setupTestSuite } from "test/nbrowser/testUtils";
-import { Button, button, element, label, option} from "test/nbrowser/elementUtils";
-
-type TypeLabels = "Regular" | "Template" | "Tutorial";
-
-
-describe("DocTypeConversion", function () {
-  this.timeout(20000);
-  const cleanup = setupTestSuite();
-
-  let userApi: UserAPI;
-  let docId: string;
-  let session: gu.Session;
-
-  before(async () => {
-    session = await gu.session().teamSite.login();
-    docId = await session.tempNewDoc(cleanup);
-    userApi = session.createHomeApi();
-  });
-
-  async function assertExistsButton(button: Button, text: String) {
-    await gu.waitToPass(async () => {
-      assert.equal(await button.element().getText(), text);
-    });
-    assert.isTrue(await button.visible());
-  }
-
-  async function checkDisplayedLabel(typeLabel: TypeLabels) {
-    // Wait in case of page reload
-    await displayedLabel.wait();
-
-    assert.equal(await displayedLabel.element().getText(), typeLabel);
-  }
-
-  async function convert(from: TypeLabels, to: TypeLabels) {
-    await gu.openDocumentSettings();
-
-    // Ensure that initial document type is the expected one.
-    const displayedLabelElement = displayedLabel.element();
-
-    // Check initially displayed label value
-    await checkDisplayedLabel(from);
-
-    // Click to open the modal
-    await editButton.click();
-
-    // Wait for modal.
-    await modal.wait();
-
-    // Select the desired Document type
-    await optionByLabel[to].click();
-
-    assert.isTrue(await optionByLabel[to]?.checked());
-
-    // Confirm the choice
-    await modalConfirm.click();
-
-    // Wait for the page to be unloaded
-    await driver.wait(until.stalenessOf(displayedLabelElement), 3000);
-
-    // checks that the displayedLabel is now equal to convert destination
-    await checkDisplayedLabel(to);
-  }
-
-  async function isRegular(){
-    assert.isFalse(await saveCopyButton.present());
-    assert.isFalse(await fiddleTag.present());
-  }
-
-  async function isTemplate(){
-    await assertExistsButton(saveCopyButton, "Save Copy");
-    assert.isTrue(await fiddleTag.visible());
-  }
-
-  async function isTutorial(){
-    await assertExistsButton(saveCopyButton, "Save Copy");
-    assert.isFalse(await fiddleTag.present());
-  }
-
-  it("should display the modal with only the current type selected", async function () {
-    await gu.openDocumentSettings();
-    // Make sure we see the Edit button of document type conversion.
-    await assertExistsButton(editButton, "Edit");
-
-    // Check that Document type is Regular before any conversion was ever apply to It.
-    assert.equal(await displayedLabel.element().getText(), "Regular");
-
-    await editButton.click();
-
-    // Wait for modal.
-    await modal.wait();
-
-    // We have three options.
-    assert.isTrue(await optionRegular.visible());
-    assert.isTrue(await optionTemplate.visible());
-    assert.isTrue(await optionTutorial.visible());
-
-    // Regular is selected cause its the current mode.
-    assert.isTrue(await optionRegular.checked());
-    assert.isFalse(await optionTemplate.checked());
-    assert.isFalse(await optionTutorial.checked());
-
-    // check that cancel works
-    await modalCancel.click();
-    assert.isFalse(await modal.present());
-  });
-
-  // If the next six tests succeed so each document type can properly be converted to every other
-  it('should convert from Regular to Template', async function() {
-    await convert("Regular", "Template");
-    await isTemplate();
-  });
-
-  it('should convert from Template to Tutorial', async function() {
-    await convert("Template", "Tutorial");
-    await isTutorial();
-  });
-
-  it('should convert from Tutorial to Regular', async function() {
-    await convert("Tutorial", "Regular");
-    await isRegular();
-  });
-
-  it('should convert from Regular to Tutorial', async function() {
-    await convert("Regular", "Tutorial");
-    await isTutorial();
-  });
-
-  it('should convert from Tutorial to Template', async function() {
-    await convert("Tutorial", "Template");
-    await isTemplate();
-  });
-
-  it('should convert from Template to Regular', async function() {
-    await convert("Template", "Regular");
-    await isRegular();
-  });
-
-  it('should be disabled for non-owners', async function() {
-    await userApi.updateDocPermissions(docId, {users: {
-      [gu.translateUser('user2').email]: 'editors',
-    }});
-
-    const session = await gu.session().teamSite.user('user2').login();
-    await session.loadDoc(`/doc/${docId}`);
-    await driver.sleep(500);
-    await gu.openDocumentSettings();
-
-    const start = driver.find('.test-settings-doctype-edit');
-    assert.equal(await start.isPresent(), true);
-
-    // Check that we have an informative tooltip.
-    await start.mouseMove();
-    // Note that .test-tooltip may appear blank a first time,
-    // hence the necessity to use waitToPass instead of findWait.
-    await gu.waitToPass(async () => {
-      assert.match(await driver.find('.test-tooltip').getText(), /Only available to document owners/);
-    });
-
-    // Nothing should happen on click. We click the location rather than the element, since the
-    // element isn't actually clickable.
-    await start.mouseMove();
-    await driver.withActions(a => a.press().release());
-    await driver.sleep(100);
-
-    assert.equal(await driver.find(".test-settings-doctype-modal").isPresent(), false);
-  });
-});
-
-const editButton = button('.test-settings-doctype-edit');
-const saveCopyButton = button('.test-tb-share-action');
-const displayedLabel = label('.test-settings-doctype-value');
-const modal = element('.test-settings-doctype-modal');
-const optionRegular = option('.test-settings-doctype-modal-option-regular');
-const optionTemplate = option('.test-settings-doctype-modal-option-template');
-const optionTutorial = option('.test-settings-doctype-modal-option-tutorial');
-const optionByLabel = {
-  'Tutorial': optionTutorial,
-  'Template': optionTemplate,
-  'Regular': optionRegular
-};
-const modalConfirm = button('.test-settings-doctype-modal-confirm');
-const modalCancel = button('.test-settings-doctype-modal-cancel');
-const fiddleTag = element('.test-fiddle-tag');
diff --git a/test/nbrowser/SavePosition.ntest.js b/test/nbrowser/SavePosition.ntest.js
index 51392d0fd9..c9c5a4abc1 100644
--- a/test/nbrowser/SavePosition.ntest.js
+++ b/test/nbrowser/SavePosition.ntest.js
@@ -9,6 +9,7 @@ describe('SavePosition.ntest', function() {
     this.timeout(Math.max(this.timeout(), 20000)); // Long-running test, unfortunately
     await gu.supportOldTimeyTestCode();
     await gu.useFixtureDoc(cleanup, "World.grist", true);
+    await gu.hideBanners();
   });
 
   afterEach(function() {
diff --git a/test/nbrowser/Timing.ts b/test/nbrowser/Timing.ts
index 31b69cb3dc..9659cdf4d2 100644
--- a/test/nbrowser/Timing.ts
+++ b/test/nbrowser/Timing.ts
@@ -3,7 +3,6 @@ import difference from 'lodash/difference';
 import { assert, driver } from "mocha-webdriver";
 import * as gu from "test/nbrowser/gristUtils";
 import { setupTestSuite } from "test/nbrowser/testUtils";
-import { button, element, label, option } from "test/nbrowser/elementUtils";
 
 describe("Timing", function () {
   this.timeout(20000);
@@ -193,6 +192,43 @@ describe("Timing", function () {
   });
 });
 
+const element = (testId: string) => ({
+  element() {
+    return driver.find(testId);
+  },
+  async wait() {
+    await driver.findWait(testId, 1000);
+  },
+  async visible() {
+    return await this.element().isDisplayed();
+  },
+  async present() {
+    return await this.element().isPresent();
+  }
+});
+
+const label = (testId: string) => ({
+  ...element(testId),
+  async text() {
+    return this.element().getText();
+  },
+});
+
+const button = (testId: string) => ({
+  ...element(testId),
+  async click() {
+    await gu.scrollIntoView(this.element());
+    await this.element().click();
+  },
+});
+
+const option = (testId: string) => ({
+  ...button(testId),
+  async checked() {
+    return 'true' === await this.element().findClosest("label").find("input[type='checkbox']").getAttribute('checked');
+  }
+});
+
 const startTiming = button(".test-settings-timing-start");
 const stopTiming = button(".test-settings-timing-stop");
 const timingText = label(".test-settings-timing-desc");
diff --git a/test/nbrowser/elementUtils.ts b/test/nbrowser/elementUtils.ts
deleted file mode 100644
index 11984ccff5..0000000000
--- a/test/nbrowser/elementUtils.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { driver, WebElementPromise } from "mocha-webdriver";
-import * as gu from "test/nbrowser/gristUtils";
-
-export interface Button {
-  click(): Promise<void>;
-  element(): WebElementPromise;
-  wait(): Promise<void>;
-  visible(): Promise<boolean>;
-  present(): Promise<boolean>;
-}
-
-export const element = (testId: string) => ({
-  element() {
-    return driver.find(testId);
-  },
-  async wait() {
-    await driver.findWait(testId, 10000);
-  },
-  async visible() {
-    return await this.element().isDisplayed();
-  },
-  async present() {
-    return await this.element().isPresent();
-  }
-});
-
-export const label = (testId: string) => ({
-  ...element(testId),
-  async text() {
-    return this.element().getText();
-  },
-});
-
-export const button = (testId: string): Button => ({
-  ...element(testId),
-  async click() {
-    await gu.scrollIntoView(this.element());
-    await this.element().click();
-  },
-});
-
-export const option = (testId: string) => ({
-  ...button(testId),
-  async checked() {
-    return 'true' === await this.element().findClosest("label").find("input[type='checkbox']").getAttribute('checked');
-  }
-});
-