[license] Last clean-up for the license model

mui · Sep 13, 2024 · 61cdc80 · 61cdc80
1 parent 298e1b6
commit 61cdc80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/packages/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx
@@ -14,7 +14,7 @@ describe('<DataGridPremium /> - License', () => {
         expiryDate: addYears(new Date(), 1),
         orderNumber: 'Test',
         licenseModel: 'subscription',
-        scope: 'pro',
+        planScope: 'pro',
         planVersion: 'initial',
       }),
     );

diff --git a/packages/x-license/src/generateLicense/generateLicense.ts b/packages/x-license/src/generateLicense/generateLicense.ts
@@ -6,31 +6,14 @@ import { LICENSE_MODELS, LicenseModel } from '../utils/licenseModel';
 const licenseVersion = '2';
 
 export interface LicenseDetails {
-  orderNumber: string;
   expiryDate: Date;
-  /**
-   * @deprecated Use planScope instead.
-   */
-  scope?: PlanScope;
-  planScope?: PlanScope;
-  /**
-   * @deprecated Use licenseModel instead.
-   */
-  licensingModel?: LicenseModel; // TODO deprecate
   licenseModel?: LicenseModel;
+  orderNumber: string;
+  planScope?: PlanScope;
   planVersion: PlanVersion;
 }
 
 function getClearLicenseString(details: LicenseDetails) {
-  // TODO remove
-  if (details.licensingModel) {
-    details.licenseModel = details.licensingModel;
-  }
-  // TODO remove
-  if (details.scope) {
-    details.planScope = details.scope;
-  }
-
   if (details.planScope && !PLAN_SCOPES.includes(details.planScope)) {
     throw new Error('MUI X: Invalid scope');
   }

diff --git a/packages/x-license/src/utils/licenseModel.ts b/packages/x-license/src/utils/licenseModel.ts
@@ -10,7 +10,9 @@ export const LICENSE_MODELS = [
    */
   'annual',
   /**
-   * TODO 2026 remove, legacy name of annual.
+   * Legacy. The previous name for 'annual'.
+   * Can be removed once old license keys generated with 'subscription' are no longer supported.
+   * It could up to 2030.
    */
   'subscription',
 ] as const;