From 1bdf8843ce1bb5572349e404c31f6d365dc52881 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Wed, 13 Mar 2024 17:15:58 +0300 Subject: [PATCH] CreateEditRoomDialog: Added logic for quota in a public room when connecting and disconnecting a provider. --- .../sub-components/RoomQuota/index.js | 5 +++-- .../sub-components/SetRoomParams.js | 18 +++++++++--------- .../client/src/store/CreateEditRoomStore.js | 5 +++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomQuota/index.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomQuota/index.js index ba3657560a..7c92a7f997 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomQuota/index.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomQuota/index.js @@ -4,8 +4,9 @@ import { inject, observer } from "mobx-react"; import QuotaForm from "SRC_DIR/components/QuotaForm"; const RoomQuota = (props) => { - const { setRoomParams, roomParams, defaultRoomsQuota, isEdit, isDisabled } = + const { setRoomParams, roomParams, defaultRoomsQuota, isEdit, isLoading } = props; + const { t } = useTranslation(["CreateEditRoomDialog", "Common"]); const onSetQuotaBytesSize = (size) => { @@ -18,7 +19,7 @@ const RoomQuota = (props) => { checkboxLabel={t("DisableRoomQuota")} onSetQuotaBytesSize={onSetQuotaBytesSize} initialSize={isEdit ? roomParams.quota : defaultRoomsQuota} - isDisabled={isDisabled} + isDisabled={isLoading || roomParams.storageLocation.isThirdparty} /> ); }; diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index 5d1f12695d..99fa045471 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -168,6 +168,15 @@ const SetRoomParams = ({ /> )} + {isDefaultRoomsQuotaSet && !roomParams.storageLocation.providerKey && ( + + )} + {!isEdit && enableThirdParty && ( )} - {isDefaultRoomsQuotaSet && ( - - )} -
{t("Icon")} diff --git a/packages/client/src/store/CreateEditRoomStore.js b/packages/client/src/store/CreateEditRoomStore.js index 1f7d52ff7e..8e83f744d9 100644 --- a/packages/client/src/store/CreateEditRoomStore.js +++ b/packages/client/src/store/CreateEditRoomStore.js @@ -92,7 +92,9 @@ class CreateEditRoomStore { const { isDefaultRoomsQuotaSet } = this.currentQuotaStore; - const quotaLimit = isDefaultRoomsQuotaSet ? roomParams.quota : null; + const isThirdparty = roomParams.storageLocation.isThirdparty; + const quotaLimit = + isDefaultRoomsQuotaSet && !isThirdparty ? roomParams.quota : null; const createRoomData = { roomType: roomParams.type, @@ -108,7 +110,6 @@ class CreateEditRoomStore { .map((t) => t.name); const addTagsData = roomParams.tags.map((tag) => tag.name); - const isThirdparty = roomParams.storageLocation.isThirdparty; const storageFolderId = roomParams.storageLocation.storageFolderId; const thirdpartyAccount = roomParams.storageLocation.thirdpartyAccount;