@wealthx/shadcn 1.5.4 → 1.5.5

package/src/components/ui/contact-alert-dialog/config.ts

@@ -8,46 +8,39 @@ import {
 } from "@react-awesome-query-builder/ui";
 import type { AlertQueryField, AlertQueryOperator } from "./types";
 
+const NUMERIC_OPERATORS_DEFAULT: AlertQueryOperator[] = [
+  "equal",
+  "less",
+  "less_or_equal",
+  "greater",
+  "greater_or_equal",
+];
+
 export const ALERT_QUERY_FIELDS: AlertQueryField[] = [
   {
     key: "userMetric.max_loan_amount",
     label: "Borrowing Capacity",
     type: "number",
     unit: "dollar",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-      "between",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
   },
   {
     key: "userMetric.debt_outstanding",
     label: "Outstanding Debt",
     type: "number",
     unit: "dollar",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
   },
   {
     key: "userMetric.lvr",
     label: "Current LVR",
     type: "number",
     unit: "percent",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
+    max: 100,
   },
   {
     key: "userMetric.has_met_buying_goal",
@@ -59,79 +52,52 @@ export const ALERT_QUERY_FIELDS: AlertQueryField[] = [
     label: "Excess Monthly Surplus",
     type: "number",
     unit: "dollar",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
   },
   {
     key: "userMetric.equity",
     label: "Equity Amount",
     type: "number",
     unit: "dollar",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
   },
   {
     key: "userMetric.max_debt_interest_rate",
     label: "Max Debt Interest Rate",
     type: "number",
     unit: "percent",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
+    max: 100,
   },
   {
     key: "userMetric.min_debt_interest_rate",
     label: "Min Debt Interest Rate",
     type: "number",
     unit: "percent",
-    operators: [
-      "equal",
-      "less",
-      "less_or_equal",
-      "greater",
-      "greater_or_equal",
-    ],
+    operators: NUMERIC_OPERATORS_DEFAULT,
+    min: 0,
+    max: 100,
   },
 ];
 
-export const ALL_NUMERIC_OPERATORS: AlertQueryOperator[] = [
-  "equal",
-  "not_equal",
-  "less",
-  "less_or_equal",
-  "greater",
-  "greater_or_equal",
-  "between",
-];
+export const ALL_NUMERIC_OPERATORS: AlertQueryOperator[] =
+  NUMERIC_OPERATORS_DEFAULT;
 
 export const BOOLEAN_OPERATORS: AlertQueryOperator[] = ["equal"];
 
 export const OPERATOR_LABELS: Record<AlertQueryOperator, string> = {
   equal: "=",
-  not_equal: "≠",
   less: "<",
   less_or_equal: "≤",
   greater: ">",
   greater_or_equal: "≥",
-  between: "between",
 };
 
 export const SEVERITY_LABELS = {
-  INSIGHT: "Insight",
+  HEALTHY: "Healthy",
   WATCH: "Watch",
   NEED_ACTION: "Need Action",
 } as const;
@@ -139,43 +105,32 @@ export const SEVERITY_LABELS = {
 // react-awesome-query-builder config — drives ImmutableTree state.
 export const QB_CONFIG: Config = {
   ...BasicConfig,
+  settings: {
+    ...BasicConfig.settings,
+    maxNesting: 3,
+    maxNumberOfRules: 5,
+  },
   fields: {
     "userMetric.max_loan_amount": {
       label: "Borrowing Capacity",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-        "between",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0 },
     },
     "userMetric.debt_outstanding": {
       label: "Outstanding Debt",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0 },
     },
     "userMetric.lvr": {
       label: "Current LVR",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0, max: 100 },
     },
     "userMetric.has_met_buying_goal": {
       label: "Has Met Buying Goal",
@@ -186,50 +141,30 @@ export const QB_CONFIG: Config = {
     "userMetric.excess_monthly_surplus": {
       label: "Excess Monthly Surplus",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0 },
     },
     "userMetric.equity": {
       label: "Equity Amount",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0 },
     },
     "userMetric.max_debt_interest_rate": {
       label: "Max Debt Interest Rate",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0, max: 100 },
     },
     "userMetric.min_debt_interest_rate": {
       label: "Min Debt Interest Rate",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal",
-      ],
+      operators: NUMERIC_OPERATORS_DEFAULT,
       valueSources: ["value"],
