Merge branch 'release/6.1'

.env.example

@@ -88,3 +88,6 @@ DEBUG_BAR_IN_FE=
 SITEMAP_BASE_URL=
 
 IPINFO_TOKEN=
+
+# `php artisan update:links` will automatically convert any Block links to these domains to absolute links
+SCRUB_DOMAINS='www.artic.edu'

VERSION

@@ -1 +1 @@
-6.0
+6.1

app/Console/Commands/UpdateLinks.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UpdateLinks extends Command
+{
+
+    protected $signature = 'update:links';
+
+    protected $description = 'Remove old URLs from blocks';
+
+    public function handle()
+    {
+
+        foreach( config('app.scrub_domains') as $url ) {
+            $blocks = \A17\Twill\Models\Block::whereRaw("content::text LIKE '%" . $url . "%'");
+
+            $blocks = $blocks->cursor();
+
+            foreach( $blocks as $block ) {
+                $content = $block->getOriginal('content');
+                $content = str_replace("http:\/\/" . $url, '', $content);
+                $content = str_replace("https:\/\/" . $url, '', $content);
+                $content = str_replace('"' . $url, '"', $content);
+                $block->content = $block->fromJson( $content ); // $casts as array
+                $block->save();
+                $this->info('Updated ' . $url . ' in ' . $block->blockable_type . ', #' . $block->blockable_id);
+            }
+        }
+
+    }
+
+}

app/Console/Kernel.php

@@ -28,6 +28,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('sitemap:generate')->twiceDaily();
+        $schedule->command('update:links')->daily();
     }
 
     /**

app/Http/Controllers/Admin/IssueArticleController.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use A17\Twill\Http\Controllers\Admin\ModuleController;
+use App\Repositories\IssueRepository;
+
+class IssueArticleController extends ModuleController
+{
+    protected $moduleName = 'issues.articles';
+    protected $modelName = 'IssueArticle';
+
+    protected function getParentModuleForeignKey()
+    {
+        return 'issue_id';
+    }
+
+    protected $indexColumns = [
+        'image' => [
+            'title' => 'Hero',
+            'thumb' => true,
+            'variant' => [
+                'role' => 'hero',
+                'crop' => 'default',
+            ],
+        ],
+        'title' => [
+            'title' => 'Title',
+            'edit_link' => true,
+            'sort' => true,
+            'field' => 'title',
+        ],
+        'date' => [
+            'title' => 'Date',
+            'edit_link' => true,
+            'sort' => true,
+            'field' => 'date',
+            'present' => true,
+        ],
+        'issue_number' => [
+            'title' => 'Issue No.',
+            'edit_link' => true,
+            'sort' => true,
+            'field' => 'issueNumber',
+            'present' => true,
+        ],
+    ];
+
+    protected $defaultOrders = ['position' => 'asc'];
+
+    protected function indexData($request)
+    {
+        $issue = app(IssueRepository::class)->getById(request('issue'));
+        return [
+            'breadcrumb' => [
+                [
+                    'label' => 'Issues',
+                    'url' => moduleRoute('issues', 'collection', 'index'),
+                ],
+                [
+                    'label' => $issue->title,
+                    'url' => moduleRoute('issues', 'collection', 'edit', $issue->id),
+                ],
+                [
+                    'label' => 'Articles',
+                ],
+
+            ],
+        ];
+    }
+
+    protected function formData($request)
+    {
+        $issue = app(IssueRepository::class)->getById(request('issue'));
+        return [
+            'breadcrumb' => [
+                [
+                    'label' => 'Issues',
+                    'url' => moduleRoute('issues', 'collection', 'index'),
+                ],
+                [
+                    'label' => $issue->title,
+                    'url' => moduleRoute('issues', 'collection', 'edit', $issue->id),
+                ],
+                [
+                    'label' => 'Articles',
+                    'url' => moduleRoute('issues.articles', 'collection', 'index', $request->route('issue')),
+                ],
+                [
+                    'label' => $issue->title,
+                ],
+            ],
+        ];
+    }
+
+    protected function getPermalinkBaseUrl()
+    {
+        $issue = app(IssueRepository::class)->getById(request('issue'));
+        return request()->getScheme() . '://' . config('app.url') . '/journal/issue/' . $issue->id . '/' . $issue->getSlug() . '/';
+    }
+/*
+    protected function formData($request)
+    {
+        $item = $this->repository->getById(request('article') ?? request('id'));
+        $baseUrl = '//' . config('app.url') . '/' .$this->permalinkBase . $item->present()->issue_number . '/';
+        $baseUrl .= $item->issue ? $item->issue->getSlug() : '';
+        $baseUrl .= '/' . $item->id . '/';
+
+        return [
+            'baseUrl' => $baseUrl,
+        ];
+    }
+    */
+}

app/Http/Controllers/Admin/JournalIssueController.php → app/Http/Controllers/Admin/IssueController.php

