pgkiln 0.84.0 → 0.86.0

package/src/builder/cross-app.ts

@@ -4,6 +4,7 @@ import { html, raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import { BASE, developer, region, send, shell, type Req } from './ui.ts';
 import { currentWorkspace } from './workspaces.ts';
+import { scopedTx as tx, type BuilderKey } from './i18n.ts';
 
 // Cross-application reports (sprint 61; APEX: Workspace Utilities → Cross
 // Application Reports): one read-only report per topic over every application
@@ -11,9 +12,10 @@ import { currentWorkspace } from './workspaces.ts';
 // returns app_id and app (the name) first; those become a link.
 
 interface Report {
-  title: string;
-  about: string;
-  columns: [key: string, label: string, cls?: 'num'][];
+  /** Message keys (src/builder/i18n): the title, the introduction and the column labels. */
+  title: BuilderKey;
+  about: BuilderKey;
+  columns: [key: string, label: BuilderKey, cls?: 'num'][];
   sql: string;
 }
 
@@ -22,56 +24,56 @@ const IN_WS = 'meta.app_workspace(a.id) = $1';
 
 export const REPORTS: Record<string, Report> = {
   attributes: {
-    title: 'Application attributes',
-    about: 'The main settings of every application: type, sign-in, availability, build status, debug level, language and database role.',
-    columns: [['alias', 'Alias'], ['app_type', 'Type'], ['authentication', 'Sign-in'], ['availability', 'Availability'], ['build_status', 'Build status'], ['debug_level', 'Debug', 'num'], ['language', 'Language'], ['db_role', 'Database role'], ['updated', 'Updated']],
+    title: 'xap.attributes.title',
+    about: 'xap.attributes.about',
+    columns: [['alias', 'xap.col.alias'], ['app_type', 'xap.col.type'], ['authentication', 'xap.col.sign_in'], ['availability', 'xap.col.availability'], ['build_status', 'xap.col.build_status'], ['debug_level', 'xap.col.debug', 'num'], ['language', 'xap.col.language'], ['db_role', 'xap.col.database_role'], ['updated', 'xap.col.updated']],
     sql: `select a.id as app_id, a.name as app, a.alias, a.app_type, a.authentication, a.availability, a.build_status, a.debug_level,
                  a.language, coalesce(a.db_role, '(runtime connection)') as db_role, to_char(a.updated_at, 'YYYY-MM-DD HH24:MI') as updated
             from meta.app a where ${IN_WS} order by lower(a.name)`,
   },
   'build-options': {
-    title: 'Build options',
-    about: 'The build options of every application and whether their components are included.',
-    columns: [['name', 'Build option'], ['status', 'Status'], ['description', 'Description']],
+    title: 'xap.build_options.title',
+    about: 'xap.build_options.about',
+    columns: [['name', 'xap.col.build_option'], ['status', 'xap.col.status'], ['description', 'xap.col.description']],
     sql: `select a.id as app_id, a.name as app, b.name, b.status, b.description
             from meta.app a join meta.build_option b on b.app_id = a.id where ${IN_WS} order by lower(a.name), b.name`,
   },
   comments: {
-    title: 'Developer comments',
-    about: 'The developers\' comments on applications and pages, newest first.',
-    columns: [['page_no', 'Page', 'num'], ['author', 'Author'], ['created', 'Written'], ['body', 'Comment']],
+    title: 'xap.comments.title',
+    about: 'xap.comments.about',
+    columns: [['page_no', 'xap.col.page', 'num'], ['author', 'xap.col.author'], ['created', 'xap.col.written'], ['body', 'xap.col.comment']],
     sql: `select a.id as app_id, a.name as app, c.page_no, c.author, to_char(c.created_at, 'YYYY-MM-DD HH24:MI') as created, left(c.body, 500) as body
             from meta.app a join meta.dev_comment c on c.app_id = a.id where ${IN_WS} order by c.created_at desc limit 500`,
   },
   authentication: {
-    title: 'Authentication',
-    about: 'How people sign in to every application: the sign-in method, password sign-in, identity providers and LDAP directories, access control, the login page and Forgot password.',
-    columns: [['authentication', 'Sign-in'], ['local_login', 'Passwords'], ['providers', 'Identity providers'], ['ldap', 'LDAP directories'], ['access_control', 'Access'], ['remember_me_days', 'Keep me signed in (days)', 'num'], ['login_page', 'Login page', 'num'], ['password_reset', 'Forgot password']],
+    title: 'xap.authentication.title',
+    about: 'xap.authentication.about',
+    columns: [['authentication', 'xap.col.sign_in'], ['local_login', 'xap.col.passwords'], ['providers', 'xap.col.identity_providers'], ['ldap', 'xap.col.ldap_directories'], ['access_control', 'xap.col.access'], ['remember_me_days', 'xap.col.keep_me_signed_in_days', 'num'], ['login_page', 'xap.col.login_page', 'num'], ['password_reset', 'xap.col.forgot_password']],
     sql: `select a.id as app_id, a.name as app, a.authentication, case when a.local_login then 'yes' else 'no' end as local_login,
                  array_to_string(a.sso_providers, ', ') as providers, array_to_string(a.ldap_directories, ', ') as ldap,
                  a.access_control, a.remember_me_days, a.login_page, case when a.password_reset then 'yes' else 'no' end as password_reset
             from meta.app a where ${IN_WS} order by lower(a.name)`,
   },
   authorization: {
-    title: 'Authorization schemes',
-    about: 'The authorization schemes of every application: their type and what they check.',
-    columns: [['name', 'Scheme'], ['type', 'Type'], ['value', 'Checks'], ['error_message', 'Error message']],
+    title: 'xap.authorization.title',
+    about: 'xap.authorization.about',
+    columns: [['name', 'xap.col.scheme'], ['type', 'xap.col.type'], ['value', 'xap.col.checks'], ['error_message', 'xap.col.error_message']],
     sql: `select a.id as app_id, a.name as app, s.name, s.type, left(s.value, 300) as value, s.error_message
             from meta.app a join meta.authz_scheme s on s.app_id = a.id where ${IN_WS} order by lower(a.name), s.name`,
   },
   'password-items': {
-    title: 'Password items',
-    about: 'Every password item: pgkiln never shows their values again, never keeps them in session state for the next page and never writes them to the debug log.',
-    columns: [['page_no', 'Page', 'num'], ['name', 'Item'], ['label', 'Label'], ['reveal', 'Show button'], ['required', 'Required']],
+    title: 'xap.password_items.title',
+    about: 'xap.password_items.about',
+    columns: [['page_no', 'xap.col.page', 'num'], ['name', 'xap.col.item'], ['label', 'xap.col.label'], ['reveal', 'xap.col.show_button'], ['required', 'xap.col.required']],
     sql: `select a.id as app_id, a.name as app, p.page_no, i.name, i.label,
                  case when (i.config ->> 'reveal')::boolean then 'yes' else 'no' end as reveal, case when i.required then 'yes' else 'no' end as required
             from meta.app a join meta.page p on p.app_id = a.id join meta.item i on i.page_id = p.id
            where ${IN_WS} and i.type = 'password' order by lower(a.name), p.page_no, i.seq`,
   },
   theme: {
-    title: 'Theme summary',
-    about: 'The look of every application: base style, Theme Roller style, navigation and the colours it sets.',
-    columns: [['base', 'Base style'], ['style', 'Style'], ['nav', 'Navigation'], ['colors', 'Colours set', 'num'], ['pwa', 'Installable (PWA)']],
+    title: 'xap.theme.title',
+    about: 'xap.theme.about',
+    columns: [['base', 'xap.col.base_style'], ['style', 'xap.col.style'], ['nav', 'xap.col.navigation'], ['colors', 'xap.col.colours_set', 'num'], ['pwa', 'xap.col.installable_pwa']],
     sql: `select a.id as app_id, a.name as app, coalesce(a.theme ->> 'base', 'default') as base, coalesce(a.theme ->> 'style', '-') as style,
                  coalesce(a.theme ->> 'nav', 'side') as nav,
                  (select count(*) from jsonb_object_keys(coalesce(a.theme -> 'colors', '{}'::jsonb)))::int as colors,
@@ -82,7 +84,7 @@ export const REPORTS: Record<string, Report> = {
 
 /** The links in Workspace utilities' side column. */
 export const crossAppLinks = () =>
-  Object.entries(REPORTS).map(([k, r]) => html`<li><a href="${BASE}/utilities/reports/${k}">${r.title}${icon('chevron')}</a></li>`);
+  Object.entries(REPORTS).map(([k, r]) => html`<li><a href="${BASE}/utilities/reports/${k}">${tx(r.title)}${icon('chevron')}</a></li>`);
 
 export async function crossAppRoutes(app: FastifyInstance) {
   app.get(`${BASE}/utilities/reports/:kind`, async (req: Req, reply) => {
@@ -92,15 +94,15 @@ export async function crossAppRoutes(app: FastifyInstance) {
     if (!r) return reply.code(404).send('Not found');
     const rows = (await owner.query(r.sql, [currentWorkspace(s)])).rows;
     const cell = (v: unknown) => (v === null || v === undefined || v === '' ? html`<span class="muted">-</span>` : String(v));
-    const main = html`<div class="title-row"><h1>${r.title}</h1></div>
-      <p class="muted u-mt0">${r.about} Applications of the workspace ${s.workspace?.name ?? ''}.</p>
-      <nav class="ide-tabs u-mb1" aria-label="Cross-application reports">${Object.entries(REPORTS).map(([k, x]) =>
-        html`<a class="ide-tab" href="${BASE}/utilities/reports/${k}"${k === req.params.kind ? raw(' aria-current="page"') : ''}><span>${x.title}</span></a>`)}</nav>
-      ${region(r.title, rows.length
-        ? html`<div class="table-wrap"><table class="report report-reflow"><thead><tr><th>Application</th>${r.columns.map(([, l, c]) => html`<th${c ? raw(` class="${c}"`) : ''}>${l}</th>`)}</tr></thead>
-            <tbody>${rows.map((row) => html`<tr><td data-label="Application"><a href="${BASE}/apps/${row.app_id}">${row.app}</a></td>
-              ${r.columns.map(([k, l, c]) => html`<td data-label="${l}"${c ? raw(` class="${c}"`) : ''}>${cell(row[k])}</td>`)}</tr>`)}</tbody></table></div>`
-        : html`<p class="muted">Nothing to report in this workspace.</p>`, html`<span class="count">${rows.length}</span>`)}`;
-    return send(reply, s, shell(s, r.title, [['App Builder', BASE], ['Workspace utilities', `${BASE}/utilities`], [r.title]], main));
+    const main = html`<div class="title-row"><h1>${tx(r.title)}</h1></div>
+      <p class="muted u-mt0">${tx(r.about)} ${tx('xap.of_workspace', { name: s.workspace?.name ?? '' })}</p>
+      <nav class="ide-tabs u-mb1" aria-label="${tx('xap.nav')}">${Object.entries(REPORTS).map(([k, x]) =>
+        html`<a class="ide-tab" href="${BASE}/utilities/reports/${k}"${k === req.params.kind ? raw(' aria-current="page"') : ''}><span>${tx(x.title)}</span></a>`)}</nav>
+      ${region(tx(r.title), rows.length
+        ? html`<div class="table-wrap"><table class="report report-reflow"><thead><tr><th>${tx('xap.application')}</th>${r.columns.map(([, l, c]) => html`<th${c ? raw(` class="${c}"`) : ''}>${tx(l)}</th>`)}</tr></thead>
+            <tbody>${rows.map((row) => html`<tr><td data-label="${tx('xap.application')}"><a href="${BASE}/apps/${row.app_id}">${row.app}</a></td>
+              ${r.columns.map(([k, l, c]) => html`<td data-label="${tx(l)}"${c ? raw(` class="${c}"`) : ''}>${cell(row[k])}</td>`)}</tr>`)}</tbody></table></div>`
+        : html`<p class="muted">${tx('xap.nothing')}</p>`, html`<span class="count">${rows.length}</span>`)}`;
+    return send(reply, s, shell(s, tx(r.title), [[tx('rail.app_builder'), BASE], [tx('wu.title'), `${BASE}/utilities`], [tx(r.title)]], main));
   });
 }

package/src/builder/dataload.ts

@@ -27,7 +27,7 @@ import type { Session } from '../session.ts';
 import type { ComponentSpec } from './components.ts';
 import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Body, type Req } from './ui.ts';
 import { appWorkspace, currentWorkspace, workshopDb } from './workspaces.ts';
-import { tr, translatorFor, type BuilderTranslate } from './i18n.ts';
+import { scopedTx, tr, translatorFor, type BuilderTranslate } from './i18n.ts';
 
 // SQL Workshop → Load Data: upload a CSV/TSV/XLSX/JSON/XML file, preview it,
 // and load it into a new table (column types inferred) or an existing one
@@ -73,7 +73,7 @@ export const DATA_LOAD_DEF_SPEC: ComponentSpec = {
 
 /** "Load a file with it" on a definition's Shared Components page. */
 export const dataLoadDefExtras = (row: { id: number }) =>
-  html`<p class="u-mt1"><a class="btn" href="${BASE}/sql/load?definition=${row.id}">${icon('upload')} Load a file with this definition</a></p>`;
+  html`<p class="u-mt1"><a class="btn" href="${BASE}/sql/load?definition=${row.id}">${icon('upload')} ${scopedTx('dl.load_with_def')}</a></p>`;
 
 /** The data load definitions of the current workspace's applications. */
 async function definitions(s: Session) {