@wealthx/shadcn 1.5.4 → 1.5.5

package/dist/index.js

@@ -13923,46 +13923,38 @@ var AlertSharingType = /* @__PURE__ */ ((AlertSharingType2) => {
 
 // src/components/ui/contact-alert-dialog/config.ts
 var import_ui = require("@react-awesome-query-builder/ui");
+var NUMERIC_OPERATORS_DEFAULT = [
+  "equal",
+  "less",
+  "less_or_equal",
+  "greater",
+  "greater_or_equal"
+];
 var ALERT_QUERY_FIELDS = [
   {
     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",
@@ -13974,116 +13966,76 @@ var ALERT_QUERY_FIELDS = [
     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
   }
 ];
-var ALL_NUMERIC_OPERATORS = [
-  "equal",
-  "not_equal",
-  "less",
-  "less_or_equal",
-  "greater",
-  "greater_or_equal",
-  "between"
-];
+var ALL_NUMERIC_OPERATORS = NUMERIC_OPERATORS_DEFAULT;
 var BOOLEAN_OPERATORS = ["equal"];
 var OPERATOR_LABELS = {
   equal: "=",
-  not_equal: "\u2260",
   less: "<",
   less_or_equal: "\u2264",
   greater: ">",
-  greater_or_equal: "\u2265",
-  between: "between"
+  greater_or_equal: "\u2265"
 };
 var SEVERITY_LABELS = {
-  INSIGHT: "Insight",
+  HEALTHY: "Healthy",
   WATCH: "Watch",
   NEED_ACTION: "Need Action"
 };
 var QB_CONFIG = __spreadProps(__spreadValues({}, import_ui.BasicConfig), {
+  settings: __spreadProps(__spreadValues({}, import_ui.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"
-      ],
-      valueSources: ["value"]
+      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"
-      ],
-      valueSources: ["value"]
+      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"
-      ],
-      valueSources: ["value"]
+      operators: NUMERIC_OPERATORS_DEFAULT,
+      valueSources: ["value"],
+      fieldSettings: { min: 0, max: 100 }
     },
     "userMetric.has_met_buying_goal": {
       label: "Has Met Buying Goal",
@@ -14094,50 +14046,30 @@ var QB_CONFIG = __spreadProps(__spreadValues({}, import_ui.BasicConfig), {
     "userMetric.excess_monthly_surplus": {
       label: "Excess Monthly Surplus",
       type: "number",
-      operators: [
-        "equal",
-        "less",
-        "less_or_equal",
-        "greater",
-        "greater_or_equal"
-      ],
-      valueSources: ["value"]
+      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"
-      ],
-      valueSources: ["value"]
+      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"
-      ],
-      valueSources: ["value"]
+      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"
-      ],
-      valueSources: ["value"]
+      operators: NUMERIC_OPERATORS_DEFAULT,
+      valueSources: ["value"],
+      fieldSettings: { min: 0, max: 100 }
     }
   }
 });
@@ -14188,14 +14120,13 @@ function parseCommas(display) {
   return display.replace(/[^\d.]/g, "").replace(/(\..*)\./g, "$1");
 }
 function ruleSummary(ruleProps, fields) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e;
   const field = (_a = ruleProps == null ? void 0 : ruleProps.field) != null ? _a : "";
   const operator = (_b = ruleProps == null ? void 0 : ruleProps.operator) != null ? _b : "equal";
   const value0 = (_c = ruleProps == null ? void 0 : ruleProps.value) == null ? void 0 : _c[0];
-  const value1 = (_d = ruleProps == null ? void 0 : ruleProps.value) == null ? void 0 : _d[1];
   const fieldDef = fields.find((f) => f.key === field);
