quickblox-react-ui-kit 0.3.0-beta.2 → 0.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.3.0-beta.2",
+  "version": "0.3.0-beta.4",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "dependencies": {

package/src/App.scss

@@ -0,0 +1,3 @@
+body {
+  font-family: 'Roboto';
+}

package/src/App.tsx

@@ -27,7 +27,7 @@ function App() {
   const { connectionRepository } = useQBConnection();
 
   const initLoginData: LoginData = {
-    login: 'artimed', // vit1 380990579507
+    login: 'artik', // vit1 380990579507
     password: 'quickblox',
   };
 

package/src/Data/Creator.ts

@@ -66,7 +66,7 @@ export class Creator {
         if (error) {
           reject(error);
         } else {
-          resolve(result.blob.uid);
+          resolve(result!.blob.uid);
         }
       });
     });
@@ -99,7 +99,6 @@ export class Creator {
       name: '',
       size: 0,
       type: FileType.image,
-      data: '',
     };
   }
 }

package/src/Data/DefaultConfigurations.ts

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

package/src/Data/Stubs.ts

@@ -64,7 +64,6 @@ export class Stubs {
       name: '',
       size: 0,
       type: FileType.image,
-      data: '',
     };
   }
 
@@ -867,7 +866,7 @@ export class Stubs {
     login: string,
     created_at: string,
     updated_at: string,
-    last_request_at: string,
+    last_request_at: number,
     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',
-      '31.03.2023',
+      0,
     );
 
     const user12: UserEntity = Stubs.createUserEntityWithParams(
@@ -975,7 +974,7 @@ export class Stubs {
       'login_user12',
       '31.03.2023',
       '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',
-      '31.03.2023',
+      0,
     );
 
     users.push(user11);

package/src/Data/dto/file/RemoteFileDTO.ts

@@ -11,12 +11,12 @@ export class RemoteFileDTO {
 
   public type: string;
 
-  public data: string | File;
+  public data: File | undefined;
 
   constructor() {
     this.id = '';
     this.type = '';
-    this.data = '';
+    this.data = undefined;
 
     this.uid = '';
     this.url = '';

package/src/Data/dto/message/RemoteMessageDTO.ts

@@ -6,7 +6,7 @@ export class RemoteMessageDTO {
 
   public dialogId: string;
 
-  public message: string;
+  public message: string | null;
 
   public created_at: string;
 

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

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

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

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

package/src/Data/mapper/FileRemoteDTOMapper.ts

@@ -43,7 +43,7 @@ export class FileRemoteDTOMapper implements IMapper {
 
     fileDTO.size = fileEntity.size || 0;
 
-    fileDTO.data = fileEntity.data || '';
+    fileDTO.data = fileEntity.data;
 
     return Promise.resolve(fileDTO as TResult);
   }
@@ -143,11 +143,6 @@ export class FileRemoteDTOMapper implements IMapper {
 
   private static validateDTO(fileDTO: RemoteFileDTO) {
     const dtoValidator: DtoValidator<LocalFileDTO> = {
-      data(v: unknown): v is LocalFileDTO['data'] {
-        const { data } = v as LocalFileDTO;
-
-        return data !== undefined && data !== null;
-      },
       id(v: unknown): v is LocalFileDTO['id'] {
         const { id } = v as LocalFileDTO;
 
@@ -168,6 +163,13 @@ export class FileRemoteDTOMapper implements IMapper {
 
         return uid !== undefined && uid !== null;
       },
+      data(v: unknown): v is LocalFileDTO['data'] {
+        const { data, uid } = v as LocalFileDTO;
+
+        return <boolean>(
+          ((data !== undefined && data !== null) || (uid && uid.length > 0))
+        );
+      },
       url(v: unknown): v is LocalFileDTO['url'] {
         const { url } = v as LocalFileDTO;
 

package/src/Data/mapper/MessageRemoteDTOMapper.ts

@@ -112,7 +112,7 @@ export class MessageRemoteDTOMapper implements IMapper {
     messageEntity.created_at = messageDTO.created_at;
     messageEntity.date_sent = messageDTO.date_sent;
     messageEntity.delivered_ids = messageDTO.delivered_ids;
-    messageEntity.message = messageDTO.message;
+    messageEntity.message = messageDTO.message || '';
     messageEntity.read_ids = messageDTO.read_ids;
     messageEntity.read = messageDTO.read;
     messageEntity.recipient_id = messageDTO.recipient_id;

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.length > 0
+          last_request_at > 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: '',
+      last_request_at: 0,
       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.length > 0
+          last_request_at > 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: '',
+      last_request_at: 0,
       login: '',
       updated_at: '',
       user_tags: '',

package/src/Data/repository/DialogsRepository.ts

@@ -147,6 +147,22 @@ export default class DialogsRepository implements IDialogsRepository {
     }
   }
 
+  async updateCurrentDialogInLocalDataSource(
+    entity: DialogEntity,
+  ): Promise<DialogEntity> {
+    try {
+      const dto: RemoteDialogDTO = await this.dialogRemoteDTOMapper.fromEntity(
+        entity,
+      );
+
+      this.remoteDataSource.updateCurrentDialog(dto);
+
+      return Promise.resolve(entity);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }
+
   // eslint-disable-next-line class-methods-use-this,@typescript-eslint/no-unused-vars
   async updateDialogInRemote(entity: DialogEntity): Promise<DialogEntity> {
     const remoteDialogDTO: RemoteDialogDTO =

package/src/Data/repository/MessagesRepository.ts

@@ -224,7 +224,7 @@ export default class MessagesRepository implements IMessagesRepository {
 
   async saveMessageToLocal(entity: MessageEntity): Promise<MessageEntity> {
     try {
-      const dto: RemoteMessageDTO = await this.messageLocalDTOMapper.fromEntity(
+      const dto: LocalMessageDTO = await this.messageLocalDTOMapper.fromEntity(
         entity,
       );
 
@@ -260,7 +260,7 @@ export default class MessagesRepository implements IMessagesRepository {
 
   async updateMessageInLocal(entity: MessageEntity): Promise<boolean> {
     try {
-      const dto: RemoteMessageDTO = await this.messageLocalDTOMapper.fromEntity(
+      const dto: LocalMessageDTO = await this.messageLocalDTOMapper.fromEntity(
         entity,
       );
 

package/src/Data/repository/UsersRepository.ts

@@ -123,7 +123,7 @@ export default class UsersRepository {
 
         dto.id = userId.toString();
 
-        const userDTO: LocalUserDTO = await this.remoteDataSource.getUser(dto);
+        const userDTO: RemoteUserDTO = await this.remoteDataSource.getUser(dto);
 
         userEntity = await this.userRemoteDTOMapper.toEntity(userDTO);
       } catch (e) {

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

@@ -109,4 +109,6 @@ export interface IRemoteDataSource extends IRemoteMessaging<RemoteMessageDTO> {
   deleteFile(dto: RemoteFileDTO): Promise<void>;
 
   subscribeToChatConnectionEvents(fileId: string): Promise<void>;
+
+  updateCurrentDialog(dto: RemoteDialogDTO): void;
 }

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

@@ -18,9 +18,9 @@ export class FileDTOMapper implements IDTOMapper {
     FileDTOMapper.validateDTO(fileDTO);
 
     // eslint-disable-next-line @typescript-eslint/no-shadow
-    const fileContentParam: QBContentParam = {
+    const fileContentParam: QBBlobCreateUploadParams = {
       name: fileDTO.name || '',
-      file: fileDTO.data,
+      file: fileDTO.data!,
       type: fileDTO.type || '',
       size: fileDTO.size || 0,
       public: false, // optional, "false" by default
@@ -31,7 +31,7 @@ export class FileDTOMapper implements IDTOMapper {
 
   // eslint-disable-next-line class-methods-use-this
   toTDO<TArg, TResult>(qbEntity: TArg): Promise<TResult> {
-    const qbFile: QBContentObject = qbEntity as unknown as QBContentObject;
+    const qbFile: QBBlobCreate = qbEntity as unknown as QBBlobCreate;
 
     FileDTOMapper.validateQBFileDialog(qbFile);
 
@@ -145,27 +145,27 @@ export class FileDTOMapper implements IDTOMapper {
     return Promise.resolve();
   }
 
-  private static validateQBFileDialog(qbFile: QBContentObject) {
+  private static validateQBFileDialog(qbFile: QBBlobCreate) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    const qbFileValidator: DtoValidator<QBContentObject> = {
-      account_id(v: unknown): v is QBContentObject['account_id'] {
-        const { account_id } = v as QBContentObject;
+    const qbFileValidator: DtoValidator<QBBlobCreate> = {
+      account_id(v: unknown): v is QBBlobCreate['account_id'] {
+        const { account_id } = v as QBBlobCreate;
 
         return account_id !== undefined && account_id !== null;
       },
-      app_id(v: unknown): v is QBContentObject['app_id'] {
-        const { app_id } = v as QBContentObject;
+      app_id(v: unknown): v is QBBlobCreate['app_id'] {
+        const { app_id } = v as QBBlobCreate;
 
         return app_id !== undefined && app_id !== null;
       },
-      content_type(v: unknown): v is QBContentObject['content_type'] {
-        const { content_type } = v as QBContentObject;
+      content_type(v: unknown): v is QBBlobCreate['content_type'] {
+        const { content_type } = v as QBBlobCreate;
 
         return content_type !== undefined && content_type !== null;
       },
-      created_at(v: unknown): v is QBContentObject['created_at'] {
-        const { created_at } = v as QBContentObject;
+      created_at(v: unknown): v is QBBlobCreate['created_at'] {
+        const { created_at } = v as QBBlobCreate;
 
         return (
           created_at !== undefined &&
@@ -173,28 +173,28 @@ export class FileDTOMapper implements IDTOMapper {
           created_at.length > 0
         );
       },
-      id(v: unknown): v is QBContentObject['id'] {
-        const { id } = v as QBContentObject;
+      id(v: unknown): v is QBBlobCreate['id'] {
+        const { id } = v as QBBlobCreate;
 
         return id !== undefined && id !== null;
       },
-      name(v: unknown): v is QBContentObject['name'] {
-        const { name } = v as QBContentObject;
+      name(v: unknown): v is QBBlobCreate['name'] {
+        const { name } = v as QBBlobCreate;
 
         return name !== undefined && name !== null && name.length > 0;
       },
-      size(v: unknown): v is QBContentObject['size'] {
-        const { size } = v as QBContentObject;
+      size(v: unknown): v is QBBlobCreate['size'] {
+        const { size } = v as QBBlobCreate;
 
         return size !== undefined && size !== null;
       },
-      uid(v: unknown): v is QBContentObject['uid'] {
-        const { uid } = v as QBContentObject;
+      uid(v: unknown): v is QBBlobCreate['uid'] {
+        const { uid } = v as QBBlobCreate;
 
         return uid !== undefined && uid !== null && uid.length > 0;
       },
-      updated_at(v: unknown): v is QBContentObject['updated_at'] {
-        const { updated_at } = v as QBContentObject;
+      updated_at(v: unknown): v is QBBlobCreate['updated_at'] {
+        const { updated_at } = v as QBBlobCreate;
 
         return (
           updated_at !== undefined &&

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

@@ -143,7 +143,7 @@ export class MessageDTOMapper implements IDTOMapper {
 
       dto.recipient_id = qbMessage.recipient_id || 0;
       dto.attachments = MessageDTOMapper.transformAttachment(
-        qbMessage.message,
+        qbMessage.message || '',
         qbMessage.attachments || [],
       );
       dto.read = qbMessage.read;
@@ -163,7 +163,7 @@ export class MessageDTOMapper implements IDTOMapper {
 
       dto.recipient_id = qbMessage.recipient_id || 0;
       dto.attachments = MessageDTOMapper.transformAttachment(
-        qbMessage.message,
+        qbMessage.message || '',
         qbMessage.attachments || [],
       );
       dto.read = qbMessage.read || 1;

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

@@ -32,9 +32,7 @@ export class UserDTOMapper implements IDTOMapper {
       id: parseInt(userDTO.id, 10),
       last_request_at: userDTO.last_request_at,
       login: userDTO.login,
-      old_password: '',
       parents_contacts: '',
-      password: '',
       phone: '',
       updated_at: userDTO.updated_at,
       user_tags: userDTO.user_tags,