Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add tilde before subscribers count in selects

Browse Source 
[MAILPOET-3646]
This commit is contained in:
Jan Lysý
2021-06-28 15:03:36 +02:00
committed by Veljko V
parent adaa004948
commit 96c84009b7
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx
View File

@ -108,7 +108,7 @@ const BasicSettingsPanel = ({ onToggle, isOpened }) => {
values: segments,
multiple: true,
placeholder: MailPoet.I18n.t('settingsPleaseSelectList'),
getLabel: (seg) => (`${seg.name} (${parseInt(seg.subscribers, 10).toLocaleString()})`),
getLabel: (seg) => (`${seg.name} (~${parseInt(seg.subscribers, 10).toLocaleString()})`),
filter: (seg) => (!!(!seg.deleted_at && seg.type === 'default')),
}}
/>

2
assets/js/src/newsletters/send/notification.jsx
View File

@ -60,7 +60,7 @@ let fields = [
return segment.name;
},
getCount: function getCount(segment) {
return parseInt(segment.subscribers, 10).toLocaleString();
return `~${parseInt(segment.subscribers, 10).toLocaleString()}`;
},
transformChangedValue: function transformChangedValue(segmentIds) {
const allSegments = this.getItems();

2
assets/js/src/newsletters/send/standard.jsx
View File

@ -160,7 +160,7 @@ let fields = [
return segment.name;
},
getCount: function getCount(segment) {
return parseInt(segment.subscribers, 10).toLocaleString();
return `~${parseInt(segment.subscribers, 10).toLocaleString()}`;
},
transformChangedValue: function transformChangedValue(segmentIds) {
const allSegments = this.getItems();

2
assets/js/src/newsletters/types/welcome/scheduling.jsx
View File

@ -27,7 +27,7 @@ const segmentField = {
placeholder: MailPoet.I18n.t('selectSegmentPlaceholder'),
forceSelect2: true,
values: availableSegments,
getCount: (segment) => parseInt(segment.subscribers, 10).toLocaleString(),
getCount: (segment) => `~${parseInt(segment.subscribers, 10).toLocaleString()}`,
getLabel: (segment) => segment.name,
getValue: (segment) => segment.id,
};

2
assets/js/src/settings/components/segments_select.tsx
View File

@ -16,7 +16,7 @@ export default (props: Props) => {
const segments = useSelector(selector)().map((segment) => ({
value: segment.id,
label: segment.name,
count: segment.subscribers,
count: `~${segment.subscribers}`,
}));
const defaultValue = segments.filter((segment) => props.value.includes(segment.value));

4
lib/Models/Subscriber.php
View File

@ -168,7 +168,7 @@ class Subscriber extends Model {
->whereNull('deleted_at')
->count();
$subscribersWithoutSegmentLabel = sprintf(
WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'),
WPFunctions::get()->__('Subscribers without a list (~%s)', 'mailpoet'),
number_format($subscribersWithoutSegment)
);
@ -186,7 +186,7 @@ class Subscriber extends Model {
}
$label = sprintf(
'%s (%s)',
'%s (~%s)',
$segment->name,
number_format($subscribersCount)
);

6
lib/Subscribers/SubscriberListingRepository.php
View File

@ -234,7 +234,7 @@ class SubscriberListingRepository extends ListingRepository {
$subscribersWithoutSegment = $subscribersWithoutSegmentQuery->getQuery()->getSingleScalarResult();
$subscribersWithoutSegmentLabel = sprintf(
WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'),
WPFunctions::get()->__('Subscribers without a list (~%s)', 'mailpoet'),
number_format((float)$subscribersWithoutSegment)
);
@ -261,7 +261,7 @@ class SubscriberListingRepository extends ListingRepository {
$segmentList = [];
foreach ($queryBuilder->getQuery()->getResult() as $item) {
$segmentList[] = [
'label' => sprintf('%s (%s)', $item['name'], number_format((float)$item['subscribersCount'])),
'label' => sprintf('%s (~%s)', $item['name'], number_format((float)$item['subscribersCount'])),
'value' => $item['id'],
];
}
@ -281,7 +281,7 @@ class SubscriberListingRepository extends ListingRepository {
continue;
}
$segmentList[] = [
'label' => sprintf('%s (%s)', $segment->getName(), number_format((float)$count)),
'label' => sprintf('%s (~%s)', $segment->getName(), number_format((float)$count)),
'value' => $segment->getId(),
];
}

2
tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -364,7 +364,7 @@ class SubscribersTest extends \MailPoetTest {
'segment' => $dynamicSegment->getId(),
],
]);
expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->getId(), 'label' => 'Dynamic (1)']);
expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->getId(), 'label' => 'Dynamic (~1)']);
$this->tester->deleteWordPressUser($wpUserEmail);
}

4
tests/integration/Subscribers/SubscriberListingRepositoryTest.php
View File

@ -69,8 +69,8 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
$filters = $this->repository->getFilters($this->getListingDefinition());
expect($filters['segment'])->count(3);
expect($filters['segment'][0]['label'])->equals('All Lists');
expect($filters['segment'][1]['label'])->equals('Subscribers without a list (3)');
expect($filters['segment'][2]['label'])->endsWith('(2)');
expect($filters['segment'][1]['label'])->equals('Subscribers without a list (~3)');
expect($filters['segment'][2]['label'])->endsWith('(~2)');
}
public function testItBuildsGroups() {