From c95dca58615542bcbd1e273996075aed385d8404 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Wed, 27 Mar 2024 08:25:09 -0400
Subject: [PATCH] Fix imports

---
 .../stories/RevisionsDialog.stories.svelte    |  4 +-
 .../stories/RevisionIcon.stories.svelte       |  4 +-
 .../stories/UploadOptions.stories.svelte      |  5 +--
 .../app/stories/ActionBar.stories.svelte      |  6 +--
 src/pages/app/stories/Document.stories.svelte |  2 +-
 .../stories/DocumentThumbnail.stories.svelte  |  2 +-
 .../app/stories/Documents.stories.svelte      | 38 ++++++++-----------
 .../app/stories/SearchBar.stories.svelte      | 15 +++++---
 .../app/stories/SearchInput.stories.svelte    |  5 ++-
 .../app/stories/SearchLink.stories.svelte     |  7 ++--
 .../viewer/stories/AllText.stories.svelte     |  8 ++--
 src/pages/viewer/stories/Body.stories.svelte  |  8 ++--
 .../viewer/stories/Header.stories.svelte      |  4 +-
 .../viewer/stories/Sidebar.stories.svelte     |  6 +--
 src/projects/stories/Browser.stories.svelte   | 12 +++---
 .../stories/ProjectList.stories.svelte        |  8 ++--
 .../stories/ProjectListItem.stories.svelte    |  5 +--
 src/test/handlers/accounts.ts                 |  4 +-
 src/test/handlers/projects.ts                 |  2 +-
 19 files changed, 68 insertions(+), 77 deletions(-)

diff --git a/src/common/dialog/stories/RevisionsDialog.stories.svelte b/src/common/dialog/stories/RevisionsDialog.stories.svelte
index 91957cedf..9096d3f41 100644
--- a/src/common/dialog/stories/RevisionsDialog.stories.svelte
+++ b/src/common/dialog/stories/RevisionsDialog.stories.svelte
@@ -6,7 +6,7 @@
 
   import RevisionsDialog from "../RevisionsDialog.svelte";
 
-  import documentFixture from "../../../pages/app/test/fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
   import { revisionControl } from "../../../test/handlers/documents";
   import { mockGetMe } from "../../../test/handlers/accounts";
 
@@ -26,7 +26,7 @@
   const args = {
     enabled: true,
     documentId: "1",
-    revisions: documentFixture.revisions,
+    revisions: document.revisions,
     onSave: action("Save"),
     onCancel: action("Cancel"),
   };
diff --git a/src/common/stories/RevisionIcon.stories.svelte b/src/common/stories/RevisionIcon.stories.svelte
index 70eed17b3..2fb82e68d 100644
--- a/src/common/stories/RevisionIcon.stories.svelte
+++ b/src/common/stories/RevisionIcon.stories.svelte
@@ -4,10 +4,10 @@
 
   import RevisionIcon from "../RevisionIcon.svelte";
 
-  import documentFixture from "../../pages/app/test/fixtures/document.json";
+  import { document } from "../../test/fixtures/documents";
 
   const args = {
-    revisions: documentFixture.revisions,
+    revisions: document.revisions,
     showCount: true,
   };
 
diff --git a/src/common/stories/UploadOptions.stories.svelte b/src/common/stories/UploadOptions.stories.svelte
index 14d9be395..fd14fdbe5 100644
--- a/src/common/stories/UploadOptions.stories.svelte
+++ b/src/common/stories/UploadOptions.stories.svelte
@@ -5,10 +5,7 @@
 
   let args = {};
 
