pgkiln 0.53.0 → 0.55.0

package/src/builder/ai-builder.ts

@@ -142,7 +142,7 @@ const SQL_SCHEMA = {
 
 async function workshopPage(s: Session, reply: FastifyReply, out: { question?: string; schema?: string; sql?: string; error?: string; result?: Raw }) {
   const list = await schemas(s);
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ai')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ai', s)}
     ${await serviceBox(s)}
     <p><a href="${BASE}/sql/ai/describe">Describe tables for AI ▸</a> <span class="muted">(better answers: say what tables and columns mean)</span></p>
     ${out.result ?? ''}
@@ -178,7 +178,7 @@ async function describePage(s: Session, reply: FastifyReply, schema: string, tab
   const t = table ? tables.find((x) => x.table === table) : undefined;
   const noted = new Set((await owner.query<{ t: string }>(`select distinct table_name as t from meta.ai_table_note where schema_name = $1`, [schema])).rows.map((r) => r.t));
   const value = (col: string, current: string | null) => (draft ? (col === '' ? draft.table : draft.columns?.[col]) ?? current ?? '' : current ?? '');
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ai')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ai', s)}
     <p><a href="${BASE}/sql/ai">◂ SQL Workshop AI</a></p>
     ${message ?? ''}
     ${region('Describe tables for AI', html`
@@ -225,7 +225,7 @@ async function pagesPage(s: Session, reply: FastifyReply, a: any, description: s
   const tables = (await wizardTables(a.db_role)).filter((t) => t.access).map((t) => t.t);
   const svc = await builderService();
   const kindOptions = WIZARD_KINDS.map(([k, label]): [string, string] => [k, label]);
-  const main = html`${appHeader(a, 'pages')}
+  const main = html`${appHeader(a, 'pages', s)}
     ${message ?? ''}
     ${region('Create pages with AI', html`
       <p class="muted u-mt0">Describe the pages you want. The App Builder's AI service proposes pages of the create page wizards for tables and views the application's role (${a.db_role ?? 'the owner'}) can read; you check the proposals and create the ones you tick. Table and column names, types and <a href="${BASE}/sql/ai/describe">descriptions</a> are sent to the service, never rows.</p>

package/src/builder/api.ts

@@ -116,7 +116,7 @@ async function apiPage(s: Session, a: any, issued?: { token: string; username: s
   ].join('\n');
 
   const check = (ok: boolean, text: Raw | string) => html`<li>${ok ? '✓' : '✗'} ${text}</li>`;
-  const main = html`${appHeader(a, 'api')}
+  const main = html`${appHeader(a, 'api', s)}
     <div class="columns">
       ${region('Setup', html`
         <p class="muted u-mt0">PostgREST runs next to pgkiln and serves the <code>${API_SCHEMA}</code> schema over HTTP. Requests carry a JWT whose <code>role</code> claim is this application’s API role; row level security uses the same <code>meta.app_user()</code> and <code>meta.has_role()</code> as the web pages.</p>

package/src/builder/autorest.ts

@@ -167,7 +167,7 @@ async function listPage(s: Session, q: Record<string, unknown>, problems: string
       <div class="buttons"><button class="btn btn-hot"${usable.length ? '' : raw(' disabled')}>${icon('bolt')} Enable</button></div>
       ${usable.length ? '' : html`<p class="muted">No application of this workspace has a database role to run as.</p>`}
     </form>`;
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('rest')}${restNav('autorest')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('rest', s)}${restNav('autorest')}
     <p class="muted">RESTful Services: publish a table or view as REST endpoints (AutoREST). Rows come paged as JSON, with filters; a primary key gives single-row GET, PUT and DELETE. Requests run as the publishing application's database role with the caller as <code>meta.app_user()</code>, so its grants and row level security apply. For tailored endpoints with your own SQL or PL/pgSQL, create a <a href="${BASE}/sql/rest/modules">module</a>.</p>
     ${region('Published objects', table)}
     ${region('Enable a table or view', form)}`;
@@ -227,7 +227,7 @@ async function detailPage(s: Session, o: Row, problems: string[] = []) {
   ].filter(Boolean).join('\n');
   const fetchEx = `const res = await fetch('${base}?limit=10'${o.auth === 'public' ? '' : `, {\n  headers: { Authorization: \`Bearer \${token}\` },\n}`});\nconst { items, has_more } = await res.json();`;
   const openapi = `${publicUrl()}/a/${o.app_alias}/autorest/openapi.json`;
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('rest')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('rest', s)}
     <h2 class="u-mb1 wrap-anywhere">${o.schema_name}.${o.object_name} <span class="muted small">${info ? kindLabel(info.kind) : ''} · ${o.enabled ? 'enabled' : 'disabled'}</span></h2>
     ${errorList(problems)}
     ${!o.enabled ? html`<div class="alert alert-info" role="status">Disabled: the endpoints answer 404.</div>` : ''}

package/src/builder/availability.ts

@@ -40,7 +40,7 @@ export async function availabilityRoutes(app: FastifyInstance) {
           'Run only: the builder refuses changes to the application (pages, shared components, settings, restores) until it is set back here. pgkiln import --replace still deploys it.')}
       </div>
       <div class="buttons"><button class="btn btn-hot">Save</button></div></form>`);
-    const main = html`${appHeader(a, 'settings')}<div class="ide-body">${body}</div>`;
+    const main = html`${appHeader(a, 'settings', s)}<div class="ide-body">${body}</div>`;
     return send(reply, s, shell(s, `${a.name} availability`, [['App Builder', BASE], [a.name, `${BASE}/apps/${a.id}`], ['Availability']], main));
   });
 

package/src/builder/backups.ts

@@ -66,7 +66,7 @@ export async function backupRoutes(app: FastifyInstance) {
           <div class="form-grid">${input('keep', 'Backups to keep', a.backups_keep, { type: 'number', help: '0 to 500; 0 makes no backups at all (also not before an import).' })}</div>
           <div class="buttons"><button class="btn">Save</button></div></form>`)}
       </div>`;
-    const main = html`${appHeader(a, 'pages')}<div class="ide-body">${body}</div>`;
+    const main = html`${appHeader(a, 'pages', s)}<div class="ide-body">${body}</div>`;
     return send(reply, s, shell(s, `${a.name} backups`, [['App Builder', BASE], [a.name, `${BASE}/apps/${a.id}`], ['Backups']], main));
   });
 

