Merge/v1.12 into v2.0

.github/workflows/ci.yml

@@ -76,9 +76,9 @@ jobs:
         working-directory: packages/hydroserver-ts
         run: npm run coverage
 
-      - name: Build TypeScript client
+      - name: Verify packed TypeScript client
         working-directory: packages/hydroserver-ts
-        run: npm run build
+        run: npm run test:package
 
   data-management:
     name: Data Management App 80% Coverage
@@ -162,10 +162,6 @@ jobs:
         working-directory: apps/qc-app
         run: npm ci --workspaces=false
 
-      - name: Install local QC utils package
-        working-directory: apps/qc-app
-        run: npm install ../../packages/qc-utils --no-save --workspaces=false
-
       - name: Run QC app typecheck
         working-directory: apps/qc-app
         run: npm run typecheck
@@ -393,10 +389,6 @@ jobs:
         working-directory: apps/qc-app
         run: npm ci --workspaces=false
 
-      - name: Install local QC utils package
-        working-directory: apps/qc-app
-        run: npm install ../../packages/qc-utils --no-save --workspaces=false
-
       - name: Install Playwright browsers
         working-directory: apps/qc-app
         run: npx playwright install --with-deps chromium firefox

.github/workflows/deploy.yml

@@ -29,18 +29,37 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      # Legacy v1.x docs live on the docs-v1 branch and are served at /v1/
+      # while users migrate. Remove this checkout and the v1 steps below to
+      # retire them.
+      - name: Checkout v1.x docs
+        uses: actions/checkout@v4
+        with:
+          ref: docs-v1
+          path: v1-src
+          sparse-checkout: apps/docs
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: npm
-          cache-dependency-path: apps/docs/package-lock.json
+          cache-dependency-path: |
+            apps/docs/package-lock.json
+            v1-src/apps/docs/package-lock.json
       - name: Install dependencies
         working-directory: apps/docs
         run: npm ci
       - name: Build
         working-directory: apps/docs
         run: npm run docs:build
+      - name: Install v1.x dependencies
+        working-directory: v1-src/apps/docs
+        run: npm ci
+      - name: Build v1.x into /v1
+        working-directory: v1-src/apps/docs
+        run: |
+          npx vitepress build docs --base /v1/
+          cp -r docs/.vitepress/dist "$GITHUB_WORKSPACE/apps/docs/docs/.vitepress/dist/v1"
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact

apps/data-management/e2e/specs/sites.spec.ts

@@ -451,6 +451,41 @@ test.describe('sites and workspaces', () => {
     await expect(updatedSiteRow).toHaveCount(0)
   })
 