-  import {
-    mockGetMe,
-    mockGetOrg,
-  } from "../../pages/app/accounts/stories/mockData";
+  import { mockGetMe, mockGetOrg } from "../../test/handlers/accounts";
 
   export const meta = {
     title: "Common / Upload Options",
diff --git a/src/pages/app/stories/ActionBar.stories.svelte b/src/pages/app/stories/ActionBar.stories.svelte
index 8dfada78d..3e4a3a0d7 100644
--- a/src/pages/app/stories/ActionBar.stories.svelte
+++ b/src/pages/app/stories/ActionBar.stories.svelte
@@ -1,9 +1,9 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story, Template } from "@storybook/addon-svelte-csf";
   import { action } from "@storybook/addon-actions";
   import ActionBar from "../ActionBar.svelte";
 
-  import documentFixture from "../../viewer/fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
 
   export const meta = {
     title: "App / Action Bar",
@@ -15,7 +15,7 @@
     loggedIn: true,
     data: {
       loading: false,
-      documents: [documentFixture, documentFixture, documentFixture],
+      documents: [document, document, document],
     },
     selection: {
       checked: false,
diff --git a/src/pages/app/stories/Document.stories.svelte b/src/pages/app/stories/Document.stories.svelte
index 8fb7fc445..448063deb 100644
--- a/src/pages/app/stories/Document.stories.svelte
+++ b/src/pages/app/stories/Document.stories.svelte
@@ -3,7 +3,7 @@
   import Document from "../Document.svelte";
 
   import * as structure from "../../../structure/document.js";
-  import document from "../fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
 
   export const meta = {
     title: "App / Documents / Document",
diff --git a/src/pages/app/stories/DocumentThumbnail.stories.svelte b/src/pages/app/stories/DocumentThumbnail.stories.svelte
index 228924071..86c32baff 100644
--- a/src/pages/app/stories/DocumentThumbnail.stories.svelte
+++ b/src/pages/app/stories/DocumentThumbnail.stories.svelte
@@ -3,7 +3,7 @@
   import DocumentThumbnail from "../DocumentThumbnail.svelte";
 
   import { Document } from "../../../structure/document.js";
-  import document from "../fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
 
   export const meta = {
     title: "App / Documents / Document Thumbnail",
diff --git a/src/pages/app/stories/Documents.stories.svelte b/src/pages/app/stories/Documents.stories.svelte
index e63fe86df..9b54d76cb 100644
--- a/src/pages/app/stories/Documents.stories.svelte
+++ b/src/pages/app/stories/Documents.stories.svelte
@@ -1,9 +1,11 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story, Template } from "@storybook/addon-svelte-csf";
   import Documents from "../Documents.svelte";
 
   import { layout } from "../../../manager/layout.js";
-  import * as mock from "./mock";
+  import { users, organizations } from "../../../test/handlers/accounts";
+  import { projects } from "../../../test/handlers/projects";
+  import { runs } from "../../../test/handlers/addons";
 
   export const meta = {
     title: "App / Documents / Documents",
@@ -22,6 +24,14 @@
   };
 
   let container;
+
+  const handlers = [
+    users.data,
+    users.me,
+    organizations.data,
+    projects.data,
+    runs.data,
+  ];
 </script>
 
 <Template let:args>
@@ -35,13 +45,7 @@
   {args}
   parameters={{
     msw: {
-      handlers: [
-        mock.users.data,
-        mock.users.me,
-        mock.organizations.data,
-        mock.projects.data,
-        mock.runs.data,
-      ],
+      handlers,
     },
   }}
 />
@@ -51,13 +55,7 @@
   args={{ ...args, embed: true }}
   parameters={{
     msw: {
-      handlers: [
-        mock.users.data,
-        mock.users.me,
-        mock.organizations.data,
-        mock.projects.data,
-        mock.runs.data,
-      ],
+      handlers,
     },
   }}
 />
@@ -67,13 +65,7 @@
   args={{ ...args, dialog: true }}
   parameters={{
     msw: {
-      handlers: [
-        mock.users.data,
-        mock.users.me,
-        mock.organizations.data,
-        mock.projects.data,
-        mock.runs.data,
-      ],
+      handlers,
     },
   }}
 />
diff --git a/src/pages/app/stories/SearchBar.stories.svelte b/src/pages/app/stories/SearchBar.stories.svelte
index 6b8d0c200..dc322994c 100644
--- a/src/pages/app/stories/SearchBar.stories.svelte
+++ b/src/pages/app/stories/SearchBar.stories.svelte
@@ -1,7 +1,8 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story, Template } from "@storybook/addon-svelte-csf";
   import SearchBar from "../SearchBar.svelte";
-  import * as mock from "./mock";
+  import { organizations, users } from "../../../test/handlers/accounts";
+  import { projects } from "../../../test/handlers/projects";
 
   export const meta = {
     title: "App / Search / Search Bar",
@@ -9,6 +10,8 @@
     tags: ["autodocs"],
     parameters: { layout: "centered" },
   };
+
+  const handlers = [users.data, organizations.data, projects.data];
 </script>
 
 <Template let:args>
@@ -22,7 +25,7 @@
   args={{ search: "project:example-project-123" }}
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers,
     },
   }}
 />
