quickblox-react-ui-kit 0.5.1-beta.1 → 0.5.1-beta.2

package/src/Data/Stubs.ts

@@ -131,12 +131,12 @@ export class Stubs {
       id: '10231',
       type: FileType.image,
       uid: '10231',
-      url: 'https://files.readme.io/00b5563-small-qb-logo-docs-white-9px.png',
+      url: 'https://via.placeholder.com/600/92c952',
       file: {
         id: '10231',
         uid: '',
         type: FileType.image,
-        url: 'https://files.readme.io/00b5563-small-qb-logo-docs-white-9px.png',
+        url: 'https://via.placeholder.com/600/92c952',
       },
     };
     const photoAttachments: ChatMessageAttachmentEntity[] = [photo];
@@ -194,8 +194,8 @@ export class Stubs {
           '103',
           i % 9 === 0
             ? `${
-                i + 1
-              } very very very long test text message for dialog 103. The text message with huge text: bla-bla-bla long long long long, bla-bla-bla, very very very long test text message for dialog 103. very very very long test text message for dialog 103. etc`
+              i + 1
+            } very very very long test text message for dialog 103. The text message with huge text: bla-bla-bla long long long long, bla-bla-bla, very very very long test text message for dialog 103. very very very long test text message for dialog 103. etc`
             : `${i + 1} test message for dialog 103`,
           '31.03.2023',
           Date.now(),
@@ -267,12 +267,12 @@ export class Stubs {
       id: '10231',
       type: FileType.image,
       uid: '10231',
-      url: 'https://cdn-ikpjoif.nitrocdn.com/WZsqFPiehrtwFaaeJNQAQZrkRMgaTuyL/assets/images/optimized/rev-83f47e6/quickblox.com/wp-content/themes/QuickbloxTheme2021/img/chat-api-feature-rich-sdk.jpg',
+      url: 'https://via.placeholder.com/600/92c952',
       file: {
         id: '10231',
         uid: '',
         type: FileType.image,
-        url: 'https://cdn-ikpjoif.nitrocdn.com/WZsqFPiehrtwFaaeJNQAQZrkRMgaTuyL/assets/images/optimized/rev-83f47e6/quickblox.com/wp-content/themes/QuickbloxTheme2021/img/chat-api-feature-rich-sdk.jpg',
+        url: 'https://via.placeholder.com/600/92c952',
       },
     };
     const photoAttachments: ChatMessageAttachmentEntity[] = [photo];
@@ -345,8 +345,8 @@ export class Stubs {
           '103',
           i % 3 === 0
             ? `${
-                i + 1
-              } very very very long test text message for dialog 103. The text message with huge text: bla-bla-bla long long long long, bla-bla-bla, very very very long test text message for dialog 103. very very very long test text message for dialog 103. etc`
+              i + 1
+            } very very very long test text message for dialog 103. The text message with huge text: bla-bla-bla long long long long, bla-bla-bla, very very very long test text message for dialog 103. very very very long test text message for dialog 103. etc`
             : `${i + 1} test message for dialog 103`,
           '31.03.2023',
           Date.now(),
@@ -607,6 +607,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '2',
@@ -622,6 +623,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '3',
@@ -637,6 +639,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '4',
@@ -652,6 +655,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '5',
@@ -667,6 +671,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '6',
@@ -682,6 +687,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '7',
@@ -697,6 +703,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
     ];
 
@@ -720,6 +727,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;
@@ -742,6 +750,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;
@@ -764,6 +773,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;
@@ -1029,12 +1039,12 @@ export class Stubs {
       id: '10231',
       type: FileType.image,
       uid: '10231',
-      url: 'https://files.readme.io/00b5563-small-qb-logo-docs-white-9px.png',
+      url: 'https://via.placeholder.com/600/92c952',
       file: {
         id: '10231',
         uid: '',
         type: FileType.image,
-        url: 'https://files.readme.io/00b5563-small-qb-logo-docs-white-9px.png',
+        url: 'https://via.placeholder.com/600/92c952',
       },
     };
     const photoAttachments: ChatMessageAttachmentEntity[] = [photo];

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

