@nauticana/sail 1.1.24 → 1.1.26

package/src/service/realtime.service.ts

@@ -8,9 +8,11 @@ export interface RealtimeChannelFrame<T = unknown> {
   data:    T;
 }
 
+const CONTROL_OPS = ['subscribed', 'unsubscribed', 'error'] as const;
+
 /** Control frames of the keel realtime wire protocol. */
 interface ControlFrame {
-  op:       'subscribed' | 'unsubscribed' | 'error';
+  op:       typeof CONTROL_OPS[number];
   channel?: string;
   reason?:  string;
 }
@@ -93,7 +95,7 @@ export class RealtimeService {
     if (this.channels.delete(channel) && this.connected()) this.sendFrame({ op: 'unsubscribe', channel });
   }
 
-  /** Payloads keel delivers to this user directly (SendToUser / PublishUser). */
+  /** Payloads keel delivers to this user directly (SendToUser / PublishUser), e.g. `{op: 'notification', ...}`. */
   userFrames<T = unknown>(): Observable<T> {
     return this.frames$.pipe(filter((f): f is T => !isChannelFrame(f) && !isControlFrame(f)));
   }
@@ -132,7 +134,7 @@ function isChannelFrame(f: unknown): f is RealtimeChannelFrame {
 }
 
 function isControlFrame(f: unknown): f is ControlFrame {
-  return !!f && typeof f === 'object' && 'op' in f;
+  return !!f && typeof f === 'object' && CONTROL_OPS.includes((f as { op?: unknown }).op as ControlFrame['op']);
 }
 
 /** ws(s):// form of the configured backend host plus `path`; same-origin when no host is set. */

package/src/service/rest_service.ts

@@ -153,8 +153,18 @@ export class BackendService extends BaseRestService {
      * the call will POST to {host}{api_prefix}{actionPath} with the
      * supplied body. For record-specific actions the body carries the
      * primary key values; for table-level actions it is typically `{}`.
+     * A body carrying a File/Blob posts as `multipart/form-data`.
      */
     executeAction<T = unknown>(actionPath: string, body: Record<string, unknown> = {}): Observable<T> {
-        return this.http.post<T>(this.apiUrl(actionPath), body).pipe(catchError((err) => this.handleError(err)));
+        return this.http.post<T>(this.apiUrl(actionPath), multipartWhenFile(body)).pipe(catchError((err) => this.handleError(err)));
     }
 }
+
+function multipartWhenFile(body: Record<string, unknown>): Record<string, unknown> | FormData {
+    if (!Object.values(body).some((value) => value instanceof Blob)) return body;
+    const form = new FormData();
+    for (const [key, value] of Object.entries(body)) {
+        if (value != null) form.append(key, value instanceof Blob ? value : String(value));
+    }
+    return form;
+}

package/src/service/rest_url.ts

@@ -77,11 +77,14 @@ export const RestURL = {
   agencyAcceptInviteURL:     '/api/v1/agency/invite/accept',
   agencyDelegationURL:       '/api/v1/agency/delegation',
   agencyRevokeDelegationURL: '/api/v1/agency/delegation/revoke',
-  // User payment methods — list/delete go through keel's generic REST
-  // CRUD against the UserSpecific basis table; set-default is a
-  // TableAction (basis table_action row), mounted at the conventional
-  // URL POST /api/v1/user_payment_method/set_default.
+  // User payment methods — list is keel's generic REST CRUD; set_default and
+  // remove are keel UserPaymentMethodHandler table actions.
   paymentMethodSetDefaultURL: '/api/v1/user_payment_method/set_default',
+  paymentMethodRemoveURL:     '/api/v1/user_payment_method/remove',
+  // Partner documents — keel DocumentHandler, mounted at its TableActionPath shape.
+  partnerDocumentUploadURL:  '/api/v1/partner_document/upload',
+  partnerDocumentPreviewURL: '/api/v1/partner_document/preview',
+  partnerDocumentReviewURL:  '/api/v1/partner_document/review',
 };
 
 /** Call this at app startup to set the backend host URL */

package/src/service/user_payment_method.service.ts

@@ -8,13 +8,10 @@ import { UserPaymentMethod } from '../model/appdata';
 /**
  * UserPaymentMethodService — consumer-side saved-payment-methods API.
  *
- * list and delete go through keel's generic REST CRUD against the
- * basis user_payment_method table — that table is UserSpecific (FK
- * column `user_id`), so the auto-filter scopes reads + owner-locks
- * DELETE without any custom server-side glue. setDefault has a custom
- * endpoint because it needs an atomic multi-row UPDATE
- * (`SET is_default = (id = ?) WHERE user_id = session`) that abstract
- * single-row CRUD can't express.
+ * list goes through keel's generic REST CRUD against the UserSpecific basis
+ * user_payment_method table. remove and setDefault are keel table actions:
+ * remove detaches the method at the provider before deleting the row, so keel
+ * grants no generic DELETE on the table.
  */
 @Injectable({ providedIn: 'root' })
 export class UserPaymentMethodService extends BaseRestService {
@@ -29,15 +26,12 @@ export class UserPaymentMethodService extends BaseRestService {
     return this.backend.list<UserPaymentMethod>('user_payment_method');
   }
 
-  /** Delete a saved payment method. user_id is auto-scoped by keel. */
-  delete(id: number): Observable<{ message: string }> {
-    return this.backend.delete('user_payment_method', { Id: String(id) });
+  /** Detach a saved payment method at the provider and delete it. */
+  remove(id: number): Observable<{ message: string }> {
+    return this.http.post<{ message: string }>(this.url(RestURL.paymentMethodRemoveURL), { id });
   }
 
-  /**
-   * Mark one row as default; clears every other row in the same call.
-   * Custom endpoint — see service-class doc for the rationale.
-   */
+  /** Mark one row as default; clears every other row in the same call. */
   setDefault(id: number): Observable<{ message: string }> {
     return this.http.post<{ message: string }>(this.url(RestURL.paymentMethodSetDefaultURL), { id });
   }