-  const fieldLabel = (_e = fieldDef == null ? void 0 : fieldDef.label) != null ? _e : field;
-  const opLabel = (_f = OPERATOR_LABELS[operator]) != null ? _f : operator;
+  const fieldLabel = (_d = fieldDef == null ? void 0 : fieldDef.label) != null ? _d : field;
+  const opLabel = (_e = OPERATOR_LABELS[operator]) != null ? _e : operator;
   const formatVal = (v) => {
     if (v === null || v === void 0) return "\u2026";
     if ((fieldDef == null ? void 0 : fieldDef.type) === "boolean") return v ? "Yes" : "No";
@@ -14206,9 +14137,6 @@ function ruleSummary(ruleProps, fields) {
     if ((fieldDef == null ? void 0 : fieldDef.unit) === "percent") return `${n}%`;
     return String(v);
   };
-  if (operator === "between") {
-    return `${fieldLabel} between ${formatVal(value0)} and ${formatVal(value1)}`;
-  }
   return `${fieldLabel} ${opLabel} ${formatVal(value0)}`;
 }
 function checkGroupValid(children) {
@@ -14427,8 +14355,22 @@ function ValueInput({
   value,
   onChange,
   unit,
+  min,
+  max,
   placeholder = "0"
 }) {
+  function handleChange(raw) {
+    const parsed = parseCommas(raw);
+    if (parsed === "") {
+      onChange("");
+      return;
+    }
+    const n = parseFloat(parsed);
+    if (Number.isNaN(n)) return;
+    if (min !== void 0 && n < min) return;
+    if (max !== void 0 && n > max) return;
+    onChange(parsed);
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime76.jsxs)(InputGroup, { className: "w-36", children: [
     unit === "dollar" && /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(InputGroupAddon, { align: "inline-start", children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(InputGroupText, { children: "$" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
@@ -14437,7 +14379,7 @@ function ValueInput({
         type: "text",
         inputMode: "numeric",
         value: formatWithCommas(value),
-        onChange: (e) => onChange(parseCommas(e.target.value)),
+        onChange: (e) => handleChange(e.target.value),
         placeholder
       }
     ),
@@ -14452,14 +14394,13 @@ function RuleEditorFields({
   longestFieldLabel,
   longestOperatorLabel
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const field = (_c = (_b = ruleProps == null ? void 0 : ruleProps.field) != null ? _b : (_a = fields[0]) == null ? void 0 : _a.key) != null ? _c : "";
   const operator = (_d = ruleProps == null ? void 0 : ruleProps.operator) != null ? _d : "greater_or_equal";
   const value0 = (_e = ruleProps == null ? void 0 : ruleProps.value) == null ? void 0 : _e[0];
-  const value1 = (_f = ruleProps == null ? void 0 : ruleProps.value) == null ? void 0 : _f[1];
-  const fieldDef = (_g = fields.find((f) => f.key === field)) != null ? _g : fields[0];
+  const fieldDef = (_f = fields.find((f) => f.key === field)) != null ? _f : fields[0];
   const isBooleanField = (fieldDef == null ? void 0 : fieldDef.type) === "boolean";
-  const availableOperators = isBooleanField ? BOOLEAN_OPERATORS : (_h = fieldDef == null ? void 0 : fieldDef.operators) != null ? _h : ALL_NUMERIC_OPERATORS;
+  const availableOperators = isBooleanField ? BOOLEAN_OPERATORS : (_g = fieldDef == null ? void 0 : fieldDef.operators) != null ? _g : ALL_NUMERIC_OPERATORS;
   function handleFieldChange(key) {
     actions.setField(path, key);
   }
@@ -14488,7 +14429,7 @@ function RuleEditorFields({
         value: field,
         onValueChange: (v) => handleFieldChange(v),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectValue, { children: (_j = (_i = fields.find((f) => f.key === field)) == null ? void 0 : _i.label) != null ? _j : field }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectValue, { children: (_i = (_h = fields.find((f) => f.key === field)) == null ? void 0 : _h.label) != null ? _i : field }) }),
           /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectContent, { children: fields.map((f) => /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectItem, { value: f.key, children: f.label }, f.key)) })
         ]
       }
@@ -14499,7 +14440,7 @@ function RuleEditorFields({
         value: operator,
         onValueChange: (v) => handleOperatorChange(v),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectValue, { children: (_k = OPERATOR_LABELS[operator]) != null ? _k : operator }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectValue, { children: (_j = OPERATOR_LABELS[operator]) != null ? _j : operator }) }),
           /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectContent, { children: availableOperators.map((op) => /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SelectItem, { value: op, children: OPERATOR_LABELS[op] }, op)) })
         ]
       }
@@ -14517,27 +14458,16 @@ function RuleEditorFields({
           ] })
         ]
       }
