quickblox-react-ui-kit 0.3.1-beta.1 → 0.3.1-beta.3

package/dist/qb-api-calls/index.d.ts

@@ -1,4 +1,4 @@
-import { GetMessagesResult, GetUserParams, ListUserParams, ListUserResponse, QBBlob, QBBlobCreateUploadParams, QBCustomObject, QBDataDeletedResponse, QBGetDialogResult, QBLoginParams, QBMediaParams, QBMessageStatusParams, QBSession, QBSystemMessage, QBUser, QBUserCreateParams, QBWebRTCSession } from 'quickblox/quickblox';
+import { ChatConnectParams, GetMessagesResult, GetUserParams, ListUserParams, ListUserResponse, QBBlob, QBBlobCreateUploadParams, QBCustomObject, QBDataDeletedResponse, QBGetDialogResult, QBLoginParams, QBMediaParams, QBMessageStatusParams, QBSession, QBSystemMessage, QBUser, QBUserCreateParams, QBWebRTCSession } from 'quickblox/quickblox';
 import { QBUIKitChatDialog, QBUIKitChatNewMessage, QBUIKitConfig } from '../CommonTypes/CommonTypes';
 export type QBInitParams = {
     appIdOrToken: string | number;
@@ -70,4 +70,5 @@ export declare function QBChatSendSystemMessage(to: QBUser['id'] | string, messa
     extension: QBSystemMessage['extension'];
 }): Promise<string>;
 export declare function QBChatMarkMessageRead(params: QBMessageStatusParams): void;
+export declare function QBChatMarkMessageDelivered(params: QBMessageStatusParams): void;
 export declare function QBWebRTCSessionGetUserMedia(session: QBWebRTCSession, params: QBMediaParams): Promise<MediaStream | undefined>;

package/global.d.ts

@@ -173,32 +173,32 @@ type Dictionary<T> = Record<string, T>;
 // }
 
 // TODO: add export to SDK
