Move BC compatibility for UserRole to entity data getter

[MAILPOET-3469]

assets/js/src/segments/dynamic/store/selectors.ts

@@ -5,7 +5,7 @@ import {
   GroupFilterValue,
   Segment,
   StateType,
-  SubscriberActionTypes, SubscriberCount,
+  SubscriberCount,
   WindowCustomFields,
   WindowEditableRoles,
   WindowNewslettersList,
@@ -14,7 +14,6 @@ import {
   WindowSubscriptionProducts,
   WindowWooCommerceCountries,
 } from '../types';
-import { SubscriberSegmentOptions } from '../dynamic_segments_filters/subscriber';
 
 export const getProducts = (state: StateType): WindowProducts => (
   state.products
@@ -69,17 +68,6 @@ export const findFiltersValueForSegment = (
   itemSearch: Segment
 ): FilterRow[] => {
   const found: FilterRow[] = [];
-  if (itemSearch.filters === undefined) {
-    // bc compatibility, the wordpress user role segment doesn't have action
-    const filterValue: FilterValue = SubscriberSegmentOptions.find(
-      (value) => value.value === SubscriberActionTypes.WORDPRESS_ROLE
-    );
-    found.push({
-      filterValue,
-      index: 0,
-    });
-    return found;
-  }
 
   itemSearch.filters.forEach((formItem: AnyFormItem, index) => {
     state.allAvailableFilters.forEach((filter: GroupFilterValue) => {

lib/Entities/DynamicSegmentFilterData.php

@@ -2,6 +2,7 @@
 
 namespace MailPoet\Entities;
 
+use MailPoet\Segments\DynamicSegments\Filters\UserRole;
 use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -27,7 +28,12 @@ class DynamicSegmentFilterData {
   }
 
   public function getData(): ?array {
-    return $this->filterData;
+    $filterData = $this->filterData;
+    // bc compatibility, the wordpress user role segment didn't have action
+    if (($this->filterData['segmentType'] ?? null) === self::TYPE_USER_ROLE && !isset($this->filterData['action'])) {
+      $filterData['action'] = UserRole::TYPE;
+    }
+    return $filterData;
   }
 
   /**