@nauticana/sail 1.1.9 → 1.1.10

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;

package/src/index.ts

@@ -69,3 +69,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;
 
 }

package/src/model/decorator.ts

@@ -1,28 +1,32 @@
 import {
+  registerDecorator,
+  ValidationOptions,
   ValidatorConstraint,
   ValidatorConstraintInterface,
   ValidationArguments,
 } from 'class-validator';
 
-@ValidatorConstraint({ name: 'isNumeric', async: false })
-export class IsNumericConstraint implements ValidatorConstraintInterface {
-  validate(value: any, args: ValidationArguments) {
-    if (typeof value !== 'number') {
+// Plain decimal only — exponential notation ('1e21') must not slip past
+// the precision/scale digit counts.
+const DECIMAL = /^-?\d+(\.\d+)?$/;
+
+@ValidatorConstraint({ name: 'isSailNumeric', async: false })
+export class IsSailNumericConstraint implements ValidatorConstraintInterface {
+  validate(value: unknown, args: ValidationArguments) {
+    if (typeof value !== 'number' || !Number.isFinite(value)) {
       return false;
     }
 
     const [precision, scale] = args.constraints;
     const valueString = value.toString();
+    if (!DECIMAL.test(valueString)) {
+      return false;
+    }
     const parts = valueString.split('.');
     const integerPart = parts[0].startsWith('-') ? parts[0].substring(1) : parts[0];
     const decimalPart = parts[1] || '';
 
-    // Check total digits vs precision and decimal digits vs scale
-    if (integerPart.length + decimalPart.length > precision || decimalPart.length > scale) {
-      return false;
-    }
-
-    return true;
+    return integerPart.length + decimalPart.length <= precision && decimalPart.length <= scale;
   }
 
   defaultMessage(_args: ValidationArguments) {
@@ -30,9 +34,9 @@ export class IsNumericConstraint implements ValidatorConstraintInterface {
   }
 }
 
-@ValidatorConstraint({ name: 'IsString', async: false })
-export class IsStringConstraint implements ValidatorConstraintInterface {
-  validate(value: any, args: ValidationArguments) {
+@ValidatorConstraint({ name: 'isSailString', async: false })
+export class IsSailStringConstraint implements ValidatorConstraintInterface {
+  validate(value: unknown, args: ValidationArguments) {
     const [maxLength] = args.constraints;
 
     if (typeof value !== 'string') {
@@ -47,28 +51,28 @@ export class IsStringConstraint implements ValidatorConstraintInterface {
   }
 }
 
-import { registerDecorator, ValidationOptions } from 'class-validator';
-
-export function IsNumeric(precision: number, scale: number, validationOptions?: ValidationOptions) {
-  return function (object: Record<string, any>, propertyName: string) {
+// Named IsSail* so they can't be confused with class-validator's own
+// IsString/IsNumber on import.
+export function IsSailNumeric(precision: number, scale: number, validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
     registerDecorator({
       target: object.constructor,
       propertyName: propertyName,
       options: validationOptions,
       constraints: [precision, scale],
-      validator: IsNumericConstraint,
+      validator: IsSailNumericConstraint,
     });
   };
 }
 
-export function IsString(maxLength: number, validationOptions?: ValidationOptions) {
-  return function (object: Record<string, any>, propertyName: string) {
+export function IsSailString(maxLength: number, validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
     registerDecorator({
       target: object.constructor,
       propertyName: propertyName,
       options: validationOptions,
       constraints: [maxLength],
-      validator: IsStringConstraint,
+      validator: IsSailStringConstraint,
     });
   };
 }

package/src/service/api-response.interceptor.ts

@@ -34,7 +34,10 @@ export const apiResponseInterceptor: HttpInterceptorFn = (req, next) => {
     map(event => {
       if (isFinalResponse(event)) {
         const body = event.body as Record<string, unknown> | null;
-        if (body && typeof body === 'object' && 'data' in body) {
+        // keel's common.APIResponse is `{data, pagination?, meta}` with `meta`
+        // always present. Requiring both keys keeps a legitimate body that
+        // merely contains a `data` field from being truncated to it.
+        if (body && typeof body === 'object' && 'data' in body && 'meta' in body) {
           return event.clone({ body: body['data'] });
         }
       }

package/src/service/auth.interceptor.ts

@@ -1,6 +1,8 @@
 import { HttpErrorResponse, HttpEventType, HttpInterceptorFn } from '@angular/common/http';
+import { inject, Injector } from '@angular/core';
 import { catchError, tap, throwError } from 'rxjs';
 import { isKeelApiUrl } from './rest_url';
+import { BaseAuthService } from './auth.service';
 
 // Auth-loop breaker: repeated 401s on token-bearing API calls (a stale session) can
 // drive the app to hammer the API/CDN. After AUTH_FAIL_THRESHOLD within
@@ -13,7 +15,18 @@ const AUTH_CIRCUIT_COOLDOWN_MS = 30_000;
 const FAIL_KEY = 'keel_auth_401s';
 const OPEN_KEY = 'keel_auth_circuit_until';
 
+/** Error-body code carried by the synthetic circuit-open rejection, so
+ *  consumers can tell "session expired, request refused locally" apart from a
+ *  real 401 and from a network failure (status 0). */
+export const AUTH_CIRCUIT_OPEN_CODE = 'sail_auth_circuit_open';
+
 export const authInterceptor: HttpInterceptorFn = (req, next) => {
+  // Resolved lazily per event to avoid a DI cycle (BaseAuthService → HttpClient
+  // → interceptors) and so an open circuit clears the dead session even when it
+  // was opened by a previous page load.
+  const injector = inject(Injector);
+  const expireSession = () => injector.get(BaseAuthService, null, { optional: true })?.sessionExpired();
+
   const token = localStorage.getItem('jwt');
   const authedApi = !!token && isKeelApiUrl(req.url);
   if (authedApi) {
@@ -21,10 +34,15 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
   }
 
   if (authedApi && authCircuitOpen()) {
+    expireSession();
     return throwError(() => new HttpErrorResponse({
       url: req.url,
-      status: 0,
-      statusText: 'auth circuit open: too many 401s — request stopped to prevent a loop',
+      status: 401,
+      statusText: 'Unauthorized',
+      error: {
+        code: AUTH_CIRCUIT_OPEN_CODE,
+        detail: 'auth circuit open: too many 401s — request stopped to prevent a loop',
+      },
     }));
   }
 
@@ -35,8 +53,8 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
       }
     }),
     catchError((err: HttpErrorResponse) => {
-      if (authedApi && err.status === 401) {
-        recordAuthFailure();
+      if (authedApi && err.status === 401 && recordAuthFailure()) {
+        expireSession();
       }
       return throwError(() => err);
     }),
@@ -47,7 +65,8 @@ function authCircuitOpen(): boolean {
   return Date.now() < Number(sessionStorage.getItem(OPEN_KEY) ?? 0);
 }
 
-function recordAuthFailure(): void {
+/** Returns true when this failure crossed the threshold and opened the circuit. */
+function recordAuthFailure(): boolean {
   const now = Date.now();
   let times: number[];
   try {
@@ -60,9 +79,10 @@ function recordAuthFailure(): void {
   if (times.length >= AUTH_FAIL_THRESHOLD) {
     sessionStorage.setItem(OPEN_KEY, String(now + AUTH_CIRCUIT_COOLDOWN_MS));
     sessionStorage.removeItem(FAIL_KEY);
-  } else {
-    sessionStorage.setItem(FAIL_KEY, JSON.stringify(times));
+    return true;
   }
+  sessionStorage.setItem(FAIL_KEY, JSON.stringify(times));
+  return false;
 }
 
 function clearAuthFailures(): void {