From 177d1f6897957acf88888aee9d0f4fe37ec26560 Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Thu, 8 Oct 2026 14:23:52 +0530 Subject: [PATCH 1/6] Make Create Workspace link external; add e2e test Mark the AppNavbar 'Create Workspace' nuxt-link as external (with a comment explaining document navigation to avoid overlapping with unresolved dashboard setup) and clean up its markup. Add an end-to-end test that simulates a very large /workspaces/mine request being held pending, then clicks the navbar 'Create Workspace' link while the dashboard is loading to verify the app performs a full navigation to /workspace/create and that the Create Workspace UI renders as expected. --- components/AppNavbar.vue | 7 ++- pages/workspace/[id]/export/index.vue | 2 +- test/e2e/dashboard.spec.ts | 75 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/components/AppNavbar.vue b/components/AppNavbar.vue index 0571576f..54547860 100644 --- a/components/AppNavbar.vue +++ b/components/AppNavbar.vue @@ -57,12 +57,15 @@ >Dashboard
  • + Create Workspace -
    • + >Create Workspace + +

  • - Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Start", when you can then press again to download the file to your device. + Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Start", which you can then press again to download the file to your device.

    diff --git a/test/e2e/dashboard.spec.ts b/test/e2e/dashboard.spec.ts index afa818d6..deb79f83 100644 --- a/test/e2e/dashboard.spec.ts +++ b/test/e2e/dashboard.spec.ts @@ -403,7 +403,82 @@ test.describe('dashboard', () => { await expect(dialog).not.toContainText('must-not-be-rendered'); expect(jobsRequestCount).toBe(1); }); + test('navigates to Create Workspace while a large dashboard is loading', async ({ page }) => { + await seedAuthenticatedSession(page); + + const largeWorkspaceList = Array.from({ length: 1_500 }, (_, index) => ({ + ...aWorkspace, + id: index + 1, + title: `Workspace ${index + 1}`, + createdAt: new Date( + Date.UTC(2026, 0, 1, 0, 0, index) + ).toISOString() + })); + + let notifyMineStarted!: () => void; + const mineStarted = new Promise((resolve) => { + notifyMineStarted = resolve; + }); + + await page.route(`${TEST_API_BASE}workspaces/mine`, async (route) => { + notifyMineStarted(); + + // Keep /mine pending long enough to click the navbar link. + await new Promise(resolve => setTimeout(resolve, 3_000)); + + // A full document navigation may cancel the dashboard request. + try { + await route.fulfill({ json: largeWorkspaceList }); + } + catch { + // Expected when the external navbar navigation cancels /mine. + } + }); + + await page.route( + `${TEST_API_BASE}tdei-user/project-group-roles/**`, + route => route.fulfill({ json: projectGroups }) + ); + + // Begin on an already-rendered page, similar to navigating from the + // authentication callback into the dashboard. + await page.goto('/'); + await page + .locator('.app-navbar') + .getByRole('link', { name: 'Dashboard', exact: true }) + .click(); + + // This guarantees we click while /mine is actually pending. + await mineStarted; + + const createWorkspaceLink = page + .locator('.app-navbar') + .getByRole('link', { + name: 'Create Workspace', + exact: true + }); + + await expect(createWorkspaceLink).toBeVisible(); + await createWorkspaceLink.click(); + + await expect(page).toHaveURL('/workspace/create'); + await expect( + page.getByRole('heading', { name: 'Create a Workspace' }) + ).toBeVisible(); + + await expect( + page.getByText('Blank Workspace', { exact: true }) + ).toBeVisible(); + + await expect( + page.getByText('From TDEI', { exact: true }) + ).toBeVisible(); + + await expect( + page.getByText('From File', { exact: true }) + ).toBeVisible(); + }); // @test e2e: clicking on a dataset updates the metadata panel on the right and shows the data extent in the map // BLOCKED: needs the details panel + maplibre map to render. The map calls // getWorkspaceBbox (OSM API) and inits maplibre-gl, which requires WebGL in From 5671e134eae650d48ed6d6638a3082d961edc390 Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Thu, 8 Oct 2026 15:36:26 +0530 Subject: [PATCH 2/6] Change export button label and simplify e2e test Rename the export action text from "Start" to "Save" in the workspace export page for clearer UX. In the dashboard e2e test, remove an artificial delay and related comments, and simplify the /mine route handler to fulfill the mocked response and swallow any fulfill errors (.catch(() => {})) to avoid flaky cancellations during navigation. --- pages/workspace/[id]/export/index.vue | 2 +- test/e2e/dashboard.spec.ts | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pages/workspace/[id]/export/index.vue b/pages/workspace/[id]/export/index.vue index 178ad9bc..e86ed806 100644 --- a/pages/workspace/[id]/export/index.vue +++ b/pages/workspace/[id]/export/index.vue @@ -61,7 +61,7 @@

    - Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Start", which you can then press again to download the file to your device. + Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Save", which you can then press again to download the file to your device.

    diff --git a/test/e2e/dashboard.spec.ts b/test/e2e/dashboard.spec.ts index deb79f83..f54381d3 100644 --- a/test/e2e/dashboard.spec.ts +++ b/test/e2e/dashboard.spec.ts @@ -423,16 +423,8 @@ test.describe('dashboard', () => { await page.route(`${TEST_API_BASE}workspaces/mine`, async (route) => { notifyMineStarted(); - // Keep /mine pending long enough to click the navbar link. await new Promise(resolve => setTimeout(resolve, 3_000)); - - // A full document navigation may cancel the dashboard request. - try { - await route.fulfill({ json: largeWorkspaceList }); - } - catch { - // Expected when the external navbar navigation cancels /mine. - } + await route.fulfill({ json: largeWorkspaceList }).catch(() => {}); }); await page.route( @@ -440,8 +432,6 @@ test.describe('dashboard', () => { route => route.fulfill({ json: projectGroups }) ); - // Begin on an already-rendered page, similar to navigating from the - // authentication callback into the dashboard. await page.goto('/'); await page @@ -449,7 +439,6 @@ test.describe('dashboard', () => { .getByRole('link', { name: 'Dashboard', exact: true }) .click(); - // This guarantees we click while /mine is actually pending. await mineStarted; const createWorkspaceLink = page From 97b767b3078e7f44693f9060ed7ed021bea545f8 Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Thu, 8 Oct 2026 15:49:37 +0530 Subject: [PATCH 3/6] Update navbar formatting and snapshot button text Minor formatting cleanup in AppNavbar.vue (moved closing     inline). Update E2E snapshot to reflect changed button label flow: when ready the button now shows "Save" instead of "Start", so the accessibility snapshot text was updated accordingly. --- components/AppNavbar.vue | 5 ++--- ...41c-Download-boxes-with-their-buttons-snapshot-1.aria.yml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/components/AppNavbar.vue b/components/AppNavbar.vue index 54547860..bd3218bb 100644 --- a/components/AppNavbar.vue +++ b/components/AppNavbar.vue @@ -63,9 +63,8 @@ to="/workspace/create" external @click="closeOnMobile" - >Create Workspace - -
    • + >Create Workspace +
  • Date: Mon, 12 Oct 2026 12:14:04 +0530 Subject: [PATCH 4/6] Detect failed workspace import jobs Add logic to detect import jobs that should be treated as failures even when marked completed. Introduces util/findFailedImportJob to pick the latest workspace-import job whose status is failed or whose response.success is false. Use this helper in WorkspaceJobFailureDialog and the dashboard: the dialog will prefer a failed import job when showing details, and the dashboard now re-verifies workspaces marked completed (verifyCompletedImport) and flips their importStatus to failed if a failing job is found. Also clear the verification cache on refresh. Includes unit tests for the helper and updates an E2E test to expect the additional job fetch. --- .../dashboard/WorkspaceJobFailureDialog.vue | 3 +- pages/dashboard.vue | 25 ++++++ test/e2e/dashboard.spec.ts | 17 ++-- test/unit/util/workspace-jobs.test.ts | 77 +++++++++++++++++++ util/workspace-jobs.ts | 10 +++ 5 files changed, 122 insertions(+), 10 deletions(-) create mode 100644 test/unit/util/workspace-jobs.test.ts create mode 100644 util/workspace-jobs.ts diff --git a/components/dashboard/WorkspaceJobFailureDialog.vue b/components/dashboard/WorkspaceJobFailureDialog.vue index 6e5c38a9..2093ac12 100644 --- a/components/dashboard/WorkspaceJobFailureDialog.vue +++ b/components/dashboard/WorkspaceJobFailureDialog.vue @@ -191,6 +191,7 @@ import { BModal } from 'bootstrap-vue-next/components/BModal'; import type { ComponentExposed } from 'vue-component-type-helpers'; import { workspacesClient } from '~/services/index'; import { resolveHttpErrorMessage } from '~/services/http'; +import { findFailedImportJob } from '~/util/workspace-jobs'; import type { WorkspaceId, WorkspaceJob } from '~/types/workspaces'; @@ -216,7 +217,7 @@ async function show(workspaceId: WorkspaceId): Promise { try { const jobs = await workspacesClient.getWorkspaceJobs(workspaceId); if (activeRequestId === requestId) { - job.value = jobs[0] ?? null; + job.value = findFailedImportJob(jobs) ?? jobs[0] ?? null; } } catch (error: unknown) { diff --git a/pages/dashboard.vue b/pages/dashboard.vue index 8a34ea28..af27f4aa 100644 --- a/pages/dashboard.vue +++ b/pages/dashboard.vue @@ -279,6 +279,7 @@ import { import { toast } from 'vue3-toastify'; import 'vue3-toastify/dist/index.css'; import { parsePositiveIntegerQuery } from '~/util/route-query'; +import { findFailedImportJob } from '~/util/workspace-jobs'; import type { Workspace, WorkspaceCenter } from '~/types/workspaces'; @@ -313,6 +314,7 @@ const workspaceSearch = ref(''); const pinnedWorkspaceIds = ref>(new Set()); const refreshingWorkspaces = ref(false); const jobFailureDialog = useTemplateRef('jobFailureDialog'); +const verifiedCompletedImports = new Set(); const currentWorkspaces = computed(() => currentProjectGroup.value @@ -435,6 +437,7 @@ function selectWorkspace( updateRoute: boolean = true ): void { currentWorkspace.value = workspace; + void verifyCompletedImport(workspace); if ( updateRoute @@ -450,6 +453,27 @@ function selectWorkspace( } } +async function verifyCompletedImport(workspace: Workspace): Promise { + if ( + workspace.importStatus !== 'completed' + || verifiedCompletedImports.has(workspace.id) + ) { + return; + } + + verifiedCompletedImports.add(workspace.id); + + try { + const jobs = await workspacesClient.getWorkspaceJobs(workspace.id); + if (findFailedImportJob(jobs)) { + workspace.importStatus = 'failed'; + } + } + catch { + verifiedCompletedImports.delete(workspace.id); + } +} + function loadWorkspacePins(): void { if (!tdeiAuth.subject) { return; @@ -498,6 +522,7 @@ async function refreshWorkspaces(): Promise { try { const refreshedWorkspaces = await workspacesClient.getMyWorkspaces(); + verifiedCompletedImports.clear(); const existingWorkspaces = new Map( workspaces.value.map(workspace => [workspace.id, workspace]) ); diff --git a/test/e2e/dashboard.spec.ts b/test/e2e/dashboard.spec.ts index f54381d3..df98d7e0 100644 --- a/test/e2e/dashboard.spec.ts +++ b/test/e2e/dashboard.spec.ts @@ -340,7 +340,7 @@ test.describe('dashboard', () => { expect(bboxRequestCount).toBe(1); }); - test('clicking a failed import status loads the latest job and shows its failure response', async ({ page }) => { + test('treats a completed import with an unsuccessful response as failed', async ({ page }) => { const failedWorkspace = { id: 1769, type: 'osw', @@ -357,10 +357,9 @@ test.describe('dashboard', () => { externalAppAccess: 0, kartaViewToken: null, role: 'lead', - importStatus: 'failed' + importStatus: 'completed' }; const failureMessage = 'Step \'Create Changeset\' failed: no input file was found'; - let jobsRequestCount = 0; await seedAuthenticatedSession(page); await seedProjectGroupSelection(page, { id: PROJECT_GROUP_ID, name: 'Puget Sound' }); @@ -368,7 +367,6 @@ test.describe('dashboard', () => { await page.route('**/project-group-roles/**', route => route.fulfill({ json: projectGroups })); await page.route('**/workspaces/1769/bbox', route => route.fulfill({ status: 204 })); await page.route('**/workspaces/1769/jobs', (route) => { - jobsRequestCount++; return route.fulfill({ json: [{ id: 2, @@ -390,10 +388,12 @@ test.describe('dashboard', () => { }); await page.goto('/dashboard'); - await expect(page.locator('.workspace-card-updated')).toContainText('Updated'); - await expect(page.locator('.dashboard-workspace-updated')).toContainText('Updated'); - await expect(page.getByText('Updated At', { exact: true })).toBeVisible(); - await page.getByRole('button', { name: 'View import failure details' }).click(); + const failedBadge = page.getByRole('button', { name: 'View import failure details' }); + await expect(failedBadge).toContainText( + 'Setup failed. Select to view details', + { timeout: 30_000 } + ); + await failedBadge.click(); const dialog = page.getByRole('dialog', { name: 'Workspace import failed' }); await expect(dialog).toBeVisible(); @@ -401,7 +401,6 @@ test.describe('dashboard', () => { await expect(dialog).toContainText('STEP_EXECUTION_FAILED'); await expect(dialog).toContainText('Create Changeset'); await expect(dialog).not.toContainText('must-not-be-rendered'); - expect(jobsRequestCount).toBe(1); }); test('navigates to Create Workspace while a large dashboard is loading', async ({ page }) => { await seedAuthenticatedSession(page); diff --git a/test/unit/util/workspace-jobs.test.ts b/test/unit/util/workspace-jobs.test.ts new file mode 100644 index 00000000..a3ed284c --- /dev/null +++ b/test/unit/util/workspace-jobs.test.ts @@ -0,0 +1,77 @@ +import { describe, expect, it } from 'vitest'; +import { findFailedImportJob } from '~/util/workspace-jobs'; + +import type { WorkspaceJob } from '~/types/workspaces'; + +function makeJob(overrides: Partial = {}): WorkspaceJob { + return { + id: 1, + workspace_id: 2632, + job_type: 'workspace-import-file', + request: {}, + current_task: 'Create Changeset', + response: { + success: true, + messageCode: 'SUCCESS', + message: 'Import completed' + }, + created_at: '2026-10-02T00:00:00Z', + updated_at: '2026-10-02T00:00:00Z', + status: 'completed', + current_task_status: null, + ...overrides + }; +} + +describe('findFailedImportJob', () => { + it('treats a completed import with success false as failed', () => { + const failedJob = makeJob({ + response: { + success: false, + messageCode: 'STEP_EXECUTION_FAILED', + message: 'Create Changeset failed' + } + }); + + expect(findFailedImportJob([failedJob])).toBe(failedJob); + }); + + it('recognizes an explicitly failed import', () => { + const failedJob = makeJob({ status: 'failed', response: null }); + + expect(findFailedImportJob([failedJob])).toBe(failedJob); + }); + + it('ignores successful imports and failed non-import jobs', () => { + const jobs = [ + makeJob(), + makeJob({ + id: 2, + job_type: 'workspace-export', + response: { + success: false, + messageCode: 'EXPORT_FAILED', + message: 'Export failed' + } + }) + ]; + + expect(findFailedImportJob(jobs)).toBeUndefined(); + }); + + it('does not let an older failed import override the latest successful import', () => { + const jobs = [ + makeJob({ id: 2 }), + makeJob({ + id: 1, + response: { + success: false, + messageCode: 'STEP_EXECUTION_FAILED', + message: 'An older import failed' + } + }) + ]; + + expect(findFailedImportJob(jobs)).toBeUndefined(); + }); +}); diff --git a/util/workspace-jobs.ts b/util/workspace-jobs.ts new file mode 100644 index 00000000..997ba71a --- /dev/null +++ b/util/workspace-jobs.ts @@ -0,0 +1,10 @@ +import type { WorkspaceJob } from '~/types/workspaces'; + +export function findFailedImportJob(jobs: WorkspaceJob[]): WorkspaceJob | undefined { + const latestImportJob = jobs.find(job => job.job_type.startsWith('workspace-import')); + + return latestImportJob + && (latestImportJob.status === 'failed' || latestImportJob.response?.success === false) + ? latestImportJob + : undefined; +} From 62311d812b45316d34788b17f2f8720eafe94aaa Mon Sep 17 00:00:00 2001 From: shweta2101 Date: Mon, 12 Oct 2026 17:15:28 +0530 Subject: [PATCH 5/6] Add Rapid3 editor selection for OSW reviews Pass workspace type to the review overlay and toolbar and add an editor selection flow for OSW workspaces. Toolbar now shows a split "Edit Here" dropdown (Rapid 2 default and Rapid 3 beta) when rapid3Manager is available and the workspace type is 'osw'; the primary action remains Rapid 2. The edit emit/signature was extended to include the chosen editor, and the review page openEditor now accepts an editor parameter and adds an editor query param for osw navigation. Updated E2E expectations and snapshot and added unit tests for the toolbar behavior. --- components/review/Overlay.vue | 7 +- components/review/Toolbar.vue | 43 +++++++++++- pages/workspace/[id]/review.vue | 8 ++- test/e2e/review.spec.ts | 34 ++++++++++ ...ils-and-an-attribute-diff-panel-1.aria.yml | 3 +- test/unit/components/ReviewToolbar.test.ts | 65 +++++++++++++++++++ 6 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 test/unit/components/ReviewToolbar.test.ts diff --git a/components/review/Overlay.vue b/components/review/Overlay.vue index e840c0f1..890e5327 100644 --- a/components/review/Overlay.vue +++ b/components/review/Overlay.vue @@ -4,6 +4,7 @@ v-model:show-details="showDetails" v-model:show-discussion="showDiscussion" :item="item" + :workspace-type="workspaceType" @edit="props.onEdit" @resolve="$emit('resolve')" @back="emit('back')" @@ -24,10 +25,14 @@