@@ -29,6 +29,8 @@ export class RemoteDialogDTO {
 
   public photo: string;
 
+  public is_join_required: number | undefined | null;
+
   constructor() {
     this.id = '';
     this.type = 0;
@@ -54,5 +56,7 @@ export class RemoteDialogDTO {
     this.name = '';
 
     this.photo = '';
+
+    this.is_join_required = undefined;
   }
 }

package/src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -667,6 +667,12 @@ export class DialogRemoteDTOMapper implements IMapper {
 
         return updatedAt !== undefined;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!dtoValidator.id(data))

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

@@ -51,6 +51,7 @@ export class DialogDTOMapper implements IDTOMapper {
       updated_at: dialogDTO.updatedAt,
       user_id: parseInt(dialogDTO.ownerId, 10),
       xmpp_room_jid: null,
+      is_join_required: dialogDTO.is_join_required,
     };
 
     return Promise.resolve(dialog as TResult);
@@ -272,6 +273,12 @@ export class DialogDTOMapper implements IDTOMapper {
 
         return updatedAt !== undefined && updatedAt !== null;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!dialogDTOValidator.id(dto))
@@ -429,6 +436,12 @@ export class DialogDTOMapper implements IDTOMapper {
 
         return xmpp_room_jid !== undefined && xmpp_room_jid !== null;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!qbDialogValidator._id(qbDialog))

package/src/Presentation/Views/Dialog/useDialogViewModel.ts

@@ -184,11 +184,20 @@ export default function useDialogViewModel(
         setError((e as unknown as Error).message);
       });
 
-    //
-
     const senderIds = Array.from(
-      new Set(messagesDialog.map((msg) => msg.sender_id)),
+      new Set(
+        messagesDialog.flatMap((msg) => {
+          const ids = [msg.sender_id];
+
+          if (Array.isArray(msg.qb_original_messages) && msg.qb_original_messages.length > 0) {
+            ids.push(msg.qb_original_messages[0].sender_id);
+          }
+
+          return ids;
+        })
+      )
     );
+
     const missingSenderIds = senderIds.filter((id) => !(id in userDictionary));
 
     const getMissingSenderUsersFromDialogByIdsUseCase: GetUsersByIdsUseCase =
@@ -426,7 +435,10 @@ export default function useDialogViewModel(
     userTypingMessageUseCase.execute().catch((reason) => {
       const errorMessage: string = stringifyError(reason);
 
-      console.log('Error: have exception in sendTypingTextMessage: ', errorMessage);
+      console.log(
+        'Error: have exception in sendTypingTextMessage: ',
+        errorMessage,
+      );
     });
   };
 
