- {/*
- Mirrors the in-workspace chrome (WorkspaceChrome): a flush, borderless
- sidebar column against the app surface, meeting the content pane on a
- single hairline divider with no gutter. Keep the two in step — a settings
- page should look the same whether it is reached inside a workspace or not.
- */}
-
-
-
-
-
-
- {children}
-
-
-
-
+
+
+ {/*
+ Mirrors the in-workspace chrome (WorkspaceChrome): a flush, borderless
+ sidebar column against the app surface, meeting the content pane on a
+ single hairline divider with no gutter. Keep the two in step — a settings
+ page should look the same whether it is reached inside a workspace or not.
+ */}
+
+
+
+ pendingSectionMeta(plane, section)}>
+
+
+
+ {children}
+
+
+
+
+
+
+
)
}
diff --git a/apps/sim/components/settings/use-pending-settings-selection.ts b/apps/sim/components/settings/use-pending-settings-selection.ts
new file mode 100644
index 00000000000..ae4c0744489
--- /dev/null
+++ b/apps/sim/components/settings/use-pending-settings-selection.ts
@@ -0,0 +1,19 @@
+'use client'
+
+import { useSettingsNavigationState } from '@/components/settings/settings-navigation-provider'
+
+/**
+ * The sidebar's selected row: the section a click is navigating to until that navigation settles
+ * (see `SettingsNavigationProvider`), otherwise the section the route resolved to.
+ */
+export function usePendingSettingsSelection
(
+ routeSection: TSection
+): { activeSection: TSection; navigateToSection: (section: TSection, href: string) => void } {
+ const { pendingSection, navigateToSection } = useSettingsNavigationState()
+ return {
+ activeSection: (pendingSection as TSection | null) ?? routeSection,
+ // Returning to the section already on screen previews nothing: its content is what will show.
+ navigateToSection: (section, href) =>
+ navigateToSection(section === routeSection ? null : section, href),
+ }
+}
diff --git a/apps/sim/connectors/confluence/attachments.test.ts b/apps/sim/connectors/confluence/attachments.test.ts
index dcff9b8117e..86a5e00915b 100644
--- a/apps/sim/connectors/confluence/attachments.test.ts
+++ b/apps/sim/connectors/confluence/attachments.test.ts
@@ -1,3 +1,4 @@
+import { getAllMockLoggers } from '@sim/testing/mocks/logger.mock'
import JSZip from 'jszip'
import { PDFDocument, StandardFonts } from 'pdf-lib'
import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -249,6 +250,133 @@ describe('Confluence attachment listing', () => {
}
)
+ describe('server errors', () => {
+ const parents = (ids: string[]) =>
+ vi.fn(
+ async (): Promise => ({
+ documents: ids.map((id) => parent(id)),
+ hasMore: false,
+ })
+ )
+
+ /** Answers a parent's attachment listing with `status` while `failing` says so. */
+ function listingFails(failing: (parentId: string) => boolean, status = 500) {
+ fetchMock.mockImplementation(async (input) => {
+ const parentId = new URL(String(input)).pathname.split('/').at(-2) ?? ''
+ if (failing(parentId)) return new Response('upstream error', { status })
+ return Response.json({ results: [file({ id: `${parentId}-file`, pageId: parentId })] })
+ })
+ }
+
+ /** Runs a listing past the shared backoff (~31 s for five retries) without real waits. */
+ async function listPastBackoff(input: Parameters[0]) {
+ vi.useFakeTimers()
+ try {
+ const listing = listConfluenceAttachments(input)
+ const settled = listing.then(
+ () => undefined,
+ () => undefined
+ )
+ for (let i = 0; i < 20; i++) await vi.advanceTimersByTimeAsync(10_000)
+ await settled
+ return await listing
+ } finally {
+ vi.useRealTimers()
+ }
+ }
+
+ it.each([
+ ['a complete body', () => 'upstream error'],
+ ['a body that never finishes', () => new ReadableStream()],
+ [
+ 'a body stream that already errored',
+ () =>
+ new ReadableStream({
+ start: (controller) => controller.error(new Error('connection reset')),
+ }),
+ ],
+ ])('retries a transient 500 with %s instead of failing the listing', async (_, body) => {
+ let failed = false
+ fetchMock.mockImplementation(async () => {
+ if (failed) return Response.json({ results: [file({ id: 'p1-file' })] })
+ failed = true
+ return new Response(body(), { status: 500 })
+ })
+ const result = await listPastBackoff({ ...INPUT, listParents: parents(['p1']) })
+ expect(result.documents.map((doc) => doc.externalId)).toEqual([
+ 'p1',
+ 'attachment:page:p1:p1-file',
+ ])
+ expect(result.listingFailures).toBeUndefined()
+ })
+
+ it('skips isolated parents whose listing keeps failing and keeps listing the rest', async () => {
+ listingFails((id) => id === 'p1' || id === 'p3' || id === 'p5')
+ const context: Record = {}
+ const result = await listPastBackoff({
+ ...INPUT,
+ listParents: parents(['p1', 'p2', 'p3', 'p4', 'p5']),
+ syncContext: context,
+ })
+ expect(result.documents.map((doc) => doc.externalId)).toEqual([
+ 'p1',
+ 'p2',
+ 'p3',
+ 'p4',
+ 'p5',
+ 'attachment:page:p2:p2-file',
+ 'attachment:page:p4:p4-file',
+ ])
+ expect(result.listingFailures).toEqual({
+ count: 3,
+ samples: ['p1', 'p3', 'p5'].map((scope) => ({
+ scope,
+ operation: 'confluence.attachments.list',
+ status: 500,
+ reasons: ['attachment_listing_unavailable'],
+ })),
+ })
+ expect(result.reconciliationSafe).toBe(false)
+ expect(context.reconciliationUnsafe).toBe(true)
+ })
+
+ it('logs Atlassian trace identifiers for a 500 but never its body', async () => {
+ let failed = false
+ fetchMock.mockImplementation(async () => {
+ if (failed) return Response.json({ results: [] })
+ failed = true
+ return Response.json(
+ {
+ errors: [{ code: 'INTERNAL_SERVER_ERROR', title: 'x', detail: 'leaked-secret-value' }],
+ },
+ {
+ status: 500,
+ headers: { 'atl-traceid': '5c1f0e2a9b7d4e1f', 'x-arequestid': 'not an id;