@@ -32,7 +35,7 @@
   args={{ compact: true, search: "project:example-project-123" }}
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers,
     },
   }}
 />
@@ -42,7 +45,7 @@
   args={{ example: true, search: "project:example-project-123" }}
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers,
     },
   }}
 />
@@ -52,7 +55,7 @@
   args={{ dialog: true, search: "user:example-user-123" }}
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers,
     },
   }}
 />
diff --git a/src/pages/app/stories/SearchInput.stories.svelte b/src/pages/app/stories/SearchInput.stories.svelte
index b04202fd5..12ffeb47b 100644
--- a/src/pages/app/stories/SearchInput.stories.svelte
+++ b/src/pages/app/stories/SearchInput.stories.svelte
@@ -2,7 +2,8 @@
   import { Story } from "@storybook/addon-svelte-csf";
   import SearchInput from "../SearchInput.svelte";
 
-  import * as mock from "./mock";
+  import { organizations, users } from "../../../test/handlers/accounts";
+  import { projects } from "../../../test/handlers/projects";
 
   export const meta = {
     title: "App / Search / Search Input",
@@ -16,7 +17,7 @@
   name="default"
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers: [users.data, organizations.data, projects.data],
     },
   }}
 >
diff --git a/src/pages/app/stories/SearchLink.stories.svelte b/src/pages/app/stories/SearchLink.stories.svelte
index 6ccc43177..176d702a5 100644
--- a/src/pages/app/stories/SearchLink.stories.svelte
+++ b/src/pages/app/stories/SearchLink.stories.svelte
@@ -1,7 +1,8 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story } from "@storybook/addon-svelte-csf";
   import SearchLink from "../SearchLink.svelte";
-  import * as mock from "./mock";
+  import { organizations, users } from "../../../test/handlers/accounts";
+  import { projects } from "../../../test/handlers/projects";
 
   export const meta = {
     title: "App / Search / Search Link",
@@ -15,7 +16,7 @@
   name="default"
   parameters={{
     msw: {
-      handlers: [mock.users.data, mock.organizations.data, mock.projects.data],
+      handlers: [users.data, organizations.data, projects.data],
     },
   }}
 >
diff --git a/src/pages/viewer/stories/AllText.stories.svelte b/src/pages/viewer/stories/AllText.stories.svelte
index 897cea481..d6dd6c0b0 100644
--- a/src/pages/viewer/stories/AllText.stories.svelte
+++ b/src/pages/viewer/stories/AllText.stories.svelte
@@ -1,10 +1,10 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story } from "@storybook/addon-svelte-csf";
   import AllText from "../AllText.svelte";
 
-  import { Document } from "@/structure/document.js";
-  import { viewer } from "@/viewer/viewer.js";
-  import document from "../fixtures/document.json";
+  import { Document } from "../../../structure/document.js";
+  import { viewer } from "../../../viewer/viewer.js";
+  import { document } from "../../../test/fixtures/documents";
 
   viewer.document = new Document(document);
 
