pukaad-ui-lib 1.421.0 → 1.423.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "pukaad-ui-lib",
   "configKey": "pukaadUI",
-  "version": "1.421.0",
+  "version": "1.423.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/card/card-reaction.d.vue.ts

@@ -20,6 +20,7 @@ type __VLS_Props = {
     iconSize?: number | string;
     id?: string;
     state?: string;
+    loginPath?: string;
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     disabled: boolean;
@@ -32,6 +33,7 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     disabledDividerBottom: boolean;
     iconSize: number | string;
     state: string;
+    loginPath: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/card/card-reaction.vue

@@ -32,8 +32,14 @@
 
 <script setup>
 import { computed, reactive, ref, watch } from "vue";
+import { navigateTo, useCookie, useRoute, useRuntimeConfig } from "nuxt/app";
 import { useApi } from "../../composables/useApi";
 const api = useApi();
+const route = useRoute();
+const config = useRuntimeConfig();
+const secId = useCookie(
+  config.public.APP_TYPE === "OFFICE" ? "OFFICE_SEC_ID" : "SEC_ID"
+);
 const isOpenModalShare = ref(false);
 const props = defineProps({
   itemCount: { type: Object, required: false, default: () => ({
@@ -54,7 +60,8 @@ const props = defineProps({
   disabled: { type: Boolean, required: false, default: false },
   iconSize: { type: [Number, String], required: false, default: 20 },
   id: { type: String, required: false, default: "" },
-  state: { type: String, required: false, default: "" }
+  state: { type: String, required: false, default: "" },
+  loginPath: { type: String, required: false, default: "/auth/login" }
 });
 const computedPadding = computed(
   () => props.disabledPadding ? 0 : props.padding
@@ -114,37 +121,46 @@ const reactions = [
     action: toggleShared
   }
 ];
+function redirectToLogin() {
+  return navigateTo({
+    path: props.loginPath,
+    query: { redirect: route.fullPath }
+  });
+}
+function ensureLoggedIn() {
+  if (secId.value) return true;
+  redirectToLogin();
+  return false;
+}
+function isUnauthorized(error) {
+  const e = error;
+  return (e?.status ?? e?.statusCode) === 401;
+}
 async function toggleLike() {
+  const likeUrl = props.state === "blog" && props.id ? `/blogs/${props.id}/like` : props.state === "content" && props.id ? `/contents/${props.id}/like` : "";
+  if (likeUrl && !ensureLoggedIn()) return;
   const previousLiked = reaction.liked;
   reaction.liked = !previousLiked;
   counts.liked += reaction.liked ? 1 : -1;
-  if (props.state === "blog" && props.id) {
-    try {
-      await api(`/blogs/${props.id}/like`, {
-        method: reaction.liked ? "POST" : "DELETE"
-      });
-    } catch (error) {
-      console.error(error);
-      reaction.liked = previousLiked;
-      counts.liked += previousLiked ? 1 : -1;
-    }
-  } else if (props.state === "content" && props.id) {
-    try {
-      await api(`/contents/${props.id}/like`, {
-        method: reaction.liked ? "POST" : "DELETE"
-      });
-    } catch (error) {
-      console.error(error);
-      reaction.liked = previousLiked;
-      counts.liked += previousLiked ? 1 : -1;
-    }
+  if (!likeUrl) return;
+  try {
+    await api(likeUrl, {
+      method: reaction.liked ? "POST" : "DELETE"
+    });
+  } catch (error) {
+    console.error(error);
+    reaction.liked = previousLiked;
+    counts.liked += previousLiked ? 1 : -1;
+    if (isUnauthorized(error)) redirectToLogin();
   }
 }
 async function toggleBookmark() {
+  const canCallApi = props.state === "content" && !!props.id;
+  if (canCallApi && !ensureLoggedIn()) return;
   const previousBookmarked = reaction.bookmarked;
   reaction.bookmarked = !previousBookmarked;
   counts.bookmarked += reaction.bookmarked ? 1 : -1;
-  if (props.state === "content" && props.id) {
+  if (canCallApi) {
     try {
       await api(`/contents/${props.id}/bookmark`, {
         method: reaction.bookmarked ? "POST" : "DELETE"
@@ -153,6 +169,7 @@ async function toggleBookmark() {
       console.error(error);
       reaction.bookmarked = previousBookmarked;
       counts.bookmarked += previousBookmarked ? 1 : -1;
+      if (isUnauthorized(error)) redirectToLogin();
     }
   }
 }

package/dist/runtime/components/card/card-reaction.vue.d.ts

@@ -20,6 +20,7 @@ type __VLS_Props = {
     iconSize?: number | string;
     id?: string;
     state?: string;
+    loginPath?: string;
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     disabled: boolean;
@@ -32,6 +33,7 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     disabledDividerBottom: boolean;
     iconSize: number | string;
     state: string;
+    loginPath: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/drawer/drawer-post-content.vue

@@ -5,6 +5,7 @@
         <div class="flex flex-col gap-[2px] w-full">
           <div v-if="hasCoverFile" class="font-body-small-prominent text-gray">
             หน้าปก
+            <span class="text-destructive">*</span>
           </div>
           <!-- v-if ไม่ใช่ v-show — root ของ InputTextarea เป็น ShadFormField (renderless)
                style จาก v-show เลยตกไปไม่ถึง DOM จริง ซ่อนไม่ได้ -->
@@ -14,6 +15,7 @@
             name="cover-text"
             label="หน้าปก"
             class="w-full"
+            required
             placeholder="พิมพ์ข้อความหน้าปกหรืออัปโหลดไฟล์มีเดีย"
             disabledBorder
             resize="none"
@@ -101,16 +103,22 @@
           placeholder="อยากบอกอะไรเกี่ยวกับโพสต์นี้"
           disabledBorder
           resize="none"
+          required
         />
         <Divider height="1" />
         <InputTag
           v-model="selectedTags"
+          :profile-scope="props.state"
           label="เพิ่มแท็ก"
           placeholder="กรอกชื่อแท็ก"
         />
 
         <InputMention v-model:mentions="selectedMentions" />
-        <InputSelectPlace v-model:places="selectedPlaces" />
+        <InputSelectPlace
+          v-model:places="selectedPlaces"
+          :profile-scope="props.state"
+          required
+        />
       </div>
       <div class="flex flex-col gap-[8px] items-center">
         <!-- cursor-default ทับ cursor-pointer ของการ์ด — พรีวิวคลิกไม่มีผล อย่าหลอกว่าเป็นปุ่ม

package/dist/runtime/components/image/image-cropper.d.vue.ts

@@ -65,14 +65,14 @@ declare const __VLS_export: import("vue").DefineComponent<ImageCropperProps, {
     src: string;
     center: boolean;
     crossorigin: "" | "anonymous" | "use-credentials";
+    background: boolean;
+    modal: boolean;
     responsive: boolean;
     restore: boolean;
     checkCrossOrigin: boolean;
     checkOrientation: boolean;
-    modal: boolean;
     guides: boolean;
     highlight: boolean;
-    background: boolean;
     autoCrop: boolean;
     movable: boolean;
     rotatable: boolean;

package/dist/runtime/components/image/image-cropper.vue.d.ts

@@ -65,14 +65,14 @@ declare const __VLS_export: import("vue").DefineComponent<ImageCropperProps, {
     src: string;
     center: boolean;
     crossorigin: "" | "anonymous" | "use-credentials";
+    background: boolean;
+    modal: boolean;
     responsive: boolean;
     restore: boolean;
     checkCrossOrigin: boolean;
     checkOrientation: boolean;
-    modal: boolean;
     guides: boolean;
     highlight: boolean;
-    background: boolean;
     autoCrop: boolean;
     movable: boolean;
     rotatable: boolean;

package/dist/runtime/components/input/input-select-place.d.vue.ts

@@ -8,6 +8,8 @@ export interface SelectPlaceItem {
 interface InputSelectPlaceProps {
     label?: string;
     placeholder?: string;
+    required?: boolean;
+    profileScope?: "personal" | "business";
 }
 type __VLS_Props = InputSelectPlaceProps;
 type __VLS_ModelProps = {
@@ -20,7 +22,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
     "onUpdate:places"?: ((value: SelectPlaceItem[]) => any) | undefined;
 }>, {
     label: string;
+    required: boolean;
     placeholder: string;
+    profileScope: "personal" | "business";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/input/input-select-place.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="flex flex-col gap-[4px] w-full">
-    <div class="font-body-large-prominent text-gray">{{ props.label }}</div>
+    <div class="font-body-large-prominent text-gray">
+      {{ props.label }}
+      <span v-if="props.required" class="text-destructive">*</span>
+    </div>
     <div v-show="selectedItems.length === 0">
       <InputCombobox
         ref="comboboxRef"
@@ -11,6 +14,12 @@
         command-list-class="max-h-[520px]"
       >
         <template #options="{ search }">
+          <ShadTabs v-model="currentTab" class="w-full p-2">
+            <ShadTabsList class="grid w-full grid-cols-2">
+              <ShadTabsTrigger value="popular">ยอดนิยม</ShadTabsTrigger>
+              <ShadTabsTrigger value="recent">ใช้งานล่าสุด</ShadTabsTrigger>
+            </ShadTabsList>
+          </ShadTabs>
           <template v-if="filterPlaces(search).length > 0">
             <div
               v-for="place in filterPlaces(search)"
@@ -56,7 +65,7 @@
                ที่กำหนดเองไม่ได้ผ่าน filter ของ cmdk เลยต้องกรอง+โชว์ empty state เองตรงนี้
                !isSearching กันโชว์ตอนกำลังยิง API อยู่ (ผลลัพธ์ยังว่างเพราะยังโหลดไม่เสร็จ ไม่ใช่ค้นไม่เจอจริง) -->
           <div
-            v-else-if="!isSearching"
+            v-else-if="!isSearching && currentTab === 'popular'"
             class="flex gap-[8px] items-center hover:cursor-pointer"
             @click="drawerSuggestPlaceOpen = true"
           >
@@ -67,6 +76,22 @@
             </div>
             <div class="font-body-medium">เพิ่มสถานที่ที่ขาดไป</div>
           </div>
+          <div
+            v-else-if="!isSearching"
+            class="flex flex-col items-center justify-center gap-2 p-6 text-gray"
+          >
+            <Icon name="pukaad:tag-empty" class="h-[123px] w-[180px]" />
+            <div class="font-body-medium">
+              {{ search ? "\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E2A\u0E16\u0E32\u0E19\u0E17\u0E35\u0E48" : "\u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2A\u0E16\u0E32\u0E19\u0E17\u0E35\u0E48\u0E17\u0E35\u0E48\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19\u0E25\u0E48\u0E32\u0E2A\u0E38\u0E14" }}
+            </div>
+          </div>
+          <div v-if="isSearching" class="flex justify-center p-2">
+            <Icon
+              name="lucide:loader-2"
+              class="h-5 w-5 animate-spin text-primary"
+            />
+          </div>
+          <div ref="sentinelRef" class="h-1" />
         </template>
       </InputCombobox>
     </div>
@@ -127,18 +152,36 @@
 
 <script setup>
 import { computed, ref, watch } from "vue";
-import { useDebounceFn } from "@vueuse/core";
+import { useDebounceFn, useIntersectionObserver } from "@vueuse/core";
+import { useCookie } from "nuxt/app";
 import { useApi } from "../../composables/useApi";
 const props = defineProps({
   label: { type: String, required: false, default: "\u0E2A\u0E16\u0E32\u0E19\u0E17\u0E35\u0E48" },
-  placeholder: { type: String, required: false, default: "\u0E40\u0E1E\u0E34\u0E48\u0E21\u0E2A\u0E16\u0E32\u0E19\u0E17\u0E35\u0E48" }
+  placeholder: { type: String, required: false, default: "\u0E40\u0E1E\u0E34\u0E48\u0E21\u0E2A\u0E16\u0E32\u0E19\u0E17\u0E35\u0E48" },
+  required: { type: Boolean, required: false, default: false },
+  profileScope: { type: String, required: false, default: "personal" }
 });
 const api = useApi();
+const businessProfileId = useCookie(
+  "PUKAAD_BUSINESS_PROFILE_ID"
+);
 const drawerSuggestPlaceOpen = ref(false);
 const comboboxRef = ref();
 const selectedIds = ref([]);
-const searchResults = ref([]);
-const isSearching = ref(false);
+const currentTab = ref("popular");
+const createListState = () => ({
+  items: [],
+  page: 1,
+  hasMore: true,
+  loading: false
+});
+const popularState = ref(createListState());
+const recentState = ref(createListState());
+const activeState = computed(
+  () => currentTab.value === "popular" ? popularState.value : recentState.value
+);
+const searchResults = computed(() => activeState.value.items);
+const isSearching = computed(() => activeState.value.loading);
 const selectedCache = ref(/* @__PURE__ */ new Map());
 const mapPlace = (raw) => ({
   id: raw.id,
@@ -147,25 +190,42 @@ const mapPlace = (raw) => ({
   image: raw.cover_image,
   post_count: raw.post_count ?? 0
 });
-const performSearch = async (q) => {
-  isSearching.value = true;
+let requestGeneration = 0;
+const fetchPlaces = async (type, q, reset = false) => {
+  const state = type === "popular" ? popularState.value : recentState.value;
+  if (reset) Object.assign(state, createListState());
+  if (state.loading || !state.hasMore) return;
+  state.loading = true;
+  const generation = requestGeneration;
   try {
-    const res = await api(
-      "/places/search",
-      { query: { q, page: 1, page_size: 10 } }
-    );
-    searchResults.value = (res.data?.items ?? []).map(mapPlace);
+    const res = await api(type === "popular" ? "/places/search" : "/places/recent", {
+      query: {
+        q,
+        page: state.page,
+        page_size: 10,
+        scope: props.profileScope
+      }
+    });
+    if (generation !== requestGeneration) return;
+    const items = (res.data?.items ?? []).map(mapPlace);
+    state.items = [...state.items, ...items];
+    const pagination = res.data?.pagination;
+    state.page++;
+    state.hasMore = state.page <= (pagination?.total_page ?? 1);
   } catch {
-    searchResults.value = [];
   } finally {
-    isSearching.value = false;
+    if (generation === requestGeneration) state.loading = false;
   }
 };
-const debouncedSearch = useDebounceFn(performSearch, 300);
+const debouncedSearch = useDebounceFn(
+  (q) => fetchPlaces(currentTab.value, q, true),
+  300
+);
 const searchTerm = ref("");
 watch(
-  searchTerm,
-  (val) => {
+  [searchTerm, currentTab],
+  ([val]) => {
+    requestGeneration++;
     debouncedSearch(val);
   },
   { immediate: true }
@@ -174,8 +234,17 @@ const filterPlaces = (search) => {
   if (searchTerm.value !== search) {
     searchTerm.value = search;
   }
-  return searchResults.value;
+  return activeState.value.items;
 };
+const sentinelRef = ref(null);
+useIntersectionObserver(sentinelRef, ([entry]) => {
+  if (entry?.isIntersecting) fetchPlaces(currentTab.value, searchTerm.value);
+});
+watch([businessProfileId, () => props.profileScope], () => {
+  requestGeneration++;
+  recentState.value = createListState();
+  if (currentTab.value === "recent") fetchPlaces("recent", searchTerm.value);
+});
 const isSelected = (id) => selectedIds.value.includes(id);
 const toggleSelect = (id) => {
   if (isSelected(id)) {

package/dist/runtime/components/input/input-select-place.vue.d.ts

@@ -8,6 +8,8 @@ export interface SelectPlaceItem {
 interface InputSelectPlaceProps {
     label?: string;
     placeholder?: string;
+    required?: boolean;
+    profileScope?: "personal" | "business";
 }
 type __VLS_Props = InputSelectPlaceProps;
 type __VLS_ModelProps = {
@@ -20,7 +22,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
     "onUpdate:places"?: ((value: SelectPlaceItem[]) => any) | undefined;
 }>, {
     label: string;
+    required: boolean;
     placeholder: string;
+    profileScope: "personal" | "business";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/input/input-tag.d.vue.ts

@@ -13,6 +13,7 @@ interface InputTagProps {
     placeholder?: string;
     state?: "user" | "admin";
     ignore?: string[];
+    profileScope?: "personal" | "business";
 }
 type __VLS_Props = InputTagProps;
 type __VLS_ModelProps = {
@@ -28,6 +29,7 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
     state: "user" | "admin";
     placeholder: string;
     limit: number;
+    profileScope: "personal" | "business";
     ignore: string[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/input/input-tag.vue

@@ -51,12 +51,15 @@
       <ShadCommand :filter="() => 1">
         <ShadCommandInput
           v-if="props.state === 'admin'"
+          v-model="searchQuery"
           placeholder="ค้นหาแท็ก"
         />
         <ShadTabs v-model="currentTab" class="w-full p-2">
           <ShadTabsList class="w-full grid grid-cols-2">
             <ShadTabsTrigger value="popular">ยอดนิยม</ShadTabsTrigger>
-            <ShadTabsTrigger value="latest">ล่าสุด</ShadTabsTrigger>
+            <ShadTabsTrigger value="recent">{{
+              isOffice ? "\u0E25\u0E48\u0E32\u0E2A\u0E38\u0E14" : "\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19\u0E25\u0E48\u0E32\u0E2A\u0E38\u0E14"
+            }}</ShadTabsTrigger>
           </ShadTabsList>
 
           <!-- Popular Tab -->
@@ -87,7 +90,9 @@
                   class="flex flex-col items-center justify-center h-full gap-2"
                 >
                   <Icon name="pukaad:tag-empty" class="h-[123px] w-[180px]" />
-                  <div class="text-gray font-body-medium">ไม่พบข้อมูล</div>
+                  <div class="text-gray font-body-medium">
+                    {{ popularState.error || "\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25" }}
+                  </div>
                 </div>
               </ShadCommandEmpty>
 
@@ -104,12 +109,12 @@
             </ShadCommandList>
           </ShadTabsContent>
 
-          <!-- Latest Tab -->
-          <ShadTabsContent value="latest" class="m-0">
+          <!-- Recent / Office latest tab -->
+          <ShadTabsContent value="recent" class="m-0">
             <ShadCommandList class="max-h-64 overflow-y-auto">
               <ShadCommandGroup>
                 <ShadCommandItem
-                  v-for="tag in filteredLatestTags"
+                  v-for="tag in filteredRecentTags"
                   :key="tag.value"
                   :value="tag.value"
                   class="flex w-full justify-between"
@@ -125,19 +130,23 @@
               <!-- Initital Loading / Empty State -->
               <ShadCommandEmpty
                 :force-show="
-  filteredLatestTags.length === 0 && !latestState.loading
+  filteredRecentTags.length === 0 && !recentState.loading
 "
               >
                 <div
                   class="flex flex-col items-center justify-center h-full gap-2"
                 >
                   <Icon name="pukaad:tag-empty" class="h-[123px] w-[180px]" />
-                  <div class="text-gray font-body-medium">ไม่พบข้อมูล</div>
+                  <div class="text-gray font-body-medium">
+                    {{
+                      recentState.error || (!isOffice && !searchQuery && recentState.data.length === 0 ? "\u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E21\u0E35\u0E41\u0E17\u0E47\u0E01\u0E17\u0E35\u0E48\u0E43\u0E0A\u0E49\u0E07\u0E32\u0E19\u0E25\u0E48\u0E32\u0E2A\u0E38\u0E14" : "\u0E44\u0E21\u0E48\u0E1E\u0E1A\u0E02\u0E49\u0E2D\u0E21\u0E39\u0E25")
+                    }}
+                  </div>
                 </div>
               </ShadCommandEmpty>
 
               <!-- Loading Indicator -->
-              <div v-if="latestState.loading" class="flex justify-center p-2">
+              <div v-if="recentState.loading" class="flex justify-center p-2">
                 <Icon
                   name="lucide:loader-2"
                   class="animate-spin h-5 w-5 text-primary"
@@ -145,7 +154,7 @@
               </div>
 
               <!-- Sentinel for Infinite Scroll -->
-              <div ref="latestSentinel" class="h-1" />
+              <div ref="recentSentinel" class="h-1" />
             </ShadCommandList>
           </ShadTabsContent>
         </ShadTabs>
@@ -155,13 +164,21 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, reactive, watch } from "vue";
-import { useNuxtApp } from "nuxt/app";
+import { ref, computed, reactive, watch } from "vue";
+import { useNuxtApp, useRuntimeConfig, useCookie } from "nuxt/app";
 import { useApi } from "../../composables/useApi";
 import { useIntersectionObserver } from "@vueuse/core";
 const { $convert } = useNuxtApp();
 const convertNumber = (val) => $convert?.convertNumber(val) || val;
 const api = useApi();
+const config = useRuntimeConfig();
+const isOffice = computed(
+  () => props.state === "admin" || config.public.APP_TYPE === "OFFICE"
+);
+const businessProfileId = useCookie(
+  "PUKAAD_BUSINESS_PROFILE_ID"
+);
+const sessionId = useCookie("SEC_ID");
 const props = defineProps({
   name: { type: String, required: false, default: "input-tag" },
   rules: { type: [Object, String, Function], required: false },
@@ -171,7 +188,8 @@ const props = defineProps({
   limit: { type: Number, required: false, default: 0 },
   placeholder: { type: String, required: false, default: "\u0E04\u0E49\u0E19\u0E2B\u0E32\u0E41\u0E17\u0E47\u0E01..." },
   state: { type: String, required: false, default: "user" },
-  ignore: { type: Array, required: false, default: () => [] }
+  ignore: { type: Array, required: false, default: () => [] },
+  profileScope: { type: String, required: false, default: "personal" }
 });
 const modelValue = defineModel({ type: Array, ...{
   default: () => []
@@ -185,13 +203,15 @@ const popularState = reactive({
   data: [],
   page: 1,
   hasMore: true,
-  loading: false
+  loading: false,
+  error: ""
 });
-const latestState = reactive({
+const recentState = reactive({
   data: [],
   page: 1,
   hasMore: true,
-  loading: false
+  loading: false,
+  error: ""
 });
 const mapTag = (tag) => ({
   label: tag.name,
@@ -199,14 +219,23 @@ const mapTag = (tag) => ({
   postCount: tag.usage_count
 });
 const PAGE_SIZE = 20;
+let requestGeneration = 0;
 const fetchTags = async (type) => {
-  const state = type === "popular" ? popularState : latestState;
+  const state = type === "popular" ? popularState : recentState;
   if (state.loading || !state.hasMore) return;
   state.loading = true;
+  state.error = "";
+  const generation = requestGeneration;
   try {
-    const res = await api(
-      `/tags/${type}?page=${state.page}&page_size=${PAGE_SIZE}`
-    );
+    const endpoint = type === "recent" && isOffice.value ? "latest" : type;
+    const res = await api(`/tags/${endpoint}`, {
+      query: {
+        page: state.page,
+        page_size: PAGE_SIZE,
+        scope: props.profileScope
+      }
+    });
+    if (generation !== requestGeneration) return;
     if (res.data && Array.isArray(res.data)) {
       const newTags = res.data.map(mapTag);
       state.data = [...state.data, ...newTags];
@@ -216,42 +245,65 @@ const fetchTags = async (type) => {
       state.hasMore = false;
     }
   } catch (e) {
+    if (generation !== requestGeneration) return;
     console.error(`Failed to fetch ${type} tags:`, e);
-    state.hasMore = false;
+    state.error = "\u0E42\u0E2B\u0E25\u0E14\u0E41\u0E17\u0E47\u0E01\u0E44\u0E21\u0E48\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08 \u0E01\u0E23\u0E38\u0E13\u0E32\u0E1B\u0E34\u0E14\u0E41\u0E25\u0E49\u0E27\u0E40\u0E1B\u0E34\u0E14\u0E43\u0E2B\u0E21\u0E48";
   } finally {
-    state.loading = false;
+    if (generation === requestGeneration) state.loading = false;
   }
 };
 watch(popoverOpen, (isOpen) => {
   if (isOpen) {
+    resetLists();
     if (currentTab.value === "popular" && popularState.data.length === 0) {
       fetchTags("popular");
-    } else if (currentTab.value === "latest" && latestState.data.length === 0) {
-      fetchTags("latest");
+    } else if (currentTab.value === "recent" && recentState.data.length === 0) {
+      fetchTags("recent");
     }
   }
 });
 const popularSentinel = ref(null);
-const latestSentinel = ref(null);
+const recentSentinel = ref(null);
 useIntersectionObserver(popularSentinel, (entries) => {
   const entry = entries[0];
   if (entry?.isIntersecting && currentTab.value === "popular" && popoverOpen.value) {
     fetchTags("popular");
   }
 });
-useIntersectionObserver(latestSentinel, (entries) => {
+useIntersectionObserver(recentSentinel, (entries) => {
   const entry = entries[0];
-  if (entry?.isIntersecting && currentTab.value === "latest" && popoverOpen.value) {
-    fetchTags("latest");
+  if (entry?.isIntersecting && currentTab.value === "recent" && popoverOpen.value) {
+    fetchTags("recent");
   }
 });
 watch(currentTab, (newTab) => {
+  if (!popoverOpen.value) return;
   if (newTab === "popular" && popularState.data.length === 0) {
     fetchTags("popular");
-  } else if (newTab === "latest" && latestState.data.length === 0) {
-    fetchTags("latest");
+  } else if (newTab === "recent" && recentState.data.length === 0) {
+    fetchTags("recent");
   }
 });
+const resetLists = () => {
+  requestGeneration++;
+  for (const state of [popularState, recentState]) {
+    Object.assign(state, {
+      data: [],
+      page: 1,
+      hasMore: true,
+      loading: false,
+      error: ""
+    });
+  }
+};
+watch(
+  [sessionId, businessProfileId, () => props.profileScope, isOffice],
+  () => {
+    resetLists();
+    if (popoverOpen.value)
+      fetchTags(currentTab.value === "popular" ? "popular" : "recent");
+  }
+);
 const selectedTags = computed(() => modelValue.value);
 const isLimitReached = computed(() => {
   if (props.limit <= 0) return false;
@@ -286,7 +338,7 @@ const filterTags = (tags) => {
   );
 };
 const filteredPopularTags = computed(() => filterTags(popularState.data));
-const filteredLatestTags = computed(() => filterTags(latestState.data));
+const filteredRecentTags = computed(() => filterTags(recentState.data));
 const onSelectTag = (tag) => {
   if (isSelected(tag.value)) {
     modelValue.value = modelValue.value.filter((t) => t.id !== tag.value);
@@ -318,7 +370,7 @@ const onAddCustomTag = () => {
     return;
   }
   const newValue = trimmedQuery.toLowerCase().replace(/\s+/g, "-");
-  const existingTag = [...popularState.data, ...latestState.data].find(
+  const existingTag = [...popularState.data, ...recentState.data].find(
     (tag) => tag.value === newValue || tag.label === trimmedQuery
   );
   if (existingTag) {

package/dist/runtime/components/input/input-tag.vue.d.ts

@@ -13,6 +13,7 @@ interface InputTagProps {
     placeholder?: string;
     state?: "user" | "admin";
     ignore?: string[];
+    profileScope?: "personal" | "business";
 }
 type __VLS_Props = InputTagProps;
 type __VLS_ModelProps = {
@@ -28,6 +29,7 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
     state: "user" | "admin";
     placeholder: string;
     limit: number;
+    profileScope: "personal" | "business";
     ignore: string[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pukaad-ui-lib",
-  "version": "1.421.0",
+  "version": "1.423.0",
   "description": "pukaad-ui for MeMSG",
   "repository": {
     "type": "git",