-type ChatConnectParams =
-  | {
-      /** Connect to the chat by user id */
-      userId: QBUser['id'];
-      /** The user's password or session token */
-      password: string;
-    }
-  | {
-      /** Connect to the chat by user jid */
-      jid: string;
-      /** The user's password or session token */
-      password: string;
-    }
-  | {
-      /** Connect to the chat by user's email */
-      email: string;
-      /** The user's password or session token */
-      password: string;
-    };
-
-type QBCustomField =
-  | string
-  | string[]
-  | number
-  | number[]
-  | boolean
-  | boolean[]
-  | null
-  | undefined;
+// type ChatConnectParams =
+//   | {
+//       /** Connect to the chat by user id */
+//       userId: QBUser['id'];
+//       /** The user's password or session token */
+//       password: string;
+//     }
+//   | {
+//       /** Connect to the chat by user jid */
+//       jid: string;
+//       /** The user's password or session token */
+//       password: string;
+//     }
+//   | {
+//       /** Connect to the chat by user's email */
+//       email: string;
+//       /** The user's password or session token */
+//       password: string;
+//     };
+//
+// type QBCustomField =
+//   | string
+//   | string[]
+//   | number
+//   | number[]
+//   | boolean
+//   | boolean[]
+//   | null
+//   | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.3.1-beta.1",
+  "version": "0.3.1-beta.3",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "dependencies": {
@@ -12,7 +12,7 @@
     "qb-ai-core": "^0.1.3",
     "qb-ai-rephrase": "^0.1.2",
     "qb-ai-translate": "^0.1.2",
-    "quickblox": "^2.16.2",
+    "quickblox": "^2.16.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.11.1",

package/src/CommonTypes/CommonTypes.ts

@@ -5,6 +5,7 @@ import {
   QBChatDialog,
   QBChatNewMessage,
   QBConfig,
+  QBCustomField,
 } from 'quickblox';
 import { Tone } from '../Presentation/Views/Dialog/AIWidgets/Tone';
 

package/src/Data/DefaultConfigurations.ts

@@ -137,10 +137,10 @@ export class DefaultConfigurations {
   static getDefaultQBConfig(): QBUIKitConfig {
     return {
       credentials: {
-        appId: 75949,
-        accountKey: 'uK_8uinNyz8-npTNB6tx',
-        authKey: 'DdS7zxMEm5Q7DaS',
-        authSecret: 'g88RhdOjnDOqFkv',
+        appId: -1,
+        accountKey: '',
+        authKey: '',
+        authSecret: '',
         sessionToken: '',
       },
       configAIApi: {

package/src/Data/Stubs.ts

@@ -105,10 +105,9 @@ export class Stubs {
     for (const item of dialogsEntities) {
       const dialogDTO: LocalDialogDTO =
         // eslint-disable-next-line no-await-in-loop
-        await dialogsDTOtoEntityMapper.fromEntity<
-          DialogEntity,
-          RemoteDialogDTO
-        >(item);
+        await dialogsDTOtoEntityMapper.fromEntity<DialogEntity, LocalDialogDTO>(
+          item,
+        );
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars,promise/catch-or-return,promise/always-return
       ds.saveDialog(dialogDTO)
@@ -537,7 +536,7 @@ export class Stubs {
         dto.id = '111';
         dto.lastMessageDateSent = 0;
         dto.lastMessageText = 'text test';
-        dto.lastMessageUserId = '777';
+        dto.lastMessageUserId = 777;
         dto.ownerId = '999';
         dto.type = dialogType;
         dto.unreadMessageCount = 555;
@@ -548,7 +547,7 @@ export class Stubs {
         dto.id = '111';
         dto.lastMessageDateSent = 0;
         dto.lastMessageText = 'text test';
-        dto.lastMessageUserId = '777';
+        dto.lastMessageUserId = 777;
         dto.ownerId = '999';
         dto.type = dialogType;
         dto.unreadMessageCount = 555;
@@ -560,7 +559,7 @@ export class Stubs {
         dto.id = '111';
         dto.lastMessageDateSent = 0;
         dto.lastMessageText = 'text test';
-        dto.lastMessageUserId = '777';
+        dto.lastMessageUserId = 777;
         dto.ownerId = '999';
         dto.type = dialogType;
         dto.unreadMessageCount = 555;
@@ -604,7 +603,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -619,7 +618,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -634,7 +633,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -649,7 +648,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -664,7 +663,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -679,7 +678,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -694,7 +693,7 @@ export class Stubs {
         participantsIds: [],
         lastMessageText: '',
         lastMessageDateSent: 0,
-        lastMessageUserId: '',
+        lastMessageUserId: 0,
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
@@ -867,7 +866,7 @@ export class Stubs {
     login: string,
     created_at: string,
     updated_at: string,
-    last_request_at: number,
+    last_request_at: string,
     custom_data: string | null = null,
     user_tags: string | null = null,
     blob_id = '',
@@ -965,7 +964,7 @@ export class Stubs {
       'login_user11',
       '31.03.2023',
       '31.03.2023',
-      0,
+      '',
     );
 
     const user12: UserEntity = Stubs.createUserEntityWithParams(
@@ -975,7 +974,7 @@ export class Stubs {
       'login_user12',
       '31.03.2023',
       '31.03.2023',
-      0,
+      '',
     );
 
     const user13: UserEntity = Stubs.createUserEntityWithParams(
@@ -985,7 +984,7 @@ export class Stubs {
       'login_user13',
       '31.03.2023',
       '31.03.2023',
-      0,
+      '',
     );
 
     users.push(user11);

package/src/Data/dto/dialog/RemoteDialogDTO.ts

@@ -17,7 +17,7 @@ export class RemoteDialogDTO {
 
   public lastMessageText: string;
 
-  public lastMessageUserId: string;
+  public lastMessageUserId: number;
 
   public lastMessageDateSent: number;
 
@@ -43,7 +43,7 @@ export class RemoteDialogDTO {
 
     this.lastMessageText = '';
 
-    this.lastMessageUserId = '';
+    this.lastMessageUserId = 0;
 
     this.lastMessageDateSent = 0;
 

package/src/Data/dto/user/LocalUserDTO.ts

@@ -13,7 +13,7 @@ export class LocalUserDTO {
 
   public updated_at: string;
 
-  public last_request_at: number;
+  public last_request_at: string;
 
   public custom_data: string | null;
 
@@ -29,7 +29,7 @@ export class LocalUserDTO {
     this.login = '';
     this.created_at = '';
     this.updated_at = '';
-    this.last_request_at = 0;
+    this.last_request_at = '';
     this.custom_data = '';
     this.user_tags = '';
     this.blob_id = '';

package/src/Data/dto/user/RemoteUserDTO.ts

@@ -13,7 +13,7 @@ export class RemoteUserDTO {
 
   public updated_at: string;
 
-  public last_request_at: number;
+  public last_request_at: string;
 
   public custom_data: string | null;
 
@@ -29,7 +29,7 @@ export class RemoteUserDTO {
     this.login = '';
     this.created_at = '';
     this.updated_at = '';
-    this.last_request_at = 0;
+    this.last_request_at = '';
     this.custom_data = '';
     this.user_tags = '';
     this.blob_id = 0;

package/src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -50,7 +50,7 @@ export class DialogRemoteDTOMapper implements IMapper {
 
     dialog.lastMessageText = dialogEntity.lastMessage.text;
 
-    dialog.lastMessageUserId = dialogEntity.lastMessage.userId.toString();
+    dialog.lastMessageUserId = dialogEntity.lastMessage.userId;
 
     dialog.lastMessageDateSent = dialogEntity.lastMessage.dateSent;
 
@@ -74,10 +74,16 @@ export class DialogRemoteDTOMapper implements IMapper {
     );
 
     function formatPhotoUrl() {
-      if (dialog.photo && dialog.photo !== 'null') {
+      if (
+        !dialog.photo.includes('https') &&
+        dialog.photo &&
+        dialog.photo !== 'null'
+      ) {
         return dialog.photo && QB.content.privateUrl(dialog.photo);
       }
 
+      if (dialog.photo.includes('https')) return dialog.photo;
+
       return '';
     }
     switch (dialog.type) {
@@ -89,7 +95,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           {
             dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
-            userId: parseInt(dialog.lastMessageUserId, 10),
+            userId: dialog.lastMessageUserId,
           },
           dialog.ownerId,
           dialog.type,
@@ -105,7 +111,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           {
             dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
-            userId: parseInt(dialog.lastMessageUserId, 10),
+            userId: dialog.lastMessageUserId,
           },
           dialog.ownerId,
           dialog.type,
@@ -122,7 +128,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           {
             dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
-            userId: parseInt(dialog.lastMessageUserId, 10),
+            userId: dialog.lastMessageUserId,
           },
           dialog.ownerId,
           dialog.type,
@@ -555,16 +561,10 @@ export class DialogRemoteDTOMapper implements IMapper {
 
     switch (dialogType) {
       case DialogType.private:
-        dialogEntity =
-          entity instanceof PrivateDialogEntity
-            ? (entity as unknown as PrivateDialogEntity)
-            : null;
+        dialogEntity = entity as PrivateDialogEntity;
         break;
       case DialogType.public:
-        dialogEntity =
-          entity instanceof PublicDialogEntity
-            ? (entity as unknown as PublicDialogEntity)
-            : null;
+        dialogEntity = entity as PublicDialogEntity;
         break;
       case DialogType.group:
         dialogEntity = entity as GroupDialogEntity;

package/src/Data/mapper/UserLocalDTOMapper.ts

@@ -134,7 +134,7 @@ export class UserLocalDTOMapper implements IMapper {
         return (
           last_request_at !== undefined &&
           last_request_at !== null &&
-          last_request_at > 0
+          last_request_at.length > 0
         );
       },
       login(v: unknown): v is UserEntity['login'] {
@@ -376,7 +376,7 @@ export class UserLocalDTOMapper implements IMapper {
       email: '',
       full_name: '',
       id: 0,
-      last_request_at: 0,
+      last_request_at: '',
       login: '',
       updated_at: '',
       user_tags: '',

package/src/Data/mapper/UserRemoteDTOMapper.ts

@@ -146,7 +146,7 @@ export class UserRemoteDTOMapper implements IMapper {
         return (
           last_request_at !== undefined &&
           last_request_at !== null &&
-          last_request_at > 0
+          last_request_at.length > 0
         );
       },
       login(v: unknown): v is UserEntity['login'] {
@@ -387,7 +387,7 @@ export class UserRemoteDTOMapper implements IMapper {
       email: '',
       full_name: '',
       id: 0,
-      last_request_at: 0,
+      last_request_at: '',
       login: '',
       updated_at: '',
       user_tags: '',

package/src/Data/source/remote/Mapper/DialogDTOMapper.ts

@@ -38,7 +38,7 @@ export class DialogDTOMapper implements IDTOMapper {
       ),
       last_message_date_sent: dialogDTO.lastMessageDateSent,
       last_message_id: null,
-      last_message_user_id: parseInt(dialogDTO.lastMessageUserId, 10),
+      last_message_user_id: dialogDTO.lastMessageUserId,
       name: dialogDTO.name,
       occupants_ids: dialogDTO.participantsIds,
       new_occupants_ids: dialogDTO.newParticipantsIds
@@ -70,9 +70,9 @@ export class DialogDTOMapper implements IDTOMapper {
     dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
     dto.lastMessageUserId =
       qbDialog.last_message_user_id === null
-        ? ''
+        ? 0
         : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-          qbDialog.last_message_user_id.toString();
+          qbDialog.last_message_user_id;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     dto.ownerId = qbDialog.user_id.toString();
     dto.type = qbDialog.type as number;
@@ -104,9 +104,9 @@ export class DialogDTOMapper implements IDTOMapper {
         dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
-            ? ''
+            ? 0
             : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-              qbDialog.last_message_user_id.toString();
+              qbDialog.last_message_user_id;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;
@@ -122,9 +122,9 @@ export class DialogDTOMapper implements IDTOMapper {
         dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
-            ? ''
+            ? 0
             : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-              qbDialog.last_message_user_id.toString();
+              qbDialog.last_message_user_id;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;
@@ -144,9 +144,9 @@ export class DialogDTOMapper implements IDTOMapper {
         dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
-            ? ''
+            ? 0
             : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-              qbDialog.last_message_user_id.toString();
+              qbDialog.last_message_user_id;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;

package/src/Data/source/remote/RemoteDataSource.ts

@@ -13,6 +13,7 @@ import QB, {
   QBSession,
   QBSystemMessage,
   QBUser,
+  QBMessageStatusParams,
 } from 'quickblox/quickblox';
 import { RemoteDialogDTO } from '../../dto/dialog/RemoteDialogDTO';
 import {
@@ -36,6 +37,7 @@ import {
   QBChatConnect,
   QBChatDisconnect,
   qbChatGetMessagesExtended,
+  QBChatMarkMessageDelivered,
   QBChatMarkMessageRead,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   // QBChatMarkMessageRead,
@@ -177,8 +179,40 @@ export class RemoteDataSource implements IRemoteDataSource {
       new SubscriptionPerformer<RemoteMessageDTO>();
   }
 
-  updateCurrentDialog(dto: RemoteDialogDTO): void {
+  async updateCurrentDialog(dto: RemoteDialogDTO): Promise<void> {
     this.currentDialog = dto;
+    //
+    //
+    const dialogsDTOtoEntityMapper: IMapper = new DialogRemoteDTOMapper();
+
+    const dialogEntity: DialogEntity = await dialogsDTOtoEntityMapper.toEntity(
+      this.currentDialog,
+    );
+    const userId = this._authInformation?.userId || -1;
+    const dialogId = this.currentDialog.id;
+    const messageId = this.currentDialog.lastMessageId;
+    //
+    //
+    const resultMessage: DialogEventInfo = {
+      eventMessageType: EventMessageType.LocalMessage,
+      dialogInfo: dialogEntity,
+      messageInfo: undefined,
+      messageStatus: {
+        isTyping: false,
+        userId,
+        dialogId,
+        messageId,
+        deliveryStatus: 'delivered',
+      },
+      notificationTypes: undefined,
+    };
+
+    this.subscriptionOnMessageStatus.informSubscribers(
+      resultMessage,
+      EventMessageType.LocalMessage,
+    );
+    //
+    //
   }
 
   public async setUpMockStorage(): Promise<void> {
@@ -468,7 +502,7 @@ export class RemoteDataSource implements IRemoteDataSource {
         .then(async (result) => {
           //
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const currentUserId = this._authInformation?.userId;
+
           const dialogs: QBChatDialog[] | undefined = result?.items.filter(
             (v) => v._id === dialogId,
           );
@@ -790,6 +824,15 @@ export class RemoteDataSource implements IRemoteDataSource {
         }
 
         //
+        const currentUserId = this._authInformation?.userId || 0;
+        const statusMessageParams: QBMessageStatusParams = {
+          userId: newDTO.lastMessageUserId || currentUserId,
+          dialogId: newDTO.id,
+          messageId: newDTO.lastMessageId,
+        };
+
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        QBChatMarkMessageDelivered(statusMessageParams);
 
         dialogsDTO.push(newDTO);
       }

package/src/Domain/entity/UserEntity.ts

@@ -5,7 +5,7 @@ export interface UserEntity {
   login: string;
   created_at: string;
   updated_at: string;
-  last_request_at: number;
+  last_request_at: string;
   blob_id: string | null;
   photo: string | null;
   custom_data: string | null;

package/src/Presentation/Views/Dialog/MessageItem/MessageItem.tsx

@@ -150,8 +150,8 @@ export default function MessageItem({
       <div className="message-item-additional-part__actions">
         <MessageContextMenu
           message={message}
-          onReply={onReply}
-          onForward={onForward}
+          onReply={() => onReply(item)}
+          onForward={() => onForward(item)}
           enableReplying={enableReplying}
           enableForwarding={enableForwarding}
           disableActions={disableAction}