@dataloop-ai/components 0.18.78 → 0.18.79

package/package.json

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

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

@@ -11,6 +11,7 @@
                 ref="smartSearchInput"
                 v-model="queryObject"
                 style="margin-bottom: 0px"
+                :width="width"
                 :status="status"
                 :aliases="aliases"
                 :schema="schema"
@@ -33,7 +34,7 @@
                                 height: '28px'
                             }"
                             :disabled="disabled"
-                            @click="emitSearchQuery"
+                            @click="$emit('search-query', queryObject)"
                         />
                     </div>
                     <div
@@ -138,6 +139,7 @@ export default defineComponent({
         //#endregion
 
         //#region data
+        // todo: more cleanup
         const inputModel = ref('')
         const jsonEditorModel = ref(false)
         const showJSONEditor = ref(false)

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

@@ -901,13 +901,12 @@ export default defineComponent({
 
     &__search-label {
         font-size: 10px;
-        height: 10px;
+        height: 15px;
         color: gray;
         position: absolute;
         word-break: break-all;
-        bottom: -10px;
+        bottom: -15px;
         max-width: 100%;
-        margin-top: 3px;
     }
 
     &__date-picker-wrapper {

package/src/demos/SmartSearchDemo/DlSmartSearchDemo.vue

@@ -26,7 +26,7 @@
         <dl-smart-search
             v-model="queryObject"
             :aliases="aliases"
-            :schema="schema"
+            :schema="schema2"
             :color-schema="colorSchema"
             :filters="filters"
             :disabled="switchState"
@@ -48,7 +48,7 @@
         <dl-smart-search-input
             v-model="queryObject2"
             :aliases="aliases"
-            :schema="schema"
+            :schema="schema2"
             :color-schema="colorSchema"
             :strict="strictState"
             :disabled="switchState"

package/src/hooks/use-suggestions.ts

@@ -383,6 +383,7 @@ const isValidByDataType = (
      */
 
     if (Array.isArray(dataType)) {
+        str = str.replace(/\'/g, '')
         let isOneOf = !!getValueMatch(dataType, str)
         for (const type of dataType) {
             isOneOf = isOneOf || isValidByDataType(str, type, operator)

package/src/utils/parse-smart-query.ts

@@ -209,6 +209,18 @@ export const stringifySmartQuery = (query: { [key: string]: any }): string => {
             continue
         }
 
+        if (key === '$and') {
+            if (Array.isArray(value)) {
+                const andObject: { [key: string]: any } = {}
+                for (const subQuery of value) {
+                    for (const subKey in subQuery) {
+                        andObject[subKey] = subQuery[subKey]
+                    }
+                }
+                return stringifySmartQuery(andObject)
+            }
+        }
+
         if (result.length) {
             result += ' AND '
         }