Merge pull request #272 from orppst/260-change-the-proposal-submissio…

…n-process-to-match-proposaldm-06

Submission process now includes Observing Mode select

src/main/webui/Add_@types.patch

@@ -1,6 +1,6 @@
---- proposalToolSchemas.ts.orig	2024-10-29 14:28:29
-+++ proposalToolSchemas.ts	2024-10-29 14:30:08
-@@ -7,6 +7,8 @@
+--- proposalToolSchemas.ts.orig	2024-10-30 13:50:57
++++ proposalToolSchemas.ts	2024-10-30 13:55:30
+@@ -7,12 +7,14 @@
   * A block of resources that have been allocated
   */
  export type AllocatedBlock = {
@@ -9,6 +9,13 @@
    /**
     * A resource that will be consumed by allocating an observation from a proposal
     */
+   resource?: Resource;
+   /**
+-   * a configuration that has been chosen to observe with.
++   * a configuration can be used to observe with.
+    */
+   mode?: ObservingMode;
+   /**
 @@ -25,6 +27,7 @@
   * an instance of a proposal that is allocated observing time
   */
@@ -98,6 +105,15 @@
    /**
     * any constraints on the observation
     */
+@@ -741,7 +752,7 @@
+    */
+   observation?: Observation[];
+   /**
+-   * a configuration that has been chosen to observe with.
++   * a configuration can be used to observe with.
+    */
+   mode?: ObservingMode;
+ };
 @@ -750,6 +761,9 @@
   * An organisation that can perform astronomical observations
   */
