@stacksjs/defaults 0.70.357 → 0.70.358

package/app/Actions/Dashboard/Models/GetModels.ts

@@ -3,15 +3,18 @@ import { Glob } from 'bun'
 import { Action } from '@stacksjs/actions'
 import { path } from '@stacksjs/path'
 import { countRows } from '../../../../resources/functions/dashboard/data'
+import { dashboardOperationalError } from '../dashboard-response'
 
 export default new Action({
   name: 'GetModels',
   description: 'Gets the application models.',
+  method: 'GET',
 
   async handle() {
-    const glob = new Glob('**/*.ts')
-    const scanOptions = { cwd: path.userModelsPath(), onlyFiles: true }
-    const displayModels: Model[] = []
+    try {
+      const glob = new Glob('**/*.ts')
+      const scanOptions = { cwd: path.userModelsPath(), onlyFiles: true }
+      const displayModels: Model[] = []
 
     for await (const file of glob.scan(scanOptions)) {
       const model = (await import(path.userModelsPath(file))).default as Model
@@ -31,9 +34,13 @@ export default new Action({
       displayModels.length = 8
     displayModels.sort((a, b) => (a.name || '').localeCompare(b.name || ''))
 
-    return await Promise.all(displayModels.map(async model => ({
-      model: model.name,
-      total: await countRows(model),
-    })))
+      return await Promise.all(displayModels.map(async model => ({
+        model: model.name,
+        total: await countRows(model),
+      })))
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Dashboard models could not be loaded.', 'GetModels')
+    }
   },
 })

package/app/Actions/Dashboard/Models/GetSubscriberCount.ts

@@ -1,12 +1,19 @@
 import { Action } from '@stacksjs/actions'
 import { Subscriber } from '@stacksjs/orm'
+import { dashboardOperationalError } from '../dashboard-response'
 
 export default new Action({
   name: 'GetSubscriberCount',
   description: 'Gets the total number of subscribers.',
+  method: 'GET',
   apiResponse: true,
 
   async handle() {
-    return await Subscriber.count()
+    try {
+      return await Subscriber.count()
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Subscriber total could not be loaded.', 'GetSubscriberCount')
+    }
   },
 })

package/app/Actions/Dashboard/Models/GetUserCount.ts

@@ -1,12 +1,19 @@
 import { Action } from '@stacksjs/actions'
 import { User } from '@stacksjs/orm'
+import { dashboardOperationalError } from '../dashboard-response'
 
 export default new Action({
   name: 'GetUserCount',
   description: 'Gets the total number of users.',
+  method: 'GET',
   apiResponse: true,
 
   async handle() {
-    return User.count()
+    try {
+      return await User.count()
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'User total could not be loaded.', 'GetUserCount')
+    }
   },
 })

package/app/Actions/Dashboard/Releases/ReleaseIndexAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { Release } from '@stacksjs/orm'
+import { dashboardOperationalError } from '../dashboard-response'
 import { normalizeReleaseRecord, summarizeReleases } from './release-records'
 
 export default new Action({
@@ -9,12 +10,17 @@ export default new Action({
   apiResponse: true,
 
   async handle() {
-    const records = await Release.orderByDesc('id').limit(200).get()
-    const releases = records.map(normalizeReleaseRecord)
+    try {
+      const records = await Release.orderByDesc('id').limit(200).get()
+      const releases = records.map(normalizeReleaseRecord)
 
-    return {
-      releases,
-      summary: summarizeReleases(releases),
+      return {
+        releases,
+        summary: summarizeReleases(releases),
+      }
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Release history could not be loaded.', 'ReleaseIndexAction')
     }
   },
 })

package/app/Actions/Dashboard/Settings/MailSettingsGetAction.ts

@@ -1,4 +1,5 @@
 import { Action } from '@stacksjs/actions'
+import { dashboardOperationalError } from '../dashboard-response'
 import { readMailSettings } from './mail-settings'
 
 export default new Action({
@@ -8,9 +9,14 @@ export default new Action({
   apiResponse: true,
 
   async handle() {
-    return Response.json(
-      { settings: await readMailSettings() },
-      { headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache' } },
-    )
+    try {
+      return Response.json(
+        { settings: await readMailSettings() },
+        { headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache' } },
+      )
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Mail settings could not be loaded.', 'MailSettingsGetAction')
+    }
   },
 })

package/app/Actions/Dashboard/Settings/MailSettingsUpdateAction.ts

@@ -1,6 +1,7 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import { response } from '@stacksjs/router'
+import { dashboardOperationalError } from '../dashboard-response'
 import { updateMailSettings } from './mail-settings'
 
 export default new Action({
@@ -10,7 +11,13 @@ export default new Action({
   apiResponse: true,
 
   async handle(request: RequestInstance) {
-    const result = await updateMailSettings(await request.all())
+    let result
+    try {
+      result = await updateMailSettings(await request.all())
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Mail settings could not be saved.', 'MailSettingsUpdateAction', 500)
+    }
 
     if ('validation' in result) {
       return response.json({

package/ide/vscode/package.json

@@ -2,7 +2,7 @@
   "publisher": "Stacks",
   "name": "vscode-stacks",
   "displayName": "Stacks",
-  "version": "0.70.357",
+  "version": "0.70.358",
   "description": "A modern Stacks development environment.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/defaults",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.357",
+  "version": "0.70.358",
   "description": "The complete managed Stacks application scaffold, including runtime defaults, AI guidance, editor metadata, and npm-backed project support files.",
   "author": "Chris Breuer",
   "license": "MIT",

package/resources/components/Dashboard/UI/Modal.stx

@@ -19,25 +19,68 @@ const sizeClasses = {
 </script>
 <script client>
 const open = useReactiveProp('isOpen', false)
+const liveClosable = useReactiveProp('closable', true)
 const liveTitle = useReactiveProp('title', '')
 const liveDescription = useReactiveProp('description', '')
+const dialog = useRef<HTMLDialogElement>('dashboardModalDialog')
+const activeElement = useActiveElement()
+const scrollLocked = useScrollLock()
 const emit = defineEmits()
+let restoreFocus: HTMLElement | null = null
 
 function closeModal(): void {
+  if (!liveClosable()) return
   emit('close')
 }
-</script>
-  <div :if="open()" class="fixed inset-y-0 overflow-y-auto right-0 z-[55] dashboard-modal-layer">
-    <!-- Overlay -->
-    <button type="button" class="absolute inset-0 w-full bg-black/50 backdrop-blur-sm" aria-label="Close modal" @click="closeModal"></button>
 
+function handleCancel(event: Event): void {
+  event.preventDefault()
+  closeModal()
+}
+
+function handleBackdropClick(event: MouseEvent): void {
+  if (event.target === event.currentTarget)
+    closeModal()
+}
+
+effect(() => {
+  const isOpen = open()
+  scrollLocked.value = isOpen
+
+  if (isOpen) {
+    const focused = peek(() => activeElement.value)
+    if (focused instanceof HTMLElement)
+      restoreFocus = focused
+    void nextTick(() => {
+      const element = dialog.current
+      if (!element) return
+      if (!element.open)
+        element.showModal()
+      element.focus()
+    })
+    return
+  }
+
+  if (dialog.current?.open)
+    dialog.current.close()
+  const target = restoreFocus
+  restoreFocus = null
+  if (target)
+    void nextTick(() => target.focus())
+})
+</script>
+  <dialog
+    :if="open()"
+    ref="dashboardModalDialog"
+    role="dialog"
+    aria-modal="true"
+    :aria-label="liveTitle() || 'Dialog'"
+    class="fixed inset-0 m-0 p-0 h-dvh max-h-none w-screen max-w-none overflow-y-auto z-[55] bg-transparent dashboard-modal-layer dashboard-modal-dialog"
+    @cancel="handleCancel"
+  >
     <!-- Modal container -->
-    <div class="flex items-center justify-center p-4 min-h-full">
+    <div class="flex items-center justify-center p-4 min-h-full" @click="handleBackdropClick">
       <div
-        role="dialog"
-        aria-modal="true"
-        :aria-label="liveTitle() || 'Dialog'"
-        tabindex="-1"
         class="relative w-full rounded-xl bg-white dark:bg-neutral-900 shadow-2xl {{ sizeClasses[size] }}"
       >
         <!-- Header -->
@@ -78,4 +121,11 @@ function closeModal(): void {
         @endif
       </div>
     </div>
-  </div>
+  </dialog>
+
+<style>
+.dashboard-modal-dialog::backdrop {
+  background: rgb(0 0 0 / 50%);
+  backdrop-filter: blur(4px);
+}
+</style>

package/views/dashboard/stores/auth.ts

@@ -33,6 +33,7 @@ export const authStore = defineStore('auth', () => {
   const loading = state(false)
   const error = state<string | null>(null)
   const loaded = state(false)
+  let pendingLoad: Promise<void> | null = null
 
   const isAdmin = derived(() => {
     if (!loaded()) return false
@@ -50,8 +51,7 @@ export const authStore = defineStore('auth', () => {
     return roles().includes('client')
   })
 
-  async function load(): Promise<void> {
-    if (loading() || loaded()) return
+  async function resolveIdentity(): Promise<void> {
     loading.set(true)
     error.set(null)
     try {
@@ -88,7 +88,23 @@ export const authStore = defineStore('auth', () => {
     }
   }
 
+  function load(): Promise<void> {
+    if (loaded())
+      return Promise.resolve()
+
+    if (pendingLoad)
+      return pendingLoad
+
+    pendingLoad = resolveIdentity().finally(() => {
+      pendingLoad = null
+    })
+    return pendingLoad
+  }
+
   async function refresh(): Promise<void> {
+    if (pendingLoad)
+      await pendingLoad
+
     loaded.set(false)
     await load()
   }