pgkiln 0.35.0 → 0.37.0

package/src/builder/home.ts

@@ -5,7 +5,7 @@ import { icon } from '../icons.ts';
 import { APP_COLORS, BASE, csrf, developer, input, region, select, send, shell, type Req } from './ui.ts';
 import type { Session } from '../session.ts';
 import { isAdmin } from './locks.ts';
-import { currentWorkspace, inWorkspaceSql } from './workspaces.ts';
+import { currentWorkspace, inWorkspaceSql, workspaceAdmin } from './workspaces.ts';
 
 // The workspace pages of the builder, laid out like APEX's App Builder: the
 // home page (tiles, a searchable list of applications as a report or as
@@ -285,7 +285,11 @@ export async function homeRoutes(app: FastifyInstance) {
         ${card(`${BASE}/sql`, icon('database'), 'SQL Workshop', 'Run SQL, browse objects and load data.')}
         ${card(`${BASE}/dashboard`, icon('activity'), 'Dashboard', 'Usage and problems across the workspace.')}
         ${(await isAdmin(s.username)) ? card(`${BASE}/instance`, icon('settings'), 'Instance settings', 'Session length, sign-in throttling and the server\'s configuration (administrators).') : ''}
-        ${(await isAdmin(s.username)) ? card(`${BASE}/workspaces`, icon('layers'), 'Workspaces', 'Groups of applications and their developers (administrators).') : ''}
+        ${(await isAdmin(s.username))
+          ? card(`${BASE}/workspaces`, icon('layers'), 'Workspaces', 'Groups of applications and their developers (administrators).')
+          : s.workspace && (await workspaceAdmin(s.username, s.workspace.id))
+            ? card(`${BASE}/workspaces/${s.workspace.id}`, icon('layers'), `Workspace ${s.workspace.name}`, 'Its name and developers (workspace administrators).')
+            : ''}
         ${(await isAdmin(s.username)) ? card(`${BASE}/ai`, icon('bolt'), 'AI services', 'Claude and OpenAI for the applications: models, keys, limits and usage (administrators).') : ''}
         ${(await isAdmin(s.username)) ? card(`${BASE}/mail`, icon('send'), 'Mail services', 'SMTP, Microsoft 365, Amazon SES, Resend, Postmark, SendGrid or Mailgun for the applications\' e-mail (administrators).') : ''}
         ${(await isAdmin(s.username)) ? card(`${BASE}/installation`, icon('history'), 'Installation', 'Version, install and upgrade runs, applied migrations (administrators).') : ''}

package/src/builder/login-page.ts

@@ -0,0 +1,82 @@
+import type { FastifyInstance } from 'fastify';
+import { owner } from '../db.ts';
+import { html, raw } from '../html.ts';
+import { back, BASE, developer, flash, type Req } from './ui.ts';
+
+// Application settings → Sign-in methods (migration 087): the application's
+// own login page (APEX: the login page, usually 9999) and "Forgot password?".
+// "Create login page" adds a minimal public page with a login region and
+// makes it the login page.
+
+interface AppRow {
+  id: number;
+  name: string;
+  authentication: string;
+  local_login: boolean;
+  login_page: number | null;
+  password_reset: boolean;
+}
+
+/** The fields in the settings form. */
+export async function loginSettingsFields(a: AppRow) {
+  const pages = (await owner.query<{ page_no: number; name: string; requires_auth: boolean }>(
+    'select page_no, name, requires_auth from meta.page where app_id = $1 order by page_no', [a.id],
+  )).rows;
+  const mail = await owner.one<{ service: string | null; enabled: boolean | null; from_address: string | null }>(
+    `select s.name as service, s.enabled, ams.from_address
+       from meta.app_mail_service ams join meta.mail_service s on s.id = ams.service_id where ams.app_id = $1`, [a.id],
+  );
+  const mailOk = !!(mail?.enabled && mail.from_address?.trim());
+  const opt = (v: string, label: string, cur: string) => html`<option value="${v}"${v === cur ? raw(' selected') : ''}>${label}</option>`;
+  const current = a.login_page ? String(a.login_page) : '';
+  return html`<div class="form-grid">
+      <div class="field"><label class="label" for="f_login_page">Login page</label>
+        <select id="f_login_page" name="login_page">${opt('', '- the built-in sign-in page -', current)}${pages.map((p) =>
+          opt(String(p.page_no), `${p.page_no} ${p.name}${p.requires_auth ? ' (requires sign-in: not usable)' : ''}`, current))}</select>
+        <small class="help">A page of the application with a <em>Login</em> region replaces the built-in sign-in page (APEX: the login page). It must not require authentication; with page template <em>Minimal</em> it has no header and navigation.
+          <button class="link-button" formaction="${BASE}/apps/${a.id}/login-page">Create a login page</button></small></div>
+      <div class="field"><span class="label" aria-hidden="true"></span><label class="check"><input type="checkbox" name="password_reset" value="true"${a.password_reset ? raw(' checked') : ''}> Offer "Forgot password?"</label>
+        <small class="help">Users with a password and an e-mail address in the user directory get a link to choose a new password (single-use, valid for 30 minutes).
+          ${mailOk
+            ? html`Sent through mail service ${mail!.service} as ${mail!.from_address}.`
+            : html`<strong>Not offered yet:</strong> the application needs an enabled mail service with a From address (Workspace utilities → Mail services).`}
+          Only for the user directory's own passwords: not for LDAP, single sign-on, database accounts or custom authentication.</small></div>
+    </div>`;
+}
+
+/** Save them (with the rest of the settings form). */
+export async function saveLoginSettings(appId: string, b: Record<string, string | undefined>) {
+  const page = b.login_page?.trim() ? Number(b.login_page) : null;
+  if (page !== null && !(await owner.one('select 1 from meta.page where app_id = $1 and page_no = $2', [appId, page]))) throw new Error(`Login page: there is no page ${b.login_page}.`);
+  await owner.query('update meta.app set login_page = $2, password_reset = $3 where id = $1', [appId, page, b.password_reset === 'true']);
+}
+
+export async function loginPageRoutes(app: FastifyInstance) {
+  // Create a login page: page 9999 (or the next free number), public, minimal, with a login region
+  app.post(`${BASE}/apps/:id/login-page`, async (req: Req, reply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const a = await owner.one<{ id: number; name: string }>('select id, name from meta.app where id = $1', [req.params.id]);
+    if (!a) return reply.code(404).send('Not found');
+    try {
+      const { page, no } = await owner.tx(async (c) => {
+        const n = (await c.query<{ n: number }>(
+          `select case when not exists (select 1 from meta.page where app_id = $1 and page_no = 9999) then 9999
+                       else (select max(page_no) + 1 from meta.page where app_id = $1) end as n`, [a.id],
+        )).rows[0].n;
+        const id = (await c.query<{ id: number }>(
+          `insert into meta.page (app_id, page_no, name, title, requires_auth, page_template) values ($1, $2, 'Login', $3, false, 'minimal') returning id`,
+          [a.id, n, a.name],
+        )).rows[0].id;
+        await c.query(`insert into meta.region (page_id, seq, title, type, template) values ($1, 10, $2, 'login', 'standard')`, [id, a.name]);
+        await c.query('update meta.app set login_page = $2, updated_at = now() where id = $1', [a.id, n]);
+        return { page: id, no: n };
+      });
+      flash(s, `Page ${no} "Login" created and made the login page. Add regions around the sign-in form in the Page Designer.`);
+      return back(reply, s, `${BASE}/pages/${page}`);
+    } catch (e) {
+      flash(s, (e as Error).message, 'error');
+      return back(reply, s, `${BASE}/apps/${req.params.id}/settings`);
+    }
+  });
+}

package/src/builder/newapp.ts

@@ -64,9 +64,27 @@ export async function createApp(c: Client, a: CheckedApp): Promise<{ id: number;
   const S = pg.escapeIdentifier(a.schema);
   const R = pg.escapeIdentifier(a.role);
   // The parsing schema: a role that can only use this schema.
-  await c.query(`create schema if not exists ${S}`);
-  if (!(await c.query('select 1 from pg_roles where rolname = $1', [a.role])).rowCount) await c.query(`create role ${R} nologin`);
-  await c.query(`grant ${R} to pgkiln_runtime`);
+  // (090) an isolated workspace's application gets a new role, and a schema that is new (owned by that
+  // role) or one of the workspace's own: never another workspace's
+  const isolated = (await c.query('select 1 from meta.workspace where id = $1 and isolated', [a.workspaceId])).rowCount;
+  const roleExists = (await c.query('select 1 from pg_roles where rolname = $1', [a.role])).rowCount;
+  if (isolated) {
+    // (a taken alias fails below, with its own message)
+    const aliasTaken = (await c.query('select 1 from meta.app where alias = $1', [a.alias])).rowCount;
+    if (roleExists && !aliasTaken) throw new Error(`The database role ${a.role} exists already: choose another alias.`);
+    const foreign = await c.query(
+      `select 1 from pg_namespace n where n.nspname = $1
+          and n.nspowner::regrole::text not in (select role_name from meta.workspace_role where workspace_id = $2)`,
+      [a.schema, a.workspaceId],
+    );
+    if (foreign.rowCount) throw new Error(`The schema ${a.schema} exists already and doesn't belong to this workspace: choose another schema.`);
+  }
+  if (!roleExists) await c.query(`create role ${R} nologin`);
+  await c.query(`create schema if not exists ${S}${isolated ? ` authorization ${R}` : ''}`);
+  if (isolated) {
+    // a name the workspace lists already (an application deleted, its role dropped) is its own; another workspace's is refused
+    await c.query('insert into meta.workspace_role (workspace_id, role_name) values ($1, $2) on conflict (workspace_id, role_name) do nothing', [a.workspaceId, a.role]);
+  } else await c.query(`grant ${R} to pgkiln_runtime`);
   await c.query(`grant usage on schema ${S} to ${R}`);
   await c.query(`grant select, insert, update, delete on all tables in schema ${S} to ${R}`);
   await c.query(`grant usage, select on all sequences in schema ${S} to ${R}`);

package/src/builder/quicksql.ts

@@ -6,6 +6,7 @@ import { quickSql } from '../quicksql.ts';
 import { clientIp, type Session } from '../session.ts';
 import { runAndRecord, runOptions, SCRIPT_MAX_MB } from './scripts.ts';
 import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Req } from './ui.ts';
+import { currentWorkspace } from './workspaces.ts';
 
 // SQL Workshop → Quick SQL: shorthand → DDL preview, then save it as a SQL
 // script or run it (as a script, so the results per statement are kept).
@@ -85,8 +86,8 @@ export async function quickSqlRoutes(app: FastifyInstance) {
       return back(reply, s, `${BASE}/sql/scripts/runs/${id}`);
     }
     let unique = name;
-    for (let n = 2; await owner.one('select 1 from meta.sql_script where name = $1', [unique]); n++) unique = `${name} (${n})`;
-    const r = await owner.one(`insert into meta.sql_script (name, content, created_by, updated_by) values ($1, $2, $3, $3) returning id`, [unique, content, s.username]);
+    for (let n = 2; await owner.one('select 1 from meta.sql_script where name = $1 and workspace_id = $2', [unique, currentWorkspace(s)]); n++) unique = `${name} (${n})`;
+    const r = await owner.one(`insert into meta.sql_script (name, content, created_by, updated_by, workspace_id) values ($1, $2, $3, $3, $4) returning id`, [unique, content, s.username, currentWorkspace(s)]);
     flash(s, `Saved as script “${unique}”.`);
     return back(reply, s, `${BASE}/sql/scripts/${r!.id}`);
   });

