@resolveio/server-lib 22.3.211 → 22.3.213

package/methods/ai-terminal.js

@@ -7411,7 +7411,7 @@ function extractAssistantDataIntentCustomerText(message) {
     value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:few|couple|couple\s+of|several)\s+(?:days?|weeks?|months?|years?)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+[0-9]+\s+(?:days?|weeks?|months?)\b/gi, ' ');
     value = value.replace(/\b(?:this|current)\s+(?:week|month|quarter|year)\b/gi, ' ');
-    value = value.replace(/\b(?:last|past)\s+(?:week|month|quarter|year)\b/gi, ' ');
+    value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:week|month|quarter|year)\b/gi, ' ');
     value = value.replace(/\byear\s+to\s+date\b/gi, ' ');
     value = value.replace(/\b(how|many|much|number|numbers|count|counts|summarize|summary|show|list|give|pull|find|tell|me|about|of|the|a|an|and|or|with|without|amount|quantity|qty|total|totals|for|to|them|their|we|our|us|right|now|by|what|which|were|was|is|are|has|have|had|been|did|do|does|get|report|all)\b/gi, ' ');
     value = value.replace(/\b(work\s*orders?|wos?|jobs?|invoices?|invoice|invoiced|invoicing|billed|billing|revenue|charged|chemicals?|chemical|sent|shipped|shipment|shipments|delivered|planned|inventory|on\s+hand|stock|ytd|status|state|open|completed|reviewed|closed|monthly|month)\b/gi, ' ');
@@ -7448,11 +7448,11 @@ function extractAssistantDataIntentLikelyFilterText(message, intent) {
     value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:few|couple|couple\s+of|several)\s+(?:days?|weeks?|months?|years?)\b/gi, ' ');
     value = value.replace(/\b(?:last|past)\s+[0-9]+\s+(?:days?|weeks?|months?)\b/gi, ' ');
     value = value.replace(/\b(?:this|current)\s+(?:week|month|quarter|year)\b/gi, ' ');
-    value = value.replace(/\b(?:last|past)\s+(?:week|month|quarter|year)\b/gi, ' ');
+    value = value.replace(/\b(?:last|past|previous|over\s+the\s+last)\s+(?:week|month|quarter|year)\b/gi, ' ');
     value = value.replace(/\b(?:until|through|since)\s+[a-z]+\s+[0-9]{1,2}\b/gi, ' ');
     value = value.replace(/\byear\s+to\s+date\b/gi, ' ');
     value = value.replace(/\b(?:by|per|group(?:ed)?(?:\s+by)?|split(?:\s+by)?)\s+[a-z0-9 _/-]+\b/gi, ' ');
-    value = value.replace(/\b(how|many|much|number|numbers|count|counts|summarize|summary|show|list|give|pull|find|tell|me|about|of|the|a|an|and|or|with|without|in|from|amount|quantity|qty|volume|total|totals|for|to|them|their|we|our|us|right|now|by|what|which|were|was|is|are|has|have|had|been|did|do|does|get|report|reports|all|break\s+down|breakdown|activity|activities|transactions?|movement|movements?|chemicals?|chemical|products?|product|inventory|invoices?|invoice|invoiced|invoicing|billed|billing|revenue|charged|usage|monthly|month|current|jobs?|work\s+orders?|blends?|blended|blending|planned|sent|shipped|shipment|shipments|delivered|created|increased?|decreased?|positive|negative|open|closed|completed|reviewed|this)\b/gi, ' ');
+    value = value.replace(/\b(how|many|much|number|numbers|count|counts|summarize|summary|show|list|give|pull|find|tell|me|about|of|the|a|an|and|or|with|without|in|from|over|amount|quantity|qty|volume|total|totals|for|to|them|their|we|our|us|right|now|by|what|which|were|was|is|are|has|have|had|been|did|do|does|get|report|reports|all|break\s+down|breakdown|activity|activities|transactions?|movement|movements?|chemicals?|chemical|products?|product|inventory|invoices?|invoice|invoiced|invoicing|billed|billing|revenue|charged|usage|monthly|month|current|jobs?|work\s+orders?|blends?|blended|blending|planned|sent|shipped|shipment|shipments|delivered|created|increased?|decreased?|positive|negative|open|closed|completed|reviewed|this)\b/gi, ' ');
     var filterTerms = new Set();
     buildAssistantAppDataFilterCandidates(intent).forEach(function (filterField) {
         (filterField.terms || []).forEach(function (term) { return filterTerms.add(normalizeOptionalString(term).toLowerCase()); });
@@ -10167,7 +10167,15 @@ function buildAssistantFieldFilterCondition(value, operator, type) {
     if (type === 'boolean') {
         return coerced;
     }
-    var escaped = escapeRegexValue(String(coerced));
+    var rawString = String(coerced);
+    var escaped = normalizedOperator === 'contains'
+        ? rawString
+            .split(/[^a-z0-9%&]+/i)
+            .map(function (token) { return normalizeOptionalString(token); })
+            .filter(function (token) { return token.length > 1 || /[0-9%&]/.test(token); })
+            .map(function (token) { return escapeRegexValue(token); })
+            .join('.*')
+        : escapeRegexValue(rawString);
     if (!escaped) {
         return undefined;
     }
@@ -10182,15 +10190,36 @@ function normalizeAssistantFieldAwareFilterValue(value, candidate) {
     ], __read((candidate.terms || [])), false), __read((candidate.fields || [])), false).map(function (term) { return cleanAssistantRequestedDimensionText(term); })
         .filter(Boolean);
     var isDivisionCandidate = candidateTerms.some(function (term) { return term === 'division' || term === 'divisions' || term.endsWith(' division'); });
-    if (!isDivisionCandidate) {
+    var isPersonCandidate = candidateTerms.some(function (term) { return [
+        'driver',
+        'drivers',
+        'user',
+        'users',
+        'employee',
+        'employees',
+        'person',
+        'people',
+        'name',
+        'id user',
+        'id_user'
+    ].includes(term); });
+    if (!isDivisionCandidate && !isPersonCandidate) {
         return value;
     }
     var text = normalizeOptionalString(value);
     if (!text) {
         return value;
     }
-    var normalized = normalizeOptionalString(text
-        .replace(/\bdivision(?:s)?\b/gi, ' ')
+    var normalizedText = text;
+    if (isDivisionCandidate) {
+        normalizedText = normalizedText.replace(/\bdivision(?:s)?\b/gi, ' ');
+    }
+    if (isPersonCandidate) {
+        normalizedText = normalizedText
+            .replace(/\b([a-z][a-z0-9.'-]*)'s\b/gi, '$1')
+            .replace(/\b(?:ats|pay|pays|settlement|settlements|driver|drivers|user|users|employee|employees|over)\b/gi, ' ');
+    }
+    var normalized = normalizeOptionalString(normalizedText
         .replace(/\s+/g, ' '));
     return normalized || value;
 }