🔥 Removed all subscriber feature related code (#1337)

refs TryGhost/Ghost#11153 - Removed all subscriber feature related code - The feature is being substituted by members
TryGhost · Sep 26, 2019 · 8dff0ee · 8dff0ee
1 parent 8a3217b
commit 8dff0ee
Show file tree

Hide file tree

Showing 37 changed files with 3 additions and 1,131 deletions.
diff --git a/app/components/gh-feature-flag.js b/app/components/gh-feature-flag.js
@@ -20,9 +20,6 @@ const FeatureFlagComponent = Component.extend({
             return this._flagValue;
         },
         set(key, value) {
-            if (this.flag === 'members' && value === true) {
-                this.set(`feature.subscribers`, false);
-            }
             return this.set(`feature.${this.flag}`, value);
         }
     }),

diff --git a/app/components/modal-delete-subscriber.js b/app/components/modal-delete-subscriber.js
diff --git a/app/components/modal-import-subscribers.js b/app/components/modal-import-subscribers.js
diff --git a/app/components/modal-new-subscriber.js b/app/components/modal-new-subscriber.js
diff --git a/app/controllers/subscribers.js b/app/controllers/subscribers.js
diff --git a/app/controllers/subscribers/import.js b/app/controllers/subscribers/import.js
diff --git a/app/helpers/event-name.js b/app/helpers/event-name.js
@@ -27,11 +27,7 @@ export const AVAILABLE_EVENTS = [
     // GROUPNAME: Tags
     {event: 'tag.added', name: 'Tag created', group: 'Tags'},
     {event: 'tag.edited', name: 'Tag updated', group: 'Tags'},
-    {event: 'tag.deleted', name: 'Tag deleted', group: 'Tags'},
-
-    // GROUPNAME: Subscribers
-    {event: 'subscriber.added', name: 'Subscriber added', group: 'Subscribers'},
-    {event: 'subscriber.deleted', name: 'Subscriber deleted', group: 'Subscribers'}
+    {event: 'tag.deleted', name: 'Tag deleted', group: 'Tags'}
 ];
 
 export function eventName([event]/*, hash*/) {

diff --git a/app/helpers/subscribers-query-params.js b/app/helpers/subscribers-query-params.js
diff --git a/app/helpers/subscribers-sort-icon.js b/app/helpers/subscribers-sort-icon.js
diff --git a/app/mixins/validation-engine.js b/app/mixins/validation-engine.js
@@ -12,7 +12,6 @@ import SetupValidator from 'ghost-admin/validators/setup';
 import SigninValidator from 'ghost-admin/validators/signin';
 import SignupValidator from 'ghost-admin/validators/signup';
 import SlackIntegrationValidator from 'ghost-admin/validators/slack-integration';
-import SubscriberValidator from 'ghost-admin/validators/subscriber';
 import TagSettingsValidator from 'ghost-admin/validators/tag-settings';
 import UserValidator from 'ghost-admin/validators/user';
 import WebhookValidator from 'ghost-admin/validators/webhook';
@@ -42,7 +41,6 @@ export default Mixin.create({
         signin: SigninValidator,
         signup: SignupValidator,
         slackIntegration: SlackIntegrationValidator,
-        subscriber: SubscriberValidator,
         tag: TagSettingsValidator,
         user: UserValidator,
         integration: IntegrationValidator,

diff --git a/app/models/subscriber.js b/app/models/subscriber.js
diff --git a/app/router.js b/app/router.js
@@ -61,11 +61,6 @@ Router.map(function () {
     this.route('members');
     this.route('member', {path: '/members/:member_id'});
 
-    this.route('subscribers', function () {
-        this.route('new');
-        this.route('import');
-    });
-
     this.route('error404', {path: '/*path'});
 });
 

diff --git a/app/routes/subscribers.js b/app/routes/subscribers.js