diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/index.js index 120319366a..92c4b333e8 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/index.js @@ -55,7 +55,7 @@ const SelectUsersStep = ({ useEffect(() => { setSearchValue(""); - setQuota(parseQuota(t, quotaCharacteristics[1])); + setQuota(parseQuota(quotaCharacteristics[1])); }, []); const handleDataChange = (leftBoundary, rightBoundary) => { diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/AddEmailsStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/AddEmailsStep/index.js index 150f5ec540..759fe1bc9e 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/AddEmailsStep/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/AddEmailsStep/index.js @@ -88,7 +88,7 @@ const AddEmailsStep = (props) => { checkedUsers.withEmail.length + checkedUsers.withoutEmail.length; useEffect(() => { - setQuota(parseQuota(t, quotaCharacteristics[1])); + setQuota(parseQuota(quotaCharacteristics[1])); }, []); const totalUsedUsers = diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/SelectUsersStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/SelectUsersStep/index.js index a4139540fd..92ac4d6dc3 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/SelectUsersStep/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/SelectUsersStep/index.js @@ -59,7 +59,7 @@ const SelectUsersStep = (props) => { useEffect(() => { setSearchValue(""); - setQuota(parseQuota(t, quotaCharacteristics[1])); + setQuota(parseQuota(quotaCharacteristics[1])); }, []); const handleDataChange = (leftBoundary, rightBoundary) => { diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/index.js index 43d67ffe88..d9edfe9301 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/index.js @@ -55,7 +55,7 @@ const SelectUsersStep = ({ useEffect(() => { setSearchValue(""); - setQuota(parseQuota(t, quotaCharacteristics[1])); + setQuota(parseQuota(quotaCharacteristics[1])); }, []); const handleDataChange = (leftBoundary, rightBoundary) => { diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/utils/index.ts b/packages/client/src/pages/PortalSettings/categories/data-import/utils/index.ts index 38b4390302..1e13724e07 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/utils/index.ts +++ b/packages/client/src/pages/PortalSettings/categories/data-import/utils/index.ts @@ -24,28 +24,20 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode import { PortalFeaturesLimitations } from "@docspace/shared/enums"; -import { getConvertedSize } from "@docspace/shared/utils/common"; -import { TFunciton, TQuota } from "../types"; +import { TQuota } from "../types"; -export const parseQuota = (t: TFunciton, quotaCharacteristics: TQuota) => { +export const parseQuota = (quotaCharacteristics: TQuota) => { const maxValue = quotaCharacteristics.value; - const usedValue = quotaCharacteristics.used.value; + const usedValue = quotaCharacteristics.used!.value; - if (maxValue === PortalFeaturesLimitations.Unavailable) return; + if (maxValue === PortalFeaturesLimitations.Unavailable) + return { used: 0, max: null }; const isExistsMaxValue = maxValue !== PortalFeaturesLimitations.Limitless; - const resultingMaxValue = - quotaCharacteristics.type === "size" && isExistsMaxValue - ? getConvertedSize(t, maxValue) - : isExistsMaxValue - ? maxValue - : null; + const resultingMaxValue = isExistsMaxValue ? maxValue : null; - const resultingUsedValue = - quotaCharacteristics.type === "size" - ? getConvertedSize(t, usedValue) - : usedValue; + const resultingUsedValue = usedValue; return { used: resultingUsedValue, max: resultingMaxValue }; };