@dataloop-ai/components 0.20.160-ds-v3.0 → 0.20.161

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.20.160-ds-v3.0",
+  "version": "0.20.161",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",
@@ -23,7 +23,7 @@
     "check-only": "if grep -E -H -r --exclude-dir=.git --exclude-dir=node_modules --exclude=*.json --exclude=*.yml '^(describe|it).only' .; then echo 'Found only in test files' && exit 1; fi"
   },
   "dependencies": {
-    "@dataloop-ai/icons": "^3.1.30",
+    "@dataloop-ai/icons": "^3.1.33",
     "@types/flat": "^5.0.2",
     "@types/lodash": "^4.14.184",
     "@types/sortablejs": "^1.15.7",

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

@@ -8,7 +8,7 @@
         >
             <template #header>
                 <dl-dialog-box-header
-                    title="DQL Editor"
+                    title="DQL Search"
                     :close-button="true"
                     @onClose="isOpen = false"
                 />
@@ -21,93 +21,31 @@
                     >
                         <dl-select
                             :model-value="selectedOption"
-                            ref="jsonQueryMenu"
                             width="300px"
                             :options="selectOptions"
                             placeholder="New Query"
-                            searchable
-                            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 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">
-                                    {{ noOptionsLabel }}
-                                </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"
@@ -127,7 +65,7 @@
                         flat
                         color="secondary"
                         padding="0"
-                        @click="optionToDelete = selectedOption"
+                        @click="showDeleteDialog = true"
                     />
                     <div class="json-editor-footer-actions">
                         <dl-button
@@ -163,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>
@@ -190,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>
@@ -222,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'
@@ -237,12 +179,9 @@ export default defineComponent({
     components: {
         DlDialogBox,
         DlDialogBoxHeader,
-        DlIcon,
         DlJsonEditor,
         DlButton,
         DlSelect,
-        DlSeparator,
-        DlTooltip,
         DlTypography,
         DlInput
     },
@@ -275,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)
 
@@ -304,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)
 
@@ -334,12 +252,6 @@ export default defineComponent({
             }
         )
 
-        const noOptionsLabel = computed<string>(() => {
-            return selectOptions.value.length
-                ? 'No Results Found'
-                : 'No Saved Queries'
-        })
-
         watch(
             selectedFilter,
             () => {
@@ -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)
@@ -483,14 +390,11 @@ export default defineComponent({
             showSaveDialog,
             stringifiedJSON,
             selectedOption,
-            noOptionsLabel,
             hasActiveFilter,
             alignJSON,
-            copyJSON,
             onQuerySelect,
             newQueryName,
             alignDisabled,
-            optionToDelete,
             showDeleteDialog,
             selectOptions,
             search,
@@ -522,50 +426,10 @@ export default defineComponent({
 }
 
 .json-query-menu-option {
-    display: flex;
-    flex-direction: row;
-}
-.json-query-menu-option-label,
-.json-query-menu-selected {
-    line-height: 20px;
     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

@@ -145,6 +145,7 @@
                 </div>
             </div>
             <dl-menu
+                v-if="!noOptions || !hideEmptyMenu"
                 ref="menu"
                 v-model="isExpanded"
                 fit-container
@@ -169,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="
@@ -513,13 +510,13 @@ export default defineComponent({
             type: String,
             default: null
         },
-        noOptionsPadding: {
-            type: String,
-            default: null
-        },
         keepFocusOnBlur: {
             type: Boolean,
             default: false
+        },
+        hideEmptyMenu: {
+            type: Boolean,
+            default: false
         }
     },
     emits: [

package/src/components/compound/DlTreeTable/views/DlTrTreeView.vue

@@ -36,7 +36,8 @@
                     {{ childDisabledCheckboxTooltip }}
                 </dl-tooltip>
                 <DlCheckbox
-                    v-if="!isCheckboxDisabled && row.isSelectable"
+                    v-if="!row.hideCheckbox"
+                    :disabled="isCheckboxDisabled || !row.isSelectable"
                     :color="color"
                     :model-value="modelValue"
                     :indeterminate-value="true"