package/src/builder/changelog.ts

@@ -106,7 +106,7 @@ async function listPage(s: Session, q: Record<string, unknown>) {
         ${exp ? html`<input type="hidden" name="app" value="${exp.id}">` : ''}
         <div class="buttons"><button class="btn btn-hot">${icon('download')} Download migration</button></div></form>`
     : '';
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('changes')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('changes', s)}
     <p class="muted">The change log (Liquibase, Flyway): DDL run from the SQL Worksheet, Table Properties and Schema Comparison is kept as change sets per schema, with who ran it and when. Download them as a migration for another database: Flyway versioned files, a Liquibase formatted SQL changelog or a plain script. Only statements that succeeded are kept; data changes (INSERT, UPDATE, DELETE) are not.</p>
     ${nav}
     ${schema ? region(`Change sets of ${schema}`, html`${exportPick}${table}${downloads}`) : region('Change sets', table)}`;

package/src/builder/data-modeler.ts

@@ -87,7 +87,7 @@ async function listPage(req: Req, reply: FastifyReply) {
         <small class="help">Names separated by commas or spaces; <code>*</code> for all, <code>ord*</code> for those starting with ord. You can add more later.</small></div>
     </div>
     <div class="buttons"><button class="btn btn-hot">${icon('plus')} Create diagram</button></div></form>`;
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler', s)}
     <p class="muted u-mt0">Relational diagrams of a schema's tables and views: their columns, keys and the foreign keys between them. From a diagram: its DDL and a data dictionary.</p>
     ${region('Diagrams', list)}<div class="u-spacer"></div>${region('Create diagram', create)}`;
   return send(reply, s, shell(s, 'Data Modeler', [['SQL Workshop', `${BASE}/sql`], ['Data Modeler']], main, 'sql'));
@@ -102,7 +102,7 @@ async function diagramPage(req: Req, reply: FastifyReply) {
   const m = await model(s, d);
   const crumbs: [string, string?][] = [['SQL Workshop', `${BASE}/sql`], ['Data Modeler', M], [d.name]];
   if (!m) {
-    const main = html`<h1 class="u-mb1">${d.name}</h1>${workshopTabs('modeler')}<div class="alert alert-error" role="alert">The schema ${d.schema_name} doesn't exist any more, or this workspace can't use it.</div>
+    const main = html`<h1 class="u-mb1">${d.name}</h1>${workshopTabs('modeler', s)}<div class="alert alert-error" role="alert">The schema ${d.schema_name} doesn't exist any more, or this workspace can't use it.</div>
       <form method="post" action="${M}/${d.id}/delete">${csrf(s)}<button class="btn btn-danger" data-confirm="Delete the diagram ${d.name}?">${icon('trash')} Delete the diagram</button></form>`;
     return send(reply, s, shell(s, d.name, crumbs, main, 'sql'));
   }
@@ -151,7 +151,7 @@ async function diagramPage(req: Req, reply: FastifyReply) {
   const settings = html`<details class="dm-settings"><summary>Rename or delete the diagram</summary>
     <form method="post" action="${M}/${d.id}/rename" class="dm-search-row">${csrf(s)}<label class="sr-only" for="f_rename">Name</label><input id="f_rename" name="name" value="${d.name}" maxlength="120" required><button class="btn">${icon('edit')} Rename</button></form>
     <form method="post" action="${M}/${d.id}/delete">${csrf(s)}<button class="btn btn-danger" data-confirm="Delete the diagram ${d.name}? The tables stay as they are.">${icon('trash')} Delete diagram</button></form></details>`;
-  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler')}
+  const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler', s)}
     <div class="dm-head"><h2 class="dm-name">${d.name}</h2><span class="muted small">Schema ${d.schema_name} · ${tables.length} objects · updated ${when(d.updated_at)} by ${d.updated_by ?? d.created_by}</span></div>
     ${missing.length ? html`<div class="alert alert-error" role="alert">Not in ${d.schema_name} any more: ${missing.join(', ')}. Saving the diagram leaves them out.</div>` : ''}
     ${toolbar}
@@ -353,7 +353,7 @@ export async function dataModelerRoutes(app: FastifyInstance) {
     const script = diagramDdl(d.schema_name, new Set(m.tables.map((t) => t.name)), await readSchema(m.db.pool, d.schema_name));
     if (req.query.download === '1')
       return reply.header('content-disposition', `attachment; filename="${fileName(d.name)}.sql"`).type('application/sql; charset=utf-8').send(script);
-    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler')}
+    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('modeler', s)}
       ${region(`DDL of ${d.name}`, html`<p class="muted u-mt0">The CREATE statements of the diagram's ${m.tables.length} objects in schema ${d.schema_name}: tables, their keys, indexes, triggers, row level security, policies, comments and grants, and views. Review before running.</p>
         <pre class="source" data-code-view="sql" tabindex="0" aria-label="DDL">${script}</pre>
         <form method="post" action="${BASE}/sql">${csrf(s)}<input type="hidden" name="sql" value="${script}">

package/src/builder/data-security.ts

@@ -171,7 +171,7 @@ async function page(req: Req, reply: FastifyReply) {
   }
   const title = `Security of ${cur.schema}.${cur.table}`;
   const objUrl = `${BASE}/sql/objects?${new URLSearchParams({ schema: cur.schema, k: 'table', o: ref })}`;
-  const main = html`<h1 class="u-mb1">${title}</h1>${workshopTabs('objects')}${form(s, cur, def, { ref, sql, warnings, errors, output })}`;
+  const main = html`<h1 class="u-mb1">${title}</h1>${workshopTabs('objects', s)}${form(s, cur, def, { ref, sql, warnings, errors, output })}`;
   return send(reply, s, shell(s, title, [['SQL Workshop', `${BASE}/sql`], ['Object Browser', `${BASE}/sql/objects`], [`${cur.schema}.${cur.table}`, objUrl], ['Security']], main, 'sql'));
 }
 

package/src/builder/dataload.ts

@@ -139,7 +139,7 @@ export function resultHtml(r: LoadResult, failed: boolean) {
 
 export async function dataLoadRoutes(app: FastifyInstance) {
   const page = (s: Session, reply: FastifyReply, main: Raw) =>
-    send(reply, s, shell(s, 'Load Data', [['SQL Workshop', `${BASE}/sql`], ['Load Data']], html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('load')}${main}`, 'sql'));
+    send(reply, s, shell(s, 'Load Data', [['SQL Workshop', `${BASE}/sql`], ['Load Data']], html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('load', s)}${main}`, 'sql'));
 
   // step 1: choose a file
   app.get(`${BASE}/sql/load`, async (req: Req, reply) => {

package/src/builder/datapump.ts

@@ -36,7 +36,7 @@ async function admin(req: Req, reply: FastifyReply) {
 }
 
 const page = (reply: FastifyReply, s: Session, title: string, trail: [string, string?][], body: Raw, code = 200) =>
-  send(reply.code(code), s, shell(s, title, crumbs(...trail), html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('datapump')}${body}`, 'sql'));
+  send(reply.code(code), s, shell(s, title, crumbs(...trail), html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('datapump', s)}${body}`, 'sql'));
 
 export const size = (n: number | null) =>
   n === null ? '' : n < 1024 ? `${n} B` : n < 1024 ** 2 ? `${(n / 1024).toFixed(1)} KB` : n < 1024 ** 3 ? `${(n / 1024 ** 2).toFixed(1)} MB` : `${(n / 1024 ** 3).toFixed(2)} GB`;

package/src/builder/ddl-tools.ts

@@ -65,7 +65,7 @@ export async function ddlToolRoutes(app: FastifyInstance) {
         result = html`<div class="alert alert-error" role="alert">${(e as Error).message}</div>`;
       }
     }
-    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ddl')}
+    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('ddl', s)}
       <p class="muted">The DDL of a schema's objects, from the database catalog, in an order that runs: types, sequences, tables, functions, views, constraints, indexes, triggers, row level security, comments and grants (APEX: Generate DDL). Objects of extensions are left out.</p>
       <form method="get" class="u-mb1">
         <div class="form-grid">${schemaSelect('schema', 'Schema', schemas, schema)}</div>
@@ -114,7 +114,7 @@ export async function ddlToolRoutes(app: FastifyInstance) {
         result = html`<div class="alert alert-error" role="alert">${(e as Error).message}</div>`;
       }
     }
-    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('compare')}
+    const main = html`<h1 class="u-mb1">SQL Workshop</h1>${workshopTabs('compare', s)}
       <p class="muted">Compares the objects of two schemas of this database by their DDL (APEX: Schema Comparison), e.g. a development copy with the schema it came from, and writes a script that makes the target like the source. The order of a table's columns is not compared.</p>
       <form method="get" class="u-mb1">
         <div class="form-grid">${schemaSelect('source', 'Source', schemas, source)}${schemaSelect('target', 'Target (to make like the source)', schemas, target)}</div>