From 3a52ca20b28a89c51fad982e0e4e474410110345 Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Tue, 12 Nov 2024 14:28:22 -0800
Subject: [PATCH 1/7] Add default view id to model schema and query. Add slim
 view to model subscription query.

---
 src/types/model.ts   | 7 ++++---
 src/utilities/gql.ts | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/types/model.ts b/src/types/model.ts
index 44368da652..e7f6817d57 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -2,12 +2,12 @@ import type { UserId } from './app';
 import type { ConstraintModelSpec } from './constraint';
 import type { ParametersMap } from './parameter';
 import type { SchedulingConditionModelSpecification, SchedulingGoalModelSpecification } from './scheduling';
-import type { View } from './view';
+import type { View, ViewSlim } from './view';
 
 export type Model = ModelSchema;
 
 export type ModelInsertInput = Pick<Model, 'description' | 'jar_id' | 'mission' | 'name' | 'version'>;
-export type ModelSetInput = Pick<Model, 'description' | 'mission' | 'name' | 'owner' | 'version'>;
+export type ModelSetInput = Pick<Model, 'default_view_id' | 'description' | 'mission' | 'name' | 'owner' | 'version'>;
 
 export type ModelStatus = 'extracting' | 'complete' | 'error' | 'none';
 export type ModelStatusRollup = {
@@ -36,6 +36,7 @@ export type ModelLog = {
 export type ModelSchema = {
   constraint_specification: ConstraintModelSpec[];
   created_at: string;
+  default_view_id: number | null;
   description?: string;
   id: number;
   jar_id: number;
@@ -66,4 +67,4 @@ export type ModelSlim = Pick<
   | 'refresh_model_parameter_logs'
   | 'refresh_resource_type_logs'
   | 'version'
->;
+> & { view: ViewSlim | null };
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index 4e4e8c063d..51b39e758c 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -2530,6 +2530,7 @@ const gql = {
           }
         }
         created_at
+        default_view_id
         description
         jar_id
         id
@@ -2622,6 +2623,13 @@ const gql = {
           success
         }
         version
+        view {
+          created_at
+          id
+          name
+          owner
+          updated_at
+        }
       }
     }
   `,

From ac3ee364b992d25f0891547fce6954e566a67274 Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Tue, 12 Nov 2024 14:29:08 -0800
Subject: [PATCH 2/7] Manage default view for a model in the Model Form

---
 src/components/model/ModelForm.svelte | 25 ++++++++++++++++++++-----
 src/components/model/Models.svelte    | 17 ++++++++++++-----
 src/routes/models/[id]/+page.svelte   |  7 +++++++
 src/utilities/effects.ts              |  4 ++--
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/components/model/ModelForm.svelte b/src/components/model/ModelForm.svelte
index 12eb49991c..fcdc5a1eb8 100644
--- a/src/components/model/ModelForm.svelte
+++ b/src/components/model/ModelForm.svelte
@@ -5,6 +5,7 @@
   import { createEventDispatcher } from 'svelte';
   import type { User, UserId } from '../../types/app';
   import type { ModelLog, ModelSlim } from '../../types/model';
+  import type { ViewSlim } from '../../types/view';
   import effects from '../../utilities/effects';
   import { getModelStatusRollup } from '../../utilities/model';
   import { permissionHandler } from '../../utilities/permissionHandler';
@@ -19,6 +20,7 @@
   export let initialModelName: string = '';
   export let initialModelOwner: UserId | undefined;
   export let initialModelVersion: string | undefined;
+  export let initialModelDefaultViewId: number | null | undefined;
   export let activityTypeLogs: ModelLog[] | undefined;
   export let modelParameterLogs: ModelLog[] | undefined;
   export let resourceTypeLogs: ModelLog[] | undefined;
@@ -26,11 +28,13 @@
   export let createdAt: string | undefined;
   export let user: User | null;
   export let users: UserId[] = [];
+  export let views: ViewSlim[] = [];
 
   const dispatch = createEventDispatcher<{
     createPlan: number;
     deleteModel: void;
     hasModelChanged: {
+      default_view_id: number | null;
       description: string;
       name: string;
       owner: UserId;
@@ -60,6 +64,7 @@
   $: name = initialModelName;
   $: owner = initialModelOwner ?? null;
   $: version = initialModelVersion ?? '';
+  $: viewId = initialModelDefaultViewId ?? null;
   $: modelLogs = {
     refresh_activity_type_logs: activityTypeLogs ?? [],
     refresh_model_parameter_logs: modelParameterLogs ?? [],
@@ -83,6 +88,7 @@
   }
 
   $: dispatch('hasModelChanged', {
+    default_view_id: viewId,
     description,
     name,
     owner,
@@ -131,7 +137,7 @@
 <div class="model-form-container">
   <div class="inputs">
     <Input layout="inline">
-      <label for="name">Model name</label>
+      <label for="name">Model Name</label>
       <input
         class="st-input w-100"
         name="name"
@@ -144,11 +150,11 @@
       />
     </Input>
     <Input layout="inline">
-      <label for="id">Model id</label>
+      <label for="id">Model ID</label>
       <input class="st-input w-100" disabled name="id" value={modelId ?? ''} />
     </Input>
     <Input layout="inline">
-      <label for="description">Model description</label>
+      <label for="description">Model Description</label>
       <textarea
         class="st-input w-100"
         name="description"
@@ -160,7 +166,7 @@
       />
     </Input>
     <Input layout="inline">
-      <label for="version">Model version</label>
+      <label for="version">Model Version</label>
       <input
         class="st-input w-100"
         name="version"
@@ -192,6 +198,15 @@
         on:delete={onClearOwner}
       />
     </Input>
+    <Input layout="inline">
+      <label for="view">Default View</label>
+      <select class="st-select" bind:value={viewId}>
+        <option value={null}>None</option>
+        {#each views as viewOption}
+          <option value={viewOption.id}>{viewOption.name} (ID: {viewOption.id})</option>
+        {/each}
+      </select>
+    </Input>
     {#if createdAt}
       <Input layout="inline">
         <label use:tooltip={{ content: 'Date Created', placement: 'top' }} for="createdAt">Date Created</label>
@@ -201,7 +216,7 @@
     {#if modelId}
       <Input layout="inline">
         <div class="model-jar-label">
-          <label class="model-metadata-item-label" for="status">Jar file status</label>
+          <label class="model-metadata-item-label" for="status">Jar File Status</label>
           {#if modelHasExtractionError}
             <button
               class="icon-button"
diff --git a/src/components/model/Models.svelte b/src/components/model/Models.svelte
index 0f36357972..0e4f4700b4 100644
--- a/src/components/model/Models.svelte
+++ b/src/components/model/Models.svelte
@@ -150,6 +150,9 @@
     ];
   }
   $: selectedModel = $models.find(({ id }) => id === selectedModelId) ?? null;
+  $: selectedModelDefaultViewName = selectedModel?.view
+    ? `${selectedModel.view.name} (ID: ${selectedModel.view.id})`
+    : 'None';
   $: if (selectedModel) {
     const { activityLogStatus, parameterLogStatus, resourceLogStatus } = getModelStatusRollup(selectedModel);
 
@@ -271,7 +274,7 @@
         <div class="model-metadata">
           <fieldset>
             <Input layout="inline">
-              <label class="model-metadata-item-label" for="name">Model name</label>
+              <label class="model-metadata-item-label" for="name">Model Name</label>
               <input
                 disabled
                 class="st-input w-100"
@@ -281,21 +284,25 @@
               />
             </Input>
             <Input layout="inline">
-              <label class="model-metadata-item-label" for="id">Model id</label>
+              <label class="model-metadata-item-label" for="id">Model ID</label>
               <input disabled class="st-input w-100" name="id" value={selectedModel.id} />
             </Input>
             <Input layout="inline">
-              <label class="model-metadata-item-label" for="description">Description</label>
+              <label class="model-metadata-item-label" for="description">Model Description</label>
               <textarea disabled class="st-input w-100" name="description" value={selectedModel.description} />
             </Input>
             <Input layout="inline">
-              <label class="model-metadata-item-label" for="version">Model version</label>
+              <label class="model-metadata-item-label" for="version">Model Version</label>
               <input disabled class="st-input w-100" name="version" value={selectedModel.version} />
             </Input>
             <Input layout="inline">
               <label class="model-metadata-item-label" for="owner">Owner</label>
               <input disabled class="st-input w-100" name="owner" value={selectedModel.owner} />
             </Input>
+            <Input layout="inline">
+              <label class="model-metadata-item-label" for="defaultView">Default View</label>
+              <input disabled class="st-input w-100" name="defaultView" value={selectedModelDefaultViewName} />
+            </Input>
             <Input layout="inline">
               <label class="model-metadata-item-label" for="created">Date Created</label>
               <input
@@ -307,7 +314,7 @@
             </Input>
             <Input layout="inline">
               <div class="model-jar-label">
-                <label class="model-metadata-item-label" for="status">Jar file status</label>
+                <label class="model-metadata-item-label" for="status">Jar File Status</label>
                 {#if modelHasExtractionError}
                   <button
                     class="icon-button"
diff --git a/src/routes/models/[id]/+page.svelte b/src/routes/models/[id]/+page.svelte
index 5293adbde4..4e0d77f9e2 100644
--- a/src/routes/models/[id]/+page.svelte
+++ b/src/routes/models/[id]/+page.svelte
@@ -90,6 +90,7 @@
   import { initialModel, model, resetModelStores } from '../../../stores/model';
   import { schedulingConditions, schedulingGoals } from '../../../stores/scheduling';
   import { users } from '../../../stores/user';
+  import { views } from '../../../stores/views';
   import type { User, UserId } from '../../../types/app';
   import type { ConstraintModelSpec, ConstraintModelSpecInsertInput } from '../../../types/constraint';
   import type {
@@ -118,12 +119,14 @@
   let hasModelChanged: boolean = false;
   let metadataList: Pick<BaseMetadata, 'id' | 'name' | 'public' | 'versions'>[] = [];
   let modelMetadata: {
+    default_view_id: number | null;
     description?: string;
     name: string;
     owner: UserId;
     version: string;
   } | null = null;
   let initialModelMetadata: {
+    default_view_id: number | null;
     description?: string;
     name: string;
     owner: UserId;
@@ -146,6 +149,7 @@
   }
   $: if ($model) {
     initialModelMetadata = {
+      default_view_id: $model.default_view_id,
       description: $model.description,
       name: $model.name,
       owner: $model.owner,
@@ -299,6 +303,7 @@
 
   function onModelMetadataChange(
     event: CustomEvent<{
+      default_view_id: number | null;
       description: string;
       name: string;
       owner: UserId;
@@ -668,6 +673,7 @@
         initialModelName={$model?.name}
         initialModelOwner={$model?.owner}
         initialModelVersion={$model?.version}
+        initialModelDefaultViewId={$model?.default_view_id}
         activityTypeLogs={$model?.refresh_activity_type_logs}
         modelParameterLogs={$model?.refresh_model_parameter_logs}
         resourceTypeLogs={$model?.refresh_resource_type_logs}
@@ -675,6 +681,7 @@
         createdAt={$model?.created_at}
         user={data.user}
         users={$users ?? []}
+        views={$views ?? []}
         on:createPlan={onCreatePlanWithModel}
         on:deleteModel={onDeleteModel}
         on:hasModelChanged={onModelMetadataChange}
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index 4ab9d6d76f..bf18f6db79 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -5730,13 +5730,13 @@ const effects = {
     id: number,
     model: Partial<ModelSetInput>,
     user: User | null,
-  ): Promise<Pick<Model, 'description' | 'name' | 'owner' | 'version'> | null> {
+  ): Promise<Pick<Model, 'description' | 'name' | 'owner' | 'version' | 'view'> | null> {
     try {
       if (!queryPermissions.UPDATE_MODEL(user)) {
         throwPermissionError('update this model');
       }
 
-      const data = await reqHasura<Pick<Model, 'description' | 'name' | 'owner' | 'version'>>(
+      const data = await reqHasura<Pick<Model, 'description' | 'name' | 'owner' | 'version' | 'view'>>(
         gql.UPDATE_MODEL,
         { id, model },
         user,

From daba98be9ef4320b6beb8018cb5cd28f35fb69a0 Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Wed, 13 Nov 2024 09:53:12 -0800
Subject: [PATCH 3/7] Fixes

---
 src/components/model/ModelForm.svelte       | 2 +-
 src/components/plan/PlanMergeReview.test.ts | 1 +
 src/utilities/effects.ts                    | 2 +-
 src/utilities/plan.test.ts                  | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/model/ModelForm.svelte b/src/components/model/ModelForm.svelte
index fcdc5a1eb8..9218b68be8 100644
--- a/src/components/model/ModelForm.svelte
+++ b/src/components/model/ModelForm.svelte
@@ -200,7 +200,7 @@
     </Input>
     <Input layout="inline">
       <label for="view">Default View</label>
-      <select class="st-select" bind:value={viewId}>
+      <select name="view" class="st-select w-100" bind:value={viewId}>
         <option value={null}>None</option>
         {#each views as viewOption}
           <option value={viewOption.id}>{viewOption.name} (ID: {viewOption.id})</option>
diff --git a/src/components/plan/PlanMergeReview.test.ts b/src/components/plan/PlanMergeReview.test.ts
index fd9a0901e0..9c9980f529 100644
--- a/src/components/plan/PlanMergeReview.test.ts
+++ b/src/components/plan/PlanMergeReview.test.ts
@@ -57,6 +57,7 @@ const mockInitialPlan: Plan = {
   model: {
     constraint_specification: [],
     created_at: '2023-02-16T00:00:00',
+    default_view_id: 0,
     id: 1,
     jar_id: 1,
     mission: '',
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index bf18f6db79..bd11315621 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -1097,7 +1097,7 @@ const effects = {
         const { createModel } = data;
         if (createModel != null) {
           const { id, created_at, owner } = createModel;
-          const model: ModelSlim = {
+          const model: Omit<ModelSlim, 'view'> = {
             created_at,
             id,
             jar_id,
diff --git a/src/utilities/plan.test.ts b/src/utilities/plan.test.ts
index e0609129d2..ac0f0b0c70 100644
--- a/src/utilities/plan.test.ts
+++ b/src/utilities/plan.test.ts
@@ -43,6 +43,7 @@ describe('Plan utility', () => {
             model: {
               constraint_specification: [],
               created_at: '2024-01-01T00:00:00',
+              default_view_id: 0,
               id: 1,
               jar_id: 123,
               mission: 'Test',
@@ -227,6 +228,7 @@ describe('Plan utility', () => {
             model: {
               constraint_specification: [],
               created_at: '2024-01-01T00:00:00',
+              default_view_id: 0,
               id: 1,
               jar_id: 123,
               mission: 'Test',
@@ -335,6 +337,7 @@ describe('Plan utility', () => {
       model: {
         constraint_specification: [],
         created_at: '2024-01-01T00:00:00',
+        default_view_id: 0,
         id: 1,
         jar_id: 123,
         mission: 'Test',

From bdf0857f43279ed6b4de3e0efacd71a5f10b739f Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Wed, 13 Nov 2024 12:33:45 -0800
Subject: [PATCH 4/7] Tests

---
 e2e-tests/fixtures/Model.ts   | 13 +++++++++++++
 e2e-tests/tests/model.test.ts | 26 +++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/fixtures/Model.ts b/e2e-tests/fixtures/Model.ts
index caa75156d3..8c36279597 100644
--- a/e2e-tests/fixtures/Model.ts
+++ b/e2e-tests/fixtures/Model.ts
@@ -20,6 +20,7 @@ export class Model {
   newPlanButton: Locator;
   saveButton: Locator;
   versionInput: Locator;
+  viewInput: Locator;
 
   constructor(
     public page: Page,
@@ -109,6 +110,17 @@ export class Model {
     await expect(this.associationTable).not.toBeVisible();
   }
 
+  async updateDefaultView(viewName: string) {
+    await this.viewInput.selectOption('None');
+    const matchingOption = await this.viewInput
+      .getByRole('option')
+      .getByText(viewName, { exact: false })
+      .elementHandle();
+    expect(matchingOption).toBeDefined();
+    await this.viewInput.selectOption(matchingOption);
+    expect(await this.viewInput.inputValue()).toEqual(await matchingOption?.getAttribute('value'));
+  }
+
   async updateDescription(modelDescription: string) {
     await this.descriptionInput.click();
     await this.descriptionInput.fill(modelDescription);
@@ -131,6 +143,7 @@ export class Model {
     this.libraryRadioButton = page.getByRole('radio', { name: 'Library' });
     this.modelRadioButton = page.getByRole('radio', { exact: true, name: 'Model' });
     this.nameInput = page.locator('input[name="name"]');
+    this.viewInput = page.locator('select[name="view"]');
     this.newPlanButton = page.getByRole('button', { name: 'New plan with model' });
     this.versionInput = page.locator('input[name="version"]');
     this.associationTable = page.getByRole('treegrid');
diff --git a/e2e-tests/tests/model.test.ts b/e2e-tests/tests/model.test.ts
index c0f9ec335c..a86fbf7aef 100644
--- a/e2e-tests/tests/model.test.ts
+++ b/e2e-tests/tests/model.test.ts
@@ -3,17 +3,24 @@ import { adjectives, animals, colors, uniqueNamesGenerator } from 'unique-names-
 import { Constraints } from '../fixtures/Constraints.js';
 import { Model } from '../fixtures/Model.js';
 import { Models } from '../fixtures/Models.js';
+import { Plan } from '../fixtures/Plan.js';
+import { Plans } from '../fixtures/Plans.js';
 import { SchedulingConditions } from '../fixtures/SchedulingConditions.js';
 import { SchedulingGoals } from '../fixtures/SchedulingGoals.js';
+import { View } from '../fixtures/View.js';
 
 let constraints: Constraints;
 let context: BrowserContext;
 let models: Models;
 let model: Model;
 let page: Page;
+let plan: Plan;
+let plans: Plans;
 let schedulingConditions: SchedulingConditions;
 let schedulingGoals: SchedulingGoals;
 let schedulingGoalName: string;
+let view: View;
+let viewName: string;
 
 const checkboxSelector = 'Press SPACE to toggle cell';
 
@@ -22,9 +29,12 @@ test.beforeAll(async ({ baseURL, browser }) => {
   page = await context.newPage();
 
   models = new Models(page);
+  plans = new Plans(page, models);
   constraints = new Constraints(page);
   schedulingConditions = new SchedulingConditions(page);
   schedulingGoals = new SchedulingGoals(page);
+  plan = new Plan(page, plans, constraints, schedulingGoals, schedulingConditions);
+  view = new View(page);
   model = new Model(page, models, constraints, schedulingGoals, schedulingConditions);
   schedulingGoalName = uniqueNamesGenerator({ dictionaries: [adjectives, colors, animals] });
   await constraints.gotoNew();
@@ -35,11 +45,21 @@ test.beforeAll(async ({ baseURL, browser }) => {
   await schedulingGoals.createSchedulingGoal(baseURL, schedulingGoalName);
   await models.goto();
   await models.createModel(baseURL);
+  await plans.goto();
+  await plans.createPlan();
+  await plan.goto();
+  viewName = await view.createViewName();
+  await view.createView(viewName);
   await model.goto();
 });
 
 test.afterAll(async () => {
-  await model.deleteModel();
+  await plan.goto();
+  await view.deleteView(viewName);
+  await plans.goto();
+  await plans.deletePlan();
+  await models.goto();
+  await models.deleteModel();
   await constraints.goto();
   await constraints.deleteConstraint();
   await schedulingConditions.goto();
@@ -63,6 +83,10 @@ test.describe.serial('Model', () => {
     await model.updateVersion('2.0.0');
   });
 
+  test('Should be able to update the default view of a model', async () => {
+    await await model.updateDefaultView(viewName);
+  });
+
   test('Should be able to add a constraint to the model and specify a version', async () => {
     await model.switchToConstraints();
     await model.switchToLibraryView();

From 6beae64229ad3f7b303f49ad651b6ab3a872fcbc Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Wed, 13 Nov 2024 12:35:25 -0800
Subject: [PATCH 5/7] Typo

---
 e2e-tests/tests/model.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/tests/model.test.ts b/e2e-tests/tests/model.test.ts
index a86fbf7aef..9e3493ac89 100644
--- a/e2e-tests/tests/model.test.ts
+++ b/e2e-tests/tests/model.test.ts
@@ -83,7 +83,7 @@ test.describe.serial('Model', () => {
     await model.updateVersion('2.0.0');
   });
 
-  test('Should be able to update the default view of a model', async () => {
+  test('Should be able to update the default view for a model', async () => {
     await await model.updateDefaultView(viewName);
   });
 

From 78e55e76a7143721530a53c24c942508f9c729c9 Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Wed, 13 Nov 2024 13:15:34 -0800
Subject: [PATCH 6/7] Type fix by removing optimistic update of models
 subscription which is now unnecessary due to redirect to edit model view upon
 initial upload success

---
 src/utilities/effects.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index bd11315621..cbfd4327bb 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -1096,26 +1096,12 @@ const effects = {
         const data = await reqHasura<Model>(gql.CREATE_MODEL, { model: modelInsertInput }, user);
         const { createModel } = data;
         if (createModel != null) {
-          const { id, created_at, owner } = createModel;
-          const model: Omit<ModelSlim, 'view'> = {
-            created_at,
-            id,
-            jar_id,
-            name,
-            owner,
-            plans: [],
-            refresh_activity_type_logs: [],
-            refresh_model_parameter_logs: [],
-            refresh_resource_type_logs: [],
-            version,
-            ...(description && { description }),
-          };
+          const { id } = createModel;
 
           showSuccessToast('Model Created Successfully');
           createModelError.set(null);
           creatingModel.set(false);
 
-          models.updateValue((currentModels: ModelSlim[]) => [...currentModels, model]);
           return id;
         } else {
           throw Error(`Unable to create model "${name}"`);

From c1031ed360a67f61cf1459526ac626b41eacc84e Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Wed, 4 Dec 2024 17:06:31 -0800
Subject: [PATCH 7/7] Fix double await

---
 e2e-tests/tests/model.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/tests/model.test.ts b/e2e-tests/tests/model.test.ts
index 9e3493ac89..80132c86c7 100644
--- a/e2e-tests/tests/model.test.ts
+++ b/e2e-tests/tests/model.test.ts
@@ -84,7 +84,7 @@ test.describe.serial('Model', () => {
   });
 
   test('Should be able to update the default view for a model', async () => {
-    await await model.updateDefaultView(viewName);
+    await model.updateDefaultView(viewName);
   });
 
   test('Should be able to add a constraint to the model and specify a version', async () => {