Rework subscriptions display in Profile (#6089)

4ian · Dec 15, 2023 · a1826d3 · a1826d3
1 parent 32a3a09
commit a1826d3
Show file tree

Hide file tree

Showing 26 changed files with 2,573 additions and 228 deletions.
diff --git a/newIDE/app/src/ExportAndShare/ShareDialog/ExportLauncher.js b/newIDE/app/src/ExportAndShare/ShareDialog/ExportLauncher.js
@@ -16,7 +16,7 @@ import {
   displayProjectErrorsBox,
   getProjectPropertiesErrors,
 } from '../../Utils/ProjectErrorsChecker';
-import { type CurrentUsage } from '../../Utils/GDevelopServices/Usage';
+import { type Quota } from '../../Utils/GDevelopServices/Usage';
 import BuildsWatcher from '../Builds/BuildsWatcher';
 import BuildStepsProgress, {
   type BuildStep,
@@ -410,18 +410,14 @@ export default class ExportLauncher extends Component<Props, State> {
       isSavingProject,
     } = this.props;
     if (!project) return null;
-    const getBuildCurrentUsage = (
-      authenticatedUser: AuthenticatedUser
-    ): ?CurrentUsage =>
+    const getBuildQuota = (authenticatedUser: AuthenticatedUser): ?Quota =>
       authenticatedUser.limits && exportPipeline.onlineBuildType
-        ? authenticatedUser.limits.limits[exportPipeline.onlineBuildType]
+        ? authenticatedUser.limits.quotas[exportPipeline.onlineBuildType]
         : null;
 
     const canLaunchBuild = (authenticatedUser: AuthenticatedUser) => {
-      const currentUsage: ?CurrentUsage = getBuildCurrentUsage(
-        authenticatedUser
-      );
-      if (currentUsage && currentUsage.limitReached) return false;
+      const quota: ?Quota = getBuildQuota(authenticatedUser);
+      if (quota && quota.limitReached) return false;
 
       return exportPipeline.canLaunchBuild(exportState, errored, exportStep);
     };
@@ -511,7 +507,7 @@ export default class ExportLauncher extends Component<Props, State> {
               authenticatedUser.authenticated && (
                 <CurrentUsageDisplayer
                   subscription={authenticatedUser.subscription}
-                  currentUsage={getBuildCurrentUsage(authenticatedUser)}
+                  quota={getBuildQuota(authenticatedUser)}
                   onChangeSubscription={this.props.onChangeSubscription}
                 />
               )}

diff --git a/newIDE/app/src/GameDashboard/LeaderboardAdmin/index.js b/newIDE/app/src/GameDashboard/LeaderboardAdmin/index.js
@@ -1070,7 +1070,9 @@ export const LeaderboardAdmin = ({
               <MaxLeaderboardCountAlertMessage
                 onUpgrade={() =>
                   openSubscriptionDialog({
-                    reason: 'Leaderboard count per game limit reached',
+                    analyticsMetadata: {
+                      reason: 'Leaderboard count per game limit reached',
+                    },
                   })
                 }
                 onClose={() =>

diff --git a/newIDE/app/src/MainFrame/EditorContainers/HomePage/BuildSection/index.js b/newIDE/app/src/MainFrame/EditorContainers/HomePage/BuildSection/index.js
@@ -224,7 +224,9 @@ const BuildSection = ({
                       limits={limits}
                       onUpgrade={() =>
                         openSubscriptionDialog({
-                          reason: 'Cloud Project limit reached',
+                          analyticsMetadata: {
+                            reason: 'Cloud Project limit reached',
+                          },
                         })
                       }
                     />

diff --git a/newIDE/app/src/Profile/CurrentUsageDisplayer.js b/newIDE/app/src/Profile/CurrentUsageDisplayer.js
@@ -4,7 +4,7 @@ import { Trans } from '@lingui/macro';
 import * as React from 'react';
 import {
   hasValidSubscriptionPlan,
-  type CurrentUsage,
+  type Quota,
   type Subscription,
 } from '../Utils/GDevelopServices/Usage';
 import PlaceholderLoader from '../UI/PlaceholderLoader';
@@ -15,30 +15,30 @@ import { ColumnStackLayout } from '../UI/Layout';
 
 type Props = {|
   subscription: ?Subscription,
-  currentUsage: ?CurrentUsage,
+  quota: ?Quota,
   onChangeSubscription: () => void,
 |};
 
 const CurrentUsageDisplayer = ({
   subscription,
-  currentUsage,
+  quota,
   onChangeSubscription,
 }: Props) => {
-  if (!currentUsage) return <PlaceholderLoader />;
+  if (!quota) return <PlaceholderLoader />;
   const hasSubscription = hasValidSubscriptionPlan(subscription);
   const loadedButHasNoSubscription =
     subscription && !hasValidSubscriptionPlan(subscription);
-  const remainingBuilds = Math.max(currentUsage.max - currentUsage.current, 0);
+  const remainingBuilds = Math.max(quota.max - quota.current, 0);
   const remainingMultipleMessage = (
     <Trans>
-      You have {remainingBuilds} builds remaining (You have used{' '}
-      {currentUsage.current}/{currentUsage.max} in the last 24h).
+      You have {remainingBuilds} builds remaining (You have used {quota.current}
+      /{quota.max} in the last 24h).
     </Trans>
   );
   const remainingSingleMessage = (
     <Trans>
-      You have {remainingBuilds} build remaining (You have used{' '}
-      {currentUsage.current}/{currentUsage.max} in the last 24h).
+      You have {remainingBuilds} build remaining (You have used {quota.current}/
+      {quota.max} in the last 24h).
     </Trans>
   );
 
@@ -51,7 +51,7 @@ const CurrentUsageDisplayer = ({
             : remainingMultipleMessage}
         </Text>
       </AlertMessage>
-      {hasSubscription && currentUsage.limitReached && (
+      {hasSubscription && quota.limitReached && (
         <GetSubscriptionCard subscriptionDialogOpeningReason="Build limit reached">
           <Text>
             <Trans>

diff --git a/newIDE/app/src/Profile/Subscription/GetSubscriptionCard.js b/newIDE/app/src/Profile/Subscription/GetSubscriptionCard.js
@@ -51,7 +51,9 @@ const GetSubscriptionCard = (props: Props) => {
             href="#"
             onClick={() => {
               openSubscriptionDialog({
-                reason: props.subscriptionDialogOpeningReason,
+                analyticsMetadata: {
+                  reason: props.subscriptionDialogOpeningReason,
+                },
               });
             }}
           >