@dataloop-ai/components 0.19.132 → 0.19.134

package/package.json

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

package/src/components/compound/DlSearches/DlSmartSearch/components/DlSmartSearchInput.vue

@@ -281,6 +281,11 @@ export default defineComponent({
 
             showSuggestions.value = false
 
+            // to handle typing . after accepting a suggestion
+            if (/\s+\.$/.test(value)) {
+                value = value.replace(/\s+\.$/, '.')
+            }
+
             // to handle date suggestion modal to open automatically.
             if (value.includes('(dd/mm/yyyy)')) {
                 value = value.trimEnd()
@@ -316,6 +321,7 @@ export default defineComponent({
             }
 
             updateEditor(input.value, editorStyle.value)
+            setSelectionOffset(input.value, caretAt.value, caretAt.value)
             setMenuOffset(isEligibleToChange(input.value, expanded.value))
 
             if (!expanded.value) {
@@ -346,7 +352,8 @@ export default defineComponent({
             }
         }
 
-        const setInputFromSuggestion = (value: string) => {
+        const setInputFromSuggestion = (suggestion: any) => {
+            const value = '' + suggestion
             let stringValue = ''
             let caretPosition = 0
             if (searchQuery.value.length) {
@@ -364,7 +371,12 @@ export default defineComponent({
                     queryRightSide = leftover + queryRightSide
                 } else if (value.startsWith('.')) {
                     // dot notation case
-                    queryLeftSide = queryLeftSide.trimEnd().replace(/\.$/, '')
+                    const words = queryLeftSide.trimEnd().split('.')
+                    const lastWord = words.pop()
+                    if (!value.startsWith('.' + lastWord)) {
+                        words.push(lastWord)
+                    }
+                    queryLeftSide = words.join('.')
                 } else if (queryLeftSide.endsWith(' ')) {
                     // caret after space: only replace multiple spaces on the left
                     queryLeftSide = queryLeftSide.trimEnd() + ' '
@@ -546,7 +558,11 @@ export default defineComponent({
 
         const onInput = (e: Event) => {
             const text = (e.target as HTMLElement).textContent
-            debouncedSetInputValue(text)
+            if (text.endsWith('.')) {
+                setInputValue(text)
+            } else {
+                debouncedSetInputValue(text)
+            }
         }
 
         const onDateSelection = (value: DateInterval) => {

package/src/components/compound/DlSearches/DlSmartSearch/components/SuggestionsDropdown.vue

@@ -28,7 +28,7 @@
                     :highlighted="suggestionIndex === highlightedIndex"
                     @click="handleOption(item)"
                 >
-                    {{ item }}
+                    {{ removeQuotes(item) }}
                 </dl-list-item>
             </dl-list>
         </dl-menu>
@@ -115,11 +115,18 @@ export default defineComponent({
             emit('update:model-value', false)
         }
 
+        const removeQuotes = (item: any) => {
+            const str = '' + item
+            const match = str.match(/^'(.*)'$/)
+            return match ? match[1] : str
+        }
+
         return {
             defaultTarget,
             setHighlightedIndex,
             handleSelectedItem,
             highlightedIndex,
+            removeQuotes,
             onShow,
             onHide,
             emitModelValue,

package/src/demos/SmartSearchDemo/DlSmartSearchDemo.vue

@@ -136,6 +136,7 @@ export default defineComponent({
                 '*': 'any'
             },
             type: ['dir', 'file'],
+            test0: ['why wont', 'this work', 123],
             test1: ['5', '6', 'number'],
             test2: ['true', 'false']
         }

package/src/hooks/use-suggestions.ts

@@ -178,7 +178,7 @@ export const useSuggestions = (
 
             if (!field) continue
 
-            const fieldSeparated: any = field.split('.')
+            const fieldSeparated: string[] = field.split('.')
 
             if (fieldSeparated.length > 1) {
                 localSuggestions = []
@@ -229,21 +229,35 @@ export const useSuggestions = (
             localSuggestions = getOperators(ops)
 
             if (!operator) {
-                const dotSeparated = matchedField.split('.').filter((el) => el)
+                const dotSeparated = matchedField.split('.')
+                const lastWord = dotSeparated.pop()
                 let fieldOf = schemaValue
                 for (const key of dotSeparated) {
                     fieldOf = fieldOf[key] as Schema
                 }
 
-                if (isObject(fieldOf) && !Array.isArray(fieldOf)) {
-                    const toConcat: string[] = []
-                    for (const key of Object.keys(fieldOf)) {
+                const toAdd: string[] = []
+
+                if (fieldOf[lastWord]) {
+                    fieldOf = fieldOf[lastWord] as Schema
+
+                    if (isObject(fieldOf) && !Array.isArray(fieldOf)) {
+                        for (const key of Object.keys(fieldOf)) {
+                            if (key === '*') continue
+                            toAdd.push(`.${key}`)
+                        }
+                    }
+                } else {
+                    for (const key in fieldOf) {
                         if (key === '*') continue
-                        toConcat.push(`.${key}`)
+                        if (key.startsWith(lastWord)) {
+                            toAdd.push(`.${key}`)
+                        }
                     }
-                    localSuggestions = localSuggestions.concat(toConcat)
                 }
 
+                localSuggestions = toAdd.concat(localSuggestions)
+
                 continue
             }
 
@@ -260,11 +274,15 @@ export const useSuggestions = (
             }
 
             if (Array.isArray(dataType)) {
-                localSuggestions = dataType.filter(
-                    (type) =>
-                        typeof type === 'string' &&
-                        !knownDataTypes.includes(type)
-                ) as string[]
+                localSuggestions = dataType
+                    .filter(
+                        (type) =>
+                            !knownDataTypes.includes(type as string) &&
+                            typeof type !== 'object'
+                    )
+                    .map((type) =>
+                        typeof type === 'string' ? `'${type}'` : type
+                    ) as string[]
 
                 if (!value) continue
 
@@ -704,7 +722,7 @@ const getValueSuggestions = (
                 !knownDataTypes.includes(type as string) &&
                 typeof type !== 'object'
             ) {
-                suggestion.push(type)
+                suggestion.push(typeof type === 'string' ? `'${type}'` : type)
             }
         }
     }