Client:Store: fix using current quota store

This commit is contained in:
Timofey Boyko 2024-01-24 10:59:51 +03:00
parent f77842b26f
commit f2bed23b20
35 changed files with 245 additions and 227 deletions

View File

@ -16,14 +16,13 @@ export default inject(
userStore,
bannerStore,
currentTariffStatusStore,
currentQuotaStore,
}: any) => {
const {
settingsStore,
isLiveChatAvailable,
currentQuotaStore,
isPaymentPageAvailable,
isTeamTrainingAlertAvailable,
isSubmitToGalleryAlertAvailable,
@ -146,4 +145,4 @@ export default inject(
isAdmin,
};
}
)(observer(Article));
)(observer(ArticleWrapper));

View File

@ -294,50 +294,52 @@ const Bar = (props) => {
) : null;
};
export default inject(({ auth, profileActionsStore, userStore }) => {
const { user, withActivationBar, sendActivationLink } = userStore;
export default inject(
({ auth, profileActionsStore, userStore, currentQuotaStore }) => {
const { user, withActivationBar, sendActivationLink } = userStore;
const { onPaymentsClick } = profileActionsStore;
const { onPaymentsClick } = profileActionsStore;
const {
maxCountRoomsByQuota,
usedRoomsCount,
const {
maxCountRoomsByQuota,
usedRoomsCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxCountManagersByQuota,
addedManagersCount,
maxCountManagersByQuota,
addedManagersCount,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
} = auth.currentQuotaStore;
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
} = currentQuotaStore;
const { currentColorScheme, setMainBarVisible } = auth.settingsStore;
const { currentColorScheme, setMainBarVisible } = auth.settingsStore;
return {
isAdmin: user?.isAdmin,
userEmail: user?.email,
withActivationBar,
sendActivationLink,
return {
isAdmin: user?.isAdmin,
userEmail: user?.email,
withActivationBar,
sendActivationLink,
onPaymentsClick,
onPaymentsClick,
maxCountRoomsByQuota,
usedRoomsCount,
maxCountRoomsByQuota,
usedRoomsCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxCountManagersByQuota,
addedManagersCount,
maxCountManagersByQuota,
addedManagersCount,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
currentColorScheme,
setMainBarVisible,
};
})(withTranslation(["Profile", "Common"])(observer(Bar)));
currentColorScheme,
setMainBarVisible,
};
}
)(withTranslation(["Profile", "Common"])(observer(Bar)));

View File

