The Event field options are ambiguous

Here is the patch for the requirement of this issue, hopefully it will help.

The patch #2 re-rolled with improvements.

I think it makes more sense to group by entity_type taken from the plugin annotations, but since we currently have no more than 10 options, that doesn't make sense. Thoughts?

Here's what we see when we apply this patch - more than 10 options.

(Note that we're also running a Commerce License patch of ✨ Integrate with Commerce Email for license renewal and expiration Needs review .)

Patch #3 started failing on recent release 8.x-1.3

The patch rerolled.