@wealthx/shadcn 1.5.3 → 1.5.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @wealthx/shadcn
 
+## 1.5.5
+
+### Patch Changes
+
+- 6ba7ca6: Update query builder
+
+## 1.5.4
+
+### Patch Changes
+
+- 16d9edb: Allow custom description and staff select
+
 ## 1.5.3
 
 ### Patch Changes

package/dist/{chunk-G2EWIP2N.mjs → chunk-CKPEFZNH.mjs}

@@ -65,46 +65,38 @@ import {
   BasicConfig,
   Utils as QbUtils
 } from "@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",
@@ -116,116 +108,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({}, BasicConfig), {
+  settings: __spreadProps(__spreadValues({}, 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",
@@ -236,50 +188,30 @@ var QB_CONFIG = __spreadProps(__spreadValues({}, 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 }
     }
   }
 });
@@ -332,14 +264,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";
@@ -350,9 +281,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) {
@@ -384,7 +312,7 @@ import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion";
 import {
   Utils as QbUtils3
 } from "@react-awesome-query-builder/ui";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 function SelectAutoWidth({
   longestLabel,
   children
@@ -405,8 +333,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__ */ jsxs(InputGroup, { className: "w-36", children: [
     unit === "dollar" && /* @__PURE__ */ jsx(InputGroupAddon, { align: "inline-start", children: /* @__PURE__ */ jsx(InputGroupText, { children: "$" }) }),
     /* @__PURE__ */ jsx(
@@ -415,7 +357,7 @@ function ValueInput({
         type: "text",
         inputMode: "numeric",
         value: formatWithCommas(value),
-        onChange: (e) => onChange(parseCommas(e.target.value)),
+        onChange: (e) => handleChange(e.target.value),
         placeholder
       }
     ),
@@ -430,14 +372,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);
   }
@@ -466,7 +407,7 @@ function RuleEditorFields({
         value: field,
         onValueChange: (v) => handleFieldChange(v),
         children: [
-          /* @__PURE__ */ jsx(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ jsx(SelectValue, { children: (_j = (_i = fields.find((f) => f.key === field)) == null ? void 0 : _i.label) != null ? _j : field }) }),
+          /* @__PURE__ */ jsx(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ jsx(SelectValue, { children: (_i = (_h = fields.find((f) => f.key === field)) == null ? void 0 : _h.label) != null ? _i : field }) }),
           /* @__PURE__ */ jsx(SelectContent, { children: fields.map((f) => /* @__PURE__ */ jsx(SelectItem, { value: f.key, children: f.label }, f.key)) })
         ]
       }
@@ -477,7 +418,7 @@ function RuleEditorFields({
         value: operator,
         onValueChange: (v) => handleOperatorChange(v),
         children: [
-          /* @__PURE__ */ jsx(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ jsx(SelectValue, { children: (_k = OPERATOR_LABELS[operator]) != null ? _k : operator }) }),
+          /* @__PURE__ */ jsx(SelectTrigger, { size: "sm", className: "w-full", children: /* @__PURE__ */ jsx(SelectValue, { children: (_j = OPERATOR_LABELS[operator]) != null ? _j : operator }) }),
           /* @__PURE__ */ jsx(SelectContent, { children: availableOperators.map((op) => /* @__PURE__ */ jsx(SelectItem, { value: op, children: OPERATOR_LABELS[op] }, op)) })
         ]
       }
@@ -495,27 +436,16 @@ function RuleEditorFields({
           ] })
         ]
       }
-    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
-        ValueInput,
-        {
-          value: valStr(value0),
-          onChange: (v) => handleValueChange(0, v),
-          unit: fieldDef == null ? void 0 : fieldDef.unit
-        }
-      ),
-      operator === "between" && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: "and" }),
-        /* @__PURE__ */ jsx(
-          ValueInput,
-          {
-            value: valStr(value1),
-            onChange: (v) => handleValueChange(1, v),
-            unit: fieldDef == null ? void 0 : fieldDef.unit
-          }
-        )
-      ] })
-    ] })
+    ) : /* @__PURE__ */ 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({
@@ -857,6 +787,7 @@ function ContactAlertDialog({
   isCompanyAdmin = false,
   initialShareAcrossCompany = false,
   onSave,
+  onError,
   isLoading = false,
   className
 }) {
@@ -880,10 +811,17 @@ function ContactAlertDialog({
   const canSave = name.trim().length > 0 && hasValidRule && !isLoading;
   function handleSave() {
     if (!canSave) return;
+    let filterSegment;
+    try {
+      filterSegment = QbUtils4.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: QbUtils4.sanitizeTree(tree, QB_CONFIG).fixedTree,
+      filterSegment,
       sharingType: shareAcrossCompany ? "COMPANY" /* COMPANY */ : "PRIVATE" /* PRIVATE */
     });
   }
@@ -899,7 +837,7 @@ function ContactAlertDialog({
           size: "sm",
           value: severity,
           onValueChange: (v) => v && setSeverity(v),
-          children: ["NEED_ACTION", "WATCH", "INSIGHT"].map((s) => /* @__PURE__ */ jsx2(ToggleGroupItem, { value: s, children: SEVERITY_LABELS[s] }, s))
+          children: ["NEED_ACTION", "WATCH", "HEALTHY"].map((s) => /* @__PURE__ */ jsx2(ToggleGroupItem, { value: s, children: SEVERITY_LABELS[s] }, s))
         }
       )
     ] }),

package/dist/{chunk-PX4M67XQ.mjs → chunk-HXU5JGLQ.mjs}

@@ -130,6 +130,7 @@ function FilePreviewDialog({
   staffOptions,
   selectedStaffId,
   onStaffSelect,
+  staffSelector,
   className
 }) {
   const [page, setPage] = React.useState(0);
@@ -140,7 +141,8 @@ function FilePreviewDialog({
   const pagedRows = rows.slice(page * pageSize, (page + 1) * pageSize);
   const pageStart = page * pageSize;
   const isImporting = state === "importing";
-  const hasStaffSelector = !!staffOptions && staffOptions.length > 0;
+  const hasBuiltInStaffSelector = !!staffOptions && staffOptions.length > 0;
+  const hasStaffSelector = !!staffSelector || hasBuiltInStaffSelector;
   const canImport = state === "preview" && rows.length > 0 && (!hasStaffSelector || !!selectedStaffId);
   const successCount = rows.filter((r) => r._status === "success").length;
   const failedCount = rows.filter((r) => r._status === "failed").length;
@@ -177,7 +179,7 @@ function FilePreviewDialog({
       }
     ),
     state === "preview" && /* @__PURE__ */ jsxs(Fragment, { children: [
-      hasStaffSelector && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
+      staffSelector ? staffSelector : hasBuiltInStaffSelector && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
         /* @__PURE__ */ jsxs("label", { className: "text-label-medium text-foreground", children: [
           "Assign staff",
           " ",

package/dist/{chunk-CUSHAIUL.mjs → chunk-QBPNYXTI.mjs}

@@ -28,6 +28,7 @@ function CsvImportModal({
   onFileClear,
   onNext,
   onDownloadTemplate,
+  uploadDescription,
   isLoading = false,
   className
 }) {
@@ -61,7 +62,7 @@ function CsvImportModal({
       {
         size: "lg",
         label: "Drag & drop or click to upload",
-        description: "Supports .csv files only. Max 10 MB.",
+        description: uploadDescription != null ? uploadDescription : "Supports .csv files only. Max 10 MB.",
         accept: ".csv",
         onFileChange: (file) => file && (onFileSelect == null ? void 0 : onFileSelect(file))
       }