Merge branch '3.x' into patch-2

area17 · Aug 10, 2023 · 4953850 · 4953850
2 parents 76145d4 + 7be10cc
commit 4953850
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 37 deletions.
diff --git a/docs/content/1_docs/13_custom-cms-pages/1_index.md b/docs/content/1_docs/13_custom-cms-pages/1_index.md
@@ -26,25 +26,25 @@ return [
 - Add a controller to handle the request
 
 ```php
-// file: app/Http/Controllers/Admin/CustomPageController.php
+// file: app/Http/Controllers/Twill/CustomPageController.php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Twill;
 
 use A17\Twill\Http\Controllers\Admin\Controller;
 
 class CustomPageController extends Controller
 {
     public function show()
     {
-        return view('admin.customPage');
+        return view('twill.customPage');
     }
 }
 ```
 
 - And create the view
 
 ```php
-// file: resources/views/admin/customPage.blade.php
+// file: resources/views/twill/customPage.blade.php
 
 @extends('twill::layouts.free')
 

diff --git a/docs/content/1_docs/3_modules/12_nested-modules.md b/docs/content/1_docs/3_modules/12_nested-modules.md
@@ -151,17 +151,17 @@ use A17\Twill\Services\Breadcrumbs\NestedBreadcrumbs;
 
 class IssueArticleController extends BaseModuleController
 {
+    protected $moduleName = 'issues.articles';
     protected $modelName = 'IssueArticle';
 
     protected function setUpController(): void
     {
-        $this->setModuleName('issues.articles');
         if (request('issue')) {
             $this->setBreadcrumbs(
                 NestedBreadcrumbs::make()
                     ->forParent(
                         parentModule: 'issues',
-                        module: $this->modelName,
+                        module: $this->moduleName,
                         activeParentId: request('issue'),
                         repository: \App\Repositories\IssueRepository::class
                     )

diff --git a/docs/content/1_docs/3_modules/6_table-builder.md b/docs/content/1_docs/3_modules/6_table-builder.md
@@ -172,9 +172,9 @@ unpublished.
 
 ##### NestedData
 
-`NestedData::make()`
+`NestedData::make()->...`
 
-This field requires no additional methods, it shows information about the nested models.
+Renders the `field` using the relationship of the same name. It shows information and a link about the nested model.
 
 ##### Languages
 

diff --git a/frontend/js/components/Previewer.vue b/frontend/js/components/Previewer.vue
@@ -70,14 +70,15 @@
     components: {
       'a17-iframe': A17PreviewerFrame
     },
+    props: ['breakpointsConfig'],
     data: function () {
       return {
         loadedCurrent: false,
         slipScreen: false,
         activeBreakpoint: 1280,
         lastActiveBreakpoint: 1280,
         scrollPosition: 0,
-        breakpoints: [
+        breakpoints: this.breakpointsConfig || [
           {
             size: 1280,
             name: 'preview-desktop'
@@ -115,11 +116,12 @@
     methods: {
       open: function (previewId = 0) {
         const self = this
+        const desktopWidth = this.breakpoints.find(item => item.name === 'preview-desktop').size
 
         // reset previewer state
         this.loadedCurrent = false
-        this.activeBreakpoint = 1280
-        this.lastActiveBreakpoint = 1280
+        this.activeBreakpoint = desktopWidth || 1280
+        this.lastActiveBreakpoint = desktopWidth || 1280
 
         function initPreview () {
           if (self.$refs.overlay) self.$refs.overlay.open()

diff --git a/frontend/js/components/blocks/Blocks.vue b/frontend/js/components/blocks/Blocks.vue
@@ -21,7 +21,7 @@
                               :opened="opened"
                               :with-handle="!isSettings"
                               :with-actions="!isSettings"
-                              :with-move-dropdown="isSettings"
+                              :with-move-dropdown="!isSettings"
                               @expand="setOpened"
                               v-if="availableBlocks.length">
                 <template v-for="availableBlock in availableBlocks">

diff --git a/migrations/default/2023_03_24_125122_add_id_to_related.php b/migrations/default/2023_03_24_125122_add_id_to_related.php
@@ -27,7 +27,7 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::table('related', function (Blueprint $table) {
+        Schema::table(config('twill.related_table', 'twill_related'), function (Blueprint $table) {
             $table->dropColumn('id');
         });
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
@@ -798,7 +798,7 @@ protected function getIndexTableColumns(): TableColumns
         if ($this->getIndexOption('includeScheduledInList') && $this->repository->isFillable('publish_start_date')) {
             $columns->add(
                 ScheduledStatus::make()
-                    ->title(twillTrans('twill::lang.listing.columns.published'))
+                    ->title(twillTrans('twill::lang.publisher.scheduled'))
                     ->optional()
             );
         }

diff --git a/src/Models/Block.php b/src/Models/Block.php
@@ -75,7 +75,7 @@ public function input(string $name): mixed
         return $this->content[$name] ?? null;
     }
 
-    public function translatedInput(string $name, bool $forceLocale = null): mixed
+    public function translatedInput(string $name, string $forceLocale = null): mixed
     {
         $value = $this->content[$name] ?? null;
 

diff --git a/src/Repositories/Behaviors/HandleFieldsGroups.php b/src/Repositories/Behaviors/HandleFieldsGroups.php
@@ -119,7 +119,7 @@ protected function handleFieldsGroups($fields)
                 $fields[$group] = null;
             }
 
-            Arr::forget($fields, $groupFields);
+            $fields = array_filter($fields, fn($key) => !in_array($key, $groupFields), ARRAY_FILTER_USE_KEY);
         }
 
         return $fields;

diff --git a/src/Repositories/Behaviors/HandleMedias.php b/src/Repositories/Behaviors/HandleMedias.php
@@ -206,6 +206,7 @@ public function afterDuplicateHandleMedias(TwillModelContract $original, TwillMo
                 'crop_x' => $media->pivot->crop_x,
                 'crop_y' => $media->pivot->crop_y,
                 'metadatas' => $media->pivot->metadatas,
+                'locale' => $media->pivot->locale,
             ];
 
             $newObject->medias()->attach($media->id, $newPushData);

diff --git a/src/Services/Breadcrumbs/NestedBreadcrumbs.php b/src/Services/Breadcrumbs/NestedBreadcrumbs.php
@@ -13,6 +13,7 @@ class NestedBreadcrumbs extends Breadcrumbs
     private int $activeParentId;
     private string $titleKey;
     private string $label;
+    private string $routePrefix = '';
 
     public function parentLabel(string $parentLabel): self
     {
@@ -26,13 +27,15 @@ public function forParent(
         string $module,
         int $activeParentId,
         string $repository,
-        ?string $titleKey = 'title'
+        ?string $titleKey = 'title',
+        ?string $routePrefix = '',
     ): self {
         $this->module = $module;
         $this->parentModule = $parentModule;
         $this->parentRepository = $repository;
         $this->activeParentId = $activeParentId;
         $this->titleKey = $titleKey;
+        $this->routePrefix = $routePrefix;
 
         if (!$this->parentLabel) {
             $this->parentLabel(Str::title($parentModule));
@@ -61,16 +64,16 @@ public function toArray(): array
             BreadcrumbItem::make()->label($this->parentLabel)
                 ->displayOnForm()
                 ->displayOnListing()
-                ->url(moduleRoute($this->parentModule, '', 'index')),
+                ->url(moduleRoute($this->parentModule, $this->routePrefix, 'index')),
             BreadcrumbItem::make()->label($this->getActiveParentTitle())
                 ->displayOnForm()
                 ->displayOnListing()
-                ->url(moduleRoute($this->parentModule, '', 'edit', $this->activeParentId)),
+                ->url(moduleRoute($this->parentModule, $this->routePrefix, 'edit', $this->activeParentId)),
             BreadcrumbItem::make()->label($this->label)
                 ->displayOnListing(),
             BreadcrumbItem::make()->label($this->label)
                 ->displayOnForm()
-                ->url(moduleRoute($this->module, '', 'index')),
+                ->url(moduleRoute($this->module, $this->routePrefix, 'index')),
             BreadcrumbItem::make()->label('Edit')
                 ->displayOnForm(),
         ];

diff --git a/src/Services/Listings/Columns/NestedData.php b/src/Services/Listings/Columns/NestedData.php
@@ -9,13 +9,6 @@
 
 class NestedData extends TableColumn
 {
-    public static function make(): static
-    {
-        $item = parent::make();
-        $item->field('children');
-        return $item;
-    }
-
     public function sortable(bool $sortable = true): static
     {
         if ($sortable && $this->sortFunction === null) {

diff --git a/tests/integration/Controllers/Tables/NestedDataColumnTest.php b/tests/integration/Controllers/Tables/NestedDataColumnTest.php
@@ -19,23 +19,23 @@ public function setUp(): void
 
     public function testColumn(): void
     {
-        $column = NestedData::make()->title('Child');
+        $column = NestedData::make()->field('children')->title('Child');
 
         $this->assertEquals('0 children', $column->renderCell($this->parent));
     }
 
     public function testSingleChild(): void {
         $this->parent->children()->create(['title' => 'Child 1', 'published' => true]);
 
-        $column = NestedData::make()->title('Child');
+        $column = NestedData::make()->field('children')->title('Child');
         $this->assertEquals('1 child', $column->renderCell($this->parent));
     }
 
     public function testMultipleChilden(): void {
         $this->parent->children()->create(['title' => 'Child 1', 'published' => true]);
         $this->parent->children()->create(['title' => 'Child 1', 'published' => true]);
 
-        $column = NestedData::make()->title('Child');
+        $column = NestedData::make()->field('children')->title('Child');
         $this->assertEquals('2 children', $column->renderCell($this->parent));
     }
 }
diff --git a/views/layouts/form.blade.php b/views/layouts/form.blade.php
@@ -155,7 +155,7 @@
     </a17-modal>
     <a17-editor v-if="editor" ref="editor"
                 bg-color="{{ config('twill.block_editor.background_color') ?? '#FFFFFF' }}"></a17-editor>
-    <a17-previewer ref="preview"></a17-previewer>
+    <a17-previewer ref="preview" :breakpoints-config="{{ json_encode(config('twill.preview.breakpoints')) }}"></a17-previewer>
     <a17-dialog ref="warningContentEditor" modal-title="{{ twillTrans('twill::lang.form.dialogs.delete.title') }}"
                 confirm-label="{{ twillTrans('twill::lang.form.dialogs.delete.confirm') }}">
         <p class="modal--tiny-title">