Regression: Adjusted departments upsell modal to check for licence and modules (#28246)

pull/28248/head^2
Aleksander Nicacio da Silva 3 years ago committed by GitHub
parent 11c7a57601
commit fd33a0f2f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/meteor/client/views/hooks/useUpgradeTabParams.ts
  2. 3
      apps/meteor/lib/upgradeTab.ts

@ -13,7 +13,7 @@ export const useUpgradeTabParams = (): { tabType: UpgradeTabVariant | false; tri
const { data: registrationStatusData, isSuccess: isSuccessRegistrationStatus } = useRegistrationStatus();
const registered = registrationStatusData?.registrationStatus?.workspaceRegistered ?? false;
const hasValidLicense = (licensesData?.licenses?.length ?? 0) > 0;
const hasValidLicense = licensesData?.licenses.some((licence) => licence.modules.length > 0) ?? false;
const hadExpiredTrials = cloudWorkspaceHadTrial ?? false;
const trialLicense = licensesData?.licenses?.find(({ meta }) => meta?.trial);

@ -19,11 +19,14 @@ export const getUpgradeTabType = ({
if (hadExpiredTrials) {
return 'upgrade-your-plan';
}
if (registered) {
return 'go-fully-featured-registered';
}
return 'go-fully-featured';
}
if (isTrial) {
return 'trial-enterprise';
}

Loading…
Cancel
Save