package/src/builder/region-help.ts

@@ -12,7 +12,7 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['chart'], '{"kind":"bar"|"column"|"line"|"area"|"donut","max_rows":1000,"format_mask":"FML999G990"}'],
   [['cards'], '{"style":"metric","link":{...},"max_rows":500}'],
   [['dynamic'], '{"max_rows":1000}'],
-  [['grid'], '{"page_size":25,"allow":{"insert":true,"update":true,"delete":true},"readonly":["col"],"columns":{"deptno":{"lov":"LOV:DEPARTMENTS","required":true}},"aggregates":{"sal":["sum","avg"]},"layout":{"order":["col"],"hidden":["col"],"widths":{"col":160},"frozen":1},"row_actions":{"edit":{"page":3,"items":{"P3_ID":"#id#"}},"duplicate":true,"delete":true,"links":[{"label":"…","page":4,"items":{}}]},"select_row":{"column":"id","item":"P1_ID"} (a master),"master":{"item":"P1_ID","column":"parent_id"} (a detail; any region type),"actions":true,"saved_reports":true,"public_reports":"SCHEME"}'],
+  [['grid'], '{"page_size":25,"allow":{"insert":true,"update":true,"delete":true},"readonly":["col"],"columns":{"deptno":{"lov":"LOV:DEPARTMENTS","required":true}},"aggregates":{"sal":["sum","avg"]},"layout":{"order":["col"],"hidden":["col"],"widths":{"col":160},"frozen":1},"row_actions":{"edit":{"page":3,"items":{"P3_ID":"#id#"}},"duplicate":true,"delete":true,"links":[{"label":"…","page":4,"items":{}}]},"select_row":{"column":"id","item":"P1_ID"} (a master),"master":{"item":"P1_ID","column":"parent_id"} (a detail; any region type),"actions":true,"saved_reports":true,"public_reports":"SCHEME","views":["row","group","chart"] (views besides the grid; left out: all three)}'],
   [['calendar'], '{"link":{...}}'],
   [['facets'], '{"report":<region id>,"search":true,"facets":[{"column":"job","label":"Job","exclude":true},{"column":"sal","type":"range","ranges":[{"to":1000},{"from":1000}],"custom":true},{"column":"rating","type":"star","max":5}]}'],
   [['smart_filters'], '{"report":<region id>,"suggestions":3,"placeholder":"…","facets":[…as facets]}'],