-    ) : /* @__PURE__ */ (0, import_jsx_runtime76.jsxs)(import_jsx_runtime76.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
-        ValueInput,
-        {
-          value: valStr(value0),
-          onChange: (v) => handleValueChange(0, v),
-          unit: fieldDef == null ? void 0 : fieldDef.unit
-        }
-      ),
-      operator === "between" && /* @__PURE__ */ (0, import_jsx_runtime76.jsxs)(import_jsx_runtime76.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime76.jsx)("span", { className: "text-xs text-muted-foreground", children: "and" }),
-        /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
-          ValueInput,
-          {
-            value: valStr(value1),
-            onChange: (v) => handleValueChange(1, v),
-            unit: fieldDef == null ? void 0 : fieldDef.unit
-          }
-        )
-      ] })
-    ] })
+    ) : /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
+      ValueInput,
+      {
+        value: valStr(value0),
+        onChange: (v) => handleValueChange(0, v),
+        unit: fieldDef == null ? void 0 : fieldDef.unit,
+        min: fieldDef == null ? void 0 : fieldDef.min,
+        max: fieldDef == null ? void 0 : fieldDef.max
+      }
+    )
   ] });
 }
 function RuleAccordionItem({
@@ -14879,6 +14809,7 @@ function ContactAlertDialog({
   isCompanyAdmin = false,
   initialShareAcrossCompany = false,
   onSave,
+  onError,
   isLoading = false,
   className
 }) {
@@ -14902,10 +14833,17 @@ function ContactAlertDialog({
   const canSave = name.trim().length > 0 && hasValidRule && !isLoading;
   function handleSave() {
     if (!canSave) return;
+    let filterSegment;
+    try {
+      filterSegment = import_ui4.Utils.sanitizeTree(tree, QB_CONFIG).fixedTree;
+    } catch (e) {
+      onError == null ? void 0 : onError(e instanceof Error ? e : new Error(String(e)));
+      return;
+    }
     onSave({
       name: name.trim(),
       severity,
-      filterSegment: import_ui4.Utils.sanitizeTree(tree, QB_CONFIG).fixedTree,
+      filterSegment,
       sharingType: shareAcrossCompany ? "COMPANY" /* COMPANY */ : "PRIVATE" /* PRIVATE */
     });
   }
@@ -14921,7 +14859,7 @@ function ContactAlertDialog({
           size: "sm",
           value: severity,
           onValueChange: (v) => v && setSeverity(v),
-          children: ["NEED_ACTION", "WATCH", "INSIGHT"].map((s) => /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(ToggleGroupItem, { value: s, children: SEVERITY_LABELS[s] }, s))
+          children: ["NEED_ACTION", "WATCH", "HEALTHY"].map((s) => /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(ToggleGroupItem, { value: s, children: SEVERITY_LABELS[s] }, s))
         }
       )
     ] }),

package/dist/index.mjs

@@ -4,7 +4,7 @@ import {
   ContactAlertDialog,
   ContactAlertQueryBuilder,
   createAlertTree
-} from "./chunk-G2EWIP2N.mjs";
+} from "./chunk-CKPEFZNH.mjs";
 import {
   TransactionsExpenseCategoriesDoughnutChart
 } from "./chunk-KB7MZMED.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wealthx/shadcn",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./src/index.ts",

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

@@ -70,13 +70,30 @@ function ValueInput({
   value,
   onChange,
   unit,
+  min,
+  max,
   placeholder = "0",
 }: {
   value: string;
   onChange: (v: string) => void;
   unit?: "dollar" | "percent";
+  min?: number;
+  max?: number;
   placeholder?: string;
 }) {
+  function handleChange(raw: string) {
+    const parsed = parseCommas(raw);
+    if (parsed === "") {
+      onChange("");
+      return;
+    }
+    const n = parseFloat(parsed);
+    if (Number.isNaN(n)) return;
+    if (min !== undefined && n < min) return;
+    if (max !== undefined && n > max) return;
+    onChange(parsed);
+  }
+
   return (
     <InputGroup className="w-36">
       {unit === "dollar" && (
@@ -88,7 +105,7 @@ function ValueInput({
         type="text"
         inputMode="numeric"
         value={formatWithCommas(value)}
-        onChange={(e) => onChange(parseCommas(e.target.value))}
+        onChange={(e) => handleChange(e.target.value)}
         placeholder={placeholder}
       />
       {unit === "percent" && (
@@ -123,7 +140,6 @@ function RuleEditorFields({
   const field: string = ruleProps?.field ?? fields[0]?.key ?? "";
   const operator: string = ruleProps?.operator ?? "greater_or_equal";
   const value0 = ruleProps?.value?.[0];
-  const value1 = ruleProps?.value?.[1];
 
   const fieldDef = fields.find((f) => f.key === field) ?? fields[0];
   const isBooleanField = fieldDef?.type === "boolean";
@@ -217,23 +233,13 @@ function RuleEditorFields({
           </SelectContent>
         </Select>
       ) : (
-        <>
-          <ValueInput
-            value={valStr(value0)}
-            onChange={(v) => handleValueChange(0, v)}
-            unit={fieldDef?.unit}
-          />
-          {operator === "between" && (
-            <>
-              <span className="text-xs text-muted-foreground">and</span>
-              <ValueInput
-                value={valStr(value1)}
-                onChange={(v) => handleValueChange(1, v)}
-                unit={fieldDef?.unit}
-              />
-            </>
-          )}
-        </>
+        <ValueInput
+          value={valStr(value0)}
+          onChange={(v) => handleValueChange(0, v)}
+          unit={fieldDef?.unit}
+          min={fieldDef?.min}
+          max={fieldDef?.max}
+        />
       )}
     </div>
   );