From ea9f43a725a5f08f396ed050d46f6412329d1ce0 Mon Sep 17 00:00:00 2001
From: Amr Mohammed El-Sheraey <141947355+AmrMsCLL@users.noreply.github.com>
Date: Mon, 5 Oct 2026 19:02:53 +0300
Subject: [PATCH] feat: open the dashboard that fits the time of day and device

---
 app/frontend/src/dashboard/Dashboard.tsx      | 77 +++++++++++++++-
 app/frontend/test/dashboard.spec.tsx          | 87 ++++++++++++++++++-
 .../migration.sql                             |  3 +
 app/server/prisma/schema.prisma               |  3 +
 .../src/dashboards/dashboards.service.ts      | 16 +++-
 .../src/dashboards/dto/dashboards.dto.ts      | 21 ++++-
 .../test/integration/dashboards.spec.ts       | 21 +++++
 7 files changed, 222 insertions(+), 6 deletions(-)
 create mode 100644 app/server/prisma/migrations/20261005120000_dashboard_context/migration.sql

diff --git a/app/frontend/src/dashboard/Dashboard.tsx b/app/frontend/src/dashboard/Dashboard.tsx
index a00736e..4229a81 100644
--- a/app/frontend/src/dashboard/Dashboard.tsx
+++ b/app/frontend/src/dashboard/Dashboard.tsx
@@ -9,13 +9,49 @@ import { atMost, required, useFormErrors } from '../validation';
 import { widgetKinds, type Widget, type WidgetSize, type WidgetType } from './widgets';
 import { LoadError } from '../components/LoadError';
 
+type Device = 'any' | 'phone' | 'desktop';
+
 interface Dashboard {
   id: string;
   name: string;
   position: number;
   layout: { widgets: Widget[] };
+  showFrom: number | null;
+  showUntil: number | null;
+  showOn: Device;
+}
+
+const chosenKey = 'strata-dashboard';
+
+function rememberedDashboard() {
+  try {
+    return sessionStorage.getItem(chosenKey);
+  } catch {
+    return null;
+  }
+}
+
+function rememberDashboard(id: string) {
+  try {
+    sessionStorage.setItem(chosenKey, id);
+  } catch {
+    return;
+  }
 }
 