@@ -108,23 +124,56 @@
    xmlId?: string;
    /**
     * The name of the organization
-@@ -795,6 +809,7 @@
-  * a configuration can be used to observe with.
+@@ -765,6 +779,10 @@
+    */
+   wikiId?: WikiDataId;
+   /**
++   * the home page for the Observatory
++   */
++  homePage?: string;
++  /**
+    * the telescopes that the observatory controls
+    */
+   telescopes?: Telescope[];
+@@ -788,9 +806,10 @@
+ export type ObservingConstraint = Record<string, any>;
+
+ /**
+- * a configuration that has been chosen to observe with.
++ * a configuration can be used to observe with.
   */
  export type ObservingMode = {
 +  _id?: number;
    /**
     * human readable name for the mode
     */
-@@ -833,6 +848,7 @@
+@@ -800,17 +819,6 @@
+    */
+   description?: string;
+   /**
+-   * A particular observation combination that is possible
+-   */
+-  configuration?: ObservingModeConfiguration;
+-  xmlId?: string;
+-};
+-
+-/**
+- * A particular observation combination that is possible
+- */
+-export type ObservingModeConfiguration = {
+-  /**
+    * Available filters /bandpasses for intruments
+    */
+   filter?: Filter;
+@@ -840,6 +848,7 @@
   * a complete proposal
   */
  export type ObservingProposal = {
 +  "_id"?: number;
    /**
     * the proposal title
     */
-@@ -886,6 +902,8 @@
+@@ -893,6 +902,8 @@
   * An institution that is a collection of people
   */
  export type Organization = {
@@ -133,7 +182,7 @@
    /**
     * The name of the organization
     */
-@@ -1110,6 +1128,8 @@
+@@ -1117,11 +1128,17 @@
   * Defines collection of resources and proposals for a particular observing season
   */
  export type ProposalCycle = {
@@ -142,23 +191,32 @@
    /**
     * a human readable description of the cycle
     */
-@@ -1183,6 +1203,7 @@
+   title?: string;
+   /**
++   * pointer to more detailed instructions about the cycle
++   */
++  instructions?: string;
++  /**
+    * the date by which observing proposals must be submitted to be considered for this cycle
+    *
+    * @format date
+@@ -1186,6 +1203,7 @@
   * A review of a proposal
   */
  export type ProposalReview = {
 +  _id?: number;
    /**
     * Description
     */
-@@ -1265,6 +1286,7 @@
+@@ -1268,6 +1286,7 @@
   * A real value with a unit.
   */
  export type RealQuantity = {
 +  "@type"?: string; // ivoa:RealQuantity
    /**
     * Must conform to definition of unit in VOUnit spec.
     */
-@@ -1296,6 +1318,8 @@
+@@ -1299,6 +1318,8 @@
   * A resource that will be consumed by allocating an observation from a proposal
   */
  export type Resource = {
@@ -167,23 +225,32 @@
    /**
     * The amount of the resource
     *
-@@ -1326,6 +1350,7 @@
+@@ -1320,7 +1341,7 @@
+    */
+   resource?: Resource;
+   /**
+-   * a configuration that has been chosen to observe with.
++   * a configuration can be used to observe with.
+    */
+   mode?: ObservingMode;
+ };
+@@ -1329,6 +1350,7 @@
   * a type of resource
   */
  export type ResourceType = {
 +  _id?: number;
    /**
     * the name of the resource type
     */
-@@ -1338,6 +1363,7 @@
+@@ -1341,6 +1363,7 @@
   * assigned to review the proposal
   */
  export type Reviewer = {
 +  _id?: number;
    /**
     * person connected with the proposal
     */
-@@ -1369,6 +1395,8 @@
+@@ -1372,6 +1395,8 @@
    /**
     * Science oriented definition of a spectral window.
     */
@@ -192,23 +259,23 @@
    spectralWindowSetup?: SpectralWindowSetup;
    expectedSpectralLine?: ExpectedSpectralLine[];
  };
-@@ -1413,6 +1441,7 @@
+@@ -1416,6 +1441,7 @@
   * A SpaceFrame is specified by its reference frame (orientation), and a reference position (origin). Currently only standard reference frames are allowed. An equinox MUST be provided for pre-ICRS reference frames. A planetary ephemeris MAY be provided if relevant. If needed, but not provided, it is assumed to be 'DE405'.
   */
  export type SpaceFrame = {
 +  "@type": string; // coords:SpaceFrame
    /**
     * RefLocation defines the origin of the spatial coordinate space. This location is represented either by a standard reference position (for which the absolute location in phase space is known by definition), or a specified point in another Spatial frame. This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames. For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which might be different from the detector location.
     */
-@@ -1435,6 +1464,7 @@
+@@ -1438,6 +1464,7 @@
   * Specialized coordinate system for the Spatial domain. This object SHOULD include an appropriate SpaceFrame. In Appendix B, we define two standard spatial coordinate space instances (Spherical and Cartesian), which may be referenced in serializations. If a CoordSpace is not provided, it is assumed to be represented by a Standard Spherical Coordinate Space.
   */
  export type SpaceSys = {
 +  "@type": string; // coords:SpaceSys
    xmlId?: string;
    /**
     * Abstract head of coordinate spaces related to physical properties.
-@@ -1518,7 +1548,7 @@
+@@ -1521,7 +1548,7 @@
    /**
     * person connected with the proposal
     */
@@ -217,15 +284,35 @@
    uid?: string;
    inKeycloakRealm?: boolean;
  };
-@@ -1538,6 +1568,7 @@
+@@ -1541,6 +1568,7 @@
   * an instance of a proposal that has been submitted
   */
  export type SubmittedProposal = {
 +  _id?: number;
    /**
     * the date that the proposal was submitted
     *
-@@ -1601,17 +1632,20 @@
+@@ -1559,15 +1587,15 @@
+    * @example "2022-03-10T00:00:00.000Z"
+    */
+   reviewsCompleteDate?: Date;
+-  /**
+-   * a complete proposal
+-   */
+-  proposal?: ObservingProposal;
+   config?: ObservationConfiguration[];
+   /**
+    * the reviews
+    */
+   reviews?: ProposalReview[];
++  /**
++   * a complete proposal
++   */
++  proposal?: ObservingProposal;
+   xmlId?: string;
+ };
+
+@@ -1604,17 +1632,20 @@
   * A target source
   */
  export type Target = {
@@ -246,15 +333,15 @@
    xmlId?: string;
    name?: string;
  };
-@@ -1620,6 +1654,7 @@
+@@ -1623,6 +1654,7 @@
   * an observation of the scientific target
   */
  export type TargetObservation = {
 +  "@type"?: string;
    xmlId?: string;
    /**
     * any constraints on the observation
-@@ -1648,10 +1683,12 @@
+@@ -1651,10 +1683,12 @@
     */
    performance?: PerformanceParameters;
    spectrum?: ScienceSpectralWindow[];
@@ -267,15 +354,15 @@
    xmlId?: string;
    /**
     * telescope name
-@@ -1671,6 +1708,7 @@
+@@ -1674,6 +1708,7 @@
   * a set of telescopes that are operated together for an observation
   */
  export type TelescopeArray = {
 +  "@type"?: string;
    xmlId?: string;
    /**
     * the array name
-@@ -1752,6 +1790,10 @@
+@@ -1755,6 +1790,10 @@
   * particular time range
   */
  export type TimingWindow = {
@@ -286,3 +373,17 @@
    note?: string;
    isAvoidConstraint?: boolean;
    /**
+@@ -1777,13 +1816,6 @@
+ };
+
+ /**
+- * Must conform to definition of unit in VOUnit spec.
+- */
+-export type Unit1 = {
+-  value?: string;
+-};
+-
+-/**
+  * @format binary
+  */
+ export type UploadItemSchema = Blob;

src/main/webui/src/App2.tsx

@@ -27,7 +27,7 @@ import TechnicalGoalsPanel from "./ProposalEditorView/technicalGoals/technicalGo
 import { TargetPanel } from "./ProposalEditorView/targets/targetPanel.tsx";
 import ObservationsPanel from "./ProposalEditorView/observations/observationPanel.tsx";
 import DocumentsPanel from "./ProposalEditorView/proposal/Documents.tsx";
-import SubmitPanel from "./ProposalEditorView/proposal/Submit.tsx";
+import SubmitPanel from "./ProposalEditorView/submitProposal/submitPanel.tsx";
 
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
 import {AuthProvider} from "./auth/Auth.tsx";

src/main/webui/src/ProposalEditorView/proposal/Overview.tsx

@@ -317,20 +317,6 @@ function OverviewPanel(): ReactElement {
         )
     }
 
-    /**
-     * generates the display submitted panel.
-     * @return {React.ReactElement} the html for the submitted display.
-     * @constructor
-     */
-    const DisplaySubmitted = (): ReactElement => {
-        return (
-            <Group>
-                <h4>Submitted:</h4>
-                <Text>{proposalsData?.submitted ? 'yes' : 'no'}</Text>
-            </Group>
-        )
-    }
-
     /**
      * handles the scientific justification panel
      * @return {React.ReactElement} the html for the scientific justification panel.
@@ -586,7 +572,6 @@ function OverviewPanel(): ReactElement {
                             <DisplayObservations/>
                             <DisplaySupportingDocuments/>
                             <DisplayRelatedProposals/>
-                            <DisplaySubmitted/>
                         </div>
                     </Container>
             }