@dataloop-ai/components 0.18.140 → 0.18.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.18.140",
+  "version": "0.18.142",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/compound/DlJsonEditor/DlJsonEditor.vue

@@ -57,7 +57,7 @@ export default defineComponent({
             default: Mode.text
         }
     },
-    emits: ['update:model-value', 'align-text', 'change'],
+    emits: ['update:model-value', 'align-text', 'change', 'focus', 'blur'],
     setup(props, { emit }) {
         const { modelValue, indentation, readonly, mode } = toRefs(props)
 
@@ -128,7 +128,13 @@ export default defineComponent({
                 readOnly: readonly.value || mode.value === Mode.tree,
                 mainMenuBar: false,
                 navigationBar: false,
-                statusBar: false
+                statusBar: false,
+                onFocus: () => {
+                    emit('focus')
+                },
+                onBlur: () => {
+                    emit('blur')
+                }
             }
 
             // There is type instantiation issue with JSONEditor,

package/src/components/compound/DlSearches/DlSmartSearch/utils/index.ts

@@ -38,7 +38,11 @@ export const isEndingWithDateIntervalPattern = (str: string) => {
 
 export const replaceDateInterval = (str: string, date: DateInterval) => {
     const newStr = `${formatDate(date.from)}`
-    const replaced = replaceLastOccurrence(str, newStr, datePatternNoBrackets)
+    const replaced = replaceFirstOrLastOccurrence(
+        str,
+        newStr,
+        datePatternNoBrackets
+    )
     return replaced
 }
 
@@ -46,16 +50,39 @@ const formatDate = (date: Date | string | number): string => {
     return moment.utc(date).format('DD/MM/YYYY')
 }
 
-const replaceLastOccurrence = (
+const replaceFirstOrLastOccurrence = (
     string: string,
     replaceValue: string,
     pattern: RegExp
 ) => {
-    const matches = string.match(pattern)
+    const regex = RegExp(pattern, 'g')
 
-    return matches && matches.length
-        ? string.replace(matches[matches.length - 1], replaceValue)
-        : string
+    let firstMatch
+    let lastMatch
+    let match
+
+    while ((match = regex.exec(string))) {
+        if (match[0] === 'dd/mm/yyyy' && !firstMatch) {
+            firstMatch = match
+        }
+        lastMatch = match
+    }
+
+    if (firstMatch) {
+        const modifiedString =
+            string.slice(0, firstMatch.index) +
+            string.slice(firstMatch.index).replace(firstMatch[0], replaceValue)
+
+        return modifiedString
+    } else if (lastMatch) {
+        const modifiedString =
+            string.slice(0, lastMatch.index) +
+            string.slice(lastMatch.index).replace(lastMatch[0], replaceValue)
+
+        return modifiedString
+    }
+
+    return string
 }
 
 export function getTabItems(filters: Filters) {

package/src/demos/DlJsonEditorDemo.vue

@@ -27,9 +27,20 @@
                 v-model="jsonModel"
                 :readonly="readonly"
                 :mode="mode"
+                @change="onChange"
+                @focus="onFocus"
+                @blur="onBlur"
             />
         </div>
         <span>JSON: {{ jsonModel }}</span>
+        <div>
+            <div>changes</div>
+            {{ changes }}
+        </div>
+        <div>
+            <div>events</div>
+            {{ events }}
+        </div>
 
         <dl-button @click="dialogState = !dialogState">
             JsonEditor
@@ -82,6 +93,19 @@ export default defineComponent({
         const jsonEditorEl = ref(null)
         const readonly = ref(false)
         const mode = ref(DlJsonEditorModes.text)
+        const changes = ref<any[]>([])
+        const events = ref<string[]>([])
+
+        const onChange = (change: any) => {
+            changes.value.push(change)
+        }
+
+        const onFocus = () => {
+            events.value.push('focus')
+        }
+        const onBlur = () => {
+            events.value.push('blur')
+        }
 
         return {
             jsonModel,
@@ -89,7 +113,12 @@ export default defineComponent({
             dialogJsonModel,
             jsonEditorEl,
             readonly,
-            mode
+            mode,
+            changes,
+            events,
+            onChange,
+            onFocus,
+            onBlur
         }
     }
 })

package/src/hooks/use-suggestions.ts

@@ -447,11 +447,16 @@ const getOperatorByDataType = (dataType: string) => {
         return []
     }
 
-    const operators = Object.keys(operatorToDataTypeMap).filter((key) => {
+    let operators = Object.keys(operatorToDataTypeMap).filter((key) => {
         const value = operatorToDataTypeMap[key]
         return value.length === 0 || value.includes(dataType)
     })
 
+    if (dataType === 'date' || dataType === 'datetime') {
+        const toExclude = ['$in', '$nin']
+        operators = operators.filter((s) => !toExclude.includes(s))
+    }
+
     return operators
 }