Add popular PHP templating languages to code editor

[bookstack] / app / Http / Controllers / WebhookController.php

diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php
index 588b256a35156ae92c11c806319445805e1c5f36..c72dcc51066d4af80bef78c6b2cb9340d1960962 100644 (file)
--- a/app/Http/Controllers/WebhookController.php
+++ b/app/Http/Controllers/WebhookController.php
@@ -3,7 +3,9 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ActivityType;
+use BookStack\Actions\Queries\WebhooksAllPaginatedAndSorted;
 use BookStack\Actions\Webhook;
+use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
 class WebhookController extends Controller
@@ -18,13 +20,25 @@ class WebhookController extends Controller
     /**
      * Show all webhooks configured in the system.
      */
-    public function index()
+    public function index(Request $request)
     {
-        $webhooks = Webhook::query()
-            ->orderBy('name', 'desc')
-            ->with('trackedEvents')
-            ->get();
-        return view('settings.webhooks.index', ['webhooks' => $webhooks]);
+        $listOptions = SimpleListOptions::fromRequest($request, 'webhooks')->withSortOptions([
+            'name' => trans('common.sort_name'),
+            'endpoint'  => trans('settings.webhooks_endpoint'),
+            'created_at' => trans('common.sort_created_at'),
+            'updated_at' => trans('common.sort_updated_at'),
+            'active'     => trans('common.status'),
+        ]);
+
+        $webhooks = (new WebhooksAllPaginatedAndSorted())->run(20, $listOptions);
+        $webhooks->appends($listOptions->getPaginationAppends());
+
+        $this->setPageTitle(trans('settings.webhooks'));
+
+        return view('settings.webhooks.index', [
+            'webhooks'    => $webhooks,
+            'listOptions' => $listOptions,
+        ]);
     }
 
     /**
@@ -32,6 +46,8 @@ class WebhookController extends Controller
      */
     public function create()
     {
+        $this->setPageTitle(trans('settings.webhooks_create'));
+
         return view('settings.webhooks.create');
     }
 
@@ -41,10 +57,11 @@ class WebhookController extends Controller
     public function store(Request $request)
     {
         $validated = $this->validate($request, [
-            'name' => ['required', 'max:150'],
+            'name'     => ['required', 'max:150'],
             'endpoint' => ['required', 'url', 'max:500'],
-            'events' => ['required', 'array'],
-            'active' => ['required'],
+            'events'   => ['required', 'array'],
+            'active'   => ['required'],
+            'timeout'  => ['required', 'integer', 'min:1', 'max:600'],
         ]);
 
         $webhook = new Webhook($validated);
@@ -53,6 +70,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents(array_values($validated['events']));
 
         $this->logActivity(ActivityType::WEBHOOK_CREATE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 
@@ -66,6 +84,8 @@ class WebhookController extends Controller
             ->with('trackedEvents')
             ->findOrFail($id);
 
+        $this->setPageTitle(trans('settings.webhooks_edit'));
+
         return view('settings.webhooks.edit', ['webhook' => $webhook]);
     }
 
@@ -75,10 +95,11 @@ class WebhookController extends Controller
     public function update(Request $request, string $id)
     {
         $validated = $this->validate($request, [
-            'name' => ['required', 'max:150'],
+            'name'     => ['required', 'max:150'],
             'endpoint' => ['required', 'url', 'max:500'],
-            'events' => ['required', 'array'],
-            'active' => ['required'],
+            'events'   => ['required', 'array'],
+            'active'   => ['required'],
+            'timeout'  => ['required', 'integer', 'min:1', 'max:600'],
         ]);
 
         /** @var Webhook $webhook */
@@ -89,6 +110,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents($validated['events']);
 
         $this->logActivity(ActivityType::WEBHOOK_UPDATE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 
@@ -99,6 +121,9 @@ class WebhookController extends Controller
     {
         /** @var Webhook $webhook */
         $webhook = Webhook::query()->findOrFail($id);
+
+        $this->setPageTitle(trans('settings.webhooks_delete'));
+
         return view('settings.webhooks.delete', ['webhook' => $webhook]);
     }
 
@@ -114,6 +139,7 @@ class WebhookController extends Controller
         $webhook->delete();
 
         $this->logActivity(ActivityType::WEBHOOK_DELETE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 }