feat(12.1-03): align cloud browser contract — kind, provider_item_id, server freshness

- CloudFolderView: folders/files classified by kind=folder/file (remove is_dir) - CloudFolderView: navigateTo uses item.provider_item_id for route param (not item.id) - CloudFolderView: handleBreadcrumbNavigate uses named route; opaque refs intact - CloudFolderView: setBrowseState maps server freshness.refresh_state verbatim - CloudFolderView: refreshedAt = server last_refreshed_at (not new Date()) - CloudFolderView: breadcrumb lineage built explicitly from visited nodes - CloudProviderTreeItem: loadChildren filters by kind=folder (not is_dir) - CloudFolderTreeItem: expandable = kind===folder; icon = kind===folder - CloudFolderTreeItem: navigate() uses provider_item_id (not folder.id) - CloudFolderTreeItem: loadChildren uses provider_item_id as parent_ref - CloudFolderTreeItem: isActive checks provider_item_id first All 82 focused tests pass; full suite: 369/369
2026-06-22 08:49:19 +02:00
parent 9974fca2cb
commit dc3e1725da
4 changed files with 168 additions and 58 deletions
@@ -1,14 +1,14 @@
 <template>
  <TreeItem
    :label="folder.name"
-    :expandable="folder.is_dir"
+    :expandable="folder.kind === 'folder'"
    :load-children="loadChildren"
    :depth="depth"
    :is-active="isActive"
    @select="navigate"
  >
    <template #icon>
-      <AppIcon v-if="folder.is_dir" name="folder" class="w-4 h-4 shrink-0 text-gray-400" />
+      <AppIcon v-if="folder.kind === 'folder'" name="folder" class="w-4 h-4 shrink-0 text-gray-400" />
      <AppIcon v-else name="fileDoc" class="w-4 h-4 shrink-0 text-gray-400" />
    </template>
    <template #children="{ children }">
