From 8b6034dcfae892c2739f979aa6b388b59f6ea63a Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 01:56:11 -0700
Subject: [PATCH 1/7] VPR-59 feat(cms): add CMS left nav and redesign hub with
 recent activity

- Left nav now mirrors legacy CMS (Home, content blocks, files, left-nav
  sections, permission-gated); nav, hub cards, and page titles share
  "Manage X" wording, and /CMS/ canonicalizes to /CMS/Home so the Home
  link highlights
- Hub: permission-filtered 2x2 tool cards plus a recent-activity rail
  (recently edited blocks/files deep-link to their editors via existing
  list APIs); zero-permission visitors get an info banner instead of a
  blank page
- Import and Bulk Encrypt moved off the hub into a File Tools menu on
  Manage Files; the Upload File nav link opens the upload dialog via
  ?upload=1
- Shell a11y (all areas): visible focus ring on flat card actions, left
  nav items announce as links, drawer landmark labeled, new "Skip to
  section menu" link, and in-page anchor navigation no longer steals
  focus or scroll position
- Shared router: scroll position survives query-only navigation, hash
  links scroll to their target; createSpaRouter.ts renamed to
  create-spa-router.ts (kebab convention) with new unit tests
---
 VueApp/src/CAHFS/router/index.ts              |   2 +-
 VueApp/src/CMS/components/RecentActivity.vue  | 145 +++++++++++++++++
 VueApp/src/CMS/pages/BulkEncrypt.vue          |   2 +-
 VueApp/src/CMS/pages/CmsHome.vue              | 147 ++++++++++++------
 VueApp/src/CMS/pages/ContentBlockEdit.vue     |   2 +-
 VueApp/src/CMS/pages/ContentBlocks.vue        |   2 +-
 VueApp/src/CMS/pages/FileAuditLog.vue         |   2 +-
 VueApp/src/CMS/pages/Files.vue                |  58 ++++++-
 VueApp/src/CMS/pages/ImportFiles.vue          |   2 +-
 VueApp/src/CMS/pages/LeftNavEdit.vue          |   2 +-
 VueApp/src/CMS/pages/LeftNavMenus.vue         |   2 +-
 .../src/CMS/pages/ManageLinkCollections.vue   |   2 +-
 VueApp/src/CMS/router/index.ts                |   8 +-
 VueApp/src/CMS/router/routes.ts               |  12 +-
 VueApp/src/CTS/router/index.ts                |   2 +-
 VueApp/src/ClinicalScheduler/router/index.ts  |   2 +-
 VueApp/src/Computing/router/index.ts          |   2 +-
 .../src/Effort/components/EffortLeftNav.vue   |   1 +
 VueApp/src/Effort/router/index.ts             |   2 +-
 VueApp/src/Students/router/index.ts           |   2 +-
 VueApp/src/composables/use-route-focus.ts     |   7 +-
 VueApp/src/layouts/LeftNav.vue                |  15 +-
 VueApp/src/layouts/ViperLayout.vue            |   8 +
 .../__tests__/create-spa-router.test.ts       |  81 ++++++++++
 VueApp/src/shared/create-spa-router.ts        |  29 ++++
 VueApp/src/shared/createSpaRouter.ts          |  20 ---
 VueApp/src/styles/base.css                    |  13 ++
 web/Areas/CMS/Services/CmsNavMenu.cs          |  43 ++++-
 28 files changed, 522 insertions(+), 93 deletions(-)
 create mode 100644 VueApp/src/CMS/components/RecentActivity.vue
 create mode 100644 VueApp/src/shared/__tests__/create-spa-router.test.ts
 create mode 100644 VueApp/src/shared/create-spa-router.ts
 delete mode 100644 VueApp/src/shared/createSpaRouter.ts

diff --git a/VueApp/src/CAHFS/router/index.ts b/VueApp/src/CAHFS/router/index.ts
index 1ee7424d1..bf695865a 100644
--- a/VueApp/src/CAHFS/router/index.ts
+++ b/VueApp/src/CAHFS/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 import { checkHasOnePermission } from "@/composables/CheckPagePermission"
diff --git a/VueApp/src/CMS/components/RecentActivity.vue b/VueApp/src/CMS/components/RecentActivity.vue
new file mode 100644
index 000000000..596166bc1
--- /dev/null
+++ b/VueApp/src/CMS/components/RecentActivity.vue
@@ -0,0 +1,145 @@
+<template>
+    <section aria-label="Recent activity">
+        <h2 class="text-h6 text-primary q-my-none">Recent activity</h2>
+
+        <template v-if="loading">
+            <q-skeleton
+                v-for="n in 4"
+                :key="n"
+                type="text"
+                class="q-my-sm"
+            />
+        </template>
+
+        <div
+            v-else-if="failed"
+            class="text-body2 text-grey-8 q-mt-xs"
+        >
+            Couldn't load recent activity.
+        </div>
+
+        <div
+            v-else-if="items.length === 0"
+            class="text-body2 text-grey-8 q-mt-xs"
+        >
+            Nothing edited recently.
+        </div>
+
+        <q-list
+            v-else
+            dense
+        >
+            <q-item
+                v-for="item in items"
+                :key="item.key"
+                clickable
+                :to="item.to"
+                role="link"
+                class="q-px-none"
+            >
+                <q-item-section side>
+                    <q-icon
+                        :name="item.icon"
+                        color="secondary"
+                        size="sm"
+                    />
+                </q-item-section>
+                <q-item-section>
+                    <q-item-label lines="1">{{ item.label }}</q-item-label>
+                    <q-item-label
+                        caption
+                        :title="formatFullDate(item.modifiedOn)"
+                    >
+                        {{ formatTimeAgo(new Date(item.modifiedOn)) }} by {{ item.modifiedBy }}
+                    </q-item-label>
+                </q-item-section>
+            </q-item>
+        </q-list>
+    </section>
+</template>
+
+<script setup lang="ts">
+import { inject, onMounted, ref } from "vue"
+import { formatTimeAgo } from "@vueuse/core"
+import { useFetch } from "@/composables/ViperFetch"
+import type { CmsContentBlock, CmsFile } from "@/CMS/types/"
+
+const MAX_ITEMS = 8
+const PER_SOURCE = 5
+
+const { showBlocks = false, showFiles = false } = defineProps<{
+    showBlocks?: boolean
+    showFiles?: boolean
+}>()
+
+type ActivityItem = {
+    key: string
+    icon: string
+    label: string
+    to: { name: string; params?: Record<string, string | number>; query?: Record<string, string> }
+    modifiedOn: string
+    modifiedBy: string
+}
+
+const apiURL = inject("apiURL")
+const { get, createUrlSearchParams } = useFetch()
+
+const loading = ref(true)
+const failed = ref(false)
+const items = ref<ActivityItem[]>([])
+
+function formatFullDate(value: string): string {
+    return new Date(value).toLocaleString()
+}
+
+async function loadBlocks(): Promise<ActivityItem[]> {
+    const res = await get(apiURL + "CMS/content?" + createUrlSearchParams({ status: "active" }))
+    if (!res.success) throw new Error("blocks")
+    return [...((res.result ?? []) as CmsContentBlock[])]
+        .sort((a, b) => new Date(b.modifiedOn).getTime() - new Date(a.modifiedOn).getTime())
+        .slice(0, PER_SOURCE)
+        .map((b) => ({
+            key: "block-" + b.contentBlockId,
+            icon: "article",
+            label: b.title || b.friendlyName || "(untitled)",
+            to: { name: "CmsContentBlockEdit", params: { id: b.contentBlockId } },
+            modifiedOn: b.modifiedOn,
+            modifiedBy: b.modifiedBy,
+        }))
+}
+
+async function loadFiles(): Promise<ActivityItem[]> {
+    const params = createUrlSearchParams({
+        status: "active",
+        page: 1,
+        perPage: PER_SOURCE,
+        sortBy: "modifiedOn",
+        descending: "true",
+    })
+    const res = await get(apiURL + "cms/files/?" + params)
+    if (!res.success) throw new Error("files")
+    return ((res.result ?? []) as CmsFile[]).map((f) => ({
+        key: "file-" + f.fileGuid,
+        icon: "folder",
+        label: f.friendlyName,
+        to: { name: "CmsFiles", query: { search: f.friendlyName } },
+        modifiedOn: f.modifiedOn,
+        modifiedBy: f.modifiedBy,
+    }))
+}
+
+async function loadActivity() {
+    const sources = [...(showBlocks ? [loadBlocks()] : []), ...(showFiles ? [loadFiles()] : [])]
+    const results = await Promise.allSettled(sources)
+    const loaded = results.filter((r) => r.status === "fulfilled").flatMap((r) => r.value)
+    failed.value = sources.length > 0 && results.every((r) => r.status === "rejected")
+    items.value = loaded
+        .sort((a, b) => new Date(b.modifiedOn).getTime() - new Date(a.modifiedOn).getTime())
+        .slice(0, MAX_ITEMS)
+    loading.value = false
+}
+
+onMounted(() => {
+    void loadActivity()
+})
+</script>
diff --git a/VueApp/src/CMS/pages/BulkEncrypt.vue b/VueApp/src/CMS/pages/BulkEncrypt.vue
index 5224965a2..365c10a4b 100644
--- a/VueApp/src/CMS/pages/BulkEncrypt.vue
+++ b/VueApp/src/CMS/pages/BulkEncrypt.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">Bulk Encrypt Files</h1>
+            <h1 class="q-my-none">Bulk Encrypt Files</h1>
             <q-space />
             <q-btn
                 flat
diff --git a/VueApp/src/CMS/pages/CmsHome.vue b/VueApp/src/CMS/pages/CmsHome.vue
index b5bd1ef22..17eb61b97 100644
--- a/VueApp/src/CMS/pages/CmsHome.vue
+++ b/VueApp/src/CMS/pages/CmsHome.vue
@@ -1,40 +1,61 @@
 <template>
     <div class="q-pa-md">
-        <h1 class="text-h4 text-primary q-my-none q-mb-md">CMS Home</h1>
+        <h1 class="q-my-none q-mb-md">Content Management System</h1>
 
-        <div class="row q-col-gutter-md">
+        <StatusBanner
+            v-if="visibleSections.length === 0"
+            type="info"
+        >
+            Your account does not have access to any CMS tools. Contact the VIPER team if you need access.
+        </StatusBanner>
+
+        <div class="row q-col-gutter-lg cms-home-grid">
+            <div class="col-12 col-lg-8">
+                <div class="row q-col-gutter-md">
+                    <div
+                        v-for="section in visibleSections"
+                        :key="section.title"
+                        class="col-12 col-sm-6"
+                    >
+                        <q-card
+                            flat
+                            bordered
+                        >
+                            <q-card-section>
+                                <h2 class="text-h6 text-primary q-my-none">
+                                    <q-icon
+                                        :name="section.icon"
+                                        size="sm"
+                                        class="q-mr-sm"
+                                    />
+                                    {{ section.title }}
+                                </h2>
+                                <div class="text-body2 text-grey-8 q-mt-xs">{{ section.description }}</div>
+                            </q-card-section>
+                            <q-card-actions>
+                                <q-btn
+                                    v-for="action in section.actions"
+                                    :key="action.label"
+                                    flat
+                                    dense
+                                    no-caps
+                                    color="primary"
+                                    :label="action.label"
+                                    :to="action.to"
+                                />
+                            </q-card-actions>
+                        </q-card>
+                    </div>
+                </div>
+            </div>
             <div
-                v-for="section in visibleSections"
-                :key="section.title"
-                class="col-12 col-sm-6 col-md-4"
+                v-if="showRecentActivity"
+                class="col-12 col-lg-4"
             >
-                <q-card
-                    flat
-                    bordered
-                >
-                    <q-card-section>
-                        <div class="text-h6 text-primary">
-                            <q-icon
-                                :name="section.icon"
-                                class="q-mr-sm"
-                            />
-                            {{ section.title }}
-                        </div>
-                        <div class="text-body2 text-grey-8 q-mt-xs">{{ section.description }}</div>
-                    </q-card-section>
-                    <q-card-actions>
-                        <q-btn
-                            v-for="action in section.actions"
-                            :key="action.label"
-                            flat
-                            dense
-                            no-caps
-                            color="primary"
-                            :label="action.label"
-                            :to="action.to"
-                        />
-                    </q-card-actions>
-                </q-card>
+                <RecentActivity
+                    :show-blocks="canManageBlocks"
+                    :show-files="canManageFiles"
+                />
             </div>
         </div>
     </div>
@@ -43,55 +64,85 @@
 <script setup lang="ts">
 import { computed } from "vue"
 import { useUserStore } from "@/store/UserStore"
+import StatusBanner from "@/components/StatusBanner.vue"
+import RecentActivity from "@/CMS/components/RecentActivity.vue"
 
 const userStore = useUserStore()
 
+type Action = {
+    label: string
+    to: { name: string; query?: Record<string, string> }
+    // Defaults to the section's permissions when omitted.
+    permissions?: string[]
+}
+
 type Section = {
     title: string
     icon: string
     description: string
-    permission: string
-    actions: { label: string; to: { name: string; query?: Record<string, string> } }[]
+    // Any one of these grants the section (mirrors CmsNavMenu.cs).
+    permissions: string[]
+    actions: Action[]
 }
 
 const sections: Section[] = [
     {
         title: "Files",
         icon: "folder",
-        description: "Upload and manage files with permission-based access and audit logging.",
-        permission: "SVMSecure.CMS.AllFiles",
+        description:
+            "Store files for VIPER pages and share them through permission-checked download links. Every download is logged.",
+        permissions: ["SVMSecure.CMS.AllFiles"],
         actions: [
             { label: "Manage Files", to: { name: "CmsFiles" } },
             { label: "Audit Log", to: { name: "CmsFileAudit" } },
-            { label: "Import", to: { name: "CmsFileImport" } },
-            { label: "Bulk Encrypt", to: { name: "CmsBulkEncrypt" } },
         ],
     },
     {
         title: "Content Blocks",
         icon: "article",
-        description: "Edit page content with version history, permissions, and attached files.",
-        permission: "SVMSecure.CMS.ManageContentBlocks",
+        description: "Edit the text and images displayed on VIPER pages. Every change is kept in version history.",
+        permissions: ["SVMSecure.CMS.ManageContentBlocks", "SVMSecure.CMS.CreateContentBlock"],
         actions: [
-            { label: "Manage Content Blocks", to: { name: "CmsContentBlocks" } },
-            { label: "New Content Block", to: { name: "CmsContentBlockEdit" } },
+            {
+                label: "Manage Content Blocks",
+                to: { name: "CmsContentBlocks" },
+                permissions: ["SVMSecure.CMS.ManageContentBlocks"],
+            },
+            { label: "Add Content Block", to: { name: "CmsContentBlockEdit" } },
         ],
     },
     {
         title: "Link Collections",
         icon: "link",
-        description: "Curate collections of links with tags and ordering.",
-        permission: "SVMSecure.CMS.ManageContentBlocks",
+        description: "Maintain the tagged link lists displayed on VIPER pages.",
+        permissions: ["SVMSecure.CMS.ManageContentBlocks"],
         actions: [{ label: "Manage Link Collections", to: { name: "ManageLinkCollections" } }],
     },
     {
         title: "Left Navigation",
         icon: "menu",
-        description: "Build left-nav menus with headers, links, ordering, and per-item visibility.",
-        permission: "SVMSecure.CMS.ManageNavigation",
-        actions: [{ label: "Manage Left Nav Menus", to: { name: "CmsLeftNavMenus" } }],
+        description: "Control the left-hand menus shown on VIPER sections and pages.",
+        permissions: ["SVMSecure.CMS.ManageNavigation"],
+        actions: [{ label: "Manage Left-Nav Menus", to: { name: "CmsLeftNavMenus" } }],
     },
 ]
 
-const visibleSections = computed(() => sections.filter((s) => userStore.userInfo.permissions.includes(s.permission)))
+const hasAny = (permissions: string[]) => permissions.some((p) => userStore.userInfo.permissions.includes(p))
+
+const visibleSections = computed(() =>
+    sections
+        .filter((s) => hasAny(s.permissions))
+        .map((s) => ({ ...s, actions: s.actions.filter((a) => hasAny(a.permissions ?? s.permissions)) })),
+)
+const canManageBlocks = computed(() => userStore.userInfo.permissions.includes("SVMSecure.CMS.ManageContentBlocks"))
+const canManageFiles = computed(() => userStore.userInfo.permissions.includes("SVMSecure.CMS.AllFiles"))
+const showRecentActivity = computed(() => canManageBlocks.value || canManageFiles.value)
 </script>
+
+<style scoped>
+/* Cards as a 2x2 grid with the activity rail beside them; cap the width
+   so neither stretches into low-density slabs on wide monitors. */
+.cms-home-grid {
+    max-width: 80rem;
+}
+</style>
diff --git a/VueApp/src/CMS/pages/ContentBlockEdit.vue b/VueApp/src/CMS/pages/ContentBlockEdit.vue
index 271f97715..20545b677 100644
--- a/VueApp/src/CMS/pages/ContentBlockEdit.vue
+++ b/VueApp/src/CMS/pages/ContentBlockEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">
+            <h1 class="q-my-none">
                 {{ isNew ? "Create Content Block" : "Edit Content Block" }}
             </h1>
             <q-space />
diff --git a/VueApp/src/CMS/pages/ContentBlocks.vue b/VueApp/src/CMS/pages/ContentBlocks.vue
index d0b0f1d80..2db270f87 100644
--- a/VueApp/src/CMS/pages/ContentBlocks.vue
+++ b/VueApp/src/CMS/pages/ContentBlocks.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">Content Blocks</h1>
+            <h1 class="q-my-none">Manage Content Blocks</h1>
             <q-space />
             <q-btn
                 color="positive"
diff --git a/VueApp/src/CMS/pages/FileAuditLog.vue b/VueApp/src/CMS/pages/FileAuditLog.vue
index e1e6c1897..d055d6aef 100644
--- a/VueApp/src/CMS/pages/FileAuditLog.vue
+++ b/VueApp/src/CMS/pages/FileAuditLog.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">File Audit Log</h1>
+            <h1 class="q-my-none">File Audit Log</h1>
             <q-space />
             <q-btn
                 flat
diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index 11e324744..3edd9eceb 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -1,8 +1,34 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">File Management</h1>
+            <h1 class="q-my-none">Manage Files</h1>
             <q-space />
+            <q-btn-dropdown
+                flat
+                dense
+                no-caps
+                color="primary"
+                label="File Tools"
+                class="q-mr-sm"
+            >
+                <q-list dense>
+                    <q-item
+                        v-for="tool in fileTools"
+                        :key="tool.label"
+                        v-close-popup
+                        clickable
+                        :to="tool.to"
+                    >
+                        <q-item-section side>
+                            <q-icon
+                                :name="tool.icon"
+                                size="xs"
+                            />
+                        </q-item-section>
+                        <q-item-section>{{ tool.label }}</q-item-section>
+                    </q-item>
+                </q-list>
+            </q-btn-dropdown>
             <q-btn
                 color="positive"
                 icon="add"
@@ -183,7 +209,8 @@
 </template>
 
 <script setup lang="ts">
-import { inject, onMounted, ref } from "vue"
+import { inject, nextTick, onMounted, ref, watch } from "vue"
+import { useRoute, useRouter } from "vue-router"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
 import FileFormDialog from "@/CMS/components/FileFormDialog.vue"
@@ -194,6 +221,8 @@ import PermissionChips from "@/CMS/components/PermissionChips.vue"
 import type { CmsFile } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "cms/files/"
+const route = useRoute()
+const router = useRouter()
 const $q = useQuasar()
 const { get, del, post, createUrlSearchParams } = useFetch()
 
@@ -206,7 +235,8 @@ const editingFile = ref<CmsFile | null>(null)
 const filters = ref({
     folder: null as string | null,
     status: "active",
-    search: "",
+    // The hub's recent-activity rail deep-links here with ?search=<file name>
+    search: typeof route.query.search === "string" ? route.query.search : "",
     encryptedOnly: false,
 })
 
@@ -216,6 +246,12 @@ const statusOptions = [
     { label: "All", value: "all" },
 ]
 