diff --git a/src/pages/viewer/stories/Body.stories.svelte b/src/pages/viewer/stories/Body.stories.svelte
index 2d8d2d7e8..199e16b34 100644
--- a/src/pages/viewer/stories/Body.stories.svelte
+++ b/src/pages/viewer/stories/Body.stories.svelte
@@ -1,10 +1,9 @@
-<script context="module">
+<script lang="ts" context="module">
   import { Story } from "@storybook/addon-svelte-csf";
   import Body from "../Body.svelte";
   import { Document } from "../../../structure/document.js";
-  import document from "../fixtures/document.json";
-
-  import { doc } from "@/viewer/document.js";
+  import { document } from "../../../test/fixtures/documents";
+  import { doc } from "../../../viewer/document.js";
   import { viewer } from "../../../viewer/viewer.js";
 
   export const meta = {
@@ -15,6 +14,7 @@
 
   // not clear this does anything useful
   viewer.doc = new Document(document);
+  // @ts-ignore
   doc.viewer = viewer;
 </script>
 
diff --git a/src/pages/viewer/stories/Header.stories.svelte b/src/pages/viewer/stories/Header.stories.svelte
index 57a0a640c..1d6805b13 100644
--- a/src/pages/viewer/stories/Header.stories.svelte
+++ b/src/pages/viewer/stories/Header.stories.svelte
@@ -3,11 +3,11 @@
 
   import Header from "../Header.svelte";
 
-  import documentFixture from "../fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
   import { Document as DocumentState } from "../../../structure/document";
 
   const args = {
-    document: new DocumentState(documentFixture),
+    document: new DocumentState(document),
     loaded: true,
     title: true,
     showOrg: true,
diff --git a/src/pages/viewer/stories/Sidebar.stories.svelte b/src/pages/viewer/stories/Sidebar.stories.svelte
index 1bf8344a1..b7489efd2 100644
--- a/src/pages/viewer/stories/Sidebar.stories.svelte
+++ b/src/pages/viewer/stories/Sidebar.stories.svelte
@@ -2,11 +2,11 @@
   import { Story, Template } from "@storybook/addon-svelte-csf";
 
   import Sidebar from "../Sidebar.svelte";
-  import documentFixture from "../fixtures/document.json";
+  import { document } from "../../../test/fixtures/documents";
   import { Document as DocumentState } from "../../../structure/document";
 
   const args = {
-    document: new DocumentState(documentFixture),
+    document: new DocumentState(document),
     loaded: true,
     signedIn: true,
     disableControls: false,
@@ -30,6 +30,6 @@
   name="Uneditable"
   args={{
     ...args,
-    document: new DocumentState({ ...documentFixture, edit_access: false }),
+    document: new DocumentState({ ...document, edit_access: false }),
   }}
 />
diff --git a/src/projects/stories/Browser.stories.svelte b/src/projects/stories/Browser.stories.svelte
index 4b8aae61e..81f3ddedf 100644
--- a/src/projects/stories/Browser.stories.svelte
+++ b/src/projects/stories/Browser.stories.svelte
@@ -4,8 +4,8 @@
   import Browser from "../Browser.svelte";
 
   const args = { visible: true };
-  import { projectHandlers } from "./mockData";
-  import { mockGetMe } from "../../pages/app/accounts/stories/mockData";
+  import { projects } from "../../test/handlers/projects";
+  import { mockGetMe } from "../../test/handlers/accounts";
 
   export const meta = {
     title: "App / Projects / Browser",
@@ -22,20 +22,20 @@
 <Story
   name="Success"
   {args}
-  parameters={{ msw: { handlers: [mockGetMe.data, projectHandlers.data] } }}
+  parameters={{ msw: { handlers: [mockGetMe.data, projects.data] } }}
 />
 <Story
   name="Loading"
   {args}
-  parameters={{ msw: { handlers: [mockGetMe.data, projectHandlers.loading] } }}
+  parameters={{ msw: { handlers: [mockGetMe.data, projects.loading] } }}
 />
 <Story
   name="Error"
   {args}
-  parameters={{ msw: { handlers: [mockGetMe.data, projectHandlers.error] } }}
+  parameters={{ msw: { handlers: [mockGetMe.data, projects.error] } }}
 />
 <Story
   name="Empty"
   {args}
-  parameters={{ msw: { handlers: [mockGetMe.data, projectHandlers.empty] } }}
+  parameters={{ msw: { handlers: [mockGetMe.data, projects.empty] } }}
 />
diff --git a/src/projects/stories/ProjectList.stories.svelte b/src/projects/stories/ProjectList.stories.svelte
index 6d60e4fc6..5e2a65dc2 100644
--- a/src/projects/stories/ProjectList.stories.svelte
+++ b/src/projects/stories/ProjectList.stories.svelte
@@ -1,11 +1,11 @@
 <script lang="ts" context="module">
   import { Story, Template } from "@storybook/addon-svelte-csf";
 
-  import { projects } from "../../api/fixtures/projects.fixtures";
+  import { projectList } from "../../test/fixtures/projects";
   import ProjectList from "../ProjectList.svelte";
 
   const args = {
-    items: projects.results,
+    items: projectList.results,
     loading: false,
     error: null,
   };
@@ -26,7 +26,7 @@
   name="With Own Data"
   args={{
     ...args,
-    items: projects.results.map((project) => ({
+    items: projectList.results.map((project) => ({
       ...project,
       edit_access: true,
     })),
@@ -36,7 +36,7 @@
   name="With Shared Data"
   args={{
     ...args,
-    items: projects.results.map((project) => ({
+    items: projectList.results.map((project) => ({
       ...project,
       edit_access: project.user === 4,
     })),
diff --git a/src/projects/stories/ProjectListItem.stories.svelte b/src/projects/stories/ProjectListItem.stories.svelte
index 42581eda1..b17352733 100644
--- a/src/projects/stories/ProjectListItem.stories.svelte
+++ b/src/projects/stories/ProjectListItem.stories.svelte
@@ -2,10 +2,7 @@
   import { Story, Template } from "@storybook/addon-svelte-csf";
 
   import ProjectListItem from "../ProjectListItem.svelte";
-  import {
-    project,
-    editableProject,
-  } from "../../api/fixtures/projects.fixtures";
+  import { project, editableProject } from "../../test/fixtures/projects";
 
   const args = { project };
 
diff --git a/src/test/handlers/accounts.ts b/src/test/handlers/accounts.ts
index 0c0ab35d8..d28f4d9e7 100644
--- a/src/test/handlers/accounts.ts
+++ b/src/test/handlers/accounts.ts
@@ -7,7 +7,7 @@ import {
   proOrg,
   usersList,
 } from "../fixtures/accounts";
-import { Org } from "../../api/types/orgAndUser.js";
+import { Org } from "../../api/types/orgAndUser";
 import {
   createApiUrl,
   dataHandler,
@@ -15,7 +15,7 @@ import {
   loadingHandler,
   errorHandler,
   generateGetHandler,
-} from "./utils.js";
+} from "./utils";
 
 export const users = {
   data: rest.get(createApiUrl("users/"), dataHandler(usersList)),
diff --git a/src/test/handlers/projects.ts b/src/test/handlers/projects.ts
index ca2a856cd..ac8282226 100644
--- a/src/test/handlers/projects.ts
+++ b/src/test/handlers/projects.ts
@@ -1,4 +1,4 @@
-import { generateGetHandler } from "./utils.js";
+import { generateGetHandler } from "./utils";
 import { projectList } from "../fixtures/projects";
 
 export const projects = generateGetHandler("projects/", projectList);