@nauticana/sail 1.1.9 → 1.1.11

package/src/component/table/table_lookup.ts

@@ -1,9 +1,10 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit, ViewEncapsulation } from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, inject, OnInit, signal, ViewEncapsulation } from "@angular/core";
 import { MatButtonModule } from "@angular/material/button";
 import { MAT_DIALOG_DATA, MatDialogActions, MatDialogClose, MatDialogContent, MatDialogRef, MatDialogTitle } from "@angular/material/dialog";
 import { MatIconModule } from "@angular/material/icon";
-import { take } from "rxjs";
+import { map, Observable, of, switchMap, take } from "rxjs";
 import { RecordForm } from "../form/form_record";
+import { errorDetail } from "../../util/errors";
 import { BaseView } from "../abstract/base_view";
 
 @Component({
@@ -22,67 +23,74 @@ import { BaseView } from "../abstract/base_view";
     ],
 })
 export class TableLookup extends BaseView implements OnInit {
-    searchRecord: any = {};
-    searchColumns: string[] = [];
+    override readonly tableName = signal('');
+    readonly searchRecord = signal<Record<string, unknown>>({});
+    readonly searchColumns = this.metadataColumns;
 
     private readonly dialogRef = inject(MatDialogRef<TableLookup>);
     private readonly data = inject<{tableName?: string; apiName?: string}>(MAT_DIALOG_DATA);
-    protected readonly cdr = inject(ChangeDetectorRef);
+
+    /** A lookup only selects — no edit/delete, so no appended "actions" column. */
+    protected override includeActionsColumn(): boolean {
+        return false;
+    }
 
     ngOnInit() {
         if (this.data) {
             this.tableName.set(this.data.tableName ?? '');
             this.apiName.set(this.data.apiName   ?? '');
         }
-        this.searchColumns = this.getDisplayedColumns();
-        this.searchRecord  = this.emptyRecord();
-        this.resolveApi();
+        this.searchRecord.set(this.emptyRecord());
+        this.resolveApi().subscribe();
     }
 
-    private resolveApi() {
+    /** Resolve (and cache) the api serving this table; '' when none matches. */
+    private resolveApi(): Observable<string> {
+        const apiName = this.apiName();
+        if (apiName) return of(apiName);
         const tableName = this.tableName();
-        if (!this.apiName() && tableName) {
-            this.cacheService.getAppData().pipe(take(1)).subscribe((data) => {
-                if (data.Apis) {
-                    for (const api in data.Apis) {
-                        const entry = data.Apis[api];
-                        if (entry.Table.TableName === tableName) {
-                            this.apiName.set(api); // bare RestUri; BackendService.crudUrl resolves the version
-                            break;
-                        }
+        return this.cacheService.getAppData().pipe(
+            take(1),
+            map((data) => {
+                for (const api in data.Apis ?? {}) {
+                    if (data.Apis[api].Table?.TableName === tableName) {
+                        this.apiName.set(api); // bare RestUri; BackendService.crudUrl resolves the version
+                        return api;
                     }
                 }
-            });
-        }
+                return '';
+            }),
+        );
     }
 
     onSearch() {
-        this.resolveApi();
-        const apiName = this.apiName();
-        if (!apiName) {
-            console.error('API name not found for table ' + this.tableName());
-            return;
-        }
-        this.backendService.list<{[key: string]: any}>(apiName, this.buildSearchTerms(this.searchRecord)).subscribe({
+        // Chained on resolveApi so an early click waits instead of silently no-oping.
+        this.resolveApi().pipe(
+            switchMap((apiName) => {
+                if (!apiName) {
+                    this.viewError.set(`No API found for table ${this.tableName()}`);
+                    return of<Record<string, unknown>[]>([]);
+                }
+                return this.backendService.list<Record<string, unknown>>(apiName, this.buildSearchTerms(this.searchRecord()));
+            }),
+        ).subscribe({
             next: (records) => {
-                this.records = records;
+                this.records.set(records);
                 this.updateDisplayedColumns(records);
-                this.cdr.markForCheck();
             },
-            error: (err) => console.error('Lookup search failed', err),
+            error: (err) => {
+                console.error('Lookup search failed', err);
+                this.viewError.set(errorDetail(err, 'Search failed.'));
+            },
         });
     }
 
-    onSelect(record: any) {
+    onSelect(record: Record<string, unknown>) {
         this.dialogRef.close(record);
     }
 
     onClear() {
-        this.searchRecord = this.emptyRecord();
-        this.records = [];
+        this.searchRecord.set(this.emptyRecord());
+        this.records.set([]);
     }
-
-    protected handleDelete(_record: {[key: string]: any}): void {}
-
-    protected handleUpdate(_result: {[key: string]: any}, _isNew: boolean, _original: {[key: string]: any}): void {}
 }

package/src/component/table/table_report.html

@@ -1,7 +1,7 @@
 <h2>{{ reportTitle() }}</h2>
 
 @if (params().length > 0) {
-    <form class="report-params" (ngSubmit)="runReport()">
+    <form class="report-params" (submit)="onSubmit($event)">
         @for (param of params(); track param.Name) {
             @let opts = optionsFor(param);
             @if (opts) {
@@ -23,7 +23,7 @@
                     <mat-label>{{ titleCase(param.Name) }}</mat-label>
                     <input matInput [type]="inputTypeFor(param)"
                            [value]="paramValue(param.Name)"
-                           (input)="setParam(param.Name, $any($event.target).value)">
+                           (input)="onParamInput(param.Name, $event)">
                 </mat-form-field>
             }
         }

package/src/component/table/table_report.ts

@@ -1,23 +1,21 @@
-import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal } from "@angular/core";
-import { HttpParams } from "@angular/common/http";
-import { FormsModule } from "@angular/forms";
+import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal, untracked } from "@angular/core";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
 import { MatSelectModule } from "@angular/material/select";
 import { MatButtonModule } from "@angular/material/button";
 import { BaseAuthService } from "../../service/auth.service";
-import { BaseRestService } from "../../service/base_rest.service";
+import { BackendService } from "../../service/rest_service";
 import { ConstantValue } from "../../model/common";
 import { ReportParam } from "../../model/appdata";
 import { titleCase } from "../../util/text";
+import { errorDetail } from "../../util/errors";
 
 @Component({
     selector: 'sail-table-report',
     templateUrl: './table_report.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     imports: [
-        FormsModule,
         MatCheckboxModule,
         MatFormFieldModule,
         MatInputModule,
@@ -25,11 +23,12 @@ import { titleCase } from "../../util/text";
         MatButtonModule,
     ],
 })
-export class TableReport extends BaseRestService {
+export class TableReport {
     readonly apiName = input('');
     readonly tableName = input('');
 
     private readonly auth = inject(BaseAuthService);
+    private readonly backend = inject(BackendService);
 
     readonly records = signal<Record<string, unknown>[]>([]);
     readonly displayedColumns = signal<string[]>([]);
@@ -50,11 +49,7 @@ export class TableReport extends BaseRestService {
      */
     readonly reportId = computed(() => this.apiName().split('/').pop() ?? '');
 
-    /**
-     * Report header text — long-form description from rest_report_header.
-     * Falls back to the title-cased table name only if the lookup misses
-     * (e.g. a brand-new report whose row hasn't been seeded yet).
-     */
+    /** Long-form header from rest_report_header; falls back to the title-cased table name. */
     readonly reportTitle = computed(() => {
         return this.auth.getReport(this.reportId())?.Description || titleCase(this.tableName());
     });
@@ -62,26 +57,36 @@ export class TableReport extends BaseRestService {
     /**
      * Param definitions for the current report. Empty when the report has
      * no rest_report_param rows — in that case we fetch immediately. With
-     * params we render an input form and wait for the user to click "Run",
-     * preserving the standard "filter then fetch" UX for parameterized
-     * reports.
+     * params we render an input form and wait for the user to click "Run".
      */
     readonly params = computed<ReportParam[]>(() => {
         return this.auth.getReport(this.reportId())?.Params ?? [];
     });
 
+    private lastApi: string | null = null;
+
     constructor() {
-        super();
+        // Re-runs on apiName changes AND appdata (re)loads via params()/canReport;
+        // report state is only reset when the report actually changed, so an
+        // appdata refresh never wipes half-typed parameters.
         effect(() => {
             const api = this.apiName();
             if (!api) return;
+            const apiChanged = api !== this.lastApi;
+            this.lastApi = api;
+            if (apiChanged) {
+                this.records.set([]);
+                this.displayedColumns.set([]);
+                this.paramValues.set({});
+            }
+            this.errorMessage.set('');
 
             if (!this.auth.canReport(this.reportId())) {
                 this.errorMessage.set('You do not have permission to view this report.');
                 return;
             }
-            // Auto-fetch only when the report takes no inputs.
-            if (this.params().length === 0) {
+            // Auto-fetch only when the report takes no inputs and nothing is shown yet.
+            if (this.params().length === 0 && (apiChanged || untracked(this.records).length === 0)) {
                 this.fetchReport(api, {});
             }
         });
@@ -122,36 +127,37 @@ export class TableReport extends BaseRestService {
         this.paramValues.update((current) => ({ ...current, [name]: value }));
     }
 
+    onParamInput(name: string, event: Event) {
+        this.setParam(name, (event.target as HTMLInputElement).value);
+    }
+
     paramValue(name: string): string {
         return this.paramValues()[name] ?? '';
     }
 
+    onSubmit(event: Event) {
+        event.preventDefault();
+        this.runReport();
+    }
+
     runReport() {
         this.fetchReport(this.apiName(), this.paramValues());
     }
 
     private fetchReport(api: string, params: Record<string, string>) {
-        let httpParams = new HttpParams();
+        const filled: Record<string, string> = {};
         for (const [k, v] of Object.entries(params)) {
-            // Drop empty values so the URL doesn't carry `?param=` for
-            // unset fields — backends should treat absent and empty-string
-            // the same, sending neither is the cleanest signal.
-            if (v !== '' && v != null) {
-                httpParams = httpParams.set(k, v);
-            }
+            // Drop empty values so the URL doesn't carry `?param=` for unset fields.
+            if (v !== '' && v != null) filled[k] = v;
         }
-        this.http.get<Record<string, unknown>[]>(this.url('/api/' + api), { params: httpParams }).subscribe({
+        this.backend.report(api, filled).subscribe({
             next: (rows) => {
                 this.records.set(rows ?? []);
-                if (rows?.length) {
-                    this.displayedColumns.set(Object.keys(rows[0]));
-                } else {
-                    this.displayedColumns.set([]);
-                }
+                this.displayedColumns.set(rows?.length ? Object.keys(rows[0]) : []);
                 this.errorMessage.set('');
             },
             error: (err) => {
-                this.errorMessage.set(err?.error?.detail ?? err?.error?.message ?? 'Failed to load report data.');
+                this.errorMessage.set(errorDetail(err, 'Failed to load report data.'));
             },
         });
     }

package/src/component/table/table_search.html

@@ -1,12 +1,12 @@
 <h1>
-    @if (title) {
-        {{ title }}
+    @if (title()) {
+        {{ title() }}
     } @else {
         {{ getCaption() }} Search
     }
 </h1>
 <div class="page-container">
-    <sail-record-form [tableName]="tableName()" [record]="editableRecord" [fields]="searchColumns" [isReadOnly]="isReadOnlyBound"></sail-record-form>
+    <sail-record-form [tableName]="tableName()" [record]="editableRecord()" (recordChange)="editableRecord.set($event)" [fields]="searchColumns()" [isReadOnly]="isReadOnlyFn"></sail-record-form>
 </div>
 <div class="search-actions">
     <button matButton="elevated" class="primary" (click)="onSearch()">Search</button>
@@ -14,7 +14,7 @@
     @if (canCreate()) {
         <button matButton="elevated" class="accent" (click)="onAddRecord()">New Record</button>
     }
-    @for (action of getActions(false); track action.action) {
+    @for (action of tableActions(); track action.action) {
         @if (canExecuteAction(action)) {
             <button matButton="outlined" type="button"
                     [title]="action.caption"

package/src/component/table/table_search.ts

@@ -1,7 +1,9 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, input, linkedSignal, OnInit, ViewEncapsulation } from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject, input, linkedSignal, OnInit, ViewEncapsulation } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { MatButtonModule } from "@angular/material/button";
 import { MatIconModule } from "@angular/material/icon";
 import { ActivatedRoute, Router } from "@angular/router";
+import { take } from "rxjs";
 import { BaseForm } from "../abstract/base_form";
 import { RecordForm } from "../form/form_record";
 import { ApplicationMenu } from "../../model/common";
@@ -26,11 +28,11 @@ export class TableSearch extends BaseForm implements OnInit {
     readonly apiName              = linkedSignal<string, string>({ source: () => this.apiNameInput(),     computation: (v, p) => v || p?.value || '' });
     readonly targetRoute          = linkedSignal<string, string>({ source: () => this.targetRouteInput(), computation: (v, p) => v || p?.value || '' });
 
-    searchColumns: string[] = [];
+    readonly searchColumns = this.metadataColumns;
 
     private readonly router = inject(Router);
     private readonly route = inject(ActivatedRoute);
-    private readonly cdr = inject(ChangeDetectorRef);
+    private readonly destroyRef = inject(DestroyRef);
 
     /**
      * Search screen surfaces only table-level actions; record-specific actions
@@ -43,30 +45,31 @@ export class TableSearch extends BaseForm implements OnInit {
         if (!this.tableName() && data['tableName']) this.tableName.set(data['tableName']);
         if (!this.apiName() && data['apiName']) this.apiName.set(data['apiName']);
         if (!this.targetRoute() && data['targetRoute']) this.targetRoute.set(data['targetRoute']);
-        this.title = this.getCaption() + ' Search';
+        this.title.set(this.getCaption() + ' Search');
         if (!this.targetRoute() && (this.apiName() || this.tableName())) {
-            this.cacheService.getMenus().subscribe((menus: ApplicationMenu[]) => {
-                const apiName = this.apiName();
-                const tableName = this.tableName();
-                for (const menu of menus) {
-                    for (const page of menu.ApplicationMenuItems!) {
-                        if (apiName.endsWith(page.RestUri!) ||
-                            (tableName && page.RestUri!.includes(tableName))
-                        ) {
-                            if (page.FilterOnList) {
-                                this.targetRoute.set('/' + menu.Id!.toLowerCase() + '/' + page.ItemId!);
-                            } else {
-                                this.targetRoute.set('/' + menu.Id!.toLowerCase() + '/' + page.ItemId! + '/list');
-                            }
-                            this.cdr.markForCheck();
-                            return;
-                        }
-                    }
+            this.cacheService.getMenus().pipe(
+                take(1),
+                takeUntilDestroyed(this.destroyRef),
+            ).subscribe((menus: ApplicationMenu[]) => this.resolveTargetRoute(menus));
+        }
+        this.editableRecord.set(this.emptySearchRecord());
+    }
+
+    /** Exact RestUri match only — substring matching routed `user` to `user_payment_method`. */
+    private resolveTargetRoute(menus: ApplicationMenu[]) {
+        const apiName = this.apiName();
+        const tableName = this.tableName();
+        for (const menu of menus) {
+            if (!menu.Id) continue;
+            for (const page of menu.ApplicationMenuItems ?? []) {
+                if (!page.ItemId || !page.RestUri) continue;
+                if (page.RestUri === apiName || (!apiName && tableName && page.RestUri === tableName)) {
+                    const base = '/' + menu.Id.toLowerCase() + '/' + page.ItemId;
+                    this.targetRoute.set(page.FilterOnList ? base : base + '/list');
+                    return;
                 }
-            });
+            }
         }
-        this.editableRecord = this.emptySearchRecord();
-        this.searchColumns = this.getDisplayedColumns();
     }
 
     onSearch() {
@@ -75,35 +78,23 @@ export class TableSearch extends BaseForm implements OnInit {
             alert('Navigation target not found for this table');
             return;
         }
-        this.router.navigate([targetRoute], {queryParams: this.buildSearchTerms(this.editableRecord)});
+        this.router.navigate([targetRoute], {queryParams: this.buildSearchTerms(this.editableRecord())});
     }
 
     onClear() {
-        this.editableRecord = this.emptySearchRecord();
+        this.editableRecord.set(this.emptySearchRecord());
     }
 
     /**
-     * Search-form variant of `emptyRecord()`. Boolean columns are forced to
-     * null so an unmodified Search click does not coerce filters from the
-     * table's HasDefault value (e.g. an `is_primary` column with a `FALSE`
-     * default would otherwise have the form submit `?IsPrimary=false` and
-     * silently exclude every primary-flag row).
-     *
-     * The user opts into a boolean filter by clicking the checkbox: first
-     * click sets it to `true`, a second click sets it to `false`, and the
-     * Clear button resets back to `null` (no filter). `buildSearchTerms`
-     * already skips `null` / `undefined` values, so the URL only carries
-     * filters the user explicitly toggled.
+     * emptyRecord() with every seeded default blanked (booleans to null), so an
+     * unmodified Search never ships implicit filters like `?Status=A`.
+     * buildSearchTerms skips null/'' — only user-set values reach the URL.
      */
-    private emptySearchRecord(): any {
+    private emptySearchRecord(): Record<string, unknown> {
         const rec = this.emptyRecord();
-        const tableDef = this.cacheService.getTableDefinition(this.tableName());
-        if (tableDef?.Columns) {
-            for (const col of tableDef.Columns) {
-                if (col.DataType === 'boolean') {
-                    rec[col.PascalName] = null;
-                }
-            }
+        for (const key of Object.keys(rec)) {
+            if (key === this.config.opField || Array.isArray(rec[key])) continue;
+            rec[key] = this.isBoolean(key) ? null : '';
         }
         return rec;
     }

package/src/config.ts

@@ -31,7 +31,7 @@ export interface SailGuiConfig {
   restUrls?: { [key: string]: string };
   publicRoutes?: Routes;
   extraRoutes?: (data: ApplicationData) => Routes;
-  dashboardComponent?: Type<any>;
+  dashboardComponent?: Type<unknown>;
   appTitle?: string;
   /** Public asset URL for the application logo shown in the navigation home link, e.g. 'logo.png'. */
   appLogoUrl?: string;
@@ -55,6 +55,10 @@ export interface SailGuiConfig {
   appleRedirectUri?: string;
   /** Public URL of your privacy policy. Shown as a link in ConsentGateComponent. */
   privacyPolicyUrl?: string;
+  /** Public URL of your terms of service. Shown in the SMS-consent disclosure. */
+  termsUrl?: string;
+  /** Brand name shown in the SMS/10DLC consent disclosure (e.g. "Daxoom"). */
+  appName?: string;
   /** Content hash / version of the currently-deployed privacy policy. */
   defaultPolicyVersion?: string;
   /** ISO 639-1 language code of the policy variant shown ('en', 'fr', ...). */

package/src/index.ts

@@ -32,6 +32,7 @@ export * from './component/login/chpass_component';
 export * from './component/login/confirm_register_component';
 export * from './component/login/confirm_chpass_component';
 export * from './component/login/consent_gate';
+export * from './component/login/sms_consent';
 export * from './component/login/otp_input';
 export * from './component/login/social_login';
 export * from './component/login/account_deletion';
@@ -69,3 +70,4 @@ export * from './service/label.service';
 export * from './service/base_rest.service';
 export * from './util/text';
 export * from './util/money';
+export * from './util/errors';

package/src/model/appdata.ts

@@ -18,13 +18,6 @@ export interface LoginResponse {
   token: string;
 }
 
-export interface AuthSummary {
-    Obj: string;
-    Act: string;
-    Val: string;
-    Reg: string;
-}
-
 export interface ApplicationData {
     MainMenu: ApplicationMenu[];
     Permissions: AuthorizationRolePermission[];
@@ -32,6 +25,8 @@ export interface ApplicationData {
     TableCache: {[key: string]: {[key: string]: string}};
     TableDefinitions: {[key: string]: TableDefinition};
     Apis: {[key: string]: DictionaryPath};
+    /** keel emits Reports as map[string]*RestReport — a JSON object keyed by report id. */
+    Reports?: {[key: string]: RestReport};
     [key: string]: unknown;
 }
 
@@ -195,8 +190,9 @@ export interface PartnerRegistration {
 	Zipcode:              string;
 	Country:              string;
 	Phone:                string;
-	Latitude:             number;
-	Longitude:            number;
+	// null when geocoding is disabled or the address wasn't verified.
+	Latitude:             number | null;
+	Longitude:            number | null;
 	DomainURL:            string;
 	PlanID:               string;
 }

package/src/model/common.ts

@@ -1,4 +1,4 @@
-import { IsString, IsNumeric } from './decorator';
+import { IsSailString, IsSailNumeric } from './decorator';
 
 /**
  * SIUD operation codes that travel on every row through keel's generic CRUD.
@@ -43,32 +43,32 @@ export class SiudAction {
 }
 
 export class UserAccountPolicy extends SiudAction {
-  @IsString(30)
+  @IsSailString(30)
   Id?:                           string;
 
-  @IsNumeric(9, 0)
+  @IsSailNumeric(9, 0)
   PolicyValue?:                  number;
 
 }
 
 
 export class ApplicationMenuItem extends SiudAction {
-  @IsString(30)
+  @IsSailString(30)
   MenuId?:                       string;
 
-  @IsString(30)
+  @IsSailString(30)
   ItemId?:                       string;
 
-  @IsString(80)
+  @IsSailString(80)
   Caption?:                      string;
 
-  @IsNumeric(9, 0)
+  @IsSailNumeric(9, 0)
   DisplayOrder?:                 number;
 
-  @IsString(255)
+  @IsSailString(255)
   RestUri?:                      string;
 
-  @IsString(80)
+  @IsSailString(80)
   Icon?:                         string;
 
   IsActive?:                     boolean;
@@ -79,16 +79,16 @@ export class ApplicationMenuItem extends SiudAction {
 
 
 export class ApplicationMenu extends SiudAction {
-  @IsString(30)
+  @IsSailString(30)
   Id?:                           string;
 
-  @IsString(80)
+  @IsSailString(80)
   Caption?:                      string;
 
-  @IsNumeric(9, 0)
+  @IsSailNumeric(9, 0)
   DisplayOrder?:                 number;
 
-  @IsString(80)
+  @IsSailString(80)
   Icon?:                         string;
 
   IsActive?:                     boolean;
@@ -98,19 +98,19 @@ export class ApplicationMenu extends SiudAction {
 
 
 export class AuthorizationRolePermission extends SiudAction {
-  @IsString(30)
+  @IsSailString(30)
   RoleId?:                       string;
 
-  @IsString(30)
+  @IsSailString(30)
   AuthorizationObjectId?:        string;
 
-  @IsString(30)
+  @IsSailString(30)
   Action?:                       string;
 
-  @IsString(80)
+  @IsSailString(80)
   LowLimit?:                     string;
 
-  @IsString(80)
+  @IsSailString(80)
   HighLimit?:                    string;
 
   IsActive?:                     boolean;
@@ -119,35 +119,35 @@ export class AuthorizationRolePermission extends SiudAction {
 
 
 export class ConstantValue extends SiudAction {
-  @IsString(60)
+  @IsSailString(60)
   ConstantId?:                   string;
 
-  @IsString(80)
+  @IsSailString(80)
   Value?:                        string;
 
-  @IsString(80)
+  @IsSailString(80)
   Caption?:                      string;
 
 }
 
 
 export class UserAccount extends SiudAction {
-  @IsNumeric(9, 0)
+  @IsSailNumeric(9, 0)
   Id?:                           number;
 
-  @IsString(80)
+  @IsSailString(80)
   FirstName?:                    string;
 
-  @IsString(80)
+  @IsSailString(80)
   LastName?:                     string;
 
-  @IsString(80)
+  @IsSailString(80)
   UserName?:                     string;
 
-  @IsString(255)
+  @IsSailString(255)
   UserEmail?:                    string;
 
-  @IsString(1)
+  @IsSailString(1)
   Status?:                       string;
 
 }