@@ -25,6 +25,7 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['report'], '{"ai_filter":{"service":"NAME"}} adds an "Ask in your own words" box (natural-language filters)'],
   [['plugin'], '{"plugin":"name","attributes":{"NAME":"value"}} (a region plug-in; a Source SELECT feeds its template)'],
   [['form'], '{"lost_update":false} saves without checking that the row is unchanged since it was shown'],
+  [['login'], '(no attributes) the sign-in form of the application\'s login page (Application settings → Login page): providers, user name and password, "Keep me signed in", "Forgot password?"'],
   [['url'], '{"height":480,"sandbox":["allow-scripts","allow-forms","allow-popups","allow-same-origin"] (the default; false: no sandbox),"fullscreen":true}'],
   [['search'], '{"configs":["CUSTOMERS","ORDERS"] (Shared Components → Search configurations; empty: all),"item":"P1_SEARCH" (search with this item\'s value instead of a field of its own),"placeholder":"…","min_length":2,"empty":"No results"}'],
 ];
@@ -53,6 +54,7 @@ const ANCHORS: Record<string, string> = {
   plugin: 'plug-ins-with-their-own-code',
   tasks: 'approvals-and-the-task-list',
   workflows: 'workflows',
+  login: 'the-login-page',
 };
 
 /** The help of every type (a region whose type isn't known yet). */
