@dataloop-ai/components 0.19.106 → 0.19.107

package/package.json

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

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

@@ -124,7 +124,9 @@ import {
     replaceJSDatesWithStringifiedDates,
     replaceStringifiedDatesWithJSDates,
     setAliases,
-    revertAliases
+    revertAliases,
+    setValueAliases,
+    revertValueAliases
 } from '../utils'
 import { v4 } from 'uuid'
 import {
@@ -569,7 +571,9 @@ export default defineComponent({
             const replacedDate = replaceStringifiedDatesWithJSDates(value)
             const json = parseSmartQuery(replacedDate ?? searchQuery.value)
 
-            return isValidJSON(json) ? json : searchQuery.value
+            return isValidJSON(json)
+                ? revertValueAliases(json, schema.value)
+                : searchQuery.value
         }
 
         const fromJSON = (value: { [key: string]: any }) => {
@@ -579,7 +583,9 @@ export default defineComponent({
                     dateKeys.value
                 )
 
-                const stringQuery = stringifySmartQuery(replacedDate)
+                const stringQuery = stringifySmartQuery(
+                    setValueAliases(replacedDate, schema.value)
+                )
                 const aliased = setAliases(stringQuery, aliases.value)
                 return aliased
             } catch (e) {

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

@@ -5,6 +5,7 @@ import { ColorSchema, SyntaxColorSchema, Filters } from '../types'
 import {
     operators,
     Alias,
+    Data,
     datePattern,
     datePatternNoBrackets,
     removeBrackets
@@ -187,6 +188,62 @@ export function setAliases(str: string, aliases: Alias[]) {
     return str.replace(regex, replacement)
 }
 
+function valueAliases(schema: Data, field: string) {
+    let aliases: Data = {}
+    const type: any = schema[field]
+    if (Array.isArray(type)) {
+        for (const element of type) {
+            if (typeof element === 'object')
+                aliases = Object.assign(aliases, element)
+        }
+    } else {
+        if (typeof type === 'object') aliases = Object.assign(aliases, type)
+    }
+    return aliases
+}
+
+export function revertValueAliases(json: Data, schema: Data) {
+    const clone = cloneDeep(json)
+    const replaceAliases = (where: Data) => {
+        for (const key in where) {
+            if (typeof where[key] === 'object') {
+                replaceAliases(where[key])
+            } else {
+                const aliases = valueAliases(schema, key)
+                const value = aliases[where[key] as string]
+                if (value) {
+                    where[key] = value
+                }
+            }
+        }
+    }
+
+    replaceAliases(clone)
+    return clone
+}
+
+export function setValueAliases(json: Data, schema: Data) {
+    const clone = cloneDeep(json)
+    const replaceValues = (where: Data) => {
+        for (const key in where) {
+            if (typeof where[key] === 'object') {
+                replaceValues(where[key])
+            } else {
+                const aliases = valueAliases(schema, key)
+                for (const alias in aliases) {
+                    if (where[key] === aliases[alias]) {
+                        where[key] = alias
+                        break
+                    }
+                }
+            }
+        }
+    }
+
+    replaceValues(clone)
+    return clone
+}
+
 export function createColorSchema(
     colorSchema: ColorSchema,
     aliases: Alias[]

package/src/demos/SmartSearchDemo/DlSmartSearchDemo.vue

@@ -140,6 +140,13 @@ export default defineComponent({
             test2: ['true', 'false']
         }
         const schema2: any = {
+            value: [
+                'string',
+                {
+                    John: 'AB34',
+                    Connor: '42'
+                }
+            ],
             type: [
                 'class',
                 'point',

package/src/hooks/use-suggestions.ts

@@ -3,12 +3,16 @@ import { splitByQuotes } from '../utils/splitByQuotes'
 import { flatten } from 'flat'
 import { isObject } from 'lodash'
 
+export type Data = {
+    [key: string]: any
+}
+
 export type Schema = {
     [key: string]:
         | string
         | number
         | boolean
-        | (number | boolean | string)[]
+        | (number | boolean | string | Data)[]
         | Schema
 }
 
@@ -245,8 +249,10 @@ export const useSuggestions = (
 
             if (Array.isArray(dataType)) {
                 localSuggestions = dataType.filter(
-                    (type) => !knownDataTypes.includes(type)
-                )
+                    (type) =>
+                        typeof type === 'string' &&
+                        !knownDataTypes.includes(type)
+                ) as string[]
 
                 if (!value) continue
 
@@ -402,7 +408,7 @@ const getError = (
 
 const isValidByDataType = (
     str: string | string[],
-    dataType: string | string[],
+    dataType: string | (string | Data)[],
     operator: string
 ): boolean => {
     if (dataType === 'any') {
@@ -423,9 +429,16 @@ const isValidByDataType = (
      */
 
     if (Array.isArray(dataType)) {
-        let isOneOf = !!getValueMatch(dataType, str)
+        let isOneOf = !!getValueMatch(
+            dataType.filter((type) => typeof type !== 'object') as string[],
+            str
+        )
         for (const type of dataType) {
-            isOneOf = isOneOf || isValidByDataType(str, type, operator)
+            if (typeof type === 'object') {
+                isOneOf = isOneOf || !!getValueMatch(Object.keys(type), str)
+            } else {
+                isOneOf = isOneOf || isValidByDataType(str, type, operator)
+            }
         }
         return isOneOf
     }
@@ -507,7 +520,7 @@ const getDataType = (
     schema: Schema,
     aliases: Alias[],
     key: string
-): string | string[] | null => {
+): string | (string | Data)[] | null => {
     const aliasedKey = getAliasObjByAlias(aliases, key)?.key ?? key
 
     const nestedKey = aliasedKey.split('.').filter((el) => el)
@@ -529,7 +542,7 @@ const getDataType = (
         return 'object'
     }
 
-    return value as unknown as string | string[] | null
+    return value as unknown as string | (string | Data)[] | null
 }
 
 const getAliasObjByAlias = (aliases: Alias[], alias: string): Alias | null => {
@@ -666,13 +679,22 @@ export const removeLeadingExpression = (str: string) => {
     return str.match(/\s+(.*)$/)?.[1] || ''
 }
 
-const getValueSuggestions = (dataType: string | string[], operator: string) => {
-    const types: string[] = Array.isArray(dataType) ? dataType : [dataType]
+const getValueSuggestions = (
+    dataType: string | (string | Data)[],
+    operator: string
+) => {
+    const types: (string | Data)[] = Array.isArray(dataType)
+        ? dataType
+        : [dataType]
     const suggestion: string[] = []
 
     if (Array.isArray(dataType)) {
         suggestion.push(
-            ...dataType.filter((type) => !knownDataTypes.includes(type))
+            ...(dataType.filter(
+                (type) =>
+                    !knownDataTypes.includes(type as string) &&
+                    typeof type !== 'object'
+            ) as string[])
         )
     }
 
@@ -688,7 +710,10 @@ const getValueSuggestions = (dataType: string | string[], operator: string) => {
             case 'datetime':
                 suggestion.push(dateSuggestionPattern)
             default:
-                // do nothing
+                if (typeof type === 'object') {
+                    // value aliases: key is the alias, value is the actual value
+                    for (const key in type) suggestion.push(key)
+                }
                 break
         }
     }