@omnitend/dashboard-for-laravel 0.32.0 → 0.33.0

package/resources/js/types/index.ts

@@ -33,6 +33,7 @@ export type FieldType =
     | "checkbox"
     | "checkbox-group"
     | "switch"
+    | "switch-list"
     | "radio"
     | "image"
     | "file"
@@ -103,9 +104,11 @@ export interface FieldDefinition {
     required?: boolean;
 
     /**
-     * Options for `select`, `radio` and `autocomplete` fields. For
-     * `autocomplete` these are the datalist suggestions; the field still
-     * accepts free text not present in the list.
+     * Options for `select`, `radio`, `checkbox-group`, `switch-list` and
+     * `autocomplete` fields. For `autocomplete` these are the datalist
+     * suggestions; the field still accepts free text not present in the list.
+     * For `switch-list` each option renders a labelled toggle row
+     * (`description` becomes the row label's tooltip).
      */
     options?: FieldOption[];
 
@@ -152,6 +155,15 @@ export interface FieldDefinition {
      */
     decimals?: number;
 
+    /**
+     * For `currency` fields: the model stores integer MINOR units (pence) but
+     * the input shows/edits MAJOR units (pounds) — display = value / 10^decimals,
+     * submit = round(input × 10^decimals). `min`/`max`/`step` stay in major
+     * units. Off by default (the model is the major-unit amount). Use for
+     * legacy pence-integer columns (#116).
+     */
+    minorUnits?: boolean;
+
     /**
      * For `percentage` fields: treat the underlying model value as a 0–1
      * fraction while showing/editing it as a 0–100 percentage. The model keeps
@@ -197,11 +209,13 @@ export interface FieldDefinition {
     textWhenFalse?: MaybeFn<string>;
 
     /**
-     * For `switch` fields: the on-state colour. `"success"` (default) is the
-     * house green-on / red-off style for an active/enabled/good switch;
-     * `"neutral"` (brand primary on / grey off) is for semantically-mixed
-     * switches that shouldn't imply good/bad ("contains alcohol", an allergen
-     * toggle, "hidden on web shop"). See DXSwitch `onVariant` (#158).
+     * For `switch` and `switch-list` fields: the on-state colour. `"success"`
+     * (default) is the house green-on / red-off style for an
+     * active/enabled/good switch; `"neutral"` (brand primary on / grey off) is
+     * for semantically-mixed switches that shouldn't imply good/bad ("contains
+     * alcohol", an allergen toggle, "hidden on web shop"). A `switch-list`
+     * usually wants `"neutral"` — a wall of red-off toggles over-signals when
+     * off simply means "not present". See DXSwitch `onVariant` (#158).
      */
     switchVariant?: "success" | "neutral";
 

package/resources/js/utils/api.ts

@@ -53,8 +53,7 @@ class ApiClient {
             }
         };
         for (const [k, v] of Object.entries(params)) append(k, v);
-        const qs = search.toString();
-        return qs ? `?${qs}` : "";
+        return search.toString();
     }
 
     private handleError(response: Response, data: any): never {
@@ -92,18 +91,24 @@ class ApiClient {
     ): Promise<ApiResponse<T>> {
         const isFormData =
             typeof FormData !== "undefined" && options.body instanceof FormData;
+        // GET/HEAD carry no body (nothing for Content-Type to describe) and
+        // change no state (no CSRF exposure). Both headers are also non-simple
+        // for CORS, so sending them would force a preflight on cross-origin
+        // apiUrl/showUrl endpoints that axios's plain GETs never needed (#132).
+        const method = (options.method ?? "GET").toUpperCase();
+        const isBodyless = method === "GET" || method === "HEAD";
 
         const headers: Record<string, string> = {
             ...this.defaultHeaders,
             ...(isFormData
                 ? {}
                 : { "Content-Type": this.defaultHeaders["Content-Type"] }),
-            "X-CSRF-TOKEN": this.getCsrfToken(),
+            ...(isBodyless ? {} : { "X-CSRF-TOKEN": this.getCsrfToken() }),
             ...options.headers,
         };
 
         // Let fetch set the multipart boundary if FormData
-        if (isFormData) delete headers["Content-Type"];
+        if (isFormData || isBodyless) delete headers["Content-Type"];
 
         const config: RequestOptions = {
             credentials: "same-origin",
@@ -140,7 +145,10 @@ class ApiClient {
         params: Record<string, unknown> = {},
         options: Omit<RequestOptions, "method"> = {},
     ) {
-        const full = `${url}${this.toQuery(params)}`;
+        // Merge into an existing query string (`/things?scope=x` + params) with
+        // `&` — a blind `?` append corrupts the URL and silently drops params.
+        const qs = this.toQuery(params);
+        const full = qs ? `${url}${url.includes("?") ? "&" : "?"}${qs}` : url;
         return this.request<T>(full, { ...options, method: "GET" });
     }