pgkiln 0.55.0 → 0.56.0

package/src/runtime/ir-plan.ts

@@ -1,5 +1,6 @@
 import { REPORT_CHART_KINDS } from './charts.ts';
 import { ComputeError, computeNameOk, computeSql } from './compute.ts';
+import { facetFilters, facetKeys, facetParamNames, type FacetDef } from './facet-state.ts';
 import { AGGREGATES, HIGHLIGHT_COLORS, MAX_COMPUTATIONS, OPERATORS } from './report.ts';
 
 // (sprint 112) What "Ask in your own words" may do to an interactive report
@@ -15,7 +16,8 @@ import { AGGREGATES, HIGHLIGHT_COLORS, MAX_COMPUTATIONS, OPERATORS } from './rep
 //
 // The settings in force are shown as chips (chipsOf): each one is a URL
 // parameter value of the report, so a chip can be edited or removed
-// (editChip, removeChip) and nothing else is stored.
+// (editChip, removeChip) and nothing else is stored. (sprint 122) The page's
+// facets on the report are chips too (Remove only: the facet region edits them).
 
 export type Kind = 'number' | 'date' | 'text' | 'boolean';
 
@@ -243,12 +245,14 @@ export type Chip =
   | { kind: 'chart'; key: string; type: string; label: string; fn: string; value: string }
   | { kind: 'hide'; key: string; column: string }
   | { kind: 'area'; key: string }
-  | { kind: 'near'; key: string };
+  | { kind: 'near'; key: string }
+  | { kind: 'facet'; key: string; column: string; value: string; exclude: boolean }
+  | { kind: 'facetrange'; key: string; column: string; from: string; to: string; custom: boolean; def: FacetDef };
 
 const MAX_CHIPS = 60;
 
 /** The report's settings in the URL as chips (what reportState() reads, in the same limits). */
