From ea98469e6eac2560b54528a64715ab8dd4ff5032 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 18 May 2022 10:13:06 +0100
Subject: [PATCH] Cleaned up `improvedOnboarding` labs flag

no issue

- the feature has been GA for a while now so the conditionals are no longer required
---
 .../settings/form-fields/publication-cover.hbs      |  8 +++-----
 .../settings/form-fields/publication-cover.js       |  4 +---
 ghost/admin/app/routes/home.js                      |  7 ++++---
 ghost/admin/app/services/feature.js                 |  1 -
 ghost/admin/app/templates/settings/labs.hbs         | 13 -------------
 ghost/admin/tests/acceptance/dashboard-test.js      |  1 -
 ghost/admin/tests/acceptance/setup-test.js          |  5 -----
 7 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs b/ghost/admin/app/components/settings/form-fields/publication-cover.hbs
index 914fce18fc..819b1ef228 100644
--- a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs
+++ b/ghost/admin/app/components/settings/form-fields/publication-cover.hbs
@@ -33,11 +33,9 @@
                     <button id="publication-cover" type="button" class="gh-btn gh-btn-white" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="coverImage">
                         <span>Upload cover</span>
                     </button>
-                    {{#if (feature "improvedOnboarding")}}
-                        <button type="button" class="gh-btn gh-btn-white w10" {{on "click" this.toggleUnsplashSelector}} aria-label="Select photo from Unsplash">
-                            <span>{{svg-jar "unsplash" class="nudge-right--2 nudge-bottom--2"}}</span>
-                        </button>
-                    {{/if}}
+                    <button type="button" class="gh-btn gh-btn-white w10" {{on "click" this.toggleUnsplashSelector}} aria-label="Select photo from Unsplash">
+                        <span>{{svg-jar "unsplash" class="nudge-right--2 nudge-bottom--2"}}</span>
+                    </button>
                 </div>
             {{/if}}
             <div class="dn">
diff --git a/ghost/admin/app/components/settings/form-fields/publication-cover.js b/ghost/admin/app/components/settings/form-fields/publication-cover.js
index 09a9ad0717..39667e99ca 100644
--- a/ghost/admin/app/components/settings/form-fields/publication-cover.js
+++ b/ghost/admin/app/components/settings/form-fields/publication-cover.js
@@ -31,9 +31,7 @@ export default class PublicationCoverFormField extends Component {
 
     @action
     toggleUnsplashSelector() {
-        if (this.feature.improvedOnboarding) {
-            this.showUnsplashSelector = !this.showUnsplashSelector;
-        }
+        this.showUnsplashSelector = !this.showUnsplashSelector;
     }
 
     @action
diff --git a/ghost/admin/app/routes/home.js b/ghost/admin/app/routes/home.js
index 4199f3702c..be0be01f53 100644
--- a/ghost/admin/app/routes/home.js
+++ b/ghost/admin/app/routes/home.js
@@ -4,15 +4,16 @@ import {inject as service} from '@ember/service';
 export default class HomeRoute extends Route {
     @service feature;
     @service modals;
+    @service router;
 
     beforeModel(transition) {
         super.beforeModel(...arguments);
 
-        if (this.feature.improvedOnboarding && transition.to?.queryParams?.firstStart === 'true') {
-            return this.transitionTo('setup.done');
+        if (transition.to?.queryParams?.firstStart === 'true') {
+            return this.router.transitionTo('setup.done');
         }
 
-        this.transitionTo('dashboard');
+        this.router.transitionTo('dashboard');
     }
 
     resetController(controller) {
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 889be85658..312cae83a5 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -62,7 +62,6 @@ export default class FeatureService extends Service {
     @feature('multipleNewsletters') multipleNewsletters;
     @feature('multipleNewslettersUI') multipleNewslettersUI;
     @feature('tweetGridCard') tweetGridCard;
-    @feature('improvedOnboarding') improvedOnboarding;
     @feature('membersTableStatus') membersTableStatus;
     @feature('selectablePortalLinks') selectablePortalLinks;
 
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 59345157f3..1ad81fcf74 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -239,19 +239,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Improved onboarding flow</h4>
-                            <p class="gh-expandable-description">
-                                Various tweaks to streamline the site creation and getting started flows.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="improvedOnboarding" />
-                        </div>
-                    </div>
-                </div>
                 <div class="gh-expandable-block">
                     <div class="gh-expandable-header">
                         <div>
diff --git a/ghost/admin/tests/acceptance/dashboard-test.js b/ghost/admin/tests/acceptance/dashboard-test.js
index 1006839fcd..33cafd448c 100644
--- a/ghost/admin/tests/acceptance/dashboard-test.js
+++ b/ghost/admin/tests/acceptance/dashboard-test.js
@@ -14,7 +14,6 @@ describe('Acceptance: Dashboard', function () {
         this.server.loadFixtures('configs');
         this.server.loadFixtures('settings');
         enableLabsFlag(this.server, 'membersActivity');
-        enableLabsFlag(this.server, 'improvedOnboarding');
 
         let role = this.server.create('role', {name: 'Administrator'});
         this.server.create('user', {roles: [role]});
diff --git a/ghost/admin/tests/acceptance/setup-test.js b/ghost/admin/tests/acceptance/setup-test.js
index 48fea34876..4857598448 100644
--- a/ghost/admin/tests/acceptance/setup-test.js
+++ b/ghost/admin/tests/acceptance/setup-test.js
@@ -2,7 +2,6 @@ import {Response} from 'miragejs';
 import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
 import {beforeEach, describe, it} from 'mocha';
 import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-import {enableLabsFlag} from '../helpers/labs-flag';
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
@@ -12,10 +11,6 @@ describe('Acceptance: Setup', function () {
     let hooks = setupApplicationTest();
     setupMirage(hooks);
 
-    beforeEach(function () {
-        enableLabsFlag(this.server, 'improvedOnboarding');
-    });
-
     it('redirects if already authenticated', async function () {
         let role = this.server.create('role', {name: 'Author'});
         this.server.create('user', {roles: [role], slug: 'test-user'});