fix argument update

NASA-AMMOS · Mar 3, 2025 · 3f2b4f1 · 3f2b4f1
1 parent 50e4b1e
commit 3f2b4f1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 37 deletions.
diff --git a/src/routes/models/[id]/+page.svelte b/src/routes/models/[id]/+page.svelte
@@ -497,7 +497,6 @@
         [],
       );
       await effects.updateConstraintModelSpecifications(
-        $model,
         constraintModelSpecUpdates.constraintModelSpecsToAdd,
         constraintInvocationIdsToDelete,
         user,
@@ -506,7 +505,7 @@
       for (let i = 0; i < constraintModelSpecUpdates.constraintModelSpecsToUpdate.length; i++) {
         const constraintSpecToUpdate = constraintModelSpecUpdates.constraintModelSpecsToUpdate[i];
 
-        await effects.updateConstraintModelSpecification($model, constraintSpecToUpdate, user);
+        await effects.updateConstraintModelSpecification(constraintSpecToUpdate, user);
       }
 
       const conditionModelSpecUpdates: (
@@ -616,15 +615,14 @@
         [],
       );
       await effects.updateSchedulingGoalModelSpecifications(
-        $model,
         goalModelSpecUpdates.goalModelSpecsToAdd,
         goalInvocationIdsToDelete,
         user,
       );
 
       for (let i = 0; i < goalModelSpecUpdates.goalModelSpecsToUpdate.length; i++) {
         const goalSpecUpdate = goalModelSpecUpdates.goalModelSpecsToUpdate[i];
-        await effects.updateSchedulingGoalModelSpecification($model, goalSpecUpdate, user);
+        await effects.updateSchedulingGoalModelSpecification(goalSpecUpdate, user);
       }
     }
   }

