From 7047b82e3e6237c1e7ce3a7864affe6e516d5ac2 Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Wed, 17 Jul 2024 18:58:17 +0400
Subject: [PATCH] Client: EditRoom: fix add existing tags to room

---
 .../src/components/GlobalEvents/EditRoomEvent.js      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/GlobalEvents/EditRoomEvent.js b/packages/client/src/components/GlobalEvents/EditRoomEvent.js
index d12b8a31e6..beac01c7a0 100644
--- a/packages/client/src/components/GlobalEvents/EditRoomEvent.js
+++ b/packages/client/src/components/GlobalEvents/EditRoomEvent.js
@@ -162,7 +162,9 @@ const EditRoomEvent = ({
       for (let i = 0; i < newTags.length; i++) {
         createTagActions.push(createTag(newTags[i]));
       }
-      await Promise.all(createTagActions);
+      if (!!createTagActions.length) {
+        await Promise.all(createTagActions);
+      }
 
       const actions = [];
       if (isOwnerChanged) {
@@ -176,7 +178,8 @@ const EditRoomEvent = ({
         };
       }
       if (tags.length) {
-        actions.push(addTagsToRoom(room.id, newTags));
+        const tagsToAddList = tags.filter((t) => !startTags.includes(t));
+        actions.push(addTagsToRoom(room.id, tagsToAddList));
         room.tags = tags;
       }
 
@@ -185,7 +188,9 @@ const EditRoomEvent = ({
         room.tags = tags;
       }
 
-      await Promise.all(actions);
+      if (!!actions.length) {
+        await Promise.all(actions);
+      }
 
       if (!!item.logo.original && !roomParams.icon.uploadedFile) {
         room = await removeLogoFromRoom(room.id);