chore: remove history future flag (#20131)

strapi · Apr 17, 2024 · d23c1d5 · d23c1d5
1 parent b2d2f81
commit d23c1d5
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 16 deletions.
diff --git a/.github/actions/run-e2e-tests/action.yml b/.github/actions/run-e2e-tests/action.yml
@@ -14,6 +14,5 @@ runs:
       env:
         RUN_EE: ${{ inputs.runEE }}
         JEST_OPTIONS: ${{ inputs.jestOptions }}
-        STRAPI_FEATURES_FUTURE_CONTENT_HISTORY: ${{ inputs.enableFutureFeatures }}
         STRAPI_FEATURES_FUTURE_RELEASES_SCHEDULING: ${{ inputs.enableFutureFeatures }}
       shell: bash
diff --git a/examples/getstarted/config/features.js b/examples/getstarted/config/features.js
@@ -1,6 +1,5 @@
 module.exports = ({ env }) => ({
   future: {
-    history: env.bool('STRAPI_FEATURES_FUTURE_CONTENT_HISTORY', false),
     contentReleasesScheduling: env.bool('STRAPI_FUTURE_CONTENT_RELEASES_SCHEDULING', false),
   },
 });
diff --git a/packages/core/content-manager/admin/src/history/components/HistoryAction.tsx b/packages/core/content-manager/admin/src/history/components/HistoryAction.tsx
@@ -19,10 +19,7 @@ const HistoryAction: DocumentActionComponent = ({ model, document }) => {
   const navigate = useNavigate();
   const pluginsQueryParams = stringify({ plugins: query.plugins }, { encode: false });
 
-  if (
-    !window.strapi.features.isEnabled('cms-content-history') ||
-    !window.strapi.future.isEnabled('history')
-  ) {
+  if (!window.strapi.features.isEnabled('cms-content-history')) {
     return null;
   }
 

diff --git a/packages/core/content-manager/server/src/history/index.ts b/packages/core/content-manager/server/src/history/index.ts
@@ -6,14 +6,11 @@ import { getService } from './utils';
 import { historyVersion } from './models/history-version';
 
 /**
- * Check once if the feature is enabled (both license info & feature flag) before loading it,
+ * Check once if the feature is enabled before loading it,
  * so that we can assume it is enabled in the other files.
  */
 const getFeature = (): Partial<Plugin.LoadedPlugin> => {
-  if (
-    strapi.features.future.isEnabled('history') &&
-    strapi.ee.features.isEnabled('cms-content-history')
-  ) {
+  if (strapi.ee.features.isEnabled('cms-content-history')) {
     return {
       register({ strapi }) {
         strapi.get('models').add(historyVersion);

diff --git a/packages/core/types/src/modules/features.ts b/packages/core/types/src/modules/features.ts
@@ -1,7 +1,6 @@
 export interface FeaturesConfig {
   future?: {
     contentReleases?: boolean;
-    history?: boolean;
   };
 }
 

diff --git a/tests/e2e/.env.example b/tests/e2e/.env.example
@@ -2,4 +2,3 @@
 
 # Examples:
 STRAPI_LICENSE=your_license_key
-STRAPI_FEATURES_FUTURE_CONTENT_HISTORY=true
diff --git a/tests/e2e/app-template/config/features.js b/tests/e2e/app-template/config/features.js
@@ -1,6 +1,5 @@
 module.exports = ({ env }) => ({
   future: {
-    history: env.bool('STRAPI_FEATURES_FUTURE_CONTENT_HISTORY', false),
     contentReleasesScheduling: env.bool('STRAPI_FEATURES_FUTURE_RELEASES_SCHEDULING', false),
   },
 });
diff --git a/tests/e2e/tests/content-manager/history.spec.ts b/tests/e2e/tests/content-manager/history.spec.ts
@@ -5,9 +5,9 @@ import { describeOnCondition } from '../../utils/shared';
 import { resetFiles } from '../../utils/file-reset';
 import { waitForRestart } from '../../utils/restart';
 
-const hasFutureFlag = process.env.STRAPI_FEATURES_FUTURE_CONTENT_HISTORY === 'true';
+const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
 
-describeOnCondition(hasFutureFlag)('History', () => {
+describeOnCondition(edition === 'EE')('History', () => {
   test.describe('Collection Type', () => {
     test.beforeEach(async ({ page }) => {
       await resetDatabaseAndImportDataFromPath('with-admin.tar');