+      fieldSettings: { min: 0, max: 100 },
     },
   },
 };

package/src/components/ui/contact-alert-dialog/contact-alert-dialog.tsx

@@ -88,6 +88,7 @@ export function ContactAlertDialog({
   isCompanyAdmin = false,
   initialShareAcrossCompany = false,
   onSave,
+  onError,
   isLoading = false,
   className,
 }: ContactAlertDialogProps) {
@@ -116,10 +117,17 @@ export function ContactAlertDialog({
 
   function handleSave() {
     if (!canSave) return;
+    let filterSegment: ImmutableTree;
+    try {
+      filterSegment = QbUtils.sanitizeTree(tree, QB_CONFIG).fixedTree;
+    } catch (e) {
+      onError?.(e instanceof Error ? e : new Error(String(e)));
+      return;
+    }
     onSave({
       name: name.trim(),
       severity,
-      filterSegment: QbUtils.sanitizeTree(tree, QB_CONFIG).fixedTree,
+      filterSegment,
       sharingType: shareAcrossCompany
         ? AlertSharingType.COMPANY
         : AlertSharingType.PRIVATE,
@@ -151,7 +159,7 @@ export function ContactAlertDialog({
             }
           >
             {(
-              ["NEED_ACTION", "WATCH", "INSIGHT"] as ContactAlertSeverity[]
+              ["NEED_ACTION", "WATCH", "HEALTHY"] as ContactAlertSeverity[]
             ).map((s) => (
               <ToggleGroupItem key={s} value={s}>
                 {SEVERITY_LABELS[s]}

package/src/components/ui/contact-alert-dialog/types.ts

@@ -4,16 +4,14 @@ export type AlertQueryCombinator = "AND" | "OR";
 
 export type AlertQueryOperator =
   | "equal"
-  | "not_equal"
   | "less"
   | "less_or_equal"
   | "greater"
-  | "greater_or_equal"
-  | "between";
+  | "greater_or_equal";
 
 export type AlertQueryFieldType = "number" | "boolean";
 
-export type ContactAlertSeverity = "INSIGHT" | "WATCH" | "NEED_ACTION";
+export type ContactAlertSeverity = "HEALTHY" | "WATCH" | "NEED_ACTION";
 
 export enum AlertSharingType {
   PRIVATE = "PRIVATE",
@@ -28,6 +26,10 @@ export interface AlertQueryField {
   unit?: "dollar" | "percent";
   /** Allowed operators (defaults to all numeric operators). */
   operators?: AlertQueryOperator[];
+  /** Lower bound for numeric value (inclusive). Enforced at input time. */
+  min?: number;
+  /** Upper bound for numeric value (inclusive). Enforced at input time. */
+  max?: number;
 }
 
 export interface ContactAlertQueryBuilderProps {
@@ -57,5 +59,7 @@ export interface ContactAlertDialogProps {
     sharingType: AlertSharingType;
   }) => void;
   isLoading?: boolean;
+  /** Fired when the underlying QB sanitizeTree throws while saving. */
+  onError?: (error: Error) => void;
   className?: string;
 }

package/src/components/ui/contact-alert-dialog/utils.ts

@@ -45,7 +45,6 @@ export function ruleSummary(
   const field: string = ruleProps?.field ?? "";
   const operator: string = ruleProps?.operator ?? "equal";
   const value0 = ruleProps?.value?.[0];
-  const value1 = ruleProps?.value?.[1];
 
   const fieldDef = fields.find((f) => f.key === field);
   const fieldLabel = fieldDef?.label ?? field;
@@ -62,9 +61,6 @@ export function ruleSummary(
     return String(v);
   };
 
-  if (operator === "between") {
-    return `${fieldLabel} between ${formatVal(value0)} and ${formatVal(value1)}`;
-  }
   return `${fieldLabel} ${opLabel} ${formatVal(value0)}`;
 }