pgkiln 0.72.0 → 0.74.0

package/src/builder/components.ts

@@ -116,9 +116,9 @@ export const COMPONENTS: Record<string, ComponentSpec> = {
       { name: 'title', common: true, label: 'Title', kind: 'text', group: 'Identification' },
       { name: 'static_id', label: 'Static ID', kind: 'text', group: 'Identification',
         help: 'Optional, unique on the page: lower case letters, digits, _ and -, starting with a letter. Names the region in exported files (so renaming it keeps them) and is data-static-id on the page, for CSS and JavaScript.' },
-      { name: 'type', common: true, label: 'Type', kind: 'select', options: ['report', 'grid', 'form', 'login', 'chart', 'cards', 'calendar', 'facets', 'smart_filters', 'display_selector', 'tasks', 'workflows', 'map', 'tree', 'template_component', 'list', 'static', 'dynamic', 'data_reporter', 'form_designer', 'ai_assistant', 'plugin', 'url', 'search'], group: 'Identification' },
+      { name: 'type', common: true, label: 'Type', kind: 'select', options: ['report', 'grid', 'form', 'login', 'chart', 'cards', 'calendar', 'facets', 'smart_filters', 'display_selector', 'tasks', 'workflows', 'map', 'tree', 'template_component', 'list', 'static', 'dynamic', 'data_reporter', 'form_designer', 'ai_assistant', 'plugin', 'url', 'search', 'classic_report', 'breadcrumb', 'help_text'], group: 'Identification' },
       { name: 'source', common: true, label: 'Source', kind: 'code', wide: true, group: 'Source',
-        help: 'report/grid: a SELECT (use :ITEM binds) · chart: label column + one numeric column per series · cards: title, subtitle, body, badge, icon · calendar: start_date, end_date, title · map: lat and lng (or location "lat,lng"), title, body, geojson · tree: id, parent_id, label, icon · template_component: any SELECT (its columns are #COLUMN# in the template), or empty for one instance · dynamic: a SELECT returning HTML (escape with meta.html_escape) · static: HTML with &ITEM. substitutions · url: the page to show, https://host/path?q=&P1_ITEM. (the host is written out; items are URL-encoded) or a path on this server (/a/other/1).' },
+        help: 'report/grid/classic_report: a SELECT (use :ITEM binds) · chart: label column + one numeric column per series · cards: title, subtitle, body, badge, icon · calendar: start_date, end_date, title · map: lat and lng (or location "lat,lng"), title, body, geojson · tree: id, parent_id, label, icon · template_component: any SELECT (its columns are #COLUMN# in the template), or empty for one instance · dynamic: a SELECT returning HTML (escape with meta.html_escape) · static: HTML with &ITEM. substitutions · url: the page to show, https://host/path?q=&P1_ITEM. (the host is written out; items are URL-encoded) or a path on this server (/a/other/1).' },
       { name: 'rest_source', label: 'REST data source', kind: 'rest_source', group: 'Source',
         help: 'Read the rows of a REST data source (Shared Components) instead of a table: the source above is then optional SQL over them, e.g. select * from rest where price > 10. Parameters: {"rest_params": {"city": "&P1_CITY."}} in the attributes.' },
       { name: 'table_name', common: true, label: 'Table (form, grid)', kind: 'text', help: 'e.g. sales.orders', group: 'Source' },
