@dataloop-ai/components 0.20.186-ds-v3.0 → 0.20.186

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

@@ -1,6 +1,12 @@
 <template>
-    <div class="dl-smart-search" :style="cssVars">
-        <div ref="inputWrapper" class="dl-smart-search__input-wrapper">
+    <div
+        class="dl-smart-search"
+        :style="cssVars"
+    >
+        <div
+            ref="inputWrapper"
+            class="dl-smart-search__input-wrapper"
+        >
             <dl-smart-search-input
                 ref="smartSearchInput"
                 v-model="queryObject"
@@ -12,7 +18,6 @@
                 :color-schema="colorSchema"
                 :strict="strict"
                 :placeholder="placeholder"
-                :disabled="disabled"
                 @focus="isFocused = true"
                 @blur="isFocused = false"
                 @search="emitSearchQuery"

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

@@ -12,7 +12,11 @@
                         :icon="
                             focused ? defaultIcon : statusIcon || defaultIcon
                         "
-                        :color="iconColor"
+                        :color="
+                            focused
+                                ? defaultIconColor
+                                : statusIconColor || defaultIconColor
+                        "
                         size="16px"
                         :inline="false"
                     />
@@ -49,7 +53,7 @@
                     </div>
                 </div>
                 <dl-tooltip
-                    v-if="!focused && !noTooltip"
+                    v-if="!focused"
                     border="1px solid var(--dl-color-separator)"
                     background-color="dl-color-panel-background"
                     color="dl-color-darker"
