Subscriptions fetched at start + remove storybook-addon-mock completely

Author: ClementPasteau

newIDE/app/.storybook/main.js

@@ -18,6 +18,5 @@ module.exports = {
       },
     },
     '@storybook/preset-create-react-app',
-    'storybook-addon-mock',
   ],
 };

newIDE/app/.storybook/preview.js

@@ -33,9 +33,6 @@ export const parameters = {
   // that we don't use.
   controls: { hideNoControlsWarning: true },
   docs: { disable: true },
-  mockAddonConfigs: {
-    globalMockData: [],
-  },
 };
 
 export const decorators = [

newIDE/app/package-lock.json

@@ -38,7 +38,6 @@
     "serve-handler": "6.1.6",
     "shelljs": "0.8.4",
     "storybook": "7.4.6",
-    "storybook-addon-mock": "4.3.0",
     "style-dictionary": "^2.10.2",
     "typescript": "^4.1.3",
     "webpack": "5.88.2",

newIDE/app/package.json

@@ -56,7 +56,7 @@ import {
   type HotReloadSteps,
 } from '../EmbeddedGame/EmbeddedGameFrame';
 import { type CreateProjectResult } from '../Utils/UseCreateProject';
-import { SubscriptionSuggestionContext } from '../Profile/Subscription/SubscriptionSuggestionContext';
+import { SubscriptionContext } from '../Profile/Subscription/SubscriptionContext';
 import {
   useAiRequestState,
   type OpenAskAiOptions,
@@ -323,17 +323,16 @@ export const AskAiEditor = React.memo<Props>(
         CreditsPackageStoreContext
       );
 
+      const authenticatedUser = React.useContext(AuthenticatedUserContext);
       const {
         profile,
         getAuthorizationHeader,
         onOpenCreateAccountDialog,
         limits,
         onRefreshLimits,
         subscription,
-      } = React.useContext(AuthenticatedUserContext);
-      const { openSubscriptionDialog } = React.useContext(
-        SubscriptionSuggestionContext
-      );
+      } = authenticatedUser;
+      const { openSubscriptionDialog } = React.useContext(SubscriptionContext);
 
       const availableCredits = limits ? limits.credits.userBalance.amount : 0;
       const quota =
@@ -952,6 +951,7 @@ export const AskAiEditor = React.memo<Props>(
                 mode: aiRequest.mode || selectedAiRequestMode,
               });
               refreshAiRequest(aiRequest.id);
+              onCloseHistory();
             }}
             selectedAiRequestId={selectedAiRequestId}
           />

newIDE/app/src/AiGeneration/AskAiEditorContainer.js

@@ -36,7 +36,7 @@ import { prepareAiUserContent } from './PrepareAiUserContent';
 import { AiRequestContext } from './AiRequestContext';
 import { getAiConfigurationPresetsWithAvailability } from './AiConfiguration';
 import { type CreateProjectResult } from '../Utils/UseCreateProject';