-export function chipsOf(params: URLSearchParams, rid: number): Chip[] {
+export function chipsOf(params: URLSearchParams, rid: number, facets?: Map<string, FacetDef>): Chip[] {
   const k = (x: string) => `r${rid}_${x}`;
   const out: Chip[] = [];
   const q = (params.get(k('q')) ?? '').trim();
@@ -287,6 +291,9 @@ export function chipsOf(params: URLSearchParams, rid: number): Chip[] {
   for (const x of params.getAll(k('x')).filter(Boolean).slice(0, 100)) out.push({ kind: 'hide', key: `x:${x}`, column: x });
   if (params.get(k('bb'))) out.push({ kind: 'area', key: 'bb' });
   if (params.get(k('near'))) out.push({ kind: 'near', key: 'near' });
+  for (const f of facets ? facetFilters(params, rid, facets) : [])
+    if (f.kind === 'values') for (const value of f.values) out.push({ kind: 'facet', key: `fx:${f.column}:${value}`, column: f.column, value, exclude: f.exclude });
+    else out.push({ kind: 'facetrange', key: `fr:${f.column}:${f.from}|${f.to}`, column: f.column, from: f.from, to: f.to, custom: f.custom, def: facets!.get(f.column)! });
   return out.slice(0, MAX_CHIPS);
 }
 
@@ -334,6 +341,13 @@ export function removeChip(params: URLSearchParams, rid: number, chip: Chip) {
     case 'hide': dropValue(params, k('x'), chip.column); break;
     case 'area': params.delete(k('bb')); break;
     case 'near': params.delete(k('near')); break;
+    case 'facet': {
+      const name = facetKeys(rid).values + chip.column;
+      dropValue(params, name, chip.value);
+      if (!params.getAll(name).length) params.delete(facetKeys(rid).exclude + chip.column);
+      break;
+    }
+    case 'facetrange': for (const n of facetParamNames(rid, chip.column)) params.delete(n); break;
   }
   params.delete(k('p'));
   params.delete(k('k'));

package/src/runtime/smart-filters.ts

@@ -1,8 +1,13 @@
 import { appDateReader } from './items.ts';
+import { valueLookup } from './ai-filter.ts';
+import { applyFacetSettings, facetSettings } from './ask-facets.ts';
+import { parseQuestion } from './ir-phrases.ts';
+import { checkPlan, type Column } from './ir-plan.ts';
+import { headingOf, isNumeric } from './report.ts';
 import { html, type Raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import type { Region } from '../metadata.ts';
-import { publicError, type PageContext } from './context.ts';
+import { dbg, publicError, type PageContext } from './context.ts';
 import { regionUrl } from './report.ts';
 import { describeFacetFilter, facetDefs, facetFilters, facetKeys, facetParamNames, rangeLabel, rangeValue, type FacetDef, type FacetFilter } from './facet-state.ts';
 import { facetLabel, facetSource, isFacetSource, rangeCounts, valueCounts } from './facets.ts';
@@ -14,6 +19,12 @@ import { facetLabel, facetSource, isFacetSource, rangeCounts, valueCounts } from
 // works without JavaScript and can be bookmarked.
 //   config: {"report": <report region id>, "suggestions": 3, "placeholder": "Search or filter…",
 //            "facets": [{"column": "job"}, {"column": "sal", "type": "range", "ranges": [...]}]}
+//
+// (sprint 122, WS-5; APEX 26.2) With "ask": true the typed text is also read
+// as a phrase ("clerks in sales with salary between 1000 and 3000", in the
+// application's language: ir-phrases.ts, no AI service): what this region's
+// facets can hold (ask-facets.ts) is offered as the first suggestion, which
+// sets those facets at once. Values are looked up in the report's own rows.
 
 const MAX_SUGGESTIONS = 10;
 
@@ -110,6 +121,28 @@ export async function renderSmartFilters(ctx: PageContext, r: Region): Promise<R
       }
     }
 
+  // (sprint 122) the search term read as a phrase: one suggestion that sets the facets it names
+  let understood: Raw | '' = '';
+  if (r.config.ask === true && fs.search && ctx.client)
+    try {
+      const columns: Column[] = defs.map((f) => {
+        const oid = fs.cols.get(f.column)!;
+        return { name: f.column, label: f.label ?? headingOf(report, f.column, ctx.locale.tr), kind: isNumeric(oid) ? 'number' : [1082, 1114, 1184].includes(oid) ? 'date' : oid === 16 ? 'boolean' : 'text', pos: 0 };
+      });
+      const parsed = await parseQuestion(fs.search, columns, ctx.locale.lang, valueLookup(ctx, columns, fs.src));
+      const settings = facetSettings(checkPlan(parsed.plan, columns), new Map(defs.map((f) => [f.column, f])), columns);
+      // a single value the matching suggestions already offer needs no second chip
+      const single = settings.length === 1 && settings[0].kind === 'values' && settings[0].values.length === 1 && !settings[0].exclude;
+      dbg(ctx, 6, 'smart', () => `"${fs.search}" as facets: ${JSON.stringify(settings)}; not understood: ${JSON.stringify(parsed.left)}`);
+      if (settings.length && !(single && !parsed.left.length && suggestions.some((x) => x.f.column === settings[0].column)))
+        understood = html`<div class="sf-suggestions sf-understood">
+          <span class="sf-suggest-title" id="${formId}_u">${t('smart.understood')}</span>
+          <ul class="sf-chips" aria-labelledby="${formId}_u"><li><a class="chip chip-suggest" href="${regionUrl(ctx, report, (p) => { applyFacetSettings(p, report.id, settings); p.delete(qName); })}">${settings.map((x, i) => html`${i ? ' · ' : ''}${describeFacetFilter(x, facetLabel(ctx, defs.find((d) => d.column === x.column)!), t, defs.find((d) => d.column === x.column))}`)}</a></li></ul>
+        </div>`;
+    } catch (e) {
+      dbg(ctx, 4, 'smart', () => `"${fs.search}" not read as a phrase: ${(e as Error).message}`);
+    }
+
   // GET form: the search term replaces the old one; every other parameter stays
   const keep = [...ctx.params.entries()].filter(([name]) => ![qName, page, 'clear', 'cs'].includes(name));
   ctx.detached.push(
@@ -128,12 +161,13 @@ export async function renderSmartFilters(ctx: PageContext, r: Region): Promise<R
         ? html`<a class="sf-clear" href="${regionUrl(ctx, report, (p) => { p.delete(qName); p.delete(page); for (const f of defs) for (const n of facetParamNames(report.id, f.column)) p.delete(n); })}">${t('facets.clear')}</a>`
         : ''}
     </div>
+    ${understood}
     ${suggestions.length
       ? html`<div class="sf-suggestions">
           <span class="sf-suggest-title" id="${formId}_s">${fs.search ? t('smart.matching') : t('smart.suggested')}</span>
           <ul class="sf-chips" aria-labelledby="${formId}_s">${suggestions.map((s) => html`<li><a class="chip chip-suggest" href="${s.href}">${s.label} <span class="facet-count">${s.n}</span></a></li>`)}</ul>
         </div>`
-      : fs.search && defs.some((f) => f.type === 'checkbox')
+      : fs.search && !understood && defs.some((f) => f.type === 'checkbox')
         ? html`<p class="muted sf-none">${t('smart.no_match')}</p>`
         : ''}
     ${errors}