@@ -39,18 +39,40 @@ const props = defineProps({
 const router = useRouter()
 const route = useRoute()

-/** Active when the current route points to this exact folder. */
+/**
+ * Active when the current route points to this exact folder.
+ * Uses provider_item_id for comparison — the opaque provider reference
+ * is what appears in the route param after normalization.
+ */
 const isActive = computed(() => {
+  const provRef = props.folder.provider_item_id
+  if (provRef !== undefined && provRef !== null) {
+    return route.path === `/cloud/${props.connectionId}/${provRef}`
+  }
+  // Fallback for legacy items that may only have id
  return route.path === `/cloud/${props.connectionId}/${props.folder.id}`
 })

+/**
+ * Load nested children using provider_item_id as the parent_ref.
+ * provider_item_id is the opaque provider reference (Drive/OneDrive item IDs,
+ * WebDAV paths, etc.) — never use the DocuVault stable id for provider navigation.
+ * Classify results by kind, not is_dir.
+ */
 async function loadChildren() {
-  // Browse by connection UUID + provider item/path reference — never provider slug
-  const data = await api.getCloudFoldersByConnectionId(props.connectionId, props.folder.id)
-  return (data.items ?? []).filter(i => i.is_dir)
+  // Use provider_item_id as the parent ref, falling back to id for legacy items
+  const parentRef = props.folder.provider_item_id ?? props.folder.id
+  const data = await api.getCloudFoldersByConnectionId(props.connectionId, parentRef)
+  return (data.items ?? []).filter(i => i.kind === 'folder')
 }

+/**
+ * Navigate using provider_item_id as the opaque route parameter.
+ * Reserved characters (/, ?, #, %, spaces, Unicode) are not decoded or split —
+ * Vue Router / API query serializers handle encoding.
+ */
 function navigate() {
-  router.push(`/cloud/${props.connectionId}/${props.folder.id}`)
+  const provRef = props.folder.provider_item_id ?? props.folder.id
+  router.push(`/cloud/${props.connectionId}/${provRef}`)
 }
 </script>
@@ -53,10 +53,15 @@ const isActive = computed(() => {
  )
 })

+/**
+ * Load root-level folders using kind classification (not is_dir).
+ * Uses connection UUID, never provider slug.
+ * Root listing uses empty string as the sentinel for parent_ref=null.
+ */
 async function loadChildren() {
-  // Use connection UUID, never provider slug (UAT gap: 422 from UUID endpoint if slug passed)
  const data = await api.getCloudFoldersByConnectionId(props.connection.id, '')
-  return (data.items ?? []).filter(i => i.is_dir)
+  // Classify by kind — the normalized CloudItemOut schema has no is_dir field
+  return (data.items ?? []).filter(i => i.kind === 'folder')
 }

 function navigateToRoot() {
@@ -43,8 +43,13 @@ const uploadQueue = ref([])
 const connectionId = computed(() => route.params.connectionId)
 const folderId = computed(() => route.params.folderId)

-const folders = computed(() => items.value.filter(i => i.is_dir))
-const files = computed(() => items.value.filter(i => !i.is_dir))
+/**
+ * Classify items by kind (canonical API field).
+ * The API returns CloudItemOut with kind="folder"|"file".
+ * Never use is_dir — that field is absent from the normalized schema.
+ */
+const folders = computed(() => items.value.filter(i => i.kind === 'folder'))
+const files = computed(() => items.value.filter(i => i.kind === 'file'))

 const connectionRoot = computed(() => {
  const conn = cloudStore.connections.find(c => c.id === connectionId.value)
@@ -56,19 +61,67 @@ const connectionRoot = computed(() => {
  }
 })

-const breadcrumb = computed(() => {
-  if (!folderId.value || folderId.value === 'root') return []
-  const parts = folderId.value.replace(/\/$/, '').split('/')
-  return parts.map((seg, idx) => ({
-    id: parts.slice(0, idx + 1).join('/'),
-    name: seg,
-  }))
-})
+/**
+ * Session-only breadcrumb lineage.
+ * Maintained as an explicit list of { name, providerItemId } visited nodes.
+ * Never reconstructed by splitting provider_item_id — Drive/OneDrive/WebDAV IDs are opaque.
+ */
+const breadcrumbLineage = ref([])
+
+const breadcrumb = computed(() => breadcrumbLineage.value)

 const mappedBreadcrumb = computed(() =>
-  breadcrumb.value.map(f => ({ id: f.id, label: f.name }))
+  breadcrumb.value.map(f => ({ id: f.providerItemId, label: f.name }))
 )

+/**
+ * Navigate to a cloud folder using provider_item_id as the opaque provider reference.
+ * The DocuVault stable id (item.id) is kept for metadata identity only —
+ * never sent as a route param or to the provider adapter.
+ *
+ * Breadcrumb lineage is grown explicitly by appending a {name, providerItemId} node.
+ * Reserved characters (/, ?, #, %, spaces, Unicode) are not decoded or split.
+ */
+function navigateTo(item) {
+  // Grow breadcrumb lineage from current folderId
+  const currentRef = folderId.value && folderId.value !== 'root' ? folderId.value : null
+  // Find existing lineage position or append new node
+  const existing = breadcrumbLineage.value.findIndex(n => n.providerItemId === currentRef)
+  if (currentRef === null) {
+    // At root — start fresh lineage
+    breadcrumbLineage.value = []
+  } else if (existing === -1) {
+    // Not in lineage yet — this means we're navigating deeper from current position
+    // (lineage was built from previous navigations or restored from session)
+  }
+  // Append the folder we're navigating INTO
+  breadcrumbLineage.value = [
+    ...breadcrumbLineage.value,
+    { name: item.name, providerItemId: item.provider_item_id },
+  ]
+  // Navigate using provider_item_id — opaque, never decoded or split
+  router.push({ name: 'cloud-folder', params: { connectionId: connectionId.value, folderId: item.provider_item_id } })
+}
+
+/**
+ * Handle breadcrumb navigation.
+ * id is a providerItemId from the lineage — null means root.
+ * Opaque references are passed intact; never split or decoded.
+ */
+function handleBreadcrumbNavigate(id) {
+  if (id == null) {
+    breadcrumbLineage.value = []
+    router.push({ name: 'cloud-folder', params: { connectionId: connectionId.value, folderId: 'root' } })
+  } else {
+    // Trim breadcrumb lineage to the clicked node
+    const idx = breadcrumbLineage.value.findIndex(n => n.providerItemId === id)
+    if (idx !== -1) {
+      breadcrumbLineage.value = breadcrumbLineage.value.slice(0, idx + 1)
+    }
+    router.push({ name: 'cloud-folder', params: { connectionId: connectionId.value, folderId: id } })
+  }
+}
+
 async function load() {
  loading.value = true
  error.value = ''
@@ -79,11 +132,17 @@ async function load() {
      folderId.value ?? 'root'
    )
    items.value = data.items ?? []
+    /**
+     * Map server freshness state verbatim — never infer fresh from HTTP 200.
+     * A successful cached browse response is not proof of provider synchronization.
+     * last_refreshed_at comes from the server; never use new Date() as evidence.
+     */
+    const freshness = data.freshness ?? {}
    cloudStore.setBrowseState({
      items: items.value,
      caps: data.capabilities ?? null,
-      freshness: 'fresh',
-      refreshedAt: new Date().toISOString(),
+      freshness: freshness.refresh_state ?? 'warning',
+      refreshedAt: freshness.last_refreshed_at ?? null,
      byteAvail: data.byte_availability ?? null,
      err: null,
    })
@@ -98,6 +157,7 @@ async function load() {
    } else {
      error.value = msg || 'Failed to load folder contents.'
    }
+    // On transport failure: preserve cached items, do not overwrite last_refreshed_at
    cloudStore.setBrowseState({ freshness: 'stale', err: error.value })
  } finally {
    loading.value = false
@@ -106,15 +166,6 @@ async function load() {
  saveLastFolder(connectionId.value, folderId.value)
 }

-function navigateTo(item) {
-  router.push(`/cloud/${connectionId.value}/${item.id}`)
-}
-
-function handleBreadcrumbNavigate(id) {
-  if (id == null) router.push(`/cloud/${connectionId.value}/root`)
-  else router.push(`/cloud/${connectionId.value}/${id}`)
-}
-
 async function onFilesSelected({ files: selectedFiles }) {
  const promises = selectedFiles.map(file => {
    const item = reactive({ name: file.name, done: false, error: null, status: 'Uploading…' })
@@ -143,7 +194,7 @@ onMounted(async () => {
  if (isRoot) {
    const last = loadLastFolder(connectionId.value)
    if (last) {
-      router.replace(`/cloud/${connectionId.value}/${last}`)
+      router.replace({ name: 'cloud-folder', params: { connectionId: connectionId.value, folderId: last } })
      return
    }
  }
@@ -189,6 +189,10 @@ describe('renders_kind_folder_and_file_in_shared_browser', () => {
        capturedFolders = this.folders
        capturedFiles = this.files
      },
+      updated() {
+        capturedFolders = this.folders
+        capturedFiles = this.files
+      },
    }
    const w = mount(CloudFolderView, {
      global: { stubs: { StorageBrowser: CapturingStub } },
@@ -213,16 +217,20 @@ describe('folder_click_uses_provider_item_id_not_id', () => {
      capabilities: null,
      freshness: { refresh_state: 'fresh', last_refreshed_at: '2026-06-22T00:00:00Z' },
    })
-    let navigateHandler = null
+    let didEmit = false
    const CapturingStub = {
      template: '<div data-test="storage-browser" />',
      props: ['folders', 'files', 'mode', 'breadcrumb', 'uploadQueue', 'loading',
              'emptyMessage', 'emptyHint', 'capabilities', 'connectionRoot',
              'folderFreshness', 'lastRefreshedAt', 'byteAvailability'],
      emits: ['folder-navigate'],
-      mounted() {
-        // Simulate a folder-navigate event with the first folder item
+      mounted() {},
+      updated() {
+        // Emit folder-navigate once folders are populated (after load completes)
+        if (this.folders.length > 0 && !didEmit) {
+          didEmit = true
          this.$emit('folder-navigate', this.folders[0])
+        }
      },
    }
    const w = mount(CloudFolderView, {
@@ -230,18 +238,29 @@ describe('folder_click_uses_provider_item_id_not_id', () => {
    })
    await flushPromises()
    // navigateTo must use provider_item_id for the route param, not DocuVault id
-    // The route must contain provider_item_id value, not the uuid id
    expect(mockPush).toHaveBeenCalled()
-    const pushArg = mockPush.mock.calls[0][0]
-    // Must use provider_item_id in the route, not the DocuVault UUID
-    if (typeof pushArg === 'string') {
-      expect(pushArg).toContain(FOLDER_A.provider_item_id)
-      expect(pushArg).not.toContain(FOLDER_A.id)
-    } else if (typeof pushArg === 'object') {
-      // Named route object — params must carry provider_item_id
-      const paramValues = Object.values(pushArg.params ?? {})
-      expect(paramValues.some(v => String(v).includes(FOLDER_A.provider_item_id) || v === FOLDER_A.provider_item_id)).toBe(true)
+    // Find the push call that carries provider_item_id (not the session-restore push)
+    const hasPidRef = mockPush.mock.calls.some(call => {
+      const arg = call[0]
+      if (typeof arg === 'string') return arg.includes(FOLDER_A.provider_item_id)
+      if (typeof arg === 'object') {
+        const paramValues = Object.values(arg.params ?? {})
+        return paramValues.some(v => String(v) === FOLDER_A.provider_item_id)
      }
+      return false
+    })
+    expect(hasPidRef).toBe(true)
+    // Must NOT use DocuVault UUID as route param
+    const hasDocuVaultId = mockPush.mock.calls.some(call => {
+      const arg = call[0]
+      if (typeof arg === 'string') return arg.includes(FOLDER_A.id)
+      if (typeof arg === 'object') {
+        const paramValues = Object.values(arg.params ?? {})
+        return paramValues.some(v => String(v) === FOLDER_A.id)
+      }
+      return false
+    })
+    expect(hasDocuVaultId).toBe(false)
  })
 })

@@ -259,6 +278,7 @@ describe('stable_docuvault_id_remains_row_key', () => {
              'emptyMessage', 'emptyHint', 'capabilities', 'connectionRoot',
              'folderFreshness', 'lastRefreshedAt', 'byteAvailability'],
      mounted() { capturedFolders = this.folders },
+      updated() { capturedFolders = this.folders },
    }
    const w = mount(CloudFolderView, {
      global: { stubs: { StorageBrowser: CapturingStub } },
@@ -279,14 +299,22 @@ describe('opaque_reference_round_trip', () => {
      capabilities: null,
      freshness: { refresh_state: 'fresh', last_refreshed_at: '2026-06-22T00:00:00Z' },
    })
+    let capturedFolders = []
+    let didEmit = false
    const CapturingStub = {
      template: '<div data-test="storage-browser" />',
      props: ['folders', 'files', 'mode', 'breadcrumb', 'uploadQueue', 'loading',
              'emptyMessage', 'emptyHint', 'capabilities', 'connectionRoot',
              'folderFreshness', 'lastRefreshedAt', 'byteAvailability'],
      emits: ['folder-navigate'],
-      mounted() {
+      mounted() { capturedFolders = this.folders },
+      updated() {
+        capturedFolders = this.folders
+        // Emit folder-navigate once folders are populated (after load completes)
+        if (this.folders.length > 0 && !didEmit) {
+          didEmit = true
          this.$emit('folder-navigate', this.folders[0])
+        }
      },
    }
    const w = mount(CloudFolderView, {
@@ -295,15 +323,19 @@ describe('opaque_reference_round_trip', () => {
    await flushPromises()
    // Navigation must use provider_item_id verbatim — no splitting or decoding
    expect(mockPush).toHaveBeenCalled()
-    const pushArg = mockPush.mock.calls[0][0]
-    // The provider_item_id must not be split or have reserved chars stripped
-    if (typeof pushArg === 'object') {
-      const paramValues = Object.values(pushArg.params ?? {})
-      // At least one param must equal or contain the full opaque ref
-      expect(
-        paramValues.some(v => String(v) === FOLDER_OPAQUE.provider_item_id)
-      ).toBe(true)
+    // Find the push call that was triggered by folder-navigate (not the initial replace)
+    const pushCalls = mockPush.mock.calls
+    // At least one call should carry the opaque provider_item_id
+    const hasOpaqueRef = pushCalls.some(call => {
+      const arg = call[0]
+      if (typeof arg === 'string') return arg.includes(FOLDER_OPAQUE.provider_item_id)
+      if (typeof arg === 'object') {
+        const paramValues = Object.values(arg.params ?? {})
+        return paramValues.some(v => String(v) === FOLDER_OPAQUE.provider_item_id)
      }
+      return false
+    })
+    expect(hasOpaqueRef).toBe(true)
  })
 })