diff --git a/src/stores/constraints.ts b/src/stores/constraints.ts
@@ -77,7 +77,7 @@ export const constraintPlanSpecsMap: Readable<ConstraintPlanSpecMap> = derived(
 export const allowedConstraintPlanSpecs: Readable<ConstraintPlanSpecification[]> = derived(
   [constraintPlanSpecs],
   ([$constraintPlanSpecs]) =>
-    ($constraintPlanSpecs || []).filter(({ constraint_metadata: constraintMetadata }) => constraintMetadata !== null),
+    ($constraintPlanSpecs || []).filter(({ constraint_metadata: metadata }) => metadata !== null),
 );
 
 export const allowedConstraintPlanSpecMap: Readable<ConstraintPlanSpecMap> = derived(

diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
@@ -5681,20 +5681,21 @@ const effects = {
     }
   },
 
-  async updateConstraintModelSpecification(
-    model: Model,
-    constraintSpecToUpdate: ConstraintModelSpecSetInput,
-    user: User | null,
-  ) {
+  async updateConstraintModelSpecification(constraintSpecToUpdate: ConstraintModelSpecSetInput, user: User | null) {
     try {
       if (!queryPermissions.UPDATE_CONSTRAINT_MODEL_SPECIFICATION(user)) {
         throwPermissionError('update this constraint model specification');
       }
-      const { invocation_id: constraintInvocationId, constraint_revision: revision, order } = constraintSpecToUpdate;
+      const {
+        arguments: constraintArguments,
+        invocation_id: constraintInvocationId,
+        constraint_revision: revision,
+        order,
+      } = constraintSpecToUpdate;
 
       const { updateConstraintModelSpecification } = await reqHasura(
         gql.UPDATE_CONSTRAINT_MODEL_SPECIFICATION,
-        { constraintInvocationId, modelId: model.id, order, revision },
+        { arguments: constraintArguments, constraintInvocationId, order, revision },
         user,
       );
 
@@ -5710,7 +5711,6 @@ const effects = {
   },
 
   async updateConstraintModelSpecifications(
-    model: Model,
     constraintSpecsToAdd: ConstraintModelSpecInsertInput[],
     constraintInvocationIdsToDelete: number[],
     user: User | null,
@@ -5722,7 +5722,7 @@ const effects = {
 
       const { deleteConstraintModelSpecifications, addConstraintModelSpecifications } = await reqHasura(
         gql.UPDATE_CONSTRAINT_MODEL_SPECIFICATIONS,
-        { constraintInvocationIdsToDelete, constraintSpecsToAdd, modelId: model.id },
+        { constraintInvocationIdsToDelete, constraintSpecsToAdd },
         user,
       );
 
@@ -5746,12 +5746,17 @@ const effects = {
       if (!queryPermissions.UPDATE_CONSTRAINT_PLAN_SPECIFICATION(user, plan)) {
         throwPermissionError('update this constraint plan specification');
       }
-      const { enabled, invocation_id: invocationId, constraint_revision: revision } = constraintPlanSpecification;
+      const {
+        arguments: constraintArguments,
+        enabled,
+        invocation_id: invocationId,
+        constraint_revision: revision,
+      } = constraintPlanSpecification;
 
       const { updateConstraintPlanSpecification } = await reqHasura(
         gql.UPDATE_CONSTRAINT_PLAN_SPECIFICATION,
         {
-          arguments: constraintPlanSpecification.arguments,
+          arguments: constraintArguments,
           constraintInvocationId: invocationId,
           enabled,
           revision,
@@ -6183,23 +6188,23 @@ const effects = {
   },
 
   async updateSchedulingGoalModelSpecification(
-    model: Model,
     schedulingGoalModelSpecification: SchedulingGoalModelSpecificationSetInput,
     user: User | null,
   ) {
     try {
       if (!queryPermissions.UPDATE_SCHEDULING_GOAL_MODEL_SPECIFICATION(user)) {
-        throwPermissionError('update this scheduling goal plan specification');
+        throwPermissionError('update this scheduling goal model specification');
       }
       const {
+        arguments: goalArguments,
         goal_invocation_id: goalInvocationId,
         goal_revision: revision,
         priority,
       } = schedulingGoalModelSpecification;
 
       const { updateSchedulingGoalModelSpecification } = await reqHasura(
         gql.UPDATE_SCHEDULING_GOAL_MODEL_SPECIFICATION,
-        { goalInvocationId, modelId: model.id, priority, revision },
+        { arguments: goalArguments, goalInvocationId, priority, revision },
         user,
       );
 
@@ -6215,7 +6220,6 @@ const effects = {
   },
 
   async updateSchedulingGoalModelSpecifications(
-    model: Model,
     goalSpecsToAdd: SchedulingGoalModelSpecificationInsertInput[],
     goalIdsToDelete: number[],
     user: User | null,
@@ -6229,7 +6233,6 @@ const effects = {
         {
           goalIdsToDelete,
           goalSpecsToAdd,
-          modelId: model.id,
         },
         user,
       );
@@ -6255,6 +6258,7 @@ const effects = {
         throwPermissionError('update this scheduling goal plan specification');
       }
       const {
+        arguments: goalArguments,
         enabled,
         goal_invocation_id,
         goal_revision: revision,
@@ -6265,7 +6269,7 @@ const effects = {
       const { updateSchedulingGoalPlanSpecification } = await reqHasura(
         gql.UPDATE_SCHEDULING_GOAL_PLAN_SPECIFICATION,
         {
-          arguments: schedulingGoalPlanSpecification.arguments,
+          arguments: goalArguments,
           enabled,
           goal_invocation_id,
           priority,

diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
@@ -2155,7 +2155,7 @@ const gql = {
   SUB_CONSTRAINT_PLAN_SPECIFICATIONS: `#graphql
     subscription SubConstraintPlanSpecifications($planId: Int!) {
       constraintPlanSpecs: ${Queries.CONSTRAINT_SPECIFICATIONS}(
-        where: {plan_id: {_eq: $planId}},
+        where: { plan_id: {_eq: $planId } },
         order_by: { constraint_id: desc }
       ) {
         arguments
@@ -2173,6 +2173,7 @@ const gql = {
             type
           }
         }
+        order
         plan_id
       }
     }
@@ -3362,10 +3363,11 @@ const gql = {
   `,
 
   UPDATE_CONSTRAINT_MODEL_SPECIFICATION: `#graphql
-    mutation UpdateConstraintModelSpecification($constraintInvocationId: Int!, $revision: Int!, $order: Int!, $modelId: Int!) {
+    mutation UpdateConstraintModelSpecification($arguments: jsonb, $constraintInvocationId: Int!, $revision: Int!, $order: Int!) {
       updateConstraintModelSpecification: ${Queries.UPDATE_CONSTRAINT_MODEL_SPECIFICATION}(
-        pk_columns: { invocation_id: $constraintInvocationId, model_id: $modelId  },
+        pk_columns: { invocation_id: $constraintInvocationId  },
         _set: {
+          arguments: $arguments,
           constraint_revision: $revision,
           order: $order
         }
@@ -3377,7 +3379,7 @@ const gql = {
   `,
 
   UPDATE_CONSTRAINT_MODEL_SPECIFICATIONS: `#graphql
-    mutation UpdateConstraintModelSpecifications($constraintSpecsToAdd: [constraint_model_specification_insert_input!]!, $constraintInvocationIdsToDelete: [Int!]! = [], $modelId: Int!) {
+    mutation UpdateConstraintModelSpecifications($constraintSpecsToAdd: [constraint_model_specification_insert_input!]!, $constraintInvocationIdsToDelete: [Int!]! = []) {
       addConstraintModelSpecifications: ${Queries.INSERT_CONSTRAINT_MODEL_SPECIFICATIONS}(
         objects: $constraintSpecsToAdd
       ) {
@@ -3388,10 +3390,7 @@ const gql = {
       }
       deleteConstraintModelSpecifications: ${Queries.DELETE_CONSTRAINT_MODEL_SPECIFICATIONS}(
         where: {
-          invocation_id: { _in: $constraintInvocationIdsToDelete },
-          _and: {
-            model_id: { _eq: $modelId },
-          }
+          invocation_id: { _in: $constraintInvocationIdsToDelete }
         }
       ) {
         affected_rows
@@ -3650,10 +3649,11 @@ const gql = {
   `,
 
   UPDATE_SCHEDULING_GOAL_MODEL_SPECIFICATION: `#graphql
-    mutation UpdateSchedulingGoalModelSpecification($goalInvocationId: Int!, $revision: Int!, $priority: Int!, $modelId: Int!) {
+    mutation UpdateSchedulingGoalModelSpecification($arguments: jsonb, $goalInvocationId: Int!, $revision: Int!, $priority: Int!) {
       updateSchedulingGoalModelSpecification: ${Queries.UPDATE_SCHEDULING_GOAL_MODEL_SPECIFICATION}(
-        pk_columns: { goal_invocation_id: $goalInvocationId, model_id: $modelId },
+        pk_columns: { goal_invocation_id: $goalInvocationId },
         _set: {
+          arguments: $arguments,
           goal_revision: $revision,
           priority: $priority,
         }
@@ -3665,7 +3665,7 @@ const gql = {
   `,
 
   UPDATE_SCHEDULING_GOAL_MODEL_SPECIFICATIONS: `#graphql
-    mutation UpdateSchedulingGoalModelSpecifications($goalSpecsToAdd: [scheduling_model_specification_goals_insert_input!]!, $goalIdsToDelete: [Int!]! = [], $modelId: Int!) {
+    mutation UpdateSchedulingGoalModelSpecifications($goalSpecsToAdd: [scheduling_model_specification_goals_insert_input!]!, $goalIdsToDelete: [Int!]! = []) {
       addSchedulingGoalModelSpecifications: ${Queries.INSERT_SCHEDULING_MODEL_SPECIFICATION_GOALS}(
         objects: $goalSpecsToAdd,
         on_conflict: {
@@ -3680,10 +3680,7 @@ const gql = {
       }
       deleteSchedulingGoalModelSpecifications: ${Queries.DELETE_SCHEDULING_GOAL_MODEL_SPECIFICATIONS}(
         where: {
-          goal_invocation_id: { _in: $goalIdsToDelete },
-          _and: {
-            model_id: { _eq: $modelId }
-          }
+          goal_invocation_id: { _in: $goalIdsToDelete }
         }
       ) {
         affected_rows