@finema/finework-layer 0.2.139 → 0.2.141

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.141](https://gitlab.finema.co/finema/finework/finework-frontend-layer/compare/0.2.140...0.2.141) (2026-02-19)
+
+### Bug Fixes
+
+* improve noti ([cb22978](https://gitlab.finema.co/finema/finework/finework-frontend-layer/commit/cb22978810ab73bdabb21bf0f49c35aaa19ed282))
+
+## [0.2.140](https://gitlab.finema.co/finema/finework/finework-frontend-layer/compare/0.2.139...0.2.140) (2026-02-17)
+
+### Features
+
+* refactor TimeFromNow component and add RelativeTimeFromNow component for enhanced date formatting ([b7c9d76](https://gitlab.finema.co/finema/finework/finework-frontend-layer/commit/b7c9d76dfdc8f5ec901daa582fec4e16db1ccd20))
+
 ## [0.2.139](https://gitlab.finema.co/finema/finework/finework-frontend-layer/compare/0.2.138...0.2.139) (2026-02-16)
 
 ### Bug Fixes

package/app/components/Format/RelativeTimeFromNow.vue

@@ -0,0 +1,106 @@
+<template>
+  <component
+    :is="props.as || 'span'"
+    :title="TimeHelper.displayDateTime(props.value)"
+  >
+    {{ getValue }}
+  </component>
+</template>
+
+<script lang="ts" setup>
+import { differenceInDays, differenceInHours, differenceInMinutes, differenceInMonths, differenceInWeeks, startOfDay, addDays } from 'date-fns'
+
+const props = defineProps<{
+  value: string | Date
+  as?: string
+}>()
+
+const config = useAppConfig()
+const localeInject = inject('locale')
+
+const isThaiLocale = computed(() => {
+  return (localeInject ?? config.core.locale) === 'th'
+})
+
+const getValue = computed(() => {
+  const targetDate = new Date(props.value)
+  const now = new Date()
+
+  const nowDate = startOfDay(now)
+  const dueDateOnly = startOfDay(targetDate)
+
+  if (nowDate > dueDateOnly) {
+    const dueDateEnd = addDays(dueDateOnly, 1)
+
+    const months = differenceInMonths(now, dueDateEnd)
+
+    if (months > 0) {
+      if (isThaiLocale.value) {
+        return months === 1 ? '1 เดือนที่แล้ว' : `${months} เดือนที่แล้ว`
+      }
+
+      return months === 1 ? '1 month ago' : `${months} months ago`
+    }
+
+    const weeks = differenceInWeeks(now, dueDateEnd)
+
+    if (weeks > 0) {
+      if (isThaiLocale.value) {
+        return weeks === 1 ? '1 สัปดาห์ที่แล้ว' : `${weeks} สัปดาห์ที่แล้ว`
+      }
+
+      return weeks === 1 ? '1 week ago' : `${weeks} weeks ago`
+    }
+
+    const days = differenceInDays(now, dueDateEnd)
+
+    if (days > 0) {
+      if (isThaiLocale.value) {
+        return days === 1 ? '1 วันที่แล้ว' : `${days} วันที่แล้ว`
+      }
+
+      return days === 1 ? '1 day ago' : `${days} days ago`
+    }
+
+    const hours = differenceInHours(now, dueDateEnd)
+
+    if (hours > 0) {
+      if (isThaiLocale.value) {
+        return hours === 1 ? '1 ชม.ที่แล้ว' : `${hours} ชม.ที่แล้ว`
+      }
+
+      return hours === 1 ? '1hr ago' : `${hours}hr ago`
+    }
+
+    const minutes = differenceInMinutes(now, dueDateEnd)
+
+    if (minutes > 0) {
+      if (isThaiLocale.value) {
+        return minutes === 1 ? '1 นาทีที่แล้ว' : `${minutes} นาทีที่แล้ว`
+      }
+
+      return minutes === 1 ? '1m ago' : `${minutes}m ago`
+    }
+
+    return isThaiLocale.value ? 'เมื่อสักครู่' : 'just now'
+  }
+
+  if (nowDate.getTime() === dueDateOnly.getTime()) {
+    return isThaiLocale.value ? 'วันนี้' : 'Today'
+  }
+
+  const tomorrow = addDays(nowDate, 1)
+
+  if (tomorrow.getTime() === dueDateOnly.getTime()) {
+    return isThaiLocale.value ? 'พรุ่งนี้' : 'Tomorrow'
+  }
+
+  const days = differenceInDays(dueDateOnly, nowDate)
+
+  if (isThaiLocale.value) {
+    return `อีก ${days} วัน`
+  }
+
+  return `in ${days}d`
+})
+</script>

package/app/components/Format/TimeFromNow.vue

@@ -8,72 +8,32 @@
 </template>
 
 <script lang="ts" setup>
-import { differenceInDays, differenceInHours, differenceInMinutes, differenceInMonths, differenceInWeeks, startOfDay, addDays } from 'date-fns'
+import { formatDistanceToNow, differenceInDays } from 'date-fns'
+import * as locales from 'date-fns/locale'
 
 const props = defineProps<{
   value: string | Date
   as?: string
 }>()
 
-const getValue = computed(() => {
-  const targetDate = new Date(props.value)
-  const now = new Date()
-
-  // Compare only the date part
-  const nowDate = startOfDay(now)
-  const dueDateOnly = startOfDay(targetDate)
-
-  if (nowDate > dueDateOnly) {
-    const dueDateEnd = addDays(dueDateOnly, 1)
-
-    const months = differenceInMonths(now, dueDateEnd)
-
-    if (months > 0) {
-      return months === 1 ? '1 month ago' : `${months} months ago`
-    }
-
-    const weeks = differenceInWeeks(now, dueDateEnd)
-
-    if (weeks > 0) {
-      return weeks === 1 ? '1 week ago' : `${weeks} weeks ago`
-    }
-
-    const days = differenceInDays(now, dueDateEnd)
-
-    if (days > 0) {
-      return days === 1 ? '1 day ago' : `${days} days ago`
-    }
+const config = useAppConfig()
+const localeInject = inject('locale')
 
-    const hours = differenceInHours(now, dueDateEnd)
-
-    if (hours > 0) {
-      return hours === 1 ? '1hr ago' : `${hours}hr ago`
-    }
-
-    const minutes = differenceInMinutes(now, dueDateEnd)
-
-    if (minutes > 0) {
-      return minutes === 1 ? '1m ago' : `${minutes}m ago`
-    }
-
-    return 'just now'
-  }
-
-  // Today
-  if (nowDate.getTime() === dueDateOnly.getTime()) {
-    return 'Today'
-  }
+const getValue = computed(() => {
+  const locale = (localeInject ?? config.core.locale) === 'th'
+    ? locales.th
+    : locales.enUS
 
-  // Tomorrow
-  const tomorrow = addDays(nowDate, 1)
+  const targetDate = new Date(props.value)
+  const daysDiff = differenceInDays(new Date(), targetDate)
 
-  if (tomorrow.getTime() === dueDateOnly.getTime()) {
-    return 'Tomorrow'
+  if (daysDiff <= 6) {
+    return formatDistanceToNow(targetDate, {
+      addSuffix: true,
+      locale,
+    })
   }
 
-  // In X days (future)
-  const days = differenceInDays(dueDateOnly, nowDate)
-
-  return `in ${days}d`
+  return TimeHelper.displayDateTime(props.value)
 })
 </script>

package/app/components/Notifications/index.vue

@@ -39,42 +39,36 @@
             <NuxtLink
               :to="getLink(item)"
               :target="getLink(item) === '#' ? '_self' : '_blank'"
-              :class="['mb-2 flex cursor-pointer items-start gap-2 rounded-lg p-4 hover:bg-gray-100']"
+              :class="['flex cursor-pointer items-start gap-2 rounded-lg p-4 hover:bg-gray-100']"
             >
-              <Chip
-                v-if="getImage(item)"
+              <!-- <Chip
                 position="bottom-right"
                 size="3xl"
                 inset
                 :color="getNotificationColor(item)"
-              >
+              > -->
+              <div class="relative">
+                <Avatar
+                  class="min-h-12 min-w-12"
+                  :src="item.actor.avatar_url"
+                  :alt="item.actor.display_name"
+                />
                 <img
-
                   :src="getImage(item)!"
-                  class="w-12"
+                  class="absolute -right-1 -bottom-1 w-5 rounded-full bg-white p-0.25"
                 />
-              </Chip>
-
-              <div class="flex-1">
-                <div class="flex items-start justify-between gap-2">
-                  <p
-                    class="line-clamp-1 text-sm font-medium text-gray-700"
-                    :title="item.title"
-                  >
-                    {{ item.title }}
-                  </p>
-                  <FormatTimeFromNow
-                    class="text-muted flex-1 text-right text-xs whitespace-nowrap"
-                    :value="item.sent_at"
-                  />
-                </div>
+              </div>
+              <!-- </Chip> -->
 
+              <div class="flex flex-1 flex-col gap-0">
                 <p
-                  class="text-sm text-neutral-500"
-                  :title="getMessage(item)"
-                >
-                  {{ getMessage(item) }}
-                </p>
+                  class="text-gray line-clamp-2 text-sm"
+                  v-html="getMessage(item)"
+                />
+                <FormatTimeFromNow
+                  class="text-xs font-medium whitespace-nowrap text-gray-600"
+                  :value="item.sent_at"
+                />
               </div>
             </NuxtLink>
           </div>
@@ -101,24 +95,41 @@ onMounted(() => {
 })
 
 const getLink = (item: INotificationItem) => {
-  if (item.data?.url) {
-    return item.data.url
-  }
+  if (item.data?.url) return item.data.url
 
-  if (item.source_type === 'PMO_PROJECT') {
-    return `/pmo/projects/${item.source_id}`
-  } else if (item.source_type === 'NEWSLETTER') {
-    return `/announcement/${item.source_id}`
-  } else if (item.source_type === 'TODO' && (item.action_type === 'TODO_ASSIGN_CARD' || item.action_type === 'TODO_COMMENT_ADD' || item.action_type === 'TODO_DUE_DATE_CHANGE' || item.action_type === 'TODO_STATUS_CHANGE')) {
-    return `/todo/boards/${item.data?.todo_board_slug}/cards/${item.data?.todo_slug}`
-  } else if (item.source_type === 'TODO' && (item.action_type === 'TODO_REMOVE_CARD' || item.action_type === 'TODO_ASSIGN_BOARD')) {
-    return `/todo/boards/${item.data?.todo_board_slug}`
-  } else if (item.source_type === 'TODO' && item.action_type === 'TODO_REMOVE_BOARD') {
-    return `/todo/cards`
-  }
+  switch (item.source_type) {
+    case 'PMO_PROJECT':
+      return `/pmo/projects/${item.source_id}`
+
+    case 'NEWSLETTER':
+      return `/announcement/${item.source_id}`
+
+    case 'TODO': {
+      const boardSlug = item.data?.todo_board_slug
+      const cardSlug = item.data?.todo_slug
+
+      switch (item.action_type) {
+        case 'TODO_ASSIGN_CARD':
+        case 'TODO_COMMENT_ADD':
+        case 'TODO_DUE_DATE_CHANGE':
+        case 'TODO_STATUS_CHANGE':
+          return `/todo/boards/${boardSlug}/cards/${cardSlug}`
 
-  // todo/boards/MEE/cards/MEE-1
-  return '#'
+        case 'TODO_REMOVE_CARD':
+        case 'TODO_ASSIGN_BOARD':
+          return `/todo/boards/${boardSlug}`
+
+        case 'TODO_REMOVE_BOARD':
+          return `/todo/cards`
+
+        default:
+          return '#'
+      }
+    }
+
+    default:
+      return '#'
+  }
 }
 
 const getImage = (item: INotificationItem): string | null => {
@@ -159,7 +170,42 @@ const getNotificationColor = (item: INotificationItem): string => {
 }
 
 const getMessage = (item: INotificationItem): string => {
-  return item.message
+  let message = item.message
+
+  // ตรวจหาวันที่ในรูปแบบ yyyy-mm-dd และแปลงเป็น text
+  const datePattern = /\b(\d{4})-(\d{2})-(\d{2})\b/g
+
+  message = message.replace(datePattern, (match) => {
+    try {
+      const date = new Date(match)
+
+      return TimeHelper.displayDate(date)
+        ? `<span class="text-primary font-medium"> ${TimeHelper.displayDate(date)}</span>`
+        : match
+    } catch {
+      return match
+    }
+  })
+
+  if (item.data) {
+    Object.entries(item.data).forEach(([key, value]) => {
+      if (key.endsWith('_slug') && typeof value === 'string' && value) {
+        // หา slug ในข้อความและครอบด้วย <strong>
+        const slugPattern = new RegExp(`\\b${value}\\b`, 'g')
+
+        message = message.replace(slugPattern, `<span class="text-primary font-medium">${value}</span>`)
+      }
+    })
+  }
+
+  // ตรวจหาคำที่อยู่ระหว่าง "from" และ "to" และทำให้เป็น bold + text-primary font-semibold
+  const fromToPattern = /\bfrom\s+(\S+)\s+to\s+(\S+)/gi
+
+  message = message.replace(fromToPattern, (_match, from, to) => {
+    return `from <span class="text-primary font-medium">${from}</span> to <span class="text-primary font-semibold">${to}</span>`
+  })
+
+  return message
 }
 
 useWatchTrue(() => markAllRead.status.value.isSuccess, () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@finema/finework-layer",
   "type": "module",
-  "version": "0.2.139",
+  "version": "0.2.141",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground -o",