Do not allow proposal submission with zero defined observations.

gemini-hlsw · Feb 24, 2025 · cf1762e · cf1762e
1 parent 50cdf4b
commit cf1762e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/explore/src/main/scala/explore/Routing.scala b/explore/src/main/scala/explore/Routing.scala
@@ -181,6 +181,7 @@ object Routing:
                 model.rootModel.zoom(RootModel.otherUndoStacks).zoom(ModelUndoStacks.forProposal),
                 userPreferences(model.rootModel).proposalTabLayout,
                 model.userIsReadonlyCoi,
+                programSummaries.get.hasDefinedObservations,
                 programSummaries.get.hasUndefinedObservations
               )
       .orEmpty

diff --git a/explore/src/main/scala/explore/proposal/ProposalSubmissionBar.scala b/explore/src/main/scala/explore/proposal/ProposalSubmissionBar.scala
@@ -43,8 +43,10 @@ case class ProposalSubmissionBar(
   deadline:                 Option[Timestamp],
   callId:                   Option[CallForProposals.Id],
   canSubmit:                Boolean,
+  hasDefinedObservations:   Boolean,
   hasUndefinedObservations: Boolean
-) extends ReactFnProps(ProposalSubmissionBar.component)
+) extends ReactFnProps(ProposalSubmissionBar.component):
+  val hasObsError = !hasDefinedObservations || hasUndefinedObservations
 
 object ProposalSubmissionBar:
   private object IsUpdatingStatus extends NewType[Boolean]
@@ -81,9 +83,17 @@ object ProposalSubmissionBar:
       errorMessage     <- useStateView(none[String]) // Submission error message
       _                <-
         useLayoutEffectWithDeps(
-          (props.proposalStatus.get, props.callId, props.hasUndefinedObservations)
-        ): (ps, _, he) =>
-          if (he && ps === ProposalStatus.NotSubmitted)
+          (props.proposalStatus.get,
+           props.callId,
+           props.hasDefinedObservations,
+           props.hasUndefinedObservations
+          )
+        ): (ps, _, hasDef, hasUndef) =>
+          if (!hasDef && ps === ProposalStatus.NotSubmitted)
+            errorMessage.set(
+              "Proposal cannot be submitted without at least one defined observation.".some
+            )
+          else if (hasUndef && ps === ProposalStatus.NotSubmitted)
             errorMessage.set(
               "Proposal cannot be submitted with undefined observations. Define them or mark them as inactive.".some
             )
@@ -124,7 +134,7 @@ object ProposalSubmissionBar:
                   label = "Submit Proposal",
                   onClick = updateStatus(ProposalStatus.Submitted),
                   disabled =
-                    isUpdatingStatus.get.value || props.callId.isEmpty || isDueDeadline || props.hasUndefinedObservations
+                    isUpdatingStatus.get.value || props.callId.isEmpty || isDueDeadline || props.hasObsError
                 ).compact.tiny,
                 props.deadline.map: deadline =>
                   val (deadlineStr, left): (String, Option[String]) =

diff --git a/explore/src/main/scala/explore/proposal/ProposalTabContents.scala b/explore/src/main/scala/explore/proposal/ProposalTabContents.scala
@@ -55,6 +55,7 @@ case class ProposalTabContents(
   undoStacks:               View[UndoStacks[IO, ProgramDetails]],
   layout:                   LayoutsMap,
   userIsReadonlyCoi:        Boolean,
+  hasDefinedObservations:   Boolean,
   hasUndefinedObservations: Boolean
 ) extends ReactFnProps(ProposalTabContents.component)
 
@@ -135,6 +136,7 @@ object ProposalTabContents:
                 deadline,
                 proposal.get.call.map(_.id),
                 isStdUser && !props.userIsReadonlyCoi,
+                props.hasDefinedObservations,
                 props.hasUndefinedObservations
               )
             )

diff --git a/model/shared/src/main/scala/explore/model/ProgramSummaries.scala b/model/shared/src/main/scala/explore/model/ProgramSummaries.scala
@@ -79,6 +79,9 @@ case class ProgramSummaries(
   lazy val hasUndefinedObservations: Boolean =
     observations.values.exists(_.workflow.state === ObservationWorkflowState.Undefined)
 
+  lazy val hasDefinedObservations: Boolean =
+    observations.values.exists(_.workflow.state === ObservationWorkflowState.Defined)
+
   lazy val obsAttachmentAssignments: ObsAttachmentAssignmentMap =
     observations.toList
       .flatMap((obsId, obs) => obs.attachmentIds.map(_ -> obsId))