From 191a301242f156b671275ef63d3ce829e2f27e45 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Thu, 4 Jul 2024 17:21:48 +0100
Subject: [PATCH] Cleaned up hasPortalImprovements GA feature flag (#20548)

no issue

- the feature has been GA for a long time now so the conditionals are no longer required
---
 .../membership/portal/SignupOptions.tsx       | 24 ++++++++-----------
 .../membership/tiers/TierDetailModal.tsx      |  9 +++----
 ghost/admin/app/services/feature.js           |  1 -
 ghost/core/core/shared/labs.js                |  1 -
 .../admin/__snapshots__/settings.test.js.snap |  2 +-
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
index f8684a8414..54fba10de3 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
@@ -1,5 +1,4 @@
 import React, {useCallback, useEffect, useMemo} from 'react';
-import useFeatureFlag from '../../../../hooks/useFeatureFlag';
 import {CheckboxGroup, CheckboxProps, Form, HtmlField, Select, SelectOption, Toggle} from '@tryghost/admin-x-design-system';
 import {Setting, SettingValue, checkStripeEnabled, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 import {Tier, getPaidActiveTiers} from '@tryghost/admin-x-framework/api/tiers';
@@ -14,7 +13,6 @@ const SignupOptions: React.FC<{
     setError: (key: string, error: string | undefined) => void
 }> = ({localSettings, updateSetting, localTiers, updateTier, errors, setError}) => {
     const {config} = useGlobalData();
-    const hasPortalImprovements = useFeatureFlag('portalImprovements');
     const [membersSignupAccess, portalName, portalSignupTermsHtml, portalSignupCheckboxRequired, portalPlansJson, portalDefaultPlan] = getSettingValues(
         localSettings, ['members_signup_access', 'portal_name', 'portal_signup_terms_html', 'portal_signup_checkbox_required', 'portal_plans', 'portal_default_plan']
     );
@@ -52,16 +50,14 @@ const SignupOptions: React.FC<{
         updateSetting('portal_plans', JSON.stringify(portalPlans));
 
         // Check default plan is included
-        if (hasPortalImprovements) {
-            if (portalDefaultPlan === 'yearly') {
-                if (!portalPlans.includes('yearly') && portalPlans.includes('monthly')) {
-                    updateSetting('portal_default_plan', 'monthly');
-                }
-            } else if (portalDefaultPlan === 'monthly') {
-                if (!portalPlans.includes('monthly')) {
-                    // If both yearly and monthly are missing from plans, still set it to yearly
-                    updateSetting('portal_default_plan', 'yearly');
-                }
+        if (portalDefaultPlan === 'yearly') {
+            if (!portalPlans.includes('yearly') && portalPlans.includes('monthly')) {
+                updateSetting('portal_default_plan', 'monthly');
+            }
+        } else if (portalDefaultPlan === 'monthly') {
+            if (!portalPlans.includes('monthly')) {
+                // If both yearly and monthly are missing from plans, still set it to yearly
+                updateSetting('portal_default_plan', 'yearly');
             }
         }
     };
@@ -79,7 +75,7 @@ const SignupOptions: React.FC<{
                 tiersCheckboxes.push({
                     checked: (portalPlans.includes('free')),
                     disabled: isDisabled,
-                    label: hasPortalImprovements ? tier.name : 'Free',
+                    label: tier.name,
                     value: 'free',
                     onChange: (checked) => {
                         if (portalPlans.includes('free') && !checked) {
@@ -158,7 +154,7 @@ const SignupOptions: React.FC<{
                     ]}
                     title='Prices available at signup'
                 />
-                {(hasPortalImprovements && portalPlans.includes('yearly') && portalPlans.includes('monthly')) &&
+                {(portalPlans.includes('yearly') && portalPlans.includes('monthly')) &&
                     <Select
                         options={defaultPlanOptions}
                         selectedOption={defaultPlanOptions.find(option => option.value === portalDefaultPlan)}
diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
index 01e9e5d6f7..b6e5586645 100644
--- a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
@@ -1,7 +1,6 @@
 import NiceModal from '@ebay/nice-modal-react';
 import React, {useEffect, useRef} from 'react';
 import TierDetailPreview from './TierDetailPreview';
-import useFeatureFlag from '../../../../hooks/useFeatureFlag';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
 import {Button, ButtonProps, ConfirmationModal, CurrencyField, Form, Heading, Icon, Modal, Select, SortableList, TextField, Toggle, URLTextField, showToast, useSortableIndexedList} from '@tryghost/admin-x-design-system';
 import {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
@@ -25,8 +24,6 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
     const handleError = useHandleError();
     const {localSettings, siteData} = useSettingGroup();
     const [portalPlansJson] = getSettingValues(localSettings, ['portal_plans']) as string[];
-    const hasPortalImprovements = useFeatureFlag('portalImprovements');
-    const allowNameChange = !isFreeTier || hasPortalImprovements;
     const portalPlans = JSON.parse(portalPlansJson?.toString() || '[]') as string[];
 
     const validators: {[key in keyof Tier]?: () => string | undefined} = {
@@ -70,7 +67,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             } else {
                 await createTier(values);
             }
-            if (isFreeTier && hasPortalImprovements) {
+            if (isFreeTier) {
                 // If we changed the visibility, we also need to update Portal settings in some situations
                 // Like the free tier is a special case, and should also be present/absent in portal_plans
                 const visible = formState.visibility === 'public';
@@ -196,7 +193,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
         <div className='-mb-8 mt-8 flex items-start gap-8'>
             <div className='flex grow flex-col gap-8'>
                 <Form marginBottom={false} title='Basic' grouped>
-                    {allowNameChange && <TextField
+                    <TextField
                         autoComplete='off'
                         error={Boolean(errors.name)}
                         hint={errors.name}
@@ -207,7 +204,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                         autoFocus
                         onChange={e => updateForm(state => ({...state, name: e.target.value}))}
                         onKeyDown={() => clearError('name')}
-                    />}
+                    />
                     <TextField
                         autoComplete='off'
                         autoFocus={isFreeTier}
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index d6c1f790d0..d16cdff79b 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -78,7 +78,6 @@ export default class FeatureService extends Service {
     @feature('lexicalIndicators') lexicalIndicators;
     @feature('filterEmailDisabled') filterEmailDisabled;
     @feature('adminXDemo') adminXDemo;
-    @feature('portalImprovements') portalImprovements;
     @feature('ActivityPub') ActivityPub;
     @feature('internalLinking') internalLinking;
     @feature('editorExcerpt') editorExcerpt;
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index f96d91b349..a439506ee7 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -24,7 +24,6 @@ const GA_FEATURES = [
     'listUnsubscribeHeader',
     'filterEmailDisabled',
     'newEmailAddresses',
-    'portalImprovements',
     'internalLinking'
 ];
 
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index cb0c1cc49b..b1073bc2aa 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -1155,7 +1155,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "4587",
+  "content-length": "4559",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,