stream-chat-angular 4.31.1 → 4.31.2

package/assets/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.31.1";
+export declare const version = "4.31.2";

package/bundles/stream-chat-angular.umd.js

@@ -356,7 +356,7 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var version = '4.31.1';
+    var version = '4.31.2';
 
     /**
      * The `NotificationService` can be used to add or remove notifications. By default the [`NotificationList`](../components/NotificationListComponent.mdx) component displays the currently active notifications.
@@ -718,6 +718,7 @@
             this.usersTypingInThreadSubject = new rxjs.BehaviorSubject([]);
             this._shouldMarkActiveChannelAsRead = true;
             this.isStateRecoveryInProgress = false;
+            this.channelQueryStateSubject = new rxjs.BehaviorSubject(undefined);
             this.channelListSetter = function (channels) {
                 var currentChannels = _this.channelsSubject.getValue() || [];
                 var newChannels = channels.filter(function (c) { return !currentChannels.find(function (channel) { return channel.cid === c.cid; }); });
@@ -775,6 +776,7 @@
                 this.latestMessageDateByUserByChannelsSubject.asObservable();
             this.activeChannelPinnedMessages$ =
                 this.activeChannelPinnedMessagesSubject.asObservable();
+            this.channelQueryState$ = this.channelQueryStateSubject.asObservable();
         }
         Object.defineProperty(ChannelService.prototype, "shouldMarkActiveChannelAsRead", {
             /**
@@ -986,27 +988,21 @@
                     switch (_h.label) {
                         case 0:
                             this.filters = filters;
-                            this.options = options || {
-                                offset: 0,
-                                limit: 25,
-                                state: true,
-                                presence: true,
-                                watch: true,
-                                message_limit: this.messagePageSize,
-                            };
+                            this.options = Object.assign({ offset: 0, limit: 25, state: true, presence: true, watch: true, message_limit: this.messagePageSize }, options);
                             this.sort = sort || { last_message_at: -1, updated_at: -1 };
                             this.shouldSetActiveChannel = shouldSetActiveChannel;
+                            this.clientEventsSubscription = this.chatClientService.events$.subscribe(function (notification) { return void _this.handleNotification(notification); });
                             _h.label = 1;
                         case 1:
                             _h.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, this.queryChannels(this.shouldSetActiveChannel)];
                         case 2:
                             result = _h.sent();
-                            this.clientEventsSubscription = this.chatClientService.events$.subscribe(function (notification) { return void _this.handleNotification(notification); });
                             return [2 /*return*/, result];
                         case 3:
                             error_1 = _h.sent();
-                            this.notificationService.addPermanentNotification('streamChat.Error loading channels', 'error');
+                            this.dismissErrorNotification =
+                                this.notificationService.addPermanentNotification('streamChat.Error loading channels', 'error');
                             throw error_1;
                         case 4: return [2 /*return*/];
                     }
@@ -1017,10 +1013,13 @@
          * Resets the `activeChannel$`, `channels$` and `activeChannelMessages$` Observables. Useful when disconnecting a chat user, use in combination with [`disconnectUser`](./ChatClientService.mdx/#disconnectuser).
          */
         ChannelService.prototype.reset = function () {
-            var _a;
+            var _a, _b;
             this.deselectActiveChannel();
             this.channelsSubject.next(undefined);
+            this.channelQueryStateSubject.next(undefined);
             (_a = this.clientEventsSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            (_b = this.dismissErrorNotification) === null || _b === void 0 ? void 0 : _b.call(this);
+            this.dismissErrorNotification = undefined;
         };
         /**
          * Loads the next page of channels. The page size can be set in the [query option](https://getstream.io/chat/docs/javascript/query_channels/?language=javascript#query-options) object.
@@ -1462,7 +1461,7 @@
             switch (clientEvent.eventType) {
                 case 'connection.recovered': {
                     void this.ngZone.run(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var _a_1;
+                        var shoulSetActiveChannel, _a_1;
                         return __generator(this, function (_h) {
                             switch (_h.label) {
                                 case 0:
@@ -1476,7 +1475,9 @@
                                     if (this.options) {
                                         this.options.offset = 0;
                                     }
-                                    return [4 /*yield*/, this.queryChannels(false, true)];
+                                    shoulSetActiveChannel = this.shouldSetActiveChannel &&
+                                        !this.activeChannelSubject.getValue();
+                                    return [4 /*yield*/, this.queryChannels(shoulSetActiveChannel || false, true)];
                                 case 2:
                                     _h.sent();
                                     // Thread messages are not refetched so active thread gets deselected to avoid displaying stale messages
@@ -1737,6 +1738,7 @@
         };
         ChannelService.prototype.queryChannels = function (shouldSetActiveChannel, recoverState) {
             if (recoverState === void 0) { recoverState = false; }
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var channels, prevChannels, currentActiveChannel_1, error_6;
                 var _this = this;
@@ -1744,6 +1746,7 @@
                     switch (_h.label) {
                         case 0:
                             _h.trys.push([0, 2, , 3]);
+                            this.channelQueryStateSubject.next({ state: 'in-progress' });
                             return [4 /*yield*/, this.chatClientService.chatClient.queryChannels(this.filters, this.sort || {}, this.options)];
                         case 1:
                             channels = _h.sent();
@@ -1757,16 +1760,29 @@
                                 !currentActiveChannel_1 &&
                                 shouldSetActiveChannel) {
                                 this.setAsActiveChannel(channels[0]);
+                                currentActiveChannel_1 = this.activeChannelSubject.getValue();
                             }
                             if (recoverState &&
                                 !channels.find(function (c) { return c.cid === (currentActiveChannel_1 === null || currentActiveChannel_1 === void 0 ? void 0 : currentActiveChannel_1.cid); })) {
                                 this.deselectActiveChannel();
                             }
                             this.hasMoreChannelsSubject.next(channels.length >= this.options.limit);
+                            this.channelQueryStateSubject.next({ state: 'success' });
+                            if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.keepAliveChannels$OnError) &&
+                                this.dismissErrorNotification) {
+                                this.dismissErrorNotification();
+                            }
                             return [2 /*return*/, channels];
                         case 2:
                             error_6 = _h.sent();
