@svgrid/enterprise 2.0.4 → 2.2.0

package/src/studio/samples/projects.ts

@@ -1,6 +1,6 @@
 import type { EntitySchema } from '../../schema.js'
 import type { FormatRule } from '../project.js'
-import { screen, formScreen, boardScreen, calendarScreen, detailScreen, project, dashScreen, statusPills, pad, ids, type SampleApp } from './shared.js'
+import { screen, formScreen, boardScreen, schedulerScreen, detailScreen, project, dashScreen, statusPills, pad, ids, type SampleApp } from './shared.js'
 
 const projectsEntity: EntitySchema = {
   name: 'projects',
@@ -183,7 +183,7 @@ export const projectTracker: SampleApp = {
         formScreen(tasks, { id: 'tasks', title: 'Tasks', order: 5 }, undefined, { format: taskFormats, summaries: true, rowActions: [{ kind: 'edit' }] }, ['status', 'priority', 'assigneeId']),
         formScreen(members, { id: 'members', title: 'Members', order: 6 }, undefined, { format: statusPills(members, 'role'), summaries: true }, ['role']),
         // Schedule: tasks placed on a month calendar by due date.
-        calendarScreen(tasks, { id: 'calendar', title: 'Schedule', order: 7 }, { dateField: 'dueDate', titleField: 'title', filter: ['status', 'priority', 'assigneeId'] }),
+        schedulerScreen(tasks, { id: 'calendar', title: 'Schedule', order: 7 }, { startField: 'startedAt', endField: 'dueDate', titleField: 'title', colorField: 'priority', resourceField: 'assigneeId', initialView: 'timelineWeek' }),
       ],
     })
   },

package/src/studio/samples/restaurant.ts

@@ -1,6 +1,6 @@
 import type { EntitySchema } from '../../schema.js'
 import type { FormatRule } from '../project.js'
-import { screen, formScreen, calendarScreen, detailScreen, project, dashScreen, statusPills, pad, ids, type SampleApp } from './shared.js'
+import { screen, formScreen, schedulerScreen, detailScreen, project, dashScreen, statusPills, pad, ids, type SampleApp } from './shared.js'
 
 const menuItems: EntitySchema = {
   name: 'menuItems',
@@ -173,7 +173,9 @@ export const restaurant: SampleApp = {
           { filter: ['category', 'available'], span: 3 },
           { grid: true, format: menuFormats, summaries: true, rowActions: [{ kind: 'edit' }], span: 3 },
         ]),
-        calendarScreen(orders, { id: 'reservations', title: 'Reservations', order: 2 }, { dateField: 'reservationTime', titleField: 'tableId', colorField: 'status', filter: ['status', 'tableId'] }),
+        // Resource scheduler: a column per table, reservations placed by time + tinted by
+        // status, drag-to-reassign a table + a detail drawer (day view). Was a month calendar.
+        schedulerScreen(orders, { id: 'reservations', title: 'Reservations', order: 2 }, { startField: 'reservationTime', titleField: 'name', colorField: 'status', resourceField: 'tableId', initialView: 'day' }),
         detailScreen(tables, { id: 'table-detail', title: 'Table detail', order: 3 }, {
           titleField: 'name', statusField: 'section', metricFields: ['seats'],
           related: [{ entity: 'orders', foreignKey: 'tableId', label: 'Orders', titleField: 'customerPhone', subtitleField: 'total', dateField: 'reservationTime', statusField: 'status' }],

package/src/studio/samples/samples.test.ts

@@ -196,12 +196,20 @@ describe('sample apps', () => {
       }
     })
 
-    it('calendar apps resolve relation title fields to their display columns', () => {
-      const cases: Record<string, string> = { clinic: 'patient', gym: 'class', restaurant: 'table', fleet: 'driver' }
-      for (const [id, title] of Object.entries(cases)) {
+    it('scheduler apps resolve relation title + resource fields to their display columns', () => {
+      // The scheduler grid view carries titleField + resourceField in the `scheduler={{ ... }}`
+      // config; relation FKs resolve to their display columns (classId -> class, etc.).
+      const cases: Record<string, { title: string; resource?: string }> = {
+        clinic: { title: 'patient', resource: 'doctor' },
+        gym: { title: 'member', resource: 'class' },
+        restaurant: { title: 'name', resource: 'table' }, // title is a plain text field
+        fleet: { title: 'driver', resource: 'vehicle' },
+      }
+      for (const [id, { title, resource }] of Object.entries(cases)) {
         const all = emitStudioProject(getSampleApp(id)!.build()).map((f) => f.contents).join('\n')
-        const tag = all.match(/<SvSchedule[\s\S]*?\/>/)![0]
-        expect(tag, `${id}: schedule title not resolved`).toContain(`titleField="${title}"`)
+        const tag = all.match(/scheduler=\{\{[\s\S]*?\}\}/)![0]
+        expect(tag, `${id}: schedule title not resolved`).toContain(`titleField: '${title}'`)
+        if (resource) expect(tag, `${id}: resource not resolved`).toContain(`resourceField: '${resource}'`)
       }
     })
   })