-import { SubscriptionSuggestionContext } from '../Profile/Subscription/SubscriptionSuggestionContext';
+import { SubscriptionContext } from '../Profile/Subscription/SubscriptionContext';
 import {
   useAiRequestState,
   useProcessFunctionCalls,
@@ -195,9 +195,7 @@ export const AskAiStandAloneForm = ({
     onRefreshLimits,
     subscription,
   } = React.useContext(AuthenticatedUserContext);
-  const { openSubscriptionDialog } = React.useContext(
-    SubscriptionSuggestionContext
-  );
+  const { openSubscriptionDialog } = React.useContext(SubscriptionContext);
 
   const hideAskAi =
     !!limits &&

newIDE/app/src/AiGeneration/AskAiStandAloneForm.js

@@ -17,7 +17,6 @@ import {
   type PrivateGameTemplateListingData,
   type CourseListingData,
 } from '../../Utils/GDevelopServices/Shop';
-import { type SubscriptionPlanWithPricingSystems } from '../../Utils/GDevelopServices/Usage';
 import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 import { Trans } from '@lingui/macro';
 import AlertMessage from '../../UI/AlertMessage';
@@ -36,6 +35,7 @@ import {
 import Text from '../../UI/Text';
 import CourseStoreContext from '../../Course/CourseStoreContext';
 import { planIdSortingFunction } from '../../Profile/Subscription/PlanCard';
+import { SubscriptionContext } from '../../Profile/Subscription/SubscriptionContext';
 import SubscriptionPlanPricingSummary from '../../Profile/Subscription/PromotionSubscriptionDialog/SubscriptionPlanPricingSummary';
 import { ResponsiveLineStackLayout } from '../../UI/Layout';
 import SubscriptionPlanTableSummary from '../../Profile/Subscription/PromotionSubscriptionDialog/SubscriptionPlanTableSummary';
@@ -77,7 +77,6 @@ const styles = {
 type Props = {|
   bundleListingData: BundleListingData,
   onBack?: () => void | Promise<void>,
-  getSubscriptionPlansWithPricingSystems: () => Array<SubscriptionPlanWithPricingSystems> | null,
   onBundleOpen: BundleListingData => void,
   onGameTemplateOpen: PrivateGameTemplateListingData => void,
   onAssetPackOpen: (
@@ -95,7 +94,6 @@ type Props = {|
 const BundleInformationPage = ({
   bundleListingData,
   onBack,
-  getSubscriptionPlansWithPricingSystems,
   onAssetPackOpen,
   onGameTemplateOpen,
   onBundleOpen,
@@ -119,6 +117,9 @@ const BundleInformationPage = ({
     receivedGameTemplates,
     receivedAssetPacks,
   } = React.useContext(AuthenticatedUserContext);
+  const { subscriptionPlansWithPricingSystems } = React.useContext(
+    SubscriptionContext
+  );
   const [bundle, setBundle] = React.useState<?Bundle>(null);
   const [errorText, setErrorText] = React.useState<?React.Node>(null);
   const {
@@ -199,8 +200,6 @@ const BundleInformationPage = ({
     ]
   );
 
-  const subscriptionPlansWithPricingSystems = getSubscriptionPlansWithPricingSystems();
-
   const highestSubscriptionPlanIncludedInBundle = React.useMemo(
     () => {
       if (!bundleListingData) return null;
@@ -392,7 +391,7 @@ const BundleInformationPage = ({
                   subscriptionPlanWithPricingSystems={
                     highestSubscriptionPlanIncludedInBundle
                   }
-                  hideActions
+                  hideFullTableLink
                 />
               </Column>
             </ResponsiveLineStackLayout>

newIDE/app/src/AssetStore/Bundles/BundleInformationPage.js

@@ -58,7 +58,7 @@ import SecureCheckout from '../SecureCheckout/SecureCheckout';
 import ProductLicenseOptions from '../ProductLicense/ProductLicenseOptions';
 import HelpIcon from '../../UI/HelpIcon';
 import Avatar from '@material-ui/core/Avatar';
-import { SubscriptionSuggestionContext } from '../../Profile/Subscription/SubscriptionSuggestionContext';
+import { SubscriptionContext } from '../../Profile/Subscription/SubscriptionContext';
 import useAlertDialog from '../../UI/Alert/useAlertDialog';
 import PasswordPromptDialog from '../PasswordPromptDialog';
 import Window from '../../Utils/Window';
@@ -210,9 +210,7 @@ const PrivateAssetPackInformationPage = ({
     purchasingPrivateAssetPackListingData,
     setPurchasingPrivateAssetPackListingData,
   ] = React.useState<?PrivateAssetPackListingData>(null);
-  const { openSubscriptionDialog } = React.useContext(
-    SubscriptionSuggestionContext
-  );
+  const { openSubscriptionDialog } = React.useContext(SubscriptionContext);
   const [assetPack, setAssetPack] = React.useState<?PrivateAssetPack>(null);
   const [isFetching, setIsFetching] = React.useState<boolean>(false);
   const [isRedeemingProduct, setIsRedeemingProduct] = React.useState<boolean>(

newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetPackInformationPage.js

@@ -70,7 +70,6 @@ import { delay } from '../Utils/Delay';
 import { BundleStoreContext } from './Bundles/BundleStoreContext';
 import BundleInformationPage from './Bundles/BundleInformationPage';
 import { type CourseCompletion } from '../MainFrame/EditorContainers/HomePage/UseCourses';
-import { type SubscriptionPlanWithPricingSystems } from '../Utils/GDevelopServices/Usage';
 
 type Props = {|
   onlyShowAssets?: boolean, // TODO: if we add more options, use an array instead.
@@ -81,7 +80,6 @@ type Props = {|
   onOpenProfile?: () => void,
   courses?: ?Array<Course>,
   onCourseOpen?: (courseId: string) => void,
-  getSubscriptionPlansWithPricingSystems?: () => Array<SubscriptionPlanWithPricingSystems> | null,
   getCourseCompletion?: (courseId: string) => CourseCompletion | null,
   assetSwappedObject?: ?gdObject,
   minimalUI?: boolean,
@@ -125,7 +123,6 @@ export const AssetStore = React.forwardRef<Props, AssetStoreInterface>(
       onOpenProfile,
       courses,
       onCourseOpen,
-      getSubscriptionPlansWithPricingSystems,
       getCourseCompletion,
       assetSwappedObject,
       minimalUI,
@@ -958,9 +955,7 @@ export const AssetStore = React.forwardRef<Props, AssetStoreInterface>(
                     privateGameTemplateListingDatasFromSameCreator
                   }
                 />
-              ) : !!openedBundleListingData &&
-                getSubscriptionPlansWithPricingSystems &&
-                getCourseCompletion ? (
+              ) : !!openedBundleListingData && getCourseCompletion ? (
                 <BundleInformationPage
                   bundleListingData={openedBundleListingData}
                   noPadding
@@ -969,9 +964,6 @@ export const AssetStore = React.forwardRef<Props, AssetStoreInterface>(
                   onGameTemplateOpen={selectPrivateGameTemplate}
                   onAssetPackOpen={selectPrivateAssetPack}
                   onCourseOpen={selectCourse}
-                  getSubscriptionPlansWithPricingSystems={
-                    getSubscriptionPlansWithPricingSystems
-                  }
                   courses={courses}
                   getCourseCompletion={getCourseCompletion}
                 />

newIDE/app/src/AssetStore/index.js

@@ -15,7 +15,7 @@ import Link from '../../UI/Link';
 import { getHelpLink } from '../../Utils/HelpLink';
 import Window from '../../Utils/Window';
 import RaisedButton from '../../UI/RaisedButton';
-import { SubscriptionSuggestionContext } from '../../Profile/Subscription/SubscriptionSuggestionContext';
+import { SubscriptionContext } from '../../Profile/Subscription/SubscriptionContext';
 
 const leaderboardsHelpLink = getHelpLink('/all-features/leaderboards');
 const multiplayerHelpLink = getHelpLink('/all-features/multiplayer');
@@ -34,9 +34,7 @@ const ServicesWidget = ({
   displayUnlockMoreLeaderboardsCallout,
 }: Props) => {
   const { isMobile } = useResponsiveWindowSize();
-  const { openSubscriptionDialog } = React.useContext(
-    SubscriptionSuggestionContext
-  );
+  const { openSubscriptionDialog } = React.useContext(SubscriptionContext);
   return (
     <DashboardWidget
       widgetSize={'full'}