quickblox-react-ui-kit 0.5.2 → 0.5.3-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.5.2",
+  "version": "0.5.3-beta.1",
   "main": "dist/index-ui.js",
   "types": "dist/index-ui.d.ts",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "qb-ai-core": "^0.1.3",
     "qb-ai-rephrase": "^0.1.2",
     "qb-ai-translate": "^0.1.2",
-    "quickblox": "2.22.0-alpha.1",
+    "quickblox": "2.23.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-router-dom": "^6.11.1",

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

@@ -25,6 +25,9 @@ export class LocalDialogDTO {
 
   public photo: string;
 
+  // CSAMPLES-4138: persisted join flag (0 = skip join, 1/undefined/null = join).
+  public isJoinRequired?: number | null;
+
   constructor() {
     this.id = '';
     this.type = 0;
@@ -38,5 +41,6 @@ export class LocalDialogDTO {
     this.unreadMessageCount = 0;
     this.name = '';
     this.photo = '';
+    this.isJoinRequired = undefined;
   }
 }

package/src/Data/mapper/DialogLocalDTOMapper.ts

@@ -51,6 +51,9 @@ export class DialogLocalDTOMapper implements IMapper {
 
     dialog.photo = DialogLocalDTOMapper.getPhoto(dialogEntity);
 
+    // CSAMPLES-4138: persist the join flag into local storage.
+    dialog.isJoinRequired = (dialogEntity as GroupDialogEntity).isJoinRequired;
+
     return Promise.resolve(dialog as TResult);
   }
 
@@ -116,6 +119,8 @@ export class DialogLocalDTOMapper implements IMapper {
           dialog.name,
           dialog.photo,
         );
+        // CSAMPLES-4138: restore the join flag read from local storage.
+        (entity as GroupDialogEntity).isJoinRequired = dialog.isJoinRequired;
         break;
       default:
         return Promise.reject(

package/src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -60,6 +60,10 @@ export class DialogRemoteDTOMapper implements IMapper {
       dialog.name = DialogRemoteDTOMapper.getDialogName(dialogEntity);
 
       dialog.photo = DialogRemoteDTOMapper.getPhoto(dialogEntity) || '';
+
+      // CSAMPLES-4138: carry the join flag back into the remote DTO
+      // (needed by the typing path, where the DTO is built from a local entity).
+      dialog.is_join_required = (dialogEntity as GroupDialogEntity).isJoinRequired;
     } catch (e) {
       console.log('MAPPER ERROR for entity: ', JSON.stringify(entity));
     }
@@ -148,6 +152,8 @@ export class DialogRemoteDTOMapper implements IMapper {
             dialog.name,
             formatPhotoUrl(),
           );
+          // CSAMPLES-4138: propagate the join flag into the domain entity.
+          (entity as GroupDialogEntity).isJoinRequired = dialog.is_join_required;
           break;
         default:
           return Promise.reject(

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

@@ -164,6 +164,8 @@ export class DialogDTOMapper implements IDTOMapper {
           dto.name = qbDialog.name;
           dto.photo = qbDialog.photo === null ? '' : qbDialog.photo;
           dto.participantsIds = qbDialog.occupants_ids;
+          // CSAMPLES-4138: carry the server "is join required" flag into the DTO.
+          dto.is_join_required = qbDialog.is_join_required;
           break;
         default:
           dto.id = qbDialog._id;

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

@@ -109,6 +109,8 @@ export class RemoteDataSource implements IRemoteDataSource {
   private joinStatusMap: Map<string, boolean> = new Map();
   private joinCheckInterval: NodeJS.Timeout | null = null;
   private processedDialogs = new Set<string>();
+  // CSAMPLES-4138: group dialogs with is_join_required===0 (join must be skipped).
+  private skipJoinDialogs = new Set<string>();
   private userCache: Map<string, RemoteUserDTO> = new Map();
   private userCachePreloadInterval: NodeJS.Timeout | null = null;
 
@@ -427,6 +429,8 @@ export class RemoteDataSource implements IRemoteDataSource {
 
   public resetProcessedDialogs(): void {
     this.processedDialogs.clear();
+    // CSAMPLES-4138: reset the join-skip cache with the rest of per-session state.
+    this.skipJoinDialogs.clear();
   }
 
   public async disconnectAndLogoutUser() {
@@ -905,6 +909,48 @@ export class RemoteDataSource implements IRemoteDataSource {
     }
   }
 
+  /**
+   * CSAMPLES-4138: single source of truth for the "is join required" rule.
+   * is_join_required === 0 => skip join. undefined/null/1 => join (legacy).
+   * SIDE EFFECT: when an explicit flag is passed, caches the skip decision in
+   * skipJoinDialogs so later flag-less call sites (sendMessage) can reuse it.
+   * @param dialogId target group dialog id.
+   * @param isJoinRequired server flag when known (variant B); omit to fall back
+   *   to the skipJoinDialogs cache (variant A).
+   */
+  private isJoinRequiredForDialog(
+    dialogId: string,
+    isJoinRequired?: number | null,
+  ): boolean {
+    if (isJoinRequired !== undefined && isJoinRequired !== null) {
+      // B: explicit flag wins — remember the skip decision for flag-less callers.
+      if (isJoinRequired === 0) {
+        this.skipJoinDialogs.add(dialogId);
+      } else {
+        this.skipJoinDialogs.delete(dialogId);
+      }
+      return isJoinRequired !== 0;
+    }
+    if (this.skipJoinDialogs.has(dialogId)) {
+      return false; // A: cache filled during getDialogs / prior typing.
+    }
+    return true; // fallback: unknown dialog → join (legacy behavior).
+  }
+
+  /**
+   * CSAMPLES-4138: join wrapper that respects the "is join required" rule.
+   * Pass isJoinRequired when the flag is known at the call site.
+   */
+  private async joinGroupDialogIfRequired(
+    dialogId: string,
+    isJoinRequired?: number | null,
+  ): Promise<void> {
+    if (!this.isJoinRequiredForDialog(dialogId, isJoinRequired)) {
+      return; // skip join
+    }
+    await this.joinGroupDialog(dialogId);
+  }
+
   //version 0.5.0-beta.11,12,14
   private startJoinRetryProcess(): void {
     if (this.joinCheckInterval) return;
@@ -988,7 +1034,11 @@ export class RemoteDataSource implements IRemoteDataSource {
         if (newDTO.type === DialogType.group && !this.processedDialogs.has(newDTO.id)) {
           this.processedDialogs.add(newDTO.id);
 
-          if (!this.joinStatusMap.has(newDTO.id)) {
+          // CSAMPLES-4138: skip join when the server flag says it's not required.
+          if (!this.isJoinRequiredForDialog(newDTO.id, newDTO.is_join_required)) {
+            // isJoinRequiredForDialog already cached the skip; never enters joinStatusMap.
+            this.skipJoinDialogs.add(newDTO.id);
+          } else if (!this.joinStatusMap.has(newDTO.id)) {
             this.joinStatusMap.set(newDTO.id, false);
             joinDialogIds.push(newDTO.id);
           }
@@ -1629,7 +1679,11 @@ export class RemoteDataSource implements IRemoteDataSource {
 
     if (dialogDTO.type === DialogType.group) {
       if (!this.joinStatusMap.has(dialogDTO.id)) {
-        await this.joinGroupDialog(dialogDTO.id);
+        // CSAMPLES-4138: respect the join flag (known here from the DTO).
+        await this.joinGroupDialogIfRequired(
+          dialogDTO.id,
+          dialogDTO.is_join_required,
+        );
       }
       // await QBJoinGroupDialog(dialogDTO.id).catch(() => {
       //   throw new RemoteDataSourceException(
@@ -1763,7 +1817,8 @@ export class RemoteDataSource implements IRemoteDataSource {
       // if (!this.joinStatusMap.has(dto.dialogId)) {
       //   await this.joinGroupDialog(dto.dialogId);
       // }
-      await this.joinGroupDialog(dto.dialogId);
+      // CSAMPLES-4138: no dialog flag here — rely on the skipJoinDialogs cache.
+      await this.joinGroupDialogIfRequired(dto.dialogId);
       const dialogJid = QB.chat.helpers.getRoomJidFromDialogId(dto.dialogId);
       try {
         qbMessageId = await QBChatSendMessage(dialogJid, qbEntity);

package/src/Domain/entity/DialogEntity.ts

@@ -12,4 +12,6 @@ export interface DialogEntity {
   lastMessage: LastMessageEntity;
   unreadMessageCount: number;
   customData: CustomDataEntity;
+  // CSAMPLES-4138: 0 = join not required (skip join), 1/undefined/null = join (legacy).
+  isJoinRequired?: number | null;
 }

package/src/Domain/entity/GroupDialogEntity.ts

@@ -28,6 +28,9 @@ export class GroupDialogEntity implements DialogEntity {
 
   photo: string | null;
 
+  // CSAMPLES-4138: 0 = join not required (skip join), 1/undefined/null = join (legacy).
+  isJoinRequired?: number | null;
+
   constructor(
     customData: CustomDataEntity,
     id: string,