temp: time value

web/app/components/base/date-and-time-picker/date-picker/index.tsx

@@ -19,6 +19,7 @@ import YearAndMonthPickerFooter from '../year-and-month-picker/footer'
 import TimePickerHeader from '../time-picker/header'
 import TimePickerOptions from '../time-picker/options'
 import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
 
 const DatePicker = ({
   value,
@@ -30,6 +31,8 @@ const DatePicker = ({
   triggerWrapClassName,
   popupZIndexClassname = 'z-[11]',
 }: DatePickerProps) => {
+  const { userProfile: { timezone } } = useAppContext()
+
   const { t } = useTranslation()
   const [isOpen, setIsOpen] = useState(false)
   const [view, setView] = useState(ViewType.date)
@@ -100,7 +103,9 @@ const DatePicker = ({
   }
 
   const handleConfirmDate = () => {
-    onChange(selectedDate)
+    // debugger
+    console.log(selectedDate, selectedDate?.tz(timezone))
+    onChange(selectedDate ? selectedDate.tz(timezone) : undefined)
     setIsOpen(false)
   }
 

web/app/components/datasets/metadata/base/date-picker.tsx

@@ -7,6 +7,9 @@ import {
 import DatePicker from '@/app/components/base/date-and-time-picker/date-picker'
 import cn from '@/utils/classnames'
 import type { TriggerProps } from '@/app/components/base/date-and-time-picker/types'
+import useTimestamp from '@/hooks/use-timestamp'
+import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
 
 type Props = {
   className?: string
@@ -18,6 +21,10 @@ const WrappedDatePicker = ({
   value,
   onChange,
 }: Props) => {
+  const { t } = useTranslation()
+  const { userProfile: { timezone } } = useAppContext()
+  const { formatTime: formatTimestamp } = useTimestamp()
+
   const handleDateChange = useCallback((date?: dayjs.Dayjs) => {
     if (date)
       onChange(date.valueOf())
@@ -36,7 +43,7 @@ const WrappedDatePicker = ({
             value ? 'text-text-secondary' : 'text-text-tertiary',
           )}
         >
-          {value || 'Choose a time...'}
+          {value ? formatTimestamp(dayjs.utc(value).tz(timezone).valueOf() / 1000, t('datasetDocuments.metadata.dateTimeFormat')) : 'Choose a time...'}
         </div>
         <RiCloseCircleFill
           className={cn(
@@ -57,7 +64,7 @@ const WrappedDatePicker = ({
 
   return (
     <DatePicker
-      value={dayjs(value)}
+      value={dayjs(value || Date.now())}
       onChange={handleDateChange}
       onClear={handleDateChange}
       renderTrigger={renderTrigger}