+  test('canceling or dismissing site edits discards unsaved changes', async ({
+    page,
+  }) => {
+    const stamp = Date.now()
+    const unsavedProvince = `Unsaved Province ${stamp}`
+    const unsavedCounty = `Unsaved County ${stamp}`
+
+    await authenticateSession(page, users.owner.email, users.owner.password)
+    await page.goto(`/sites/${fixtures.monitoringSites.mutablePublic.id}`)
+
+    await page.getByTestId('edit-site-button').click()
+    await page.getByLabel('State/Province/Region').fill(unsavedProvince)
+    await page.getByRole('button', { name: 'Cancel' }).click()
+
+    await expect(page.getByText(unsavedProvince, { exact: true })).toHaveCount(0)
+
+    await page.getByTestId('edit-site-button').click()
+    await expect(page.getByLabel('State/Province/Region')).not.toHaveValue(
+      unsavedProvince
+    )
+    await page.getByRole('button', { name: 'Cancel' }).click()
+
+    await page.getByTestId('edit-site-button').click()
+    await page.getByLabel('County/District').fill(unsavedCounty)
+    await page.keyboard.press('Escape')
+
+    await expect(page.getByText(unsavedCounty, { exact: true })).toHaveCount(0)
+
+    await page.getByTestId('edit-site-button').click()
+    await expect(page.getByLabel('County/District')).not.toHaveValue(
+      unsavedCounty
+    )
+    await page.getByRole('button', { name: 'Cancel' }).click()
+  })
+
   test('owner can edit, toggle privacy for, and delete a site with datastream CRUD', async ({
     page,
     browser,

apps/data-management/e2e/specs/visualization.spec.ts

@@ -308,20 +308,22 @@ test.describe("visualization", () => {
 
     await plotPublicDatastream(page);
 
-    // Date preset chips use abbreviated labels: 1m, 6m, YTD, 1y, all
+    // Date preset chips use abbreviated labels: 1w, 1m, 6m, YTD, 1y, all
+    await expect(page.getByText("1w").first()).toBeVisible();
     await expect(page.getByText("1m").first()).toBeVisible();
     await expect(page.getByText("6m").first()).toBeVisible();
     await expect(page.getByText("1y").first()).toBeVisible();
 
+    await page.getByText("1w").first().click();
     await page.getByText("1m").first().click();
     await page.getByText("6m").first().click();
     await page.getByText("1y").first().click();
 
     // Quick-range selection is mirrored into the route query.
-    await expect(page).toHaveURL(/selectedDateBtnId=3/);
+    await expect(page).toHaveURL(/selectedDateBtnId=4/);
     const copiedUrl = new URL(page.url());
 
-    expect(copiedUrl.searchParams.get("selectedDateBtnId")).toBe("3");
+    expect(copiedUrl.searchParams.get("selectedDateBtnId")).toBe("4");
     expect(copiedUrl.searchParams.has("beginDate")).toBe(false);
     expect(copiedUrl.searchParams.has("endDate")).toBe(false);
     expect(copiedUrl.searchParams.has("xStart")).toBe(false);

apps/data-management/src/App.vue

@@ -1,30 +1,52 @@
 <template>
-  <v-app>
-    <Navbar v-if="!route.meta.hideNavBar" />
+  <router-view v-slot="{ Component }">
+    <v-app>
+      <Navbar v-if="Component && showNavBar" />
 
-    <v-main :style="mainLayoutStyle">
-      <router-view />
-    </v-main>
+      <v-main :style="mainLayoutStyle">
+        <component :is="Component" v-if="Component" />
+        <HsEmptyState
+          v-else-if="initializationError"
+          title="Unable to load HydroServer"
+        >
+          Check your connection and refresh the page.
+        </HsEmptyState>
+        <HsFullScreenLoader v-else loading-text="Loading HydroServer..." />
+      </v-main>
 
-    <Footer v-if="!route.meta.hideFooter" class="flex-grow-0" />
-    <Notifications />
-  </v-app>
+      <Footer v-if="Component && !route.meta.hideFooter" class="flex-grow-0" />
+      <Notifications />
+    </v-app>
+  </router-view>
 </template>
 
 <script setup lang="ts">
+import {
+  initializationError,
+  isHydroServerReady,
+} from '@/bootstrap/appInitialization'
 import Navbar from '@/components/base/Navbar.vue'
 import Footer from '@/components/base/Footer.vue'
 import Notifications from '@/components/base/Notifications.vue'
+import {
+  HsEmptyState,
+  HsFullScreenLoader,
+} from '@hydroserver/design-system/vue'
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()
 
+// The navbar waits for the client: it reads the session and the user's workspaces.
+const showNavBar = computed(
+  () => isHydroServerReady.value && !route.meta.hideNavBar
+)
+
 // Vuetify 4 can initially register a conditionally-rendered app bar with a
 // zero layout height in optimized builds. Keep the shared main-content offset
 // deterministic so the fixed navbar never covers page controls.
 const mainLayoutStyle = computed(() => {
-  const navbarHeight = route.meta.hideNavBar ? '0px' : '64px'
+  const navbarHeight = showNavBar.value ? '64px' : '0px'
   return {
     '--v-layout-top': navbarHeight,
     paddingLeft: 'var(--v-layout-left, 0px)',