+export function automaticDashboard<T extends Pick<Dashboard, 'showFrom' | 'showUntil' | 'showOn'>>(dashboards: T[], now: Date, phone: boolean) {
+  const minute = now.getHours() * 60 + now.getMinutes();
+  const fits = dashboards.filter(
+    ({ showFrom, showUntil, showOn }) =>
+      (showFrom === null || showUntil === null || (showFrom < showUntil ? minute >= showFrom && minute < showUntil : minute >= showFrom || minute < showUntil)) &&
+      (showOn === 'any' || showOn === (phone ? 'phone' : 'desktop')),
+  );
+  return fits.find((dashboard) => dashboard.showFrom !== null || dashboard.showOn !== 'any') ?? fits[0] ?? dashboards[0];
+}
+
+const clockTime = (minutes: number | null) => (minutes === null ? '' : `${String(Math.floor(minutes / 60)).padStart(2, '0')}:${String(minutes % 60).padStart(2, '0')}`);
+const minutesOf = (time: string) => (time ? Number(time.slice(0, 2)) * 60 + Number(time.slice(3, 5)) : null);
+
 const templates = [
   ['morning', 'Morning briefing', 'Clock, Today, Agenda, Renewals and spend, Inbox'],
   ['work', 'Work day', 'Today, Task list, Shortcuts, Clock'],
@@ -134,11 +170,20 @@ export function DashboardHome() {
   const [name, setName] = useState('');
   const [deleting, setDeleting] = useState(false);
   const [adding, setAdding] = useState(false);
+  const [schedule, setSchedule] = useState({ from: '', until: '', on: 'any' as Device });
   const addForm = useFormErrors();
+  const chosen = params.get('d');
+
+  useEffect(() => {
+    if (chosen) rememberDashboard(chosen);
+  }, [chosen]);
 
   if (dashboards.error) return <LoadError error={dashboards.error} onRetry={dashboards.reload} />;
   if (!dashboards.data) return <PageSkeleton label="Loading your dashboard" />;
-  const current = dashboards.data.find((dashboard) => dashboard.id === params.get('d')) ?? dashboards.data[0]!;
+  const picked = chosen ?? rememberedDashboard();
+  const current =
+    dashboards.data.find((dashboard) => dashboard.id === picked) ??
+    automaticDashboard(dashboards.data, new Date(), window.matchMedia('(max-width: 767px)').matches)!;
   const widgets = draft ?? current.layout.widgets;
   const editing = draft !== undefined;
   if (params.get('display') === 'wall' && !editing) return <WallDisplay dashboard={current} />;
@@ -157,9 +202,17 @@ export function DashboardHome() {
     }
     void saving
       .run(async () => {
+        if (Boolean(schedule.from) !== Boolean(schedule.until)) throw new Error('Set both times, or neither.');
+        const showFrom = minutesOf(schedule.from);
+        const showUntil = minutesOf(schedule.until);
         const saved = await auth.request<Dashboard>(`/me/dashboards/${current.id}`, {
           method: 'PATCH',
-          body: JSON.stringify({ layout: { widgets }, ...(name.trim() ? { name: name.trim() } : {}) }),
+          body: JSON.stringify({
+            layout: { widgets },
+            ...(name.trim() ? { name: name.trim() } : {}),
+            ...(showFrom !== current.showFrom || showUntil !== current.showUntil ? { showFrom, showUntil } : {}),
+            ...(schedule.on !== current.showOn ? { showOn: schedule.on } : {}),
+          }),
         });
         dashboards.mutate((all) => all.map((dashboard) => (dashboard.id === saved.id ? saved : dashboard)));
         return '';
@@ -203,6 +256,7 @@ export function DashboardHome() {
                 className="secondary-button px-3 py-2 text-sm"
                 onClick={() => {
                   setName(current.name);
+                  setSchedule({ from: clockTime(current.showFrom), until: clockTime(current.showUntil), on: current.showOn });
                   setDraft(current.layout.widgets);
                 }}
                 type="button"
@@ -229,6 +283,25 @@ export function DashboardHome() {
             Name
             <input maxLength={40} onChange={(event) => setName(event.currentTarget.value)} value={name} />
           </label>
+          <fieldset className="m-0 flex flex-wrap items-end gap-3 border-0 p-0">
+            <legend className="field-label mb-1.5 p-0">Opens by itself</legend>
+            <label className="field-label">
+              From
+              <input onChange={(event) => setSchedule({ ...schedule, from: event.currentTarget.value })} type="time" value={schedule.from} />
+            </label>
+            <label className="field-label">
+              Until
+              <input onChange={(event) => setSchedule({ ...schedule, until: event.currentTarget.value })} type="time" value={schedule.until} />
+            </label>
+            <label className="field-label">
+              On
+              <select onChange={(event) => setSchedule({ ...schedule, on: event.currentTarget.value as Device })} value={schedule.on}>
+                <option value="any">Any device</option>
+                <option value="phone">Phones</option>
+                <option value="desktop">Computers</option>
+              </select>
+            </label>
+          </fieldset>
           {dashboards.data.length > 1 && (
             <button className="secondary-button px-3 py-2 text-sm" onClick={() => setDeleting(true)} type="button">
               Delete this dashboard
diff --git a/app/frontend/test/dashboard.spec.tsx b/app/frontend/test/dashboard.spec.tsx
index 6321f45..5ac175e 100644
--- a/app/frontend/test/dashboard.spec.tsx
+++ b/app/frontend/test/dashboard.spec.tsx
@@ -3,6 +3,7 @@ import { createRoot, type Root } from 'react-dom/client';
 import { MemoryRouter } from 'react-router';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { App } from '../src/App';
+import { automaticDashboard } from '../src/dashboard/Dashboard';
 import { AuthProvider } from '../src/auth';
 
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
@@ -16,7 +17,7 @@ const widgets = [
   { id: 'links', type: 'shortcuts', size: 'wide', settings: { links: [{ label: 'Mail', url: 'https://mail.example.com' }] } },
   { id: 'inbox', type: 'inbox', size: 'medium', settings: {} },
 ];
-const home = { id: 'home', name: 'Home', position: 0, layout: { widgets } };
+const home = { id: 'home', name: 'Home', position: 0, layout: { widgets }, showFrom: null, showUntil: null, showOn: 'any' };
 
 describe('Home dashboard', () => {
   let container: HTMLDivElement;
@@ -330,4 +331,88 @@ describe('Home dashboard', () => {
     await act(async () => button('Save as task').click());
     expect(fetchMock).toHaveBeenCalledWith('/api/v1/spaces/flat/tasks', expect.objectContaining({ method: 'POST', body: JSON.stringify({ title: 'Buy bin bags' }) }));
   });
+
+  it('opens the dashboard that fits the time and device unless one was chosen in this visit', async () => {
+    const plain = { id: 'plain', showFrom: null, showUntil: null, showOn: 'any' as const };
+    const night = { id: 'night', showFrom: 22 * 60, showUntil: 6 * 60, showOn: 'any' as const };
+    const commute = { id: 'commute', showFrom: 7 * 60, showUntil: 9 * 60, showOn: 'phone' as const };
+    const all = [plain, night, commute];
+    expect(automaticDashboard(all, new Date(2026, 9, 5, 23, 30), false)?.id).toBe('night');
+    expect(automaticDashboard(all, new Date(2026, 9, 5, 5, 59), true)?.id).toBe('night');
+    expect(automaticDashboard(all, new Date(2026, 9, 5, 8, 0), true)?.id).toBe('commute');
+    expect(automaticDashboard(all, new Date(2026, 9, 5, 8, 0), false)?.id).toBe('plain');
+    expect(automaticDashboard([commute], new Date(2026, 9, 5, 12, 0), false)?.id).toBe('commute');
+
+    vi.useFakeTimers({ now: new Date(2026, 9, 5, 23, 0), toFake: ['Date'] });
+    sessionStorage.clear();
+    let saved: unknown;
+    const late = { ...home, id: 'late', name: 'Late', position: 1, showFrom: 22 * 60, showUntil: 6 * 60 };
+    vi.stubGlobal(
+      'fetch',
+      vi.fn((input: string, init?: RequestInit) => {
+        const path = input.replace('/api/v1', '');
+        if (path === '/auth/refresh') return Promise.resolve(json({ accessToken: 'token', user }));
+        if (path === '/spaces') return Promise.resolve(json([]));
+        if (path === '/me/inbox/summary') return Promise.resolve(json({ unread: 0 }));
+        if (path === '/me/dashboards') return Promise.resolve(json([{ ...home, layout: { widgets: [] } }, { ...late, layout: { widgets: [] } }]));
+        if (path === '/me/dashboards/late' && init?.method === 'PATCH') {
+          saved = JSON.parse(String(init.body));
+          return Promise.resolve(json({ ...late, layout: { widgets: [] }, showFrom: 21 * 60, showOn: 'desktop' }));
+        }
+        return Promise.resolve(new Response(null, { status: 404 }));
+      }),
+    );
+    try {
+      await act(async () =>
+        root.render(
+          <MemoryRouter initialEntries={['/']}>
+            <AuthProvider>
+              <App />
+            </AuthProvider>
+          </MemoryRouter>,
+        ),
+      );
+      expect(container.querySelector('h1')?.textContent).toBe('Late');
+
+      await act(async () => button('Edit').click());
+      const time = (label: string) => [...container.querySelectorAll('label')].find((candidate) => candidate.textContent?.startsWith(label))!.querySelector('input')!;
+      expect(time('From').value).toBe('22:00');
+      await act(async () => {
+        Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!.call(time('From'), '21:00');
+        time('From').dispatchEvent(new Event('input', { bubbles: true }));
+        const device = [...container.querySelectorAll('label')].find((candidate) => candidate.textContent?.startsWith('On'))!.querySelector('select')!;
+        device.value = 'desktop';
+        device.dispatchEvent(new Event('change', { bubbles: true }));
+      });
+      await act(async () => button('Done').click());
+      expect(saved).toEqual({ layout: { widgets: [] }, name: 'Late', showFrom: 1260, showUntil: 360, showOn: 'desktop' });
+
+      act(() => root.unmount());
+      root = createRoot(container);
+      await act(async () =>
+        root.render(
+          <MemoryRouter initialEntries={['/?d=home']}>
+            <AuthProvider>
+              <App />
+            </AuthProvider>
+          </MemoryRouter>,
+        ),
+      );
+      act(() => root.unmount());
+      root = createRoot(container);
+      await act(async () =>
+        root.render(
+          <MemoryRouter initialEntries={['/']}>
+            <AuthProvider>
+              <App />
+            </AuthProvider>
+          </MemoryRouter>,
+        ),
+      );
+      expect(container.querySelector('h1')?.textContent).toBe('Home');
+    } finally {
+      vi.useRealTimers();
+      sessionStorage.clear();
+    }
+  });
 });
diff --git a/app/server/prisma/migrations/20261005120000_dashboard_context/migration.sql b/app/server/prisma/migrations/20261005120000_dashboard_context/migration.sql
new file mode 100644
index 0000000..60aada2
--- /dev/null
+++ b/app/server/prisma/migrations/20261005120000_dashboard_context/migration.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "dashboards" ADD COLUMN "show_from" INTEGER,
+ADD COLUMN "show_until" INTEGER,
+ADD COLUMN "show_on" TEXT NOT NULL DEFAULT 'any';
diff --git a/app/server/prisma/schema.prisma b/app/server/prisma/schema.prisma
index ea7c754..7a7780f 100644
--- a/app/server/prisma/schema.prisma
+++ b/app/server/prisma/schema.prisma
@@ -553,6 +553,9 @@ model Dashboard {
   name      String
   position  Int      @default(0)
   layout    Json
+  showFrom  Int?     @map("show_from")
+  showUntil Int?     @map("show_until")
+  showOn    String   @default("any") @map("show_on")
   createdAt DateTime @default(now()) @map("created_at")
   updatedAt DateTime @updatedAt @map("updated_at")
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
diff --git a/app/server/src/dashboards/dashboards.service.ts b/app/server/src/dashboards/dashboards.service.ts
index 0de933a..316c1cd 100644
--- a/app/server/src/dashboards/dashboards.service.ts
+++ b/app/server/src/dashboards/dashboards.service.ts
@@ -35,7 +35,7 @@ const starters: Record<Template, Pick<WidgetDto, 'type' | 'size' | 'settings'>[]
   ],
 };
 
-const dashboardFields = { id: true, name: true, position: true, layout: true, updatedAt: true } satisfies Prisma.DashboardSelect;
+const dashboardFields = { id: true, name: true, position: true, layout: true, showFrom: true, showUntil: true, showOn: true, updatedAt: true } satisfies Prisma.DashboardSelect;
 
 function starterLayout(template: Template): Prisma.InputJsonObject {
   return {
@@ -161,9 +161,21 @@ export class DashboardsService {
   }
 
   async update(userId: string, dashboardId: string, input: UpdateDashboardDto) {
+    if ((input.showFrom ?? null) === null ? (input.showUntil ?? null) !== null : (input.showUntil ?? null) === null) {
+      throw new BadRequestException('Set both the start and the end of the time range');
+    }
+    if (input.showFrom != null && input.showFrom === input.showUntil) {
+      throw new BadRequestException('The time range needs a start and an end that differ');
+    }
     const [updated] = await this.prisma.dashboard.updateManyAndReturn({
       where: { id: dashboardId, userId },
-      data: { name: input.name, layout: input.layout ? checkedLayout(input.layout) : undefined },
+      data: {
+        name: input.name,
+        layout: input.layout ? checkedLayout(input.layout) : undefined,
+        showFrom: input.showFrom,
+        showUntil: input.showUntil,
+        showOn: input.showOn,
+      },
       select: dashboardFields,
     });
     if (!updated) throw new NotFoundException('Dashboard not found');
diff --git a/app/server/src/dashboards/dto/dashboards.dto.ts b/app/server/src/dashboards/dto/dashboards.dto.ts
index 7802ffb..f7ec811 100644
--- a/app/server/src/dashboards/dto/dashboards.dto.ts
+++ b/app/server/src/dashboards/dto/dashboards.dto.ts
@@ -1,11 +1,12 @@
 import { Type } from 'class-transformer';
-import { ArrayMaxSize, IsArray, IsIn, IsObject, IsOptional, IsString, Length, ValidateNested } from 'class-validator';
+import { ArrayMaxSize, IsArray, IsIn, IsInt, IsObject, IsOptional, IsString, Length, Max, Min, ValidateIf, ValidateNested } from 'class-validator';
 import { IsOptionalNotNull } from '../../validation/is-optional-not-null.decorator';
 import { Trimmed } from '../../validation/trimmed.decorator';
 
 export const widgetTypes = ['clock', 'today', 'tasks', 'shortcuts', 'recurring', 'inbox', 'agenda', 'countdown', 'focus', 'tidy', 'weather', 'news', 'capture'] as const;
 export const widgetSizes = ['small', 'medium', 'wide', 'full'] as const;
 export const templates = ['morning', 'work', 'student', 'travel'] as const;
+export const devices = ['any', 'phone', 'desktop'] as const;
 
 export class WidgetDto {
   @IsString()
@@ -54,4 +55,22 @@ export class UpdateDashboardDto {
   @ValidateNested()
   @Type(() => LayoutDto)
   layout?: LayoutDto;
+
+  @IsOptional()
+  @ValidateIf((_input, value) => value !== null)
+  @IsInt()
+  @Min(0)
+  @Max(1439)
+  showFrom?: number | null;
+
+  @IsOptional()
+  @ValidateIf((_input, value) => value !== null)
+  @IsInt()
+  @Min(0)
+  @Max(1439)
+  showUntil?: number | null;
+
+  @IsOptionalNotNull()
+  @IsIn(devices, { message: 'Choose any device, phones or computers.' })
+  showOn?: (typeof devices)[number];
 }
diff --git a/app/server/test/integration/dashboards.spec.ts b/app/server/test/integration/dashboards.spec.ts
index 85b72cf..be2ab68 100644
--- a/app/server/test/integration/dashboards.spec.ts
+++ b/app/server/test/integration/dashboards.spec.ts
@@ -55,4 +55,25 @@ describe('Dashboards against Postgres', () => {
     expect((await owner.call('DELETE', `/me/dashboards/${home.id}`)).status).toBe(204);
     expect((await owner.call('GET', '/me/dashboards')).body.map((dashboard: { name: string }) => dashboard.name)).toEqual(['Trip']);
   });
+
+  it('keeps when and where a dashboard opens by itself', async () => {
+    const owner = await member('scheduler');
+    const [home] = (await owner.call('GET', '/me/dashboards')).body;
+    expect(home).toMatchObject({ showFrom: null, showUntil: null, showOn: 'any' });
+
+    const morning = await owner.call('PATCH', `/me/dashboards/${home.id}`, { showFrom: 22 * 60, showUntil: 6 * 60, showOn: 'phone' });
+    expect(morning.body).toMatchObject({ showFrom: 1320, showUntil: 360, showOn: 'phone' });
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { name: 'Night' })).body).toMatchObject({ name: 'Night', showFrom: 1320, showOn: 'phone' });
+
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { showFrom: 60 })).status).toBe(400);
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { showFrom: 60, showUntil: 60 })).status).toBe(400);
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { showFrom: 60, showUntil: 1440 })).status).toBe(400);
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { showOn: 'tablet' })).status).toBe(400);
+
+    expect((await owner.call('PATCH', `/me/dashboards/${home.id}`, { showFrom: null, showUntil: null, showOn: 'any' })).body).toMatchObject({
+      showFrom: null,
+      showUntil: null,
+      showOn: 'any',
+    });
+  });
 });