From be635259a673276fe891df31233c47f81da5c367 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz <avs@integer-net.de>
Date: Fri, 29 Sep 2023 08:49:59 +0000
Subject: [PATCH 1/3] Adjust the Doc Blocks for the REST API so tools like
 Swagger don't throw an error any more

---
 Api/AsyncEventRepositoryInterface.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Api/AsyncEventRepositoryInterface.php b/Api/AsyncEventRepositoryInterface.php
index 783d434..f045b5e 100644
--- a/Api/AsyncEventRepositoryInterface.php
+++ b/Api/AsyncEventRepositoryInterface.php
@@ -19,7 +19,7 @@ interface AsyncEventRepositoryInterface
      * Get a single asynchronous event by id
      *
      * @param int $subscriptionId
-     * @return AsyncEventDisplayInterface
+     * @return \MageOS\AsyncEvents\Api\Data\AsyncEventDisplayInterface
      * @throws NoSuchEntityException
      */
     public function get(int $subscriptionId): AsyncEventDisplayInterface;
@@ -28,16 +28,16 @@ public function get(int $subscriptionId): AsyncEventDisplayInterface;
      * Get a list of asynchronous events by search criteria
      *
      * @param SearchCriteriaInterface $searchCriteria
-     * @return AsyncEventSearchResultsInterface
+     * @return \MageOS\AsyncEvents\Api\Data\AsyncEventSearchResultsInterface
      */
     public function getList(SearchCriteriaInterface $searchCriteria): AsyncEventSearchResultsInterface;
 
     /**
      * Save an asynchronous event
      *
-     * @param AsyncEventInterface $asyncEvent
+     * @param \MageOS\AsyncEvents\Api\Data\AsyncEventInterface $asyncEvent
      * @param bool $checkResources
-     * @return AsyncEventDisplayInterface
+     * @return \MageOS\AsyncEvents\Api\Data\AsyncEventDisplayInterface
      * @throws NoSuchEntityException
      * @throws LocalizedException
      * @throws AlreadyExistsException

From e1c4b86fb192f824ad7229946d92296099edf7e0 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz <avs@integer-net.de>
Date: Fri, 29 Sep 2023 12:22:32 +0200
Subject: [PATCH 2/3] Display the "status" column in the subscription grid as
 select instead of text

---
 Model/Source/Status.php                         | 17 +++++++++++++++++
 .../async_events_events_listing.xml             | 12 ++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 Model/Source/Status.php

diff --git a/Model/Source/Status.php b/Model/Source/Status.php
new file mode 100644
index 0000000..97f1995
--- /dev/null
+++ b/Model/Source/Status.php
@@ -0,0 +1,17 @@
+<?php
+declare(strict_types=1);
+
+namespace MageOS\AsyncEvents\Model\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class Status implements OptionSourceInterface
+{
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 0, 'label' => __('Disabled')],
+            ['value' => 1, 'label' => __('Enabled')],
+        ];
+    }
+}
diff --git a/view/adminhtml/ui_component/async_events_events_listing.xml b/view/adminhtml/ui_component/async_events_events_listing.xml
index 2d571bf..1790314 100644
--- a/view/adminhtml/ui_component/async_events_events_listing.xml
+++ b/view/adminhtml/ui_component/async_events_events_listing.xml
@@ -107,6 +107,18 @@
                 <label translate="true">Status</label>
             </settings>
         </column>
+        <column name="status" component="Magento_Ui/js/grid/columns/select">
+            <settings>
+                <options class="MageOS\AsyncEvents\Model\Source\Status"/>
+                <filter>select</filter>
+                <editor>
+                    <editorType>select</editorType>
+                </editor>
+                <dataType>select</dataType>
+                <label translate="true">Status</label>
+            </settings>
+        </column>
+
         <column name="subscribed_at" class="Magento\Ui\Component\Listing\Columns\Date"
                 component="Magento_Ui/js/grid/columns/date">
             <settings>

From d052a22b5b4396c5110d42ae1774c41cf3c50f58 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz <avs@integer-net.de>
Date: Fri, 29 Sep 2023 12:29:57 +0200
Subject: [PATCH 3/3] Revert "Display the "status" column in the subscription
 grid as select instead of text"

This reverts commit e1c4b86fb192f824ad7229946d92296099edf7e0.
---
 Model/Source/Status.php                         | 17 -----------------
 .../async_events_events_listing.xml             | 12 ------------
 2 files changed, 29 deletions(-)
 delete mode 100644 Model/Source/Status.php

diff --git a/Model/Source/Status.php b/Model/Source/Status.php
deleted file mode 100644
index 97f1995..0000000
--- a/Model/Source/Status.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace MageOS\AsyncEvents\Model\Source;
-
-use Magento\Framework\Data\OptionSourceInterface;
-
-class Status implements OptionSourceInterface
-{
-    public function toOptionArray()
-    {
-        return [
-            ['value' => 0, 'label' => __('Disabled')],
-            ['value' => 1, 'label' => __('Enabled')],
-        ];
-    }
-}
diff --git a/view/adminhtml/ui_component/async_events_events_listing.xml b/view/adminhtml/ui_component/async_events_events_listing.xml
index 1790314..2d571bf 100644
--- a/view/adminhtml/ui_component/async_events_events_listing.xml
+++ b/view/adminhtml/ui_component/async_events_events_listing.xml
@@ -107,18 +107,6 @@
                 <label translate="true">Status</label>
             </settings>
         </column>
-        <column name="status" component="Magento_Ui/js/grid/columns/select">
-            <settings>
-                <options class="MageOS\AsyncEvents\Model\Source\Status"/>
-                <filter>select</filter>
-                <editor>
-                    <editorType>select</editorType>
-                </editor>
-                <dataType>select</dataType>
-                <label translate="true">Status</label>
-            </settings>
-        </column>
-
         <column name="subscribed_at" class="Magento\Ui\Component\Listing\Columns\Date"
                 component="Magento_Ui/js/grid/columns/date">
             <settings>