+const fileTools = [
+    { label: "Audit Log", icon: "history", to: { name: "CmsFileAudit" } },
+    { label: "Import Files", icon: "drive_file_move", to: { name: "CmsFileImport" } },
+    { label: "Bulk Encrypt", icon: "lock", to: { name: "CmsBulkEncrypt" } },
+]
+
 const pagination = ref({
     sortBy: "friendlyName",
     descending: false,
@@ -343,6 +379,22 @@ function formatDate(value: string | null): string {
     return new Date(value).toLocaleDateString("en-US", { year: "2-digit", month: "2-digit", day: "2-digit" })
 }
 
+// The "Upload File" left-nav link targets ?upload=1; consume the flag so
+// re-clicking the link re-opens the dialog after it has been closed.
+// Strip the query BEFORE opening: route-focus moves focus to <main> after
+// each navigation (use-route-focus.ts), which would close an already-open dialog.
+watch(
+    () => route.query.upload,
+    async (upload) => {
+        if (upload !== undefined) {
+            await router.replace({ query: { ...route.query, upload: undefined } })
+            await nextTick()
+            openUploadDialog()
+        }
+    },
+    { immediate: true },
+)
+
 onMounted(() => {
     loadFolders()
     reload()
diff --git a/VueApp/src/CMS/pages/ImportFiles.vue b/VueApp/src/CMS/pages/ImportFiles.vue
index d16648384..608c288bc 100644
--- a/VueApp/src/CMS/pages/ImportFiles.vue
+++ b/VueApp/src/CMS/pages/ImportFiles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">Import Files from VIPER</h1>
+            <h1 class="q-my-none">Import Files from VIPER</h1>
             <q-space />
             <q-btn
                 flat
diff --git a/VueApp/src/CMS/pages/LeftNavEdit.vue b/VueApp/src/CMS/pages/LeftNavEdit.vue
index d9ee8de17..f12b509a0 100644
--- a/VueApp/src/CMS/pages/LeftNavEdit.vue
+++ b/VueApp/src/CMS/pages/LeftNavEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">
+            <h1 class="q-my-none">
                 {{ isNew ? "Create Navigation Menu" : "Edit Navigation Menu" }}
             </h1>
             <q-space />
diff --git a/VueApp/src/CMS/pages/LeftNavMenus.vue b/VueApp/src/CMS/pages/LeftNavMenus.vue
index 6edf5ea41..b7666638e 100644
--- a/VueApp/src/CMS/pages/LeftNavMenus.vue
+++ b/VueApp/src/CMS/pages/LeftNavMenus.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="q-pa-md">
         <div class="row items-center q-mb-md">
-            <h1 class="text-h4 text-primary q-my-none">Left Navigation Menus</h1>
+            <h1 class="q-my-none">Manage Left-Nav Menus</h1>
             <q-space />
             <q-btn
                 color="positive"
diff --git a/VueApp/src/CMS/pages/ManageLinkCollections.vue b/VueApp/src/CMS/pages/ManageLinkCollections.vue
index a372f7481..27b131798 100644
--- a/VueApp/src/CMS/pages/ManageLinkCollections.vue
+++ b/VueApp/src/CMS/pages/ManageLinkCollections.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="link-collections-page">
-        <h1 class="text-h4 text-primary q-mt-none q-mb-sm">Link Collections</h1>
+        <h1 class="q-mt-none q-mb-sm">Manage Link Collections</h1>
 
         <q-form>
             <div class="row items-center q-mb-md q-col-gutter-sm">
diff --git a/VueApp/src/CMS/router/index.ts b/VueApp/src/CMS/router/index.ts
index 295dc9e7e..b93c5bca5 100644
--- a/VueApp/src/CMS/router/index.ts
+++ b/VueApp/src/CMS/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 import { checkHasOnePermission } from "@/composables/CheckPagePermission"
@@ -17,6 +17,12 @@ router.beforeEach(async (to) => {
             return { name: "CmsAuth" }
         }
     }
+    // Canonicalize the area root for CMS users so the left nav "Home" link
+    // highlights; unauthenticated and permission-less visitors stay on the
+    // CmsAuth landing (redirecting them would force a login or loop).
+    if (to.name === "CmsAuth" && checkHasOnePermission(["SVMSecure.CMS"])) {
+        return { name: "CmsHome" }
+    }
 })
 
 export { router as cmsRouter }
diff --git a/VueApp/src/CMS/router/routes.ts b/VueApp/src/CMS/router/routes.ts
index b5b7da5dd..c1d55eebc 100644
--- a/VueApp/src/CMS/router/routes.ts
+++ b/VueApp/src/CMS/router/routes.ts
@@ -1,4 +1,6 @@
 import ViperLayout from "@/layouts/ViperLayout.vue"
+import type { RouteLocationNormalized } from "vue-router"
+import { checkHasOnePermission } from "@/composables/CheckPagePermission"
 
 const routes = [
     {
@@ -54,7 +56,15 @@ const routes = [
     {
         path: "/CMS/ManageContentBlocks/Edit/:id?",
         name: "CmsContentBlockEdit",
-        meta: { layout: ViperLayout, permissions: ["SVMSecure.CMS.ManageContentBlocks"] },
+        // CreateContentBlock-only users may create via this route (no id);
+        // editing an existing block requires ManageContentBlocks, matching
+        // the API, which gates GET/PUT of existing blocks the same way.
+        meta: {
+            layout: ViperLayout,
+            permissions: ["SVMSecure.CMS.ManageContentBlocks", "SVMSecure.CMS.CreateContentBlock"],
+        },
+        beforeEnter: (to: RouteLocationNormalized) =>
+            !to.params.id || checkHasOnePermission(["SVMSecure.CMS.ManageContentBlocks"]) ? true : { name: "CmsAuth" },
         component: () => import("@/CMS/pages/ContentBlockEdit.vue"),
     },
     {
diff --git a/VueApp/src/CTS/router/index.ts b/VueApp/src/CTS/router/index.ts
index 6fc5aa690..44c1bc531 100644
--- a/VueApp/src/CTS/router/index.ts
+++ b/VueApp/src/CTS/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 import { checkHasOnePermission } from "@/composables/CheckPagePermission"
diff --git a/VueApp/src/ClinicalScheduler/router/index.ts b/VueApp/src/ClinicalScheduler/router/index.ts
index 67e72260b..96ea4d5ae 100644
--- a/VueApp/src/ClinicalScheduler/router/index.ts
+++ b/VueApp/src/ClinicalScheduler/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { clinicalSchedulerRoutes as routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 
diff --git a/VueApp/src/Computing/router/index.ts b/VueApp/src/Computing/router/index.ts
index f31cc266c..95d689f67 100644
--- a/VueApp/src/Computing/router/index.ts
+++ b/VueApp/src/Computing/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 
diff --git a/VueApp/src/Effort/components/EffortLeftNav.vue b/VueApp/src/Effort/components/EffortLeftNav.vue
index 08e04a905..2ae261327 100644
--- a/VueApp/src/Effort/components/EffortLeftNav.vue
+++ b/VueApp/src/Effort/components/EffortLeftNav.vue
@@ -13,6 +13,7 @@
         <div
             class="q-pa-sm"
             id="leftNavMenu"
+            tabindex="-1"
         >
             <q-btn
                 dense
diff --git a/VueApp/src/Effort/router/index.ts b/VueApp/src/Effort/router/index.ts
index c88cfaf20..5a10ec945 100644
--- a/VueApp/src/Effort/router/index.ts
+++ b/VueApp/src/Effort/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { effortRoutes as routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 import { checkHasOnePermission } from "@/composables/CheckPagePermission"
diff --git a/VueApp/src/Students/router/index.ts b/VueApp/src/Students/router/index.ts
index 9ce0ec118..f7d428856 100644
--- a/VueApp/src/Students/router/index.ts
+++ b/VueApp/src/Students/router/index.ts
@@ -1,4 +1,4 @@
-import { createSpaRouter } from "@/shared/createSpaRouter"
+import { createSpaRouter } from "@/shared/create-spa-router"
 import { routes } from "./routes"
 import { useRequireLogin } from "@/composables/RequireLogin"
 import { checkHasOnePermission } from "@/composables/CheckPagePermission"
diff --git a/VueApp/src/composables/use-route-focus.ts b/VueApp/src/composables/use-route-focus.ts
index be0f20f92..7c8826674 100644
--- a/VueApp/src/composables/use-route-focus.ts
+++ b/VueApp/src/composables/use-route-focus.ts
@@ -7,7 +7,12 @@ import { nextTick } from "vue"
  * alone does not move focus.
  */
 export function useRouteFocus(router: Router) {
-    router.afterEach(() => {
+    router.afterEach((to, from) => {
+        // In-page anchor navigation (skip links): the browser already moved
+        // focus to the fragment target; don't steal it back to <main>.
+        if (to.path === from.path && to.hash) {
+            return
+        }
         nextTick(() => {
             const main = document.querySelector("#main-content") || document.querySelector("main")
             if (main instanceof HTMLElement) {
diff --git a/VueApp/src/layouts/LeftNav.vue b/VueApp/src/layouts/LeftNav.vue
index c1b615f83..66f161721 100644
--- a/VueApp/src/layouts/LeftNav.vue
+++ b/VueApp/src/layouts/LeftNav.vue
@@ -14,6 +14,7 @@
             <div
                 class="q-pa-sm"
                 id="leftNavMenu"
+                tabindex="-1"
             >
                 <q-btn
                     dense
@@ -29,10 +30,12 @@
                     {{ navHeader }}
                 </h2>
                 <nav :aria-label="navHeader || 'Section navigation'">
+                    <!-- QItem hardcodes role="listitem", which overrides the native link
+                         role on anchors; explicit roles restore link semantics, so no
+                         role="list" wrapper (headers/spacers are presentational). -->
                     <q-list
                         dense
                         separator
-                        role="list"
                     >
                         <template
                             v-for="(menuItem, index) in menuItems"
@@ -45,6 +48,7 @@
                                 :to="menuItem.routeTo"
                                 :active="isItemActive(menuItem.routeTo)"
                                 :class="menuItem.displayClass"
+                                role="link"
                             >
                                 <q-item-section>
                                     <q-item-label
@@ -63,6 +67,7 @@
                                 :target="menuItem.isExternalSite ? '_blank' : undefined"
                                 :rel="menuItem.isExternalSite ? 'noopener noreferrer' : undefined"
                                 :class="menuItem.displayClass"
+                                role="link"
                             >
                                 <q-item-section>
                                     <q-item-label
@@ -87,6 +92,7 @@
                             <q-item
                                 v-else
                                 :class="menuItem.displayClass"
+                                role="presentation"
                             >
                                 <q-item-section>
                                     <q-item-label
@@ -319,5 +325,10 @@ watch(
     },
 )
 
-onMounted(() => getLeftNav())
+onMounted(() => {
+    getLeftNav()
+    // QDrawer drops fallthrough attrs on its content div, so the complementary
+    // landmark (the <aside> root) must be labeled directly.
+    document.getElementById("leftNavMenu")?.closest("aside")?.setAttribute("aria-label", "Section menu")
+})
 </script>
diff --git a/VueApp/src/layouts/ViperLayout.vue b/VueApp/src/layouts/ViperLayout.vue
index 123a485e9..429282c52 100644
--- a/VueApp/src/layouts/ViperLayout.vue
+++ b/VueApp/src/layouts/ViperLayout.vue
@@ -5,6 +5,14 @@
         class="skip-to-content"
         >Skip to main content</a
     >
+    <!-- gt-sm: the drawer is hidden below QDrawer's show-if-above breakpoint,
+         so the skip link would target an invisible element on small screens -->
+    <a
+        v-if="navarea"
+        href="#leftNavMenu"
+        class="skip-to-content gt-sm"
+        >Skip to section menu</a
+    >
     <q-layout view="hHh lpR fFf">
         <q-header
             elevated
diff --git a/VueApp/src/shared/__tests__/create-spa-router.test.ts b/VueApp/src/shared/__tests__/create-spa-router.test.ts
new file mode 100644
index 000000000..7b11a2898
--- /dev/null
+++ b/VueApp/src/shared/__tests__/create-spa-router.test.ts
@@ -0,0 +1,81 @@
+import { createMemoryHistory, createRouter } from "vue-router"
+import type { RouteLocationNormalized } from "vue-router"
+import { nextTick } from "vue"
+import { createSpaRouter } from "../create-spa-router"
+import { useRouteFocus } from "@/composables/use-route-focus"
+
+const DummyPage = { template: "<div>page</div>" }
+
+function route(path: string, hash = ""): RouteLocationNormalized {
+    return { path, hash } as RouteLocationNormalized
+}
+
+describe("createSpaRouter scroll behavior", () => {
+    const router = createSpaRouter([{ path: "/", component: DummyPage }])
+    const scrollBehavior = router.options.scrollBehavior!
+
+    it("scrolls to top when navigating to a different page", () => {
+        expect(scrollBehavior(route("/b"), route("/a"), null)).toEqual({ left: 0, top: 0 })
+    })
+
+    it("keeps scroll position for query-only changes on the same page", () => {
+        expect(scrollBehavior(route("/a"), route("/a"), null)).toBeFalsy()
+    })
+
+    it("scrolls to the fragment target when navigating to a hash on another page", () => {
+        expect(scrollBehavior(route("/b", "#section"), route("/a"), null)).toEqual({ el: "#section" })
+    })
+
+    it("scrolls to the fragment target when the hash changes on the same page", () => {
+        expect(scrollBehavior(route("/a", "#section"), route("/a"), null)).toEqual({ el: "#section" })
+    })
+
+    it("keeps scroll position for query-only changes when the hash is unchanged", () => {
+        expect(scrollBehavior(route("/a", "#section"), route("/a", "#section"), null)).toBeFalsy()
+    })
+})
+
+describe("route-change focus management", () => {
+    function buildRouter() {
+        const router = createRouter({
+            history: createMemoryHistory(),
+            routes: [
+                { path: "/", component: DummyPage },
+                { path: "/other", component: DummyPage },
+            ],
+        })
+        useRouteFocus(router)
+        return router
+    }
+
+    beforeEach(() => {
+        document.body.innerHTML = [
+            '<div id="leftNavMenu" tabindex="-1"></div>',
+            '<main id="main-content"></main>',
+        ].join("")
+    })
+
+    it("moves focus to the main landmark after page navigation", async () => {
+        const router = buildRouter()
+        await router.push("/")
+        await router.isReady()
+
+        await router.push("/other")
+        await nextTick()
+
+        expect(document.activeElement?.id).toBe("main-content")
+    })
+
+    it("does not steal focus on in-page anchor navigation (skip links)", async () => {
+        const router = buildRouter()
+        await router.push("/other")
+        await router.isReady()
+
+        const skipTarget = document.querySelector<HTMLElement>("#leftNavMenu")!
+        skipTarget.focus()
+        await router.push({ path: "/other", hash: "#leftNavMenu" })
+        await nextTick()
+
+        expect(document.activeElement?.id).toBe("leftNavMenu")
+    })
+})
diff --git a/VueApp/src/shared/create-spa-router.ts b/VueApp/src/shared/create-spa-router.ts
new file mode 100644
index 000000000..f89fb345f
--- /dev/null
+++ b/VueApp/src/shared/create-spa-router.ts
@@ -0,0 +1,29 @@
+import { createRouter, createWebHistory } from "vue-router"
+import type { RouteRecordRaw, Router } from "vue-router"
+import { useRouteFocus } from "@/composables/use-route-focus"
+
+/**
+ * Standard VIPER SPA router: web history rooted at VITE_VIPER_HOME,
+ * scroll-to-top on page navigation (query-only changes keep the scroll
+ * position), hash-fragment scrolling for router-driven anchor links, and
+ * route-change focus management for accessibility.
+ * Callers wire their own `beforeEach` guard since auth/permission rules
+ * vary per SPA.
+ */
+export function createSpaRouter(routes: RouteRecordRaw[]): Router {
+    const baseUrl = import.meta.env.VITE_VIPER_HOME
+    const router = createRouter({
+        scrollBehavior: (to, from) => {
+            // Scroll to the fragment target on router-driven hash navigation,
+            // but not on query-only changes where the hash merely persists.
+            if (to.hash && (to.path !== from.path || to.hash !== from.hash)) {
+                return { el: to.hash }
+            }
+            return to.path === from.path ? false : { left: 0, top: 0 }
+        },
+        history: createWebHistory(baseUrl),
+        routes,
+    })
+    useRouteFocus(router)
+    return router
+}
diff --git a/VueApp/src/shared/createSpaRouter.ts b/VueApp/src/shared/createSpaRouter.ts
deleted file mode 100644
index b1349020d..000000000
--- a/VueApp/src/shared/createSpaRouter.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { createRouter, createWebHistory } from "vue-router"
-import type { RouteRecordRaw, Router } from "vue-router"
-import { useRouteFocus } from "@/composables/use-route-focus"
-
-/**
- * Standard VIPER SPA router: web history rooted at VITE_VIPER_HOME,
- * scroll-to-top on every navigation, and route-change focus management
- * for accessibility. Callers wire their own `beforeEach` guard since
- * auth/permission rules vary per SPA.
- */
-export function createSpaRouter(routes: RouteRecordRaw[]): Router {
-    const baseUrl = import.meta.env.VITE_VIPER_HOME
-    const router = createRouter({
-        scrollBehavior: () => ({ left: 0, top: 0 }),
-        history: createWebHistory(baseUrl),
-        routes,
-    })
-    useRouteFocus(router)
-    return router
-}
diff --git a/VueApp/src/styles/base.css b/VueApp/src/styles/base.css
index 071d7efaf..1e8394ef0 100644
--- a/VueApp/src/styles/base.css
+++ b/VueApp/src/styles/base.css
@@ -82,6 +82,14 @@ body {
         0 0 0 0.25rem #258cfb;
 }
 
+/* Flat q-btn links suppress Quasar's focus helper enough to fail
+   WCAG 2.4.7; restore the system focus ring for keyboard users. */
+.q-card__actions .q-btn:focus-visible {
+    box-shadow:
+        0 0 0 0.1rem white,
+        0 0 0 0.25rem #258cfb;
+}
+
 /*Placeholders used when loading*/
 #headerPlaceholder {
     height: 50px;
@@ -374,6 +382,11 @@ header .q-avatar {
     outline: none;
 }
 
+/* Same treatment for the drawer container targeted by "Skip to section menu" */
+#leftNavMenu:focus {
+    outline: none;
+}
+
 /* Quasar palette AA contrast overrides (!important required to override Quasar's !important).
    Kept in sync with web/wwwroot/css/site.css so Razor and SPA render the same color. */
 .text-grey {
diff --git a/web/Areas/CMS/Services/CmsNavMenu.cs b/web/Areas/CMS/Services/CmsNavMenu.cs
index 0b151aeee..c5bc0c6bc 100644
--- a/web/Areas/CMS/Services/CmsNavMenu.cs
+++ b/web/Areas/CMS/Services/CmsNavMenu.cs
@@ -1,3 +1,4 @@
+using Viper.Areas.CMS.Constants;
 using Viper.Classes;
 using Viper.Classes.SQLContext;
 
@@ -13,13 +14,49 @@ public CmsNavMenu(RAPSContext context)
 
         public NavMenu Nav()
         {
-            UserHelper userHelper = new UserHelper();
+            UserHelper userHelper = new();
+            var user = userHelper.GetCurrentUser();
+            bool canManageBlocks = userHelper.HasPermission(_rapsContext, user, CmsPermissions.ManageContentBlocks);
+            bool canCreateBlocks = userHelper.HasPermission(_rapsContext, user, CmsPermissions.CreateContentBlock);
+            bool canManageFiles = userHelper.HasPermission(_rapsContext, user, CmsPermissions.AllFiles);
+            bool canManageNav = userHelper.HasPermission(_rapsContext, user, CmsPermissions.ManageNavigation);
 
             var nav = new List<NavMenuItem>();
 
-            if (userHelper.HasPermission(_rapsContext, userHelper.GetCurrentUser(), "SVMSecure.CMS.ManageContentBlocks"))
+            if (canManageBlocks || canCreateBlocks || canManageFiles || canManageNav)
             {
-                nav.Add(new NavMenuItem { MenuItemText = "Manage Link Collections", MenuItemURL = "ManageLinkCollections" });
+                nav.Add(new NavMenuItem { MenuItemText = "Home", MenuItemURL = "Home" });
+            }
+
+            if (canManageBlocks || canCreateBlocks)
+            {
+                nav.Add(new NavMenuItem { MenuItemText = "Content Blocks", IsHeader = true });
+                if (canManageBlocks)
+                {
+                    nav.Add(new NavMenuItem { MenuItemText = "Manage Content Blocks", MenuItemURL = "ManageContentBlocks", IndentLevel = 1 });
+                }
+                if (canCreateBlocks)
+                {
+                    nav.Add(new NavMenuItem { MenuItemText = "Add Content Block", MenuItemURL = "ManageContentBlocks/Edit", IndentLevel = 1 });
+                }
+                if (canManageBlocks)
+                {
+                    nav.Add(new NavMenuItem { MenuItemText = "Manage Link Collections", MenuItemURL = "ManageLinkCollections", IndentLevel = 1 });
+                }
+            }
+
+            if (canManageFiles)
+            {
+                nav.Add(new NavMenuItem { MenuItemText = "Files", IsHeader = true });
+                nav.Add(new NavMenuItem { MenuItemText = "Manage Files", MenuItemURL = "ManageFiles", IndentLevel = 1 });
+                nav.Add(new NavMenuItem { MenuItemText = "Upload File", MenuItemURL = "ManageFiles?upload=1", IndentLevel = 1 });
+            }
+
+            if (canManageNav)
+            {
+                nav.Add(new NavMenuItem { MenuItemText = "Left Navigation Menus", IsHeader = true });
+                nav.Add(new NavMenuItem { MenuItemText = "Manage Left-Nav Menus", MenuItemURL = "ManageLeftNav", IndentLevel = 1 });
+                nav.Add(new NavMenuItem { MenuItemText = "Add Left-Nav Menu", MenuItemURL = "ManageLeftNav/Edit", IndentLevel = 1 });
             }
 
             return new NavMenu("Content Management System", nav);

From 91222f66c96e775f62534826d971d6e64830fdea Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 06:55:54 -0700
Subject: [PATCH 2/7] VPR-59 fix(cms): close a11y gaps and align labels across
 CMS pages

- Workspace anchors now use the brand link color and dense table action
  buttons keep a 24px minimum hit area (base.css, applies app-wide)
- Icon-only status and result indicators get screen-reader text; links
  that open new windows announce it
- Loading buttons use the design-system spinner+label slot; deleted
  banner on content block edit uses StatusBanner; sidebar/card headings
  are real h2s
- Create buttons match nav wording (Add Content Block, Add Left-Nav
  Menu, Add Collection); removed the duplicate Audit Log button on
  Manage Files
- Hand-rolled "file(s)" plurals replaced with inflect(); inline styles
  extracted to classes
---
 VueApp/src/CMS/pages/BulkEncrypt.vue          | 18 ++++++++++---
 VueApp/src/CMS/pages/ContentBlockEdit.vue     | 27 ++++++++++++-------
 VueApp/src/CMS/pages/ContentBlocks.vue        | 12 ++++++++-
 VueApp/src/CMS/pages/Files.vue                | 27 +++++++++++--------
 VueApp/src/CMS/pages/ImportFiles.vue          | 27 ++++++++++++++-----
 VueApp/src/CMS/pages/LeftNavEdit.vue          | 24 ++++++++++++++---
 VueApp/src/CMS/pages/LeftNavMenus.vue         |  2 +-
 .../src/CMS/pages/ManageLinkCollections.vue   | 10 ++++---
 VueApp/src/styles/base.css                    | 13 +++++++++
 9 files changed, 120 insertions(+), 40 deletions(-)

diff --git a/VueApp/src/CMS/pages/BulkEncrypt.vue b/VueApp/src/CMS/pages/BulkEncrypt.vue
index 365c10a4b..0187dfe18 100644
--- a/VueApp/src/CMS/pages/BulkEncrypt.vue
+++ b/VueApp/src/CMS/pages/BulkEncrypt.vue
@@ -56,7 +56,15 @@
                     :disable="!selected.length"
                     :loading="encrypting"
                     @click="encryptSelected"
-                />
+                >
+                    <template #loading>
+                        <q-spinner
+                            size="1em"
+                            class="q-mr-sm"
+                        />
+                        Encrypting...
+                    </template>
+                </q-btn>
             </div>
         </div>
 
@@ -90,11 +98,12 @@
                     v-for="r in results"
                     :key="r.fileGuid"
                 >
-                    <q-item-section avatar>
+                    <q-item-section side>
                         <q-icon
                             :name="r.success ? 'check_circle' : 'error'"
                             :color="r.success ? 'positive' : 'negative'"
                         />
+                        <span class="sr-only">{{ r.success ? "Encrypted" : "Failed" }}</span>
                     </q-item-section>
                     <q-item-section>
                         <q-item-label>{{ r.friendlyName ?? r.fileGuid }}</q-item-label>
@@ -113,6 +122,7 @@
 
 <script setup lang="ts">
 import { inject, onMounted, ref } from "vue"
+import { inflect } from "inflection"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
 import ModifiedStamp from "@/CMS/components/ModifiedStamp.vue"
@@ -204,7 +214,7 @@ async function encryptSelected() {
     const confirmed = await new Promise<boolean>((resolve) => {
         $q.dialog({
             title: "Encrypt Files",
-            message: `Encrypt ${selected.value.length} file(s) in place?`,
+            message: `Encrypt ${selected.value.length} ${inflect("file", selected.value.length)} in place?`,
             cancel: { label: "Cancel", flat: true },
             persistent: true,
             ok: { label: "Encrypt", color: "primary", unelevated: true },
@@ -230,7 +240,7 @@ async function encryptSelected() {
     const succeeded = res.result.filter((r: BulkEncryptResult) => r.success).length
     $q.notify({
         type: succeeded === res.result.length ? "positive" : "warning",
-        message: `${succeeded} of ${res.result.length} files encrypted`,
+        message: `${succeeded} of ${res.result.length} ${inflect("file", res.result.length)} encrypted`,
     })
     reload()
 }
diff --git a/VueApp/src/CMS/pages/ContentBlockEdit.vue b/VueApp/src/CMS/pages/ContentBlockEdit.vue
index 20545b677..3bfbd9b2b 100644
--- a/VueApp/src/CMS/pages/ContentBlockEdit.vue
+++ b/VueApp/src/CMS/pages/ContentBlockEdit.vue
@@ -16,11 +16,10 @@
             />
         </div>
 
-        <q-banner
+        <StatusBanner
             v-if="block.deletedOn"
-            class="bg-orange-2 q-mb-md"
-            dense
-            rounded
+            type="warning"
+            class="q-mb-md"
         >
             This content block is marked as deleted. Restore it to make it available again.
             <template #action>
@@ -33,7 +32,7 @@
                     @click="restoreBlock"
                 />
             </template>
-        </q-banner>
+        </StatusBanner>
 
         <q-form
             ref="formRef"
@@ -101,7 +100,7 @@
                         class="q-mb-md"
                     >
                         <q-card-section class="q-gutter-y-sm">
-                            <div class="text-h6">Settings</div>
+                            <h2 class="text-h6 q-my-none">Settings</h2>
 
                             <q-select
                                 v-model="block.system"
@@ -164,7 +163,7 @@
                         class="q-mb-md"
                     >
                         <q-card-section>
-                            <div class="text-h6 q-mb-sm">Permissions</div>
+                            <h2 class="text-h6 q-my-none q-mb-sm">Permissions</h2>
                             <PermissionSelector v-model="block.permissions" />
                         </q-card-section>
                     </q-card>
@@ -174,7 +173,7 @@
                         bordered
                     >
                         <q-card-section>
-                            <div class="text-h6 q-mb-sm">Attached Files</div>
+                            <h2 class="text-h6 q-my-none q-mb-sm">Attached Files</h2>
                             <div
                                 v-for="file in block.files"
                                 :key="file.fileGuid"
@@ -187,6 +186,7 @@
                                     class="col ellipsis"
                                 >
                                     {{ file.friendlyName }}
+                                    <span class="sr-only">(opens in new window)</span>
                                 </a>
                                 <q-btn
                                     dense
@@ -229,7 +229,15 @@
                     no-caps
                     class="q-pr-md"
                     :loading="saving"
-                />
+                >
+                    <template #loading>
+                        <q-spinner
+                            size="1em"
+                            class="q-mr-sm"
+                        />
+                        {{ isNew ? "Create" : "Save" }}
+                    </template>
+                </q-btn>
                 <q-btn
                     flat
                     label="Cancel"
@@ -249,6 +257,7 @@ import { useRoute, useRouter } from "vue-router"
 import { useQuasar } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
+import StatusBanner from "@/components/StatusBanner.vue"
 import type { CmsContentBlock, CmsContentBlockFile, CmsContentHistoryItem, CmsFile } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "CMS/content"
diff --git a/VueApp/src/CMS/pages/ContentBlocks.vue b/VueApp/src/CMS/pages/ContentBlocks.vue
index 2db270f87..2d19d0e83 100644
--- a/VueApp/src/CMS/pages/ContentBlocks.vue
+++ b/VueApp/src/CMS/pages/ContentBlocks.vue
@@ -6,7 +6,7 @@
             <q-btn
                 color="positive"
                 icon="add"
-                label="New Content Block"
+                label="Add Content Block"
                 no-caps
                 dense
                 class="q-pr-md"
@@ -91,6 +91,11 @@
                         >
                             <q-tooltip>Public access</q-tooltip>
                         </q-icon>
+                        <span
+                            v-if="cellProps.row.allowPublicAccess"
+                            class="sr-only"
+                            >Public access</span
+                        >
                         <q-icon
                             v-if="cellProps.row.deletedOn"
                             name="delete_outline"
@@ -98,6 +103,11 @@
                         >
                             <q-tooltip>Deleted</q-tooltip>
                         </q-icon>
+                        <span
+                            v-if="cellProps.row.deletedOn"
+                            class="sr-only"
+                            >Deleted</span
+                        >
                     </div>
                     <div class="text-caption text-grey-7">{{ cellProps.row.friendlyName }}</div>
                 </q-td>
diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index 3edd9eceb..238d223a4 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -86,17 +86,6 @@
                     @update:model-value="reload"
                 />
             </div>
-            <div class="col-auto flex items-center">
-                <q-btn
-                    flat
-                    dense
-                    no-caps
-                    color="primary"
-                    icon="history"
-                    label="Audit Log"
-                    :to="{ name: 'CmsFileAudit' }"
-                />
-            </div>
         </div>
 
         <q-table
@@ -120,6 +109,7 @@
                             rel="noopener"
                         >
                             {{ cellProps.row.friendlyName }}
+                            <span class="sr-only">(opens in new window)</span>
                         </a>
                         <q-icon
                             v-if="cellProps.row.encrypted"
@@ -128,6 +118,11 @@
                         >
                             <q-tooltip>Encrypted</q-tooltip>
                         </q-icon>
+                        <span
+                            v-if="cellProps.row.encrypted"
+                            class="sr-only"
+                            >Encrypted</span
+                        >
                         <q-icon
                             v-if="cellProps.row.allowPublicAccess"
                             name="public"
@@ -135,6 +130,11 @@
                         >
                             <q-tooltip>Public access</q-tooltip>
                         </q-icon>
+                        <span
+                            v-if="cellProps.row.allowPublicAccess"
+                            class="sr-only"
+                            >Public access</span
+                        >
                         <q-icon
                             v-if="cellProps.row.deletedOn"
                             name="delete_outline"
@@ -142,6 +142,11 @@
                         >
                             <q-tooltip>Deleted {{ formatDate(cellProps.row.deletedOn) }}</q-tooltip>
                         </q-icon>
+                        <span
+                            v-if="cellProps.row.deletedOn"
+                            class="sr-only"
+                            >Deleted {{ formatDate(cellProps.row.deletedOn) }}</span
+                        >
                     </div>
                 </q-td>
             </template>
diff --git a/VueApp/src/CMS/pages/ImportFiles.vue b/VueApp/src/CMS/pages/ImportFiles.vue
index 608c288bc..52ad5e955 100644
--- a/VueApp/src/CMS/pages/ImportFiles.vue
+++ b/VueApp/src/CMS/pages/ImportFiles.vue
@@ -14,10 +14,7 @@
             />
         </div>
 
-        <p
-            class="text-body2 text-grey-8"
-            style="max-width: 60rem"
-        >
+        <p class="text-body2 text-grey-8 intro-copy">
             Moves files out of the legacy VIPER webroot into the managed file store. The original path is saved as the
             file's Old URL, so existing links keep working through the file handler. Enter one path per line, relative
             to the legacy webroot (e.g.
@@ -77,7 +74,15 @@
                             no-caps
                             class="q-pr-md"
                             :loading="importing"
-                        />
+                        >
+                            <template #loading>
+                                <q-spinner
+                                    size="1em"
+                                    class="q-mr-sm"
+                                />
+                                Import Files
+                            </template>
+                        </q-btn>
                     </div>
                 </div>
             </div>
@@ -102,6 +107,7 @@
                             :color="cellProps.row.success ? 'positive' : 'negative'"
                             size="sm"
                         />
+                        <span class="sr-only">{{ cellProps.row.success ? "Imported" : "Failed" }}</span>
                     </q-td>
                 </template>
             </q-table>
@@ -111,6 +117,7 @@
 
 <script setup lang="ts">
 import { inject, onMounted, ref } from "vue"
+import { inflect } from "inflection"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
@@ -141,7 +148,7 @@ const options = ref({
 })
 
 const resultColumns: QTableProps["columns"] = [
-    { name: "success", label: "", field: "success", align: "center" },
+    { name: "success", label: "Result", field: "success", align: "center" },
     { name: "filePath", label: "Path", field: "filePath", align: "left" },
     { name: "friendlyName", label: "Imported as", field: "friendlyName", align: "left" },
     { name: "message", label: "Message", field: "message", align: "left" },
@@ -178,7 +185,7 @@ async function runImport() {
     const succeeded = res.result.filter((r: ImportResult) => r.success).length
     $q.notify({
         type: succeeded === res.result.length ? "positive" : "warning",
-        message: `${succeeded} of ${res.result.length} files imported`,
+        message: `${succeeded} of ${res.result.length} ${inflect("file", res.result.length)} imported`,
     })
     // Imported paths are consumed; keep failures in the textarea for fixing.
     paths.value = res.result
@@ -189,3 +196,9 @@ async function runImport() {
 
 onMounted(loadFolders)
 </script>
+
+<style scoped>
+.intro-copy {
+    max-width: 60rem;
+}
+</style>
diff --git a/VueApp/src/CMS/pages/LeftNavEdit.vue b/VueApp/src/CMS/pages/LeftNavEdit.vue
index f12b509a0..a30ec2ab5 100644
--- a/VueApp/src/CMS/pages/LeftNavEdit.vue
+++ b/VueApp/src/CMS/pages/LeftNavEdit.vue
@@ -23,7 +23,7 @@
                     bordered
                 >
                     <q-card-section class="q-gutter-y-sm">
-                        <div class="text-h6">Menu Settings</div>
+                        <h2 class="text-h6 q-my-none">Menu Settings</h2>
 
                         <q-form
                             ref="menuFormRef"
@@ -84,7 +84,15 @@
                                 no-caps
                                 class="q-pr-md"
                                 :loading="savingMenu"
-                            />
+                            >
+                                <template #loading>
+                                    <q-spinner
+                                        size="1em"
+                                        class="q-mr-sm"
+                                    />
+                                    {{ isNew ? "Create Menu" : "Save Menu Settings" }}
+                                </template>
+                            </q-btn>
                         </q-form>
                     </q-card-section>
                 </q-card>
@@ -100,7 +108,7 @@
                 >
                     <q-card-section>
                         <div class="row items-center q-mb-sm">
-                            <div class="text-h6">Menu Items</div>
+                            <h2 class="text-h6 q-my-none">Menu Items</h2>
                             <q-space />
                             <q-btn
                                 flat
@@ -223,7 +231,15 @@
                                 class="q-pr-md"
                                 :loading="savingItems"
                                 @click="saveItems"
-                            />
+                            >
+                                <template #loading>
+                                    <q-spinner
+                                        size="1em"
+                                        class="q-mr-sm"
+                                    />
+                                    Save Items
+                                </template>
+                            </q-btn>
                             <q-btn
                                 flat
                                 label="Revert"
diff --git a/VueApp/src/CMS/pages/LeftNavMenus.vue b/VueApp/src/CMS/pages/LeftNavMenus.vue
index b7666638e..874184798 100644
--- a/VueApp/src/CMS/pages/LeftNavMenus.vue
+++ b/VueApp/src/CMS/pages/LeftNavMenus.vue
@@ -6,7 +6,7 @@
             <q-btn
                 color="positive"
                 icon="add"
-                label="New Menu"
+                label="Add Left-Nav Menu"
                 no-caps
                 dense
                 class="q-pr-md"
diff --git a/VueApp/src/CMS/pages/ManageLinkCollections.vue b/VueApp/src/CMS/pages/ManageLinkCollections.vue
index 27b131798..4468efbb2 100644
--- a/VueApp/src/CMS/pages/ManageLinkCollections.vue
+++ b/VueApp/src/CMS/pages/ManageLinkCollections.vue
@@ -23,7 +23,7 @@
                     <q-btn
                         color="positive"
                         icon="add"
-                        label="New Collection"
+                        label="Add Collection"
                         no-caps
                         dense
                         class="q-mx-lg q-pr-md"
@@ -53,7 +53,7 @@
             aria-labelledby="collection-dialog-title"
             @hide="cancelCollectionDialog"
         >
-            <q-card style="min-width: 350px">
+            <q-card class="dialog-card">
                 <q-card-section class="row items-center q-pb-none">
                     <div
                         id="collection-dialog-title"
@@ -219,7 +219,7 @@
                 aria-labelledby="link-dialog-title"
                 @keydown.escape="cancelLinkDialog"
             >
-                <q-card style="min-width: 350px">
+                <q-card class="dialog-card">
                     <q-card-section class="row items-center q-pb-none">
                         <div
                             id="link-dialog-title"
@@ -850,6 +850,10 @@ loadCollections()
 </script>
 
 <style scoped>
+.dialog-card {
+    min-width: 350px;
+}
+
 #allLinks {
     background: #fff;
     border-radius: 6px;
diff --git a/VueApp/src/styles/base.css b/VueApp/src/styles/base.css
index 1e8394ef0..2c4a46368 100644
--- a/VueApp/src/styles/base.css
+++ b/VueApp/src/styles/base.css
@@ -387,6 +387,19 @@ header .q-avatar {
     outline: none;
 }
 
+/* Workspace links carry the brand (DESIGN.md: Aggie Blue is the link color);
+   without this, content anchors fall back to browser default blue/purple.
+   Buttons, nav items, and tabs manage their own colors. */
+#main-content a:not(.q-btn):not(.q-item):not(.q-tab) {
+    color: var(--q-primary);
+}
+
+/* Dense table action buttons keep a 24px minimum hit area (WCAG 2.2 SC 2.5.8) */
+.q-td .q-btn {
+    min-width: 24px;
+    min-height: 24px;
+}
+
 /* Quasar palette AA contrast overrides (!important required to override Quasar's !important).
    Kept in sync with web/wwwroot/css/site.css so Razor and SPA render the same color. */
 .text-grey {

From 597d159cc6237c7e34386efd95e6fb3519d21026 Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 11:44:27 -0700
Subject: [PATCH 3/7] VPR-59 feat(cms): VIPER2 download links, shareable
 filters, folder fixes

- File URLs now point at the VIPER2 download handler (/CMS/Files,
  permission-checked, serves public files anonymously) instead of the
  ColdFusion /cms/files path; host keeps non-default ports and the URL
  respects PathBase on TEST/PROD
- Manage Files: Old URL column collapses to a compact link (full URL in
  tooltip) that resolves through the download handler; filters sync to
  the query string for shareable deep links; new "Public only" toggle
  (isPublic was already supported by the API)
- Folder filter lists disk folders unioned with folders that exist only
  on file records (e.g. VMDEVSignatures in dev), with an explicit "All"
  default; upload destinations keep the disk-only allow-list since the
  first path segment is a security check
- Hub cards render as equal-height tiles via a CSS grid with 1fr rows
---
 VueApp/src/CMS/pages/BulkEncrypt.vue          |  3 +-
 VueApp/src/CMS/pages/CmsHome.vue              | 76 +++++++++++--------
 VueApp/src/CMS/pages/Files.vue                | 76 ++++++++++++++-----
 .../CMS/Controllers/CMSFilesController.cs     |  6 +-
 web/Areas/CMS/Data/CMS.cs                     | 16 ++--
 .../CMS/Services/CmsFileStorageService.cs     | 20 +++++
 6 files changed, 136 insertions(+), 61 deletions(-)

diff --git a/VueApp/src/CMS/pages/BulkEncrypt.vue b/VueApp/src/CMS/pages/BulkEncrypt.vue
index 0187dfe18..603ac04a2 100644
--- a/VueApp/src/CMS/pages/BulkEncrypt.vue
+++ b/VueApp/src/CMS/pages/BulkEncrypt.vue
@@ -206,7 +206,8 @@ function reload() {
 }
 
 async function loadFolders() {
-    const res = await get(apiURL + "folders")
+    // Union of disk + record-only folders; this filters records, not uploads.
+    const res = await get(apiURL + "folders?includeData=true")
     folders.value = res.success ? res.result : []
 }
 
diff --git a/VueApp/src/CMS/pages/CmsHome.vue b/VueApp/src/CMS/pages/CmsHome.vue
index 17eb61b97..1edd8f990 100644
--- a/VueApp/src/CMS/pages/CmsHome.vue
+++ b/VueApp/src/CMS/pages/CmsHome.vue
@@ -11,41 +11,37 @@
 
         <div class="row q-col-gutter-lg cms-home-grid">
             <div class="col-12 col-lg-8">
-                <div class="row q-col-gutter-md">
-                    <div
+                <div class="cms-home-cards">
+                    <q-card
                         v-for="section in visibleSections"
                         :key="section.title"
-                        class="col-12 col-sm-6"
+                        flat
+                        bordered
                     >
-                        <q-card
-                            flat
-                            bordered
-                        >
-                            <q-card-section>
-                                <h2 class="text-h6 text-primary q-my-none">
-                                    <q-icon
-                                        :name="section.icon"
-                                        size="sm"
-                                        class="q-mr-sm"
-                                    />
-                                    {{ section.title }}
-                                </h2>
-                                <div class="text-body2 text-grey-8 q-mt-xs">{{ section.description }}</div>
-                            </q-card-section>
-                            <q-card-actions>
-                                <q-btn
-                                    v-for="action in section.actions"
-                                    :key="action.label"
-                                    flat
-                                    dense
-                                    no-caps
-                                    color="primary"
-                                    :label="action.label"
-                                    :to="action.to"
+                        <q-card-section>
+                            <h2 class="text-h6 text-primary q-my-none">
+                                <q-icon
+                                    :name="section.icon"
+                                    size="sm"
+                                    class="q-mr-sm"
                                 />
-                            </q-card-actions>
-                        </q-card>
-                    </div>
+                                {{ section.title }}
+                            </h2>
+                            <div class="text-body2 text-grey-8 q-mt-xs">{{ section.description }}</div>
+                        </q-card-section>
+                        <q-card-actions>
+                            <q-btn
+                                v-for="action in section.actions"
+                                :key="action.label"
+                                flat
+                                dense
+                                no-caps
+                                color="primary"
+                                :label="action.label"
+                                :to="action.to"
+                            />
+                        </q-card-actions>
+                    </q-card>
                 </div>
             </div>
             <div
@@ -145,4 +141,22 @@ const showRecentActivity = computed(() => canManageBlocks.value || canManageFile
 .cms-home-grid {
     max-width: 80rem;
 }
+
+/* CSS grid with equal rows so all four cards render as same-size tiles
+   regardless of description length; collapses to one column when narrow. */
+.cms-home-cards {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(17rem, 1fr));
+    grid-auto-rows: 1fr;
+    gap: 16px;
+}
+
+.cms-home-cards .q-card {
+    display: flex;
+    flex-direction: column;
+}
+
+.cms-home-cards .q-card .q-card__actions {
+    margin-top: auto;
+}
 </style>
diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index 238d223a4..b0958263f 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -46,9 +46,8 @@
                     v-model="filters.folder"
                     dense
                     options-dense
-                    clearable
                     label="VIPER app"
-                    :options="folders"
+                    :options="filterFolders"
                     @update:model-value="reload"
                 />
             </div>
@@ -86,6 +85,14 @@
                     @update:model-value="reload"
                 />
             </div>
+            <div class="col-auto flex items-center">
+                <q-toggle
+                    v-model="filters.publicOnly"
+                    dense
+                    label="Public only"
+                    @update:model-value="reload"
+                />
+            </div>
         </div>
 
         <q-table
@@ -162,13 +169,16 @@
 
             <template #body-cell-oldUrl="cellProps">
                 <q-td :props="cellProps">
-                    <span
+                    <a
                         v-if="cellProps.row.oldUrl"
-                        class="ellipsis old-url"
+                        :href="oldUrlHref(cellProps.row.oldUrl)"
+                        target="_blank"
+                        rel="noopener"
                     >
-                        {{ cellProps.row.oldUrl }}
+                        Old URL
+                        <span class="sr-only">{{ cellProps.row.oldUrl }} (opens in new window)</span>
                         <q-tooltip>{{ cellProps.row.oldUrl }}</q-tooltip>
-                    </span>
+                    </a>
                 </q-td>
             </template>
 
@@ -231,20 +241,44 @@ const router = useRouter()
 const $q = useQuasar()
 const { get, del, post, createUrlSearchParams } = useFetch()
 
+const ALL_FOLDERS = "All"
+
 const files = ref<CmsFile[]>([])
 const folders = ref<string[]>([])
+const filterFolders = ref<string[]>([ALL_FOLDERS])
 const loading = ref(false)
 const showDialog = ref(false)
 const editingFile = ref<CmsFile | null>(null)
 
+// Filters initialize from the URL so views can be shared/deep-linked
+// (the hub's recent-activity rail uses ?search=<file name>).
 const filters = ref({
-    folder: null as string | null,
-    status: "active",
-    // The hub's recent-activity rail deep-links here with ?search=<file name>
+    folder: typeof route.query.folder === "string" ? route.query.folder : ALL_FOLDERS,
+    status: typeof route.query.status === "string" ? route.query.status : "active",
     search: typeof route.query.search === "string" ? route.query.search : "",
-    encryptedOnly: false,
+    encryptedOnly: route.query.encrypted === "1",
+    publicOnly: route.query.public === "1",
 })
 
+// Reflect the active filters back into the URL (defaults are omitted).
+function syncFiltersToUrl() {
+    void router.replace({
+        query: {
+            ...route.query,
+            folder: filters.value.folder !== ALL_FOLDERS ? filters.value.folder : undefined,
+            status: filters.value.status !== "active" ? filters.value.status : undefined,
+            search: filters.value.search || undefined,
+            encrypted: filters.value.encryptedOnly ? "1" : undefined,
+            public: filters.value.publicOnly ? "1" : undefined,
+        },
+    })
+}
+
+// The download handler is an MVC route, so the SPA base must be prepended.
+function oldUrlHref(oldUrl: string): string {
+    return `${import.meta.env.VITE_VIPER_HOME}CMS/Files?oldURL=${encodeURIComponent(oldUrl)}`
+}
+
 const statusOptions = [
     { label: "Active", value: "active" },
     { label: "Deleted", value: "deleted" },
@@ -275,8 +309,14 @@ const columns: QTableProps["columns"] = [
 ]
 
 async function loadFolders() {
-    const res = await get(apiURL + "folders")
-    folders.value = res.success ? res.result : []
+    // Upload destinations (disk allow-list) and filter options (union with
+    // folders that only exist on file records) are different lists.
+    const [destinations, filterable] = await Promise.all([
+        get(apiURL + "folders"),
+        get(apiURL + "folders?includeData=true"),
+    ])
+    folders.value = destinations.success ? destinations.result : []
+    filterFolders.value = [ALL_FOLDERS, ...(filterable.success ? filterable.result : [])]
 }
 
 type TableRequestPagination = {
@@ -291,10 +331,11 @@ async function onRequest(requestProps: { pagination: TableRequestPagination }) {
     const { page, rowsPerPage, sortBy, descending } = requestProps.pagination
     loading.value = true
     const params = createUrlSearchParams({
-        folder: filters.value.folder,
+        folder: filters.value.folder !== ALL_FOLDERS ? filters.value.folder : null,
         status: filters.value.status,
         search: filters.value.search || null,
         encrypted: filters.value.encryptedOnly ? "true" : null,
+        isPublic: filters.value.publicOnly ? "true" : null,
         page,
         perPage: rowsPerPage,
         sortBy: sortBy ?? "friendlyName",
@@ -315,6 +356,7 @@ async function onRequest(requestProps: { pagination: TableRequestPagination }) {
 }
 
 function reload() {
+    syncFiltersToUrl()
     void onRequest({ pagination: { ...pagination.value, page: 1 } })
 }
 
@@ -405,11 +447,3 @@ onMounted(() => {
     reload()
 })
 </script>
-
-<style scoped>
-.old-url {
-    max-width: 200px;
-    display: inline-block;
-    vertical-align: middle;
-}
-</style>
diff --git a/web/Areas/CMS/Controllers/CMSFilesController.cs b/web/Areas/CMS/Controllers/CMSFilesController.cs
index 8a3cc70d5..ed3bb32f0 100644
--- a/web/Areas/CMS/Controllers/CMSFilesController.cs
+++ b/web/Areas/CMS/Controllers/CMSFilesController.cs
@@ -68,10 +68,12 @@ public async Task<ActionResult<List<CmsFileDto>>> GetFiles(
         }
 
         // GET /api/cms/files/folders
+        // includeData=true unions in folders that exist only on file records (for
+        // filtering); the default disk-backed list is the upload destination allow-list.
         [HttpGet("folders")]
-        public ActionResult<List<string>> GetFolders()
+        public async Task<ActionResult<List<string>>> GetFolders(bool includeData = false, CancellationToken ct = default)
         {
-            return _storage.GetTopLevelFolders();
+            return includeData ? await _storage.GetFilterFoldersAsync(ct) : _storage.GetTopLevelFolders();
         }
 
         // GET /api/cms/files/audit
diff --git a/web/Areas/CMS/Data/CMS.cs b/web/Areas/CMS/Data/CMS.cs
index 7569be092..07f491d4d 100644
--- a/web/Areas/CMS/Data/CMS.cs
+++ b/web/Areas/CMS/Data/CMS.cs
@@ -1,7 +1,6 @@
 using System.IO.Compression;
 using System.Net;
 using System.Text.Json;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Net.Http.Headers;
@@ -278,20 +277,24 @@ public IEnumerable<CMSFile> GetAllFiles(string? folder, bool? isPublic, string?
 
         #region public static string GetFriendlyURL(string friendlyName, bool allowPublicAccess = false)
         /// <summary>
-        /// Get Friendly URL for a friendly name. Currently, always points to ColdFusion Viper
+        /// Get Friendly URL for a friendly name. Points to the VIPER 2 download handler
+        /// (CMSController.Files), which checks permissions internally and serves public
+        /// files anonymously, so no separate /public URL shape is needed.
         /// </summary>
         public static string GetFriendlyURL(string friendlyName, bool allowPublicAccess = false)
         {
             string rootURL = String.Empty;
+            string pathBase = String.Empty;
             HttpRequest? thisRequest = HttpHelper.HttpContext?.Request;
 
             if (thisRequest != null)
             {
-                Uri url = new(thisRequest.GetDisplayUrl());
-                rootURL = url.Scheme + Uri.SchemeDelimiter + url.Host;
+                // Request.Host keeps any non-default port (url.Host would drop it)
+                rootURL = thisRequest.Scheme + Uri.SchemeDelimiter + thisRequest.Host;
+                pathBase = thisRequest.PathBase;
             }
 
-            return rootURL + (allowPublicAccess ? @"/public" : "") + @"/cms/files/?fn=" + WebUtility.UrlEncode(friendlyName);
+            return rootURL + pathBase + @"/CMS/Files?fn=" + WebUtility.UrlEncode(friendlyName);
         }
         #endregion
 
@@ -301,7 +304,8 @@ public static string GetFriendlyURL(string friendlyName, bool allowPublicAccess
         /// </summary>
         public static string GetURL(string fileGUID, bool allowPublicAccess = false)
         {
-            return (allowPublicAccess ? @"/public" : "") + @"/cms/files/?id=" + fileGUID;
+            string pathBase = HttpHelper.HttpContext?.Request.PathBase ?? String.Empty;
+            return pathBase + @"/CMS/Files?id=" + fileGUID;
         }
         #endregion
 
diff --git a/web/Areas/CMS/Services/CmsFileStorageService.cs b/web/Areas/CMS/Services/CmsFileStorageService.cs
index f2575e611..28a07c923 100644
--- a/web/Areas/CMS/Services/CmsFileStorageService.cs
+++ b/web/Areas/CMS/Services/CmsFileStorageService.cs
@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using Viper.Areas.CMS.Constants;
 using Viper.Classes.SQLContext;
 
@@ -10,6 +11,13 @@ public interface ICmsFileStorageService
         /// <summary>Top-level folders ("VIPER apps") that files can be stored under.</summary>
         List<string> GetTopLevelFolders();
 
+        /// <summary>
+        /// Top-level folders for FILTERING: the upload allow-list (disk) unioned with
+        /// folders that only exist on file records (e.g. created on another environment's
+        /// disk). Not valid as upload destinations.
+        /// </summary>
+        Task<List<string>> GetFilterFoldersAsync(CancellationToken ct = default);
+
         /// <summary>
         /// Validate a user-supplied folder (may contain subfolders, e.g. "cats\photos").
         /// The first segment must be an existing top-level folder and the resolved path
@@ -69,6 +77,18 @@ public List<string> GetTopLevelFolders()
                 .ToList();
         }
 
+        public async Task<List<string>> GetFilterFoldersAsync(CancellationToken ct = default)
+        {
+            var dbFolders = await _context.Files.Select(f => f.Folder).Distinct().ToListAsync(ct);
+            var topLevel = dbFolders
+                .Where(f => !string.IsNullOrWhiteSpace(f))
+                .Select(f => f!.Split(new[] { '\\', '/' })[0]);
+            return GetTopLevelFolders()
+                .Union(topLevel, StringComparer.OrdinalIgnoreCase)
+                .OrderBy(f => f, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
         public bool IsValidFolder(string folder)
         {
             if (string.IsNullOrWhiteSpace(folder))

From f617f77746336f45cd41da3bcfd32f68577bc117 Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 12:29:53 -0700
Subject: [PATCH 4/7] VPR-59 fix(cms): remove copy-link button from file
 actions

---
 VueApp/src/CMS/pages/Files.vue | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index b0958263f..7d41cdc33 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -192,18 +192,6 @@
                         entity-name="file"
                         @click="openEditDialog(cellProps.row)"
                     />
-                    <q-btn
-                        dense
-                        flat
-                        no-caps
-                        size="sm"
-                        color="secondary"
-                        icon="content_copy"
-                        aria-label="Copy link"
-                        @click="copyUrl(cellProps.row)"
-                    >
-                        <q-tooltip>Copy link</q-tooltip>
-                    </q-btn>
                     <DeleteRestoreButtons
                         :deleted="!!cellProps.row.deletedOn"
                         entity-name="file"
@@ -370,15 +358,6 @@ function openEditDialog(file: CmsFile) {
     showDialog.value = true
 }
 
-async function copyUrl(file: CmsFile) {
-    try {
-        await navigator.clipboard.writeText(file.friendlyUrl)
-        $q.notify({ type: "positive", message: "Link copied" })
-    } catch {
-        $q.notify({ type: "negative", message: "Failed to copy link" })
-    }
-}
-
 async function deleteFile(file: CmsFile) {
     const confirmed = await confirmAction(
         "Delete File",

From ed4ff58759139e8913eab34545d34c3158f21e2c Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 12:32:43 -0700
Subject: [PATCH 5/7] VPR-59 fix(cms): point Old URL links at the VIPER 1 host

Matches the legacy UI and exercises the real resolution chain old links
take (VIPER 1 404 handler -> oldURL lookup) instead of calling the CMS
handler lookup directly.
---
 VueApp/src/CMS/pages/Files.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index 7d41cdc33..1fe120d13 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -262,9 +262,12 @@ function syncFiltersToUrl() {
     })
 }
 
-// The download handler is an MVC route, so the SPA base must be prepended.
+// The old URL is the file's original VIPER 1 webroot path, kept so links
+// that predate the import still resolve (via the 404 -> missingFile -> CMS
+// lookup chain). Link it on the VIPER 1 host, matching the legacy UI, so
+// clicking exercises the same path end users' old links take.
 function oldUrlHref(oldUrl: string): string {
-    return `${import.meta.env.VITE_VIPER_HOME}CMS/Files?oldURL=${encodeURIComponent(oldUrl)}`
+    return import.meta.env.VITE_VIPER_1_HOME + oldUrl.replace(/^\//, "")
 }
 
 const statusOptions = [

From 4e747d1ae6e7c74993e72edddc5f64cf2fa9ce08 Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 20:33:39 -0700
Subject: [PATCH 6/7] VPR-59 feat(cms): resolve upload name conflicts and
 preview imports

- Replace the MakeUnique flag with a check-name endpoint plus explicit
  FileName/Overwrite request fields, so an upload detects a name
  conflict up front and prompts to rename or overwrite
- Add an import dry-run preview that reports the resulting names and
  any auto-renames without moving files, sharing path validation with
  the real import so it can't promise what import would reject
- Reconcile the on-disk file back to its pre-save state when a metadata
  save fails across create, update, import, and bulk-encrypt
- Require a replacement upload to keep the original file's extension so
  a stored .pdf can't end up holding .png bytes
- Add per-folder file counts for the filter dropdowns, and extract
  shared BreadcrumbHeading and StatusIcon components
---
 VueApp/src/CMS/components/FileFormDialog.vue  | 171 ++++++++-
 VueApp/src/CMS/components/StatusIcon.vue      |  18 +
 VueApp/src/CMS/pages/BulkEncrypt.vue          |  46 +--
 VueApp/src/CMS/pages/CmsHome.vue              |   2 +-
 VueApp/src/CMS/pages/ContentBlocks.vue        |  29 +-
 VueApp/src/CMS/pages/FileAuditLog.vue         | 122 +++++--
 VueApp/src/CMS/pages/Files.vue                | 112 ++++--
 VueApp/src/CMS/pages/ImportFiles.vue          | 271 ++++++++++----
 VueApp/src/components/BreadcrumbHeading.vue   |  19 +
 VueApp/src/styles/base.css                    |  10 +
 test/CMS/CmsFileImportServiceTests.cs         | 257 ++++++++++++-
 test/CMS/CmsFileServiceTests.cs               | 341 +++++++++++++++++-
 web/Areas/CMS/Constants/CmsFileNaming.cs      |  14 +
 .../CMS/Controllers/CMSFilesController.cs     |  49 +++
 web/Areas/CMS/Models/DTOs/CmsFileDto.cs       |  22 ++
 .../CMS/Models/DTOs/CmsFileImportDtos.cs      |  21 ++
 web/Areas/CMS/Models/DTOs/CmsFileRequests.cs  |  11 +-
 .../CMS/Services/CmsFileImportService.cs      | 176 +++++++--
 web/Areas/CMS/Services/CmsFileService.cs      | 197 +++++++++-
 .../CMS/Services/CmsFileStorageService.cs     |  22 +-
 20 files changed, 1652 insertions(+), 258 deletions(-)
 create mode 100644 VueApp/src/CMS/components/StatusIcon.vue
 create mode 100644 VueApp/src/components/BreadcrumbHeading.vue
 create mode 100644 web/Areas/CMS/Constants/CmsFileNaming.cs

diff --git a/VueApp/src/CMS/components/FileFormDialog.vue b/VueApp/src/CMS/components/FileFormDialog.vue
index adaa42864..9f53f3e28 100644
--- a/VueApp/src/CMS/components/FileFormDialog.vue
+++ b/VueApp/src/CMS/components/FileFormDialog.vue
@@ -121,11 +121,6 @@
                             v-model="form.encrypt"
                             label="Encrypt file"
                         />
-                        <q-checkbox
-                            v-if="!isEdit"
-                            v-model="form.makeUnique"
-                            label="Rename automatically if name exists"
-                        />
                     </div>
                 </q-card-section>
 
@@ -148,6 +143,63 @@
                     />
                 </q-card-actions>
             </q-form>
+
+            <q-dialog
+                v-model="showConflict"
+                persistent
+                aria-labelledby="conflict-dialog-title"
+            >
+                <q-card style="width: 480px; max-width: 95vw">
+                    <q-card-section class="row items-center q-pb-none">
+                        <div
+                            id="conflict-dialog-title"
+                            class="text-h6"
+                        >
+                            File name already exists
+                        </div>
+                        <q-space />
+                        <q-btn
+                            icon="close"
+                            flat
+                            round
+                            dense
+                            aria-label="Close dialog"
+                            @click="showConflict = false"
+                        />
+                    </q-card-section>
+                    <q-card-section>
+                        <p class="text-body2">
+                            <strong>{{ form.upload?.name }}</strong> already exists in <strong>{{ form.folder }}</strong
+                            >{{ conflictDetail }}. Choose how to continue:
+                        </p>
+                        <q-option-group
+                            v-model="conflictChoice"
+                            :options="conflictOptions"
+                        />
+                        <q-input
+                            v-if="conflictChoice === 'rename'"
+                            v-model="renameTo"
+                            dense
+                            outlined
+                            label="New file name"
+                            class="q-mt-sm"
+                            :rules="[(v: string) => !!v?.trim() || 'Enter a file name']"
+                            hide-bottom-space
+                        />
+                    </q-card-section>
+                    <q-card-actions align="right">
+                        <q-btn
+                            color="primary"
+                            dense
+                            no-caps
+                            class="q-pr-md"
+                            :label="conflictChoice === 'rename' ? 'Upload with new name' : 'Overwrite'"
+                            :loading="saving"
+                            @click="resolveConflict"
+                        />
+                    </q-card-actions>
+                </q-card>
+            </q-dialog>
         </q-card>
     </q-dialog>
 </template>
@@ -173,6 +225,7 @@ const emit = defineEmits<{
 
 const apiURL = inject("apiURL") + "cms/files/"
 const $q = useQuasar()
+const { get, postForm, putForm, createUrlSearchParams } = useFetch()
 
 const acceptedExtensions =
     ".pdf,.docx,.doc,.xls,.xlsx,.csv,.ppt,.pptx,.pptm,.txt,.html,.gif,.png,.jpg,.jpeg,.tiff,.mp3,.wav,.mp4,.webm,.oft,.eps,.zip,.7z,.dmg,.exe"
@@ -188,11 +241,18 @@ type FileForm = {
     oldUrl: string
     allowPublicAccess: boolean
     encrypt: boolean
-    makeUnique: boolean
     permissions: string[]
     people: CmsFilePerson[]
 }
 
+type NameCheck = {
+    inUse: boolean
+    suggestedName: string
+    existingFileGuid: string | null
+    existingFriendlyName: string | null
+    existingDeleted: boolean
+}
+
 const emptyForm = (): FileForm => ({
     upload: null,
     folder: null,
@@ -200,13 +260,32 @@ const emptyForm = (): FileForm => ({
     oldUrl: "",
     allowPublicAccess: false,
     encrypt: false,
-    makeUnique: false,
     permissions: [],
     people: [],
 })
 
 const form = ref<FileForm>(emptyForm())
 
+const conflict = ref<NameCheck | null>(null)
+const showConflict = ref(false)
+const conflictChoice = ref<"rename" | "overwrite">("rename")
+const renameTo = ref("")
+
+const conflictOptions = computed(() => [
+    { label: "Upload with a new name", value: "rename" },
+    {
+        label: conflict.value?.existingFileGuid
+            ? "Overwrite the existing file (replaces its content and details)"
+            : "Overwrite the existing file on disk",
+        value: "overwrite",
+    },
+])
+
+const conflictDetail = computed(() => {
+    if (!conflict.value?.existingFriendlyName) return ""
+    return ` (${conflict.value.existingFriendlyName}${conflict.value.existingDeleted ? ", deleted" : ""})`
+})
+
 watch(
     () => [props.modelValue, props.file] as const,
     ([open]) => {
@@ -219,7 +298,6 @@ watch(
                 oldUrl: props.file.oldUrl ?? "",
                 allowPublicAccess: props.file.allowPublicAccess,
                 encrypt: props.file.encrypted,
-                makeUnique: false,
                 permissions: [...props.file.permissions],
                 people: props.file.people.map((p) => ({ ...p })),
             }
@@ -231,6 +309,8 @@ watch(
 
 function resetForm() {
     form.value = emptyForm()
+    conflict.value = null
+    showConflict.value = false
     formRef.value?.resetValidation()
 }
 
@@ -244,14 +324,25 @@ async function copyUrl() {
     }
 }
 
-function buildFormData(): FormData {
+type SubmitOptions = {
+    fileName?: string
+    overwrite?: boolean
+    overwriteGuid?: string
+}
+
+function buildFormData(opts: SubmitOptions = {}): FormData {
     const data = new FormData()
     if (form.value.upload) {
         data.append("file", form.value.upload)
     }
-    if (!isEdit.value) {
+    if (!isEdit.value && !opts.overwriteGuid) {
         data.append("folder", form.value.folder ?? "")
-        data.append("makeUnique", form.value.makeUnique.toString())
+        if (opts.fileName) {
+            data.append("fileName", opts.fileName)
+        }
+        if (opts.overwrite) {
+            data.append("overwrite", "true")
+        }
     }
     data.append("description", form.value.description)
     data.append("oldUrl", form.value.oldUrl)
@@ -267,14 +358,55 @@ function buildFormData(): FormData {
 }
 
 async function save() {
+    if (saving.value) return
     const valid = await formRef.value?.validate()
     if (!valid) return
 
+    // New uploads check the destination name first; a conflict prompts for rename/overwrite.
+    if (!isEdit.value && form.value.upload && form.value.folder) {
+        saving.value = true
+        const params = createUrlSearchParams({ folder: form.value.folder, fileName: form.value.upload.name })
+        const check = await get(apiURL + "check-name?" + params)
+        saving.value = false
+        if (check.success && check.result.inUse) {
+            conflict.value = check.result
+            conflictChoice.value = "rename"
+            renameTo.value = check.result.suggestedName
+            showConflict.value = true
+            return
+        }
+    }
+    await submitSave()
+}
+
+async function resolveConflict() {
+    if (saving.value) return
+    // Keep the conflict dialog open until the upload succeeds, so its buttons show the
+    // loading state and a failure leaves the user here instead of stranded on the form.
+    if (conflictChoice.value === "rename") {
+        const name = renameTo.value.trim()
+        if (!name) return
+        if (await submitSave({ fileName: name })) showConflict.value = false
+        return
+    }
+    const opts: SubmitOptions = conflict.value?.existingFileGuid
+        ? { overwriteGuid: conflict.value.existingFileGuid }
+        : { overwrite: true }
+    if (await submitSave(opts)) showConflict.value = false
+}
+
+async function submitSave(opts: SubmitOptions = {}): Promise<boolean> {
+    if (saving.value) return false
     saving.value = true
-    const { postForm, putForm } = useFetch()
-    const res = isEdit.value
-        ? await putForm(apiURL + props.file!.fileGuid, buildFormData())
-        : await postForm(apiURL, buildFormData())
+    let res
+    if (isEdit.value) {
+        res = await putForm(apiURL + props.file!.fileGuid, buildFormData())
+    } else if (opts.overwriteGuid) {
+        // Overwriting a managed file replaces the existing record's content and details.
+        res = await putForm(apiURL + opts.overwriteGuid, buildFormData(opts))
+    } else {
+        res = await postForm(apiURL, buildFormData(opts))
+    }
     saving.value = false
 
     if (!res.success) {
@@ -282,11 +414,16 @@ async function save() {
             type: "negative",
             message: res.errors?.[0] ?? `Failed to ${isEdit.value ? "save" : "upload"} file`,
         })
-        return
+        return false
     }
 
-    $q.notify({ type: "positive", message: isEdit.value ? "File updated" : "File uploaded" })
+    const overwrote = opts.overwrite || opts.overwriteGuid
+    $q.notify({
+        type: "positive",
+        message: isEdit.value ? "File updated" : overwrote ? "File overwritten" : "File uploaded",
+    })
     emit("saved", res.result)
     emit("update:modelValue", false)
+    return true
 }
 </script>
diff --git a/VueApp/src/CMS/components/StatusIcon.vue b/VueApp/src/CMS/components/StatusIcon.vue
new file mode 100644
index 000000000..6237c192a
--- /dev/null
+++ b/VueApp/src/CMS/components/StatusIcon.vue
@@ -0,0 +1,18 @@
+<template>
+    <q-icon
+        :name="icon"
+        :color="color"
+    >
+        <q-tooltip>{{ label }}</q-tooltip>
+    </q-icon>
+    <span class="sr-only">{{ label }}</span>
+</template>
+
+<script setup lang="ts">
+// Row-status icon: tooltip for sighted users, sr-only text for screen readers.
+defineProps<{
+    icon: string
+    color: string
+    label: string
+}>()
+</script>
diff --git a/VueApp/src/CMS/pages/BulkEncrypt.vue b/VueApp/src/CMS/pages/BulkEncrypt.vue
index 603ac04a2..5e339061d 100644
--- a/VueApp/src/CMS/pages/BulkEncrypt.vue
+++ b/VueApp/src/CMS/pages/BulkEncrypt.vue
@@ -1,18 +1,10 @@
 <template>
     <div class="q-pa-md">
-        <div class="row items-center q-mb-md">
-            <h1 class="q-my-none">Bulk Encrypt Files</h1>
-            <q-space />
-            <q-btn
-                flat
-                dense
-                no-caps
-                color="primary"
-                icon="arrow_back"
-                label="Back to Files"
-                :to="{ name: 'CmsFiles' }"
-            />
-        </div>
+        <BreadcrumbHeading
+            label="Bulk Encrypt"
+            parent-label="Manage Files"
+            :parent-to="{ name: 'CmsFiles' }"
+        />
 
         <p class="text-body2 text-grey-8">
             Lists active files that are not encrypted. Select files and encrypt them in place; downloads decrypt
@@ -25,9 +17,10 @@
                     v-model="filters.folder"
                     dense
                     options-dense
-                    clearable
+                    emit-value
+                    map-options
                     label="VIPER app"
-                    :options="folders"
+                    :options="folderOptions"
                     @update:model-value="reload"
                 />
             </div>
@@ -125,6 +118,7 @@ import { inject, onMounted, ref } from "vue"
 import { inflect } from "inflection"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
+import BreadcrumbHeading from "@/components/BreadcrumbHeading.vue"
 import ModifiedStamp from "@/CMS/components/ModifiedStamp.vue"
 import type { CmsFile } from "@/CMS/types/"
 
@@ -139,15 +133,19 @@ const apiURL = inject("apiURL") + "cms/files/"
 const $q = useQuasar()
 const { get, post, createUrlSearchParams } = useFetch()
 
+type FolderOption = { label: string; value: string }
+
+const ALL_FOLDERS = "All"
+
 const files = ref<CmsFile[]>([])
-const folders = ref<string[]>([])
+const folderOptions = ref<FolderOption[]>([{ label: ALL_FOLDERS, value: ALL_FOLDERS }])
 const selected = ref<CmsFile[]>([])
 const results = ref<BulkEncryptResult[]>([])
 const loading = ref(false)
 const encrypting = ref(false)
 
 const filters = ref({
-    folder: null as string | null,
+    folder: ALL_FOLDERS,
     search: "",
 })
 
@@ -177,7 +175,7 @@ async function onRequest(requestProps: { pagination: TableRequestPagination }) {
     const { page, rowsPerPage, sortBy, descending } = requestProps.pagination
     loading.value = true
     const params = createUrlSearchParams({
-        folder: filters.value.folder,
+        folder: filters.value.folder !== ALL_FOLDERS ? filters.value.folder : null,
         status: "active",
         encrypted: "false",
         search: filters.value.search || null,
@@ -206,9 +204,14 @@ function reload() {
 }
 
 async function loadFolders() {
-    // Union of disk + record-only folders; this filters records, not uploads.
-    const res = await get(apiURL + "folders?includeData=true")
-    folders.value = res.success ? res.result : []
+    // Counts match what this page lists: active, unencrypted files per VIPER app.
+    const res = await get(apiURL + "folder-counts?status=active&encrypted=false")
+    const counts: { folder: string; count: number }[] = res.success ? res.result : []
+    const total = counts.reduce((sum, c) => sum + c.count, 0)
+    folderOptions.value = [
+        { label: `${ALL_FOLDERS} (${total})`, value: ALL_FOLDERS },
+        ...counts.map((c) => ({ label: `${c.folder} (${c.count})`, value: c.folder })),
+    ]
 }
 
 async function encryptSelected() {
@@ -244,6 +247,7 @@ async function encryptSelected() {
         message: `${succeeded} of ${res.result.length} ${inflect("file", res.result.length)} encrypted`,
     })
     reload()
+    void loadFolders()
 }
 
 onMounted(() => {
diff --git a/VueApp/src/CMS/pages/CmsHome.vue b/VueApp/src/CMS/pages/CmsHome.vue
index 1edd8f990..1eb9d2204 100644
--- a/VueApp/src/CMS/pages/CmsHome.vue
+++ b/VueApp/src/CMS/pages/CmsHome.vue
@@ -90,7 +90,7 @@ const sections: Section[] = [
         permissions: ["SVMSecure.CMS.AllFiles"],
         actions: [
             { label: "Manage Files", to: { name: "CmsFiles" } },
-            { label: "Audit Log", to: { name: "CmsFileAudit" } },
+            { label: "Audit Trail", to: { name: "CmsFileAudit" } },
         ],
     },
     {
diff --git a/VueApp/src/CMS/pages/ContentBlocks.vue b/VueApp/src/CMS/pages/ContentBlocks.vue
index 2d19d0e83..67317307b 100644
--- a/VueApp/src/CMS/pages/ContentBlocks.vue
+++ b/VueApp/src/CMS/pages/ContentBlocks.vue
@@ -84,30 +84,18 @@
                         >
                             {{ cellProps.row.title || "(untitled)" }}
                         </router-link>
-                        <q-icon
+                        <StatusIcon
                             v-if="cellProps.row.allowPublicAccess"
-                            name="public"
+                            icon="public"
                             color="positive"
-                        >
-                            <q-tooltip>Public access</q-tooltip>
-                        </q-icon>
-                        <span
-                            v-if="cellProps.row.allowPublicAccess"
-                            class="sr-only"
-                            >Public access</span
-                        >
-                        <q-icon
+                            label="Public access"
+                        />
+                        <StatusIcon
                             v-if="cellProps.row.deletedOn"
-                            name="delete_outline"
+                            icon="delete_outline"
                             color="negative"
-                        >
-                            <q-tooltip>Deleted</q-tooltip>
-                        </q-icon>
-                        <span
-                            v-if="cellProps.row.deletedOn"
-                            class="sr-only"
-                            >Deleted</span
-                        >
+                            label="Deleted"
+                        />
                     </div>
                     <div class="text-caption text-grey-7">{{ cellProps.row.friendlyName }}</div>
                 </q-td>
@@ -149,6 +137,7 @@ import DeleteRestoreButtons from "@/CMS/components/DeleteRestoreButtons.vue"
 import EditButton from "@/CMS/components/EditButton.vue"
 import ModifiedStamp from "@/CMS/components/ModifiedStamp.vue"
 import PermissionChips from "@/CMS/components/PermissionChips.vue"
+import StatusIcon from "@/CMS/components/StatusIcon.vue"
 import type { CmsContentBlock } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "CMS/content"
diff --git a/VueApp/src/CMS/pages/FileAuditLog.vue b/VueApp/src/CMS/pages/FileAuditLog.vue
index d055d6aef..65bfbbf03 100644
--- a/VueApp/src/CMS/pages/FileAuditLog.vue
+++ b/VueApp/src/CMS/pages/FileAuditLog.vue
@@ -1,18 +1,10 @@
 <template>
     <div class="q-pa-md">
-        <div class="row items-center q-mb-md">
-            <h1 class="q-my-none">File Audit Log</h1>
-            <q-space />
-            <q-btn
-                flat
-                dense
-                no-caps
-                color="primary"
-                icon="arrow_back"
-                label="Back to Files"
-                :to="{ name: 'CmsFiles' }"
-            />
-        </div>
+        <BreadcrumbHeading
+            label="Audit Trail"
+            parent-label="Manage Files"
+            :parent-to="{ name: 'CmsFiles' }"
+        />
 
         <div class="row q-col-gutter-md q-mb-sm">
             <div class="col-12 col-sm-3 col-lg-2">
@@ -103,7 +95,14 @@
         >
             <template #body-cell-timestamp="cellProps">
                 <q-td :props="cellProps">
-                    {{ formatDateTime(cellProps.row.timestamp) }}
+                    {{ formatDateTime(cellProps.row.timestamp, { dateStyle: "short", timeStyle: "short" }) }}
+                </q-td>
+            </template>
+            <template #body-cell-action="cellProps">
+                <q-td :props="cellProps">
+                    <StatusBadge :color="getActionColor(cellProps.row.action)">
+                        {{ cellProps.row.action }}
+                    </StatusBadge>
                 </q-td>
             </template>
             <template #body-cell-filePath="cellProps">
@@ -119,10 +118,13 @@
 </template>
 
 <script setup lang="ts">
-import { inject, onMounted, ref } from "vue"
+import { inject, onMounted, ref, watch } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
+import { useDateFunctions } from "@/composables/DateFunctions"
+import BreadcrumbHeading from "@/components/BreadcrumbHeading.vue"
+import StatusBadge from "@/components/StatusBadge.vue"
 import type { CmsFileAudit } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "cms/files/audit"
@@ -130,19 +132,35 @@ const $q = useQuasar()
 const route = useRoute()
 const router = useRouter()
 const { get, createUrlSearchParams } = useFetch()
+const { formatDateTime } = useDateFunctions()
 
 const entries = ref<CmsFileAudit[]>([])
 const loading = ref(false)
 const fileGuid = ref<string | null>((route.query.fileGuid as string) || null)
 
+// Filters initialize from the URL so filtered views can be shared/deep-linked.
 const filters = ref({
-    action: null as string | null,
-    loginId: "",
-    from: "",
-    to: "",
-    search: "",
+    action: typeof route.query.action === "string" ? route.query.action : null,
+    loginId: typeof route.query.loginId === "string" ? route.query.loginId : "",
+    from: typeof route.query.from === "string" ? route.query.from : "",
+    to: typeof route.query.to === "string" ? route.query.to : "",
+    search: typeof route.query.search === "string" ? route.query.search : "",
 })
 
+// Reflect the active filters back into the URL (empty values are omitted).
+function syncFiltersToUrl() {
+    void router.replace({
+        query: {
+            fileGuid: fileGuid.value || undefined,
+            action: filters.value.action || undefined,
+            loginId: filters.value.loginId || undefined,
+            from: filters.value.from || undefined,
+            to: filters.value.to || undefined,
+            search: filters.value.search || undefined,
+        },
+    })
+}
+
 const actionOptions = [
     "AccessFile",
     "AccessFileDenied",
@@ -162,14 +180,28 @@ const pagination = ref({
     rowsNumber: 0,
 })
 
+// Column order mirrors the Effort audit trail: date, who, what was affected,
+// then the action badge and its detail.
 const columns: QTableProps["columns"] = [
-    { name: "timestamp", label: "When", field: "timestamp", align: "left" },
-    { name: "loginid", label: "User", field: "loginid", align: "left" },
+    { name: "timestamp", label: "Date", field: "timestamp", align: "left" },
+    { name: "loginid", label: "Modified By", field: "loginid", align: "left" },
+    { name: "filePath", label: "File", field: "filePath", align: "left" },
     { name: "action", label: "Action", field: "action", align: "left" },
     { name: "detail", label: "Detail", field: "detail", align: "left" },
-    { name: "filePath", label: "File", field: "filePath", align: "left" },
 ]
 
+// Same palette logic as the Effort audit trail (AuditList.getActionColor):
+// create-like is green, edits blue, deletes red, restores teal, imports cyan.
+function getActionColor(action: string): string {
+    if (action === "AccessFileDenied") return "warning"
+    if (action.startsWith("Add") || action.startsWith("Upload")) return "positive"
+    if (action.startsWith("Edit")) return "primary"
+    if (action.startsWith("Delete")) return "negative"
+    if (action.startsWith("CancelDelete")) return "secondary"
+    if (action.startsWith("Import")) return "info"
+    return "grey-8"
+}
+
 type TableRequestPagination = {
     sortBy: string
     descending: boolean
@@ -198,31 +230,51 @@ async function onRequest(requestProps: { pagination: TableRequestPagination }) {
         pagination.value.page = page
         pagination.value.rowsPerPage = rowsPerPage
     } else {
-        $q.notify({ type: "negative", message: res.errors?.[0] ?? "Failed to load audit log" })
+        $q.notify({ type: "negative", message: res.errors?.[0] ?? "Failed to load audit trail" })
     }
     loading.value = false
 }
 
 function reload() {
+    syncFiltersToUrl()
     void onRequest({ pagination: { ...pagination.value, page: 1 } })
 }
 
 function clearFileFilter() {
     fileGuid.value = null
-    void router.replace({ query: {} })
     reload()
 }
 
-function formatDateTime(value: string | null): string {
-    if (!value) return ""
-    return new Date(value).toLocaleString("en-US", {
-        year: "2-digit",
-        month: "2-digit",
-        day: "2-digit",
-        hour: "numeric",
-        minute: "2-digit",
-    })
-}
+// Re-sync filters from the URL when in-app navigation reuses this view with a different
+// query (e.g. re-clicking the left-nav link, or a per-file ?fileGuid deep-link). The
+// equality guard skips our own syncFiltersToUrl write so it doesn't double-fetch.
+watch(
+    () => route.query,
+    (query) => {
+        const nextGuid = typeof query.fileGuid === "string" ? query.fileGuid : null
+        const next = {
+            action: typeof query.action === "string" ? query.action : null,
+            loginId: typeof query.loginId === "string" ? query.loginId : "",
+            from: typeof query.from === "string" ? query.from : "",
+            to: typeof query.to === "string" ? query.to : "",
+            search: typeof query.search === "string" ? query.search : "",
+        }
+        const f = filters.value
+        if (
+            nextGuid === fileGuid.value &&
+            next.action === f.action &&
+            next.loginId === f.loginId &&
+            next.from === f.from &&
+            next.to === f.to &&
+            next.search === f.search
+        ) {
+            return
+        }
+        fileGuid.value = nextGuid
+        filters.value = next
+        void onRequest({ pagination: { ...pagination.value, page: 1 } })
+    },
+)
 
 onMounted(reload)
 </script>
diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index 1fe120d13..c708879f6 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -46,6 +46,8 @@
                     v-model="filters.folder"
                     dense
                     options-dense
+                    emit-value
+                    map-options
                     label="VIPER app"
                     :options="filterFolders"
                     @update:model-value="reload"
@@ -118,42 +120,24 @@
                             {{ cellProps.row.friendlyName }}
                             <span class="sr-only">(opens in new window)</span>
                         </a>
-                        <q-icon
+                        <StatusIcon
                             v-if="cellProps.row.encrypted"
-                            name="lock"
+                            icon="lock"
                             color="warning"
-                        >
-                            <q-tooltip>Encrypted</q-tooltip>
-                        </q-icon>
-                        <span
-                            v-if="cellProps.row.encrypted"
-                            class="sr-only"
-                            >Encrypted</span
-                        >
-                        <q-icon
+                            label="Encrypted"
+                        />
+                        <StatusIcon
                             v-if="cellProps.row.allowPublicAccess"
-                            name="public"
+                            icon="public"
                             color="positive"
-                        >
-                            <q-tooltip>Public access</q-tooltip>
-                        </q-icon>
-                        <span
-                            v-if="cellProps.row.allowPublicAccess"
-                            class="sr-only"
-                            >Public access</span
-                        >
-                        <q-icon
+                            label="Public access"
+                        />
+                        <StatusIcon
                             v-if="cellProps.row.deletedOn"
-                            name="delete_outline"
+                            icon="delete_outline"
                             color="negative"
-                        >
-                            <q-tooltip>Deleted {{ formatDate(cellProps.row.deletedOn) }}</q-tooltip>
-                        </q-icon>
-                        <span
-                            v-if="cellProps.row.deletedOn"
-                            class="sr-only"
-                            >Deleted {{ formatDate(cellProps.row.deletedOn) }}</span
-                        >
+                            :label="`Deleted ${formatDate(cellProps.row.deletedOn)}`"
+                        />
                     </div>
                 </q-td>
             </template>
@@ -221,6 +205,7 @@ import DeleteRestoreButtons from "@/CMS/components/DeleteRestoreButtons.vue"
 import EditButton from "@/CMS/components/EditButton.vue"
 import ModifiedStamp from "@/CMS/components/ModifiedStamp.vue"
 import PermissionChips from "@/CMS/components/PermissionChips.vue"
+import StatusIcon from "@/CMS/components/StatusIcon.vue"
 import type { CmsFile } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "cms/files/"
@@ -233,7 +218,9 @@ const ALL_FOLDERS = "All"
 
 const files = ref<CmsFile[]>([])
 const folders = ref<string[]>([])
-const filterFolders = ref<string[]>([ALL_FOLDERS])
+type FolderOption = { label: string; value: string }
+
+const filterFolders = ref<FolderOption[]>([{ label: ALL_FOLDERS, value: ALL_FOLDERS }])
 const loading = ref(false)
 const showDialog = ref(false)
 const editingFile = ref<CmsFile | null>(null)
@@ -277,7 +264,7 @@ const statusOptions = [
 ]
 
 const fileTools = [
-    { label: "Audit Log", icon: "history", to: { name: "CmsFileAudit" } },
+    { label: "Audit Trail", icon: "history", to: { name: "CmsFileAudit" } },
     { label: "Import Files", icon: "drive_file_move", to: { name: "CmsFileImport" } },
     { label: "Bulk Encrypt", icon: "lock", to: { name: "CmsBulkEncrypt" } },
 ]
@@ -300,14 +287,32 @@ const columns: QTableProps["columns"] = [
 ]
 
 async function loadFolders() {
-    // Upload destinations (disk allow-list) and filter options (union with
-    // folders that only exist on file records) are different lists.
-    const [destinations, filterable] = await Promise.all([
-        get(apiURL + "folders"),
+    // Upload destinations are the disk allow-list; the filter dropdown is built
+    // separately (loadFolderOptions) from record folders plus per-folder counts.
+    const destinations = await get(apiURL + "folders")
+    folders.value = destinations.success ? destinations.result : []
+}
+
+async function loadFolderOptions() {
+    // Counts reflect the status/encrypted/public filters so they match the list;
+    // search is intentionally excluded (the dropdown is a folder inventory).
+    const countParams = createUrlSearchParams({
+        status: filters.value.status,
+        encrypted: filters.value.encryptedOnly ? "true" : null,
+        isPublic: filters.value.publicOnly ? "true" : null,
+    })
+    const [filterable, countsRes] = await Promise.all([
         get(apiURL + "folders?includeData=true"),
+        get(apiURL + "folder-counts?" + countParams),
     ])
-    folders.value = destinations.success ? destinations.result : []
-    filterFolders.value = [ALL_FOLDERS, ...(filterable.success ? filterable.result : [])]
+    const counts: { folder: string; count: number }[] = countsRes.success ? countsRes.result : []
+    const countByFolder = new Map(counts.map((c) => [c.folder.toLowerCase(), c.count]))
+    const names: string[] = filterable.success ? filterable.result : []
+    const total = counts.reduce((sum, c) => sum + c.count, 0)
+    filterFolders.value = [
+        { label: `${ALL_FOLDERS} (${total})`, value: ALL_FOLDERS },
+        ...names.map((n) => ({ label: `${n} (${countByFolder.get(n.toLowerCase()) ?? 0})`, value: n })),
+    ]
 }
 
 type TableRequestPagination = {
@@ -348,6 +353,7 @@ async function onRequest(requestProps: { pagination: TableRequestPagination }) {
 
 function reload() {
     syncFiltersToUrl()
+    void loadFolderOptions()
     void onRequest({ pagination: { ...pagination.value, page: 1 } })
 }
 
@@ -408,6 +414,36 @@ function formatDate(value: string | null): string {
     return new Date(value).toLocaleDateString("en-US", { year: "2-digit", month: "2-digit", day: "2-digit" })
 }
 
+// When in-app navigation reuses this view with a different query (e.g. re-clicking the
+// left-nav "Manage Files" link while a filter is active, or a hub deep-link), the component
+// instance is kept, so re-sync the filters from the URL. The equality guard skips our own
+// syncFiltersToUrl write, which would otherwise trigger a redundant second fetch.
+watch(
+    () => route.query,
+    (query) => {
+        const next = {
+            folder: typeof query.folder === "string" ? query.folder : ALL_FOLDERS,
+            status: typeof query.status === "string" ? query.status : "active",
+            search: typeof query.search === "string" ? query.search : "",
+            encryptedOnly: query.encrypted === "1",
+            publicOnly: query.public === "1",
+        }
+        const f = filters.value
+        if (
+            next.folder === f.folder &&
+            next.status === f.status &&
+            next.search === f.search &&
+            next.encryptedOnly === f.encryptedOnly &&
+            next.publicOnly === f.publicOnly
+        ) {
+            return
+        }
+        filters.value = next
+        void loadFolderOptions()
+        void onRequest({ pagination: { ...pagination.value, page: 1 } })
+    },
+)
+
 // The "Upload File" left-nav link targets ?upload=1; consume the flag so
 // re-clicking the link re-opens the dialog after it has been closed.
 // Strip the query BEFORE opening: route-focus moves focus to <main> after
diff --git a/VueApp/src/CMS/pages/ImportFiles.vue b/VueApp/src/CMS/pages/ImportFiles.vue
index 52ad5e955..890ee04aa 100644
--- a/VueApp/src/CMS/pages/ImportFiles.vue
+++ b/VueApp/src/CMS/pages/ImportFiles.vue
@@ -1,18 +1,10 @@
 <template>
     <div class="q-pa-md">
-        <div class="row items-center q-mb-md">
-            <h1 class="q-my-none">Import Files from VIPER</h1>
-            <q-space />
-            <q-btn
-                flat
-                dense
-                no-caps
-                color="primary"
-                icon="arrow_back"
-                label="Back to Files"
-                :to="{ name: 'CmsFiles' }"
-            />
-        </div>
+        <BreadcrumbHeading
+            label="Import from VIPER"
+            parent-label="Manage Files"
+            :parent-to="{ name: 'CmsFiles' }"
+        />
 
         <p class="text-body2 text-grey-8 intro-copy">
             Moves files out of the legacy VIPER webroot into the managed file store. The original path is saved as the
@@ -22,37 +14,37 @@
         </p>
 
         <q-form
+            v-if="!preview"
             greedy
-            @submit.prevent="runImport"
+            @submit.prevent="runPreview"
         >
-            <div class="row q-col-gutter-lg">
-                <div class="col-12 col-md-7">
-                    <q-input
-                        v-model="paths"
-                        outlined
-                        type="textarea"
-                        rows="12"
-                        label="File paths (one per line)"
-                        :rules="[(v: string | null) => (v && v.trim().length > 0) || 'Enter at least one path']"
-                        hide-bottom-space
-                    />
-                </div>
-                <div class="col-12 col-md-5">
-                    <q-select
-                        v-model="options.folder"
-                        dense
-                        options-dense
-                        outlined
-                        label="Destination folder"
-                        class="q-mb-sm"
-                        :options="folders"
-                        :rules="[(v: string | null) => !!v || 'Please select a folder']"
-                        hide-bottom-space
-                    />
-                    <PermissionSelector
-                        v-model="options.permissions"
-                        class="q-mb-sm"
-                    />
+            <div class="import-form">
+                <q-input
+                    v-model="paths"
+                    outlined
+                    type="textarea"
+                    rows="12"
+                    label="File paths (one per line)"
+                    class="q-mb-md"
+                    :rules="[(v: string | null) => (v && v.trim().length > 0) || 'Enter at least one path']"
+                    hide-bottom-space
+                />
+                <q-select
+                    v-model="options.folder"
+                    dense
+                    options-dense
+                    outlined
+                    label="Destination folder"
+                    class="q-mb-sm"
+                    :options="folders"
+                    :rules="[(v: string | null) => !!v || 'Please select a folder']"
+                    hide-bottom-space
+                />
+                <PermissionSelector
+                    v-model="options.permissions"
+                    class="q-mb-sm"
+                />
+                <div class="column items-start">
                     <q-toggle
                         v-model="options.useDefaultPermission"
                         label="Add default permission (SVMSecure.{folder})"
@@ -65,29 +57,99 @@
                         v-model="options.encrypt"
                         label="Encrypt files"
                     />
-                    <div class="q-mt-md">
-                        <q-btn
-                            type="submit"
-                            color="primary"
-                            label="Import Files"
-                            dense
-                            no-caps
-                            class="q-pr-md"
-                            :loading="importing"
-                        >
-                            <template #loading>
-                                <q-spinner
-                                    size="1em"
-                                    class="q-mr-sm"
-                                />
-                                Import Files
-                            </template>
-                        </q-btn>
-                    </div>
+                </div>
+                <div class="q-mt-md">
+                    <q-btn
+                        type="submit"
+                        color="primary"
+                        label="Preview Import"
+                        dense
+                        no-caps
+                        class="q-pr-md"
+                        :loading="previewing"
+                    >
+                        <template #loading>
+                            <q-spinner
+                                size="1em"
+                                class="q-mr-sm"
+                            />
+                            Preview Import
+                        </template>
+                    </q-btn>
                 </div>
             </div>
         </q-form>
 
+        <template v-else>
+            <h2 class="text-h6 text-primary q-mb-sm">Confirm Import</h2>
+            <p class="text-body2">
+                {{ importableCount }} of {{ preview.length }} {{ inflect("file", preview.length) }} will be imported
+                into <strong>{{ options.folder }}</strong
+                >. Nothing has been moved yet.
+            </p>
+            <ul class="text-body2 q-mt-none">
+                <li>
+                    Permissions:
+                    {{ effectivePermissions.length ? effectivePermissions.join(", ") : "none (any VIPER user)" }}
+                </li>
+                <li>Public access: {{ options.allowPublicAccess ? "yes" : "no" }}</li>
+                <li>Encrypt: {{ options.encrypt ? "yes" : "no" }}</li>
+            </ul>
+            <q-table
+                :rows="preview"
+                :columns="previewColumns"
+                row-key="filePath"
+                :pagination="{ rowsPerPage: 0 }"
+                hide-bottom
+                dense
+                flat
+                bordered
+            >
+                <template #body-cell-status="cellProps">
+                    <q-td :props="cellProps">
+                        <q-icon
+                            :name="previewStatus(cellProps.row).icon"
+                            :color="previewStatus(cellProps.row).color"
+                            size="sm"
+                        />
+                        <span class="sr-only">{{ previewStatus(cellProps.row).label }}</span>
+                    </q-td>
+                </template>
+                <template #body-cell-fileName="cellProps">
+                    <q-td :props="cellProps">
+                        <template v-if="cellProps.row.fileName">
+                            {{ cellProps.row.fileName }}
+                            <div
+                                v-if="cellProps.row.renamedFrom"
+                                class="text-caption text-warning"
+                            >
+                                renamed from {{ cellProps.row.renamedFrom }}
+                            </div>
+                        </template>
+                    </q-td>
+                </template>
+            </q-table>
+            <div class="q-mt-md q-gutter-sm">
+                <q-btn
+                    flat
+                    dense
+                    no-caps
+                    label="Back"
+                    @click="preview = null"
+                />
+                <q-btn
+                    color="primary"
+                    dense
+                    no-caps
+                    class="q-pr-md"
+                    :label="`Confirm and Import ${importableCount} ${inflect('file', importableCount)}`"
+                    :disable="importableCount === 0"
+                    :loading="importing"
+                    @click="runImport"
+                />
+            </div>
+        </template>
+
         <template v-if="results.length">
             <h2 class="text-h6 text-primary q-mb-sm q-mt-lg">Results</h2>
             <q-table
@@ -116,10 +178,11 @@
 </template>
 
 <script setup lang="ts">
-import { inject, onMounted, ref } from "vue"
+import { computed, inject, onMounted, ref } from "vue"
 import { inflect } from "inflection"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
+import BreadcrumbHeading from "@/components/BreadcrumbHeading.vue"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
 
 type ImportResult = {
@@ -130,6 +193,16 @@ type ImportResult = {
     friendlyName: string | null
 }
 
+type ImportPreview = {
+    filePath: string
+    canImport: boolean
+    message: string | null
+    fileName: string | null
+    renamedFrom: string | null
+    friendlyName: string | null
+    oldUrl: string | null
+}
+
 const apiURL = inject("apiURL") + "cms/files/"
 const $q = useQuasar()
 const { get, post } = useFetch()
@@ -137,6 +210,8 @@ const { get, post } = useFetch()
 const folders = ref<string[]>([])
 const paths = ref("")
 const importing = ref(false)
+const previewing = ref(false)
+const preview = ref<ImportPreview[] | null>(null)
 const results = ref<ImportResult[]>([])
 
 const options = ref({
@@ -154,33 +229,79 @@ const resultColumns: QTableProps["columns"] = [
     { name: "message", label: "Message", field: "message", align: "left" },
 ]
 
+const previewColumns: QTableProps["columns"] = [
+    { name: "status", label: "Result", field: "canImport", align: "center" },
+    { name: "filePath", label: "Path", field: "filePath", align: "left" },
+    { name: "fileName", label: "Will be imported as", field: "fileName", align: "left" },
+    { name: "message", label: "Note", field: "message", align: "left" },
+]
+
+const importableCount = computed(() => preview.value?.filter((p) => p.canImport).length ?? 0)
+
+function previewStatus(row: ImportPreview) {
+    if (!row.canImport) return { icon: "error", color: "negative", label: "Will be skipped" }
+    if (row.message) return { icon: "warning", color: "warning", label: "Ready" }
+    return { icon: "check_circle", color: "positive", label: "Ready" }
+}
+
+const effectivePermissions = computed(() => {
+    const perms = [...options.value.permissions]
+    if (options.value.useDefaultPermission && options.value.folder) {
+        perms.push("SVMSecure." + options.value.folder.split(/[\\/]/)[0])
+    }
+    // The default permission can duplicate one already chosen; the import dedupes
+    // server-side, so collapse it here too to avoid a doubled label in the summary.
+    return [...new Set(perms)]
+})
+
 async function loadFolders() {
     const res = await get(apiURL + "folders")
     folders.value = res.success ? res.result : []
 }
 
-async function runImport() {
-    const filePaths = paths.value
-        .split("\n")
-        .map((p) => p.trim())
-        .filter((p) => p.length > 0)
-    if (!filePaths.length || !options.value.folder) return
-
-    importing.value = true
-    const res = await post(apiURL + "import", {
-        filePaths,
+function buildRequest() {
+    return {
+        filePaths: paths.value
+            .split("\n")
+            .map((p) => p.trim())
+            .filter((p) => p.length > 0),
         folder: options.value.folder,
         permissions: options.value.permissions,
         useDefaultPermission: options.value.useDefaultPermission,
         allowPublicAccess: options.value.allowPublicAccess,
         encrypt: options.value.encrypt,
-    })
+    }
+}
+
+async function runPreview() {
+    const request = buildRequest()
+    if (!request.filePaths.length || !request.folder) return
+
+    previewing.value = true
+    results.value = []
+    const res = await post(apiURL + "import/preview", request)
+    previewing.value = false
+
+    if (!res.success) {
+        $q.notify({ type: "negative", message: res.errors?.[0] ?? "Preview failed" })
+        return
+    }
+    preview.value = res.result
+}
+
+async function runImport() {
+    const request = buildRequest()
+    if (!request.filePaths.length || !request.folder) return
+
+    importing.value = true
+    const res = await post(apiURL + "import", request)
     importing.value = false
 
     if (!res.success) {
         $q.notify({ type: "negative", message: res.errors?.[0] ?? "Import failed" })
         return
     }
+    preview.value = null
     results.value = res.result
     const succeeded = res.result.filter((r: ImportResult) => r.success).length
     $q.notify({
@@ -201,4 +322,8 @@ onMounted(loadFolders)
 .intro-copy {
     max-width: 60rem;
 }
+
+.import-form {
+    max-width: 40rem;
+}
 </style>
diff --git a/VueApp/src/components/BreadcrumbHeading.vue b/VueApp/src/components/BreadcrumbHeading.vue
new file mode 100644
index 000000000..e3d238adc
--- /dev/null
+++ b/VueApp/src/components/BreadcrumbHeading.vue
@@ -0,0 +1,19 @@
+<template>
+    <h1 class="q-ma-none q-mb-md">
+        <router-link :to="parentTo">{{ parentLabel }}</router-link>
+        <span aria-hidden="true"> / </span>
+        {{ label }}
+    </h1>
+</template>
+
+<script setup lang="ts">
+import type { RouteLocationRaw } from "vue-router"
+
+// Breadcrumb-style page heading for subpages: the parent crumb links back, the
+// current page is plain text. Link styling comes from base.css (h1 a rules).
+defineProps<{
+    label: string
+    parentLabel: string
+    parentTo: RouteLocationRaw
+}>()
+</script>
diff --git a/VueApp/src/styles/base.css b/VueApp/src/styles/base.css
index 2c4a46368..5e7a35132 100644
--- a/VueApp/src/styles/base.css
+++ b/VueApp/src/styles/base.css
@@ -294,6 +294,16 @@ div.breadcrumbs {
     font-weight: bold;
 }
 
+/* Breadcrumb-style parent links inside page headings */
+.q-page-container h1 a {
+    text-decoration: none;
+}
+
+.q-page-container h1 a:hover,
+.q-page-container h1 a:focus {
+    text-decoration: underline;
+}
+
 .q-dialog h2,
 .q-dialog .text-h2,
 .q-page-container h2,
diff --git a/test/CMS/CmsFileImportServiceTests.cs b/test/CMS/CmsFileImportServiceTests.cs
index 84cf8a721..30c6d4feb 100644
--- a/test/CMS/CmsFileImportServiceTests.cs
+++ b/test/CMS/CmsFileImportServiceTests.cs
@@ -1,5 +1,7 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Viper.Areas.CMS.Models.DTOs;
 using Viper.Areas.CMS.Services;
@@ -30,6 +32,9 @@ public CmsFileImportServiceTests()
 
         _storage = Substitute.For<ICmsFileStorageService>();
         _storage.IsValidFolder(Arg.Any<string>()).Returns(true);
+        // Default: available name echoes the input (no rename needed).
+        _storage.GetAvailableFileName(Arg.Any<string>(), Arg.Any<string>())
+            .Returns(callInfo => callInfo.ArgAt<string>(1));
         _storage.MoveIntoPlace(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>())
             .Returns(callInfo =>
             {
@@ -47,7 +52,7 @@ public CmsFileImportServiceTests()
             .Build();
 
         _service = new CmsFileImportService(_context, _storage, _encryption, _audit,
-            Substitute.For<IUserHelper>(), configuration);
+            Substitute.For<IUserHelper>(), configuration, Substitute.For<ILogger<CmsFileImportService>>());
     }
 
     public void Dispose()
@@ -164,6 +169,205 @@ public async Task Import_WithEncrypt_EncryptsBeforeMove()
         Assert.Equal("encrypted-db-key", saved.Key);
     }
 
+    #region Preview
+
+    [Fact]
+    public async Task Preview_ValidFile_ReportsNamesWithoutMoving()
+    {
+        var source = CreateWebrootFile(@"cats\docs\manual.pdf");
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "/cats/docs/manual.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.True(result.CanImport, result.Message);
+        Assert.Equal("manual.pdf", result.FileName);
+        Assert.Equal("cats-manual.pdf", result.FriendlyName);
+        Assert.Equal("/cats/docs/manual.pdf", result.OldUrl);
+        Assert.Null(result.RenamedFrom);
+        // Source must not be moved or deleted.
+        Assert.True(File.Exists(source));
+        // No DB rows must be created.
+        Assert.Empty(await _context.Files.ToListAsync(TestContext.Current.CancellationToken));
+    }
+
+    [Fact]
+    public async Task Preview_MissingFile_ReportsNotFound()
+    {
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "cats/docs/missing.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.CanImport);
+        Assert.Contains("not found", result.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Preview_TraversalPath_ReportsOutsideWebroot()
+    {
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "../outside.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.CanImport);
+        Assert.Contains("outside", result.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Preview_DuplicateLines_FlagsSecondAsDuplicate()
+    {
+        CreateWebrootFile(@"cats\docs\manual.pdf");
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string>
+            {
+                "cats/docs/manual.pdf",
+                "cats/docs/manual.pdf"
+            },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        Assert.Equal(2, results.Count);
+        Assert.True(results[0].CanImport);
+        Assert.False(results[1].CanImport);
+        Assert.Contains("Duplicate", results[1].Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Preview_ExistingFriendlyName_Blocks()
+    {
+        CreateWebrootFile(@"cats\docs\manual.pdf");
+
+        // Seed a Files row whose FriendlyName matches what the preview would compute.
+        _context.Files.Add(new Viper.Models.VIPER.File
+        {
+            FileGuid = Guid.NewGuid(),
+            FilePath = @"C:\FakeRoot\cats\manual.pdf",
+            Folder = "cats",
+            FriendlyName = "cats-manual.pdf",
+            Description = "existing",
+            ModifiedBy = "test",
+            ModifiedOn = DateTime.Now
+        });
+        await _context.SaveChangesAsync(TestContext.Current.CancellationToken);
+
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "cats/docs/manual.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.CanImport);
+        Assert.Contains("cats-manual.pdf", result.Message);
+    }
+
+    [Fact]
+    public async Task Preview_InvalidPathCharacters_ReportsInvalidPath()
+    {
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "cats/bad\0name.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.CanImport);
+        Assert.Contains("not valid", result.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Preview_DisallowedFileType_ReportsNotAllowed()
+    {
+        CreateWebrootFile(@"cats\evil.bat", "nope");
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "cats/evil.bat" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.CanImport);
+        Assert.Contains("not allowed", result.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Preview_DiskConflict_ReportsAutoRename()
+    {
+        CreateWebrootFile(@"cats\docs\manual.pdf");
+        _storage.GetAvailableFileName("cats", "manual.pdf").Returns("manual_0.pdf");
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string> { "cats/docs/manual.pdf" },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.True(result.CanImport, result.Message);
+        Assert.Equal("manual_0.pdf", result.FileName);
+        Assert.Equal("manual.pdf", result.RenamedFrom);
+        Assert.Equal("cats-manual_0.pdf", result.FriendlyName);
+    }
+
+    [Fact]
+    public async Task Preview_TwoLinesSameFinalName_NonBlockingMessageOnSecond()
+    {
+        CreateWebrootFile(@"cats\docs\manual.pdf");
+        // A second file in a different sub-path that produces the same final name after rename.
+        Directory.CreateDirectory(Path.Join(_webroot, "cats", "other"));
+        CreateWebrootFile(@"cats\other\manual.pdf");
+
+        // Stub storage to always return the same available name so both resolve to "manual.pdf".
+        _storage.GetAvailableFileName("cats", "manual.pdf").Returns("manual.pdf");
+
+        var request = new CmsFileImportRequest
+        {
+            FilePaths = new List<string>
+            {
+                "cats/docs/manual.pdf",
+                "cats/other/manual.pdf"
+            },
+            Folder = "cats"
+        };
+
+        var results = await _service.PreviewImportAsync(request, TestContext.Current.CancellationToken);
+
+        Assert.Equal(2, results.Count);
+        // First entry: CanImport true, no message.
+        Assert.True(results[0].CanImport);
+        Assert.Null(results[0].Message);
+        // Second entry: CanImport true (non-blocking), but has a message about renaming.
+        Assert.True(results[1].CanImport);
+        Assert.NotNull(results[1].Message);
+        Assert.Contains("renamed", results[1].Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    #endregion
+
     [Fact]
     public async Task BulkEncrypt_EncryptsUnencryptedAndSkipsOthers()
     {
@@ -205,4 +409,55 @@ public async Task BulkEncrypt_EncryptsUnencryptedAndSkipsOthers()
         var saved = await _context.Files.SingleAsync(f => f.FileGuid == plain.FileGuid, TestContext.Current.CancellationToken);
         Assert.True(saved.Encrypted);
     }
+
+    [Fact]
+    public async Task BulkEncrypt_NonDatabaseSaveFailure_DecryptsFileBack()
+    {
+        // Named in-memory stores are shared, so the seeding context and the failing
+        // context (whose interceptor throws a non-DB exception on save) see the same data.
+        var storeName = "VIPER_" + Guid.NewGuid();
+        var plain = new Viper.Models.VIPER.File
+        {
+            FileGuid = Guid.NewGuid(),
+            FilePath = @"C:\FakeRoot\cats\plain.pdf",
+            Folder = "cats",
+            FriendlyName = "cats-plain.pdf",
+            Description = "",
+            ModifiedBy = "test",
+            ModifiedOn = DateTime.Now
+        };
+        await using (var seedContext = new VIPERContext(new DbContextOptionsBuilder<VIPERContext>()
+            .UseInMemoryDatabase(storeName).Options))
+        {
+            seedContext.Files.Add(plain);
+            await seedContext.SaveChangesAsync(TestContext.Current.CancellationToken);
+        }
+
+        await using var failingContext = new VIPERContext(new DbContextOptionsBuilder<VIPERContext>()
+            .UseInMemoryDatabase(storeName)
+            .AddInterceptors(new ThrowingSaveInterceptor())
+            .Options);
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?> { ["CMS:LegacyWebrootPath"] = _webroot })
+            .Build();
+        var service = new CmsFileImportService(failingContext, _storage, _encryption, _audit,
+            Substitute.For<IUserHelper>(), configuration, Substitute.For<ILogger<CmsFileImportService>>());
+        _storage.ManagedFileExists(plain.FilePath).Returns(true);
+
+        var results = await service.BulkEncryptAsync(new List<Guid> { plain.FileGuid }, TestContext.Current.CancellationToken);
+
+        var result = Assert.Single(results);
+        Assert.False(result.Success);
+        Assert.Contains("simulated save failure", result.Message);
+        _encryption.Received(1).DecryptFileInPlace(plain.FilePath, "encrypted-db-key");
+    }
+
+    private sealed class ThrowingSaveInterceptor : SaveChangesInterceptor
+    {
+        public override ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEventData eventData,
+            InterceptionResult<int> result, CancellationToken cancellationToken = default)
+        {
+            throw new InvalidOperationException("simulated save failure");
+        }
+    }
 }
diff --git a/test/CMS/CmsFileServiceTests.cs b/test/CMS/CmsFileServiceTests.cs
index c0793605c..55bda3cc0 100644
--- a/test/CMS/CmsFileServiceTests.cs
+++ b/test/CMS/CmsFileServiceTests.cs
@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Viper.Areas.CMS.Models.DTOs;
 using Viper.Areas.CMS.Services;
@@ -22,6 +24,7 @@ public sealed class CmsFileServiceTests : IDisposable
     private readonly ICmsFileAuditService _audit;
     private readonly IUserHelper _userHelper;
     private readonly CmsFileService _service;
+    private readonly List<VIPERContext> _extraContexts = new();
 
     public CmsFileServiceTests()
     {
@@ -44,13 +47,18 @@ public CmsFileServiceTests()
         _audit = Substitute.For<ICmsFileAuditService>();
         _userHelper = Substitute.For<IUserHelper>();
 
-        _service = new CmsFileService(_context, _aaudContext, _storage, _encryption, _audit, _userHelper);
+        _service = new CmsFileService(_context, _aaudContext, _storage, _encryption, _audit, _userHelper,
+            Substitute.For<ILogger<CmsFileService>>());
     }
 
     public void Dispose()
     {
         _context.Dispose();
         _aaudContext.Dispose();
+        foreach (var ctx in _extraContexts)
+        {
+            ctx.Dispose();
+        }
     }
 
     private static IFormFile MakeFormFile(string fileName = "report.pdf")
@@ -77,6 +85,53 @@ private async Task<File> SeedFileAsync(Action<File>? customize = null)
         return file;
     }
 
+    /// <summary>
+    /// Seeds a file into a shared named store, then returns a service backed by a second context
+    /// on that store whose interceptor throws on save. Lets the rollback path be exercised without
+    /// a real database. Reuses the mocked storage/encryption so their calls can be asserted.
+    /// </summary>
+    private async Task<(CmsFileService Service, Guid FileGuid, string FilePath)> BuildServiceOverFailingSaveAsync(
+        Action<File>? customize = null)
+    {
+        const string filePath = @"C:\FakeRoot\cats\plain.pdf";
+        var storeName = "VIPER_" + Guid.NewGuid();
+        var file = new File
+        {
+            FileGuid = Guid.NewGuid(),
+            FilePath = filePath,
+            Folder = "cats",
+            FriendlyName = "cats-plain.pdf",
+            Description = "seeded",
+            ModifiedBy = "test",
+            ModifiedOn = DateTime.Now.AddDays(-1)
+        };
+        customize?.Invoke(file);
+        await using (var seedContext = new VIPERContext(new DbContextOptionsBuilder<VIPERContext>()
+            .UseInMemoryDatabase(storeName).Options))
+        {
+            seedContext.Files.Add(file);
+            await seedContext.SaveChangesAsync(TestContext.Current.CancellationToken);
+        }
+
+        var failingContext = new VIPERContext(new DbContextOptionsBuilder<VIPERContext>()
+            .UseInMemoryDatabase(storeName)
+            .AddInterceptors(new ThrowingSaveInterceptor())
+            .Options);
+        _extraContexts.Add(failingContext);
+        var service = new CmsFileService(failingContext, _aaudContext, _storage, _encryption, _audit, _userHelper,
+            Substitute.For<ILogger<CmsFileService>>());
+        return (service, file.FileGuid, filePath);
+    }
+
+    private sealed class ThrowingSaveInterceptor : SaveChangesInterceptor
+    {
+        public override ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEventData eventData,
+            InterceptionResult<int> result, CancellationToken cancellationToken = default)
+        {
+            throw new InvalidOperationException("simulated save failure");
+        }
+    }
+
     #region Create
 
     [Fact]
@@ -166,6 +221,69 @@ await Assert.ThrowsAsync<ArgumentException>(
             () => _service.CreateFileAsync(request, MakeFormFile("evil.bat"), TestContext.Current.CancellationToken));
     }
 
+    [Fact]
+    public async Task CreateFile_FileNameOverride_StoresUnderOverrideName()
+    {
+        var request = new CmsFileCreateRequest { Folder = "cats", FileName = "custom.pdf" };
+
+        var dto = await _service.CreateFileAsync(request, MakeFormFile("orig.pdf"), TestContext.Current.CancellationToken);
+
+        // MoveIntoPlace should have been called with the override name, not the upload name.
+        _storage.Received(1).MoveIntoPlace(Arg.Any<string>(), "cats", "custom.pdf", Arg.Any<bool>());
+        Assert.Equal("custom.pdf", dto.FileName);
+        Assert.Equal("cats-custom.pdf", dto.FriendlyName);
+    }
+
+    [Fact]
+    public async Task CreateFile_OverwriteDiskOnly_ReplacesInPlace()
+    {
+        const string targetPath = @"C:\FakeRoot\cats\report.pdf";
+        _storage.FileNameInUse("cats", "report.pdf").Returns(true);
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(targetPath);
+
+        var request = new CmsFileCreateRequest { Folder = "cats", Overwrite = true };
+
+        await _service.CreateFileAsync(request, MakeFormFile("report.pdf"), TestContext.Current.CancellationToken);
+
+        _storage.Received(1).ReplaceInPlace(Arg.Any<string>(), targetPath);
+        _storage.DidNotReceive().MoveIntoPlace(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>());
+        var saved = await _context.Files.SingleAsync(TestContext.Current.CancellationToken);
+        Assert.Equal(targetPath, saved.FilePath);
+    }
+
+    [Fact]
+    public async Task CreateFile_OverwriteManagedRecord_Throws()
+    {
+        const string targetPath = @"C:\FakeRoot\cats\report.pdf";
+        _storage.FileNameInUse("cats", "report.pdf").Returns(true);
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(targetPath);
+
+        // Seed a Files row whose FilePath matches the target path.
+        await SeedFileAsync(f =>
+        {
+            f.FilePath = targetPath;
+            f.FriendlyName = "cats-report.pdf";
+        });
+
+        var request = new CmsFileCreateRequest { Folder = "cats", Overwrite = true };
+
+        await Assert.ThrowsAsync<InvalidOperationException>(
+            () => _service.CreateFileAsync(request, MakeFormFile("report.pdf"), TestContext.Current.CancellationToken));
+
+        _storage.DidNotReceive().ReplaceInPlace(Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task CreateFile_OverwriteWithoutConflict_StoresNormally()
+    {
+        var request = new CmsFileCreateRequest { Folder = "cats", Overwrite = true };
+
+        await _service.CreateFileAsync(request, MakeFormFile("report.pdf"), TestContext.Current.CancellationToken);
+
+        _storage.Received(1).MoveIntoPlace(Arg.Any<string>(), "cats", "report.pdf", Arg.Any<bool>());
+        _storage.DidNotReceive().ReplaceInPlace(Arg.Any<string>(), Arg.Any<string>());
+    }
+
     #endregion
 
     #region Update
@@ -254,6 +372,45 @@ public async Task UpdateFile_WithReplacementUpload_ReplacesInPlaceAndAudits()
         _audit.Received(1).Audit(Arg.Any<File>(), CmsFileAuditActions.UploadFile, "ReplacingFile");
     }
 
+    [Fact]
+    public async Task UpdateFile_ReplacementWithDifferentExtension_Throws()
+    {
+        // The record keeps its name/path on replacement, so a .png swapped for the seeded
+        // .pdf would leave the stored .pdf holding .png bytes; the upload must be rejected.
+        var file = await SeedFileAsync();
+        var request = new CmsFileUpdateRequest { Description = "seeded" };
+
+        await Assert.ThrowsAsync<ArgumentException>(
+            () => _service.UpdateFileAsync(file.FileGuid, request, MakeFormFile("newversion.png"), TestContext.Current.CancellationToken));
+        _storage.DidNotReceive().ReplaceInPlace(Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task UpdateFile_WithReplacementUpload_RestoresSoftDeletedFile()
+    {
+        var file = await SeedFileAsync(f => f.DeletedOn = DateTime.Now);
+        var request = new CmsFileUpdateRequest { Description = "seeded" };
+
+        await _service.UpdateFileAsync(file.FileGuid, request, MakeFormFile("newversion.pdf"), TestContext.Current.CancellationToken);
+
+        var saved = await _context.Files.SingleAsync(TestContext.Current.CancellationToken);
+        Assert.Null(saved.DeletedOn);
+        _audit.Received(1).Audit(Arg.Any<File>(), CmsFileAuditActions.EditFile,
+            Arg.Is<string>(d => d.Contains("Restored file")));
+    }
+
+    [Fact]
+    public async Task UpdateFile_MetadataOnly_DoesNotRestoreSoftDeletedFile()
+    {
+        var file = await SeedFileAsync(f => f.DeletedOn = DateTime.Now);
+        var request = new CmsFileUpdateRequest { Description = "updated" };
+
+        await _service.UpdateFileAsync(file.FileGuid, request, null, TestContext.Current.CancellationToken);
+
+        var saved = await _context.Files.SingleAsync(TestContext.Current.CancellationToken);
+        Assert.NotNull(saved.DeletedOn);
+    }
+
     [Fact]
     public async Task UpdateFile_UnknownGuid_ReturnsNull()
     {
@@ -262,6 +419,40 @@ public async Task UpdateFile_UnknownGuid_ReturnsNull()
         Assert.Null(dto);
     }
 
+    [Fact]
+    public async Task UpdateFile_EncryptToggleOn_SaveFails_DecryptsFileBack()
+    {
+        var (service, fileGuid, filePath) = await BuildServiceOverFailingSaveAsync();
+        _storage.ManagedFileExists(filePath).Returns(true);
+        var request = new CmsFileUpdateRequest { Description = "seeded", Encrypt = true };
+
+        await Assert.ThrowsAsync<InvalidOperationException>(
+            () => service.UpdateFileAsync(fileGuid, request, null, TestContext.Current.CancellationToken));
+
+        // The file was encrypted on disk but the save failed, so it must be decrypted back with
+        // the same key or it would be unreadable (no key persisted).
+        _encryption.Received(1).DecryptFileInPlace(filePath, "encrypted-db-key");
+    }
+
+    [Fact]
+    public async Task UpdateFile_EncryptToggleOff_SaveFails_ReEncryptsFile()
+    {
+        var (service, fileGuid, filePath) = await BuildServiceOverFailingSaveAsync(f =>
+        {
+            f.Encrypted = true;
+            f.Key = "old-key";
+        });
+        _storage.ManagedFileExists(filePath).Returns(true);
+        var request = new CmsFileUpdateRequest { Description = "seeded", Encrypt = false };
+
+        await Assert.ThrowsAsync<InvalidOperationException>(
+            () => service.UpdateFileAsync(fileGuid, request, null, TestContext.Current.CancellationToken));
+
+        // The file was decrypted on disk but the save failed, so it must be re-encrypted with the
+        // original key to stay consistent with the rolled-back (still-encrypted) database row.
+        _encryption.Received(1).EncryptFileInPlace(filePath, "old-key");
+    }
+
     #endregion
 
     #region Delete / Restore
@@ -310,6 +501,97 @@ public async Task PermanentDelete_RemovesRowAndDiskFile()
 
     #endregion
 
+    #region CheckName
+
+    [Fact]
+    public async Task CheckName_FreeName_ReturnsNotInUse()
+    {
+        _storage.FileNameInUse("cats", "report.pdf").Returns(false);
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(@"C:\FakeRoot\cats\report.pdf");
+
+        var dto = await _service.CheckNameAsync("cats", "report.pdf", TestContext.Current.CancellationToken);
+
+        Assert.False(dto.InUse);
+        Assert.Equal("report.pdf", dto.SuggestedName);
+        Assert.Null(dto.ExistingFileGuid);
+    }
+
+    [Fact]
+    public async Task CheckName_DiskConflictOnly_SuggestsRename()
+    {
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(@"C:\FakeRoot\cats\report.pdf");
+        _storage.FileNameInUse("cats", "report.pdf").Returns(true);
+        _storage.GetAvailableFileName("cats", "report.pdf").Returns("report_0.pdf");
+
+        var dto = await _service.CheckNameAsync("cats", "report.pdf", TestContext.Current.CancellationToken);
+
+        Assert.True(dto.InUse);
+        Assert.Equal("report_0.pdf", dto.SuggestedName);
+        Assert.Null(dto.ExistingFileGuid);
+    }
+
+    [Fact]
+    public async Task CheckName_ManagedRecordConflict_ReturnsExistingFile()
+    {
+        const string targetPath = @"C:\FakeRoot\cats\report.pdf";
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(targetPath);
+        _storage.FileNameInUse("cats", "report.pdf").Returns(false);
+        _storage.GetAvailableFileName("cats", "report.pdf").Returns("report_0.pdf");
+
+        var seeded = await SeedFileAsync(f =>
+        {
+            f.FilePath = targetPath;
+            f.FriendlyName = "cats-report.pdf";
+            f.DeletedOn = null;
+        });
+
+        var dto = await _service.CheckNameAsync("cats", "report.pdf", TestContext.Current.CancellationToken);
+
+        Assert.True(dto.InUse);
+        Assert.Equal(seeded.FileGuid, dto.ExistingFileGuid);
+        Assert.Equal("cats-report.pdf", dto.ExistingFriendlyName);
+        Assert.False(dto.ExistingDeleted);
+    }
+
+    [Fact]
+    public async Task CheckName_ManagedRecordConflict_SetsExistingDeleted_WhenSoftDeleted()
+    {
+        const string targetPath = @"C:\FakeRoot\cats\report.pdf";
+        _storage.BuildManagedPath("cats", "report.pdf").Returns(targetPath);
+        _storage.FileNameInUse("cats", "report.pdf").Returns(false);
+        _storage.GetAvailableFileName("cats", "report.pdf").Returns("report_0.pdf");
+
+        await SeedFileAsync(f =>
+        {
+            f.FilePath = targetPath;
+            f.FriendlyName = "cats-report.pdf";
+            f.DeletedOn = DateTime.Now;
+        });
+
+        var dto = await _service.CheckNameAsync("cats", "report.pdf", TestContext.Current.CancellationToken);
+
+        Assert.True(dto.InUse);
+        Assert.True(dto.ExistingDeleted);
+    }
+
+    [Fact]
+    public async Task CheckName_InvalidFolder_Throws()
+    {
+        _storage.IsValidFolder("nope").Returns(false);
+
+        await Assert.ThrowsAsync<ArgumentException>(
+            () => _service.CheckNameAsync("nope", "report.pdf", TestContext.Current.CancellationToken));
+    }
+
+    [Fact]
+    public async Task CheckName_DisallowedFileType_Throws()
+    {
+        await Assert.ThrowsAsync<ArgumentException>(
+            () => _service.CheckNameAsync("cats", "evil.bat", TestContext.Current.CancellationToken));
+    }
+
+    #endregion
+
     #region List
 
     [Fact]
@@ -395,5 +677,62 @@ await SeedFileAsync(f =>
         Assert.Equal("cats-file2.pdf", page2[0].FriendlyName);
     }
 
+    [Fact]
+    public async Task GetFolderCounts_RollsUpSubfolders_AndFiltersStatusEncryptedAndPublic()
+    {
+        await SeedFileAsync(f => f.AllowPublicAccess = true);
+        await SeedFileAsync(f =>
+        {
+            f.Folder = @"cats\photos";
+            f.FriendlyName = "cats-photos-pic.jpg";
+            f.FilePath = @"C:\FakeRoot\cats\photos\pic.jpg";
+        });
+        await SeedFileAsync(f =>
+        {
+            f.Folder = "students";
+            f.FriendlyName = "students-doc.pdf";
+            f.FilePath = @"C:\FakeRoot\students\doc.pdf";
+            f.Encrypted = true;
+        });
+        await SeedFileAsync(f =>
+        {
+            f.Folder = "students";
+            f.FriendlyName = "students-deleted.pdf";
+            f.FilePath = @"C:\FakeRoot\students\deleted.pdf";
+            f.DeletedOn = DateTime.Now;
+        });
+
+        var active = await _service.GetFolderCountsAsync("active", null, null, TestContext.Current.CancellationToken);
+        var unencrypted = await _service.GetFolderCountsAsync("active", false, null, TestContext.Current.CancellationToken);
+        var publicOnly = await _service.GetFolderCountsAsync("active", null, true, TestContext.Current.CancellationToken);
+
+        Assert.Equal(2, active.Count);
+        Assert.Equal(2, active.Single(c => c.Folder == "cats").Count);
+        Assert.Equal(1, active.Single(c => c.Folder == "students").Count);
+        var onlyCats = Assert.Single(unencrypted);
+        Assert.Equal("cats", onlyCats.Folder);
+        Assert.Equal(2, onlyCats.Count);
+        var publicCats = Assert.Single(publicOnly);
+        Assert.Equal("cats", publicCats.Folder);
+        Assert.Equal(1, publicCats.Count);
+    }
+
+    [Fact]
+    public async Task GetFolderCounts_MergesFolderCasings()
+    {
+        await SeedFileAsync(f => f.Folder = "Accreditation");
+        await SeedFileAsync(f =>
+        {
+            f.Folder = "accreditation";
+            f.FriendlyName = "accreditation-two.pdf";
+            f.FilePath = @"C:\FakeRoot\accreditation\two.pdf";
+        });
+
+        var counts = await _service.GetFolderCountsAsync("active", null, null, TestContext.Current.CancellationToken);
+
+        var entry = Assert.Single(counts);
+        Assert.Equal(2, entry.Count);
+    }
+
     #endregion
 }
diff --git a/web/Areas/CMS/Constants/CmsFileNaming.cs b/web/Areas/CMS/Constants/CmsFileNaming.cs
new file mode 100644
index 000000000..221d57c17
--- /dev/null
+++ b/web/Areas/CMS/Constants/CmsFileNaming.cs
@@ -0,0 +1,14 @@
+namespace Viper.Areas.CMS.Constants
+{
+    /// <summary>
+    /// Shared CMS file naming rules. Mirrors the legacy ColdFusion Files.cfc:
+    /// friendly names are the folder path with separators dashed, plus the file name.
+    /// </summary>
+    public static class CmsFileNaming
+    {
+        public static string BuildFriendlyName(string folder, string fileName)
+        {
+            return folder.Replace('\\', '-').Replace('/', '-') + "-" + fileName;
+        }
+    }
+}
diff --git a/web/Areas/CMS/Controllers/CMSFilesController.cs b/web/Areas/CMS/Controllers/CMSFilesController.cs
index ed3bb32f0..e2425f593 100644
--- a/web/Areas/CMS/Controllers/CMSFilesController.cs
+++ b/web/Areas/CMS/Controllers/CMSFilesController.cs
@@ -76,6 +76,16 @@ public async Task<ActionResult<List<string>>> GetFolders(bool includeData = fals
             return includeData ? await _storage.GetFilterFoldersAsync(ct) : _storage.GetTopLevelFolders();
         }
 
+        // GET /api/cms/files/folder-counts
+        // File counts per top-level folder for filter dropdowns; same status/encrypted/isPublic
+        // semantics as the list endpoint.
+        [HttpGet("folder-counts")]
+        public async Task<ActionResult<List<CmsFolderCountDto>>> GetFolderCounts(
+            bool? encrypted, bool? isPublic, string status = "active", CancellationToken ct = default)
+        {
+            return await _fileService.GetFolderCountsAsync(status, encrypted, isPublic, ct);
+        }
+
         // GET /api/cms/files/audit
         [HttpGet("audit")]
         [ApiPagination(DefaultPerPage = 50, MaxPerPage = 500)]
@@ -120,6 +130,21 @@ public async Task<ActionResult<CmsFileDto>> GetFile(Guid fileGuid, CancellationT
             return file;
         }
 
+        // GET /api/cms/files/check-name — pre-upload conflict check for a folder + file name
+        [HttpGet("check-name")]
+        public async Task<ActionResult<CmsFileNameCheckDto>> CheckName(string folder, string fileName,
+            CancellationToken ct = default)
+        {
+            try
+            {
+                return await _fileService.CheckNameAsync(folder, fileName, ct);
+            }
+            catch (ArgumentException ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+
         // POST /api/cms/files
         [HttpPost]
         [RequestSizeLimit(MaxUploadBytes)]
@@ -221,6 +246,30 @@ public async Task<ActionResult<List<CmsFileImportResult>>> ImportFiles(CmsFileIm
             }
         }
 
+        // POST /api/cms/files/import/preview — dry-run validation of an import request
+        [HttpPost("import/preview")]
+        public async Task<ActionResult<List<CmsFileImportPreviewResult>>> PreviewImport(CmsFileImportRequest request,
+            CancellationToken ct = default)
+        {
+            if (request.FilePaths.Count == 0)
+            {
+                return BadRequest("At least one file path is required.");
+            }
+
+            try
+            {
+                return await _importService.PreviewImportAsync(request, ct);
+            }
+            catch (ArgumentException ex)
+            {
+                return BadRequest(ex.Message);
+            }
+            catch (InvalidOperationException ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+
         // POST /api/cms/files/bulk-encrypt
         [HttpPost("bulk-encrypt")]
         public async Task<ActionResult<List<CmsBulkEncryptResult>>> BulkEncrypt(List<Guid> fileGuids,
diff --git a/web/Areas/CMS/Models/DTOs/CmsFileDto.cs b/web/Areas/CMS/Models/DTOs/CmsFileDto.cs
index c433e848a..70b523e4a 100644
--- a/web/Areas/CMS/Models/DTOs/CmsFileDto.cs
+++ b/web/Areas/CMS/Models/DTOs/CmsFileDto.cs
@@ -24,4 +24,26 @@ public class CmsFilePersonDto
         public string IamId { get; set; } = string.Empty;
         public string? Name { get; set; }
     }
+
+    public class CmsFolderCountDto
+    {
+        public string Folder { get; set; } = string.Empty;
+        public int Count { get; set; }
+    }
+
+    /// <summary>Result of a pre-upload name availability check for a folder.</summary>
+    public class CmsFileNameCheckDto
+    {
+        public bool InUse { get; set; }
+
+        /// <summary>The name an auto-rename would store the file under (the name itself when free).</summary>
+        public string SuggestedName { get; set; } = string.Empty;
+
+        /// <summary>Set when the conflicting name belongs to an existing file record.</summary>
+        public Guid? ExistingFileGuid { get; set; }
+
+        public string? ExistingFriendlyName { get; set; }
+
+        public bool ExistingDeleted { get; set; }
+    }
 }
diff --git a/web/Areas/CMS/Models/DTOs/CmsFileImportDtos.cs b/web/Areas/CMS/Models/DTOs/CmsFileImportDtos.cs
index 09c9fe505..ac51338aa 100644
--- a/web/Areas/CMS/Models/DTOs/CmsFileImportDtos.cs
+++ b/web/Areas/CMS/Models/DTOs/CmsFileImportDtos.cs
@@ -33,6 +33,27 @@ public class CmsFileImportResult
         public string? FriendlyName { get; set; }
     }
 
+    /// <summary>Dry-run result for one path of an import request; nothing is moved or saved.</summary>
+    public class CmsFileImportPreviewResult
+    {
+        public string FilePath { get; set; } = string.Empty;
+
+        public bool CanImport { get; set; }
+
+        /// <summary>Blocking issue (CanImport false) or informational note (CanImport true).</summary>
+        public string? Message { get; set; }
+
+        /// <summary>Name the file will be stored under, after any auto-rename.</summary>
+        public string? FileName { get; set; }
+
+        /// <summary>Original name when an auto-rename will occur.</summary>
+        public string? RenamedFrom { get; set; }
+
+        public string? FriendlyName { get; set; }
+
+        public string? OldUrl { get; set; }
+    }
+
     public class CmsBulkEncryptResult
     {
         public Guid FileGuid { get; set; }
diff --git a/web/Areas/CMS/Models/DTOs/CmsFileRequests.cs b/web/Areas/CMS/Models/DTOs/CmsFileRequests.cs
index 3bab26700..b1d372823 100644
--- a/web/Areas/CMS/Models/DTOs/CmsFileRequests.cs
+++ b/web/Areas/CMS/Models/DTOs/CmsFileRequests.cs
@@ -24,8 +24,15 @@ public class CmsFileCreateRequest
 
         public bool? Encrypt { get; set; }
 
-        /// <summary>When true, auto-rename on name conflict (name_0..name_999) instead of failing.</summary>
-        public bool? MakeUnique { get; set; }
+        /// <summary>Optional stored-name override; defaults to the uploaded file's name.</summary>
+        [MaxLength(256)]
+        public string? FileName { get; set; }
+
+        /// <summary>
+        /// When true, overwrite a same-named disk file that has no file record. A conflict with
+        /// a managed record still fails (replace it by editing that record instead).
+        /// </summary>
+        public bool? Overwrite { get; set; }
     }
 
     /// <summary>
diff --git a/web/Areas/CMS/Services/CmsFileImportService.cs b/web/Areas/CMS/Services/CmsFileImportService.cs
index ff7b5abd6..8361e1242 100644
--- a/web/Areas/CMS/Services/CmsFileImportService.cs
+++ b/web/Areas/CMS/Services/CmsFileImportService.cs
@@ -3,6 +3,7 @@
 using Viper.Areas.CMS.Constants;
 using Viper.Areas.CMS.Models.DTOs;
 using Viper.Classes.SQLContext;
+using Viper.Classes.Utilities;
 using File = Viper.Models.VIPER.File;
 
 namespace Viper.Areas.CMS.Services
@@ -11,6 +12,9 @@ public interface ICmsFileImportService
     {
         Task<List<CmsFileImportResult>> ImportFilesAsync(CmsFileImportRequest request, CancellationToken ct = default);
 
+        /// <summary>Dry-run of an import request: validates each path and reports the resulting names without moving anything.</summary>
+        Task<List<CmsFileImportPreviewResult>> PreviewImportAsync(CmsFileImportRequest request, CancellationToken ct = default);
+
         Task<List<CmsBulkEncryptResult>> BulkEncryptAsync(List<Guid> fileGuids, CancellationToken ct = default);
     }
 
@@ -26,17 +30,19 @@ public class CmsFileImportService : ICmsFileImportService
         private readonly ICmsFileEncryptionService _encryption;
         private readonly ICmsFileAuditService _audit;
         private readonly IUserHelper _userHelper;
+        private readonly ILogger<CmsFileImportService> _logger;
         private readonly string? _legacyWebroot;
 
         public CmsFileImportService(VIPERContext context, ICmsFileStorageService storage,
             ICmsFileEncryptionService encryption, ICmsFileAuditService audit, IUserHelper userHelper,
-            IConfiguration configuration)
+            IConfiguration configuration, ILogger<CmsFileImportService> logger)
         {
             _context = context;
             _storage = storage;
             _encryption = encryption;
             _audit = audit;
             _userHelper = userHelper;
+            _logger = logger;
             _legacyWebroot = configuration["CMS:LegacyWebrootPath"]
                 ?? (HttpHelper.Environment?.EnvironmentName == "Development" ? @"C:\Sites\https\VIPER" : null);
         }
@@ -71,31 +77,113 @@ public async Task<List<CmsFileImportResult>> ImportFilesAsync(CmsFileImportReque
             return results;
         }
 
-        private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, CmsFileImportRequest request,
-            List<string> permissions, CancellationToken ct)
+        public async Task<List<CmsFileImportPreviewResult>> PreviewImportAsync(CmsFileImportRequest request, CancellationToken ct = default)
         {
-            var result = new CmsFileImportResult { FilePath = rawPath };
-            try
+            if (string.IsNullOrEmpty(_legacyWebroot))
+            {
+                throw new InvalidOperationException("CMS:LegacyWebrootPath is not configured for this environment.");
+            }
+            if (!_storage.IsValidFolder(request.Folder))
             {
-                string relative = rawPath.TrimStart('/', '\\').Replace('/', '\\');
-                string sourcePath = Path.GetFullPath(Path.Join(_legacyWebroot, relative));
-                string webroot = Path.GetFullPath(_legacyWebroot! + Path.DirectorySeparatorChar);
-                if (!sourcePath.StartsWith(webroot, StringComparison.OrdinalIgnoreCase))
+                throw new ArgumentException("Invalid folder.");
+            }
+
+            var results = new List<CmsFileImportPreviewResult>();
+            var seenSources = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var plannedNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var rawPath in request.FilePaths.Where(p => !string.IsNullOrWhiteSpace(p)).Select(p => p.Trim()))
+            {
+                var result = new CmsFileImportPreviewResult { FilePath = rawPath };
+                results.Add(result);
+
+                var source = ResolveSource(rawPath);
+                if (source.Error != null)
                 {
-                    result.Message = "Path is outside the legacy webroot.";
-                    return result;
+                    result.Message = source.Error;
+                    continue;
                 }
-                if (!System.IO.File.Exists(sourcePath))
+                if (!seenSources.Add(source.SourcePath))
                 {
-                    result.Message = "File not found.";
-                    return result;
+                    result.Message = "Duplicate of an earlier line.";
+                    continue;
                 }
-                string fileName = Path.GetFileName(sourcePath);
-                if (!CmsFileTypes.IsAllowedFileName(fileName))
+
+                string finalName = _storage.GetAvailableFileName(request.Folder, source.FileName);
+                string friendlyName = CmsFileNaming.BuildFriendlyName(request.Folder, finalName);
+                if (await _context.Files.AnyAsync(f => f.FriendlyName == friendlyName, ct))
+                {
+                    result.Message = $"A file with the name {friendlyName} already exists.";
+                    continue;
+                }
+
+                result.CanImport = true;
+                result.FileName = finalName;
+                if (!string.Equals(finalName, source.FileName, StringComparison.OrdinalIgnoreCase))
+                {
+                    result.RenamedFrom = source.FileName;
+                }
+                result.FriendlyName = friendlyName;
+                result.OldUrl = "/" + source.Relative.Replace('\\', '/');
+                if (!plannedNames.Add(finalName))
+                {
+                    result.Message = "Another line uses the same file name; this one will be renamed during import.";
+                }
+            }
+            return results;
+        }
+
+        private sealed record SourceResolution(string Relative, string SourcePath, string FileName, string? Error);
+
+        /// <summary>
+        /// Resolves a legacy-webroot path and runs the validations shared by preview and
+        /// import, so the preview can't promise something the import would reject.
+        /// </summary>
+        private SourceResolution ResolveSource(string rawPath)
+        {
+            string relative = rawPath.TrimStart('/', '\\').Replace('/', '\\');
+            string sourcePath;
+            string fileName;
+            try
+            {
+                sourcePath = Path.GetFullPath(Path.Join(_legacyWebroot, relative));
+                fileName = Path.GetFileName(sourcePath);
+            }
+            catch (Exception ex) when (ex is ArgumentException or NotSupportedException or PathTooLongException)
+            {
+                return new SourceResolution(relative, string.Empty, string.Empty, "Path is not valid.");
+            }
+            string webroot = Path.GetFullPath(_legacyWebroot! + Path.DirectorySeparatorChar);
+
+            string? error = null;
+            if (!sourcePath.StartsWith(webroot, StringComparison.OrdinalIgnoreCase))
+            {
+                error = "Path is outside the legacy webroot.";
+            }
+            else if (!System.IO.File.Exists(sourcePath))
+            {
+                error = "File not found.";
+            }
+            else if (!CmsFileTypes.IsAllowedFileName(fileName))
+            {
+                error = "File type is not allowed.";
+            }
+            return new SourceResolution(relative, sourcePath, fileName, error);
+        }
+
+        private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, CmsFileImportRequest request,
+            List<string> permissions, CancellationToken ct)
+        {
+            var result = new CmsFileImportResult { FilePath = rawPath };
+            try
+            {
+                var source = ResolveSource(rawPath);
+                if (source.Error != null)
                 {
-                    result.Message = "File type is not allowed.";
+                    result.Message = source.Error;
                     return result;
                 }
+                string sourcePath = source.SourcePath;
 
                 bool encrypt = request.Encrypt ?? false;
                 string? dbKey = encrypt ? _encryption.GenerateKeyForDb() : null;
@@ -104,16 +192,17 @@ private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, Cm
                 // after the import fully succeeds (legacy used move semantics).
                 string tempPath = Path.Join(Path.GetTempPath(), "Viper-CMS-Uploads", Guid.NewGuid().ToString("N"));
                 System.IO.Directory.CreateDirectory(Path.GetDirectoryName(tempPath)!);
-                System.IO.File.Copy(sourcePath, tempPath);
 
                 string finalPath;
                 try
                 {
+                    // Copy inside the try so a partial copy (e.g. disk full) is removed by the finally.
+                    System.IO.File.Copy(sourcePath, tempPath);
                     if (dbKey != null)
                     {
                         _encryption.EncryptFileInPlace(tempPath, dbKey);
                     }
-                    finalPath = _storage.MoveIntoPlace(tempPath, request.Folder, fileName, makeUnique: true);
+                    finalPath = _storage.MoveIntoPlace(tempPath, request.Folder, source.FileName, makeUnique: true);
                 }
                 finally
                 {
@@ -123,7 +212,7 @@ private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, Cm
                     }
                 }
 
-                string friendlyName = request.Folder.Replace('\\', '-').Replace('/', '-') + "-" + Path.GetFileName(finalPath);
+                string friendlyName = CmsFileNaming.BuildFriendlyName(request.Folder, Path.GetFileName(finalPath));
                 if (await _context.Files.AnyAsync(f => f.FriendlyName == friendlyName, ct))
                 {
                     _storage.DeleteManagedFile(finalPath);
@@ -141,7 +230,7 @@ private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, Cm
                     Key = dbKey,
                     Description = "Automatically imported from Viper",
                     AllowPublicAccess = request.AllowPublicAccess ?? false,
-                    OldUrl = "/" + relative.Replace('\\', '/'),
+                    OldUrl = "/" + source.Relative.Replace('\\', '/'),
                     ModifiedOn = DateTime.Now,
                     ModifiedBy = CurrentLoginId()
                 };
@@ -156,7 +245,15 @@ private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, Cm
                 {
                     await _context.SaveChangesAsync(ct);
                 }
-                catch (Exception ex) when (ex is DbUpdateException or SqlException)
+                catch (OperationCanceledException)
+                {
+                    // A cancelled save never persisted the record: drop the pending entity and the
+                    // stored copy so the abort leaves nothing orphaned, then let it propagate.
+                    _context.ChangeTracker.Clear();
+                    _storage.DeleteManagedFile(finalPath);
+                    throw;
+                }
+                catch (Exception ex) when (ex is DbUpdateException or SqlException or InvalidOperationException)
                 {
                     // Drop the failed entities so they can't poison later saves in this batch,
                     // and remove the stored copy; the untouched source can be re-imported.
@@ -166,7 +263,19 @@ private async Task<CmsFileImportResult> ImportSingleFileAsync(string rawPath, Cm
                     return result;
                 }
 
-                System.IO.File.Delete(sourcePath);
+                try
+                {
+                    System.IO.File.Delete(sourcePath);
+                }
+                catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+                {
+                    // The record is saved and the managed copy is in place, so the import
+                    // succeeded; only the legacy source could not be removed. Re-importing it
+                    // would now fail on the duplicate name, so report success with a note.
+                    _logger.LogWarning(ex, "CMS import succeeded but the legacy source could not be removed: {Path}",
+                        LogSanitizer.SanitizeString(sourcePath));
+                    result.Message = "Imported, but the original file could not be removed from the legacy webroot.";
+                }
 
                 result.Success = true;
                 result.FileGuid = entity.FileGuid;
@@ -236,14 +345,19 @@ private async Task<CmsBulkEncryptResult> EncryptSingleFileAsync(Guid fileGuid, C
                 file.ModifiedOn = DateTime.Now;
                 file.ModifiedBy = CurrentLoginId();
                 _audit.Audit(file, CmsFileAuditActions.EditFile, "Encrypted file (bulk)");
-                // The file is already encrypted on disk; cancelling this save would lose the
-                // key, so it runs to completion even if the request is aborted.
-                await _context.SaveChangesAsync(CancellationToken.None);
-                result.Success = true;
-            }
-            catch (Exception ex) when (ex is DbUpdateException or SqlException)
-            {
-                RollBackUnsavedEncryption(file, dbKey!, ex, result);
+                try
+                {
+                    // The file is already encrypted on disk; cancelling this save would lose the
+                    // key, so it runs to completion even if the request is aborted.
+                    await _context.SaveChangesAsync(CancellationToken.None);
+                    result.Success = true;
+                }
+                catch (Exception ex)
+                {
+                    // Any save failure, whatever the exception type, means the key was not
+                    // persisted; the file must be decrypted back or it is unrecoverable.
+                    RollBackUnsavedEncryption(file, dbKey, ex, result);
+                }
             }
             catch (IOException ex)
             {
diff --git a/web/Areas/CMS/Services/CmsFileService.cs b/web/Areas/CMS/Services/CmsFileService.cs
index e2d41ffcf..443e61a93 100644
--- a/web/Areas/CMS/Services/CmsFileService.cs
+++ b/web/Areas/CMS/Services/CmsFileService.cs
@@ -12,6 +12,10 @@ public interface ICmsFileService
         Task<(List<CmsFileDto> Files, int Total)> GetFilesAsync(string? folder, string status, string? search,
             bool? encrypted, bool? isPublic, int page, int perPage, string? sortBy, bool descending, CancellationToken ct = default);
 
+        Task<List<CmsFolderCountDto>> GetFolderCountsAsync(string status, bool? encrypted, bool? isPublic, CancellationToken ct = default);
+
+        Task<CmsFileNameCheckDto> CheckNameAsync(string folder, string fileName, CancellationToken ct = default);
+
         Task<CmsFileDto?> GetFileAsync(Guid fileGuid, CancellationToken ct = default);
 
         Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFormFile file, CancellationToken ct = default);
@@ -39,9 +43,11 @@ public class CmsFileService : ICmsFileService
         private readonly ICmsFileEncryptionService _encryption;
         private readonly ICmsFileAuditService _audit;
         private readonly IUserHelper _userHelper;
+        private readonly ILogger<CmsFileService> _logger;
 
         public CmsFileService(VIPERContext context, AAUDContext aaudContext, ICmsFileStorageService storage,
-            ICmsFileEncryptionService encryption, ICmsFileAuditService audit, IUserHelper userHelper)
+            ICmsFileEncryptionService encryption, ICmsFileAuditService audit, IUserHelper userHelper,
+            ILogger<CmsFileService> logger)
         {
             _context = context;
             _aaudContext = aaudContext;
@@ -49,6 +55,7 @@ public CmsFileService(VIPERContext context, AAUDContext aaudContext, ICmsFileSto
             _encryption = encryption;
             _audit = audit;
             _userHelper = userHelper;
+            _logger = logger;
         }
 
         public async Task<(List<CmsFileDto> Files, int Total)> GetFilesAsync(string? folder, string status, string? search,
@@ -69,12 +76,7 @@ public CmsFileService(VIPERContext context, AAUDContext aaudContext, ICmsFileSto
                 query = query.Where(f => f.Folder == folder || (f.Folder != null && f.Folder.StartsWith(folderPrefix)));
             }
 
-            query = status.ToLowerInvariant() switch
-            {
-                "active" => query.Where(f => f.DeletedOn == null),
-                "deleted" => query.Where(f => f.DeletedOn != null),
-                _ => query
-            };
+            query = ApplyStatusFilter(query, status);
 
             if (encrypted != null)
             {
@@ -117,6 +119,51 @@ public CmsFileService(VIPERContext context, AAUDContext aaudContext, ICmsFileSto
             return (files.Select(f => CmsFileMapper.ToCmsFileDto(f, names)).ToList(), total);
         }
 
+        public async Task<List<CmsFolderCountDto>> GetFolderCountsAsync(string status, bool? encrypted, bool? isPublic,
+            CancellationToken ct = default)
+        {
+            var query = _context.Files
+                .AsNoTracking()
+                .TagWith("CmsFileService.GetFolderCounts")
+                .AsQueryable();
+
+            query = ApplyStatusFilter(query, status);
+
+            if (encrypted != null)
+            {
+                query = query.Where(f => f.Encrypted == encrypted);
+            }
+
+            if (isPublic != null)
+            {
+                query = query.Where(f => f.AllowPublicAccess == isPublic);
+            }
+
+            var byFolder = await query
+                .GroupBy(f => f.Folder)
+                .Select(g => new { g.Key, Count = g.Count() })
+                .ToListAsync(ct);
+
+            // Folders may have subfolders stored as "folder\sub"; roll counts up to the
+            // top-level folder so they match the list's folder filter (GetFilesAsync).
+            return byFolder
+                .GroupBy(x => (x.Key ?? string.Empty).Split(['\\', '/'], StringSplitOptions.None)[0], StringComparer.OrdinalIgnoreCase)
+                .Where(g => !string.IsNullOrWhiteSpace(g.Key))
+                .Select(g => new CmsFolderCountDto { Folder = g.Key, Count = g.Sum(x => x.Count) })
+                .OrderBy(c => c.Folder, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        private static IQueryable<File> ApplyStatusFilter(IQueryable<File> query, string? status)
+        {
+            return status?.ToLowerInvariant() switch
+            {
+                "active" => query.Where(f => f.DeletedOn == null),
+                "deleted" => query.Where(f => f.DeletedOn != null),
+                _ => query
+            };
+        }
+
         public async Task<CmsFileDto?> GetFileAsync(Guid fileGuid, CancellationToken ct = default)
         {
             var file = await LoadFileAsync(fileGuid, tracking: false, ct);
@@ -128,13 +175,42 @@ public CmsFileService(VIPERContext context, AAUDContext aaudContext, ICmsFileSto
             return CmsFileMapper.ToCmsFileDto(file, names);
         }
 
+        public async Task<CmsFileNameCheckDto> CheckNameAsync(string folder, string fileName, CancellationToken ct = default)
+        {
+            if (!_storage.IsValidFolder(folder))
+            {
+                throw new ArgumentException("Invalid folder.");
+            }
+            string name = Path.GetFileName(fileName);
+            if (string.IsNullOrWhiteSpace(name) || !CmsFileTypes.IsAllowedFileName(name))
+            {
+                throw new ArgumentException("File type is not allowed.");
+            }
+
+            string targetPath = _storage.BuildManagedPath(folder, name);
+            var existing = await _context.Files
+                .AsNoTracking()
+                .FirstOrDefaultAsync(f => f.FilePath == targetPath, ct);
+            bool inUse = existing != null || _storage.FileNameInUse(folder, name);
+            return new CmsFileNameCheckDto
+            {
+                InUse = inUse,
+                SuggestedName = inUse ? _storage.GetAvailableFileName(folder, name) : name,
+                ExistingFileGuid = existing?.FileGuid,
+                ExistingFriendlyName = existing?.FriendlyName,
+                ExistingDeleted = existing?.DeletedOn != null
+            };
+        }
+
         public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFormFile file, CancellationToken ct = default)
         {
             if (!_storage.IsValidFolder(request.Folder))
             {
                 throw new ArgumentException("Invalid folder.");
             }
-            if (!CmsFileTypes.IsAllowedFileName(file.FileName))
+            string uploadName = Path.GetFileName(
+                string.IsNullOrWhiteSpace(request.FileName) ? file.FileName : request.FileName);
+            if (string.IsNullOrWhiteSpace(uploadName) || !CmsFileTypes.IsAllowedFileName(uploadName))
             {
                 throw new ArgumentException("File type is not allowed.");
             }
@@ -150,7 +226,21 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
                 {
                     _encryption.EncryptFileInPlace(tempPath, dbKey);
                 }
-                finalPath = _storage.MoveIntoPlace(tempPath, request.Folder, file.FileName, request.MakeUnique ?? false);
+                if (request.Overwrite == true && _storage.FileNameInUse(request.Folder, uploadName))
+                {
+                    string targetPath = _storage.BuildManagedPath(request.Folder, uploadName);
+                    if (await _context.Files.AnyAsync(f => f.FilePath == targetPath, ct))
+                    {
+                        throw new InvalidOperationException(
+                            $"{uploadName} belongs to an existing file record; replace its content by editing that file.");
+                    }
+                    _storage.ReplaceInPlace(tempPath, targetPath);
+                    finalPath = targetPath;
+                }
+                else
+                {
+                    finalPath = _storage.MoveIntoPlace(tempPath, request.Folder, uploadName, makeUnique: false);
+                }
             }
             finally
             {
@@ -160,7 +250,7 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
                 }
             }
 
-            string friendlyName = BuildFriendlyName(request.Folder, Path.GetFileName(finalPath));
+            string friendlyName = CmsFileNaming.BuildFriendlyName(request.Folder, Path.GetFileName(finalPath));
             if (await _context.Files.AnyAsync(f => f.FriendlyName == friendlyName, ct))
             {
                 _storage.DeleteManagedFile(finalPath);
@@ -194,7 +284,18 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
             _context.Files.Add(entity);
             _audit.Audit(entity, CmsFileAuditActions.AddFile, BuildCreateDetail(entity));
             _audit.Audit(entity, CmsFileAuditActions.UploadFile, "NewFile");
-            await _context.SaveChangesAsync(ct);
+            try
+            {
+                await _context.SaveChangesAsync(ct);
+            }
+            catch (Exception)
+            {
+                // The upload is already in the managed store; any failed save would orphan it on
+                // disk, so drop the pending changes and remove the stored copy before rethrowing.
+                _context.ChangeTracker.Clear();
+                _storage.DeleteManagedFile(finalPath);
+                throw;
+            }
 
             var names = await GetNamesByIamIdAsync(entity.FileToPeople.Select(p => p.IamId), ct);
             return CmsFileMapper.ToCmsFileDto(entity, names);
@@ -212,6 +313,12 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
             bool encrypt = request.Encrypt ?? false;
             bool allowPublicAccess = request.AllowPublicAccess ?? false;
 
+            // The crypto toggle and any replacement upload below transform the file on disk before
+            // the metadata save. Capture the pre-change state so a failed save can reconcile the
+            // on-disk file back to it (mirrors the import service's encryption rollback).
+            bool originalEncrypted = entity.Encrypted;
+            string? originalKey = entity.Key;
+
             // Encryption toggle happens before any file replacement so the replacement upload
             // is written with the file's final encryption state.
             if (encrypt && !entity.Encrypted)
@@ -263,6 +370,14 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
                 {
                     throw new ArgumentException("File type is not allowed.");
                 }
+                // The replacement keeps the existing record's name and path, so its bytes must
+                // stay the same type; a mismatched extension would leave the stored .pdf holding
+                // .png bytes and serve a corrupt download.
+                string currentExt = Path.GetExtension(entity.FilePath);
+                if (!string.Equals(currentExt, Path.GetExtension(file.FileName), StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new ArgumentException($"The replacement file must be the same type as the original ({currentExt}).");
+                }
                 string tempPath = await _storage.SaveToTempAsync(file, ct);
                 try
                 {
@@ -280,18 +395,71 @@ public async Task<CmsFileDto> CreateFileAsync(CmsFileCreateRequest request, IFor
                     }
                 }
                 _audit.Audit(entity, CmsFileAuditActions.UploadFile, "ReplacingFile");
+
+                // Uploading new content into a soft-deleted record (the overwrite-conflict
+                // flow) makes it live again; metadata-only edits leave deletion state alone.
+                if (entity.DeletedOn != null)
+                {
+                    entity.DeletedOn = null;
+                    changes.Add("Restored file");
+                }
             }
 
             entity.ModifiedOn = DateTime.Now;
             entity.ModifiedBy = CurrentLoginId();
 
             _audit.Audit(entity, CmsFileAuditActions.EditFile, string.Join("; ", changes));
-            await _context.SaveChangesAsync(ct);
+            try
+            {
+                // The file on disk may already be in its new encryption state; cancelling the save
+                // would strand it without a matching key, so it runs to completion even if aborted.
+                await _context.SaveChangesAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // Any failure type means the new state was not persisted; drop the pending changes
+                // and reconcile the on-disk file back to its original encryption state before rethrowing.
+                _context.ChangeTracker.Clear();
+                RevertCryptoOnSaveFailure(entity, originalEncrypted, originalKey);
+                throw;
+            }
 
             var names = await GetNamesByIamIdAsync(entity.FileToPeople.Select(p => p.IamId), ct);
             return CmsFileMapper.ToCmsFileDto(entity, names);
         }
 
+        /// <summary>
+        /// A failed metadata save rolls the database back to the file's original encryption state,
+        /// but the on-disk file was already transformed to the new state. Reconcile it back, or a
+        /// download would read bytes that don't match the stored key. A failure to revert leaves the
+        /// file unreadable, so it is logged as critical rather than swallowed.
+        /// </summary>
+        private void RevertCryptoOnSaveFailure(File entity, bool originalEncrypted, string? originalKey)
+        {
+            if (entity.Encrypted == originalEncrypted || !_storage.ManagedFileExists(entity.FilePath))
+            {
+                return;
+            }
+            try
+            {
+                if (originalEncrypted && !string.IsNullOrEmpty(originalKey))
+                {
+                    // The file had been decrypted; re-encrypt it with the original key.
+                    _encryption.EncryptFileInPlace(entity.FilePath, originalKey);
+                }
+                else if (!originalEncrypted && !string.IsNullOrEmpty(entity.Key))
+                {
+                    // The file had been encrypted; decrypt it with the key that was generated.
+                    _encryption.DecryptFileInPlace(entity.FilePath, entity.Key);
+                }
+            }
+            catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+            {
+                _logger.LogCritical(ex, "CMS file {FileGuid} could not be reverted after a failed save; "
+                    + "its on-disk encryption no longer matches the database.", entity.FileGuid);
+            }
+        }
+
         public async Task<bool> SoftDeleteFileAsync(Guid fileGuid, CancellationToken ct = default)
         {
             var entity = await LoadFileAsync(fileGuid, tracking: true, ct);
@@ -434,11 +602,6 @@ private string CurrentLoginId()
             return _userHelper.GetCurrentUser()?.LoginId ?? "unknown";
         }
 
-        private static string BuildFriendlyName(string folder, string fileName)
-        {
-            return folder.Replace('\\', '-').Replace('/', '-') + "-" + fileName;
-        }
-
         private static string BuildCreateDetail(File entity)
         {
             var parts = new List<string> { $"Folder: {entity.Folder}" };
diff --git a/web/Areas/CMS/Services/CmsFileStorageService.cs b/web/Areas/CMS/Services/CmsFileStorageService.cs
index 28a07c923..4e8714349 100644
--- a/web/Areas/CMS/Services/CmsFileStorageService.cs
+++ b/web/Areas/CMS/Services/CmsFileStorageService.cs
@@ -28,6 +28,15 @@ public interface ICmsFileStorageService
         /// <summary>True if the name exists on disk or in the files table for this folder.</summary>
         bool FileNameInUse(string folder, string fileName);
 
+        /// <summary>
+        /// The name MoveIntoPlace would store folder\fileName under: the name itself when free,
+        /// otherwise the first free name_0..name_999 candidate.
+        /// </summary>
+        string GetAvailableFileName(string folder, string fileName);
+
+        /// <summary>Resolved managed path for folder\fileName (validated to stay under the root).</summary>
+        string BuildManagedPath(string folder, string fileName);
+
         /// <summary>Save an upload to a temp file (outside the storage root); returns the temp path.</summary>
         Task<string> SaveToTempAsync(IFormFile file, CancellationToken ct = default);
 
@@ -82,7 +91,7 @@ public async Task<List<string>> GetFilterFoldersAsync(CancellationToken ct = def
             var dbFolders = await _context.Files.Select(f => f.Folder).Distinct().ToListAsync(ct);
             var topLevel = dbFolders
                 .Where(f => !string.IsNullOrWhiteSpace(f))
-                .Select(f => f!.Split(new[] { '\\', '/' })[0]);
+                .Select(f => f!.Split(['\\', '/'], StringSplitOptions.None)[0]);
             return GetTopLevelFolders()
                 .Union(topLevel, StringComparer.OrdinalIgnoreCase)
                 .OrderBy(f => f, StringComparer.OrdinalIgnoreCase)
@@ -125,6 +134,17 @@ public bool FileNameInUse(string folder, string fileName)
             return _context.Files.Any(f => f.FilePath == targetPath);
         }
 
+        public string GetAvailableFileName(string folder, string fileName)
+        {
+            string finalName = Path.GetFileName(fileName);
+            return FileNameInUse(folder, finalName) ? GetUniqueFileName(folder, finalName) : finalName;
+        }
+
+        public string BuildManagedPath(string folder, string fileName)
+        {
+            return BuildTargetPath(folder, fileName);
+        }
+
         public async Task<string> SaveToTempAsync(IFormFile file, CancellationToken ct = default)
         {
             string tempFolder = Path.Join(Path.GetTempPath(), "Viper-CMS-Uploads");

From 7dd098168d745808a71e6bb7f9c6c3fec59ab689 Mon Sep 17 00:00:00 2001
From: Rex Lorenzo <rexlorenzo@gmail.com>
Date: Fri, 12 Jun 2026 23:43:49 -0700
Subject: [PATCH 7/7] VPR-59 feat(cms): standardize form UX, navigation, and
 list filters

- Surface validation and save errors in an inline banner beside the
  submit button on the content block, left-nav, file, and link forms,
  replacing transient toasts that scrolled out of view.
- Guard unsaved edits on those forms: route-leave prompts on the pages
  and confirm-on-close on the dialogs, via useUnsavedChanges.
- Make Add Left-Nav Menu a settings-only modal opened from the list
  (and the nav via ?add=1) that routes to the page for item editing;
  a shared LeftNavMenuSettingsFields backs both the modal and page.
- Auto-enable Public access when a content block's System is set to
  "Public", with an inline notice, since AllowPublicAccess is the only
  field that actually gates unauthenticated visibility.
- Add a "Public only" filter to the content block list, backed by a new
  isPublic parameter on the list endpoint and service.
- Replace "Back to ..." buttons with breadcrumb headings and align the
  page titles and entry labels to "Add" (including "Add File").
- Default the System filter to an explicit "All" on the menu and block
  lists.
---
 VueApp/src/CMS/components/FileFormDialog.vue  |  55 +++++--
 .../src/CMS/components/LeftNavMenuDialog.vue  | 149 ++++++++++++++++++
 .../components/LeftNavMenuSettingsFields.vue  |  69 ++++++++
 VueApp/src/CMS/pages/ContentBlockEdit.vue     |  89 ++++++++---
 VueApp/src/CMS/pages/ContentBlocks.vue        |  22 ++-
 VueApp/src/CMS/pages/Files.vue                |   3 +-
 VueApp/src/CMS/pages/LeftNavEdit.vue          | 134 ++++++++--------
 VueApp/src/CMS/pages/LeftNavMenus.vue         |  37 ++++-
 .../src/CMS/pages/ManageLinkCollections.vue   |  38 ++++-
 test/CMS/CmsContentBlockServiceTests.cs       |   8 +-
 .../CMS/Controllers/CMSContentController.cs   |   3 +-
 .../CMS/Services/CmsContentBlockService.cs    |   8 +-
 web/Areas/CMS/Services/CmsNavMenu.cs          |   4 +-
 13 files changed, 490 insertions(+), 129 deletions(-)
 create mode 100644 VueApp/src/CMS/components/LeftNavMenuDialog.vue
 create mode 100644 VueApp/src/CMS/components/LeftNavMenuSettingsFields.vue

diff --git a/VueApp/src/CMS/components/FileFormDialog.vue b/VueApp/src/CMS/components/FileFormDialog.vue
index 9f53f3e28..68bba5c8b 100644
--- a/VueApp/src/CMS/components/FileFormDialog.vue
+++ b/VueApp/src/CMS/components/FileFormDialog.vue
@@ -1,9 +1,11 @@
 <template>
     <q-dialog
         :model-value="modelValue"
+        persistent
         aria-labelledby="file-dialog-title"
         @update:model-value="emit('update:modelValue', $event)"
         @hide="resetForm"
+        @keydown.escape="handleClose"
     >
         <q-card style="width: 600px; max-width: 95vw">
             <q-card-section class="row items-center q-pb-none">
@@ -11,7 +13,7 @@
                     id="file-dialog-title"
                     class="text-h6"
                 >
-                    {{ isEdit ? "Edit File" : "Upload File" }}
+                    {{ isEdit ? "Edit File" : "Add File" }}
                 </div>
                 <q-space />
                 <q-btn
@@ -20,7 +22,7 @@
                     round
                     dense
                     aria-label="Close dialog"
-                    v-close-popup
+                    @click="handleClose"
                 />
             </q-card-section>
 
@@ -28,6 +30,7 @@
                 ref="formRef"
                 greedy
                 @submit.prevent="save"
+                @validation-error="onValidationError"
             >
                 <q-card-section class="q-gutter-y-sm">
                     <div
@@ -122,6 +125,13 @@
                             label="Encrypt file"
                         />
                     </div>
+
+                    <StatusBanner
+                        v-if="formError"
+                        type="error"
+                    >
+                        {{ formError }}
+                    </StatusBanner>
                 </q-card-section>
 
                 <q-card-actions align="right">
@@ -130,7 +140,7 @@
                         label="Cancel"
                         dense
                         no-caps
-                        v-close-popup
+                        @click="handleClose"
                     />
                     <q-btn
                         type="submit"
@@ -138,7 +148,6 @@
                         color="primary"
                         dense
                         no-caps
-                        class="q-pr-md"
                         :loading="saving"
                     />
                 </q-card-actions>
@@ -192,7 +201,6 @@
                             color="primary"
                             dense
                             no-caps
-                            class="q-pr-md"
                             :label="conflictChoice === 'rename' ? 'Upload with new name' : 'Overwrite'"
                             :loading="saving"
                             @click="resolveConflict"
@@ -208,8 +216,10 @@
 import { computed, inject, ref, watch } from "vue"
 import { useQuasar } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
+import { useUnsavedChanges } from "@/composables/use-unsaved-changes"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
 import PersonSelector from "@/CMS/components/PersonSelector.vue"
+import StatusBanner from "@/components/StatusBanner.vue"
 import type { CmsFile, CmsFilePerson } from "@/CMS/types/"
 
 const props = defineProps<{
@@ -233,6 +243,7 @@ const acceptedExtensions =
 const isEdit = computed(() => props.file !== null)
 const formRef = ref()
 const saving = ref(false)
+const formError = ref("")
 
 type FileForm = {
     upload: File | null
@@ -266,6 +277,8 @@ const emptyForm = (): FileForm => ({
 
 const form = ref<FileForm>(emptyForm())
 
+const { setInitialState, confirmClose } = useUnsavedChanges(form)
+
 const conflict = ref<NameCheck | null>(null)
 const showConflict = ref(false)
 const conflictChoice = ref<"rename" | "overwrite">("rename")
@@ -304,6 +317,8 @@ watch(
         } else {
             form.value = emptyForm()
         }
+        formError.value = ""
+        setInitialState()
     },
 )
 
@@ -311,9 +326,24 @@ function resetForm() {
     form.value = emptyForm()
     conflict.value = null
     showConflict.value = false
+    formError.value = ""
     formRef.value?.resetValidation()
 }
 
+async function handleClose() {
+    if (await confirmClose()) {
+        emit("update:modelValue", false)
+    }
+}
+
+// The q-form focuses the first invalid field on a failed submit; this surfaces a matching
+// message next to the action buttons so the failure is obvious.
+function onValidationError() {
+    formError.value = isEdit.value
+        ? "Please complete the required fields before saving."
+        : "Please choose a file and complete the required fields before uploading."
+}
+
 async function copyUrl() {
     if (!props.file) return
     try {
@@ -359,8 +389,7 @@ function buildFormData(opts: SubmitOptions = {}): FormData {
 
 async function save() {
     if (saving.value) return
-    const valid = await formRef.value?.validate()
-    if (!valid) return
+    formError.value = ""
 
     // New uploads check the destination name first; a conflict prompts for rename/overwrite.
     if (!isEdit.value && form.value.upload && form.value.folder) {
@@ -410,10 +439,14 @@ async function submitSave(opts: SubmitOptions = {}): Promise<boolean> {
     saving.value = false
 
     if (!res.success) {
-        $q.notify({
-            type: "negative",
-            message: res.errors?.[0] ?? `Failed to ${isEdit.value ? "save" : "upload"} file`,
-        })
+        const message = res.errors?.[0] ?? `Failed to ${isEdit.value ? "save" : "upload"} file`
+        // During conflict resolution the user is in the conflict sub-dialog, so a toast is the
+        // only place they'd see the error; otherwise surface it on the main form banner.
+        if (showConflict.value) {
+            $q.notify({ type: "negative", message })
+        } else {
+            formError.value = message
+        }
         return false
     }
 
diff --git a/VueApp/src/CMS/components/LeftNavMenuDialog.vue b/VueApp/src/CMS/components/LeftNavMenuDialog.vue
new file mode 100644
index 000000000..f7e434a18
--- /dev/null
+++ b/VueApp/src/CMS/components/LeftNavMenuDialog.vue
@@ -0,0 +1,149 @@
+<template>
+    <q-dialog
+        :model-value="modelValue"
+        persistent
+        aria-labelledby="add-menu-title"
+        @update:model-value="emit('update:modelValue', $event)"
+        @keydown.escape="handleClose"
+    >
+        <q-card style="width: 480px; max-width: 95vw">
+            <q-card-section class="row items-center q-pb-none">
+                <div
+                    id="add-menu-title"
+                    class="text-h6"
+                >
+                    Add Left-Nav Menu
+                </div>
+                <q-space />
+                <q-btn
+                    icon="close"
+                    flat
+                    round
+                    dense
+                    aria-label="Close dialog"
+                    @click="handleClose"
+                />
+            </q-card-section>
+
+            <q-form
+                ref="formRef"
+                greedy
+                @submit.prevent="save"
+                @validation-error="onValidationError"
+            >
+                <q-card-section class="q-pt-sm">
+                    <LeftNavMenuSettingsFields v-model="menu" />
+
+                    <StatusBanner
+                        v-if="formError"
+                        type="error"
+                    >
+                        {{ formError }}
+                    </StatusBanner>
+                </q-card-section>
+
+                <q-card-actions align="right">
+                    <q-btn
+                        flat
+                        label="Cancel"
+                        dense
+                        no-caps
+                        @click="handleClose"
+                    />
+                    <q-btn
+                        type="submit"
+                        label="Create Menu"
+                        color="primary"
+                        dense
+                        no-caps
+                        :loading="saving"
+                    >
+                        <template #loading>
+                            <q-spinner
+                                size="1em"
+                                class="q-mr-sm"
+                            />
+                            Create Menu
+                        </template>
+                    </q-btn>
+                </q-card-actions>
+            </q-form>
+        </q-card>
+    </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { inject, ref, watch } from "vue"
+import { useFetch } from "@/composables/ViperFetch"
+import { useUnsavedChanges } from "@/composables/use-unsaved-changes"
+import LeftNavMenuSettingsFields, { type MenuSettings } from "@/CMS/components/LeftNavMenuSettingsFields.vue"
+import StatusBanner from "@/components/StatusBanner.vue"
+
+const props = defineProps<{ modelValue: boolean }>()
+const emit = defineEmits<{
+    "update:modelValue": [value: boolean]
+    created: [leftNavMenuId: number]
+}>()
+
+const apiURL = inject("apiURL") + "cms/left-navs"
+const { post } = useFetch()
+
+const formRef = ref()
+const saving = ref(false)
+const formError = ref("")
+
+const emptyMenu = (): MenuSettings => ({
+    menuHeaderText: "",
+    system: "Viper",
+    viperSectionPath: null,
+    page: null,
+    friendlyName: null,
+})
+
+const menu = ref<MenuSettings>(emptyMenu())
+
+const { setInitialState, confirmClose } = useUnsavedChanges(menu)
+
+// Start each open from a clean, empty form and capture that baseline for the unsaved guard.
+watch(
+    () => props.modelValue,
+    (open) => {
+        if (open) {
+            menu.value = emptyMenu()
+            formError.value = ""
+            formRef.value?.resetValidation()
+            setInitialState()
+        }
+    },
+)
+
+async function handleClose() {
+    if (await confirmClose()) {
+        emit("update:modelValue", false)
+    }
+}
+
+function onValidationError() {
+    formError.value = "Please complete the required fields before creating this menu."
+}
+
+async function save() {
+    formError.value = ""
+    saving.value = true
+    const res = await post(apiURL, {
+        menuHeaderText: menu.value.menuHeaderText,
+        system: menu.value.system,
+        viperSectionPath: menu.value.viperSectionPath || null,
+        page: menu.value.page || null,
+        friendlyName: menu.value.friendlyName || null,
+    })
+    saving.value = false
+
+    if (!res.success) {
+        formError.value = res.errors?.[0] ?? "Failed to create menu"
+        return
+    }
+    emit("created", res.result.leftNavMenuId)
+    emit("update:modelValue", false)
+}
+</script>
diff --git a/VueApp/src/CMS/components/LeftNavMenuSettingsFields.vue b/VueApp/src/CMS/components/LeftNavMenuSettingsFields.vue
new file mode 100644
index 000000000..8f1440197
--- /dev/null
+++ b/VueApp/src/CMS/components/LeftNavMenuSettingsFields.vue
@@ -0,0 +1,69 @@
+<template>
+    <q-input
+        v-model="menu.menuHeaderText"
+        dense
+        outlined
+        label="Menu header"
+        class="required-field q-mb-sm"
+        :rules="[(v: string | null) => (v && v.trim().length > 0) || 'Menu header is required']"
+        aria-required="true"
+        hide-bottom-space
+    />
+
+    <q-select
+        v-model="menu.system"
+        dense
+        options-dense
+        outlined
+        label="System"
+        class="q-mb-sm"
+        :options="['Viper', 'Public']"
+    />
+
+    <q-input
+        v-model="menu.viperSectionPath"
+        dense
+        outlined
+        label="VIPER section path"
+        class="q-mb-sm"
+    />
+
+    <q-input
+        v-model="menu.page"
+        dense
+        outlined
+        label="Page"
+        class="q-mb-sm"
+    />
+
+    <q-input
+        v-model="menu.friendlyName"
+        dense
+        outlined
+        label="Friendly name"
+        hint="Used by pages to look up this menu"
+        class="q-mb-sm"
+    />
+</template>
+
+<script setup lang="ts">
+export type MenuSettings = {
+    menuHeaderText: string | null
+    system: string
+    viperSectionPath: string | null
+    page: string | null
+    friendlyName: string | null
+}
+
+// Shared by the add modal (LeftNavMenuDialog) and the edit page (LeftNavEdit) so the menu
+// settings form stays identical in both. The model is a shared reactive object; field edits
+// mutate it in place, which both callers observe.
+const menu = defineModel<MenuSettings>({ required: true })
+</script>
+
+<style scoped>
+.required-field :deep(.q-field__label)::after {
+    content: " *";
+    color: var(--q-negative);
+}
+</style>
diff --git a/VueApp/src/CMS/pages/ContentBlockEdit.vue b/VueApp/src/CMS/pages/ContentBlockEdit.vue
index 3bfbd9b2b..a1c87a011 100644
--- a/VueApp/src/CMS/pages/ContentBlockEdit.vue
+++ b/VueApp/src/CMS/pages/ContentBlockEdit.vue
@@ -1,20 +1,10 @@
 <template>
     <div class="q-pa-md">
-        <div class="row items-center q-mb-md">
-            <h1 class="q-my-none">
-                {{ isNew ? "Create Content Block" : "Edit Content Block" }}
-            </h1>
-            <q-space />
-            <q-btn
-                flat
-                dense
-                no-caps
-                color="primary"
-                icon="arrow_back"
-                label="Back to Content Blocks"
-                :to="{ name: 'CmsContentBlocks' }"
-            />
-        </div>
+        <BreadcrumbHeading
+            :label="isNew ? 'Add Content Block' : 'Edit Content Block'"
+            parent-label="Manage Content Blocks"
+            :parent-to="{ name: 'CmsContentBlocks' }"
+        />
 
         <StatusBanner
             v-if="block.deletedOn"
@@ -38,6 +28,7 @@
             ref="formRef"
             greedy
             @submit.prevent="saveBlock"
+            @validation-error="onValidationError"
         >
             <div class="row q-col-gutter-lg">
                 <div class="col-12 col-lg-8">
@@ -111,6 +102,7 @@
                                 :options="['Viper', 'Public']"
                                 :rules="[(v: string | null) => !!v || 'System is required']"
                                 hide-bottom-space
+                                @update:model-value="onSystemChange"
                             />
 
                             <q-select
@@ -153,7 +145,17 @@
                             <q-toggle
                                 v-model="block.allowPublicAccess"
                                 label="Public access"
+                                @update:model-value="autoEnabledPublicAccess = false"
                             />
+
+                            <StatusBanner
+                                v-if="autoEnabledPublicAccess"
+                                type="info"
+                                live="assertive"
+                            >
+                                Public system content is visible to everyone, so we turned on Public access. Switch it
+                                off if this block should stay restricted.
+                            </StatusBanner>
                         </q-card-section>
                     </q-card>
 
@@ -220,6 +222,14 @@
                 </div>
             </div>
 
+            <StatusBanner
+                v-if="formError"
+                type="error"
+                class="q-mt-md"
+            >
+                {{ formError }}
+            </StatusBanner>
+
             <div class="q-mt-md">
                 <q-btn
                     type="submit"
@@ -227,7 +237,6 @@
                     :label="isNew ? 'Create' : 'Save'"
                     dense
                     no-caps
-                    class="q-pr-md"
                     :loading="saving"
                 >
                     <template #loading>
@@ -253,9 +262,11 @@
 
 <script setup lang="ts">
 import { computed, inject, onMounted, ref } from "vue"
-import { useRoute, useRouter } from "vue-router"
+import { useRoute, useRouter, onBeforeRouteLeave } from "vue-router"
 import { useQuasar } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
+import { useUnsavedChanges } from "@/composables/use-unsaved-changes"
+import BreadcrumbHeading from "@/components/BreadcrumbHeading.vue"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
 import StatusBanner from "@/components/StatusBanner.vue"
 import type { CmsContentBlock, CmsContentBlockFile, CmsContentHistoryItem, CmsFile } from "@/CMS/types/"
@@ -272,6 +283,7 @@ const isNew = computed(() => blockId.value === null)
 
 const formRef = ref()
 const saving = ref(false)
+const formError = ref("")
 
 const emptyBlock = (): CmsContentBlock => ({
     contentBlockId: 0,
@@ -292,10 +304,17 @@ const emptyBlock = (): CmsContentBlock => ({
 })
 
 const block = ref<CmsContentBlock>(emptyBlock())
+
+const { setInitialState, resetDirtyState, confirmClose } = useUnsavedChanges(block)
+
+// Prompt before leaving with unsaved edits, matching the Effort forms' guard.
+onBeforeRouteLeave(async () => await confirmClose())
+
 const sectionPaths = ref<string[]>([])
 const history = ref<CmsContentHistoryItem[]>([])
 const selectedHistory = ref<CmsContentHistoryItem | null>(null)
 const viewingVersion = ref(false)
+const autoEnabledPublicAccess = ref(false)
 
 const fileToAttach = ref<CmsFile | null>(null)
 const fileOptions = ref<CmsFile[]>([])
@@ -319,6 +338,8 @@ async function loadBlock() {
         return
     }
     block.value = res.result
+    autoEnabledPublicAccess.value = false
+    setInitialState()
     await loadHistory()
 }
 
@@ -385,9 +406,29 @@ function detachFile(file: CmsContentBlockFile) {
     block.value.files = block.value.files.filter((f) => f.fileGuid !== file.fileGuid)
 }
 
+// "Public" system content is publicly visible by convention, but AllowPublicAccess is the only
+// field that actually gates unauthenticated access. Enable it for the user and tell them, so the
+// two stay in sync without silently exposing a block they meant to keep restricted.
+function onSystemChange(value: string | null) {
+    if (value === "Public" && !block.value.allowPublicAccess) {
+        block.value.allowPublicAccess = true
+        autoEnabledPublicAccess.value = true
+    } else {
+        autoEnabledPublicAccess.value = false
+    }
+}
+
+// Fires when the form's submit-time validation fails. The q-form focuses the first invalid
+// field; this surfaces a matching message next to the Create button so the failure is obvious
+// without scrolling back up to the field.
+function onValidationError() {
+    formError.value = isNew.value
+        ? "Please complete the required fields before creating this content block."
+        : "Please complete the required fields before saving your changes."
+}
+
 async function saveBlock() {
-    const valid = await formRef.value?.validate()
-    if (!valid) return
+    formError.value = ""
 
     saving.value = true
     const payload = {
@@ -429,20 +470,23 @@ async function saveBlock() {
     }
 
     if (!res.success) {
-        $q.notify({ type: "negative", message: res.errors?.[0] ?? "Failed to save content block" })
+        formError.value = res.errors?.[0] ?? "Failed to save content block"
         return
     }
 
     $q.notify({ type: "positive", message: isNew.value ? "Content block created" : "Content block saved" })
     viewingVersion.value = false
     selectedHistory.value = null
+    autoEnabledPublicAccess.value = false
 
     if (isNew.value) {
         void router.push({ name: "CmsContentBlockEdit", params: { id: res.result.contentBlockId } })
         block.value = res.result
+        resetDirtyState()
         await loadHistory()
     } else {
         block.value = res.result
+        resetDirtyState()
         await loadHistory()
     }
 }
@@ -458,6 +502,11 @@ async function restoreBlock() {
 onMounted(() => {
     loadSectionPaths()
     loadBlock()
+    // loadBlock sets the baseline for an existing block after it loads; a brand-new form's
+    // baseline is just the empty block, so capture it synchronously here.
+    if (isNew.value) {
+        setInitialState()
+    }
 })
 </script>
 
diff --git a/VueApp/src/CMS/pages/ContentBlocks.vue b/VueApp/src/CMS/pages/ContentBlocks.vue
index 67317307b..557055115 100644
--- a/VueApp/src/CMS/pages/ContentBlocks.vue
+++ b/VueApp/src/CMS/pages/ContentBlocks.vue
@@ -9,7 +9,6 @@
                 label="Add Content Block"
                 no-caps
                 dense
-                class="q-pr-md"
                 :to="{ name: 'CmsContentBlockEdit' }"
             />
         </div>
@@ -32,9 +31,10 @@
                     v-model="filters.system"
                     dense
                     options-dense
-                    clearable
+                    emit-value
+                    map-options
                     label="System"
-                    :options="['Viper', 'Public']"
+                    :options="systemOptions"
                     @update:model-value="loadBlocks"
                 />
             </div>
@@ -63,6 +63,14 @@
                     </template>
                 </q-input>
             </div>
+            <div class="col-auto flex items-center">
+                <q-toggle
+                    v-model="filters.publicOnly"
+                    dense
+                    label="Public only"
+                    @update:model-value="loadBlocks"
+                />
+            </div>
         </div>
 
         <q-table
@@ -153,6 +161,7 @@ const filters = ref({
     system: null as string | null,
     viperSectionPath: null as string | null,
     search: "",
+    publicOnly: false,
 })
 
 const statusOptions = [
@@ -161,6 +170,12 @@ const statusOptions = [
     { label: "All", value: "all" },
 ]
 
+const systemOptions = [
+    { label: "All", value: null },
+    { label: "Viper", value: "Viper" },
+    { label: "Public", value: "Public" },
+]
+
 const columns: QTableProps["columns"] = [
     { name: "title", label: "Title", field: "title", align: "left", sortable: true },
     { name: "system", label: "System", field: "system", align: "left", sortable: true },
@@ -179,6 +194,7 @@ async function loadBlocks() {
         system: filters.value.system,
         viperSectionPath: filters.value.viperSectionPath,
         search: filters.value.search || null,
+        isPublic: filters.value.publicOnly ? "true" : null,
     })
     const res = await get(apiURL + "?" + params)
     blocks.value = res.success ? res.result : []
diff --git a/VueApp/src/CMS/pages/Files.vue b/VueApp/src/CMS/pages/Files.vue
index c708879f6..e2900b27a 100644
--- a/VueApp/src/CMS/pages/Files.vue
+++ b/VueApp/src/CMS/pages/Files.vue
@@ -32,10 +32,9 @@
             <q-btn
                 color="positive"
                 icon="add"
-                label="Upload File"
+                label="Add File"
                 no-caps
                 dense
-                class="q-pr-md"
                 @click="openUploadDialog"
             />
         </div>
diff --git a/VueApp/src/CMS/pages/LeftNavEdit.vue b/VueApp/src/CMS/pages/LeftNavEdit.vue
index a30ec2ab5..3d2076068 100644
--- a/VueApp/src/CMS/pages/LeftNavEdit.vue
+++ b/VueApp/src/CMS/pages/LeftNavEdit.vue
@@ -1,20 +1,10 @@
 <template>
     <div class="q-pa-md">
-        <div class="row items-center q-mb-md">
-            <h1 class="q-my-none">
-                {{ isNew ? "Create Navigation Menu" : "Edit Navigation Menu" }}
-            </h1>
-            <q-space />
-            <q-btn
-                flat
-                dense
-                no-caps
-                color="primary"
-                icon="arrow_back"
-                label="Back to Menus"
-                :to="{ name: 'CmsLeftNavMenus' }"
-            />
-        </div>
+        <BreadcrumbHeading
+            :label="isNew ? 'Add Left-Nav Menu' : 'Edit Left-Nav Menu'"
+            parent-label="Manage Left-Nav Menus"
+            :parent-to="{ name: 'CmsLeftNavMenus' }"
+        />
 
         <div class="row q-col-gutter-lg">
             <div class="col-12 col-md-4">
@@ -29,52 +19,17 @@
                             ref="menuFormRef"
                             greedy
                             @submit.prevent="saveMenu"
+                            @validation-error="onMenuValidationError"
                         >
-                            <q-input
-                                v-model="menu.menuHeaderText"
-                                dense
-                                outlined
-                                label="Menu header"
-                                class="required-field q-mb-sm"
-                                :rules="[(v: string | null) => (v && v.trim().length > 0) || 'Menu header is required']"
-                                aria-required="true"
-                                hide-bottom-space
-                            />
-
-                            <q-select
-                                v-model="menu.system"
-                                dense
-                                options-dense
-                                outlined
-                                label="System"
-                                class="q-mb-sm"
-                                :options="['Viper', 'Public']"
-                            />
+                            <LeftNavMenuSettingsFields v-model="menu" />
 
-                            <q-input
-                                v-model="menu.viperSectionPath"
-                                dense
-                                outlined
-                                label="VIPER section path"
+                            <StatusBanner
+                                v-if="menuFormError"
+                                type="error"
                                 class="q-mb-sm"
-                            />
-
-                            <q-input
-                                v-model="menu.page"
-                                dense
-                                outlined
-                                label="Page"
-                                class="q-mb-sm"
-                            />
-
-                            <q-input
-                                v-model="menu.friendlyName"
-                                dense
-                                outlined
-                                label="Friendly name"
-                                hint="Used by pages to look up this menu"
-                                class="q-mb-sm"
-                            />
+                            >
+                                {{ menuFormError }}
+                            </StatusBanner>
 
                             <q-btn
                                 type="submit"
@@ -82,7 +37,6 @@
                                 :label="isNew ? 'Create Menu' : 'Save Menu Settings'"
                                 dense
                                 no-caps
-                                class="q-pr-md"
                                 :loading="savingMenu"
                             >
                                 <template #loading>
@@ -222,13 +176,20 @@
                             No items yet — add a header or link above.
                         </div>
 
+                        <StatusBanner
+                            v-if="itemsError"
+                            type="error"
+                            class="q-mt-md"
+                        >
+                            {{ itemsError }}
+                        </StatusBanner>
+
                         <div class="q-mt-md">
                             <q-btn
                                 color="primary"
                                 label="Save Items"
                                 dense
                                 no-caps
-                                class="q-pr-md"
                                 :loading="savingItems"
                                 @click="saveItems"
                             >
@@ -258,11 +219,15 @@
 
 <script setup lang="ts">
 import { computed, inject, onMounted, ref, watch } from "vue"
-import { useRoute, useRouter } from "vue-router"
+import { useRoute, useRouter, onBeforeRouteLeave } from "vue-router"
 import { useQuasar } from "quasar"
 import { VueDraggable } from "vue-draggable-plus"
 import { useFetch } from "@/composables/ViperFetch"
+import { useUnsavedChanges } from "@/composables/use-unsaved-changes"
+import BreadcrumbHeading from "@/components/BreadcrumbHeading.vue"
+import LeftNavMenuSettingsFields from "@/CMS/components/LeftNavMenuSettingsFields.vue"
 import PermissionSelector from "@/CMS/components/PermissionSelector.vue"
+import StatusBanner from "@/components/StatusBanner.vue"
 import type { CmsLeftNavMenu } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "cms/left-navs"
@@ -277,6 +242,8 @@ const isNew = computed(() => menuId.value === null)
 const menuFormRef = ref()
 const savingMenu = ref(false)
 const savingItems = ref(false)
+const menuFormError = ref("")
+const itemsError = ref("")
 
 const menu = ref({
     menuHeaderText: "" as string | null,
@@ -299,6 +266,13 @@ const items = ref<EditableItem[]>([])
 let savedMenu: CmsLeftNavMenu | null = null
 let nextKey = -1
 
+// Dirty tracking spans both the menu settings and the items list, so unsaved edits in
+// either half prompt before navigating away (matching the Effort forms' guard).
+const formSnapshot = computed(() => ({ menu: menu.value, items: items.value }))
+const { setInitialState, resetDirtyState, confirmClose } = useUnsavedChanges(formSnapshot)
+
+onBeforeRouteLeave(async () => await confirmClose())
+
 function toEditableItems(source: CmsLeftNavMenu): EditableItem[] {
     return source.items.map((i) => ({
         key: i.leftNavItemId,
@@ -327,11 +301,19 @@ async function loadMenu() {
         friendlyName: res.result.friendlyName,
     }
     items.value = toEditableItems(res.result)
+    setInitialState()
+}
+
+// The q-form focuses the first invalid field on a failed submit; this surfaces a matching
+// message next to the save button so the failure is obvious without scrolling up.
+function onMenuValidationError() {
+    menuFormError.value = isNew.value
+        ? "Please complete the required fields before creating this menu."
+        : "Please complete the required fields before saving."
 }
 
 async function saveMenu() {
-    const valid = await menuFormRef.value?.validate()
-    if (!valid) return
+    menuFormError.value = ""
 
     savingMenu.value = true
     const payload = {
@@ -345,10 +327,11 @@ async function saveMenu() {
     savingMenu.value = false
 
     if (!res.success) {
-        $q.notify({ type: "negative", message: "Failed to save menu" })
+        menuFormError.value = res.errors?.[0] ?? "Failed to save menu"
         return
     }
     $q.notify({ type: "positive", message: isNew.value ? "Menu created — now add items" : "Menu settings saved" })
+    resetDirtyState()
     if (isNew.value) {
         // the menuId watch loads the created menu once the route changes
         void router.push({ name: "CmsLeftNavEdit", params: { id: res.result.leftNavMenuId } })
@@ -378,9 +361,10 @@ function moveItem(index: number, direction: -1 | 1) {
 }
 
 async function saveItems() {
+    itemsError.value = ""
     const emptyItem = items.value.find((i) => !i.menuItemText || i.menuItemText.trim() === "")
     if (emptyItem) {
-        $q.notify({ type: "negative", message: "Every item needs text" })
+        itemsError.value = "Every item needs text — fill in the empty item before saving."
         return
     }
 
@@ -396,17 +380,19 @@ async function saveItems() {
     savingItems.value = false
 
     if (!res.success) {
-        $q.notify({ type: "negative", message: "Failed to save items" })
+        itemsError.value = res.errors?.[0] ?? "Failed to save items"
         return
     }
     $q.notify({ type: "positive", message: "Items saved" })
     savedMenu = res.result
     items.value = toEditableItems(res.result)
+    resetDirtyState()
 }
 
 function revertItems() {
     if (savedMenu) {
         items.value = toEditableItems(savedMenu)
+        itemsError.value = ""
         $q.notify({ type: "info", message: "Items reverted to last saved state" })
     }
 }
@@ -425,12 +411,21 @@ watch(menuId, (id) => {
         }
         items.value = []
         savedMenu = null
+        menuFormError.value = ""
+        itemsError.value = ""
+        setInitialState()
     } else {
         void loadMenu()
     }
 })
 
-onMounted(loadMenu)
+onMounted(() => {
+    loadMenu()
+    // loadMenu sets the baseline for an existing menu; a brand-new form's baseline is empty.
+    if (isNew.value) {
+        setInitialState()
+    }
+})
 </script>
 
 <style scoped>
@@ -452,9 +447,4 @@ onMounted(loadMenu)
 .handle:active {
     cursor: grabbing;
 }
-
-.required-field :deep(.q-field__label)::after {
-    content: " *";
-    color: var(--q-negative);
-}
 </style>
diff --git a/VueApp/src/CMS/pages/LeftNavMenus.vue b/VueApp/src/CMS/pages/LeftNavMenus.vue
index 874184798..0c796918a 100644
--- a/VueApp/src/CMS/pages/LeftNavMenus.vue
+++ b/VueApp/src/CMS/pages/LeftNavMenus.vue
@@ -9,8 +9,7 @@
                 label="Add Left-Nav Menu"
                 no-caps
                 dense
-                class="q-pr-md"
-                :to="{ name: 'CmsLeftNavEdit' }"
+                @click="showAddDialog = true"
             />
         </div>
 
@@ -20,9 +19,10 @@
                     v-model="filters.system"
                     dense
                     options-dense
-                    clearable
+                    emit-value
+                    map-options
                     label="System"
-                    :options="['Viper', 'Public']"
+                    :options="systemOptions"
                     @update:model-value="loadMenus"
                 />
             </div>
@@ -90,29 +90,45 @@
                 </q-td>
             </template>
         </q-table>
+
+        <LeftNavMenuDialog
+            v-model="showAddDialog"
+            @created="onMenuCreated"
+        />
     </div>
 </template>
 
 <script setup lang="ts">
 import { inject, onMounted, ref } from "vue"
+import { useRoute, useRouter } from "vue-router"
 import { useQuasar, type QTableProps } from "quasar"
 import { useFetch } from "@/composables/ViperFetch"
 import EditButton from "@/CMS/components/EditButton.vue"
+import LeftNavMenuDialog from "@/CMS/components/LeftNavMenuDialog.vue"
 import ModifiedStamp from "@/CMS/components/ModifiedStamp.vue"
 import type { CmsLeftNavMenu } from "@/CMS/types/"
 
 const apiURL = inject("apiURL") + "cms/left-navs"
+const route = useRoute()
+const router = useRouter()
 const $q = useQuasar()
 const { get, del, createUrlSearchParams } = useFetch()
 
 const menus = ref<CmsLeftNavMenu[]>([])
 const loading = ref(false)
+const showAddDialog = ref(false)
 
 const filters = ref({
     system: null as string | null,
     search: "",
 })
 
+const systemOptions = [
+    { label: "All", value: null },
+    { label: "Viper", value: "Viper" },
+    { label: "Public", value: "Public" },
+]
+
 const columns: QTableProps["columns"] = [
     { name: "menuHeaderText", label: "Menu Header", field: "menuHeaderText", align: "left", sortable: true },
     { name: "system", label: "System", field: "system", align: "left", sortable: true },
@@ -158,5 +174,16 @@ async function deleteMenu(menu: CmsLeftNavMenu) {
     loadMenus()
 }
 
-onMounted(loadMenus)
+function onMenuCreated(leftNavMenuId: number) {
+    // After creating the menu's settings, go to the page to manage its items.
+    void router.push({ name: "CmsLeftNavEdit", params: { id: leftNavMenuId } })
+}
+
+onMounted(() => {
+    // The "Add Left-Nav Menu" nav entry deep-links here with ?add=1 to open the dialog.
+    if (route.query.add === "1") {
+        showAddDialog.value = true
+    }
+    loadMenus()
+})
 </script>
diff --git a/VueApp/src/CMS/pages/ManageLinkCollections.vue b/VueApp/src/CMS/pages/ManageLinkCollections.vue
index 4468efbb2..df335063c 100644
--- a/VueApp/src/CMS/pages/ManageLinkCollections.vue
+++ b/VueApp/src/CMS/pages/ManageLinkCollections.vue
@@ -211,7 +211,7 @@
                 label="Add Link"
                 @click="showLinkDialog = true"
                 no-caps
-                class="q-pr-md q-mt-sm"
+                class="q-mt-sm"
             />
             <q-dialog
                 v-model="showLinkDialog"
@@ -309,6 +309,14 @@
                             />
                         </fieldset>
                     </q-card-section>
+                    <q-card-section
+                        v-if="linkFormError"
+                        class="q-pt-none"
+                    >
+                        <StatusBanner type="error">
+                            {{ linkFormError }}
+                        </StatusBanner>
+                    </q-card-section>
                     <q-card-actions align="right">
                         <q-btn
                             v-if="link.linkId > 0"
@@ -317,7 +325,6 @@
                             dense
                             no-caps
                             color="negative"
-                            class="q-pr-md"
                         />
                         <q-btn
                             label="Save"
@@ -325,7 +332,6 @@
                             dense
                             no-caps
                             color="primary"
-                            class="q-pr-md"
                         />
                     </q-card-actions>
                 </q-card>
@@ -460,6 +466,8 @@ import type { Ref } from "vue"
 import { VueDraggable } from "vue-draggable-plus"
 import type { LinkCollection, Link, LinkCollectionTagCategory, LinkWithTags } from "@/CMS/types/"
 import { useFetch } from "@/composables/ViperFetch"
+import { useUnsavedChanges } from "@/composables/use-unsaved-changes"
+import StatusBanner from "@/components/StatusBanner.vue"
 import { isSafeUrl } from "@/CMS/utils/url"
 
 const apiURL = (inject("apiURL") + "cms/linkCollections/") as string
@@ -484,6 +492,16 @@ const links: Ref<LinkWithTags[]> = ref([])
 const link: Ref<LinkWithTags> = ref({ linkId: 0, url: "", title: "", description: "", tags: {}, sortOrder: 0 })
 const showLinkDialog: Ref<boolean> = ref(false)
 const linkFormRef: Ref<any> = ref(null)
+const linkFormError = ref("")
+const { setInitialState: setLinkBaseline, confirmClose: confirmLinkClose } = useUnsavedChanges(link)
+
+// Capture the dialog's clean baseline whenever it opens, for the unsaved-changes guard.
+watch(showLinkDialog, (open) => {
+    if (open) {
+        linkFormError.value = ""
+        setLinkBaseline()
+    }
+})
 
 const justMovedLinkId: Ref<number | null> = ref(null)
 const justMovedTagId: Ref<number | null> = ref(null)
@@ -673,8 +691,12 @@ function getTagsForCategory(element: LinkWithTags, categoryId: number) {
 }
 
 async function saveLink() {
+    linkFormError.value = ""
     const valid = await linkFormRef.value?.validate()
-    if (!valid) return
+    if (!valid) {
+        linkFormError.value = "Please complete the required fields before saving this link."
+        return
+    }
     const { post, put } = useFetch()
     const isEdit = link.value.linkId !== 0
     let saveRes
@@ -698,13 +720,13 @@ async function saveLink() {
     }
 
     if (!saveRes.success) {
-        $q.notify({ type: "negative", message: `Failed to ${isEdit ? "update" : "create"} link` })
+        linkFormError.value = saveRes.errors?.[0] ?? `Failed to ${isEdit ? "update" : "create"} link`
         return
     }
 
     const tagsRes = await put(apiURL + collectionId.value + "/links/" + link.value.linkId + "/tags", link.value.tags)
     if (!tagsRes.success) {
-        $q.notify({ type: "negative", message: "Link saved but tags failed to update" })
+        linkFormError.value = "Link saved but tags failed to update"
         return
     }
 
@@ -719,9 +741,11 @@ function clickLink(li: LinkWithTags) {
     showLinkDialog.value = true
 }
 
-function cancelLinkDialog() {
+async function cancelLinkDialog() {
+    if (!(await confirmLinkClose())) return
     link.value = { linkId: 0, url: "", title: "", description: "", tags: {}, sortOrder: 0 }
     showLinkDialog.value = false
+    linkFormError.value = ""
     linkFormRef.value?.resetValidation()
 }
 
diff --git a/test/CMS/CmsContentBlockServiceTests.cs b/test/CMS/CmsContentBlockServiceTests.cs
index 3c5c2620e..a198dd185 100644
--- a/test/CMS/CmsContentBlockServiceTests.cs
+++ b/test/CMS/CmsContentBlockServiceTests.cs
@@ -83,9 +83,9 @@ public async Task GetContentBlocks_FiltersByStatus()
         await SeedBlockAsync();
         await SeedBlockAsync(b => b.DeletedOn = DateTime.Now);
 
-        var active = await _service.GetContentBlocksAsync("active", null, null, null, TestContext.Current.CancellationToken);
-        var deleted = await _service.GetContentBlocksAsync("deleted", null, null, null, TestContext.Current.CancellationToken);
-        var all = await _service.GetContentBlocksAsync("all", null, null, null, TestContext.Current.CancellationToken);
+        var active = await _service.GetContentBlocksAsync("active", null, null, null, ct: TestContext.Current.CancellationToken);
+        var deleted = await _service.GetContentBlocksAsync("deleted", null, null, null, ct: TestContext.Current.CancellationToken);
+        var all = await _service.GetContentBlocksAsync("all", null, null, null, ct: TestContext.Current.CancellationToken);
 
         Assert.Single(active);
         Assert.Single(deleted);
@@ -97,7 +97,7 @@ public async Task GetContentBlocks_ListOmitsContent()
     {
         await SeedBlockAsync();
 
-        var list = await _service.GetContentBlocksAsync("active", null, null, null, TestContext.Current.CancellationToken);
+        var list = await _service.GetContentBlocksAsync("active", null, null, null, ct: TestContext.Current.CancellationToken);
 
         Assert.Equal(string.Empty, list[0].Content);
     }
diff --git a/web/Areas/CMS/Controllers/CMSContentController.cs b/web/Areas/CMS/Controllers/CMSContentController.cs
index e83e4bfed..e2229941c 100644
--- a/web/Areas/CMS/Controllers/CMSContentController.cs
+++ b/web/Areas/CMS/Controllers/CMSContentController.cs
@@ -39,9 +39,10 @@ public async Task<ActionResult<List<ContentBlockDto>>> GetContentBlocks(
             string? system = null,
             string? viperSectionPath = null,
             string? search = null,
+            bool? isPublic = null,
             CancellationToken ct = default)
         {
-            return await _blockService.GetContentBlocksAsync(status, system, viperSectionPath, search, ct);
+            return await _blockService.GetContentBlocksAsync(status, system, viperSectionPath, search, isPublic, ct);
         }
 
         //GET: content/section-paths
diff --git a/web/Areas/CMS/Services/CmsContentBlockService.cs b/web/Areas/CMS/Services/CmsContentBlockService.cs
index 22cc40c0e..06c41c437 100644
--- a/web/Areas/CMS/Services/CmsContentBlockService.cs
+++ b/web/Areas/CMS/Services/CmsContentBlockService.cs
@@ -19,7 +19,7 @@ public CmsConcurrencyException(string message) : base(message) { }
     public interface ICmsContentBlockService
     {
         Task<List<ContentBlockDto>> GetContentBlocksAsync(string status, string? system, string? viperSectionPath,
-            string? search, CancellationToken ct = default);
+            string? search, bool? isPublic = null, CancellationToken ct = default);
 
         Task<ContentBlockDto?> GetContentBlockAsync(int contentBlockId, CancellationToken ct = default);
 
@@ -62,7 +62,7 @@ public CmsContentBlockService(VIPERContext context, IHtmlSanitizerService saniti
         }
 
         public async Task<List<ContentBlockDto>> GetContentBlocksAsync(string status, string? system,
-            string? viperSectionPath, string? search, CancellationToken ct = default)
+            string? viperSectionPath, string? search, bool? isPublic = null, CancellationToken ct = default)
         {
             var query = _context.ContentBlocks
                 .AsNoTracking()
@@ -85,6 +85,10 @@ public async Task<List<ContentBlockDto>> GetContentBlocksAsync(string status, st
             {
                 query = query.Where(b => b.ViperSectionPath == viperSectionPath);
             }
+            if (isPublic != null)
+            {
+                query = query.Where(b => b.AllowPublicAccess == isPublic);
+            }
             if (!string.IsNullOrEmpty(search))
             {
                 query = query.Where(b => (b.Title != null && b.Title.Contains(search))
diff --git a/web/Areas/CMS/Services/CmsNavMenu.cs b/web/Areas/CMS/Services/CmsNavMenu.cs
index c5bc0c6bc..9f908e7ec 100644
--- a/web/Areas/CMS/Services/CmsNavMenu.cs
+++ b/web/Areas/CMS/Services/CmsNavMenu.cs
@@ -49,14 +49,14 @@ public NavMenu Nav()
             {
                 nav.Add(new NavMenuItem { MenuItemText = "Files", IsHeader = true });
                 nav.Add(new NavMenuItem { MenuItemText = "Manage Files", MenuItemURL = "ManageFiles", IndentLevel = 1 });
-                nav.Add(new NavMenuItem { MenuItemText = "Upload File", MenuItemURL = "ManageFiles?upload=1", IndentLevel = 1 });
+                nav.Add(new NavMenuItem { MenuItemText = "Add File", MenuItemURL = "ManageFiles?upload=1", IndentLevel = 1 });
             }
 
             if (canManageNav)
             {
                 nav.Add(new NavMenuItem { MenuItemText = "Left Navigation Menus", IsHeader = true });
                 nav.Add(new NavMenuItem { MenuItemText = "Manage Left-Nav Menus", MenuItemURL = "ManageLeftNav", IndentLevel = 1 });
-                nav.Add(new NavMenuItem { MenuItemText = "Add Left-Nav Menu", MenuItemURL = "ManageLeftNav/Edit", IndentLevel = 1 });
+                nav.Add(new NavMenuItem { MenuItemText = "Add Left-Nav Menu", MenuItemURL = "ManageLeftNav?add=1", IndentLevel = 1 });
             }
 
             return new NavMenu("Content Management System", nav);