@@ -244,10 +248,6 @@ export default defineComponent({
             type: String,
             default: '28px'
         },
-        noTooltip: {
-            type: Boolean,
-            default: false
-        },
         omitSuggestions: {
             type: Array as PropType<string[]>,
             default: () => [] as string[]
@@ -275,7 +275,6 @@ export default defineComponent({
         'blur',
         'input',
         'search',
-        'status',
         'error',
         'clear'
     ],
@@ -298,7 +297,6 @@ export default defineComponent({
             defaultIcon,
             defaultIconColor,
             schema,
-            noTooltip,
             omitSuggestions,
             operatorsOverride,
             height,
@@ -962,16 +960,6 @@ export default defineComponent({
             }
         })
 
-        const iconColor = computed(() => {
-            if (disabled.value) {
-                return 'dl-color-disabled'
-            }
-            if (focused.value) {
-                return defaultIconColor.value
-            }
-            return statusIconColor.value || defaultIconColor.value
-        })
-
         const textareaStyles = computed<Record<string, string | number>>(() => {
             const overflow: string =
                 scroll.value && focused.value ? 'scroll' : 'hidden'
@@ -1006,14 +994,9 @@ export default defineComponent({
         })
 
         const inputClass = computed<string>(() => {
-            let classes = 'dl-smart-search-input__textarea'
-            if (focused.value) {
-                classes += ' focus'
-            }
-            if (disabled.value) {
-                classes += ' dl-smart-search-input__textarea--disabled'
-            }
-            return classes
+            return `dl-smart-search-input__textarea${
+                focused.value ? ' focus' : ''
+            }`
         })
 
         const showClearButton = computed(() => {
@@ -1052,31 +1035,24 @@ export default defineComponent({
                 return status.value
             }
 
-            let newStatus: {
-                type: string
-                message: string
-            }
-
             if (!error.value && searchQuery.value !== '') {
-                newStatus = {
+                return {
                     type: 'success',
                     message: ''
                 }
-            } else if (error.value === 'warning') {
-                newStatus = {
+            }
+
+            if (error.value === 'warning') {
+                return {
                     type: 'warning',
                     message: 'The query is not supported technically.'
                 }
-            } else {
-                newStatus = {
-                    type: 'error',
-                    message: error.value
-                }
             }
 
-            emit('status', newStatus)
-
-            return newStatus
+            return {
+                type: 'error',
+                message: error.value
+            }
         })
 
         const inputPlaceholder = computed<string>(() => {
@@ -1197,7 +1173,6 @@ export default defineComponent({
             debouncedSetInputValue,
             statusIcon,
             statusIconColor,
-            iconColor,
             textareaStyles,
             searchBarClasses,
             inputClass,
@@ -1350,21 +1325,6 @@ export default defineComponent({
         }
     }
 
-    &__textarea--disabled {
-        &::before {
-            color: var(--dl-color-disabled);
-        }
-    }
-
-    &__search-bar--disabled {
-        .dl-smart-search-input__input,
-        .dl-smart-search-input__textarea {
-            &::before {
-                color: var(--dl-color-disabled);
-            }
-        }
-    }
-
     &__input-wrapper,
     &__textarea-wrapper {
         min-height: 28px;

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

@@ -4,116 +4,48 @@
             v-model="isOpen"
             :height="500"
             :width="800"
-            style="--dl-dialog-box-footer-padding: 10px 16px; --dl-dialog-box-content-padding: 0"
+            style="--dl-dialog-box-footer-padding: 10px 16px"
         >
             <template #header>
                 <dl-dialog-box-header
-                    title="DQL Editor"
+                    title="DQL Search"
                     :close-button="true"
                     @onClose="isOpen = false"
                 />
             </template>
             <template #body>
                 <div class="json-editor-layout">
-                    <div class="json-query-menu">
+                    <div
+                        class="json-query-menu"
+                        style="margin-bottom: 10px"
+                    >
                         <dl-select
                             :model-value="selectedOption"
-                            ref="jsonQueryMenu"
                             width="300px"
                             :options="selectOptions"
                             placeholder="New Query"
-                            searchable
-                            size="m"
-                            after-options-padding="0"
-                            no-options-padding="0"
-                            menu-style="overflow-y: hidden;"
                             @update:model-value="onQuerySelect"
                         >
                             <template #selected="scope">
-                                <span class="json-query-menu-selected">
+                                <span class="json-query-menu-option">
                                     {{ scope.opt ? scope.opt.label : '' }}
                                 </span>
                             </template>
                             <template #option="scope">
-                                <div
-                                    v-if="selectOptions.length < 2"
-                                    class="json-query-menu-no-option"
-                                    disabled
-                                    style="cursor: default !important; padding: 14px 0 10px 0;"
-                                >
-                                    No Saved Queries
-                                </div>
-                                <div v-else class="json-query-menu-option">
-                                    <div class="json-query-menu-option-label">
-                                        {{ scope.opt.label }}
-                                    </div>
-                                    <dl-icon
-                                        v-if="scope.opt.label !== 'New Query'"
-                                        icon="icon-dl-delete"
-                                        color="dl-color-negative"
-                                        class="json-query-menu-option-delete"
-                                        @click.stop="onDelete(scope.opt)"
-                                    >
-                                        <dl-tooltip>Delete</dl-tooltip>
-                                    </dl-icon>
-                                </div>
-                            </template>
-                            <template #after-options>
-                                <dl-separator
-                                    style="margin: 0 0 2px 0 !important"
-                                    type="horizontal"
-                                />
-                                <dl-button
-                                    icon="icon-dl-save"
-                                    flat
-                                    fluid
-                                    secondary
-                                    size="s"
-                                    label="Save Query"
-                                    class="json-query-menu-save-button"
-                                    @click="onSave"
-                                />
-                            </template>
-                            <template #no-options>
-                                <div class="json-query-menu-no-option">
-                                    No Results Found
-                                </div>
-                                <dl-separator
-                                    style="margin: 0 0 2px 0 !important"
-                                    type="horizontal"
-                                />
-                                <dl-button
-                                    icon="icon-dl-save"
-                                    flat
-                                    fluid
-                                    secondary
-                                    size="s"
-                                    label="Save Query"
-                                    class="json-query-menu-save-button"
-                                    @click="onSave"
-                                />
+                                <span class="json-query-menu-option">
+                                    {{ scope.opt.label }}
+                                </span>
                             </template>
                         </dl-select>
-                        <div>
-                            <dl-button
-                                icon="icon-dl-align-left"
-                                tooltip="Align Left"
-                                flat
-                                color="secondary"
-                                padding="0px 3px"
-                                :disabled="alignDisabled"
-                                @click="alignJSON"
-                            />
-                            <dl-button
-                                icon="icon-dl-copy"
-                                tooltip="Copy"
-                                flat
-                                color="secondary"
-                                padding="0px 3px"
-                                :disabled="alignDisabled"
-                                @click="copyJSON"
-                            />
-                        </div>
+                        <dl-button
+                            icon="icon-dl-align-left"
+                            label="Align Left"
+                            flat
+                            color="secondary"
+                            padding="0px 3px"
+                            :disabled="alignDisabled"
+                            @click="alignJSON"
+                        />
                     </div>
                     <dl-json-editor
                         ref="jsonEditor"
@@ -133,7 +65,7 @@
                         flat
                         color="secondary"
                         padding="0"
-                        @click="optionToDelete = selectedOption"
+                        @click="showDeleteDialog = true"
                     />
                     <div class="json-editor-footer-actions">
                         <dl-button
@@ -169,20 +101,27 @@
             <template #body>
                 <dl-input
                     v-model="newQueryName"
-                    :red-asterisk="true"
-                    :required="true"
-                    title="Query Name"
-                    placeholder="Insert query name"
+                    title="Query name"
+                    style="text-align: center"
+                    placeholder="Type query name"
                 />
             </template>
             <template #footer>
                 <div class="dl-smart-search__buttons--save">
                     <dl-button
                         :disabled="!newQueryName"
+                        outlined
+                        style="margin-right: 5px"
                         @click="() => saveQuery(false)"
                     >
                         Save
                     </dl-button>
+                    <dl-button
+                        :disabled="!newQueryName"
+                        @click="() => saveQuery(true)"
+                    >
+                        Save and Search
+                    </dl-button>
                 </div>
             </template>
         </dl-dialog-box>
@@ -196,13 +135,12 @@
                 />
             </template>
             <template #body>
-                <dl-typography size="h5">
-                    Are you sure you want to permanently delete the following query?
-                    <br />
-                    {{ optionToDelete.label }}
-                    <br />
-                    <br />
-                    This action cannot be undone.
+                <dl-typography
+                    size="h3"
+                    style="display: flex; justify-content: center"
+                >
+                    Are you sure you want to delete
+                    {{ selectedOption.label }}?
                 </dl-typography>
             </template>
             <template #footer>
@@ -228,12 +166,10 @@ import {
 } from 'vue-demi'
 import { DlSelect } from '../../../DlSelect'
 import { DlSelectOption } from '../../../DlSelect/types'
-import { DlSeparator } from '../../../../essential/DlSeparator'
 import { DlButton } from '../../../../basic'
 import { DlDialogBox, DlDialogBoxHeader } from '../../../DlDialogBox'
 import { DlJsonEditor } from '../../../DlJsonEditor'
-import { DlTooltip } from '../../../../shared/DlTooltip'
-import { DlTypography, DlIcon } from '../../../../essential'
+import { DlTypography } from '../../../../essential'
 import { DlInput } from '../../../DlInput'
 import { stateManager } from '../../../../../StateManager'
 import { cloneDeep, isEqual, uniqBy } from 'lodash'
@@ -243,12 +179,9 @@ export default defineComponent({
     components: {
         DlDialogBox,
         DlDialogBoxHeader,
-        DlIcon,
         DlJsonEditor,
         DlButton,
         DlSelect,
-        DlSeparator,
-        DlTooltip,
         DlTypography,
         DlInput
     },
@@ -281,24 +214,11 @@ export default defineComponent({
         'update:modelValue',
         'search',
         'change',
-        'copied',
         'update:options',
         'save',
         'delete',
         'select'
     ],
-    methods: {
-        onDelete(option: DlSelectOption) {
-            const select = this.$refs['jsonQueryMenu'] as InstanceType<typeof DlSelect>
-            select?.closeMenu()
-            this.optionToDelete = option
-        },
-        onSave() {
-            const select = this.$refs['jsonQueryMenu'] as InstanceType<typeof DlSelect>
-            select?.closeMenu()
-            this.showSaveDialog = true
-        }
-    },
     setup(props, { emit }) {
         const { modelValue, options, json, selectedFilter } = toRefs(props)
 
@@ -310,15 +230,7 @@ export default defineComponent({
         const currentQuery = ref<{ [key: string]: any }>(cloneDeep(json.value))
         const jsonEditor = ref<any>(null)
         const showSaveDialog = ref(false)
-        const optionToDelete = ref<DlSelectOption>(null)
-        const showDeleteDialog = computed<boolean>({
-            get: () => !!optionToDelete.value,
-            set: (val) => {
-                if (!val) {
-                    optionToDelete.value = null
-                }
-            }
-        })
+        const showDeleteDialog = ref(false)
         const newQueryName = ref('')
         const alignDisabled = ref(false)
 
@@ -361,11 +273,6 @@ export default defineComponent({
             jsonEditor.value?.format()
         }
 
-        const copyJSON = async () => {
-            await navigator.clipboard.writeText(stringifiedJSON.value)
-            emit('copied')
-        }
-
         const onQuerySelect = (option: DlSelectOption) => {
             if (option.label === selectedOption.value.label) {
                 return
@@ -449,10 +356,10 @@ export default defineComponent({
 
         const deleteQuery = () => {
             const toDelete = options.value.find(
-                (o: DlSelectOption) => o.label === optionToDelete.value.label
+                (o: DlSelectOption) => o.label === selectedOption.value.label
             )
             const newOptions = options.value.filter(
-                (o: DlSelectOption) => o.label !== optionToDelete.value.label
+                (o: DlSelectOption) => o.label !== selectedOption.value.label
             )
 
             emit('delete', toDelete)
@@ -485,11 +392,9 @@ export default defineComponent({
             selectedOption,
             hasActiveFilter,
             alignJSON,
-            copyJSON,
             onQuerySelect,
             newQueryName,
             alignDisabled,
-            optionToDelete,
             showDeleteDialog,
             selectOptions,
             search,
@@ -502,76 +407,29 @@ export default defineComponent({
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .json-editor-layout {
     display: flex;
     flex-direction: column;
     height: 100%;
 }
 
-.json-editor-footer {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
+.json-editor-footer,
 .json-query-menu {
+    width: 100%;
     display: flex;
     align-items: center;
-    background-color: var(--dl-color-fill);
     justify-content: space-between;
-    padding: 6px 16px;
 }
 .json-editor {
-    height: calc(100% - 40px);
-    --jse-main-border: none;
+    height: 100%;
 }
 
 .json-query-menu-option {
-    display: flex;
-    flex-direction: row;
-}
-.json-query-menu-option-label,
-.json-query-menu-selected {
-    padding-top: 3px;
     white-space: nowrap;
     display: inline-block;
     width: 265px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.json-query-menu-option:hover .json-query-menu-option-label {
-    margin-right: 6px;
-    width: 255px;
-}
-.json-query-menu-option-delete {
-    overflow-x: hidden;
-    width: 0;
-}
-.json-query-menu-option:hover .json-query-menu-option-delete {
-    border-radius: 4px;
-    overflow-x: visible;
-    padding: 4px;
-    width: auto;
-}
-.json-query-menu-option-delete:hover {
-    background-color: var(--dl-color-fill-secondary);
-}
-.json-query-menu-option-delete:active {
-    background-color: var(--dl-color-negative-background);
-}
-.json-query-menu-no-option {
-    display: flex;
-    padding: 20px 0;
-    flex-direction: column;
-    align-items: center;
-    align-self: stretch;
-}
-.json-query-menu-save-button:hover {
-    background-color: var(--dl-color-fill-secondary);
-}
-.dl-smart-search__buttons--save {
-    text-align: right;
-    width: 100%;
-}
 </style>

package/src/components/compound/DlSelect/DlSelect.vue

@@ -170,17 +170,13 @@
                         <slot name="before-options" />
                     </dl-item-section>
                 </dl-list-item>
-                <dl-list-item
-                    v-if="noOptions"
-                    :style="computedNoOptionsStyle"
-                    :padding="noOptionsPadding"
-                >
+                <dl-list-item v-if="noOptions" :style="computedNoOptionsStyle">
                     <dl-item-section color="dl-color-medium">
                         <slot name="no-options"> No options </slot>
                     </dl-item-section>
                 </dl-list-item>
                 <dl-list
-                    v-else-if="showMenuList"
+                    v-if="showMenuList"
                     class="select-list"
                     :padding="false"
                     :style="
@@ -519,10 +515,6 @@ export default defineComponent({
             type: String,
             default: null
         },
-        noOptionsPadding: {
-            type: String,
-            default: null
-        },
         keepFocusOnBlur: {
             type: Boolean,
             default: false
@@ -1056,11 +1048,7 @@ export default defineComponent({
             return !!option?.readonly
         },
         isDisableRowOption(option: DlSelectOptionType) {
-            return (
-                typeof option === 'object' &&
-                option !== null &&
-                !!option.disableRow
-            )
+            return typeof option === 'object' && option !== null && !!option.disableRow
         },
         getOptionCount(option: any) {
             return option?.count ?? null

package/src/components/compound/DlSelect/components/DlSelectOption.vue

@@ -17,7 +17,7 @@
         <dl-list-item
             v-else
             class="option"
-            :class="{
+            :class="{ 
                 highlighted: highlightSelected && isSelected,
                 'disabled-row': disableRow
             }"
@@ -142,7 +142,10 @@ import { v4 } from 'uuid'
 import { debounce } from 'lodash'
 import { stateManager } from '../../../../StateManager'
 import { getCaseInsensitiveInput, getLabel } from '../utils'
-import { DlSelectOption, DlSelectOptionType } from '../../types'
+import {
+    DlSelectOption,
+    DlSelectOptionType
+} from '../../types'
 
 const ValueTypes = [Array, Boolean, String, Number, Object, Function]
 
@@ -403,11 +406,7 @@ export default defineComponent({
             return !!option?.readonly
         },
         isDisableRowOption(option: DlSelectOptionType) {
-            return (
-                typeof option === 'object' &&
-                option !== null &&
-                !!option.disableRow
-            )
+            return typeof option === 'object' && option !== null && !!option.disableRow
         }
     }
 })