@bcc-code/vue-bcc-chat-ui 3.35.0 → 3.39.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bcc-code/vue-bcc-chat-ui",
   "author": "bcc-code",
   "license": "Apache-2.0",
-  "version": "3.35.0",
+  "version": "3.39.0",
   "type": "module",
   "private": false,
   "files": [

package/src/components/BccChatMessageList.vue

@@ -22,6 +22,7 @@ import BccScheduledMessages from "./BccScheduledMessages.vue";
 const props = defineProps({
   chatUid: { type: String, required: true },
   senderDisplayName: { type: String, required: false },
+  hideDeletedMessages: { type: Boolean, required: false, default: false },
   groupMessageGetter: {
     type: Function as PropType<(guid: string, query: string) => Promise<any>>,
     required: false,
@@ -40,6 +41,7 @@ const chatInstance: Ref<ChatInstance> = ref({
   decoyAttachment: null,
   showScheduledMessagesChat: false,
   showAlert: false,
+  showRescheduleAlert: false,
   userInput: null,
   rescheduleInfo: null
 });
@@ -142,7 +144,7 @@ function closeScheduledMessage() {
       <div>Connecting: {{chat.connecting.value}}</div>
       <div>CometChat: {{cometChatStatus}} <button @click="getCometChatStatus()">[refresh]</button></div>
     </div> -->
-    <BccChatMessages v-if="chatGroup && !chatInstance.showScheduledMessagesChat" :chatGroup="chatGroup"
+    <BccChatMessages v-if="chatGroup && !chatInstance.showScheduledMessagesChat" :chatGroup="chatGroup" :hide-deleted-messages="props.hideDeletedMessages"
       :chatUid="props.chatUid"></BccChatMessages>
     <BccScheduledMessages v-else-if="chatGroup && chatInstance.showScheduledMessagesChat"
       class="bcc-scheduled-message-list" :chatGroup="chatInstance.scheduledMessageChat!"

package/src/components/BccChatMessages.vue

@@ -11,14 +11,15 @@ import { MessageComposerConfiguration } from "@cometchat/uikit-shared";
 
 const props = defineProps({
     chatUid: { type: String, required: true },
-    chatGroup: { type: Group, required: true }
+    chatGroup: { type: Group, required: true },
+    hideDeletedMessages: { type: Boolean, required: false, default: false }
 })
 
 const chatGroup = ref<Group>();
 
 const chatInstance = inject<Ref<ChatInstance>>("chatInstance");
 const messageComposerConfiguration = getMessageComposerConfiguration(chatInstance);
-const messageListConfiguration = getMessageListConfiguration(chatInstance, chatGroup);
+const messageListConfiguration = getMessageListConfiguration(props.hideDeletedMessages, chatInstance, chatGroup);
 const threadedMessagesConfiguration = getThreadedMessagesConfiguration(chatGroup);
 threadedMessagesConfiguration.messageComposerConfiguration = getThreadedMessageComposerConfig();
 

package/src/components/BccScheduledMessageModal.vue

@@ -4,7 +4,13 @@ import { localize } from '@cometchat/uikit-resources';
 import { computed, onMounted, ref } from 'vue';
 import "../style.css";
 
-const emit = defineEmits(['close', 'send']);
+const props = defineProps({
+    isReschedule: { type: Boolean, default: false }
+})
+
+const title = props.isReschedule ? localize("RESCHEDULE") : localize("SCHEDULE_MESSAGE")
+
+const emit = defineEmits(['close', 'schedule', 'reschedule']);
 
 const dateInput = ref<string>();
 const timeInput = ref<string>();
@@ -14,8 +20,6 @@ const localDateTime = computed<string>(() => {
     return new Date(dateInput.value + "T" + timeInput.value).toISOString()
 })
 
-const title = ref(localize("SCHEDULE_MESSAGE"));
-
 const isDateInFuture = computed<boolean>(() => {
     if (dateInput.value === '' || timeInput.value === '') return false
     return new Date(localDateTime.value) > new Date();
@@ -37,14 +41,14 @@ function close() {
 
 function scheduleMessage() {
     if (isDateInFuture && !messageSent.value) {
-        emit('send', localDateTime.value)
+        emit(props.isReschedule ? 'reschedule' : 'schedule', localDateTime.value)
         messageSent.value = true;
     }
 }
 </script>
 
 <template>
-    <BccModal class="modal" :title=title :open="true" @close="close()" :closeButton="true">
+    <BccModal class="modal" :title="title" :open="true" @close="close()" :closeButton="true">
         <div class="flex flex-col w-full">
             <div class="flex flex-row w-full justify-between">
                 <input class="input" type="date" v-model="dateInput" required>

package/src/components/BccScheduledMessages.vue

@@ -65,6 +65,7 @@ onUnmounted(() => {
         chatInstance.value.scheduledMessageChat = undefined
         chatInstance.value.showScheduledMessagesChat = false
         chatInstance.value.showAlert = false
+        chatInstance.value.rescheduleInfo = null
     }
 })
 
@@ -90,6 +91,10 @@ onUnmounted(() => {
                 :open="chatInstance!.showAlert" @close="chatInstance!.showAlert = false">
                 {{ localize("ERROR_SENDING_SCHEDULED_MESSAGE") }}
             </BccAlert>
+            <BccAlert class="absolute top-0 w-[97%] mx-2 mt-11" icon closeButton context="danger"
+                :open="chatInstance!.showRescheduleAlert" @close="chatInstance!.showRescheduleAlert = false">
+                {{ localize("ERROR_RESCHEDULING_MESSAGE") }}
+            </BccAlert>
         </div>
     </div>
 </template>

package/src/components/BccScheduledSendButton.vue

@@ -10,6 +10,8 @@ const props = defineProps({
     chatUid: { type: String, required: true }
 })
 
+const isReschedule = ref<boolean>(false);
+
 const chatInstance = inject<Ref<ChatInstance>>("chatInstance");
 const vueInstance: any = getCurrentInstance();
 const msgComposerData = vueInstance?.parent?.type?.name === "CometChatMessageComposer" && vueInstance?.parent?.setupState;
@@ -53,8 +55,10 @@ onBeforeUnmount(() => {
 
 watchEffect(async () => {
     if (chatInstance && chatInstance.value.rescheduleInfo) {
+        isReschedule.value = true;
         showModal.value = true;
     } else {
+        isReschedule.value = false;
         showModal.value = false;
     }
 })
@@ -74,22 +78,32 @@ function closeModal() {
 
 function scheduleMessage(scheduleDate?: string) {
     if (scheduleDate && chatInstance) {
-        if (chatInstance.value.rescheduleInfo) {
-            rescheduleMessage(scheduleDate, props.chatUid, chatInstance.value.rescheduleInfo.rescheduleMuid, chatInstance.value.rescheduleInfo.messageId)
-        } else {
-            sendScheduledMessage(scheduleDate, props.chatUid, chatInstance).then((msgSuccessful) => {
-                if (!msgSuccessful) {
-                    showModal.value = false
-                    chatInstance.value.showAlert = true
-                    setTimeout(() => chatInstance.value.showAlert = false, 5000)
-                } else {
-                    showModal.value = false
-                    msgComposerData.messageText = "";
-                    msgComposerData.textRef = "";
-                    msgComposerData.inputRef?.emptyInputField();
-                }
-            });
-        }
+        sendScheduledMessage(scheduleDate, props.chatUid, chatInstance).then((msgSuccessful) => {
+            if (!msgSuccessful) {
+                showModal.value = false
+                chatInstance.value.showAlert = true
+                setTimeout(() => chatInstance.value.showAlert = false, 5000)
+            } else {
+                showModal.value = false
+                msgComposerData.messageText = "";
+                msgComposerData.textRef = "";
+                msgComposerData.inputRef?.emptyInputField();
+            }
+        });
+    }
+}
+
+function reschedule(scheduleDate?: string) {
+    if (scheduleDate && chatInstance && chatInstance.value.rescheduleInfo) {
+        rescheduleMessage(scheduleDate, props.chatUid, chatInstance.value.rescheduleInfo.rescheduleMuid, chatInstance.value.rescheduleInfo.messageId).then((successful) => {
+            if (!successful) {
+                showModal.value = false
+                chatInstance.value.showRescheduleAlert = true
+                setTimeout(() => chatInstance.value.showRescheduleAlert = false, 5000)
+            } else {
+                showModal.value = false
+            }
+        })
     }
 }
 </script>
@@ -99,5 +113,6 @@ function scheduleMessage(scheduleDate?: string) {
         <cometchat-button :iconURL="sendButtonIconURL" :buttonStyle="sendButtonStyle"
             :hoverText="localize('SCHEDULE_MESSAGE')" @click="sendMessage()" />
     </div>
-    <BccScheduledMessageModal v-if="showModal" @close="closeModal()" @send="scheduleMessage"></BccScheduledMessageModal>
+    <BccScheduledMessageModal v-if="showModal" @close="closeModal()" @schedule="scheduleMessage" @reschedule="reschedule" :isReschedule="isReschedule">
+    </BccScheduledMessageModal>
 </template>