Merge pull request #5 from justbetter/feature/detour-pagination

Feature/detour pagination

Author: BobWez98

README.md

@@ -53,6 +53,12 @@ return [
 ];
 ```
 
+Or set via environment variable:
+
+```env
+STATAMIC_DETOUR_DRIVER=file
+```
+
 #### Eloquent Driver
 
 Store redirects in the database. This is recommended for larger sites with many redirects for better performance.
@@ -63,6 +69,12 @@ return [
 ];
 ```
 
+Or set via environment variable:
+
+```env
+STATAMIC_DETOUR_DRIVER=eloquent
+```
+
 When using the Eloquent driver, run the migrations:
 
 ```bash

config/statamic-detour.php

@@ -5,7 +5,7 @@
 
 return [
 
-    'driver' => 'file',
+    'driver' => env('STATAMIC_DETOUR_DRIVER', 'file'),
 
     'drivers' => [
         'file' => FileRepository::class,

resources/js/components/Detours.vue

@@ -1,9 +1,7 @@
 <template>
     <div>
-        <publish-form :title="''" :action="action" :blueprint="blueprint" :meta="meta" :values="values"
-            @saved="addItem($event)"></publish-form>
-
-            <table class="min-w-full border border-gray-200">
+        <publish-form :title="''" :action="action" :blueprint="blueprint" :meta="meta" :values="values" @saved="addItem($event)"></publish-form>
+        <table class="min-w-full border border-gray-200">
             <thead class="bg-gray-50">
                 <tr>
                     <th class="px-4 py-3 text-left text-sm font-semibold text-gray-700">{{ __('From') }}</th>
@@ -15,7 +13,7 @@
                 </tr>
             </thead>
             <tbody class="divide-y divide-gray-200">
-                <tr class="hover:bg-gray-50 text-gray-900" v-for="item, id in detours" :key="id">
+                <tr class="hover:bg-gray-50 text-gray-900" v-for="(item, id) in detours" :key="id">
                     <td class="px-4 py-3 text-sm">{{ item.from }}</td>
                     <td class="px-4 py-3 text-sm">{{ item.to }}</td>
                     <td class="px-4 py-3 text-sm">{{ item.type }}</td>
@@ -62,7 +60,7 @@ export default ({
     methods: {
         deleteItem(id, type = 'delete') {
             if (type == 'delete') {
-                delete this.detours[id];    
+                delete this.detours[id];
             }
 
             this.$forceUpdate();
@@ -76,7 +74,7 @@ export default ({
         deleteDetour(id) {
             const url = cp_url('/detours/' + id);
             Statamic.$axios.delete(url).then(() => this.deleteItem(id));
-        }
+        },
     }
 })
-</script>
+</script>

resources/js/cp.js

@@ -1,5 +1,5 @@
 import Detours from './components/Detours.vue';
 
 Statamic.booting(() => {
-    Statamic.$components.register('detours', Detours);
+    Statamic.$components.register('Detours', Detours);
 });

resources/views/detours/index.blade.php

@@ -1,11 +1,16 @@
 @extends('statamic::layout')
 
 @section('content')
-    <detours
-        action="{{ $action }}"
-        :blueprint='@json($blueprint)'
-        :meta='@json($meta)'
-        :values='@json($values)'
-        :items="@js($data)"
-    />
-@endsection
+    <div>
+        <Detours
+            action="{{ $action }}"
+            :blueprint='@json($blueprint)'
+            :meta='@json($meta)'
+            :values='@json($values)'
+            :items='@json($data)'
+        ></Detours>
+        <div class="mt-4">
+            {{ $paginator->withQueryString()->links('pagination::simple-tailwind') }}
+        </div>
+    </div>
+@endsection

src/Actions/GenerateUrl.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace JustBetter\Detour\Actions;
+
+use JustBetter\Detour\Contracts\GeneratesUrl;
+use JustBetter\Detour\Data\Detour;
+use JustBetter\Detour\Enums\Type;
+
+class GenerateUrl implements GeneratesUrl
+{
+    public function generate(Detour $detour, string $path): ?string
+    {
+        if ($detour->isType(Type::Regex)) {
+            if (! str_contains($detour->to, '$')) {
+                return $detour->to;
+            }
+
+            return preg_replace($detour->from, $detour->to, $path);
+        }
+
+        return $detour->to;
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(GeneratesUrl::class, static::class);
+    }
+}

src/Actions/HandleDetour.php

@@ -4,6 +4,7 @@
 
 use JustBetter\Detour\Contracts\ListsDetours;
 use JustBetter\Detour\Contracts\ResolvesRepository;
+use JustBetter\Detour\Data\Paginate;
 use Statamic\Fields\Blueprint;
 
 class ListDetours implements ListsDetours
@@ -12,18 +13,21 @@ public function __construct(
         protected ResolvesRepository $resolvesRepository
     ) {}
 
-    public function list(): array
+    public function list(int $size, int $page): array
     {
         $repository = $this->resolvesRepository->resolve();
 
         // @phpstan-ignore-next-line
         $oldDirectory = Blueprint::directory();
-        $values = $repository->get();
+
+        $paginate = Paginate::make(['size' => $size,  'page' => $page])->validate();
+
+        $paginator = $repository->paginate($paginate);
 
         // @phpstan-ignore-next-line
         $blueprint = Blueprint::setDirectories(__DIR__.'/../../resources/blueprints')->find('detour');
         $fields = $blueprint->fields();
-        $fields = $fields->addValues($values);
+        $fields = $fields->addValues($paginator->items());
         $fields = $fields->preProcess();
 
         if ($oldDirectory) {
@@ -35,8 +39,9 @@ public function list(): array
             'blueprint' => $blueprint->toPublishArray(),
             'values' => $fields->values(),
             'meta' => $fields->meta(),
-            'data' => $values,
+            'data' => $paginator->items(),
             'action' => cp_route('justbetter.detours.store'),
+            'paginator' => $paginator,
         ];
     }
 

src/Actions/ListDetours.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace JustBetter\Detour\Actions;
+
+use JustBetter\Detour\Contracts\MatchesDetour;
+use JustBetter\Detour\Contracts\ResolvesRepository;
+use JustBetter\Detour\Data\Detour;
+use Statamic\Facades\Site as SiteFacade;
+use Statamic\Sites\Site;
+
+class MatchDetour implements MatchesDetour
+{
+    public function __construct(protected ResolvesRepository $resolver) {}
+
+    public function match(string $path): ?Detour
+    {
+        $repository = $this->resolver->resolve();
+
+        /** @var Site $site */
+        $site = SiteFacade::current();
+
+        $detours = $repository->get();
+
+        foreach ($detours as $detour) {
+            if ($detour->matches($site->handle(), $path)) {
+                return $detour;
+            }
+        }
+
+        return null;
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(MatchesDetour::class, static::class);
+    }
+}

src/Actions/MatchDetour.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\Detour\Contracts;
+
+use JustBetter\Detour\Data\Detour;
+
+interface GeneratesUrl
+{
+    public function generate(Detour $detour, string $path): ?string;
+}