pgkiln 0.45.0 → 0.46.0

package/src/builder/newapp.ts

@@ -268,7 +268,8 @@ export async function createApp(c: Client, a: CheckedApp): Promise<{ id: number;
   if (base !== 'standard') theme.base = base;
   if (a.topNav) theme.nav = 'top';
   if (a.accent) theme.accent = a.accent;
-  const r = await c.query('insert into meta.app (alias, name, authentication, db_role, theme, language) values ($1, $2, $3, $4, $5, $6) returning id', [a.alias, a.name, a.authentication, a.role, theme, a.language ?? 'en']);
+  // (107) a new application starts at Release 1.0, like APEX's
+  const r = await c.query(`insert into meta.app (alias, name, authentication, db_role, theme, language, version) values ($1, $2, $3, $4, $5, $6, 'Release 1.0') returning id`, [a.alias, a.name, a.authentication, a.role, theme, a.language ?? 'en']);
   const appId = r.rows[0].id as number;
   await placeApp(c, appId, a.workspaceId);
   const p = await c.query(`insert into meta.page (app_id, page_no, name, title) values ($1, 1, 'Home', 'Home') returning id`, [appId]);

package/src/builder/object-browser.ts

@@ -4,7 +4,9 @@ import { html, raw, type Raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import { readSchema } from '../ddl.ts';
 import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Req } from './ui.ts';
-import { sessionSchema, workshopDb } from './workspaces.ts';
+import { currentWorkspace, inWorkspaceSql, sessionSchema, workshopDb } from './workspaces.ts';
+import { owner } from '../db.ts';
+import type { Session } from '../session.ts';
 
 // (sprint 75) The SQL Workshop's Object Browser like APEX's: a schema in the header (the session's
 // schema by default), a tree with a folder per object type, a filter, a + menu that starts a CREATE
@@ -61,6 +63,23 @@ export function createTemplate(kind: string, schema: string): string | null {
 }
 
 const PAGE_SIZE = 25;
+
+/**
+ * (sprint 89, SQL-4) The parsing schema of the application changed last in the developer's workspace: the
+ * schema its database role may use (not public, pgkiln's or the system's). APEX opens the Object Browser
+ * on the workspace's parsing schema.
+ */
+async function parsingSchema(s: Session): Promise<string | null> {
+  const row = await owner.one<{ n: string }>(
+    `select n.nspname as n
+       from meta.app a join pg_roles r on r.rolname = a.db_role
+       join pg_namespace n on has_schema_privilege(r.oid, n.oid, 'USAGE')
+      where ${inWorkspaceSql('a', 1)} and n.nspname !~ '^pg_' and n.nspname not in ('information_schema', 'public') and not (n.nspname = any ($2))
+      order by a.updated_at desc, a.id desc, n.nspname limit 1`,
+    [currentWorkspace(s), SYSTEM_SCHEMAS],
+  ).catch(() => undefined);
+  return row?.n ?? null;
+}
 /** A column type in an action: a type name with an optional size and array brackets. */
 const TYPE_RE = /^[a-z][a-z0-9_ ]{0,40}(\(\d{1,4}(,\s?\d{1,4})?\))?(\[\])?$/i;
 const NAME_RE = /^[A-Za-z_][A-Za-z0-9_$]{0,62}$/;
@@ -81,8 +100,15 @@ export async function objectBrowserRoutes(app: FastifyInstance) {
         [system, SYSTEM_SCHEMAS],
       )
     ).rows.map((r) => r.n);
-    const own = await sessionSchema(s, db);
-    const schema = typeof q.schema === 'string' && schemas.includes(q.schema) ? q.schema : own && schemas.includes(own) ? own : (schemas[0] ?? '');
+    // (sprint 89, SQL-4) the schema asked for, else the last one shown (remembered per session), else the session's
+    // schema of SQL Commands, else the parsing schema of the application changed last, else the first
+    const usable = (v: unknown): v is string => typeof v === 'string' && schemas.includes(v);
+    const asked = usable(q.schema) ? q.schema : null;
+    const last = s.state.__OBSCHEMA;
+    const own = asked || usable(last) ? null : await sessionSchema(s, db);
+    const parsing = asked || usable(last) || usable(own) ? null : await parsingSchema(s);
+    const schema = asked ?? (usable(last) ? last : usable(own) ? own : usable(parsing) ? parsing : (schemas[0] ?? ''));
+    if (schema && schema !== last) s.state.__OBSCHEMA = schema;
     const filter = typeof q.q === 'string' ? q.q.trim().slice(0, 100) : '';
     const objects = schema ? await listObjects(db, schema, system) : [];
     const shown = objects.filter((o) => !filter || o.name.toLowerCase().includes(filter.toLowerCase()));
