@dataloop-ai/components 0.19.129 → 0.19.131

package/package.json

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

package/src/components/basic/DlButton/DlButton.vue

@@ -49,6 +49,7 @@
         <dl-tooltip
             v-if="tooltip || hasTooltipSlot"
             style="pointer-events: auto"
+            :trigger-percentage="tooltipTriggerPercentage"
         >
             <slot name="tooltip">
                 {{ tooltip }}
@@ -173,6 +174,13 @@ export default defineComponent({
          * The tooltip displayed when hovering over the button
          */
         tooltip: { type: String, default: null, required: false },
+        /**
+         * The percentage of the button's width that will trigger the tooltip
+         */
+        tooltipTriggerPercentage: {
+            type: Number,
+            default: 1
+        },
         /**
          * The button will maintain the styles it has when it's pressed if this prop is active
          */

package/src/demos/DlInputDemo.vue

@@ -1,5 +1,14 @@
 <template>
     <div>
+        <div style="padding-bottom: 10px">
+            <div>switch the disalbed prop: {{ disabledInput }}</div>
+            <dl-switch v-model="disabledInput" />
+            <dl-input
+                v-model="textVal"
+                placeholder="Test reactivity"
+                :disabled="disabledInput"
+            />
+        </div>
         <div>
             <input v-model="textVal">
             <div>This is to test v-model reactivity</div>
@@ -255,11 +264,12 @@
 <script lang="ts">
 import { v4 } from 'uuid'
 import { computed, defineComponent, ref } from 'vue-demi'
-import { DlInput, DlButton, DlIcon } from '../components'
+import { DlInput, DlButton, DlIcon, DlSwitch } from '../components'
 import { DlInputFile } from '../components/compound/DlInput/types'
 export default defineComponent({
     name: 'DlInputDemo',
     components: {
+        DlSwitch,
         DlInput,
         DlButton,
         DlIcon
@@ -298,6 +308,8 @@ export default defineComponent({
             files.value = val
         }
 
+        const disabledInput = ref<boolean>(false)
+
         const textVal = ref<string>('test me')
 
         const trimmedValue = ref('')
@@ -305,6 +317,7 @@ export default defineComponent({
         return {
             log: console.log,
             textVal,
+            disabledInput,
             trimmedValue,
             textInputValue,
             passFieldValue,

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

@@ -85,7 +85,7 @@ export const parseSmartQuery = (
             }
         }
 
-        const andQuery: { [key: string]: any } = {}
+        const andQuery: { [key: string]: any }[] = []
         let queryValue: any
 
         let key: string
@@ -106,42 +106,42 @@ export const parseSmartQuery = (
                     [key, value] = term.split('>=').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = { $gte: pureValue }
+                        andQuery.push({ [key]: { $gte: pureValue } })
                     }
                     break
                 case term.includes('<='):
                     [key, value] = term.split('<=').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = { $lte: pureValue }
+                        andQuery.push({ [key]: { $lte: pureValue } })
                     }
                     break
                 case term.includes('>'):
                     [key, value] = term.split('>').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = { $gt: pureValue }
+                        andQuery.push({ [key]: { $gt: pureValue } })
                     }
                     break
                 case term.includes('<'):
                     [key, value] = term.split('<').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = { $lt: pureValue }
+                        andQuery.push({ [key]: { $lt: pureValue } })
                     }
                     break
                 case term.includes('!='):
                     [key, value] = term.split('!=').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = { $ne: pureValue }
+                        andQuery.push({ [key]: { $ne: pureValue } })
                     }
                     break
                 case term.includes('='):
                     [key, value] = term.split('=').map((x) => x.trim())
                     pureValue = GeneratePureValue(value)
                     if (pureValue !== null) {
-                        andQuery[key] = pureValue
+                        andQuery.push({ [key]: pureValue })
                     }
                     break
                 case term.includes('IN'):
@@ -159,7 +159,7 @@ export const parseSmartQuery = (
 
                         pureValue = GeneratePureValue(queryValue)
                         if (pureValue !== null && Array.isArray(pureValue)) {
-                            andQuery[key] = { $nin: pureValue }
+                            andQuery.push({ [key]: { $nin: pureValue } })
                         }
                     } else {
                         queryValue = term
@@ -171,14 +171,24 @@ export const parseSmartQuery = (
 
                         pureValue = GeneratePureValue(queryValue)
                         if (pureValue !== null && Array.isArray(pureValue)) {
-                            andQuery[key] = { $in: pureValue }
+                            andQuery.push({ [key]: { $in: pureValue } })
                         }
                     }
                     break
             }
         }
 
-        orTerms.push(andQuery)
+        const simlifiedAndQuery: { [key: string]: any } = {}
+        for (const term of andQuery) {
+            const key = Object.keys(term)[0]
+            simlifiedAndQuery[key] = term[key]
+        }
+
+        orTerms.push(
+            andQuery.length > Object.keys(simlifiedAndQuery).length
+                ? { $and: andQuery }
+                : simlifiedAndQuery
+        )
     }
 
     const builtQuery = orTerms.length > 1 ? { $or: orTerms } : orTerms[0]
@@ -211,14 +221,13 @@ export const stringifySmartQuery = (query: { [key: string]: any }): string => {
 
         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)
+                const subQueries = value.map(
+                    (subQuery: { [key: string]: any }) =>
+                        stringifySmartQuery(subQuery)
+                )
+                result += subQueries.join(' AND ')
             }
+            continue
         }
 
         if (result.length) {