@ -82,11 +82,10 @@ const BenefitsContainer = ({ isTrial, isEnterprise }) => {
);
};
export default inject(({ auth }) => {
export default inject(({ auth, currentQuotaStore }) => {
const {
paymentQuotasStore,
currentQuotaStore,
isEnterprise,
} = auth;

View File

@ -106,9 +106,9 @@ ChangePricingPlanDialog.propTypes = {
onClose: PropTypes.func.isRequired,
};
export default inject(({ auth, payments }) => {
export default inject(({ payments, currentQuotaStore }) => {
const { managersCount, allowedStorageSizeByQuota } = payments;
const { currentQuotaStore } = auth;
const { addedManagersCount, usedTotalStorageSizeCount } = currentQuotaStore;
return {
managersCount,

View File

@ -125,24 +125,26 @@ const InviteUsersWarningDialog = (props) => {
);
};
export default inject(({ auth, dialogsStore, currentTariffStatusStore }) => {
const { isPaymentPageAvailable } = auth;
const { dueDate, delayDueDate, isGracePeriod } = currentTariffStatusStore;
const { currentTariffPlanTitle } = auth.currentQuotaStore;
export default inject(
({ auth, dialogsStore, currentTariffStatusStore, currentQuotaStore }) => {
const { isPaymentPageAvailable } = auth;
const { dueDate, delayDueDate, isGracePeriod } = currentTariffStatusStore;
const { currentTariffPlanTitle } = currentQuotaStore;
const {
inviteUsersWarningDialogVisible,
setInviteUsersWarningDialogVisible,
} = dialogsStore;
const {
inviteUsersWarningDialogVisible,
setInviteUsersWarningDialogVisible,
} = dialogsStore;
return {
isPaymentPageAvailable,
currentTariffPlanTitle,
language: auth.language,
visible: inviteUsersWarningDialogVisible,
setIsVisible: setInviteUsersWarningDialogVisible,
dueDate,
delayDueDate,
isGracePeriod,
};
})(observer(withTranslation(["Payments", "Common"])(InviteUsersWarningDialog)));
return {
isPaymentPageAvailable,
currentTariffPlanTitle,
language: auth.language,
visible: inviteUsersWarningDialogVisible,
setIsVisible: setInviteUsersWarningDialogVisible,
dueDate,
delayDueDate,
isGracePeriod,
};
}
)(observer(withTranslation(["Payments", "Common"])(InviteUsersWarningDialog)));

View File

@ -343,8 +343,7 @@ const SectionHeaderContent = (props) => {
);
};
export default inject(({ auth, setup, common }) => {
const { currentQuotaStore } = auth;
export default inject(({ currentQuotaStore, setup, common }) => {
const {
isBrandingAndCustomizationAvailable,
isRestoreAndAutoBackupAvailable,

View File

@ -288,8 +288,8 @@ const AdditionalResources = (props) => {
);
};
export default inject(({ auth, common }) => {
const { currentQuotaStore, settingsStore, isManagement } = auth;
export default inject(({ auth, common, currentQuotaStore }) => {
const { settingsStore, isManagement } = auth;
const { setIsLoadedAdditionalResources, isLoadedAdditionalResources } =
common;

View File

@ -460,8 +460,8 @@ const CompanyInfoSettings = (props) => {
);
};
export default inject(({ auth, common }) => {
const { currentQuotaStore, settingsStore, isManagement } = auth;
export default inject(({ auth, common, currentQuotaStore }) => {
const { settingsStore, isManagement } = auth;
const {
setIsLoadedCompanyInfoSettingsData,

View File

@ -509,7 +509,7 @@ const WhiteLabel = (props) => {
);
};
export default inject(({ auth, common }) => {
export default inject(({ auth, common, currentQuotaStore }) => {
const {
setLogoText,
whiteLabelLogoText,
@ -526,7 +526,7 @@ export default inject(({ auth, common }) => {
const { whiteLabelLogoUrls: defaultWhiteLabelLogoUrls, currentDeviceType } =
auth.settingsStore;
const { isBrandingAndCustomizationAvailable } = auth.currentQuotaStore;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
const { isManagement } = auth;
return {

View File

@ -253,7 +253,7 @@ const DNSSettings = (props) => {
);
};
export default inject(({ auth, common }) => {
export default inject(({ auth, common, currentQuotaStore }) => {
const {
helpLink,
currentColorScheme,
@ -272,7 +272,7 @@ export default inject(({ auth, common }) => {
saveDNSSettings,
isDefaultDNS,
} = common;
const { currentQuotaStore } = auth;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
const { customObj } = dnsSettings;
const { dnsName, enable } = customObj;

View File

@ -102,8 +102,8 @@ const Branding = ({
);
};
export default inject(({ auth, setup, common }) => {
const { currentQuotaStore, settingsStore, isManagement } = auth;
export default inject(({ auth, currentQuotaStore, common }) => {
const { settingsStore, isManagement } = auth;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
const { isLoadedCompanyInfoSettingsData } = common;
const { standalone } = settingsStore;

View File

@ -128,8 +128,8 @@ const Customization = (props) => {
);
};
export default inject(({ auth, common }) => {
const { currentQuotaStore, settingsStore } = auth;
export default inject(({ auth, common, currentQuotaStore }) => {
const { settingsStore } = auth;
const { enablePortalRename } = settingsStore;
const { isBrandingAndCustomizationAvailable } = currentQuotaStore;
const { isLoaded, setIsLoadedCustomization, resetIsInit } = common;

View File

@ -579,8 +579,14 @@ class AutomaticBackup extends React.PureComponent {
}
}
export default inject(
({ auth, backup, treeFoldersStore, filesSelectorInput }) => {
const { language, settingsStore, currentQuotaStore, isManagement } = auth;
({
auth,
backup,
treeFoldersStore,
filesSelectorInput,
currentQuotaStore,
}) => {
const { language, settingsStore, isManagement } = auth;
const { isRestoreAndAutoBackupAvailable } = currentQuotaStore;
const { theme, currentColorScheme, automaticBackupUrl } = settingsStore;

View File

@ -266,8 +266,8 @@ const RestoreBackup = (props) => {
);
};
export default inject(({ auth, backup }) => {
const { settingsStore, currentQuotaStore } = auth;
export default inject(({ auth, backup, currentQuotaStore }) => {
const { settingsStore } = auth;
const { currentDeviceType, standalone } = settingsStore;
const { isRestoreAndAutoBackupAvailable } = currentQuotaStore;
const {

View File

@ -127,8 +127,8 @@ const ButtonContainer = (props) => {
);
};
export default inject(({ auth, backup }) => {
const { settingsStore, currentQuotaStore } = auth;
export default inject(({ auth, backup, currentQuotaStore }) => {
const { settingsStore } = auth;
const { socketHelper, setTenantStatus } = settingsStore;
const {
downloadingProgress,

View File

@ -17,8 +17,7 @@ const LocalFile = ({ setRestoreResource, isEnableRestore, t }) => {
);
};
export default inject(({ auth, backup }) => {
const { currentQuotaStore } = auth;
export default inject(({ currentQuotaStore, backup }) => {
const { setRestoreResource } = backup;
const { isRestoreAndAutoBackupAvailable } = currentQuotaStore;

View File

@ -26,8 +26,7 @@ const RoomsModule = (props) => {
);
};
export default inject(({ auth, backup }) => {
const { currentQuotaStore } = auth;
export default inject(({ currentQuotaStore, backup }) => {
const { setRestoreResource } = backup;
const { isRestoreAndAutoBackupAvailable } = currentQuotaStore;

View File

@ -78,8 +78,8 @@ const SingleSignOn = (props) => {
);
};
export default inject(({ auth, ssoStore }) => {
const { currentQuotaStore, setDocumentTitle } = auth;
export default inject(({ auth, ssoStore, currentQuotaStore }) => {
const { setDocumentTitle } = auth;
const { isSSOAvailable } = currentQuotaStore;
const { currentDeviceType } = auth.settingsStore;

View File

@ -299,8 +299,8 @@ ThirdPartyServices.propTypes = {
setSelectedConsumer: PropTypes.func.isRequired,
};
export default inject(({ setup, auth }) => {
const { settingsStore, setDocumentTitle, currentQuotaStore } = auth;
export default inject(({ setup, auth, currentQuotaStore }) => {
const { settingsStore, setDocumentTitle } = auth;
const {
integrationSettingsUrl,
theme,

View File

@ -121,11 +121,11 @@ const IntegrationWrapper = (props) => {
);
};
export default inject(({ auth, ssoStore }) => {
export default inject(({ auth, ssoStore, currentQuotaStore }) => {
const { standalone, enablePlugins } = auth.settingsStore;
const { load: toDefault } = ssoStore;
const { currentDeviceType } = auth.settingsStore;
const { isSSOAvailable } = auth.currentQuotaStore;
const { isSSOAvailable } = currentQuotaStore;
return {
toDefault,

View File

@ -98,8 +98,7 @@ const CurrentTariffContainer = ({ style, quotaCharacteristics }) => {
);
};
export default inject(({ auth }) => {
const { currentQuotaStore } = auth;
export default inject(({ currentQuotaStore }) => {
const { quotaCharacteristics } = currentQuotaStore;
return {

View File

@ -335,59 +335,61 @@ const PaymentContainer = (props) => {
);
};
export default inject(({ auth, payments, currentTariffStatusStore }) => {
const {
currentQuotaStore,
paymentQuotasStore,
export default inject(
({ auth, currentQuotaStore, payments, currentTariffStatusStore }) => {
const {
paymentQuotasStore,
settingsStore,
} = auth;
const { showText: expandArticle } = settingsStore;
settingsStore,
} = auth;
const { showText: expandArticle } = settingsStore;
const { isFreeTariff, currentTariffPlanTitle, isNonProfit } =
currentQuotaStore;
const { isFreeTariff, currentTariffPlanTitle, isNonProfit } =
currentQuotaStore;
const {
isNotPaidPeriod,
isPaidPeriod,
isGracePeriod,
customerId,
portalTariffStatus,
paymentDate,
gracePeriodEndDate,
delayDaysCount,
isPaymentDateValid,
} = currentTariffStatusStore;
const {
isNotPaidPeriod,
isPaidPeriod,
isGracePeriod,
customerId,
portalTariffStatus,
paymentDate,
gracePeriodEndDate,
delayDaysCount,
isPaymentDateValid,
} = currentTariffStatusStore;
const { planCost, tariffPlanTitle, portalPaymentQuotas } = paymentQuotasStore;
const { planCost, tariffPlanTitle, portalPaymentQuotas } =
paymentQuotasStore;
const { theme } = auth.settingsStore;
const { theme } = auth.settingsStore;
const { isAlreadyPaid } = payments;
const { isAlreadyPaid } = payments;
return {
paymentDate,
isAlreadyPaid,
return {
paymentDate,
isAlreadyPaid,
gracePeriodEndDate,
delayDaysCount,
gracePeriodEndDate,
delayDaysCount,
expandArticle,
isFreeTariff,
tariffPlanTitle,
expandArticle,
isFreeTariff,
tariffPlanTitle,
isGracePeriod,
theme,
currencySymbol: planCost.currencySymbol,
startValue: planCost.value,
isNotPaidPeriod,
payerEmail: customerId,
isGracePeriod,
theme,
currencySymbol: planCost.currencySymbol,
startValue: planCost.value,
isNotPaidPeriod,
payerEmail: customerId,
isPaidPeriod,
currentTariffPlanTitle,
portalTariffStatus,
portalPaymentQuotas,
isNonProfit,
isPaymentDateValid,
};
})(observer(PaymentContainer));
isPaidPeriod,
currentTariffPlanTitle,
portalTariffStatus,
portalPaymentQuotas,
isNonProfit,
isPaymentDateValid,
};
}
)(observer(PaymentContainer));

View File

@ -69,10 +69,15 @@ const SaaSPage = ({
};
export default inject(
({ auth, payments, userStore, currentTariffStatusStore }) => {
({
auth,
payments,
userStore,
currentQuotaStore,
currentTariffStatusStore,
}) => {
const {
language,
currentQuotaStore,
isUpdatingTariff,

View File

@ -49,8 +49,8 @@ const CurrentUsersCountContainer = (props) => {
);
};
export default inject(({ auth }) => {
const { settingsStore, currentQuotaStore, paymentQuotasStore } = auth;
export default inject(({ auth, currentQuotaStore }) => {
const { settingsStore, paymentQuotasStore } = auth;
const { maxCountManagersByQuota } = currentQuotaStore;
const { addedManagersCountTitle } = paymentQuotasStore;
const { theme } = settingsStore;

View File

@ -186,42 +186,43 @@ const UpdatePlanButtonContainer = ({
);
};
export default inject(({ auth, payments, currentTariffStatusStore }) => {
const { currentQuotaStore } = auth;
const {
maxCountManagersByQuota,
setPortalQuotaValue,
currentTariffPlanTitle,
} = currentQuotaStore;
export default inject(
({ currentQuotaStore, payments, currentTariffStatusStore }) => {
const {
maxCountManagersByQuota,
setPortalQuotaValue,
currentTariffPlanTitle,
} = currentQuotaStore;
const { isNotPaidPeriod, isGracePeriod } = currentTariffStatusStore;
const { isNotPaidPeriod, isGracePeriod } = currentTariffStatusStore;
const {
setIsLoading,
paymentLink,
isNeedRequest,
isLoading,
managersCount,
isLessCountThanAcceptable,
accountLink,
isAlreadyPaid,
canPayTariff,
} = payments;
const {
setIsLoading,
paymentLink,
isNeedRequest,
isLoading,
managersCount,
isLessCountThanAcceptable,
accountLink,
isAlreadyPaid,
canPayTariff,
} = payments;
return {
canPayTariff,
isAlreadyPaid,
setIsLoading,
paymentLink,
isNeedRequest,
isLoading,
managersCount,
maxCountManagersByQuota,
isLessCountThanAcceptable,
isNotPaidPeriod,
isGracePeriod,
accountLink,
setPortalQuotaValue,
currentTariffPlanTitle,
};
})(observer(UpdatePlanButtonContainer));
return {
canPayTariff,
isAlreadyPaid,
setIsLoading,
paymentLink,
isNeedRequest,
isLoading,
managersCount,
maxCountManagersByQuota,
isLessCountThanAcceptable,
isNotPaidPeriod,
isGracePeriod,
accountLink,
setPortalQuotaValue,
currentTariffPlanTitle,
};
}
)(observer(UpdatePlanButtonContainer));

View File

@ -50,20 +50,20 @@ const StandalonePage = (props) => {
);
};
export default inject(({ auth, payments, currentTariffStatusStore }) => {
const { currentQuotaStore } = auth;
export default inject(
({ currentQuotaStore, payments, currentTariffStatusStore }) => {
const { standaloneInit, isInitPaymentPage, isUpdatingBasicSettings } =
payments;
const { isLoaded: isLoadedCurrentQuota, isTrial } = currentQuotaStore;
const { isLoaded: isLoadedTariffStatus } = currentTariffStatusStore;
const { standaloneInit, isInitPaymentPage, isUpdatingBasicSettings } =
payments;
const { isLoaded: isLoadedCurrentQuota, isTrial } = currentQuotaStore;
const { isLoaded: isLoadedTariffStatus } = currentTariffStatusStore;
return {
isTrial,
standaloneInit,
isInitPaymentPage,
isLoadedTariffStatus,
isLoadedCurrentQuota,
isUpdatingBasicSettings,
};
})(observer(StandalonePage));
return {
isTrial,
standaloneInit,
isInitPaymentPage,
isLoadedTariffStatus,
isLoadedCurrentQuota,
isUpdatingBasicSettings,
};
}
)(observer(StandalonePage));

View File

@ -75,8 +75,7 @@ const TariffTitleContainer = ({
);
};
export default inject(({ auth, currentTariffStatusStore }) => {
const { currentQuotaStore } = auth;
export default inject(({ currentQuotaStore, currentTariffStatusStore }) => {
const { trialDaysLeft, paymentDate, isLicenseDateExpired } =
currentTariffStatusStore;
const { isTrial } = currentQuotaStore;

View File

@ -85,7 +85,7 @@ const AuditTrail = (props) => {
);
};
export default inject(({ setup, auth }) => {
export default inject(({ setup, auth, currentQuotaStore }) => {
const {
getAuditTrail,
security,
@ -96,7 +96,7 @@ export default inject(({ setup, auth }) => {
securityLifetime,
isLoadingDownloadReport,
} = setup;
const { settingsStore, currentQuotaStore } = auth;
const { settingsStore } = auth;
const { theme } = settingsStore;
const { isAuditAvailable } = currentQuotaStore;
return {

View File

@ -84,7 +84,7 @@ const LoginHistory = (props) => {
);
};
export default inject(({ setup, auth }) => {
export default inject(({ setup, auth, currentQuotaStore }) => {
const {
getLoginHistory,
security,
@ -96,7 +96,7 @@ export default inject(({ setup, auth }) => {
} = setup;
const { theme } = auth.settingsStore;
const { isAuditAvailable } = auth.currentQuotaStore;
const { isAuditAvailable } = currentQuotaStore;
return {
getLoginHistory,

View File

@ -137,10 +137,10 @@ const SocialNetworks = (props) => {
);
};
export default inject(({ auth, peopleStore }) => {
export default inject(({ currentQuotaStore, peopleStore }) => {
const { usersStore } = peopleStore;
const { providers, setProviders } = usersStore;
const { currentQuotaStore } = auth;
const { isOAuthAvailable, setPortalQuota } = currentQuotaStore;
return {

View File

@ -756,7 +756,6 @@ class ContextOptionsStore {
const { action } = data;
const { isGracePeriod } = this.currentTariffStatusStore;
const { isFreeTariff } = this.authStore.currentQuotaStore;
if (isGracePeriod) {
this.dialogsStore.setInviteUsersWarningDialogVisible(true);

View File

@ -14,6 +14,7 @@ import { combineUrl } from "@docspace/shared/utils/combineUrl";
class PaymentStore {
userStore = null;
currentTariffStatusStore = null;
currentQuotaStore = null;
salesEmail = "";
helpUrl = "https://helpdesk.onlyoffice.com";
@ -40,17 +41,17 @@ class PaymentStore {
isInitPaymentPage = false;
isLicenseCorrect = false;
constructor(userStore, currentTariffStatusStore) {
constructor(userStore, currentTariffStatusStore, currentQuotaStore) {
this.userStore = userStore;
this.currentTariffStatusStore = currentTariffStatusStore;
this.currentQuotaStore = currentQuotaStore;
makeAutoObservable(this);
}
get isAlreadyPaid() {
const { currentQuotaStore } = authStore;
const { customerId } = this.currentTariffStatusStore;
const { isFreeTariff } = currentQuotaStore;
const { isFreeTariff } = this.currentQuotaStore;
return customerId?.length !== 0 || !isFreeTariff;
}
@ -63,9 +64,8 @@ class PaymentStore {
this.isUpdatingBasicSettings = isUpdatingBasicSettings;
};
basicSettings = async () => {
const { currentQuotaStore } = authStore;
const { setPortalTariff, setPayerInfo } = this.currentTariffStatusStore;
const { addedManagersCount } = currentQuotaStore;
const { addedManagersCount } = this.currentQuotaStore;
this.setIsUpdatingBasicSettings(true);
@ -95,9 +95,9 @@ class PaymentStore {
return;
}
const { paymentQuotasStore, currentQuotaStore } = authStore;
const { paymentQuotasStore } = authStore;
const { setPayerInfo } = this.currentTariffStatusStore;
const { addedManagersCount } = currentQuotaStore;
const { addedManagersCount } = this.currentQuotaStore;
const { setPortalPaymentQuotas } = paymentQuotasStore;
const requests = [this.getSettingsPayment(), setPortalPaymentQuotas()];
@ -296,9 +296,8 @@ class PaymentStore {
this.setBasicTariffContainer();
};
setBasicTariffContainer = () => {
const { currentQuotaStore } = authStore;
const { currentPlanCost, maxCountManagersByQuota, addedManagersCount } =
currentQuotaStore;
this.currentQuotaStore;
const currentTotalPrice = currentPlanCost.value;
if (this.isAlreadyPaid) {
@ -356,9 +355,8 @@ class PaymentStore {
}
get canUpdateTariff() {
const { currentQuotaStore } = authStore;
const { user } = this.userStore;
const { isFreeTariff } = currentQuotaStore;
const { isFreeTariff } = this.currentQuotaStore;
if (!user) return false;
@ -368,8 +366,7 @@ class PaymentStore {
}
get canPayTariff() {
const { currentQuotaStore } = authStore;
const { addedManagersCount } = currentQuotaStore;
const { addedManagersCount } = this.currentQuotaStore;
if (this.managersCount >= addedManagersCount) return true;
@ -377,8 +374,8 @@ class PaymentStore {
}
get canDowngradeTariff() {
const { currentQuotaStore } = authStore;
const { addedManagersCount, usedTotalStorageSizeCount } = currentQuotaStore;
const { addedManagersCount, usedTotalStorageSizeCount } =
this.currentQuotaStore;
if (addedManagersCount > this.managersCount) return false;
if (usedTotalStorageSizeCount > this.allowedStorageSizeByQuota)

View File

@ -4,6 +4,7 @@ import {
tfaStore,
bannerStore,
currentTariffStatusStore,
currentQuotaStore,
} from "@docspace/common/store/AuthStore";
import PaymentStore from "./PaymentStore";
import WizardStore from "./WizardStore";
@ -51,7 +52,11 @@ const selectedFolderStore = new SelectedFolderStore(authStore.settingsStore);
const pluginStore = new PluginStore(authStore, selectedFolderStore, userStore);
const paymentStore = new PaymentStore(userStore, currentTariffStatusStore);
const paymentStore = new PaymentStore(
userStore,
currentTariffStatusStore,
currentQuotaStore
);
const wizardStore = new WizardStore();
const setupStore = new SettingsSetupStore(tfaStore);
const confirmStore = new ConfirmStore();
@ -220,7 +225,7 @@ const createEditRoomStore = new CreateEditRoomStore(
thirdPartyStore,
authStore.settingsStore,
infoPanelStore,
authStore.currentQuotaStore,
currentQuotaStore,
clientLoadingStore
);
@ -232,6 +237,7 @@ const store = {
tfaStore,
bannerStore,
currentTariffStatusStore,
currentQuotaStore,
payments: paymentStore,
wizard: wizardStore,

View File

@ -22,16 +22,18 @@ import { UserStore } from "@docspace/shared/store/UserStore";
import { TfaStore } from "@docspace/shared/store/TfaStore";
import { BannerStore } from "@docspace/shared/store/BannerStore";
import { CurrentTariffStatusStore } from "@docspace/shared/store/CurrentTariffStatusStore";
import { CurrentQuotasStore } from "@docspace/shared/store/CurrentQuotaStore";
import { loginWithTfaCode } from "@docspace/shared/api/user";
export const userStore = new UserStore();
export const tfaStore = new TfaStore();
export const bannerStore = new BannerStore();
export const currentQuotaStore = new CurrentQuotasStore();
class AuthStore {
userStore = null;
currentQuotaStore = null;
settingsStore = null;
isLoading = false;
@ -46,14 +48,13 @@ class AuthStore {
tenantExtra = {};
constructor(userStore, currentTariffStatusStore) {
constructor(userStore, currentTariffStatusStore, currentQuotaStore) {
this.userStore = userStore;
this.currentTariffStatusStore = currentTariffStatusStore;
this.currentQuotaStore = currentQuotaStore;
this.settingsStore = new SettingsStore();
this.currentQuotaStore = new CurrentQuotasStore();
this.paymentQuotasStore = new PaymentQuotasStore();
makeAutoObservable(this);
@ -469,7 +470,11 @@ class AuthStore {
export const currentTariffStatusStore = new CurrentTariffStatusStore();
const authStore = new AuthStore(userStore, currentTariffStatusStore);
const authStore = new AuthStore(
userStore,
currentTariffStatusStore,
currentQuotaStore
);
currentTariffStatusStore.authStore = authStore;

View File

@ -16,7 +16,7 @@ import {
PERCENTAGE_FOR_SHOWING_BAR,
} from "../constants";
export interface IQuotasStore {
export interface ICurrentQuotasStore {
currentPortalQuota: TPortalQuota;
currentPortalQuotaFeatures: TFeature[];
isLoaded: boolean;
@ -61,7 +61,7 @@ export interface IQuotasStore {
setPortalQuota: () => Promise<void>;
}
class QuotasStore {
class CurrentQuotasStore {
currentPortalQuota: TPortalQuota = {} as TPortalQuota;
currentPortalQuotaFeatures: TFeature[] = [];
@ -292,4 +292,4 @@ class QuotasStore {
};
}
export default QuotasStore;
export { CurrentQuotasStore };