@@ -63,7 +65,7 @@ export function regionConfigHelp(type: string | null | undefined): { text: strin
   if (!type) return { text: ALL_REGION_CONFIG_HELP, url: null };
   const own = REGION_CONFIG_HELP.filter(([types]) => types.includes(type)).map(([, text]) => text);
   const any = REGION_CONFIG_HELP.filter(([types]) => types.includes('*')).map(([, text]) => `any region: ${text}`);
-  const chapter = type === 'tasks' || type === 'workflows' ? 'processing' : 'pages-and-regions';
+  const chapter = type === 'tasks' || type === 'workflows' ? 'processing' : type === 'login' ? 'security' : 'pages-and-regions';
   return {
     text: [...own, ...any].join(' · ') || 'No attributes of its own.',
     url: ANCHORS[type] ? `${GUIDE}/${chapter}#${ANCHORS[type]}` : null,

package/src/builder/region-settings.ts

@@ -242,6 +242,10 @@ function mergeGridFeatures(out: Config, b: Body, a: Allowed, columns: string[])
   set('saved_reports', b.saved_reports === 'true' ? undefined : false);
   const pub = (b.public_reports ?? '').trim().toUpperCase();
   set('public_reports', pub && a.authz?.has(pub) ? pub : undefined);
+  // views besides the grid: all three is the default (left out); none ticked means the grid only
+  // (only when the form has the Views fieldset)
+  const views = GRID_USER_VIEWS.filter((v) => b[`view_${v}`] === 'true');
+  if (b.grid_views === '1') set('views', views.length < GRID_USER_VIEWS.length ? views : undefined);
   // row actions: an edit link, duplicate and delete; custom links stay as written in the JSON
   const edit = mergeLink(b, a.pages, 'edit');
   const ra: Config = { ...(out.row_actions && typeof out.row_actions === 'object' ? out.row_actions : {}) };
@@ -342,8 +346,10 @@ export function mergeSmartFiltersSettings(config: Config, b: Body, a: Allowed):
 export function mergeDisplaySelectorSettings(config: Config, b: Body): Config {
   const out = { ...config };
   const set = setter(out);
-  set('style', b.style === 'select' ? 'select' : undefined);
+  set('style', b.style === 'select' || b.style === 'carousel' ? b.style : undefined);
   set('show_all', b.show_all === 'true' ? undefined : false);
+  const interval = Number(b.interval);
+  set('interval', b.style === 'carousel' && Number.isInteger(interval) && interval >= 1 && interval <= 120 ? interval : undefined);
   set('remember', b.remember === 'true' ? undefined : false);
   return out;
 }
@@ -497,6 +503,11 @@ async function gridFields(appId: number, r: RegionRow, id: (n: string) => string
       <div class="field"><label class="label" for="${id('public_reports')}">Public reports by</label>
         <select id="${id('public_reports')}" name="public_reports">${opt('', '- nobody -', cfg.public_reports)}${authz.map((n) => opt(n, n, cfg.public_reports))}</select></div>
     </div></fieldset>
+    <input type="hidden" name="grid_views" value="1">
+    <fieldset class="prop-group"><legend>Views</legend><div class="form-grid">
+      ${GRID_USER_VIEWS.map((v) => check(`view_${v}`, GRID_VIEW_LABELS[v], !Array.isArray(cfg.views) || cfg.views.includes(v)))}
+    </div>
+    <small class="help">Views users may switch to besides the grid. The single row view edits one row at a time (also from the row actions menu); group by and chart are set up in Actions.</small></fieldset>
     <fieldset class="prop-group"><legend>Row actions</legend><div class="form-grid">
       ${check('row_actions', 'Row actions menu', !!cfg.row_actions)}
       ${check('row_duplicate', 'Duplicate', cfg.row_actions?.duplicate !== false)}
@@ -634,6 +645,8 @@ async function facetsFields(r: RegionRow, pageId: number, appId: number, id: (n:
 }
 
 const VIEW_LABELS: Record<string, string> = { month: 'Month', week: 'Week', day: 'Day', list: 'List' };
+const GRID_USER_VIEWS = ['row', 'group', 'chart'] as const;
+const GRID_VIEW_LABELS: Record<string, string> = { row: 'Single row view', group: 'Group by', chart: 'Chart' };
 
 async function calendarFields(appId: number, r: RegionRow, id: (n: string) => string, pages: { page_no: number; name: string }[]) {
   const cfg = r.config ?? {};
@@ -676,7 +689,10 @@ async function displaySelectorFields(r: RegionRow, pageId: number, id: (n: strin
                                      where page_id = $1 and id <> $2 and type <> 'display_selector' order by seq, id`, [pageId, r.id])).rows;
   return html`<fieldset class="prop-group"><legend>Appearance</legend><div class="form-grid">
       <div class="field"><label class="label" for="${id('style')}">Show as</label>
-        <select id="${id('style')}" name="style">${opt('', 'Tabs', cfg.style)}${opt('select', 'Select list', cfg.style)}</select></div>
+        <select id="${id('style')}" name="style">${opt('', 'Tabs', cfg.style)}${opt('select', 'Select list', cfg.style)}${opt('carousel', 'Carousel (one at a time, Previous and Next)', cfg.style)}</select></div>
+      <div class="field"><label class="label" for="${id('interval')}">Carousel: next region every (seconds)</label>
+        <input id="${id('interval')}" name="interval" type="number" min="1" max="120" value="${cfg.interval ?? ''}" placeholder="empty: only by hand">
+        <small class="help">Not while the pointer or the focus is in the carousel, nor for users who prefer reduced motion. A carousel has no "Show all".</small></div>
     </div>
     ${check('show_all', '"Show all" choice (shows every region)', cfg.show_all !== false)}
     ${check('remember', 'Remember the choice during the session', cfg.remember !== false)}</fieldset>
@@ -765,7 +781,7 @@ export async function regionSettingsForm(pageId: number, appId: number, r: Regio
           <div class="field"><label class="label" for="${id('list')}">List</label>
             <select id="${id('list')}" name="list">${opt('', '- choose -', cfg.list)}${lists.map((l) => opt(l.name, `${l.name} (${l.type})`, cfg.list))}${cfg.list && !lists.some((l) => l.name === cfg.list) ? opt(cfg.list, `${cfg.list} (missing!)`, cfg.list) : ''}</select></div>
           <div class="field"><label class="label" for="${id('template')}">Template</label>
-            <select id="${id('template')}" name="template">${opt('', 'Links (nested)', cfg.template)}${opt('badges', 'Badge list', cfg.template)}${opt('cards', 'Cards (menu)', cfg.template)}${opt('tabs', 'Tabs', cfg.template)}</select></div>
+            <select id="${id('template')}" name="template">${opt('', 'Links (nested)', cfg.template)}${opt('badges', 'Badge list', cfg.template)}${opt('cards', 'Cards (menu)', cfg.template)}${opt('tabs', 'Tabs', cfg.template)}${opt('wizard_progress', 'Wizard progress (numbered steps)', cfg.template)}</select></div>
         </div></fieldset>`;
       break;
     }

package/src/builder/report-settings.ts

@@ -3,6 +3,7 @@ import { designSql } from './websources.ts';
 import pg from 'pg';
 import { applyBinds } from '../binds.ts';
 import { owner } from '../db.ts';
+import { devDbForApp } from '../workspace-db.ts';
 import { html, raw } from '../html.ts';
 import { formatMaskError } from '../runtime/format.ts';
 import { heading } from '../runtime/items.ts';
@@ -19,12 +20,13 @@ const PAGE_SIZES = ['5', '10', '15', '25', '50', '100'];
 /** The column names of a report's query: run with limit 0, as the app's role, then rolled back. */
 export async function reportColumns(appId: number, source: string | null): Promise<{ columns: string[] } | { error: string }> {
   if (!source?.trim()) return { error: 'The region has no source query yet.' };
-  const c = await owner.pool.connect();
+  // the role from pgkiln's tables (the owner); the query on the developer's connection (090)
+  const role = (await owner.one<{ db_role: string | null }>('select db_role from meta.app where id = $1', [appId]))?.db_role;
+  const c = await (await devDbForApp(appId)).pool.connect();
   try {
     await c.query('begin');
     await c.query(`set local statement_timeout = '5s'`);
     await c.query(`select set_config('pgkiln.app_id', $1, true)`, [String(appId)]);
-    const role = (await c.query('select db_role from meta.app where id = $1', [appId])).rows[0]?.db_role;
     if (role) await c.query(`set local role ${pg.escapeIdentifier(role)}`);
     const sql = applyBinds(source.trim().replace(/;+\s*$/, ''), {});
     const res = await c.query(`select * from (\n${sql}\n) "__q" limit 0`);

package/src/builder/routes.ts

@@ -12,11 +12,12 @@ import { pwaSection } from './pwa.ts';
 import { documentShell } from '../layout.ts';
 import { passwordProblem } from '../accounts.ts';
 import { clientIp, createSession, destroySession, getSession, loginThrottled, logActivity, saveState, takeFlash } from '../session.ts';
+import { loginSettingsFields, saveLoginSettings } from './login-page.ts';
 import { APP_COLORS, appHeader, back, BASE, builderHead, csrf, developer, flash, input, region, select, send, shell, THEME_COOKIE, validTheme, type Req } from './ui.ts';
 import { appOr404 } from './forms.ts';
 import { docToFiles, filesToZip } from '../appfiles.ts';
 import { homeRoutes, rememberApp } from './home.ts';
-import { appAllowed, currentWorkspace, placeApp, workspaceRoutes } from './workspaces.ts';
+import { appAllowed, currentWorkspace, placeApp, workshopDb, workspaceRoutes } from './workspaces.ts';
 import { instanceRoutes } from './instance.ts';
 import { saveTimeZoneSettings, timeZoneSettings } from './globalization.ts';
 import { WIZARD_KINDS, wizardRoutes, wizardTables } from './wizards.ts';
@@ -169,7 +170,7 @@ export async function builderRoutes(app: FastifyInstance) {
         await placeApp(c, made.id, ws);
         // (sprint 51) the Advisor on the imported application, before the commit: errors refuse it
         if (req.body?.check === 'true') {
-          const errors = (await advise(made.id, c)).findings.filter((f) => f.severity === 'error');
+          const errors = (await advise(made.id, c, { db: await workshopDb(s) })).findings.filter((f) => f.severity === 'error');
           if (errors.length)
             throw new Error(`the check found ${errors.length} error(s), nothing was imported: ${errors.slice(0, 5).map((f) =>
               `${f.entry ? `${f.entry.pageNo !== null ? `page ${f.entry.pageNo}, ` : ''}${f.entry.label}` : 'database'} (${f.field}): ${f.message}`).join('; ')}${errors.length > 5 ? '; …' : ''}. Fix them, or import without the check.`);
@@ -207,6 +208,11 @@ export async function builderRoutes(app: FastifyInstance) {
       wizardTables(a.db_role),
     ]);
     const nextPage = Math.max(0, ...pages.rows.map((p) => p.page_no)) + 1;
+    // (089) page groups: a column and a filter (?group=name, or "-" for pages without one)
+    const groups = (await owner.query<{ name: string }>('select name from meta.page_group where app_id = $1 order by name', [a.id])).rows.map((g) => g.name);
+    const grouped = groups.length > 0 || pages.rows.some((p) => p.page_group);
+    const groupFilter = typeof req.query?.group === 'string' ? req.query.group : '';
+    const shownPages = pages.rows.filter((p) => !groupFilter || (groupFilter === '-' ? !p.page_group : p.page_group === groupFilter));
     const locks = new Map((await appLocks(a.id)).map((l) => [l.page_no, l]));
     const commentsPerPage = new Map((await owner.query('select page_no, count(*)::int as n from meta.dev_comment where app_id = $1 group by 1', [a.id])).rows.map((r) => [r.page_no, r.n]));
     const appLock = locks.get(0);
@@ -214,10 +220,14 @@ export async function builderRoutes(app: FastifyInstance) {
     const main = html`
       ${appHeader(a, 'pages')}
       ${appLock && appLock.locked_by !== s.username ? html`<div class="alert alert-error" role="status">${icon('key')} ${lockText(appLock)} Changes are refused until it is unlocked.</div>` : ''}
-      ${region('Pages', html`<div class="table-wrap"><table class="report">
-          <thead><tr><th class="num">Page</th><th>Name</th><th>Mode</th><th class="num">Regions</th><th class="num">Items</th><th class="num">DAs</th><th class="num">Processes</th><th>Authorization</th><th>Protection</th><th>Lock</th><th></th></tr></thead>
-          <tbody>${pages.rows.map((p) => html`<tr>
-            <td class="num">${p.page_no}</td><td><a href="${BASE}/pages/${p.id}">${p.name}</a>${commentsPerPage.get(p.page_no) ? html` <span class="tag" title="Developer comments">${commentsPerPage.get(p.page_no)} comment${commentsPerPage.get(p.page_no) === 1 ? '' : 's'}</span>` : ''}</td><td>${p.mode}</td>
+      ${region('Pages', html`${grouped
+          ? html`<form method="get" class="search u-mwnone u-mb1"><div class="field"><label class="label" for="f_group">Page group</label>
+              <select id="f_group" name="group">${[['', 'All pages'], ...groups.map((g) => [g, g]), ['-', 'Without a group']].map(([v, l]) => html`<option value="${v}"${v === groupFilter ? raw(' selected') : ''}>${l}</option>`)}</select></div>
+              <button class="btn u-selfend">Show</button></form>`
+          : ''}<div class="table-wrap"><table class="report">
+          <thead><tr><th class="num">Page</th><th>Name</th>${grouped ? html`<th>Group</th>` : ''}<th>Mode</th><th class="num">Regions</th><th class="num">Items</th><th class="num">DAs</th><th class="num">Processes</th><th>Authorization</th><th>Protection</th><th>Lock</th><th></th></tr></thead>
+          <tbody>${shownPages.map((p) => html`<tr>
+            <td class="num">${p.page_no}</td><td><a href="${BASE}/pages/${p.id}">${p.name}</a>${commentsPerPage.get(p.page_no) ? html` <span class="tag" title="Developer comments">${commentsPerPage.get(p.page_no)} comment${commentsPerPage.get(p.page_no) === 1 ? '' : 's'}</span>` : ''}</td>${grouped ? html`<td>${p.page_group ?? '—'}</td>` : ''}<td>${p.mode}</td>
             <td class="num">${p.regions}</td><td class="num">${p.items}</td><td class="num">${p.das}</td><td class="num">${p.processes}</td>
             <td>${p.requires_auth ? (p.authz ?? '—') : 'public'}</td><td>${p.protection}</td>
             <td>${((l) => (l ? html`<span class="lock-tag" title="${lockText(l)}">${icon('key')}<span>${l.locked_by === s.username ? 'you' : l.locked_by}</span></span>` : '—'))(locks.get(p.page_no))}</td>
@@ -354,6 +364,7 @@ export async function builderRoutes(app: FastifyInstance) {
               : html`<p class="muted">No LDAP directories configured. <a href="${BASE}/users/directories">Add one</a> to check passwords against LDAP or Active Directory.</p>`}
             <small class="help">LDAP passwords are checked by the username and password form, after local accounts, so keep that method on.</small>
             <div class="form-grid">${input('session_group', 'Session sharing group', a.session_group ?? '', { placeholder: 'empty: not shared', help: 'Applications with the same group (and the user directory as authentication) share a sign-in: after signing in to one, the others open without a new sign-in, each with its own access check and roles; signing out of one signs out of all (APEX: session sharing). Lower case letters, digits and _.' })}</div>
+            ${await loginSettingsFields(a)}
             <div class="form-grid">${input('remember_me_days', '"Keep me signed in" for (days)', a.remember_me_days ?? '', { type: 'number', placeholder: 'empty: not offered', help: 'Offers a checkbox on the sign-in form (APEX: persistent authentication). The browser stays signed in for this many days after the sign-in, also when the session ends; signing out, a new password, deactivation or removed access ends it. 1 to 365.' })}</div>
             ${providers.length
               ? providers.map((pr) => html`<div class="field"><label class="check"><input type="checkbox" name="sso_providers" value="${pr.name}"${a.sso_providers.includes(pr.name) ? raw(' checked') : ''}> Sign in with ${pr.display_name}${pr.enabled ? '' : ' (disabled)'}</label></div>`)
@@ -484,6 +495,7 @@ export async function builderRoutes(app: FastifyInstance) {
          /^[a-z][a-z0-9_]{0,29}$/.test(b.session_group?.trim().toLowerCase() ?? '') ? b.session_group!.trim().toLowerCase() : null],
       );
       await saveTimeZoneSettings(req.params.id, b);
+      await saveLoginSettings(req.params.id, b);
       flash(s, 'Settings saved.');
     } catch (e) {
       flash(s, (e as Error).message, 'error');

package/src/builder/sampledata.ts

@@ -31,6 +31,7 @@ import {
 } from '../sampledata.ts';
 import { clientIp, logActivity, type Session } from '../session.ts';
 import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Body, type Req } from './ui.ts';
+import { currentWorkspace, workshopDb } from './workspaces.ts';
 
 // SQL Workshop → Sample Data (APEX 26.1: Data Generator): generate realistic
 // rows for one or more tables of a schema (src/sampledata.ts). Step 1 picks a
@@ -58,9 +59,9 @@ interface Saved {
   tables: TableSpec[];
 }
 
-async function saved(id: unknown) {
+async function saved(s: Session, id: unknown) {
   if (!/^\d{1,9}$/.test(String(id ?? ''))) return undefined;
-  return owner.one<Saved>('select * from meta.data_generator where id = $1', [id]);
+  return owner.one<Saved>('select * from meta.data_generator where id = $1 and workspace_id = $2', [id, currentWorkspace(s)]);
 }
 
 /** The definition posted by the generator form (never trusted: plan() checks it against the catalog). */
@@ -108,12 +109,13 @@ export async function sampleDataRoutes(app: FastifyInstance) {
 
   const intro = html`<p class="muted">Generate realistic rows for the tables of a schema: names, e-mail addresses, dates and numbers in a range, values from a list,
     foreign keys that pick existing parent rows. Preview them, insert them in one transaction (parents first) or download them as SQL or CSV.
-    Runs as the builder's owner connection, like <a href="${BASE}/sql">SQL Commands</a>.</p>`;
+    Runs as the builder's owner connection (an isolated workspace's developer login for its developers), like <a href="${BASE}/sql">SQL Commands</a>.</p>`;
 
   // ------------------------------------------------------------ step 1 and 2: schema and tables
   const start = async (s: Session, reply: FastifyReply, schema: string | undefined) => {
-    const all = await schemas(owner.pool);
-    const gens = (await owner.query<Saved & { updated_at: string; updated_by: string }>('select id, name, description, schema_name, tables, updated_at, updated_by from meta.data_generator order by lower(name)')).rows;
+    const db = await workshopDb(s);
+    const all = (await schemas(db.pool)).filter((x) => db === owner || x.usable);
+    const gens = (await owner.query<Saved & { updated_at: string; updated_by: string }>('select id, name, description, schema_name, tables, updated_at, updated_by from meta.data_generator where workspace_id = $1 order by lower(name)', [currentWorkspace(s)])).rows;
     const savedList = gens.length
       ? html`<ul class="sd-saved">${gens.map(
           (g) => html`<li><a href="${sdUrl}/${g.id}">${g.name}</a> <span class="muted small">${g.schema_name}: ${g.tables.map((t) => `${t.table} (${t.rows})`).join(', ')}</span>
@@ -129,7 +131,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
         <button class="btn">Choose</button></form>`;
     let tablesForm: Raw | '' = '';
     if (chosen) {
-      const tables = await schemaTables(owner.pool, chosen);
+      const tables = await schemaTables(db.pool, chosen);
       tablesForm = html`<form method="get" action="${sdUrl}" class="u-mt1"><input type="hidden" name="schema" value="${chosen}">
         <fieldset class="prop-group"><legend>Tables of ${chosen}</legend><div class="qb-pick">${tables.map(
           (t) => html`<label class="check"><input type="checkbox" name="t" value="${t.name}"> ${t.name} <span class="muted small">${t.estimate >= 0 ? `~${t.estimate.toLocaleString('en')} rows` : ''}</span></label>`,
@@ -155,23 +157,24 @@ export async function sampleDataRoutes(app: FastifyInstance) {
   }
 
   /** The tables of a definition with their catalog info; specs proposed for columns the definition doesn't mention. */
-  const describeAll = async (def: GeneratorDef) => {
+  const describeAll = async (s: Session, def: GeneratorDef) => {
+    const db = (await workshopDb(s)).pool;
     const out: { info: TableInfo; spec: TableSpec }[] = [];
     const missing: string[] = [];
     for (const t of def.tables) {
-      const info = await describe(owner.pool, def.schema, t.table);
+      const info = await describe(db, def.schema, t.table);
       if (!info) {
         missing.push(t.table);
         continue;
       }
-      const spec = tableSpec(info, DEFAULT_ROWS, t, undefined, await nextValues(owner.pool, info));
+      const spec = tableSpec(info, DEFAULT_ROWS, t, undefined, await nextValues(db, info));
       out.push({ info, spec: { ...spec, rows: Number.isInteger(t.rows) ? t.rows : DEFAULT_ROWS } });
     }
     return { tables: out, missing };
   };
 
   const editor = async (s: Session, reply: FastifyReply, st: FormState, code = 200) => {
-    const { tables, missing } = await describeAll(st.def);
+    const { tables, missing } = await describeAll(s, st.def);
     const title = st.id ? (st.name ?? 'Generator') : 'New generator';
     const columnRow = (i: number, j: number, c: ColumnInfo, spec: TableSpec) => {
       const cs = spec.columns.find((x) => x.column === c.name)!;
@@ -246,7 +249,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
   app.get(`${sdUrl}/:id`, async (req: Req, reply) => {
     const s = await developer(req, reply);
     if (!s) return;
-    const g = await saved(req.params.id);
+    const g = await saved(s, req.params.id);
     if (!g) return reply.code(404).send('Not found');
     return editor(s, reply, { id: g.id, name: g.name, description: g.description ?? '', def: cleanDef({ schema: g.schema_name, seed: g.seed, tables: g.tables }) });
   });
@@ -256,7 +259,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
     if (!s) return;
     const b = req.body ?? {};
     const def = defFromBody(b);
-    const g = b.id ? await saved(b.id) : undefined;
+    const g = b.id ? await saved(s, b.id) : undefined;
     if (b.id && !g) return reply.code(404).send('Not found');
     const st: FormState = { def, id: g?.id, name: (b.name ?? '').trim(), description: (b.description ?? '').trim() };
     const refuse = (error: string) => editor(s, reply, { ...st, error }, 422);
@@ -266,13 +269,13 @@ export async function sampleDataRoutes(app: FastifyInstance) {
       if (!st.name) return refuse('Give the generator a name to save it.');
       if (st.name.length > 100 || (st.description ?? '').length > 1000) return refuse('The name is at most 100 characters, the description 1000.');
       if (!allowedSchema(def.schema)) return refuse('Choose a schema of your own: not meta, information_schema or pg_*.');
-      const { tables } = await describeAll(def);
+      const { tables } = await describeAll(s, def);
       if (!tables.length) return refuse('Choose at least one table.');
       const json = JSON.stringify(tables.map(({ spec }) => spec));
       try {
         const id = g
           ? (await owner.one('update meta.data_generator set name = $2, description = $3, schema_name = $4, seed = $5, tables = $6, updated_by = $7, updated_at = now() where id = $1 returning id', [g.id, st.name, st.description || null, def.schema, def.seed, json, s.username])).id
-          : (await owner.one('insert into meta.data_generator (name, description, schema_name, seed, tables, created_by, updated_by) values ($1, $2, $3, $4, $5, $6, $6) returning id', [st.name, st.description || null, def.schema, def.seed, json, s.username])).id;
+          : (await owner.one('insert into meta.data_generator (name, description, schema_name, seed, tables, created_by, updated_by, workspace_id) values ($1, $2, $3, $4, $5, $6, $6, $7) returning id', [st.name, st.description || null, def.schema, def.seed, json, s.username, currentWorkspace(s)])).id;
         flash(s, `Generator ${st.name} saved.`);
         return back(reply, s, `${sdUrl}/${id}`);
       } catch (e) {
@@ -282,7 +285,8 @@ export async function sampleDataRoutes(app: FastifyInstance) {
     }
     if (!['preview', 'insert', 'sql', 'csv'].includes(action)) return refuse('Unknown action.');
 
-    const p = await plan(owner.pool, def);
+    const db = await workshopDb(s);
+    const p = await plan(db.pool, def);
     if (p.problems.length) return refuse(p.problems.join(' '));
     const seed = def.seed ?? randomSeed();
     st.def = { ...def, seed };
@@ -290,7 +294,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
     if (action === 'sql' || action === 'csv') {
       let generated;
       try {
-        generated = await generateAll(owner.pool, p.tables, seed);
+        generated = await generateAll(db.pool, p.tables, seed);
       } catch (e) {
         if (e instanceof SampleDataError) return refuse(e.message);
         throw e;
@@ -309,7 +313,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
 
     // preview and insert: the same run, rolled back or committed
     const started = performance.now();
-    const c = await owner.pool.connect();
+    const c = await db.pool.connect();
     let result: RunResult;
     try {
       await c.query('begin');
@@ -340,7 +344,7 @@ export async function sampleDataRoutes(app: FastifyInstance) {
   app.post(`${sdUrl}/:id/delete`, async (req: Req, reply) => {
     const s = await developer(req, reply);
     if (!s) return;
-    const g = await saved(req.params.id);
+    const g = await saved(s, req.params.id);
     if (!g) return reply.code(404).send('Not found');
     await owner.query('delete from meta.data_generator where id = $1', [g.id]);
     flash(s, `Generator ${g.name} deleted.`);