diff --git a/api/esprr_api/__init__.py b/api/esprr_api/__init__.py index d48eb53..63594c2 100644 --- 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 index 81e0a21..fd5c010 100644 --- 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 index 11447d2..daaf660 100644 --- 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 index 5b64a47..6ddebce 100644 --- a/dashboard/src/utils/DisplayNames.ts +++ b/dashboard/src/utils/DisplayNames.ts @@ -20,6 +20,7 @@ export const displayNames: Record = { 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 index a98a1f8..c439fd2 100644 --- a/dashboard/src/views/Group.vue +++ b/dashboard/src/views/Group.vue @@ -44,6 +44,7 @@ 2019 Status 2020 Status 2021 Status + 2022 Status @@ -269,6 +270,38 @@ + + + + + + @@ -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 index 1ca741b..2b838c3 100644 --- a/dashboard/src/views/System.vue +++ b/dashboard/src/views/System.vue @@ -38,6 +38,14 @@ }" > + { 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 index 10baf13..1be936c 100644 --- 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 () => {