@dataloop-ai/components 0.20.178-alert.0 → 0.20.178-ds-v3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.20.178-alert.0",
+  "version": "0.20.178-ds-v3.1",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/basic/DlAlert/DlAlert.vue

@@ -1,76 +1,42 @@
 <template>
-    <div>
-        <div
-            v-if="show"
-            :id="uuid"
-            ref="rootRef"
-            class="root"
-            :style="rootStyle"
-            data-test="root"
-        >
-            <div>
-                <dl-icon
-                    data-test="icon"
-                    :style="iconStyle"
-                    :icon="icon"
-                    :color="iconColor"
-                    :size="iconSize"
-                />
-                <span class="text" :style="textStyle">
-                    <slot v-if="!text" />
-                    <span v-else>
-                        {{ text }}
-                    </span>
+    <div
+        v-if="show"
+        :id="uuid"
+        ref="rootRef"
+        class="root"
+        :style="rootStyle"
+        data-test="root"
+    >
+        <div>
+            <dl-icon
+                data-test="icon"
+                :style="iconStyle"
+                :icon="icon"
+                :color="iconColor"
+                :size="iconSize"
+            />
+            <span class="text" :style="textStyle">
+                <slot v-if="!text" />
+                <span v-else>
+                    {{ text }}
                 </span>
-            </div>
-            <div
-                v-if="closable"
-                class="close-button"
-                data-test="close-button"
-                :style="closeButtonStyle"
-            >
-                <dl-icon
-                    class="close-button-icon"
-                    data-test="close-button-icon"
-                    icon="icon-dl-close"
-                    color="dl-color-darker"
-                    size="16px"
-                    @click="handleClose"
-                />
-            </div>
+            </span>
         </div>
-        <dl-dialog-box
-            v-model="showConfirmDialog"
-            :width="400"
-            data-test="confirm-dialog"
+        <div
+            v-if="closable"
+            class="close-button"
+            data-test="close-button"
+            :style="closeButtonStyle"
         >
-            <template #header>
-                <dl-dialog-box-header
-                    :title="props.confirmCloseHeader"
-                    :close-button="false"
-                />
-            </template>
-            <template #body>
-                <p class="confirm-message">
-                    {{ props.confirmCloseMessage }}
-                </p>
-            </template>
-            <template #footer>
-                <dl-dialog-box-footer>
-                    <dl-button
-                        outlined
-                        label="Cancel"
-                        data-test="cancel-button"
-                        @click="handleCancelDismiss"
-                    />
-                    <dl-button
-                        label="Dismiss"
-                        data-test="dismiss-button"
-                        @click="handleConfirmDismiss"
-                    />
-                </dl-dialog-box-footer>
-            </template>
-        </dl-dialog-box>
+            <dl-icon
+                class="close-button-icon"
+                data-test="close-button-icon"
+                icon="icon-dl-close"
+                color="dl-color-darker"
+                size="16px"
+                @click="handleClose"
+            />
+        </div>
     </div>
 </template>
 
@@ -88,12 +54,6 @@ import {
 } from 'vue-demi'
 import { getColor, includes } from '../../../utils'
 import { DlIcon } from '../../essential'
