Web: Client: Data Import: added additional condition for define quota room

This commit is contained in:
Elyor Djalilov 2024-08-02 20:54:46 +05:00
parent f059540ba7
commit 5385a81f5c
3 changed files with 25 additions and 6 deletions

View File

@ -29,7 +29,7 @@ import {
ModalDialogType, ModalDialogType,
} from "@docspace/shared/components/modal-dialog"; } from "@docspace/shared/components/modal-dialog";
import { convertBytes } from "@docspace/client/src/pages/PortalSettings/utils/convertBytes"; import { getConvertedSize } from "@docspace/shared/utils/common";
import { Button, ButtonSize } from "@docspace/shared/components/button"; import { Button, ButtonSize } from "@docspace/shared/components/button";
import { Text } from "@docspace/shared/components/text"; import { Text } from "@docspace/shared/components/text";
import { WarningQuotaDialogProps } from "./WarningQuotaDialog.types"; import { WarningQuotaDialogProps } from "./WarningQuotaDialog.types";
@ -52,7 +52,7 @@ export const WarningQuotaDialog = ({
<ModalDialog.Body> <ModalDialog.Body>
<Text noSelect style={{ marginBottom: "16px" }}> <Text noSelect style={{ marginBottom: "16px" }}>
{t("Settings:StorageQuotaWarningDescription", { {t("Settings:StorageQuotaWarningDescription", {
quotaLimit: convertBytes(defaultQuota), quotaLimit: getConvertedSize(t, defaultQuota),
productName: t("Common:ProductName"), productName: t("Common:ProductName"),
})} })}
</Text> </Text>

View File

@ -157,7 +157,9 @@ const SelectFileStep = (props: SelectFileStepProps) => {
setMigratingWorkspace, setMigratingWorkspace,
uploadFiles, uploadFiles,
defaultUsersQuota, defaultUsersQuota,
defaultRoomsQuota,
isDefaultUsersQuotaSet, isDefaultUsersQuotaSet,
isDefaultRoomsQuotaSet,
warningQuotaDialogVisible, warningQuotaDialogVisible,
setWarningQuotaDialogVisible, setWarningQuotaDialogVisible,
} = props as InjectedSelectFileStepProps; } = props as InjectedSelectFileStepProps;
@ -182,9 +184,17 @@ const SelectFileStep = (props: SelectFileStepProps) => {
const navigate = useNavigate(); const navigate = useNavigate();
useEffect(() => { useEffect(() => {
setWarningQuotaDialogVisible(isDefaultUsersQuotaSet); setWarningQuotaDialogVisible(
setDefaultQuota(defaultUsersQuota ?? 0); isDefaultUsersQuotaSet || isDefaultRoomsQuotaSet,
}, [isDefaultUsersQuotaSet, setWarningQuotaDialogVisible, defaultUsersQuota]); );
setDefaultQuota((defaultUsersQuota || defaultRoomsQuota) ?? 0);
}, [
defaultUsersQuota,
defaultRoomsQuota,
isDefaultRoomsQuotaSet,
isDefaultUsersQuotaSet,
setWarningQuotaDialogVisible,
]);
const onClickRedirect = () => { const onClickRedirect = () => {
navigate("/portal-settings/management/disk-space"); navigate("/portal-settings/management/disk-space");
@ -531,7 +541,12 @@ export default inject<TStore>(
setWarningQuotaDialogVisible, setWarningQuotaDialogVisible,
} = dialogsStore; } = dialogsStore;
const { isDefaultUsersQuotaSet, defaultUsersQuota } = currentQuotaStore; const {
isDefaultRoomsQuotaSet,
isDefaultUsersQuotaSet,
defaultUsersQuota,
defaultRoomsQuota,
} = currentQuotaStore;
return { return {
initMigrations, initMigrations,
@ -550,6 +565,8 @@ export default inject<TStore>(
setMigratingWorkspace, setMigratingWorkspace,
uploadFiles, uploadFiles,
defaultUsersQuota, defaultUsersQuota,
defaultRoomsQuota,
isDefaultRoomsQuotaSet,
isDefaultUsersQuotaSet, isDefaultUsersQuotaSet,
warningQuotaDialogVisible, warningQuotaDialogVisible,
setWarningQuotaDialogVisible, setWarningQuotaDialogVisible,

View File

@ -71,7 +71,9 @@ export interface InjectedSelectFileStepProps extends SelectFileStepProps {
setMigratingWorkspace: TStore["importAccountsStore"]["setMigratingWorkspace"]; setMigratingWorkspace: TStore["importAccountsStore"]["setMigratingWorkspace"];
uploadFiles: TStore["importAccountsStore"]["uploadFiles"]; uploadFiles: TStore["importAccountsStore"]["uploadFiles"];
defaultUsersQuota: TStore["currentQuotaStore"]["defaultUsersQuota"]; defaultUsersQuota: TStore["currentQuotaStore"]["defaultUsersQuota"];
defaultRoomsQuota: TStore["currentQuotaStore"]["defaultRoomsQuota"];
isDefaultUsersQuotaSet: TStore["currentQuotaStore"]["isDefaultUsersQuotaSet"]; isDefaultUsersQuotaSet: TStore["currentQuotaStore"]["isDefaultUsersQuotaSet"];
isDefaultRoomsQuotaSet: TStore["currentQuotaStore"]["isDefaultRoomsQuotaSet"];
warningQuotaDialogVisible: TStore["dialogsStore"]["warningQuotaDialogVisible"]; warningQuotaDialogVisible: TStore["dialogsStore"]["warningQuotaDialogVisible"];
setWarningQuotaDialogVisible: TStore["dialogsStore"]["setWarningQuotaDialogVisible"]; setWarningQuotaDialogVisible: TStore["dialogsStore"]["setWarningQuotaDialogVisible"];
} }