Merge pull request #112 from classmodel/simpler_startup

Simper startup screen.

Author: sverhoeven

apps/class-solid/src/components/StartButtons.tsx

@@ -6,7 +6,6 @@ import { experiments, uploadExperiment } from "~/lib/store";
 import {
   MdiBackupRestore,
   MdiBeakerPlus,
-  MdiFileDocumentOutline,
   MdiPlusBox,
   MdiUpload,
 } from "./icons";
@@ -50,36 +49,6 @@ function ResumeSessionButton(props: { afterClick: () => void }) {
   );
 }
 
-function StartFromScratchButton(props: {
-  onClick: () => void;
-  afterClick: () => void;
-}) {
-  return (
-    <Button
-      variant="outline"
-      class="flex h-44 w-56 flex-col gap-2 border border-dashed"
-      onClick={() => {
-        props.onClick();
-        props.afterClick();
-      }}
-    >
-      <MdiBeakerPlus class="h-32 w-32" />
-      <Show
-        when={experiments.length}
-        fallback={
-          <>
-            <p>Start from scratch</p>
-            <p>(default config)</p>
-          </>
-        }
-      >
-        <p>From scratch</p>
-        <p>(default config)</p>
-      </Show>
-    </Button>
-  );
-}
-
 function StartFromUploadButton(props: {
   afterClick: () => void;
 }) {
@@ -219,7 +188,7 @@ function StartFromPresetButton(props: {
         class="flex h-44 w-56 flex-col gap-2 border border-dashed"
         onClick={() => setOpen(true)}
       >
-        <MdiFileDocumentOutline class="h-32 w-32" />
+        <MdiBeakerPlus class="h-32 w-32" />
         <Show when={experiments.length} fallback={<p>Start from preset</p>}>
           <p>From preset</p>
         </Show>
@@ -234,13 +203,9 @@ export function StartButtons(props: {
 }) {
   return (
     <>
-      <StartFromScratchButton
-        onClick={props.onFromSratchClick}
-        afterClick={props.afterClick}
-      />
+      <StartFromPresetButton afterClick={props.afterClick} />
       <StartFromUploadButton afterClick={props.afterClick} />
       <ResumeSessionButton afterClick={props.afterClick} />
-      <StartFromPresetButton afterClick={props.afterClick} />
     </>
   );
 }

apps/class-solid/tests/big-app-state.json

@@ -1,5 +1,5 @@
 {
-  "name": "My experiment 1",
+  "name": "Copy of Default",
   "description": "",
   "reference": {
     "initialState": {

apps/class-solid/tests/experiment.spec.ts

@@ -2,14 +2,18 @@ import { expect, test } from "@playwright/test";
 import { parseDownload } from "./helpers";
 
 test("Duplicate experiment with a permutation", async ({ page }, testInfo) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
-  await page.getByRole("button", { name: "Run" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
 
   // Add a permutation
-  const experiment1 = page.getByLabel("My experiment 1", { exact: true });
+  const experiment1 = page.getByLabel("Default", { exact: true });
   await experiment1
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",
@@ -26,7 +30,7 @@ test("Duplicate experiment with a permutation", async ({ page }, testInfo) => {
   await page.getByTitle("Duplicate experiment").click();
 
   // Make experiment 2 different
-  const experiment2 = page.getByLabel("Copy of My experiment 1", {
+  const experiment2 = page.getByLabel("Copy of Default", {
     exact: true,
   });
   await experiment2.getByRole("button", { name: "Edit", exact: true }).click();
@@ -71,14 +75,18 @@ test("Duplicate experiment with a permutation", async ({ page }, testInfo) => {
 });
 
 test("Swap permutation with default reference", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
-  await page.getByRole("button", { name: "Run" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
 
   // Add a permutation
-  const experiment = page.getByLabel("My experiment 1", { exact: true });
+  const experiment = page.getByLabel("Default", { exact: true });
   await experiment
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",
@@ -110,17 +118,22 @@ test("Swap permutation with default reference", async ({ page }) => {
 });
 
 test("Swap permutation with custom reference", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
   await page.getByLabel("Mixed layer").click();
   await page.getByLabel("h", { exact: true }).fill("400");
   await page.getByLabel("θ", { exact: true }).fill("265");
   await page.getByRole("button", { name: "Run" }).click();
 
   // Add a permutation
-  const experiment = page.getByLabel("My experiment 1", { exact: true });
+  const experiment = page.getByLabel("Default", { exact: true });
   await experiment
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",
@@ -157,14 +170,18 @@ test("Swap permutation with custom reference", async ({ page }) => {
 });
 
 test("Promote permutation to a new experiment", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
-  await page.getByRole("button", { name: "Run" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
 
   // Add a permutation
-  const experiment1 = page.getByLabel("My experiment 1", { exact: true });
+  const experiment1 = page.getByLabel("Default", { exact: true });
   await experiment1
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",
@@ -199,14 +216,18 @@ test("Promote permutation to a new experiment", async ({ page }) => {
 });
 
 test("Duplicate permutation", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
-  await page.getByRole("button", { name: "Run" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
 
   // Add a permutation
-  const experiment1 = page.getByLabel("My experiment 1", { exact: true });
+  const experiment1 = page.getByLabel("Default", { exact: true });
   await experiment1
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",

apps/class-solid/tests/modify.spec.ts

@@ -2,6 +2,8 @@ import { expect, test } from "@playwright/test";
 
 // Check that modifying an experiment preserves previous edits
 test("Edit experiment preserves previous edits", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   await page.goto("/");
 
   // Create new experiment with custom h
@@ -29,14 +31,16 @@ test("Edit experiment preserves previous edits", async ({ page }) => {
 });
 
 test("Edit permutation preserves previous edits", async ({ page }) => {
+  test.skip(true, "Only used during development");
+
   // Add experiment
   await page.goto("/");
   await page.getByRole("button", { name: "Add Start from scratch (" }).click();
   await page.getByRole("button", { name: "Run" }).click();
 
   // Add permutation with very small initial temperature jump
   // Expect boundary layer to grow very quickly
-  const experiment1 = page.getByLabel("My experiment 1", { exact: true });
+  const experiment1 = page.getByLabel("Default", { exact: true });
   await experiment1
     .getByTitle(
       "Add a permutation to the reference configuration of this experiment",

apps/class-solid/tests/share.spec.ts

@@ -2,10 +2,14 @@ import { expect, test } from "@playwright/test";
 import { parseDownload } from "./helpers";
 
 test("Create share link from an experiment", async ({ page }) => {
+  test.skip(true, "Only used during development");
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
 
   await page.getByRole("button", { name: "Mixed Layer" }).click();
   await page.getByLabel("h", { exact: true }).fill("800");
@@ -21,7 +25,7 @@ test("Create share link from an experiment", async ({ page }) => {
   // TODO test get link from text input field?
 
   // Check that the new experiment has the correct configuration
-  const sharedExperiment = sharedPage.getByLabel("My experiment 1", {
+  const sharedExperiment = sharedPage.getByLabel("Default", {
     exact: true,
   });
   await sharedExperiment.getByRole("button", { name: "Download" }).click();
@@ -49,7 +53,10 @@ test("Given large app state, sharing is not possible", async ({ page }) => {
   await page.goto("/");
 
   // Create a new experiment
-  await page.getByRole("button", { name: "Start from scratch" }).click();
+  await page.getByRole("button", { name: "Add Start from preset" }).click();
+  await page
+    .getByRole("button", { name: "Default The classic default" })
+    .click();
   await page.getByRole("button", { name: "Run" }).click();
   // Add permutation sweep
   await page.getByRole("button", { name: "S", exact: true }).click();
@@ -59,7 +66,7 @@ test("Given large app state, sharing is not possible", async ({ page }) => {
   const times = 12;
   for (let i = 0; i < times; i++) {
     await page
-      .getByLabel("My experiment 1", { exact: true })
+      .getByLabel("Default", { exact: true })
       .getByRole("button", { name: "Duplicate experiment" })
       .click();
   }