@@ -149,13 +149,13 @@ export const COMPONENTS: Record<string, ComponentSpec> = {
     validate: (v) => formatSettingsProblem(v.config),
     fields: [
       { name: 'name', common: true, label: 'Name', kind: 'upper', help: 'Referenced in SQL as :NAME, e.g. P3_NAME', group: 'Identification' },
-      { name: 'type', common: true, label: 'Type', kind: 'select', options: ['text', 'textarea', 'number', 'date', 'datetime', 'select', 'popup_lov', 'radio', 'checkbox', 'switch', 'checkbox_group', 'multiselect', 'email', 'tel', 'url', 'color', 'file', 'location', 'richtext', 'markdown', 'rating', 'combobox', 'daterange', 'qrcode', 'image', 'address', 'hidden', 'display', 'password', 'plugin'], group: 'Identification' },
+      { name: 'type', common: true, label: 'Type', kind: 'select', options: ['text', 'textarea', 'number', 'date', 'datetime', 'select', 'popup_lov', 'radio', 'checkbox', 'switch', 'checkbox_group', 'multiselect', 'email', 'tel', 'url', 'color', 'file', 'location', 'richtext', 'markdown', 'rating', 'combobox', 'daterange', 'qrcode', 'image', 'address', 'hidden', 'display', 'password', 'plugin', 'shuttle', 'select_one', 'select_many'], group: 'Identification' },
       { name: 'label', common: true, label: 'Label', kind: 'text', group: 'Identification' },
       { name: 'region_id', common: true, label: 'Region', kind: 'region', group: 'Layout' },
       { name: 'seq', label: 'Sequence', kind: 'int', group: 'Layout' },
       { name: 'source_column', common: true, label: 'Source column (form)', kind: 'text', group: 'Source' },
       { name: 'default_value', common: true, label: 'Default value', kind: 'text', group: 'Source' },
-      { name: 'lov', common: true, label: 'List of values', kind: 'code', wide: true, group: 'List of values', help: 'select display, return from … · STATIC:Yes;Y,No;N · LOV:NAME (shared) · checkbox_group/multiselect store values colon-separated: string_to_array(:P1_X, \':\')' },
+      { name: 'lov', common: true, label: 'List of values', kind: 'code', wide: true, group: 'List of values', help: 'select display, return from … · STATIC:Yes;Y,No;N · LOV:NAME (shared) · checkbox_group/multiselect/shuttle/select_many store values colon-separated: string_to_array(:P1_X, \':\')' },
       { name: 'template_options', label: 'Template options', kind: 'options', choices: ITEM_OPTIONS, group: 'Appearance',
         help: 'CSS classes from a fixed list, added to the item (APEX: Template Options).' },
       { name: 'required', common: true, label: 'Value required', kind: 'bool', group: 'Validation' },
@@ -163,7 +163,7 @@ export const COMPONENTS: Record<string, ComponentSpec> = {
       { name: 'readonly_condition', label: 'Read-only condition (SQL)', kind: 'code', group: 'Security', help: 'When true the item is shown read-only and ignored on submit.' },
       { name: 'authz', label: 'Authorization', kind: 'authz', group: 'Security', help: AUTHZ_HELP },
       buildOption('Security'),
-      { name: 'config', label: 'Attributes (JSON)', kind: 'json', group: 'Attributes', help: '{"submit_on_change":true,"null_label":"- All -","cascade_parents":"P3_DEPTNO","wide":true}. {"warn_unsaved":false}: a change of this item doesn\'t count for the page\'s "Warn on unsaved changes". Lists of values read at most {"max_rows":5000} rows. File items: {"filename_column":"photo_name","mime_column":"photo_mime","size_column":"photo_size","updated_column":"photo_updated","accept":"image/*,.pdf","max_mb":2,"capture":"environment","max_px":1600} (capture opens the camera on phones; max_px makes photos smaller before upload). {"crop":"1:1"} lets the user crop a picture before upload (free, 1:1, 4:3, 3:4, 16:9, 3:2, 2:3). Several files: {"multiple":true,"max_files":5,"table":"doc.attachment","parent_column":"ticket_id","key_column":"id"} with the content column as source (one row per file). Text items: {"scan":true} adds a barcode/QR scan button where the browser can read codes. Location items hold "lat,lng" with a "Use my location" button. Rich text: sanitised HTML; markdown: Markdown text ({"rows":10}). Rating: {"max":5} stars, stored as 1..max. Combobox: free text with list-of-values suggestions, values colon-separated ({"multiple":false} for one value). Date range: "from:to" (ISO dates; split_part(:P1_X, \':\', 1)). QR code: shows the value as a QR code ({"ecc":"M","size":200,"show_value":true}). Password: {"reveal":true} adds a show/hide button. Image (display image): the value is an https URL, a path or a data:image URL; or {"sql":"select photo, photo_mime from hr.emp where id = :P3_ID"} shows the first column of the first row (a BLOB); {"alt":"Photo of &P3_NAME.","width":160,"height":160}. Address: {"coordinates_item":"P3_LOCATION","country":"nl"} (a "Check address" button where the installation has a geocoder, GEOCODER_URL; the chosen address\'s position goes into the item as "lat,lng"). Any item: {"persist":"user"} keeps its value per user across sessions (a user preference named like the item). Number and display items: {"format_mask":"999G999G990D00"} shows the number in the language\'s notation (FML999G990D00 adds the currency) and reads it back on submit. · plugin: {"plugin":"name","attributes":{"NAME":"value"}} (an item plug-in: a text field its JavaScript enhances)' },
+      { name: 'config', label: 'Attributes (JSON)', kind: 'json', group: 'Attributes', help: '{"submit_on_change":true,"null_label":"- All -","cascade_parents":"P3_DEPTNO","wide":true}. {"warn_unsaved":false}: a change of this item doesn\'t count for the page\'s "Warn on unsaved changes". Lists of values read at most {"max_rows":5000} rows. File items: {"filename_column":"photo_name","mime_column":"photo_mime","size_column":"photo_size","updated_column":"photo_updated","accept":"image/*,.pdf","max_mb":2,"capture":"environment","max_px":1600} (capture opens the camera on phones; max_px makes photos smaller before upload). {"crop":"1:1"} lets the user crop a picture before upload (free, 1:1, 4:3, 3:4, 16:9, 3:2, 2:3). Several files: {"multiple":true,"max_files":5,"table":"doc.attachment","parent_column":"ticket_id","key_column":"id"} with the content column as source (one row per file). Text items: {"scan":true} adds a barcode/QR scan button where the browser can read codes. Location items hold "lat,lng" with a "Use my location" button. Rich text: sanitised HTML; markdown: Markdown text ({"rows":10}). Rating: {"max":5} stars, stored as 1..max. Combobox: free text with list-of-values suggestions, values colon-separated ({"multiple":false} for one value). Shuttle: two lists (available, chosen) with move and order buttons; the chosen values colon-separated in their order. Select One / Select Many: a search field over the list of values (Select Many: chosen values as chips, colon-separated); {"null_label":"- None -"} or false for Select One. Date range: "from:to" (ISO dates; split_part(:P1_X, \':\', 1)). QR code: shows the value as a QR code ({"ecc":"M","size":200,"show_value":true}). Password: {"reveal":true} adds a show/hide button. Image (display image): the value is an https URL, a path or a data:image URL; or {"sql":"select photo, photo_mime from hr.emp where id = :P3_ID"} shows the first column of the first row (a BLOB); {"alt":"Photo of &P3_NAME.","width":160,"height":160}. Address: {"coordinates_item":"P3_LOCATION","country":"nl"} (a "Check address" button where the installation has a geocoder, GEOCODER_URL; the chosen address\'s position goes into the item as "lat,lng"). Any item: {"persist":"user"} keeps its value per user across sessions (a user preference named like the item). Number and display items: {"format_mask":"999G999G990D00"} shows the number in the language\'s notation (FML999G990D00 adds the currency) and reads it back on submit. · plugin: {"plugin":"name","attributes":{"NAME":"value"}} (an item plug-in: a text field its JavaScript enhances)' },
     ],
   },
   button: {

package/src/builder/designer.ts

@@ -391,7 +391,7 @@ export async function designerRoutes(app: FastifyInstance) {
             ${select('page_template', 'Page template', p.page_template ?? 'standard', [['standard', 'Standard'], ['left_side_column', 'Left side column'], ['right_side_column', 'Right side column'], ['minimal', 'Minimal (no navigation)']], 'Side column: regions with position left (or right) show in a column beside the body (under it on narrow screens). Minimal: no header and navigation menu, e.g. for a login page (Application settings → Login page).')}
             ${select('dialog_position', 'Dialog position', p.dialog_position ?? 'center', [['center', 'Centred dialog'], ['right', 'Drawer from the right'], ['left', 'Drawer from the left'], ['top', 'Drawer from the top'], ['bottom', 'Drawer from the bottom']], 'Modal pages only. On phones dialogs and side drawers fill the screen.')}
             ${select('dialog_size', 'Dialog size', p.dialog_size ?? 'medium', [['small', 'Small'], ['medium', 'Medium'], ['large', 'Large']], 'The width (the height of top and bottom drawers).')}
-            ${input('static_includes', 'JavaScript and CSS files', (p.static_includes ?? []).join(', '), { placeholder: 'e.g. page-3.js, page-3.css', help: 'Static application files (.js, .css) this page loads after the application\'s own, in this order.' })}
+            ${input('static_includes', 'JavaScript and CSS files', (p.static_includes ?? []).join(', '), { placeholder: 'e.g. page-3.js, page-3.css', help: 'Static application files (.js, .css) this page loads after the application\'s own, in this order; #WORKSPACE_FILES#name for a static workspace file.' })}
             <div class="field"><span class="label" aria-hidden="true"></span><label class="check"><input type="checkbox" name="warn_unsaved" value="true"${p.warn_unsaved ? raw(' checked') : ''}> Warn on unsaved changes</label>
               <small class="help">Ask before the user leaves the page (a link, a redirect button, closing the tab) while an item has a changed value. Submitting doesn't ask. Leave an item out with {"warn_unsaved": false} in its attributes.</small></div>
             ${select('parent_page', 'Breadcrumb parent', p.parent_page ?? '', [['', '- none -'], ...lk.pages.filter((x) => x.page_no !== p.page_no).map((x): [string, string] => [String(x.page_no), `${x.page_no}. ${x.name}`])])}
@@ -404,6 +404,11 @@ export async function designerRoutes(app: FastifyInstance) {
             ${select('build_option', 'Build option', p.build_option ?? '', buildOptionChoices(lk, p.build_option),
               'While the option is excluded (or "Not": included) the page does not exist in the running application.')}
           </div></fieldset>
+          <fieldset class="prop-group"><legend>Help</legend><div class="form-grid">
+            <div class="field" data-wide><label class="label" for="f_help">Help text</label>
+              <textarea id="f_help" name="help" rows="5" maxlength="20000">${p.help ?? ''}</textarea>
+              <small class="help">Markdown with &amp;ITEM. substitutions. A region of type Help Text on the page shows it (APEX: Page → Help).</small></div>
+          </div></fieldset>
           <div class="buttons"><button class="btn btn-hot">${tx('pd.save_page')}</button></div>
         </form>`, true)])}
         ${await usedInPanel(p.app_id, 'page', p)}
@@ -505,9 +510,10 @@ export async function designerRoutes(app: FastifyInstance) {
       const before = await owner.one('select app_id, page_no from meta.page where id = $1', [req.params.pid]);
       await owner.query(
         `update meta.page set page_no = $2, name = $3, title = $4, requires_auth = $5, mode = $6, parent_page = $7, authz = $8, protection = $9, build_option = $10,
-                dialog_position = $11, dialog_size = $12, static_includes = $13, warn_unsaved = $14, page_template = $15, page_group = $16 where id = $1`,
+                dialog_position = $11, dialog_size = $12, static_includes = $13, warn_unsaved = $14, page_template = $15, page_group = $16, help = $17 where id = $1`,
         [req.params.pid, Number(b.page_no), b.name?.trim(), b.title?.trim() || null, b.requires_auth === 'true', b.mode, b.parent_page ? Number(b.parent_page) : null, b.authz || null, b.protection, b.build_option?.trim().toUpperCase() || null,
-         ['left', 'right', 'top', 'bottom'].includes(b.dialog_position ?? '') ? b.dialog_position : 'center', ['small', 'large'].includes(b.dialog_size ?? '') ? b.dialog_size : 'medium', parseIncludes(b.static_includes), b.warn_unsaved === 'true', ['minimal', 'left_side_column', 'right_side_column'].includes(b.page_template ?? '') ? b.page_template : 'standard', b.page_group?.trim() || null],
+         ['left', 'right', 'top', 'bottom'].includes(b.dialog_position ?? '') ? b.dialog_position : 'center', ['small', 'large'].includes(b.dialog_size ?? '') ? b.dialog_size : 'medium', parseIncludes(b.static_includes), b.warn_unsaved === 'true', ['minimal', 'left_side_column', 'right_side_column'].includes(b.page_template ?? '') ? b.page_template : 'standard', b.page_group?.trim() || null,
+         typeof b.help === 'string' && b.help.trim() ? b.help.replace(/\r\n?/g, '\n').trim().slice(0, 20000) : null],
       );
       // the page's lock and comments follow a new page number
       if (before && before.page_no !== Number(b.page_no))

package/src/builder/home.ts

@@ -286,6 +286,9 @@ export async function homeRoutes(app: FastifyInstance) {
         ${card(`${BASE}/developers`, icon('users'), 'Developers', 'Who may use this builder.')}
         ${s.workspace?.sql_workshop === false ? '' : card(`${BASE}/sql`, icon('database'), 'SQL Workshop', 'Run SQL, browse objects and load data.')}
         ${card(`${BASE}/backups`, icon('archive'), 'Manage backups', 'The backups of every application of this workspace; back them all up at once.')}
+        ${card(`${BASE}/workspace-files`, icon('file'), 'Static workspace files', 'CSS, JavaScript, images and fonts every application of this workspace can load (#WORKSPACE_FILES#).')}
+        ${card(`${BASE}/remote-servers`, icon('server'), 'Remote servers', 'Named base URLs for REST data sources, catalogs and AI services: change one value to move them all.')}
+        ${card(`${BASE}/workspace-credentials`, icon('key'), 'Web credentials', 'Keys and OAuth2 clients the applications of this workspace use by name (secrets encrypted, write-only).')}
         ${card(`${BASE}/rest-catalogs`, icon('globe'), 'REST Source Catalogs', 'Web services described once for the workspace (e.g. from an OpenAPI document); applications make REST data sources from them.')}
         ${s.workspace?.admin ? card(`${BASE}/workspace-export`, icon('download'), 'Export and import', 'This workspace\'s components as one file: settings, developers, groups, links, catalogs, scripts, blueprints (workspace administrators).') : ''}
         ${card(`${BASE}/dashboard`, icon('activity'), 'Dashboard', 'Usage and problems across the workspace.')}

package/src/builder/i18n/de.ts

@@ -552,6 +552,9 @@ export const de: BuilderMessages = {
   'gallery.region.search': 'Suche',
   'gallery.region.login': 'Anmeldung',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Klassischer Bericht',
+  'gallery.region.breadcrumb': 'Navigationspfad',
+  'gallery.region.help_text': 'Hilfetext',
   'gallery.item.text': 'Textfeld',
   'gallery.item.textarea': 'Textbereich',
   'gallery.item.number': 'Zahlenfeld',
@@ -582,6 +585,9 @@ export const de: BuilderMessages = {
   'gallery.item.display': 'Nur anzeigen',
   'gallery.item.password': 'Kennwort',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Shuttle',
+  'gallery.item.select_one': 'Einzelauswahl (Suche)',
+  'gallery.item.select_many': 'Mehrfachauswahl (Suche)',
   'gallery.button.submit': 'Seite weiterleiten',
   'gallery.button.redirect': 'Zu Seite umleiten',
   'gallery.button.da': 'Dynamische Aktion',

package/src/builder/i18n/en.ts

@@ -555,6 +555,9 @@ export const en = {
   'gallery.region.search': 'Search',
   'gallery.region.login': 'Login',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Classic Report',
+  'gallery.region.breadcrumb': 'Breadcrumb',
+  'gallery.region.help_text': 'Help Text',
   'gallery.item.text': 'Text Field',
   'gallery.item.textarea': 'Text Area',
   'gallery.item.number': 'Number Field',
@@ -585,6 +588,9 @@ export const en = {
   'gallery.item.display': 'Display Only',
   'gallery.item.password': 'Password',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Shuttle',
+  'gallery.item.select_one': 'Select One',
+  'gallery.item.select_many': 'Select Many',
   'gallery.button.submit': 'Submit Page',
   'gallery.button.redirect': 'Redirect to Page',
   'gallery.button.da': 'Dynamic Action',

package/src/builder/i18n/es.ts

@@ -552,6 +552,9 @@ export const es: BuilderMessages = {
   'gallery.region.search': 'Buscar',
   'gallery.region.login': 'Inicio de sesión',
   'gallery.region.plugin': 'Plugin',
+  'gallery.region.classic_report': 'Informe clásico',
+  'gallery.region.breadcrumb': 'Ruta de navegación',
+  'gallery.region.help_text': 'Texto de ayuda',
   'gallery.item.text': 'Campo de texto',
   'gallery.item.textarea': 'Área de texto',
   'gallery.item.number': 'Campo numérico',
@@ -582,6 +585,9 @@ export const es: BuilderMessages = {
   'gallery.item.display': 'Solo visualización',
   'gallery.item.password': 'Contraseña',
   'gallery.item.plugin': 'Plugin',
+  'gallery.item.shuttle': 'Lista de transferencia',
+  'gallery.item.select_one': 'Seleccionar uno',
+  'gallery.item.select_many': 'Seleccionar varios',
   'gallery.button.submit': 'Enviar página',
   'gallery.button.redirect': 'Redirigir a página',
   'gallery.button.da': 'Acción dinámica',

package/src/builder/i18n/fr.ts

@@ -552,6 +552,9 @@ export const fr: BuilderMessages = {
   'gallery.region.search': 'Recherche',
   'gallery.region.login': 'Connexion',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Etat classique',
+  'gallery.region.breadcrumb': 'Fil d\'Ariane',
+  'gallery.region.help_text': 'Texte d\'aide',
   'gallery.item.text': 'Champ de texte',
   'gallery.item.textarea': 'Zone de texte',
   'gallery.item.number': 'Champ numérique',
@@ -582,6 +585,9 @@ export const fr: BuilderMessages = {
   'gallery.item.display': 'Affichage seul',
   'gallery.item.password': 'Mot de passe',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Navette',
+  'gallery.item.select_one': 'Sélectionner un',
+  'gallery.item.select_many': 'Sélectionner plusieurs',
   'gallery.button.submit': 'Soumettre la page',
   'gallery.button.redirect': 'Rediriger vers une page',
   'gallery.button.da': 'Action dynamique',

package/src/builder/i18n/it.ts

@@ -552,6 +552,9 @@ export const it: BuilderMessages = {
   'gallery.region.search': 'Ricerca',
   'gallery.region.login': 'Login',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Report classico',
+  'gallery.region.breadcrumb': 'Percorso di navigazione',
+  'gallery.region.help_text': 'Testo della guida',
   'gallery.item.text': 'Campo di testo',
   'gallery.item.textarea': 'Area di testo',
   'gallery.item.number': 'Campo numerico',
@@ -582,6 +585,9 @@ export const it: BuilderMessages = {
   'gallery.item.display': 'Solo visualizzazione',
   'gallery.item.password': 'Password',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Shuttle',
+  'gallery.item.select_one': 'Selezione singola',
+  'gallery.item.select_many': 'Selezione multipla con ricerca',
   'gallery.button.submit': 'Invia pagina',
   'gallery.button.redirect': 'Reindirizza alla pagina',
   'gallery.button.da': 'Azione dinamica',

package/src/builder/i18n/ja.ts

@@ -552,6 +552,9 @@ export const ja: BuilderMessages = {
   'gallery.region.search': '検索',
   'gallery.region.login': 'ログイン',
   'gallery.region.plugin': 'プラグイン',
+  'gallery.region.classic_report': 'クラシック・レポート',
+  'gallery.region.breadcrumb': 'ブレッドクラム',
+  'gallery.region.help_text': 'ヘルプ・テキスト',
   'gallery.item.text': 'テキスト・フィールド',
   'gallery.item.textarea': 'テキスト領域',
   'gallery.item.number': '数値フィールド',
@@ -582,6 +585,9 @@ export const ja: BuilderMessages = {
   'gallery.item.display': '表示のみ',
   'gallery.item.password': 'パスワード',
   'gallery.item.plugin': 'プラグイン',
+  'gallery.item.shuttle': 'シャトル',
+  'gallery.item.select_one': '単一選択',
+  'gallery.item.select_many': '複数選択（検索）',
   'gallery.button.submit': 'ページの送信',
   'gallery.button.redirect': 'ページへリダイレクト',
   'gallery.button.da': '動的アクション',

package/src/builder/i18n/ko.ts

@@ -552,6 +552,9 @@ export const ko: BuilderMessages = {
   'gallery.region.search': '검색',
   'gallery.region.login': '로그인',
   'gallery.region.plugin': '플러그인',
+  'gallery.region.classic_report': '클래식 보고서',
+  'gallery.region.breadcrumb': '이동 경로',
+  'gallery.region.help_text': '도움말 텍스트',
   'gallery.item.text': '텍스트 필드',
   'gallery.item.textarea': '텍스트 영역',
   'gallery.item.number': '숫자 필드',
@@ -582,6 +585,9 @@ export const ko: BuilderMessages = {
   'gallery.item.display': '표시 전용',
   'gallery.item.password': '비밀번호',
   'gallery.item.plugin': '플러그인',
+  'gallery.item.shuttle': '셔틀',
+  'gallery.item.select_one': '단일 선택',
+  'gallery.item.select_many': '다중 선택(검색)',
   'gallery.button.submit': '페이지 제출',
   'gallery.button.redirect': '페이지로 리디렉션',
   'gallery.button.da': '동적 작업',

package/src/builder/i18n/nl.ts

@@ -552,6 +552,9 @@ export const nl: BuilderMessages = {
   'gallery.region.search': 'Zoeken',
   'gallery.region.login': 'Aanmelden',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Klassiek rapport',
+  'gallery.region.breadcrumb': 'Kruimelpad',
+  'gallery.region.help_text': 'Helptekst',
   'gallery.item.text': 'Tekstveld',
   'gallery.item.textarea': 'Tekstgebied',
   'gallery.item.number': 'Getalveld',
@@ -582,6 +585,9 @@ export const nl: BuilderMessages = {
   'gallery.item.display': 'Alleen weergeven',
   'gallery.item.password': 'Wachtwoord',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Shuttle',
+  'gallery.item.select_one': 'Eén kiezen',
+  'gallery.item.select_many': 'Meerdere kiezen',
   'gallery.button.submit': 'Pagina verzenden',
   'gallery.button.redirect': 'Naar pagina omleiden',
   'gallery.button.da': 'Dynamische actie',

package/src/builder/i18n/pt.ts

@@ -552,6 +552,9 @@ export const pt: BuilderMessages = {
   'gallery.region.search': 'Pesquisa',
   'gallery.region.login': 'Login',
   'gallery.region.plugin': 'Plug-in',
+  'gallery.region.classic_report': 'Relatório Clássico',
+  'gallery.region.breadcrumb': 'Trilha de Navegação',
+  'gallery.region.help_text': 'Texto de Ajuda',
   'gallery.item.text': 'Campo de Texto',
   'gallery.item.textarea': 'Área de Texto',
   'gallery.item.number': 'Campo Numérico',
@@ -582,6 +585,9 @@ export const pt: BuilderMessages = {
   'gallery.item.display': 'Somente Exibição',
   'gallery.item.password': 'Senha',
   'gallery.item.plugin': 'Plug-in',
+  'gallery.item.shuttle': 'Shuttle',
+  'gallery.item.select_one': 'Selecionar Um',
+  'gallery.item.select_many': 'Selecionar Vários',
   'gallery.button.submit': 'Enviar Página',
   'gallery.button.redirect': 'Redirecionar para Página',
   'gallery.button.da': 'Ação Dinâmica',

package/src/builder/i18n/zh-cn.ts

@@ -552,6 +552,9 @@ export const zhCN: BuilderMessages = {
   'gallery.region.search': '搜索',
   'gallery.region.login': '登录',
   'gallery.region.plugin': '插件',
+  'gallery.region.classic_report': '经典报表',
+  'gallery.region.breadcrumb': '面包屑导航',
+  'gallery.region.help_text': '帮助文本',
   'gallery.item.text': '文本字段',
   'gallery.item.textarea': '文本区域',
   'gallery.item.number': '数字字段',
@@ -582,6 +585,9 @@ export const zhCN: BuilderMessages = {
   'gallery.item.display': '仅显示',
   'gallery.item.password': '密码',
   'gallery.item.plugin': '插件',
+  'gallery.item.shuttle': '穿梭框',
+  'gallery.item.select_one': '单选（搜索）',
+  'gallery.item.select_many': '多选（搜索）',
   'gallery.button.submit': '提交页面',
   'gallery.button.redirect': '重定向到页面',
   'gallery.button.da': '动态操作',

package/src/builder/i18n/zh-tw.ts

@@ -552,6 +552,9 @@ export const zhTW: BuilderMessages = {
   'gallery.region.search': '搜尋',
   'gallery.region.login': '登入',
   'gallery.region.plugin': '外掛程式',
+  'gallery.region.classic_report': '傳統報表',
+  'gallery.region.breadcrumb': '導覽路徑',
+  'gallery.region.help_text': '說明文字',
   'gallery.item.text': '文字欄位',
   'gallery.item.textarea': '文字區域',
   'gallery.item.number': '數字欄位',
@@ -582,6 +585,9 @@ export const zhTW: BuilderMessages = {
   'gallery.item.display': '僅顯示',
   'gallery.item.password': '密碼',
   'gallery.item.plugin': '外掛程式',
+  'gallery.item.shuttle': '穿梭框',
+  'gallery.item.select_one': '單選（搜尋）',
+  'gallery.item.select_many': '多選（搜尋）',
   'gallery.button.submit': '提交頁面',
   'gallery.button.redirect': '重新導向至頁面',
   'gallery.button.da': '動態動作',

package/src/builder/network-access.ts

@@ -3,6 +3,7 @@ import { owner } from '../db.ts';
 import { html, raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import { parseHostList, scopeForWorkspace } from '../network-acl.ts';
+import { serverUrl, type RemoteServer } from '../remote-servers.ts';
 import { clientIp, logActivity, type Session } from '../session.ts';
 import { matches, restHosts, scopeProblem, urlProblem } from '../webclient.ts';
 import { clearResponseCache } from '../websources.ts';
@@ -53,6 +54,29 @@ export async function networkAccessRoutes(app: FastifyInstance) {
         `select r.at, r.what, r.host, r.url, r.list, r.message, a.alias from meta.network_refusal r left join meta.app a on a.id = r.app_id
           where r.workspace_id = $1 order by r.id desc limit 100`, [w.id]).then((r) => r.rows),
     ]);
+    // (141) the hosts the workspace's remote servers stand for now, and whether a call to them would pass
+    const scopeNow = await scopeForWorkspace(w.id, 'check');
+    const servers = (await owner.query<RemoteServer>('select * from meta.remote_server where workspace_id = $1 order by static_id', [w.id])).rows.map((x) => {
+      const u = serverUrl(x);
+      let host = '';
+      let problem: string | null = u.problem;
+      if (u.url)
+        try {
+          const url = new URL(u.url);
+          host = url.host;
+          problem = urlProblem(url) ?? scopeProblem(scopeNow, url);
+        } catch {
+          problem = 'not a valid URL';
+        }
+      return { ...x, url: u.url, from: u.from, host, problem };
+    });
+    const serversOf = (entry: string) => servers.filter((x) => x.host && (() => {
+      try {
+        return matches([entry], new URL(`https://${x.host}`));
+      } catch {
+        return false;
+      }
+    })()).map((x) => x.static_id);
     // entries the installation's list never lets through (they narrow nothing: worth a warning)
     const unreachable = w.network_hosts.filter((h) => {
       const host = h.replace(/^\*\./, 'x.');
@@ -90,11 +114,20 @@ export async function networkAccessRoutes(app: FastifyInstance) {
               <textarea id="f_hosts" name="hosts" rows="6" spellcheck="false">${w.network_hosts.join('\n')}</textarea>
               <small class="help">One per line: <code>api.example.com</code>, <code>*.example.com</code> for its subdomains, <code>api.example.com:8443</code> for one port only. No scheme or path. Restricted with no hosts: no outgoing calls at all.</small></div>
             ${unreachable.length ? html`<div class="alert alert-warning" role="status">Not on the installation's list, so never reachable: ${unreachable.join(', ')}.</div>` : ''}
+            ${w.network_hosts.some((h) => serversOf(h).length) ? html`<p class="muted small">Remote servers on these hosts: ${w.network_hosts.filter((h) => serversOf(h).length).map((h) => `${h} (${serversOf(h).join(', ')})`).join('; ')}.</p>` : ''}
             <div class="buttons"><button class="btn btn-hot">Save</button></div></form>`, '', 'workspace-list')}
         ${region('Installation', html`<p class="muted u-mt0">Set in the server's environment by its administrators (<code>PGKILN_REST_ALLOWED_HOSTS</code>).</p>
             ${inst.allowed.includes('*') ? html`<p>Any public host (<code>*</code>).</p>` : entries(inst.allowed)}
             ${m.admin ? html`<h3 class="u-mt1">Private hosts</h3><p class="muted small">Hosts on private or loopback addresses that may be called (<code>PGKILN_REST_PRIVATE_HOSTS</code>).</p>${entries(inst.private)}` : ''}`)}
       </div>
+      ${region('Remote servers', html`<p class="muted u-mt0">The hosts this workspace's <a href="${BASE}/remote-servers">remote servers</a> stand for now: the REST data sources, catalogs and AI services on a server call this host.</p>
+        <div class="table-wrap"><table class="report report-reflow">
+        <thead><tr><th>Server</th><th>Host</th><th>From</th><th>Would be called</th></tr></thead>
+        <tbody>${servers.length ? servers.map((x) => html`<tr><td data-label="Server">${x.static_id}</td>
+            <td data-label="Host" class="u-break">${x.host ? html`<code>${x.host}</code>` : html`<span class="muted">none</span>`}</td>
+            <td data-label="From">${x.from === 'env' ? x.env_var : x.from === 'stored' ? 'base URL' : ''}</td>
+            <td data-label="Would be called">${x.problem ? html`<span class="tag tag-error">no</span> <span class="muted small">${x.problem}</span>` : html`<span class="tag tag-ok">yes</span>`}</td></tr>`)
+          : html`<tr><td colspan="4" class="empty">No remote servers.</td></tr>`}</tbody></table></div>`, '', 'servers')}
       ${region('Check a URL', html`<form method="get" action="${BASE}/network" class="search u-mwnone">
           <input type="hidden" name="ws" value="${w.id}">
           ${input('url', 'URL', tryUrl, { type: 'url', placeholder: 'https://api.example.com/v1/items' })}

package/src/builder/region-help.ts

@@ -8,7 +8,7 @@ const GUIDE = 'https://pgkiln.vargar.eu/docs';
 
 export const REGION_CONFIG_HELP: [string[], string][] = [
   [['report'], '{"page_size":15,"pagination":"range" (rows X–Y without a total),"keyset":["id"] (with range: Next/Previous seek on these unique columns),"max_rows":10000,"searchable":true,"sortable":true,"interactive":true,"mobile":"reflow"|"scroll","hidden":["col"],"headings":{"col":"Label"},"link":{"column":"id","page":3,"items":{"P3_ID":"#id#"}},"empty":"No rows","pdf":{"layout":"NAME","columns":["col"],"widths":{"col":40},"align":{"col":"right"}}} (pdf widths in mm; layouts under Shared Components → Report layouts)'],
-  [['report', 'grid', 'cards'], '{"formats":{"sal":"FML999G990D00","hiredate":"DD-MON-YYYY"}} (number or date format masks per column)'],
+  [['report', 'classic_report', 'grid', 'cards'], '{"formats":{"sal":"FML999G990D00","hiredate":"DD-MON-YYYY"}} (number or date format masks per column)'],
   [['chart'], '{"kind":"bar"|"column"|"line"|"area"|"donut","max_rows":1000,"format_mask":"FML999G990"}'],
   [['cards'], '{"style":"metric","link":{...},"max_rows":500}'],
   [['dynamic'], '{"max_rows":1000}'],
@@ -19,7 +19,7 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['display_selector'], '{"style":"tabs"|"select","show_all":true,"remember":true}'],
   [['list'], '{"list":"NAME","template":"links"|"badges"|"cards"|"tabs"} (lists under Shared Components → Lists)'],
   [['*'], '{"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)'],
+  [['report', 'classic_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}; or {"agent":"SALES_AGENT","welcome":"…"} for an AI agent of Shared Components (the AI assistant settings below edit it)'],
@@ -28,6 +28,9 @@ export const REGION_CONFIG_HELP: [string[], string][] = [
   [['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}'],
+  [['classic_report'], '{"report_template":"standard"|"value_pairs"|"badges"|"media_list","pagination":"total" (rows X–Y of N, the default)|"range" (rows X–Y)|"none" (one page of at most max_rows, 500),"page_size":15,"max_rows":500,"sortable":true,"searchable":false,"mobile":"reflow"|"scroll","hidden":["col"],"headings":{"col":"Label"},"link":{"column":"id","page":3,"items":{"P3_ID":"#id#"}},"empty":"No rows"} (a report without the Actions menu; badges: label and value columns; media_list: title and description columns)'],
+  [['breadcrumb'], '{"current":false} leaves the current page out of the trail (the pages above it come from each page\'s Breadcrumb parent, else Home); put it in the Breadcrumb bar position with template plain'],
+  [['help_text'], '{"empty":"…"} shown when the page has no help text (Page → Help text: Markdown with &ITEM. substitutions)'],
   [['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"}'],
 ];
 
@@ -57,6 +60,9 @@ const ANCHORS: Record<string, string> = {
   tasks: 'approvals-and-the-task-list',
   workflows: 'workflows',
   login: 'the-login-page',
+  classic_report: 'classic_report-classic-report',
+  breadcrumb: 'breadcrumb-and-help_text',
+  help_text: 'breadcrumb-and-help_text',
 };
 
 /** The help of every type (a region whose type isn't known yet). */

package/src/builder/rest-catalogs.ts

@@ -144,7 +144,7 @@ export async function restCatalogRoutes(app: FastifyInstance) {
     const s = await developer(req, reply);
     if (!s) return;
     const rows = (await owner.query(
-      `select c.id, c.name, c.description, c.base_url, c.source, c.api_version, c.updated_at,
+      `select c.id, c.name, c.description, c.base_url, c.server, c.source, c.api_version, c.updated_at,
               (select count(*)::int from meta.rest_catalog_service x where x.catalog_id = c.id) as services
          from meta.rest_catalog c where c.workspace_id = $1 order by lower(c.name)`, [currentWorkspace(s)])).rows;
     const main = html`<div class="title-row"><h1>REST Source Catalogs</h1></div>
@@ -154,7 +154,7 @@ export async function restCatalogRoutes(app: FastifyInstance) {
         <thead><tr><th>Catalog</th><th>Base URL</th><th class="num">Services</th><th>From</th><th>Updated (UTC)</th></tr></thead>
         <tbody>${rows.length ? rows.map((c) => html`<tr>
           <td data-label="Catalog"><a href="${root}/${c.id}">${c.name}</a>${c.description ? html`<br><span class="muted small">${String(c.description).slice(0, 160)}</span>` : ''}</td>
-          <td data-label="Base URL"><code class="wrap-anywhere">${c.base_url}</code></td>
+          <td data-label="Base URL">${c.server ? html`<span class="tag">${icon('server')} ${c.server}</span> ` : ''}<code class="wrap-anywhere">${c.base_url ?? ''}</code></td>
           <td class="num" data-label="Services">${c.services}</td>
           <td data-label="From">${c.source === 'openapi' ? html`OpenAPI${c.api_version ? html` <span class="muted">${c.api_version}</span>` : ''}` : 'by hand'}</td>
           <td data-label="Updated">${when(c.updated_at)}</td></tr>`)
@@ -225,7 +225,7 @@ export async function restCatalogRoutes(app: FastifyInstance) {
     const sel = req.query.service ? c.services.find((x) => String(x.id) === req.query.service) : null;
     const main = html`<div class="title-row"><h1>${c.name}</h1>
         <a class="btn" href="${base}/download">${icon('download')} Download</a></div>
-      <p class="muted u-mt0"><code class="wrap-anywhere">${c.base_url}</code>${c.source === 'openapi' ? html` · from an OpenAPI document${c.api_version ? html` (version ${c.api_version})` : ''}` : ''} · updated ${when(c.updated_at)} UTC</p>
+      <p class="muted u-mt0">${c.server ? html`On remote server <a href="${BASE}/remote-servers">${c.server}</a> · ` : ''}<code class="wrap-anywhere">${c.base_url ?? ''}</code>${c.source === 'openapi' ? html` · from an OpenAPI document${c.api_version ? html` (version ${c.api_version})` : ''}` : ''} · updated ${when(c.updated_at)} UTC</p>
       ${notesHtml(s)}
       ${region('Services', html`<div class="table-wrap"><table class="report report-reflow">
         <thead><tr><th>Service</th><th>Method</th><th>Path</th><th class="num">Parameters</th><th class="num">Columns</th><th>Write back</th></tr></thead>
@@ -241,12 +241,13 @@ export async function restCatalogRoutes(app: FastifyInstance) {
       ${req.query.service === 'new'
         ? region('New service', serviceForm(s, `${base}/services`, { method: 'GET', path: '/' }, 'Add'), '', 'service')
         : sel
-          ? region(`Service ${sel.name}`, html`<p class="muted u-mt0">URL: <code class="wrap-anywhere">${serviceUrl(c.base_url, sel.path)}</code></p>
+          ? region(`Service ${sel.name}`, html`<p class="muted u-mt0">URL: <code class="wrap-anywhere">${c.server ? `${c.server} + ${sel.path}` : serviceUrl(c.base_url ?? '', sel.path)}</code></p>
               ${serviceForm(s, `${base}/services/${sel.id}`, sel, 'Save')}
               <form method="post" action="${base}/services/${sel.id}/delete" class="danger-zone">${csrf(s)}<button class="btn btn-danger" data-confirm="Delete the service ${sel.name}?">Delete service</button></form>`, '', 'service')
           : ''}
       ${region('Catalog', html`<form method="post" action="${base}">${csrf(s)}
-        <div class="form-grid">${input('name', 'Name', c.name, { required: true })}${input('base_url', 'Base URL', c.base_url, { required: true, help: 'e.g. a test system\'s URL. Data sources made earlier keep the URL they were made with.' })}
+        <div class="form-grid">${input('name', 'Name', c.name, { required: true })}${input('base_url', 'Base URL', c.base_url ?? '', { help: 'e.g. a test system\'s URL (optional on a remote server). Data sources made earlier keep the URL they were made with.' })}
+          ${input('server', 'Remote server', c.server ?? '', { placeholder: 'e.g. CRM', help: 'The static id of a remote server of this workspace (Workspace utilities → Remote servers): data sources made from the catalog then name the server and the service\'s path, so they move with it.' })}
           ${input('api_version', 'API version', c.api_version ?? '')}
           <div class="field" data-wide><label class="label" for="f_cdescription">Description</label><textarea id="f_cdescription" name="description" rows="2">${c.description ?? ''}</textarea></div></div>
         <div class="buttons"><button class="btn btn-hot">${icon('save')} Save</button></div></form>`)}
@@ -262,14 +263,19 @@ export async function restCatalogRoutes(app: FastifyInstance) {
     if (!c) return reply.code(404).send('Not found');
     const v = {
       name: String(req.body?.name ?? '').trim(), base_url: trimBase(String(req.body?.base_url ?? '')),
+      server: String(req.body?.server ?? '').trim().toUpperCase() || null,
       description: String(req.body?.description ?? '').trim() || null, api_version: String(req.body?.api_version ?? '').trim() || null,
     };
     // the services must still make sense on the new base URL
-    const problems = [...catalogProblems(v), ...c.services.flatMap((x) => serviceProblems(v.base_url, x))];
+    const problems = [...catalogProblems(v), ...c.services.flatMap((x) => serviceProblems(v.base_url || 'https://x', x))];
     if (problems.length) flash(s, problems.slice(0, 6).join(' '), 'error');
     else
       try {
-        await owner.query('update meta.rest_catalog set name = $2, base_url = $3, description = $4, api_version = $5, updated_at = now() where id = $1', [c.id, v.name, v.base_url, v.description, v.api_version]);
+        await owner.query('update meta.rest_catalog set name = $2, base_url = $3, description = $4, api_version = $5, server = $6, updated_at = now() where id = $1',
+          [c.id, v.name, v.base_url || null, v.description, v.api_version, v.server]);
+        if (v.server && !(await owner.one('select 1 as ok from meta.remote_server where workspace_id = $1 and static_id = $2', [c.workspace_id, v.server])))
+          flash(s, `Catalog saved. This workspace has no remote server ${v.server} yet: add it under Workspace utilities → Remote servers.`, 'error');
+        else
         flash(s, 'Catalog saved.');
       } catch (e) {
         flash(s, uniqueError(e), 'error');
@@ -292,6 +298,8 @@ export async function restCatalogRoutes(app: FastifyInstance) {
       if (doc instanceof Error) throw doc;
       doc = await documentOf(doc, s);
       const { catalog, notes } = readCatalogText(doc.text, { baseUrl: req.body?.base_url, from: doc.from, name: c.name });
+      // (141) the catalog stays on its remote server
+      catalog.server = c.server ?? null;
       const problems = wholeCatalogProblems(catalog);
       if (problems.length) throw new Error(problems.slice(0, 8).join(' '));
       await owner.tx((db) => replaceCatalog(db, c.id, catalog));
@@ -338,7 +346,7 @@ export async function restCatalogRoutes(app: FastifyInstance) {
     const retry = `${root}/${c.id}?service=${sid ?? 'new'}#service`;
     try {
       const v = serviceFromBody(req.body ?? {});
-      const problems = serviceProblems(c.base_url, v);
+      const problems = serviceProblems(c.base_url || 'https://x', v);
       if (problems.length) throw new Error(problems.join(' '));
       const vals = [v.name, v.description, v.path, v.method, JSON.stringify(v.params), JSON.stringify(v.headers), v.body, v.row_selector, JSON.stringify(v.columns), v.key_columns, JSON.stringify(v.operations)];
       let id = sid;
@@ -388,14 +396,14 @@ export async function restCatalogRoutes(app: FastifyInstance) {
       const c = (await loadCatalog(svc.catalog_id))!;
       const v = sourceFromService(c, c.services.find((x) => x.id === svc.id)!, { name: req.body?.name, credential: req.body?.credential });
       if (!/^[A-Z][A-Z0-9_]{0,59}$/.test(v.name)) throw new Error('The name is upper case letters, digits and _, starting with a letter, e.g. COUNTRIES.');
-      if (v.credential && !(await owner.one('select 1 as ok from meta.web_credential where app_id = $1 and name = $2', [appId, v.credential])))
-        throw new Error(`This application has no web credential ${v.credential}.`);
+      if (v.credential && !(await owner.one('select 1 as ok from meta.web_credential where app_id = $1 and name = $2 union all select 1 from meta.workspace_credential where workspace_id = meta.app_workspace($1) and name = $2', [appId, v.credential])))
+        throw new Error(`This application has no web credential ${v.credential} (nor does its workspace).`);
       const problems = sourceProblems(v);
       if (problems.length) throw new Error(problems.join(' '));
       const r = await owner.one<{ id: number }>(
-        `insert into meta.rest_source (app_id, name, description, url, method, credential, params, headers, body, row_selector, columns, key_columns, operations)
-         values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) returning id`,
-        [appId, v.name, v.description, v.url, v.method, v.credential, JSON.stringify(v.params), JSON.stringify(v.headers), v.body, v.row_selector, JSON.stringify(v.columns), v.key_columns, JSON.stringify(v.operations)]);
+        `insert into meta.rest_source (app_id, name, description, url, method, credential, params, headers, body, row_selector, columns, key_columns, operations, server)
+         values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) returning id`,
+        [appId, v.name, v.description, v.url, v.method, v.credential, JSON.stringify(v.params), JSON.stringify(v.headers), v.body, v.row_selector, JSON.stringify(v.columns), v.key_columns, JSON.stringify(v.operations), v.server]);
       flash(s, `REST data source ${v.name} made from ${c.name}. Test it below${v.credential ? '' : '; add a web credential if the service needs one'}.`);
       return back(reply, s, `${BASE}/apps/${appId}/shared?c=rest_source-${r!.id}`);
     } catch (e) {
@@ -423,7 +431,7 @@ export async function catalogPicker(appId: number, s: Session): Promise<Raw | ''
       where c.workspace_id = meta.app_workspace($1) order by lower(c.name), x.position, x.name`, [appId])).rows;
   if (!services.length)
     return html`<p class="muted u-mt0 u-mb1">${icon('globe')} Services described once for the workspace: <a href="${root}">REST Source Catalogs</a>.</p>`;
-  const credentials = (await owner.query('select name from meta.web_credential where app_id = $1 order by name', [appId])).rows;
+  const credentials = (await owner.query('select name from meta.web_credential where app_id = $1 union select name from meta.workspace_credential where workspace_id = meta.app_workspace($1) order by name', [appId])).rows;
   const groups = new Map<string, typeof services>();
   for (const x of services) groups.set(x.catalog, [...(groups.get(x.catalog) ?? []), x]);
   return region('From a REST source catalog', html`<form method="post" action="${BASE}/apps/${appId}/rest-sources/from-catalog">${csrf(s)}

package/src/builder/routes.ts

@@ -603,7 +603,11 @@ export async function builderRoutes(app: FastifyInstance) {
       });
       // supporting objects are never run on import: the developer reviews them and chooses
       const scripts = (await owner.one('select count(*)::int as n from meta.supporting_script where app_id = $1', [r.id])).n;
-      flash(s, `Application imported. Check its database role and users under Settings / Shared Components.${scripts ? ` It has ${scripts} supporting object script(s): they were not run.` : ''}`);
+      // (141) remote servers its REST data sources name that this workspace doesn't have (yet)
+      const servers = (await owner.query<{ server: string }>(
+        `select distinct x.server from meta.rest_source x where x.app_id = $1 and x.server is not null
+            and not exists (select 1 from meta.remote_server r where r.workspace_id = meta.app_workspace($1) and r.static_id = x.server) order by 1`, [r.id])).rows.map((x) => x.server);
+      flash(s, `Application imported. Check its database role and users under Settings / Shared Components.${scripts ? ` It has ${scripts} supporting object script(s): they were not run.` : ''}${servers.length ? ` Its REST data sources use remote server${servers.length > 1 ? 's' : ''} ${servers.join(', ')}, which this workspace doesn't have: add ${servers.length > 1 ? 'them' : 'it'} under Workspace utilities → Remote servers.` : ''}`);
       return back(reply, s, scripts ? `${BASE}/apps/${r.id}/supporting-objects?imported=1` : `${BASE}/apps/${r.id}`);
     } catch (e) {
       flash(s, `Import failed: ${(e as Error).message}`, 'error');