-                            this.channelsSubject.error(error_6);
+                            if (!((_b = this.options) === null || _b === void 0 ? void 0 : _b.keepAliveChannels$OnError)) {
+                                this.channelsSubject.error(error_6);
+                            }
+                            this.channelQueryStateSubject.next({
+                                state: 'error',
+                                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                                error: error_6,
+                            });
                             throw error_6;
                         case 3: return [2 /*return*/];
                     }
@@ -4511,8 +4527,20 @@
             this.channelService = channelService;
             this.themeService = themeService;
             this.subscriptions = [];
-            this.isError$ = this.channelService.channels$.pipe(operators.map(function () { return false; }), operators.catchError(function () { return rxjs.of(true); }), operators.startWith(false));
-            this.isInitializing$ = this.channelService.channels$.pipe(operators.map(function (channels) { return !channels; }), operators.catchError(function () { return rxjs.of(false); }));
+            this.isError$ = rxjs.combineLatest([
+                this.channelService.channelQueryState$,
+                this.channelService.activeChannel$,
+            ]).pipe(operators.map(function (_a) {
+                var _b = __read(_a, 2), state = _b[0], activeChannel = _b[1];
+                return !activeChannel && (state === null || state === void 0 ? void 0 : state.state) === 'error';
+            }));
+            this.isInitializing$ = rxjs.combineLatest([
+                this.channelService.channelQueryState$,
+                this.channelService.activeChannel$,
+            ]).pipe(operators.map(function (_a) {
+                var _b = __read(_a, 2), state = _b[0], activeChannel = _b[1];
+                return !activeChannel && (state === null || state === void 0 ? void 0 : state.state) === 'in-progress';
+            }));
             this.isActiveThread$ = this.channelService.activeParentMessageId$.pipe(operators.map(function (id) { return !!id; }));
             this.theme$ = this.themeService.theme$;
             this.isActiveChannel$ = this.channelService.activeChannel$.pipe(operators.map(function (c) { return !!c; }));
@@ -4855,8 +4883,8 @@
             this.isOpen$ = this.channelListToggleService.isOpen$;
             this.channels$ = this.channelService.channels$;
             this.hasMoreChannels$ = this.channelService.hasMoreChannels$;
-            this.isError$ = this.channels$.pipe(operators.map(function () { return false; }), operators.catchError(function () { return rxjs.of(true); }), operators.startWith(false));
-            this.isInitializing$ = this.channels$.pipe(operators.map(function (channels) { return !channels; }), operators.catchError(function () { return rxjs.of(false); }));
+            this.isError$ = this.channelService.channelQueryState$.pipe(operators.map(function (s) { return !_this.isLoadingMoreChannels && (s === null || s === void 0 ? void 0 : s.state) === 'error'; }));
+            this.isInitializing$ = this.channelService.channelQueryState$.pipe(operators.map(function (s) { return !_this.isLoadingMoreChannels && (s === null || s === void 0 ? void 0 : s.state) === 'in-progress'; }));
             this.subscriptions.push(this.customTemplatesService.channelPreviewTemplate$.subscribe(function (template) { return (_this.customChannelPreviewTemplate = template); }));
         }
         ChannelListComponent.prototype.ngAfterViewInit = function () {