-import { DlButton } from '../DlButton'
-import {
-    DlDialogBox,
-    DlDialogBoxHeader,
-    DlDialogBoxFooter
-} from '../../compound/DlDialogBox'
 import { DlAlertType } from './types'
 
 const typeToIconMap: Record<DlAlertType, string> = {
@@ -120,11 +80,7 @@ const typeToBackgroundMap: Record<DlAlertType, string> = {
 export default defineComponent({
     name: 'DlAlert',
     components: {
-        DlIcon,
-        DlButton,
-        DlDialogBox,
-        DlDialogBoxHeader,
-        DlDialogBoxFooter
+        DlIcon
     },
     model: {
         prop: 'modelValue',
@@ -164,21 +120,9 @@ export default defineComponent({
         padding: {
             type: String,
             default: null
-        },
-        confirmClose: {
-            type: Boolean,
-            default: false
-        },
-        confirmCloseHeader: {
-            type: String,
-            default: 'Are you sure?'
-        },
-        confirmCloseMessage: {
-            type: String,
-            default: ''
         }
     },
-    emits: ['update:model-value', 'dismiss'],
+    emits: ['update:model-value'],
     setup(props, { emit }) {
         const { padding, modelValue, type } = toRefs(props)
         const show = ref(modelValue.value)
@@ -194,7 +138,6 @@ export default defineComponent({
         const rootStyle = ref()
         const iconStyle = ref()
         const closeButtonStyle = ref()
-        const showConfirmDialog = ref(false)
 
         onMounted(() => {
             normalizeStyles(props.fluid)
@@ -223,12 +166,9 @@ export default defineComponent({
 
         function normalizeStyles(fluid?: boolean) {
             nextTick(() => {
-                const rootElement = (rootRef as Ref<HTMLElement | null>).value
-                if (!rootElement) {
-                    return
-                }
-
-                const { height } = rootElement.getBoundingClientRect()
+                const { height } = (
+                    rootRef as Ref<HTMLElement | null>
+                ).value!.getBoundingClientRect()
                 const iconS: Record<string, any> = {
                     display: 'flex'
                 }
@@ -259,28 +199,10 @@ export default defineComponent({
         }
 
         function handleClose() {
-            if (props.confirmClose) {
-                showConfirmDialog.value = true
-            } else {
-                closeAlert()
-            }
-        }
-
-        function closeAlert() {
             show.value = false
             emit('update:model-value', false)
         }
 
-        function handleConfirmDismiss() {
-            showConfirmDialog.value = false
-            closeAlert()
-            emit('dismiss')
-        }
-
-        function handleCancelDismiss() {
-            showConfirmDialog.value = false
-        }
-
         return {
             uuid: `dl-alert-${v4()}`,
             rootRef,
@@ -291,11 +213,7 @@ export default defineComponent({
             iconStyle,
             closeButtonStyle,
             textStyle,
-            showConfirmDialog,
-            props,
-            handleClose,
-            handleConfirmDismiss,
-            handleCancelDismiss
+            handleClose
         }
     },
     template: 'dl-alert'
@@ -339,11 +257,4 @@ export default defineComponent({
         cursor: pointer;
     }
 }
-
-.confirm-message {
-    margin: 0;
-    color: var(--dl-color-darker);
-    font-size: var(--dl-font-size-body);
-    line-height: 1.5;
-}
 </style>

package/src/components/compound/DlDateTime/DlDateTimeRange/DateTimeRangeContent.vue

@@ -0,0 +1,177 @@
+<template>
+    <div class="dl-date-time-range--card">
+        <div v-if="mode === 'multi'" class="dl-date-time-range--card_sidebar">
+            <card-sidebar
+                v-if="typeState === 'day'"
+                :options="sidebarDayOptions"
+                :current-option="currentSidebarOption"
+                @click="handleDayTypeOptionClick"
+            />
+            <card-sidebar
+                v-else
+                :options="sidebarMonthOptions"
+                :current-option="currentSidebarOption"
+                @click="handleMonthTypeOptionClick"
+            />
+        </div>
+        <div
+            class="dl-date-time-range--card_content"
+            :style="cardContentStyles"
+        >
+            <dl-date-picker
+                :model-value="dateInterval"
+                :type="typeState"
+                :available-range="availableRange"
+                :disabled="isInputDisabled"
+                :normalize-calendars="normalizeCalendars"
+                :active-date-from="activeDateFrom"
+                :active-date-to="activeDateTo"
+                @update:model-value="updateDateIntervalWithAutoClose"
+                @update:from-to-date="updateFromToDate"
+            />
+            <dl-time-picker
+                v-if="showTime && typeState === 'day'"
+                :disabled="isInputDisabled"
+                :model-value="dateInterval"
+                @update:model-value="updateDateInterval"
+            />
+
+            <dl-button
+                v-if="!hideClearButton"
+                size="s"
+                outlined
+                class="dl-date-time-range--button"
+                @click="handleClear"
+            >
+                <span style="text-transform: capitalize"> Clear </span>
+            </dl-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType } from 'vue-demi'
+import { DlTimePicker } from '../DlTimePicker'
+import { DateInterval } from '../types'
+import CardSidebar from './CardSidebar.vue'
+import { DayTypeOption, MonthTypeOption } from './types'
+import DlDatePicker from '../DlDatePicker/DlDatePicker.vue'
+import { CalendarDate } from '../DlDatePicker/models/CalendarDate'
+import { DlButton } from '../../../basic'
+
+export default defineComponent({
+    components: {
+        CardSidebar,
+        DlDatePicker,
+        DlTimePicker,
+        DlButton
+    },
+    props: {
+        mode: {
+            type: String as PropType<'single' | 'multi'>,
+            required: true
+        },
+        typeState: {
+            type: String as PropType<'day' | 'month'>,
+            required: true
+        },
+        sidebarDayOptions: {
+            type: Array as PropType<DayTypeOption[]>,
+            required: true
+        },
+        sidebarMonthOptions: {
+            type: Array as PropType<MonthTypeOption[]>,
+            required: true
+        },
+        currentSidebarOption: {
+            type: String,
+            required: true
+        },
+        dateInterval: {
+            type: Object as PropType<DateInterval | null>,
+            default: null
+        },
+        availableRange: {
+            type: Object as PropType<Partial<DateInterval> | null>,
+            default: null
+        },
+        isInputDisabled: {
+            type: Boolean,
+            default: false
+        },
+        normalizeCalendars: {
+            type: Boolean,
+            default: false
+        },
+        activeDateFrom: {
+            type: Object as PropType<CalendarDate | null>,
+            default: null
+        },
+        activeDateTo: {
+            type: Object as PropType<CalendarDate | null>,
+            default: null
+        },
+        showTime: {
+            type: Boolean,
+            default: false
+        },
+        cardContentStyles: {
+            type: Object as PropType<Record<string, any>>,
+            default: () => ({})
+        },
+        hideClearButton: {
+            type: Boolean,
+            default: false
+        }
+    },
+    emits: [
+        'day-type-option-click',
+        'month-type-option-click',
+        'update-date-interval',
+        'update-date-interval-with-auto-close',
+        'update-from-to-date',
+        'clear'
+    ],
+    methods: {
+        handleDayTypeOptionClick(option: DayTypeOption) {
+            this.$emit('day-type-option-click', option)
+        },
+        handleMonthTypeOptionClick(option: MonthTypeOption) {
+            this.$emit('month-type-option-click', option)
+        },
+        updateDateInterval(value: DateInterval | null) {
+            this.$emit('update-date-interval', value)
+        },
+        updateDateIntervalWithAutoClose(value: DateInterval) {
+            this.$emit('update-date-interval-with-auto-close', value)
+        },
+        updateFromToDate(value?: { from: CalendarDate; to: CalendarDate }) {
+            this.$emit('update-from-to-date', value)
+        },
+        handleClear() {
+            this.$emit('clear')
+        }
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.dl-date-time-range--card {
+    background-color: var(--dl-color-bg);
+    z-index: 1;
+    display: flex;
+    border-radius: 2px;
+}
+
+.dl-date-time-range--card_content {
+    width: var(--card-content-width);
+}
+
+.dl-date-time-range--button {
+    display: flex;
+    margin-left: auto;
+    width: fit-content;
+    margin-right: 16px;
+    margin-bottom: 16px;
+}
+</style>

package/src/components/compound/DlDateTime/DlDateTimeRange/DlDateTimeRange.vue

@@ -1,104 +1,71 @@
 <template>
     <div :id="uuid" class="dl-date-time-range">
-        <date-input
-            :text="dateInputText"
-            :input-style="dateInputStyle"
-            :disabled="disabled"
-            :width="width"
-        >
-            <dl-menu
-                ref="dateTimeRangeMenu"
-                anchor="bottom middle"
-                self="top middle"
-                :offset="[0, 5]"
+        <template v-if="isInputMode">
+            <date-input
+                :text="dateInputText"
+                :input-style="dateInputStyle"
                 :disabled="disabled"
+                :width="width"
             >
-                <div class="dl-date-time-range--card">
-                    <div
-                        v-if="mode === 'multi'"
-                        class="dl-date-time-range--card_sidebar"
-                    >
-                        <card-sidebar
-                            v-if="typeState === 'day'"
-                            :options="sidebarDayOptions"
-                            :current-option="currentSidebarOption"
-                            @click="handleDayTypeOptionClick"
-                        />
-                        <card-sidebar
-                            v-else
-                            :options="sidebarMonthOptions"
-                            :current-option="currentSidebarOption"
-                            @click="handleMonthTypeOptionClick"
-                        />
-                    </div>
-                    <div
-                        class="dl-date-time-range--card_content"
-                        :style="cardContentStyles"
-                    >
-                        <dl-date-picker
-                            :model-value="dateInterval"
-                            :type="typeState"
-                            :available-range="availableRange"
-                            :disabled="isInputDisabled"
-                            :normalize-calendars="normalizeCalendars"
-                            :active-date-from="activeDateFrom"
-                            :active-date-to="activeDateTo"
-                            @update:model-value="
-                                updateDateIntervalWithAutoClose
-                            "
-                            @update:from-to-date="updateFromToDate"
-                        />
-                        <dl-time-picker
-                            v-if="showTime && typeState === 'day'"
-                            :disabled="isInputDisabled"
-                            :model-value="dateInterval"
-                            @update:model-value="updateDateInterval"
-                        />
-
-                        <dl-button
-                            size="s"
-                            outlined
-                            class="dl-date-time-range--button"
-                            @click="handleClearAction"
-                        >
-                            <span style="text-transform: capitalize">
-                                Clear
-                            </span>
-                        </dl-button>
-                    </div>
-                </div>
-            </dl-menu>
-        </date-input>
+                <dl-menu
+                    ref="dateTimeRangeMenu"
+                    anchor="bottom middle"
+                    self="top middle"
+                    :offset="[0, 5]"
+                    :disabled="disabled"
+                >
+                    <date-time-range-content
+                        v-bind="dateTimeRangeContentProps"
+                        @day-type-option-click="handleDayTypeOptionClick"
+                        @month-type-option-click="handleMonthTypeOptionClick"
+                        @update-date-interval="updateDateInterval"
+                        @update-date-interval-with-auto-close="
+                            updateDateIntervalWithAutoClose
+                        "
+                        @update-from-to-date="updateFromToDate"
+                        @clear="handleClearAction"
+                    />
+                </dl-menu>
+            </date-input>
+        </template>
+        <template v-else>
+            <date-time-range-content
+                v-bind="dateTimeRangeContentProps"
+                @day-type-option-click="handleDayTypeOptionClick"
+                @month-type-option-click="handleMonthTypeOptionClick"
+                @update-date-interval="updateDateInterval"
+                @update-date-interval-with-auto-close="
+                    updateDateIntervalWithAutoClose
+                "
+                @update-from-to-date="updateFromToDate"
+                @clear="handleClearAction"
+            />
+        </template>
     </div>
 </template>
 <script lang="ts">
-import { DlTimePicker } from '../DlTimePicker'
 import { DateInterval } from '../types'
-import CardSidebar from './CardSidebar.vue'
 import {
     DayTypeOption,
     DAY_SIDEBAR_OPTION,
     MonthTypeOption,
-    MONTH_SIDEBAR_OPTION
+    MONTH_SIDEBAR_OPTION,
+    DATETIME_RANGE_VIEW_MODE
 } from './types'
 import { CustomDate } from '../DlDatePicker/models/CustomDate'
-import DlDatePicker from '../DlDatePicker/DlDatePicker.vue'
 import { CalendarDate } from '../DlDatePicker/models/CalendarDate'
 import DateInput from './DateInput.vue'
+import DateTimeRangeContent from './DateTimeRangeContent.vue'
 import { DlMenu } from '../../../essential'
-import { DlButton } from '../../../basic'
 import { defineComponent, PropType } from 'vue-demi'
 import { isInRange } from '../DlDatePicker/utils'
 import { v4 } from 'uuid'
 
 export default defineComponent({
     components: {
-        CardSidebar,
-        DlDatePicker,
-        DlTimePicker,
         DateInput,
-        DlMenu,
-        DlButton
+        DateTimeRangeContent,
+        DlMenu
     },
     model: {
         prop: 'modelValue',
@@ -152,6 +119,14 @@ export default defineComponent({
         shouldClearSelectFirstOption: {
             type: Boolean,
             default: false
+        },
+        viewMode: {
+            type: String as PropType<DATETIME_RANGE_VIEW_MODE>,
+            default: DATETIME_RANGE_VIEW_MODE.input
+        },
+        hideClearButton: {
+            type: Boolean,
+            default: false
         }
     },
     emits: ['update:model-value', 'set-type', 'change'],
@@ -437,6 +412,27 @@ export default defineComponent({
             return {
                 '--card-content-width': this.datePickerCardWidth
             }
+        },
+        isInputMode(): boolean {
+            return this.viewMode === DATETIME_RANGE_VIEW_MODE.input
+        },
+        dateTimeRangeContentProps(): Record<string, any> {
+            return {
+                mode: this.mode,
+                typeState: this.typeState,
+                sidebarDayOptions: this.sidebarDayOptions,
+                sidebarMonthOptions: this.sidebarMonthOptions,
+                currentSidebarOption: this.currentSidebarOption,
+                dateInterval: this.dateInterval,
+                availableRange: this.availableRange,
+                isInputDisabled: this.isInputDisabled,
+                normalizeCalendars: this.normalizeCalendars,
+                activeDateFrom: this.activeDateFrom,
+                activeDateTo: this.activeDateTo,
+                showTime: this.showTime,
+                cardContentStyles: this.cardContentStyles,
+                hideClearButton: this.hideClearButton
+            }
         }
     },
     watch: {
@@ -524,6 +520,14 @@ export default defineComponent({
                     from: value.from,
                     to: new Date(value.to)
                 }
+                // When in multi mode, update sidebar option to custom if user manually selects date
+                if (this.mode === 'multi') {
+                    this.currentSidebarOption =
+                        this.typeState === 'day'
+                            ? DAY_SIDEBAR_OPTION.custom
+                            : MONTH_SIDEBAR_OPTION.custom
+                    this.isInputDisabled = false
+                }
             }
             this.$emit('update:model-value', value)
             this.$emit('change', value)
@@ -535,13 +539,18 @@ export default defineComponent({
         updateDateIntervalWithAutoClose(value: DateInterval) {
             this.updateDateInterval(value)
 
-            if (this.autoClose) {
+            if (
+                this.autoClose &&
+                this.viewMode === DATETIME_RANGE_VIEW_MODE.input
+            ) {
                 const dateTimeRangeMenu = this.$refs[
                     'dateTimeRangeMenu'
                 ] as unknown as {
                     hide: () => void
                 }
-                dateTimeRangeMenu.hide()
+                if (dateTimeRangeMenu) {
+                    dateTimeRangeMenu.hide()
+                }
             }
         },
         handleDayTypeOptionClick(option: DayTypeOption) {
@@ -583,25 +592,5 @@ export default defineComponent({
 .dl-date-time-range {
     display: flex;
     justify-content: center;
-
-    &--card {
-        background-color: var(--dl-color-bg);
-        z-index: 1;
-        display: flex;
-        border-radius: 2px;
-        border-radius: 2px;
-    }
-
-    &--card_content {
-        width: var(--card-content-width);
-    }
-
-    &--button {
-        display: flex;
-        margin-left: auto;
-        width: fit-content;
-        margin-right: 16px;
-        margin-bottom: 16px;
-    }
 }
 </style>

package/src/components/compound/DlDateTime/DlDateTimeRange/types.ts

@@ -40,3 +40,8 @@ export type MonthTypeOption = {
     value?: DateInterval
     disabled?: boolean
 }
+
+export enum DATETIME_RANGE_VIEW_MODE {
+    input = 'input',
+    inline = 'inline'
+}