TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 15:12:58 +03:00
Code Issues Projects Releases Wiki Activity

Separated tiers group to active and archived

Browse Source 
refs https://github.com/TryGhost/Team/issues/1403

- currently, all tiers are grouped together in dropdowns with list of tiers
- this separates them into active and archived groups, so that the status of the tiers is clear when making choices
This commit is contained in:
Sodbileg Gansukh 2023-05-18 13:11:09 +08:00 committed by naz
parent 61e5068081
commit c7b6a72a49
3 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ghost/admin/app/components/gh-members-recipient-select.js
View File

@ -165,21 +165,33 @@ export default class GhMembersRecipientSelect extends Component {
const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all'});
if (tiers.length > 1) {
const tiersGroup = {
groupName: 'Tiers',
const activeTiersGroup = {
groupName: 'Active tiers',
options: []
};
const archivedTiersGroup = {
groupName: 'Archived tiers',
options: []
};
tiers.forEach((tier) => {
tiersGroup.options.push({
const tierData = {
name: tier.name,
segment: `tier:${tier.slug}`,
count: tier.count?.members,
class: 'segment-tier'
});
};
if (tier.active) {
activeTiersGroup.options.push(tierData);
} else {
archivedTiersGroup.options.push(tierData);
}
});
options.push(tiersGroup);
options.push(activeTiersGroup);
options.push(archivedTiersGroup);
}
this.specificOptions = options;

26
ghost/admin/app/components/gh-members-segment-select.js
View File

@ -78,22 +78,36 @@ export default class GhMembersSegmentSelect extends Component {
const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'});
if (tiers.length > 0) {
const tiersGroup = {
groupName: 'Tiers',
const activeTiersGroup = {
groupName: 'Active tiers',
options: []
};
const archivedTiersGroup = {
groupName: 'Archived tiers',
options: []
};
tiers.forEach((tier) => {
tiersGroup.options.push({
const tierData = {
name: tier.name,
segment: `${tier.id}`,
count: tier.count?.members,
class: 'segment-tier'
});
};
if (tier.active) {
activeTiersGroup.options.push(tierData);
} else {
archivedTiersGroup.options.push(tierData);
}
});
options.push(tiersGroup);
options.push(activeTiersGroup);
options.push(archivedTiersGroup);
if (this.args.selectDefaultTier && !this.args.segment) {
this.args.onChange?.(tiersGroup.options[0].segment);
this.args.onChange?.(activeTiersGroup.options[0].segment);
}
}

25
ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.js
View File

@ -75,23 +75,36 @@ export default class VisibilitySegmentSelect extends Component {
this.tiers = tiers;
if (tiers.length > 0) {
const tiersGroup = {
groupName: 'Tiers',
const activeTiersGroup = {
groupName: 'Active tiers',
options: []
};
const archivedTiersGroup = {
groupName: 'Archived tiers',
options: []
};
tiers.forEach((tier) => {
tiersGroup.options.push({
const tierData = {
name: tier.name,
id: tier.id,
count: tier.count?.members,
class: 'segment-tier'
});
};
if (tier.active) {
activeTiersGroup.options.push(tierData);
} else {
archivedTiersGroup.options.push(tierData);
}
});
options.push(tiersGroup);
options.push(activeTiersGroup);
options.push(archivedTiersGroup);
if (this.args.selectDefaultTier && !this.args.tiers) {
this.setSegment([tiersGroup.options[0]]);
this.setSegment([activeTiersGroup.options[0]]);
}
}