adding access to 2022 dataset

UARENForecasting · Sep 19, 2023 · 327b89b · 327b89b
1 parent e1debc9
commit 327b89b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 3 deletions.
diff --git a/api/esprr_api/__init__.py b/api/esprr_api/__init__.py
@@ -33,6 +33,7 @@ class Settings(BaseSettings):
         "NSRDB_2019": Path("/d4/uaren/nsrdb/nsrdb_2019.zarr"),
         "NSRDB_2020": Path("/d4/uaren/nsrdb/nsrdb_2020.zarr"),
         "NSRDB_2021": Path("/d4/uaren/nsrdb/nsrdb_2021.zarr"),
+        "NSRDB_2022": Path("/d4/uaren/nsrdb/nsrdb_2021.zarr")
     }
     sync_jobs_period: int = 15
 

diff --git a/api/esprr_api/models.py b/api/esprr_api/models.py
@@ -278,6 +278,7 @@ class DatasetEnum(str, Enum):
     nsrdb_2019 = "NSRDB_2019"
     nsrdb_2020 = "NSRDB_2020"
     nsrdb_2021 = "NSRDB_2021"
+    nsrdb_2022 = "NSRDB_2022"
 
 
 class DataStatusEnum(str, Enum):

diff --git a/dashboard/src/models.ts b/dashboard/src/models.ts
@@ -56,4 +56,5 @@ export const validDatasets = [
   "NSRDB_2019",
   "NSRDB_2020",
   "NSRDB_2021",
+  "NSRDB_2022"
 ];
diff --git a/dashboard/src/utils/DisplayNames.ts b/dashboard/src/utils/DisplayNames.ts
@@ -20,6 +20,7 @@ export const displayNames: Record<string, any> = {
   NSRDB_2019: "NSRDB 2019",
   NSRDB_2020: "NSRDB 2020",
   NSRDB_2021: "NSRDB 2021",
+  NSRDB_2022: "NSRDB 2022",
 };
 
 export function getDisplayName(machineName: string): string {

diff --git a/dashboard/src/views/Group.vue b/dashboard/src/views/Group.vue
@@ -44,6 +44,7 @@
               <th>2019 Status</th>
               <th>2020 Status</th>
               <th>2021 Status</th>
+              <th>2022 Status</th>
             </tr>
           </thead>
           <tbody>
@@ -269,6 +270,38 @@
                   </button>
                 </router-link>
               </td>
+              <td>
+                <button
+                  v-if="
+                    !('NSRDB_2022' in groupResultStatus) ||
+                    groupResultStatus['NSRDB_2022'] == 'not started'
+                  "
+                  @click="queueAll('NSRDB_2022')"
+                >
+                  Compute 2022
+                </button>
+                <router-link
+                  v-else
+                  class="btn-spc"
+                  :to="{
+                    name: 'Group Dataset Details',
+                    params: {
+                      groupId: group.object_id,
+                      dataset: 'NSRDB_2022',
+                    },
+                  }"
+                >
+                  <button
+                    class="group-results group-2022-results"
+                    :disabled="
+                      !('NSRDB_2022' in groupResultStatus) ||
+                      groupResultStatus['NSRDB_2022'] == 'pending'
+                    "
+                  >
+                    2022 Results
+                  </button>
+                </router-link>
+              </td>
             </tr>
           </tbody>
         </table>
@@ -571,7 +604,7 @@ table {
 .group.systems-table tr {
   display: grid;
   padding: 0.5em;
-  grid-template-columns: 1fr 3fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-template-columns: 1fr 3fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
   border-bottom: 1px solid #ccc;
 }
 .group.systems-table tr:hover {

diff --git a/dashboard/src/views/System.vue b/dashboard/src/views/System.vue
@@ -38,6 +38,14 @@
               }"
               ><button>2021 Results</button></router-link
             >
+            <router-link
+              class="btn-spc"
+              :to="{
+                name: 'System Results',
+                params: { systemId: systemId, dataset: 'NSRDB_2022' },
+              }"
+              ><button>2022 Results</button></router-link
+            >
             <router-link
               v-if="dataset"
               :to="{

diff --git a/dashboard/tests/unit/test_group_results.spec.ts b/dashboard/tests/unit/test_group_results.spec.ts
@@ -265,7 +265,7 @@ describe("Test Group Results component", () => {
     const warning = wrapper.find(".no-dataset-warning");
     expect(warning.text()).toBe(
       "You are trying to access an invalid dataset. Valid datasets are\n" +
-        "    NSRDB_2018, NSRDB_2019, NSRDB_2020, NSRDB_2021."
+        "    NSRDB_2018, NSRDB_2019, NSRDB_2020, NSRDB_2021, NSRDB_2022."
     );
   });
   it("Test results dne", async () => {

diff --git a/dashboard/tests/unit/test_results.spec.ts b/dashboard/tests/unit/test_results.spec.ts
@@ -233,7 +233,7 @@ describe("Test Results component", () => {
     const warning = wrapper.find(".no-dataset-warning");
     expect(warning.text()).toBe(
       "You are trying to access an invalid dataset. Valid datasets are\n" +
-        "    NSRDB_2018, NSRDB_2019, NSRDB_2020, NSRDB_2021."
+        "    NSRDB_2018, NSRDB_2019, NSRDB_2020, NSRDB_2021, NSRDB_2022."
     );
   });
   it("Test result dne", async () => {