Removed ui60 flag from Settings (#24390)

ref
https://linear.app/ghost/issue/PROD-2317/remove-settings-related-ui60-flag

- Removed `ui60` flag for settings sidebar navigation and search,
content area and related tests. This PR doesn't remove the flag itself
as it's still used in the Admin.

Author: peterzimon

apps/admin-x-settings/src/components/Settings.tsx

@@ -6,33 +6,17 @@ import GeneralSettings from './settings/general/GeneralSettings';
 import GrowthSettings from './settings/growth/GrowthSettings';
 import MembershipSettings from './settings/membership/MembershipSettings';
 import SiteSettings from './settings/site/SiteSettings';
-import useFeatureFlag from '../hooks/useFeatureFlag';
 
 const Settings: React.FC = () => {
-    const ui60 = useFeatureFlag('ui60');
-
     return (
         <>
             <div className='mb-[60vh] px-8 pt-16 tablet:max-w-[760px] tablet:px-14 tablet:pt-0'>
-                {ui60 ?
-                    <>
-                        <GeneralSettings />
-                        <SiteSettings />
-                        <MembershipSettings />
-                        <EmailSettings />
-                        <GrowthSettings />
-                        <AdvancedSettings />
-                    </>
-                    :
-                    <>
-                        <GeneralSettings />
-                        <SiteSettings />
-                        <MembershipSettings />
-                        <GrowthSettings />
-                        <EmailSettings />
-                        <AdvancedSettings />
-                    </>
-                }
+                <GeneralSettings />
+                <SiteSettings />
+                <MembershipSettings />
+                <EmailSettings />
+                <GrowthSettings />
+                <AdvancedSettings />
             </div>
         </>
     );

apps/admin-x-settings/src/components/Sidebar.tsx

@@ -6,18 +6,6 @@ import Labs from './Labs';
 import MigrationTools from './MigrationTools';
 import React from 'react';
 import SearchableSection from '../../SearchableSection';
-import SpamFilters from './SpamFilters';
-import useFeatureFlag from '../../../hooks/useFeatureFlag';
-
-export const searchKeywords5x = {
-    integrations: ['advanced', 'integrations', 'zapier', 'slack', 'unsplash', 'first promoter', 'firstpromoter', 'pintura', 'disqus', 'analytics', 'ulysses', 'typeform', 'buffer', 'plausible', 'github', 'webhooks'],
-    migrationtools: ['import', 'export', 'migrate', 'substack', 'substack', 'migration', 'medium', 'wordpress', 'wp', 'squarespace'],
-    codeInjection: ['advanced', 'code injection', 'head', 'footer'],
-    labs: ['advanced', 'labs', 'alpha', 'private', 'beta', 'flag', 'routes', 'redirect', 'translation', 'editor', 'portal'],
-    history: ['advanced', 'history', 'log', 'events', 'user events', 'staff', 'audit', 'action'],
-    dangerzone: ['danger', 'danger zone', 'delete', 'content', 'delete all content', 'delete site'],
-    spamFilters: ['membership', 'signup', 'sign up', 'spam', 'filters', 'prevention', 'prevent', 'block', 'domains', 'email']
-};
 
 export const searchKeywords = {
     integrations: ['advanced', 'integrations', 'zapier', 'slack', 'unsplash', 'first promoter', 'firstpromoter', 'pintura', 'disqus', 'analytics', 'ulysses', 'typeform', 'buffer', 'plausible', 'github', 'webhooks'],
@@ -29,22 +17,6 @@ export const searchKeywords = {
 };
 
 const AdvancedSettings: React.FC = () => {
-    const ui60 = useFeatureFlag('ui60');
-
-    if (!ui60) {
-        return (
-            <SearchableSection keywords={Object.values(searchKeywords5x).flat()} title='Advanced'>
-                <Integrations keywords={searchKeywords5x.integrations} />
-                <MigrationTools keywords={searchKeywords5x.migrationtools} />
-                <SpamFilters keywords={searchKeywords5x.spamFilters} />
-                <CodeInjection keywords={searchKeywords5x.codeInjection} />
-                <Labs keywords={searchKeywords5x.labs} />
-                <History keywords={searchKeywords5x.history} />
-                <DangerZone keywords={searchKeywords5x.dangerzone} />
-            </SearchableSection>
-        );
-    }
-
     return (
         <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Advanced'>
             <Integrations keywords={searchKeywords.integrations} />

apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx

@@ -1,32 +1,14 @@
 import React from 'react';
 
 import Analytics from '../membership/Analytics';
-import Facebook from './Facebook';
 import LockSite from './LockSite';
-import Metadata from './Metadata';
 import PublicationLanguage from './PublicationLanguage';
 import SEOMeta from './SEOMeta';
 import SearchableSection from '../../SearchableSection';
 import SocialAccounts from './SocialAccounts';
 import TimeZone from './TimeZone';
 import TitleAndDescription from './TitleAndDescription';
-import Twitter from './Twitter';
 import Users from './Users';
-import useFeatureFlag from '../../../hooks/useFeatureFlag';
-
-// @TODO: Remove this for 6.0 -->
-export const searchKeywords5x = {
-    titleAndDescription: ['general', 'title and description', 'site title', 'site description', 'title & description'],
-    timeZone: ['general', 'time', 'date', 'site timezone', 'time zone'],
-    publicationLanguage: ['general', 'publication language', 'locale'],
-    metadata: ['general', 'metadata', 'title', 'description', 'search', 'engine', 'google', 'meta data'],
-    twitter: ['general', 'twitter card', 'structured data', 'rich cards', 'x card', 'social'],
-    facebook: ['general', 'facebook card', 'structured data', 'rich cards', 'social'],
-    socialAccounts: ['general', 'social accounts', 'facebook', 'twitter', 'structured data', 'rich cards'],
-    lockSite: ['general', 'password protection', 'lock site', 'make this site private'],
-    users: ['general', 'users and permissions', 'roles', 'staff', 'invite people', 'contributors', 'editors', 'authors', 'administrators']
-};
-// <--
 
 export const searchKeywords = {
     titleAndDescription: ['general', 'title and description', 'site title', 'site description', 'title & description'],
@@ -40,24 +22,6 @@ export const searchKeywords = {
 };
 
 const GeneralSettings: React.FC = () => {
-    const ui60 = useFeatureFlag('ui60');
-
-    if (!ui60) {
-        return (
-            <SearchableSection keywords={Object.values(searchKeywords5x).flat()} title="General settings">
-                <TitleAndDescription keywords={searchKeywords5x.titleAndDescription} />
-                <TimeZone keywords={searchKeywords5x.timeZone} />
-                <PublicationLanguage keywords={searchKeywords5x.publicationLanguage} />
-                <Metadata keywords={searchKeywords5x.metadata} />
-                <Twitter keywords={searchKeywords5x.twitter} />
-                <Facebook keywords={searchKeywords5x.facebook} />
-                <SocialAccounts keywords={searchKeywords5x.socialAccounts} />
-                <LockSite keywords={searchKeywords5x.lockSite} />
-                <Users keywords={searchKeywords5x.users} />
-            </SearchableSection>
-        );
-    }
-
     // This section is going to be updated with merging Twitter and Facebook to the Metadata group,
     // that's why we're using a dedicated searchKeywords array for it.
     return (