@@ -684,6 +696,8 @@ export default function useDialogViewModel(
     relatedMessage: MessageEntity,
   ): Promise<void> => {
     //
+    const senderRepliedMessage = messagesToReply[0].sender;
+
     const replyMessagesUseCase: ReplyMessagesUseCase = new ReplyMessagesUseCase(
       new MessagesRepository(LOCAL_DATA_SOURCE, REMOTE_DATA_SOURCE),
       messagesToReply,
@@ -705,8 +719,36 @@ export default function useDialogViewModel(
           })
           .finally(() => {
             setMessages((prevState) => {
+
+              if (messageEntity.qb_original_messages) {
+                const nestedObj = messageEntity.qb_original_messages
+
+                if (nestedObj && nestedObj.length > 0) {
+                    nestedObj[0].sender = senderRepliedMessage;
+                    if (
+                      nestedObj[0].sender &&
+                      nestedObj[0].sender.full_name &&
+                      regex &&
+                      !regex.test(nestedObj[0].sender.full_name)
+                    ) {
+                      nestedObj[0].sender.full_name = 'Unknown';
+                    }
+                  messageEntity.qb_original_messages = nestedObj
+                }
+              }
+
+              if (
+                messageEntity.sender &&
+                messageEntity.sender.full_name &&
+                regex &&
+                !regex.test(messageEntity.sender.full_name)
+              ) {
+                messageEntity.sender.full_name = 'Unknown';
+              }
+
               const newState = [...prevState, messageEntity];
 
+
               return newState;
             });
           });

package/src/Presentation/Views/DialogList/useDialogListViewModel.ts

@@ -245,20 +245,36 @@ export default function useDialogListViewModel(
             .then((newItem) => {
               //
               setDialogs((prevDialogs) => {
-                const newDialogs = [
-                  ...prevDialogs,
-                  newItem as PublicDialogEntity,
-                ];
-
-                const sortedData = [...newDialogs].sort((a, b) => {
-                  return b.lastMessage.dateSent && a.lastMessage.dateSent
-                    ? new Date(b.lastMessage.dateSent).getTime() -
-                        new Date(a.lastMessage.dateSent).getTime()
-                    : new Date(b.updatedAt).getTime() -
-                        new Date(a.updatedAt).getTime();
+                let updatedDialogs: PublicDialogEntity[];
+
+                if (newItem.type === DialogType.private) {
+                  const filteredDialogs = prevDialogs.filter(d => d.id !== newItem.id);
+                  updatedDialogs = [...filteredDialogs, newItem as PublicDialogEntity];
+                } else {
+                  updatedDialogs = [...prevDialogs, newItem as PublicDialogEntity];
+                }
+
+                const sortedDialogs = updatedDialogs.sort((a, b) => {
+                  const aDate = a.lastMessage?.dateSent ?? a.updatedAt;
+                  const bDate = b.lastMessage?.dateSent ?? b.updatedAt;
+                  return new Date(bDate).getTime() - new Date(aDate).getTime();
                 });
 
-                return sortedData;
+                return sortedDialogs;
+                // const newDialogs = [
+                //   ...prevDialogs,
+                //   newItem as PublicDialogEntity,
+                // ];
+                //
+                // const sortedData = [...newDialogs].sort((a, b) => {
+                //   return b.lastMessage.dateSent && a.lastMessage.dateSent
+                //     ? new Date(b.lastMessage.dateSent).getTime() -
+                //         new Date(a.lastMessage.dateSent).getTime()
+                //     : new Date(b.updatedAt).getTime() -
+                //         new Date(a.updatedAt).getTime();
+                // });
+                //
+                // return sortedData;
               });
               //
             })

package/src/Presentation/layouts/Desktop/DesktopLayout.scss

@@ -60,3 +60,10 @@ $desktop-main-container-item-center-width: 720px;
   justify-content: center;
   height: 100%;
 }
+
+@media only screen and (max-width: 430px) {
+
+  .desktop-layout-main-container {
+    display: block;
+  }
+}

package/src/Presentation/ui-components/Header/Header.scss

@@ -71,6 +71,13 @@
   .dialog-header__body-left {
     gap: 3px;
   }
+
+  .dialog-header {
+    &__body {
+      width: unset;
+    }
+
+  }
 }
 @media only screen and (min-width: 981px) {
   .dialog-header__back {

package/src/QBconfig.ts

@@ -129,6 +129,8 @@ export const QBConfig: QBUIKitConfig = {
     },
     pingLocalhostTimeInterval: 5,
     chatReconnectionTimeInterval: 3,
+    showPublicDialogsInList: false,
+    allowPublicDialogCreation: false,
     debug: true,
     enableForwarding: true,
     enableReplying: true,

package/src/qb-api-calls/index.ts

@@ -468,6 +468,90 @@ export function QBCreateGroupDialog(
   });
 }
 
+// START
+
+export function QBCreatePrivateDialogWithAutojoinFalse(
+  userId: QBUser['id'],
+  dialogName?: string,
+  data?: Dictionary<unknown>,
+) {
+  console.log(
+    `call QBCreatePrivateDialog with userid: ${userId} dialog name: ${
+      dialogName || '-'
+    }`,
+  );
+
+  return new Promise<QBUIKitChatDialog>((resolve, reject) => {
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    const QB = getQB();
+
+    QB.chat.dialog.create(
+      { name: dialogName || '-', occupants_ids: [userId], type: 3, data, is_join_required: 0 },
+      (error, chat) => {
+        if (error) {
+          reject(stringifyError(error));
+        } else {
+          resolve(chat!);
+        }
+      },
+    );
+  });
+}
+export function QBCreateGroupDialogWithAutojoinFalse(
+  userIds: Array<QBUser['id']>,
+  dialogName?: string,
+  data?: Dictionary<unknown>,
+) {
+  console.log(
+    `call QBCreateGroupDialog with ids: ${JSON.stringify(userIds)} name: ${
+      dialogName || ''
+    }`,
+  );
+
+  let params = {};
+
+  if (data && data?.photo) {
+    params = {
+      name: dialogName || '-',
+      occupants_ids: [userIds],
+      type: 2,
+      photo: data?.photo,
+      is_join_required: 0,
+    };
+  } else {
+    params = {
+      name: dialogName || '-',
+      occupants_ids: [userIds],
+      type: 2,
+      is_join_required: 0
+    };
+  }
+
+  return new Promise<QBUIKitChatDialog>((resolve, reject) => {
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    const QB = getQB();
+
+    QB.chat.dialog.create(
+      // {
+      //   name: dialogName || '-',
+      //   occupants_ids: [userIds],
+      //   type: 2,
+      //   photo: data?.photo,
+      // },
+      params,
+      (error, chat) => {
+        if (error) {
+          reject(stringifyError(error));
+        } else {
+          resolve(chat!);
+        }
+      },
+    );
+  });
+}
+
+// END
+
 export function QBUpdateDialog(
   dialogId: QBUIKitChatDialog['_id'],
   data: Dictionary<unknown>,
@@ -491,16 +575,9 @@ export function QBJoinGroupDialog(dialogId: QBUIKitChatDialog['_id']) {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const QB = getQB();
     const dialogJid = QB.chat.helpers.getRoomJidFromDialogId(dialogId);
-
-    // QB.chat.muc.join(dialogJid, (error, res) => {
-    //   if (error) {
-    //     console.log('ERROR in QBJoinGroupDialog with join group dialog:', error);
-    //     reject(stringifyError(error));
-    //   } else {
-    //     console.log('QBJoinGroupDialog: join group dialog:', res);
-    //     resolve(res);
-    //   }
-    // });
+    // для ВЕРСИИ ТЕСТОВОГО ПРИМЕРА СПИСОК ДИАЛГОВ БЕЗ АВТОДЖОИНА нужно просто закомментировать
+    // содержимое этого
+    // метода
     QB.chat.muc.join(dialogJid, (error, res) => {
       if (error) {
         console.log('ERROR in QBJoinGroupDialog with join group dialog:', error);
@@ -555,7 +632,7 @@ export function QBLeaveDialog(dialogId: QBUIKitChatDialog['_id']) {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const QB = getQB();
     const dialogJid = QB.chat.helpers.getRoomJidFromDialogId(dialogId);
-
+    // unjoin
     QB.chat.muc.leave(dialogJid, (error, res) => {
       if (error) {
         reject(stringifyError(error));
@@ -613,34 +690,6 @@ export function QBCreateAndUploadContent(
   });
 }
 
-// export function QBChatGetMessages(
-//   dialogId: QBChatDialog['_id'],
-//   skip = 0,
-//   limit = 100,
-// ) {
-//   return new Promise<GetMessagesResult & { dialogId: QBChatDialog['_id'] }>(
-//     (resolve, reject) => {
-//       QB.chat.message.list(
-//         {
-//           chat_dialog_id: dialogId,
-//           sort_desc: 'date_sent',
-//           limit,
-//           skip,
-//           mark_as_read: 0,
-//         },
-//         (error, messages) => {
-//           if (error) {
-//             reject(stringifyError(error));
-//           } else {
-//             resolve({ ...messages, dialogId });
-//           }
-//         },
-//       );
-//     },
-//   );
-// }
-// //
-
 export function qbChatGetMessagesExtended(
   dialogId: QBUIKitChatDialog['_id'],
   params: Partial<{
@@ -773,9 +822,6 @@ export function QBWebRTCSessionGetUserMedia(
     });
   });
 }
-// export interface AIAnswerResponse {
-//   answer: string;
-// } // artim 19.05.2024
 
 export function QBAnswerAssist(
   smartChatAssistantId: string,