Merge pull request #8 from gearsdigital/remove-domain-from-page-url-#2

Remove domain from page url #2
gearsdigital · Jan 24, 2020 · 3ecc860 · 3ecc860
2 parents 807936d + 4728e95
commit 3ecc860
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 15 deletions.
diff --git a/index.js b/index.js
diff --git a/index.php b/index.php
@@ -1,22 +1,50 @@
 <?php
+
+use Kirby\Http\Url;
+
 Kirby::plugin('gearsdigital/enhanced-toolbar-link-dialog', [
     'api'          => [
-        'routes' => [
+        'models'      => [
+            // a camelCased model name results in Kirby\Exception\NotFoundException
+            'simplepagemodel' => [
+                'type'   => 'Kirby\Cms\Page',
+                'fields' => [
+                    'id'    => function ($page) {
+                        return $page->id();
+                    },
+                    'title' => function ($page) {
+                        return $page->title()->value();
+                    },
+                    'slug'  => function ($page) {
+                        return URL::makeAbsolute($page->slug());
+                    },
+                ],
+            ],
+        ],
+        'collections' => [
+            'simplepagecollection' => [
+                'model' => 'simplepagemodel',
+                'type'  => 'Kirby\Toolkit\Collection',
+            ],
+        ],
+        'routes'      => [
             [
                 'pattern' => 'enhanced-toolbar-link-dialog/pages',
                 'method'  => 'get',
                 'action'  => function () {
                     $page = get('page');
-                    $query = get('search', '*');
+                    $query = get('search');
 
                     if (empty($query)) {
                         $query = '*';
                     }
 
-                    return site()->search($query, 'title')->paginate([
+                    $pagedCollection = site()->search($query, 'title')->paginate([
                         'page'  => $page,
                         'limit' => 10,
                     ]);
+
+                    return $this->collection('simplepagecollection', $pagedCollection);
                 },
             ],
         ],
@@ -25,12 +53,12 @@
         'en' => [
             'gearsdigital.enhanced-toolbar-link-dialog.internal' => 'Internal Link',
             'gearsdigital.enhanced-toolbar-link-dialog.external' => 'External Link',
-            'gearsdigital.enhanced-toolbar-link-dialog.empty' => 'No pages found',
+            'gearsdigital.enhanced-toolbar-link-dialog.empty'    => 'No pages found',
         ],
         'de' => [
             'gearsdigital.enhanced-toolbar-link-dialog.internal' => 'Interner Link',
             'gearsdigital.enhanced-toolbar-link-dialog.external' => 'Externer Link',
-            'gearsdigital.enhanced-toolbar-link-dialog.empty' => 'Keine Seiten gefunden.',
+            'gearsdigital.enhanced-toolbar-link-dialog.empty'    => 'Keine Seiten gefunden.',
         ],
     ],
 ]);
diff --git a/src/components/EnhancedToolbarLinkDialog.vue b/src/components/EnhancedToolbarLinkDialog.vue
@@ -42,7 +42,7 @@
         icon="search"
       />
 
-      <k-list v-if="pages.length > 0">
+      <k-list v-if="hasPages">
         <k-list-item
           v-for="page in pages"
           :key="page.id"
@@ -85,10 +85,6 @@
 
 <script>
   export default {
-    props: {
-      pages: Array,
-      text: String
-    },
     data() {
       return {
         tabs: [
@@ -104,6 +100,7 @@
         search: null,
         currentPage: {},
         currentTab: {},
+        pages: [],
         value: {
           url: null,
           text: null
@@ -133,6 +130,9 @@
       }, 200)
     },
     computed: {
+      hasPages() {
+        return this.pages.length
+      },
       kirbytext() {
         return this.$store.state.system.info.kirbytext;
       }
@@ -157,7 +157,7 @@
       },
       selectPage(model) {
         this.value = {
-          url: model.url,
+          url: model.slug,
           text: this.value.text || model.title
         };
         if (this.isCurrentPage(model)) {
@@ -197,9 +197,9 @@
           search: this.search
         };
         this.$api.get('enhanced-toolbar-link-dialog/pages', params).then(response => {
-          this.pages = response.data;
-          this.pagination = response.pagination;
-        });
+            this.pages = response.data;
+            this.pagination = response.pagination;
+          });
       },
       submit() {
         this.$emit("submit", this.kirbytext ? this.createKirbytext() : this.createMarkdown());