From c8671e80428771624b6e63bb8eb7ededee8bc684 Mon Sep 17 00:00:00 2001
From: Pavel Baluev <pavel.baluev@parity.io>
Date: Sun, 24 Mar 2024 23:01:46 +0100
Subject: [PATCH] Update schema for office.id and office.area.id

---
 .../client/components/AdminDashboardStats.tsx | 33 ++++++++-----------
 src/server/app-config/schemas.ts              |  6 ++--
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/modules/room-reservation/client/components/AdminDashboardStats.tsx b/src/modules/room-reservation/client/components/AdminDashboardStats.tsx
index 6c9f57ae..fc66f3e8 100644
--- a/src/modules/room-reservation/client/components/AdminDashboardStats.tsx
+++ b/src/modules/room-reservation/client/components/AdminDashboardStats.tsx
@@ -7,7 +7,14 @@ import { StackedBarChart, Card } from '#client/components/charts'
 import { DATE_FORMAT } from '#client/constants'
 import * as stores from '#client/stores'
 import * as fp from '#shared/utils/fp'
-import { H2, HR, Placeholder, Table, UserLabel, WidgetWrapper } from '#client/components/ui'
+import {
+  H2,
+  HR,
+  Placeholder,
+  Table,
+  UserLabel,
+  WidgetWrapper,
+} from '#client/components/ui'
 import { RoomReservationAdminDashboardStats } from '#shared/types'
 import { useAdminDashboardStats } from '../queries'
 
@@ -82,7 +89,7 @@ export const AdminDashboardStats: React.FC<Props> = ({ period, unit }) => {
 
   if (!isFetched || !data) {
     return (
-      <WidgetWrapper title="Guest visits">
+      <WidgetWrapper title="Room reservations">
         <Placeholder children="Loading..." />
       </WidgetWrapper>
     )
@@ -90,7 +97,7 @@ export const AdminDashboardStats: React.FC<Props> = ({ period, unit }) => {
 
   if (noData) {
     return (
-      <WidgetWrapper title="Guest visits">
+      <WidgetWrapper title="Room reservations">
         <Placeholder children="No data" />
       </WidgetWrapper>
     )
@@ -99,26 +106,14 @@ export const AdminDashboardStats: React.FC<Props> = ({ period, unit }) => {
   return (
     <WidgetWrapper title="Room reservations">
       <div className="flex gap-x-2 mb-4 overflow-x-scroll">
-        <Card
-          title={data.reservationsToday}
-          subtitle={'Reservations today'}
-        />
-        <Card
-          title={data.reservationsTotal}
-          subtitle={'Total reservations'}
-        />
+        <Card title={data.reservationsToday} subtitle={'Reservations today'} />
+        <Card title={data.reservationsTotal} subtitle={'Total reservations'} />
         <Card
           title={data.anonymouseReservationsPercent + '%'}
           subtitle={'Anonymous reservations'}
         />
-        <Card
-          title={data.bookersToday}
-          subtitle={'Bookers today'}
-        />
-        <Card
-          title={data.bookersTotal}
-          subtitle={'Bookers total'}
-        />
+        <Card title={data.bookersToday} subtitle={'Bookers today'} />
+        <Card title={data.bookersTotal} subtitle={'Bookers total'} />
       </div>
       <StackedBarChart
         xKey="date"
diff --git a/src/server/app-config/schemas.ts b/src/server/app-config/schemas.ts
index 2537cdcc..07d9cf60 100644
--- a/src/server/app-config/schemas.ts
+++ b/src/server/app-config/schemas.ts
@@ -1,5 +1,7 @@
 import { z } from 'zod'
 
+const SAFE_ID_RE = /^[A-Za-z_][A-Za-z0-9_]*$/
+
 export const componentRef = z
   .tuple([z.string(), z.string()])
   .or(
@@ -70,7 +72,7 @@ export const officeAreaDesk = z
   )
 
 export const officeArea = z.object({
-  id: z.string(),
+  id: z.string().regex(SAFE_ID_RE),
   available: z.boolean().default(true),
   name: z.string(),
   capacity: z.number().min(1),
@@ -97,7 +99,7 @@ export const officeRoom = z.object({
 
 export const office = z
   .object({
-    id: z.string(),
+    id: z.string().regex(SAFE_ID_RE),
     name: z.string(),
     icon: z.string().optional(),
     timezone: z.string(),