Merge branch 'develop' into fix/table-row-deletion-480

Author: Valley-15

.github/workflows/ci.yml

@@ -6,8 +6,18 @@ on:
     branches:
       - develop
       - main
-      - wiki-v3
+      - version-3
+    paths-ignore:
+      - '**.js'
+      - '**.vue'
+      - '**.css'
+      - '**.ts'
   pull_request:
+    paths-ignore:
+      - '**.js'
+      - '**.vue'
+      - '**.css'
+      - '**.ts'
 
 concurrency:
   group: develop-wiki-${{ github.event.number }}

e2e/tests/change-request-flow.spec.ts

@@ -512,4 +512,89 @@ test.describe('Change Request Flow', () => {
 			changeCard.getByText('Reordered', { exact: true }),
 		).toBeVisible();
 	});
+
+	test('should navigate to published page after merging from space editor', async ({
+		page,
+		request,
+	}) => {
+		await page.goto('/wiki/spaces');
+		await page.waitForLoadState('networkidle');
+
+		const timestamp = Date.now();
+		const spaceName = `CR Merge Nav Space ${timestamp}`;
+		const spaceRoute = `cr-merge-nav-${timestamp}`;
+		const pageTitle = `merge-nav-page-${timestamp}`;
+		const pageContent = `Merge nav content ${timestamp}`;
+
+		// Create a new space
+		await page.getByRole('button', { name: 'New Space' }).click();
+		await page.waitForSelector('[role="dialog"]', { state: 'visible' });
+		await page.getByLabel('Space Name').fill(spaceName);
+		await page.getByLabel('Route').fill(spaceRoute);
+		await page
+			.getByRole('dialog')
+			.getByRole('button', { name: 'Create' })
+			.click();
+		await page.waitForLoadState('networkidle');
+		await expect(page).toHaveURL(/\/wiki\/spaces\//);
+
+		// Create a new page draft
+		const createFirstPage = page.getByRole('button', {
+			name: 'Create First Page',
+		});
+		const newPageButton = page.getByRole('button', { name: 'New Page' });
+
+		if (await createFirstPage.isVisible({ timeout: 2000 }).catch(() => false)) {
+			await createFirstPage.click();
+		} else {
+			await newPageButton.click();
+		}
+
+		await page.getByLabel('Title').fill(pageTitle);
+		await page
+			.getByRole('dialog')
+			.getByRole('button', { name: 'Save Draft' })
+			.click();
+		await page.waitForTimeout(500);
+
+		// Open the draft page from sidebar
+		await page.locator('aside').getByText(pageTitle, { exact: true }).click();
+		await page.waitForURL(/\/draft\/[^/?#]+/);
+
+		// Add content
+		const editor = page
+			.locator('.ProseMirror, [contenteditable="true"]')
+			.first();
+		await expect(editor).toBeVisible({ timeout: 10000 });
+		await page.waitForFunction(() => window.wikiEditor !== undefined, {
+			timeout: 10000,
+		});
+		await page.evaluate((content) => {
+			window.wikiEditor.commands.setContent(content, {
+				contentType: 'markdown',
+			});
+		}, pageContent);
+		await editor.click();
+		await page.getByRole('button', { name: 'Save Draft' }).click();
+		await page.waitForTimeout(500);
+
+		// Merge directly from within the space editor (manager can merge Draft CRs)
+		const mergeButton = page.getByRole('button', { name: 'Merge' });
+		await expect(mergeButton).toBeVisible({ timeout: 10000 });
+		await mergeButton.click();
+		await expect(
+			page.locator('text=Change request merged').first(),
+		).toBeVisible({ timeout: 15000 });
+
+		// The fix: after merge, URL should navigate to the published page route
+		// and NOT remain on the /draft/ route
+		await page.waitForURL(/\/page\//, { timeout: 10000 });
+		expect(page.url()).toMatch(/\/spaces\/[^/]+\/page\//);
+		expect(page.url()).not.toMatch(/\/draft\//);
+
+		// The published page content should be visible without needing a hard refresh
+		await expect(page.getByText(pageContent)).toBeVisible({
+			timeout: 10000,
+		});
+	});
 });

e2e/tests/wiki.spec.ts

@@ -113,21 +113,17 @@ test.describe('Wiki Editor', () => {
 		// Should have sidebar with space management buttons
 		await expect(page.locator('aside')).toBeVisible();
 
+		// Wait for the tree to load (CR mode requires async init)
 		// Should have either "Create First Page" (empty space) or icon buttons for New Group/Page
-		// The "New Page" button has title="New Page" and icon="file-plus"
 		const createFirstPage = page.locator(
 			'button:has-text("Create First Page")',
 		);
 		const newPageButton = page.locator('button[title="New Page"]');
 
-		const hasCreateFirst = await createFirstPage
-			.isVisible({ timeout: 2000 })
-			.catch(() => false);
-		const hasNewPage = await newPageButton
-			.isVisible({ timeout: 2000 })
-			.catch(() => false);
-
-		expect(hasCreateFirst || hasNewPage).toBe(true);
+		// Use a combined locator with sufficient timeout for CR tree loading
+		await expect(createFirstPage.or(newPageButton)).toBeVisible({
+			timeout: 10000,
+		});
 	});
 
 	test('should open wiki editor when clicking page in sidebar', async ({

frontend/src/components/SpaceList.vue

@@ -10,38 +10,48 @@
       </Button>
     </div>
 
-    <ListView
-      class="h-full"
-      :columns="columns"
-      :rows="spaces.data || []"
-      :options="{
-        selectable: false,
-        showTooltip: true,
-        resizeColumn: false,
-        getRowRoute: (row) => ({ name: 'SpaceDetails', params: { spaceId: row.name } }),
-        emptyState: {
-          title: __('No Wiki Spaces'),
-          description: isManager ? __('Create your first wiki space to get started') : __('No wiki spaces available'),
-          button: isManager ? {
-            label: __('New Space'),
-            variant: 'solid',
-            onClick: () => (showCreateDialog = true),
-          } : undefined,
-        },
-      }"
-      row-key="name"
-    >
-      <template #cell="{ item, column }">
-        <Badge
-          v-if="column.key === 'is_published'"
-          variant="subtle"
-          :theme="item ? 'green' : 'orange'"
-          size="sm"
-          :label="item ? __('Published') : __('Unpublished')"
+    <div class="flex-1 overflow-auto">
+      <ListView
+        :columns="columns"
+        :rows="spaces.data || []"
+        :options="{
+          selectable: false,
+          showTooltip: true,
+          resizeColumn: false,
+          getRowRoute: (row) => ({ name: 'SpaceDetails', params: { spaceId: row.name } }),
+          emptyState: {
+            title: __('No Wiki Spaces'),
+            description: isManager ? __('Create your first wiki space to get started') : __('No wiki spaces available'),
+            button: isManager ? {
+              label: __('New Space'),
+              variant: 'solid',
+              onClick: () => (showCreateDialog = true),
+            } : undefined,
+          },
+        }"
+        row-key="name"
+      >
+        <template #cell="{ item, column }">
+          <Badge
+            v-if="column.key === 'is_published'"
+            variant="subtle"
+            :theme="item ? 'green' : 'orange'"
+            size="sm"
+            :label="item ? __('Published') : __('Unpublished')"
+          />
+          <span v-else>{{ item }}</span>
+        </template>
+      </ListView>
+
+      <div v-if="spaces.hasNextPage" class="flex px-2 py-2">
+        <Button
+          @click="() => spaces.next()"
+          :loading="spaces.list.loading"
+          :label="__('Load more')"
+          icon-left="refresh-cw"
         />
-        <span v-else>{{ item }}</span>
-      </template>
-    </ListView>
+      </div>
+    </div>
 
     <Dialog
       v-model="showCreateDialog"
@@ -156,7 +166,7 @@ const spaces = createListResource({
   doctype: "Wiki Space",
   fields: ["name", "space_name", "route", "root_group", "is_published"],
   orderBy: "creation desc",
-  limit: 100,
+  pageLength: 25,
   auto: true,
   insert: {
     onSuccess: (doc) => {

frontend/src/components/WikiDocumentPanel.vue

@@ -177,7 +177,7 @@ const isSaving = computed(() => {
 });
 
 const editorKey = computed(() => {
-	if (wikiDoc.doc?.name === props.pageId) {
+	if (wikiDoc.doc?.name === props.pageId && !crPageResource.loading) {
 		return props.pageId;
 	}
 	return null;