ghost 4.47.4 → 4.48.0

package/core/built/assets/{ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js → ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js}

@@ -4354,6 +4354,6 @@ var i=t.default.create({properties:["name","event","targetUrl"],name(e){Ember.is
 e.default=i})),define("ghost-admin/views/application",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var t=Ember.Component.extend({})
 e.default=t})),define("ghost-admin/config/environment",[],(function(){try{var e="ghost-admin/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.47",name:"ghost-admin"})
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.48",name:"ghost-admin"})
 
-//# sourceMappingURL=ghost.min-a2a47979b0b61d15a3914042a7b1cd20.map
+//# sourceMappingURL=ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.map

package/core/server/api/canary/members.js

@@ -5,7 +5,6 @@ const moment = require('moment-timezone');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const membersService = require('../../services/members');
-const labsService = require('../../../shared/labs');
 
 const settingsCache = require('../../../shared/settings-cache');
 const tpl = require('@tryghost/tpl');
@@ -362,16 +361,9 @@ module.exports = {
         },
         validation: {},
         async query(frame) {
-            frame.options.withRelated = ['labels', 'stripeSubscriptions', 'stripeSubscriptions.customer'];
-            if (labsService.isSet('multipleProducts')) {
-                frame.options.withRelated.push('products');
-            }
-            if (labsService.isSet('multipleNewsletters')) {
-                frame.options.withRelated.push('newsletters');
-            }
-            const page = await membersService.api.members.list(frame.options);
-
-            return page;
+            return {
+                data: await membersService.export(frame.options)
+            };
         }
     },
 

package/core/server/api/canary/utils/serializers/output/members.js

@@ -79,18 +79,13 @@ function bulkAction(bulkActionResult, _apiConfig, frame) {
 /**
  * @template PageMeta
  *
- * @param {{data: import('bookshelf').Model[], meta: PageMeta}} page
- * @param {APIConfig} _apiConfig
- * @param {Frame} frame
+ * @param {{data: any[]}} data
  *
  * @returns {string} - A CSV string
  */
-function exportCSV(page, _apiConfig, frame) {
+function exportCSV(data) {
     debug('exportCSV');
-
-    const members = page.data.map(model => serializeMember(model, frame.options));
-
-    return unparse(members);
+    return unparse(data.data);
 }
 
 /**

package/core/server/data/exporter/index.js

@@ -1,5 +1,8 @@
+const {BACKUP_TABLES, TABLES_ALLOWLIST} = require('./table-lists');
+
 module.exports = {
     doExport: require('./exporter'),
     fileName: require('./export-filename'),
-    BACKUP_TABLES: require('./table-lists').BACKUP_TABLES
+    BACKUP_TABLES,
+    TABLES_ALLOWLIST
 };

package/core/server/data/exporter/table-lists.js

@@ -10,25 +10,17 @@ const BACKUP_TABLES = [
     'members',
     'members_labels',
     'members_products',
-    'posts_products',
     'members_stripe_customers',
     'members_stripe_customers_subscriptions',
     'migrations',
     'migrations_lock',
-    'newsletters',
     'oauth',
     'permissions',
     'permissions_roles',
     'permissions_users',
-    'products',
-    'benefits',
-    'products_benefits',
     'webhooks',
-    'snippets',
     'tokens',
     'sessions',
-    'stripe_products',
-    'stripe_prices',
     'mobiledoc_revisions',
     'email_batches',
     'email_recipients',
@@ -40,9 +32,8 @@ const BACKUP_TABLES = [
     'members_paid_subscription_events',
     'members_subscribe_events',
     'members_product_events',
-    'members_newsletters',
-    'offers',
-    'offer_redemptions'
+    'members_newsletters'
+
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file
@@ -58,7 +49,17 @@ const TABLES_ALLOWLIST = [
     'settings',
     'custom_theme_settings',
     'tags',
-    'users'
+    'users',
+    'products',
+    'stripe_products',
+    'stripe_prices',
+    'posts_products',
+    'newsletters',
+    'benefits',
+    'products_benefits',
+    'offers',
+    'offer_redemptions',
+    'snippets'
 ];
 
 // NOTE: these are settings keys which should never end up in the export file

package/core/server/services/members/exporter/query.js

@@ -0,0 +1,88 @@
+const models = require('../../../models');
+const {knex} = require('../../../data/db');
+const moment = require('moment');
+
+module.exports = async function (options) {
+    const hasFilter = options.limit !== 'all' || options.filter || options.search;
+
+    let ids = null;
+    if (hasFilter) {
+        // do a very minimal query, only to fetch the ids of the filtered values
+        // should be quite fast
+        options.withRelated = [];
+        options.columns = ['id'];
+
+        const page = await models.Member.findPage(options);
+        ids = page.data.map(d => d.id);
+
+        /*
+        const filterOptions = _.pick(options, ['transacting', 'context']);
+
+        if (all !== true) {
+            // Include mongoTransformer to apply subscribed:{true|false} => newsletter relation mapping
+            Object.assign(filterOptions, _.pick(options, ['filter', 'search', 'mongoTransformer']));
+        }
+        
+        const memberRows = await models.Member.getFilteredCollectionQuery(filterOptions)
+            .select('members.id')
+            .distinct();
+
+        ids = memberRows.map(row => row.id);
+        */
+    }
+
+    const allProducts = await models.Product.fetchAll();
+    const allLabels = await models.Label.fetchAll();
+
+    let query = knex('members')
+        .select('id', 'email', 'name', 'note', 'status', 'created_at')
+        .select(knex.raw(`
+            (CASE WHEN EXISTS (SELECT 1 FROM members_newsletters n WHERE n.member_id = members.id)
+                    THEN TRUE ELSE FALSE
+            END) as subscribed
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(product_id) FROM members_products f WHERE f.member_id = members.id) as products
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(label_id) FROM members_labels f WHERE f.member_id = members.id) as labels
+        `))
+        .select(knex.raw(`
+            (SELECT customer_id FROM members_stripe_customers f WHERE f.member_id = members.id limit 1) as stripe_customer_id
+        `));
+
+    if (hasFilter) {
+        query = query.whereIn('id', ids);
+    }
+
+    const rows = await query;
+    for (const row of rows) {
+        const productIds = row.products ? row.products.split(',') : [];
+        const products = productIds.map((id) => {
+            const product = allProducts.find(p => p.id === id);
+            return {
+                name: product.get('name')
+            };
+        });
+        row.products = products;
+
+        const labelIds = row.labels ? row.labels.split(',') : [];
+        const labels = labelIds.map((id) => {
+            const label = allLabels.find(l => l.id === id);
+            return {
+                name: label.get('name')
+            };
+        });
+        row.labels = labels;
+    }
+
+    for (const member of rows) {
+        // Note: we don't modify the array or change/duplicate objects
+        // to increase performance
+        member.subscribed = !!member.subscribed;
+        member.comped = member.status === 'comped';
+        member.created_at = moment(member.created_at).toISOString();
+    }
+
+    return rows;
+};

package/core/server/services/members/service.js

@@ -202,7 +202,7 @@ module.exports = {
 
     processImport: processImport,
 
-    stats: membersStats
-
+    stats: membersStats,
+    export: require('./exporter/query')
 };
 module.exports.middleware = require('./middleware');

package/core/server/web/admin/views/default-prod.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.47%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.48%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.47%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.48%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js"></script>
             
 </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.47.4",
+  "version": "4.48.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",