@@ -4,9 +4,9 @@
 
 use A17\Twill\Http\Controllers\Admin\ModuleController;
 
-class JournalIssueController extends ModuleController
+class IssueController extends ModuleController
 {
-    protected $moduleName = 'journalIssues';
+    protected $moduleName = 'issues';
 
     protected $permalinkBase = 'journal/issue/';
 
@@ -39,13 +39,17 @@ class JournalIssueController extends ModuleController
             'field' => 'issueNumber',
             'present' => true,
         ],
+        'articles' => [
+            'title' => 'Articles',
+            'nested' => 'articles',
+        ]
     ];
 
     protected $defaultOrders = ['position' => 'asc'];
 
     protected function formData($request)
     {
-        $item = $this->repository->getById(request('journalIssue') ?? request('id'));
+        $item = $this->repository->getById(request('issue') ?? request('id'));
         $baseUrl = '//' . config('app.url') . '/' .$this->permalinkBase . $item->issue_number . '/';
 
         return [

app/Http/Requests/Admin/JournalArticleRequest.php → app/Http/Requests/Admin/IssueArticleRequest.php

@@ -4,7 +4,7 @@
 
 use A17\Twill\Http\Requests\Admin\Request;
 
-class JournalArticleRequest extends Request
+class IssueArticleRequest extends Request
 {
     public function rulesForCreate()
     {

app/Http/Requests/Admin/JournalIssueRequest.php → app/Http/Requests/Admin/IssueRequest.php

@@ -4,7 +4,7 @@
 
 use A17\Twill\Http\Requests\Admin\Request;
 
-class JournalIssueRequest extends Request
+class IssueRequest extends Request
 {
     public function rulesForCreate()
     {

app/Models/JournalIssue.php → app/Models/Issue.php

@@ -9,12 +9,12 @@
 use A17\Twill\Models\Behaviors\Sortable;
 use A17\Twill\Models\Model;
 
-class JournalIssue extends Model implements Sortable
+class Issue extends Model implements Sortable
 {
     use HasSlug, HasMedias, HasRevisions, HasPosition;
 
-    protected $presenter = 'App\Presenters\Admin\JournalIssuePresenter';
-    protected $presenterAdmin = 'App\Presenters\Admin\JournalIssuePresenter';
+    protected $presenter = 'App\Presenters\Admin\IssuePresenter';
+    protected $presenterAdmin = 'App\Presenters\Admin\IssuePresenter';
 
     protected $fillable = [
         'published',
@@ -61,6 +61,11 @@ class JournalIssue extends Model implements Sortable
         ],
     ];
 
+    public function articles()
+    {
+        return $this->hasMany('App\Models\IssueArticle', 'issue_id');
+    }
+
     // Generates the id-slug type of URL
     public function getRouteKeyName()
     {

app/Models/JournalArticle.php → app/Models/IssueArticle.php

@@ -9,12 +9,12 @@
 use A17\Twill\Models\Behaviors\Sortable;
 use A17\Twill\Models\Model;
 
-class JournalArticle extends Model implements Sortable
+class IssueArticle extends Model implements Sortable
 {
     use HasSlug, HasMedias, HasRevisions, HasPosition;
 
-    protected $presenter = 'App\Presenters\Admin\JournalArticlePresenter';
-    protected $presenterAdmin = 'App\Presenters\Admin\JournalArticlePresenter';
+    protected $presenter = 'App\Presenters\Admin\IssueArticlePresenter';
+    protected $presenterAdmin = 'App\Presenters\Admin\IssueArticlePresenter';
 
     protected $fillable = [
         'published',
@@ -29,7 +29,7 @@ class JournalArticle extends Model implements Sortable
         'review_status',
         'license_text',
         'publish_start_date',
-        'journal_issue_id',
+        'issue_id',
         'position',
     ];
 
@@ -68,7 +68,7 @@ class JournalArticle extends Model implements Sortable
 
     public function issue()
     {
-        return $this->belongsTo('App\Models\JournalIssue');
+        return $this->belongsTo('App\Models\Issue');
     }
 
     // Generates the id-slug type of URL
@@ -79,6 +79,6 @@ public function getRouteKeyName()
 
     public function getIssueSlugAttribute()
     {
-        return join([$this->issue()->issue_number ?? '', $this->issue()->getSlug(), $this->id, $this->getSlug()], '/');
+        return join([$this->issue->issue_number ?? '', $this->issue->getSlug(), $this->id, $this->getSlug()], '/');
     }
 }

app/Models/Revisions/IssueArticleRevision.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models\Revisions;
+
+use A17\Twill\Models\Revision;
+
+class IssueArticleRevision extends Revision
+{
+    protected $table = "issue_article_revisions";
+}

app/Models/Revisions/IssueRevision.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models\Revisions;
+
+use A17\Twill\Models\Revision;
+
+class IssueRevision extends Revision
+{
+    protected $table = "issue_revisions";
+}