Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

✨ Redesigned Admin settings (#18545)

Browse source 
refs https://github.com/TryGhost/Product/issues/3832

Last piece of cleanup, removing the old feature flag. See
https://github.com/TryGhost/Ghost/pull/18360 for the commit that
actually switched over the routes.
This commit is contained in:
Jono M 2023-10-10 07:37:01 +01:00 committed by GitHub
parent 4b07de885a
commit 81d2fa09da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
View file

@ -35,10 +35,6 @@ const features = [{
title: 'Collections Card',
description: 'Enables the Collections Card for pages - requires Collections and the beta Editor to be enabled',
flag: 'collectionsCard'
},{
title: 'Admin X',
description: 'Enables Admin X, the new admin UI for Ghost',
flag: 'adminXSettings'
},{
title: 'Mail Events',
description: 'Enables processing of mail events',

1
apps/admin-x-settings/test/utils/acceptance.ts
View file

@ -50,7 +50,6 @@ export const responseFixtures = {
};
let defaultLabFlags = {
adminXSettings: false,
recommendations: false,
audienceFeedback: false,
collections: false,

1
ghost/admin/app/services/feature.js
View file

@ -72,7 +72,6 @@ export default class FeatureService extends Service {
@feature('signupCard') signupCard;
@feature('signupForm') signupForm;
@feature('collections') collections;
@feature('adminXSettings') adminXSettings;
@feature('mailEvents') mailEvents;
@feature('collectionsCard') collectionsCard;
@feature('importMemberTier') importMemberTier;

14
ghost/admin/app/templates/settings/labs.hbs
View file

@ -296,20 +296,6 @@
</div>
</div>
<div class="gh-expandable-block">
<div class="gh-expandable-header">
<div>
<h4 class="gh-expandable-title">Admin X</h4>
<p class="gh-expandable-description">
Enables Admin X, the new admin UI for Ghost
</p>
</div>
<div class="for-switch">
<GhFeatureFlag @flag="adminXSettings" />
</div>
</div>
</div>
<div class="gh-expandable-block">
<div class="gh-expandable-header">
<div>

6
ghost/core/core/server/services/settings/SettingsBREADService.js
View file

@ -65,11 +65,7 @@ class SettingsBREADService {
// @todo: need to make this more generic?
const adminUrl = urlUtils.urlFor('admin', true);
const signinURL = new URL(adminUrl);
signinURL.hash = `/settings/members/?verifyEmail=${token}`;
// NOTE: to be removed in future, this is to ensure that the new settings are used when enabled
if (labsService && labsService.isSet('adminXSettings')) {
signinURL.hash = `/settings-x/portal/edit?verifyEmail=${token}`;
}
signinURL.hash = `/settings/portal/edit?verifyEmail=${token}`;
return signinURL.href;
}

1
ghost/core/core/shared/labs.js
View file

@ -37,7 +37,6 @@ const ALPHA_FEATURES = [
'websockets',
'stripeAutomaticTax',
'emailCustomization',
'adminXSettings',
'mailEvents',
'collectionsCard',
'tipsAndDonations',

6
ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap
View file

@ -120,7 +120,7 @@ exports[`UNIT > Settings BREAD Service: edit setting members_support_address tri
<table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
<tbody>
<tr>
<td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/members/?verifyEmail=test\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
<td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/portal/edit?verifyEmail=test\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
</tr>
</tbody>
</table>
@ -131,7 +131,7 @@ exports[`UNIT > Settings BREAD Service: edit setting members_support_address tri
<p style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 25px;\\">For your security, the link will expire in 24 hours time.</p>
<hr/>
<p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
<p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/members/?verifyEmail=test</p>
<p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/portal/edit?verifyEmail=test</p>
</td>
</tr>
</table>
@ -175,7 +175,7 @@ exports[`UNIT > Settings BREAD Service: edit setting members_support_address tri
Please confirm your email address with this link:
http://127.0.0.1:2369/ghost/#/settings/members/?verifyEmail=test
http://127.0.0.1:2369/ghost/#/settings/portal/edit?verifyEmail=test
For your security, the link will expire in 24 hours time.