@@ -161,6 +187,24 @@ export async function objectBrowserRoutes(app: FastifyInstance) {
       if (!cols.includes(col)) problem = 'Choose a column of the table.';
       else if (!NAME_RE.test(to) || cols.includes(to)) problem = 'The new name must be a valid name that the table doesn\'t have yet.';
       else sql = `alter table ${table.q} rename column ${ident(col)} to ${ident(to)};`;
+    } else if (b.action === 'modify') {
+      // (sprint 89, SQL-4) type, nulls and default in one ALTER TABLE; a default is one expression, never a statement
+      const type = String(b.type ?? '').trim();
+      const expr = String(b.default ?? '').trim();
+      const parts: string[] = [];
+      const c = ident(col);
+      if (!cols.includes(col)) problem = 'Choose a column of the table.';
+      else if (type && !TYPE_RE.test(type)) problem = 'A type is a name with an optional size, e.g. text, numeric(9,2), varchar(40), int[].';
+      else if (b.default_action === 'set' && (!expr || expr.length > 200 || /;|--|\/\*/.test(expr))) problem = 'A default is one expression (at most 200 characters, without ; or comments), e.g. now(), 0 or \'new\'.';
+      else {
+        if (type) parts.push(`alter column ${c} type ${type} using ${c}::${type}`);
+        if (b.nullable === 'not_null') parts.push(`alter column ${c} set not null`);
+        else if (b.nullable === 'null') parts.push(`alter column ${c} drop not null`);
+        if (b.default_action === 'set') parts.push(`alter column ${c} set default ${expr}`);
+        else if (b.default_action === 'drop') parts.push(`alter column ${c} drop default`);
+        if (!parts.length) problem = 'Nothing to change: choose a new type, nulls or a default.';
+        else sql = `alter table ${table.q}\n  ${parts.join(',\n  ')};`;
+      }
     } else if (b.action === 'drop') {
       if (!cols.includes(col)) problem = 'Choose a column of the table.';
       else sql = `alter table ${table.q} drop column ${ident(col)};`;
@@ -210,7 +254,7 @@ async function objectDetail(db: Awaited<ReturnType<typeof workshopDb>>, s: { csr
   const table = (rows: Record<string, unknown>[], empty = 'None.') =>
     rows.length
       ? html`<div class="table-wrap"><table class="report"><thead><tr>${Object.keys(rows[0]).map((k) => html`<th scope="col">${k}</th>`)}</tr></thead>
-        <tbody>${rows.map((r) => html`<tr>${Object.values(r).map((v) => html`<td>${v === null ? html`<span class="null">null</span>` : typeof v === 'object' ? JSON.stringify(v) : String(v)}</td>`)}</tr>`)}</tbody></table></div>`
+        <tbody>${rows.map((r) => html`<tr>${Object.values(r).map((v) => html`<td>${v === null ? '' : typeof v === 'object' ? JSON.stringify(v) : String(v)}</td>`)}</tr>`)}</tbody></table></div>`
       : html`<p class="muted">${empty}</p>`;
   const ddlOf = async (match: (x: { kind: string; name: string; table?: string }) => boolean) => {
     const objects = await readSchema(db.pool as pg.Pool, schema).catch(() => []);
@@ -247,7 +291,14 @@ async function objectDetail(db: Awaited<ReturnType<typeof workshopDb>>, s: { csr
   const isTable = o.type === 'table';
   const tabs = TABLE_TABS.filter(([k]) => isTable || !['indexes', 'constraints', 'triggers', 'rls'].includes(k) || (o.type === 'matview' && k === 'indexes'));
   const tab = tabs.some(([k]) => k === tabAsked) ? tabAsked : 'columns';
-  const nav = html`<nav class="settings-tabs ob-tabs" aria-label="${o.name}">${tabs.map(([k, label]) => html`<a href="${link({ k: o.type, o: o.ref, tab: k })}"${k === tab ? raw(' aria-current="page"') : ''}>${label}</a>`)}</nav>`;
+  // (sprint 89, SQL-4) the tabs on one row: the main ones and the current one, the rest under More
+  const MAIN = ['columns', 'data', 'indexes', 'constraints', 'ddl'];
+  const tabLink = ([k, label]: readonly [string, string]) => html`<a href="${link({ k: o.type, o: o.ref, tab: k })}"${k === tab ? raw(' aria-current="page"') : ''}>${label}</a>`;
+  const shownTabs = tabs.filter(([k]) => MAIN.includes(k) || k === tab);
+  const moreTabs = tabs.filter(([k]) => !shownTabs.some(([x]) => x === k));
+  const nav = html`<nav class="settings-tabs ob-tabs" aria-label="${o.name}">${shownTabs.map(tabLink)}${moreTabs.length
+    ? html`<details class="menu ob-more"><summary>More ${icon('chevron-down')}</summary><div class="menu-panel"><div class="menu-section menu-links">${moreTabs.map(tabLink)}</div></div></details>`
+    : ''}</nav>`;
   let body: Raw;
   switch (tab) {
     case 'columns': {
@@ -262,20 +313,32 @@ async function objectDetail(db: Awaited<ReturnType<typeof workshopDb>>, s: { csr
       ).rows;
       const names = cols.map((c) => String(c.column));
       const hidden = html`${raw(`<input type="hidden" name="__csrf" value="${s.csrf_token}">`)}<input type="hidden" name="table" value="${o.ref}"><input type="hidden" name="schema" value="${schema}">`;
-      const pick = (id: string) => html`<label class="sr-only" for="${id}">Column</label><select id="${id}" name="column">${names.map((n) => html`<option>${n}</option>`)}</select>`;
-      body = html`${table(cols)}${isTable
-        ? html`<div class="ob-actions">
-            <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="add">
-              <b>Add column</b><label class="sr-only" for="ob-add-name">Name</label><input id="ob-add-name" name="column" placeholder="name" required>
-              <label class="sr-only" for="ob-add-type">Type</label><input id="ob-add-type" name="type" placeholder="text" required>
-              <label class="check"><input type="checkbox" name="not_null" value="true"> not null</label><button class="btn btn-sm">Show the SQL</button></form>
-            <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="rename">
-              <b>Rename column</b>${pick('ob-ren-col')}<label class="sr-only" for="ob-ren-to">New name</label><input id="ob-ren-to" name="new_name" placeholder="new name" required><button class="btn btn-sm">Show the SQL</button></form>
-            <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="drop">
-              <b>Drop column</b>${pick('ob-drop-col')}<button class="btn btn-sm">Show the SQL</button></form>
-            <p class="muted u-m0">Each action writes the ALTER TABLE statement into SQL Commands: review it there and press Run.</p>
+      const pick = (id: string) => html`<label class="label" for="${id}">Column</label><select id="${id}" name="column">${names.map((n) => html`<option>${n}</option>`)}</select>`;
+      // (sprint 89, SQL-4; APEX: the Columns toolbar) Add, Modify, Rename and Drop above the columns, each a small form
+      body = html`${isTable
+        ? html`<div class="ob-toolbar" role="toolbar" aria-label="Columns">
+            <details class="menu ob-tool"><summary class="btn btn-sm">${icon('plus')} Add column</summary><div class="menu-panel">
+              <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="add">
+                <label class="label" for="ob-add-name">Name</label><input id="ob-add-name" name="column" placeholder="name" required>
+                <label class="label" for="ob-add-type">Type</label><input id="ob-add-type" name="type" placeholder="text" required>
+                <label class="check"><input type="checkbox" name="not_null" value="true"> not null</label><button class="btn btn-sm btn-hot">Show the SQL</button></form></div></details>
+            <details class="menu ob-tool"><summary class="btn btn-sm">${icon('edit')} Modify column</summary><div class="menu-panel">
+              <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="modify">
+                ${pick('ob-mod-col')}
+                <label class="label" for="ob-mod-type">New type</label><input id="ob-mod-type" name="type" placeholder="the same">
+                <label class="label" for="ob-mod-null">Nulls</label><select id="ob-mod-null" name="nullable"><option value="">the same</option><option value="null">allowed</option><option value="not_null">not null</option></select>
+                <label class="label" for="ob-mod-def">Default</label><select id="ob-mod-def" name="default_action"><option value="">the same</option><option value="set">set to</option><option value="drop">none</option></select>
+                <label class="sr-only" for="ob-mod-expr">Default expression</label><input id="ob-mod-expr" name="default" placeholder="now(), 0, 'x'">
+                <button class="btn btn-sm btn-hot">Show the SQL</button></form></div></details>
+            <details class="menu ob-tool"><summary class="btn btn-sm">${icon('tag')} Rename column</summary><div class="menu-panel">
+              <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="rename">
+                ${pick('ob-ren-col')}<label class="label" for="ob-ren-to">New name</label><input id="ob-ren-to" name="new_name" placeholder="new name" required><button class="btn btn-sm btn-hot">Show the SQL</button></form></div></details>
+            <details class="menu ob-tool"><summary class="btn btn-sm">${icon('trash')} Drop column</summary><div class="menu-panel">
+              <form method="post" action="${BASE}/sql/objects/alter" class="ob-action">${hidden}<input type="hidden" name="action" value="drop">
+                ${pick('ob-drop-col')}<button class="btn btn-sm btn-danger">Show the SQL</button></form></div></details>
+            <span class="muted ob-toolbar-note">Each writes the ALTER TABLE statement into SQL Commands: review it there and press Run.</span>
           </div>`
-        : ''}`;
+        : ''}${table(cols)}`;
       break;
     }
     case 'data': {

package/src/builder/region-help.ts

@@ -21,6 +21,7 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['*'], '{"display_selector":true} puts it in the page\'s display selector'],
   [['report', 'chart', 'cards', 'dynamic', 'tree', 'template_component'], '{"lazy":true} loads it after the page shows, {"cache":{"scope":"user"|"session"|"all","seconds":300}} keeps its HTML (a submit of the page empties it)'],
   [['data_reporter'], '{"sources":[{"id":"orders","label":"Orders","description":"…","schema":"sales","table":"order_v","columns":[{"name":"total","label":"Total","format":"FML999G990D00"}]}],"sharing":true,"share_authz":"SCHEME","page_size":25} (the Data Reporter settings below edit it)'],
+  [['form_designer'], '{"sources":[{"id":"orders","label":"Orders","description":"…","schema":"sales","table":"orders","key":"id","columns":[{"name":"customer","label":"Customer"},{"name":"status","lov":"LOV:ORDER_STATUS"}],"insert":true,"update":true,"delete":false}],"design_authz":"SCHEME","page_size":25} (the Form Designer region\'s Settings; users that pass design_authz design forms)'],
   [['ai_assistant'], '{"service":"NAME","system":"…","welcome":"…","context":[{"name":"policy","sql":"select … :AI_PROMPT …"}],"tools":[{"name":"my_leave","description":"…","sql":"select … where status = :STATUS","parameters":{"STATUS":{"type":"string","enum":["PENDING"]}}},{"name":"dept","type":"rest","source":"DEPARTMENT","description":"…"}],"max_rounds":5,"max_turns":20} (the AI assistant settings below edit it)'],
   [['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)'],
@@ -45,6 +46,7 @@ const ANCHORS: Record<string, string> = {
   tree: 'tree',
   list: 'list-lists',
   data_reporter: 'data-reporter-data-reporter',
+  form_designer: 'form_designer-form-designer',
   ai_assistant: 'ai-assistant-ai-assistant',
   template_component: 'template-components',
   static: 'static-and-dynamic-content',

package/src/builder/region-settings.ts

@@ -16,6 +16,7 @@ import { LIST_TEMPLATES } from '../runtime/lists.ts';
 import { MAX_EXTRA_LAYERS } from '../runtime/maps.ts';
 import { postgis } from '../runtime/spatial.ts';
 import { reporterSettingsForm } from './reporter.ts';
+import { formDesignerSettingsForm } from './form-designer.ts';
 
 // Page designer → a region → Settings: the region's "config" JSON as a form
 // for grid, chart, cards, calendar and faceted search regions (report
@@ -732,6 +733,7 @@ export async function regionSettingsForm(pageId: number, appId: number, r: Regio
   if (r.type === 'ai_assistant') return assistantSettingsForm(pageId, appId, r, s);
   if (r.type === 'template_component') return templateRegionForm(pageId, appId, r, s);
   if (r.type === 'data_reporter') return reporterSettingsForm(pageId, appId, r, s);
+  if (r.type === 'form_designer') return formDesignerSettingsForm(pageId, appId, r, s);
   if (!(SETTINGS_TYPES as readonly string[]).includes(r.type)) return '';
   const cfg = r.config ?? {};
   const id = (n: string) => `rg_${r.id}_${n}`;

package/src/builder/reporter.ts

@@ -43,7 +43,7 @@ async function objectByOid(oid: number): Promise<DbObject | null> {
 }
 
 /** The tables and views to choose from, with whether the application's role may read them. */
-async function objectList(dbRole: string | null) {
+export async function objectList(dbRole: string | null) {
   return (
     await owner.query<{ oid: number; name: string; access: boolean }>(
       `select c.oid::int as oid, format('%I.%I', n.nspname, c.relname) as name,

package/src/builder/routes.ts

@@ -13,7 +13,7 @@ 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 { APP_COLORS, appHeader, back, BASE, designerUrl, 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';
@@ -278,11 +278,11 @@ export async function builderRoutes(app: FastifyInstance) {
               <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>`
           : ''}${icons
-          ? html`<ul class="page-icons" id="pages-rows">${shownPages.map((p) => html`<li><a href="${BASE}/pages/${p.id}" class="page-icon"><span class="page-icon-no">${p.page_no}</span><b>${p.name}</b><small class="muted">${p.mode}, ${p.regions} region${p.regions === 1 ? '' : 's'}</small></a></li>`)}</ul>`
+          ? html`<ul class="page-icons" id="pages-rows">${shownPages.map((p) => html`<li><a href="${designerUrl(a.id, p.page_no)}" class="page-icon"><span class="page-icon-no">${p.page_no}</span><b>${p.name}</b><small class="muted">${p.mode}, ${p.regions} region${p.regions === 1 ? '' : 's'}</small></a></li>`)}</ul>`
           : html`<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 id="pages-rows">${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.page_no}</td><td><a href="${designerUrl(a.id, p.page_no)}">${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>
@@ -401,6 +401,7 @@ export async function builderRoutes(app: FastifyInstance) {
             <div class="form-grid">
               ${input('name', 'Name', a.name, { required: true })}
               ${input('alias', 'Alias', a.alias, { required: true })}
+              ${input('version', 'Version', a.version ?? '', { placeholder: 'Release 1.0', help: 'Shown in the footer of the application\'s pages; empty: none.' })}
               ${input('home_page', 'Home page', a.home_page, { type: 'number' })}
               ${select('app_type', 'Application type', a.app_type ?? 'standard', APP_TYPES.map((t): [string, string] => [t, APP_TYPE_LABELS[t]]),
                 'Theme and library applications offer their theme or shared components to other applications (Shared Components → Subscriptions); Create application can start from a boilerplate application.')}
@@ -546,7 +547,7 @@ export async function builderRoutes(app: FastifyInstance) {
                 date_format = $14, timestamp_format = $15, remember_me_days = $16, ldap_directories = $17,
                 header_name = $18, header_auto_create = $19, logout_url = $20, db_auth_roles = $21, db_auth_member_of = $22,
                 custom_auth_function = $23, custom_auth_code = $24, custom_auth_post_code = $25, nav_list = $26, navbar_list = $27,
-                app_type = $28, session_group = $29, updated_at = now() where id = $1`,
+                app_type = $28, session_group = $29, version = $30, updated_at = now() where id = $1`,
         [req.params.id, b.name?.trim(), b.alias?.trim().toLowerCase(), Number(b.home_page) || 1, b.authentication, b.db_role?.trim() || null, b.debug === 'true',
          JSON.stringify({
            base: baseStyleOf({ base: b.base }) === 'standard' ? undefined : baseStyleOf({ base: b.base }),
@@ -579,7 +580,8 @@ export async function builderRoutes(app: FastifyInstance) {
          b.nav_list?.trim().toUpperCase() || null,
          b.navbar_list?.trim().toUpperCase() || null,
          (APP_TYPES as readonly string[]).includes(b.app_type ?? '') ? b.app_type : 'standard',
-         /^[a-z][a-z0-9_]{0,29}$/.test(b.session_group?.trim().toLowerCase() ?? '') ? b.session_group!.trim().toLowerCase() : null],
+         /^[a-z][a-z0-9_]{0,29}$/.test(b.session_group?.trim().toLowerCase() ?? '') ? b.session_group!.trim().toLowerCase() : null,
+         (b.version ?? '').trim().slice(0, 40) || null],
       );
       await saveTimeZoneSettings(req.params.id, b);
       await saveLoginSettings(req.params.id, b);

package/src/builder/search.ts

@@ -3,7 +3,7 @@ import { owner } from '../db.ts';
 import { html, type Raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import { COMPONENTS, type FieldKind } from './components.ts';
-import { appHeader, BASE, developer, region, send, shell, type Req } from './ui.ts';
+import { appHeader, BASE, designerUrl, developer, region, send, shell, type Req } from './ui.ts';
 
 // App Builder → Search and "Where used": every component of an application
 // (pages, regions, items, buttons, dynamic actions, validations, processes
@@ -46,7 +46,7 @@ export async function appEntries(appId: number, query: (sql: string, params?: un
   const pageById = new Map(pages.map((p) => [p.id, p]));
   const out: Entry[] = pages.map((p) => ({
     kind: 'page', id: p.id, label: `Page ${p.page_no}: ${p.name}`, kindLabel: 'Page', icon: 'file', pageNo: p.page_no,
-    url: `${BASE}/pages/${p.id}?c=page`,
+    url: designerUrl(appId, p.page_no, 'c=page'),
     fields: PAGE_FIELDS.map((f) => ({ ...f, value: asText(p[f.name]) })),
   }));
   for (const [kind, spec] of Object.entries(COMPONENTS)) {
@@ -57,7 +57,7 @@ export async function appEntries(appId: number, query: (sql: string, params?: un
       const page = spec.scope === 'page' ? pageById.get(row.page_id) : null;
       out.push({
         kind, id: row.id, label: spec.summary(row), kindLabel: spec.label, icon: spec.icon, pageNo: page?.page_no ?? null,
-        url: page ? `${BASE}/pages/${page.id}?c=${kind}-${row.id}` : `${BASE}/apps/${appId}/shared?c=${kind}-${row.id}`,
+        url: page ? designerUrl(appId, page.page_no, `c=${kind}-${row.id}`) : `${BASE}/apps/${appId}/shared?c=${kind}-${row.id}`,
         fields: spec.fields.filter((f) => TEXT_KINDS.has(f.kind)).map((f) => ({ name: f.name, label: f.label, kind: f.kind, value: asText(row[f.name]) })),
       });
     }

package/src/builder/shared.ts

@@ -13,7 +13,7 @@ import { layoutExtras } from './layouts.ts';
 import { templateExtras, templateImport } from './templates.ts';
 import { credentialExtras, needsSecret, restSourceExtras } from './websources.ts';
 import { dataLoadDefExtras } from './dataload.ts';
-import { appHeader, back, BASE, csrf, developer, flash, input, region, select, send, shell, type Req } from './ui.ts';
+import { appHeader, back, BASE, designerUrl, csrf, developer, flash, input, region, select, send, shell, type Req } from './ui.ts';
 import { endSessions, grantAccess, roleHints, roleHintsHtml, splitRoles } from './users.ts';
 import { appOr404, componentForm, lookups, saveComponent } from './forms.ts';
 import { catalogPicker } from './rest-catalogs.ts';
@@ -89,7 +89,7 @@ export async function sharedRoutes(app: FastifyInstance) {
       if (!kids.length) return html``;
       return html`<ul class="tree">${kids.map((p) => {
         const next = new Set(seen).add(p.page_no);
-        return html`<li><a href="${BASE}/pages/${p.id}">${icon('file')}<span>${p.name}</span><span class="kind">p${p.page_no}</span></a>${tree(p.page_no, next)}</li>`;
+        return html`<li><a href="${designerUrl(a.id, p.page_no)}">${icon('file')}<span>${p.name}</span><span class="kind">p${p.page_no}</span></a>${tree(p.page_no, next)}</li>`;
       })}</ul>`;
     };
     const main = html`${appHeader(a, 'shared')}

package/src/builder/ui.ts

@@ -12,6 +12,8 @@ import { ensureDevbar } from '../runtime/devbar.ts';
 // Shared building blocks of the builder UI.
 
 export const BASE = '/builder';
+/** (sprint 86) The page designer's address: the application's id and the page's number (/builder/pages/:id redirects here). */
+export const designerUrl = (appId: number, pageNo: number, query = '') => `${BASE}/apps/${appId}/pages/${pageNo}${query ? `?${query}` : ''}`;
 
 /** pgkiln's version and the database name, for the builder's status bar. */
 const VERSION = (JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8')) as { version: string }).version;

package/src/cli/replace.ts

@@ -51,6 +51,8 @@ export const KEPT = ['app_access', 'api_client', 'session', 'sso_pending', 'save
   'subscription',
   // (057) users' Data Reporter reports (user data, like saved reports)
   'data_report',
+  // (106) Form Designer forms, built by the application's administrators (installation data, like reports)
+  'user_form',
   // (060) which AI services an application may use (installation data), its AI usage log and AI requests from SQL
   'app_ai_service', 'ai_usage', 'ai_request',
   // (061) AI assistant conversations (per session, follow their region)
@@ -79,6 +81,8 @@ const REPOINTED = ['saved_report.region_id', 'task.definition_id', 'workflow.def
   'rest_sync_log.source_id',
   // (057) Data Reporter reports follow their region like saved reports
   'data_report.region_id',
+  // (106) Form Designer forms follow their region
+  'user_form.region_id',
   // (061) AI assistant conversations follow their region
   'ai_conversation.region_id'];
 
@@ -201,6 +205,12 @@ export async function replaceApp(db: Db, doc: unknown, alias: string, opts: Repl
          from unnest($1::int[], $2::int[]) as m(old, neu) where s.region_id = m.old`,
       [pairs.map((p) => p[0]), pairs.map((p) => p[1])],
     );
+  if (pairs.length)
+    await db.query(
+      `update meta.user_form s set region_id = m.neu
+         from unnest($1::int[], $2::int[]) as m(old, neu) where s.region_id = m.old`,
+      [pairs.map((p) => p[0]), pairs.map((p) => p[1])],
+    );
   if (pairs.length)
     await db.query(
       `update meta.ai_conversation s set region_id = m.neu

package/src/i18n/ar.ts

@@ -63,6 +63,7 @@ export const ar: Record<MessageKey, string> = {
   'common.back': "رجوع",
   'common.home': "الانتقال إلى الصفحة الرئيسية",
   'common.skip': "تخطَّ إلى المحتوى",
+  'common.back_to_top': "العودة إلى الأعلى",
   'common.toggle_nav': "إظهار التنقل أو إخفاؤه",
   'common.dismiss': "إغلاق",
   // messages and errors
@@ -390,6 +391,9 @@ export const ar: Record<MessageKey, string> = {
   'facets.stars_up': "{n} نجوم فأكثر",
   'facets.star_up': "نجمة واحدة فأكثر",
   'facets.clear_short': "مسح",
+  'facets.menu': "خيارات {facet}",
+  'facets.sort_count': "الترتيب حسب العدد",
+  'facets.sort_name': "الترتيب حسب الاسم",
   'facets.show_all': "عرض الكل ({n})",
   'facets.total': "إجمالي عدد الصفوف {n}",
   'smart.placeholder': "بحث أو تصفية…",
@@ -685,6 +689,64 @@ export const ar: Record<MessageKey, string> = {
   'reporter.changed': "عُدِّل في {date}",
   'reporter.no_match': "لا توجد تقارير مطابقة للبحث.",
   'reporter.chart_tag': "مخطط",
+  // Form Designer (form-designer.ts)
+  'formdesigner.no_sources': "لم تُعدّ أي جداول لهذه المنطقة بعد.",
+  'formdesigner.no_forms': "لا توجد نماذج بعد.",
+  'formdesigner.new': "نموذج جديد",
+  'formdesigner.create': "تصميم",
+  'formdesigner.draft': "مسودة",
+  'formdesigner.design': "تصميم النموذج",
+  'formdesigner.design_of': "تصميم {name}",
+  'formdesigner.back': "كل النماذج",
+  'formdesigner.add': "إضافة",
+  'formdesigner.edit_row': "تعديل",
+  'formdesigner.rows': "صفوف {form}",
+  'formdesigner.save': "حفظ",
+  'formdesigner.delete': "حذف",
+  'formdesigner.delete_confirm': "حذف هذا الصف؟",
+  'formdesigner.cancel': "إلغاء",
+  'formdesigner.saved_row': "تم الحفظ.",
+  'formdesigner.deleted_row': "تم الحذف.",
+  'formdesigner.required': "الحقل {field} مطلوب.",
+  'formdesigner.not_in_list': "{field}: اختر قيمة من القائمة.",
+  'formdesigner.changed': "غيّر شخص آخر هذا الصف في هذه الأثناء. راجعه واحفظ مرة أخرى.",
+  'formdesigner.row_not_found': "هذا الصف غير موجود، أو لا يُسمح لك برؤيته.",
+  'formdesigner.not_allowed': "لا يُسمح لك بفعل ذلك بهذا الصف.",
+  'formdesigner.form_not_found': "هذا النموذج غير موجود (بعد الآن).",
+  'formdesigner.unknown_source': "لم يعد جدول هذا النموذج معروضًا.",
+  'formdesigner.nothing': "لا يحتوي هذا النموذج على حقول بعد.",
+  'formdesigner.choose': "- اختر -",
+  'formdesigner.name': "الاسم",
+  'formdesigner.description': "الوصف",
+  'formdesigner.published': "منشور: يمكن لكل من يرى هذه الصفحة استخدام النموذج",
+  'formdesigner.fields': "الحقول",
+  'formdesigner.field_on': "في النموذج",
+  'formdesigner.column': "العمود",
+  'formdesigner.key': "مفتاح",
+  'formdesigner.order': "الترتيب",
+  'formdesigner.label': "التسمية",
+  'formdesigner.help': "نص المساعدة",
+  'formdesigner.required_short': "مطلوب",
+  'formdesigner.display': "العرض",
+  'formdesigner.default': "الافتراضي",
+  'formdesigner.in_list': "في القائمة",
+  'formdesigner.display_auto': "حقل",
+  'formdesigner.display_textarea': "منطقة نص",
+  'formdesigner.display_select': "قائمة اختيار",
+  'formdesigner.display_radio': "مجموعة خيارات",
+  'formdesigner.actions': "يمكن للمستخدمين",
+  'formdesigner.allow_insert': "إضافة صفوف",
+  'formdesigner.allow_update': "تغيير صفوف",
+  'formdesigner.allow_delete': "حذف صفوف",
+  'formdesigner.list_help': "تعرض قائمة الصفوف الأعمدة المحددة «في القائمة»؛ وبدونها يضيف النموذج صفوفًا فقط.",
+  'formdesigner.save_form': "حفظ النموذج",
+  'formdesigner.delete_form': "حذف النموذج",
+  'formdesigner.delete_form_confirm': "حذف النموذج «{name}»؟ تبقى الصفوف التي حفظها.",
+  'formdesigner.form_saved': "تم حفظ النموذج «{name}».",
+  'formdesigner.form_deleted': "تم حذف النموذج.",
+  'formdesigner.name_required': "أعطِ النموذج اسمًا.",
+  'formdesigner.no_fields': "ضع عمودًا واحدًا على الأقل في النموذج.",
+  'formdesigner.changed_by': "غيّره {user} في {date}",
   // AI assistant region and natural-language report filters (assistant.ts, ai-filter.ts)
   'assistant.conversation': "المحادثة",
   'assistant.you': "أنت",

package/src/i18n/cs.ts

@@ -63,6 +63,7 @@ export const cs: Record<MessageKey, string> = {
   'common.back': "Zpět",
   'common.home': "Na úvodní stránku",
   'common.skip': "Přejít na obsah",
+  'common.back_to_top': "Zpět nahoru",
   'common.toggle_nav': "Zobrazit nebo skrýt navigaci",
   'common.dismiss': "Zavřít",
   // messages and errors
@@ -390,6 +391,9 @@ export const cs: Record<MessageKey, string> = {
   'facets.stars_up': "{n} hvězdičky a více",
   'facets.star_up': "1 hvězdička a více",
   'facets.clear_short': "Vymazat",
+  'facets.menu': "Možnosti: {facet}",
+  'facets.sort_count': "Seřadit podle počtu",
+  'facets.sort_name': "Seřadit podle názvu",
   'facets.show_all': "Zobrazit vše ({n})",
   'facets.total': "Celkový počet řádků {n}",
   'smart.placeholder': "Hledat nebo filtrovat…",
@@ -685,6 +689,64 @@ export const cs: Record<MessageKey, string> = {
   'reporter.changed': "změněno {date}",
   'reporter.no_match': "Hledání neodpovídá žádná sestava.",
   'reporter.chart_tag': "graf",
+  // Form Designer (form-designer.ts)
+  'formdesigner.no_sources': "Pro tuto oblast zatím nejsou nastaveny žádné tabulky.",
+  'formdesigner.no_forms': "Zatím nejsou žádné formuláře.",
+  'formdesigner.new': "Nový formulář",
+  'formdesigner.create': "Navrhnout",
+  'formdesigner.draft': "Koncept",
+  'formdesigner.design': "Navrhnout formulář",
+  'formdesigner.design_of': "Návrh: {name}",
+  'formdesigner.back': "Všechny formuláře",
+  'formdesigner.add': "Přidat",
+  'formdesigner.edit_row': "Upravit",
+  'formdesigner.rows': "Řádky: {form}",
+  'formdesigner.save': "Uložit",
+  'formdesigner.delete': "Smazat",
+  'formdesigner.delete_confirm': "Smazat tento řádek?",
+  'formdesigner.cancel': "Zrušit",
+  'formdesigner.saved_row': "Uloženo.",
+  'formdesigner.deleted_row': "Smazáno.",
+  'formdesigner.required': "{field} je povinné.",
+  'formdesigner.not_in_list': "{field}: vyberte hodnotu ze seznamu.",
+  'formdesigner.changed': "Někdo jiný mezitím tento řádek změnil. Zkontrolujte ho a uložte znovu.",
+  'formdesigner.row_not_found': "Tento řádek neexistuje, nebo ho nesmíte vidět.",
+  'formdesigner.not_allowed': "To s tímto řádkem dělat nesmíte.",
+  'formdesigner.form_not_found': "Tento formulář neexistuje (už).",
+  'formdesigner.unknown_source': "Tabulka tohoto formuláře se už nenabízí.",
+  'formdesigner.nothing': "Tento formulář zatím nemá žádná pole.",
+  'formdesigner.choose': "- Vyberte -",
+  'formdesigner.name': "Název",
+  'formdesigner.description': "Popis",
+  'formdesigner.published': "Zveřejněno: formulář může používat každý, kdo vidí tuto stránku",
+  'formdesigner.fields': "Pole",
+  'formdesigner.field_on': "Ve formuláři",
+  'formdesigner.column': "Sloupec",
+  'formdesigner.key': "klíč",
+  'formdesigner.order': "Pořadí",
+  'formdesigner.label': "Popisek",
+  'formdesigner.help': "Nápověda",
+  'formdesigner.required_short': "Povinné",
+  'formdesigner.display': "Zobrazení",
+  'formdesigner.default': "Výchozí",
+  'formdesigner.in_list': "V seznamu",
+  'formdesigner.display_auto': "Pole",
+  'formdesigner.display_textarea': "Textová oblast",
+  'formdesigner.display_select': "Výběrový seznam",
+  'formdesigner.display_radio': "Přepínače",
+  'formdesigner.actions': "Uživatelé smějí",
+  'formdesigner.allow_insert': "přidávat řádky",
+  'formdesigner.allow_update': "měnit řádky",
+  'formdesigner.allow_delete': "mazat řádky",
+  'formdesigner.list_help': "Seznam řádků ukazuje sloupce zaškrtnuté „V seznamu“; bez nich formulář jen přidává řádky.",
+  'formdesigner.save_form': "Uložit formulář",
+  'formdesigner.delete_form': "Smazat formulář",
+  'formdesigner.delete_form_confirm': "Smazat formulář „{name}“? Řádky jím uložené zůstanou.",
+  'formdesigner.form_saved': "Formulář „{name}“ uložen.",
+  'formdesigner.form_deleted': "Formulář smazán.",
+  'formdesigner.name_required': "Pojmenujte formulář.",
+  'formdesigner.no_fields': "Dejte do formuláře alespoň jeden sloupec.",
+  'formdesigner.changed_by': "změnil(a) {user} dne {date}",
   // AI assistant region and natural-language report filters (assistant.ts, ai-filter.ts)
   'assistant.conversation': "Konverzace",
   'assistant.you': "Vy",

package/src/i18n/da.ts

@@ -63,6 +63,7 @@ export const da: Record<MessageKey, string> = {
   'common.back': "Tilbage",
   'common.home': "Gå til forsiden",
   'common.skip': "Gå til indholdet",
+  'common.back_to_top': "Til toppen",
   'common.toggle_nav': "Vis eller skjul navigationen",
   'common.dismiss': "Luk",
   // messages and errors
@@ -390,6 +391,9 @@ export const da: Record<MessageKey, string> = {
   'facets.stars_up': "{n} stjerner og op",
   'facets.star_up': "1 stjerne og op",
   'facets.clear_short': "Ryd",
+  'facets.menu': "Indstillinger for {facet}",
+  'facets.sort_count': "Sortér efter antal",
+  'facets.sort_name': "Sortér efter navn",
   'facets.show_all': "Vis alle ({n})",
   'facets.total': "Antal rækker i alt {n}",
   'smart.placeholder': "Søg eller filtrér…",
@@ -685,6 +689,64 @@ export const da: Record<MessageKey, string> = {
   'reporter.changed': "ændret {date}",
   'reporter.no_match': "Ingen rapporter matcher søgningen.",
   'reporter.chart_tag': "diagram",
+  // Form Designer (form-designer.ts)
+  'formdesigner.no_sources': "Der er endnu ikke sat tabeller op for denne region.",
+  'formdesigner.no_forms': "Der er endnu ingen formularer.",
+  'formdesigner.new': "Ny formular",
+  'formdesigner.create': "Design",
+  'formdesigner.draft': "Kladde",
+  'formdesigner.design': "Design formular",
+  'formdesigner.design_of': "Design af {name}",
+  'formdesigner.back': "Alle formularer",
+  'formdesigner.add': "Tilføj",
+  'formdesigner.edit_row': "Rediger",
+  'formdesigner.rows': "Rækker i {form}",
+  'formdesigner.save': "Gem",
+  'formdesigner.delete': "Slet",
+  'formdesigner.delete_confirm': "Slet denne række?",
+  'formdesigner.cancel': "Annuller",
+  'formdesigner.saved_row': "Gemt.",
+  'formdesigner.deleted_row': "Slettet.",
+  'formdesigner.required': "{field} er påkrævet.",
+  'formdesigner.not_in_list': "{field}: vælg en værdi fra listen.",
+  'formdesigner.changed': "En anden har ændret denne række i mellemtiden. Kontrollér den, og gem igen.",
+  'formdesigner.row_not_found': "Denne række findes ikke, eller du må ikke se den.",
+  'formdesigner.not_allowed': "Det må du ikke gøre med denne række.",
+  'formdesigner.form_not_found': "Denne formular findes ikke (længere).",
+  'formdesigner.unknown_source': "Denne formulars tabel tilbydes ikke længere.",
+  'formdesigner.nothing': "Denne formular har endnu ingen felter.",
+  'formdesigner.choose': "- Vælg -",
+  'formdesigner.name': "Navn",
+  'formdesigner.description': "Beskrivelse",
+  'formdesigner.published': "Udgivet: alle, der kan se denne side, må bruge formularen",
+  'formdesigner.fields': "Felter",
+  'formdesigner.field_on': "På formularen",
+  'formdesigner.column': "Kolonne",
+  'formdesigner.key': "nøgle",
+  'formdesigner.order': "Rækkefølge",
+  'formdesigner.label': "Etiket",
+  'formdesigner.help': "Hjælpetekst",
+  'formdesigner.required_short': "Påkrævet",
+  'formdesigner.display': "Visning",
+  'formdesigner.default': "Standard",
+  'formdesigner.in_list': "I listen",
+  'formdesigner.display_auto': "Felt",
+  'formdesigner.display_textarea': "Tekstområde",
+  'formdesigner.display_select': "Valgliste",
+  'formdesigner.display_radio': "Radioknapper",
+  'formdesigner.actions': "Brugere må",
+  'formdesigner.allow_insert': "tilføje rækker",
+  'formdesigner.allow_update': "ændre rækker",
+  'formdesigner.allow_delete': "slette rækker",
+  'formdesigner.list_help': "Listen over rækker viser kolonnerne med flueben i \"I listen\"; uden nogen tilføjer formularen kun rækker.",
+  'formdesigner.save_form': "Gem formular",
+  'formdesigner.delete_form': "Slet formular",
+  'formdesigner.delete_form_confirm': "Slet formularen \"{name}\"? Rækkerne, den har gemt, bliver.",
+  'formdesigner.form_saved': "Formularen \"{name}\" er gemt.",
+  'formdesigner.form_deleted': "Formularen er slettet.",
+  'formdesigner.name_required': "Giv formularen et navn.",
+  'formdesigner.no_fields': "Sæt mindst én kolonne på formularen.",
+  'formdesigner.changed_by': "ændret af {user} den {date}",
   // AI assistant region and natural-language report filters (assistant.ts, ai-filter.ts)
   'assistant.conversation': "Samtale",
   'assistant.you': "Dig",