Merge branch '3.x' into multi-selectors-n-fragments

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3]
-        laravel: [11]
+        laravel: [10, 11]
 
     steps:
       - uses: shivammathur/setup-php@v2

src/Laravel/src/Commands/MakePageCommand.php

@@ -108,6 +108,7 @@ private function makePage(
         if (! $this->option('without-register')) {
             self::addResourceOrPageToProviderFile(
                 $stubsPath->name,
+                page: true,
                 namespace: $stubsPath->namespace
             );
         }

src/Laravel/src/Commands/MoonShineCommand.php

@@ -11,6 +11,8 @@
 
 use Leeto\PackageCommand\Command;
 use MoonShine\Laravel\Support\StubsPath;
+use MoonShine\MenuManager\MenuItem;
+use ReflectionClass;
 
 abstract class MoonShineCommand extends Command
 {
@@ -43,11 +45,14 @@ public static function addResourceOrPageToMenu(string $class, string $title, str
     {
         $namespace = rtrim($namespace, '\\');
 
+        $reflector = new ReflectionClass(moonshineConfig()->getLayout());
+
         self::addResourceOrPageTo(
             class: "$namespace\\$class",
-            to: app_path('MoonShine/Layouts/MoonShineLayout.php'),
+            to: $reflector->getFileName(),
             between: static fn (Stringable $content): Stringable => $content->betweenFirst("protected function menu(): array", '}'),
             replace: static fn (Stringable $content, Closure $tab): Stringable => $content->replace("];", "{$tab()}MenuItem::make('$title', $class::class),\n{$tab(2)}];"),
+            use: MenuItem::class
         );
     }
 

src/Laravel/src/DependencyInjection/MoonShineConfigurator.php

@@ -29,8 +29,8 @@ public function __construct(Repository $repository)
         $this->items = $repository->get('moonshine', []);
         $this->authorizationRules = Collection::make();
         $this
-            ->set('dir', 'app/MoonShine')
-            ->set('namespace', 'App\MoonShine');
+            ->set('dir', $this->items['dir'] ?? 'app/MoonShine')
+            ->set('namespace', $this->items['namespace'] ?? 'App\MoonShine');
     }
 
     public function dir(string $dir, string $namespace): self

src/Laravel/src/Http/Controllers/ReactiveController.php

@@ -64,7 +64,7 @@ public function __invoke(MoonShineRequest $request): JsonResponse
         );
 
         foreach ($fields as $field) {
-            $fields = $field->getReactiveCallback(
+            $fields = $field->formName($form->getName())->getReactiveCallback(
                 $fields,
                 data_get($values, $field->getColumn()),
                 $values->toArray(),

src/Laravel/src/Support/StubsPath.php

@@ -24,7 +24,6 @@ public function __construct(
 
         $pathWithExt = str($this->path)
             ->replace('\\', '/')
-            ->deduplicate('/')
             ->replaceLast('.' . $this->ext, '')
             ->append('.' . $this->ext)
             ->value();

src/UI/resources/js/Components/FormBuilder.js

@@ -27,6 +27,8 @@ export default (name = '', initData = {}, reactive = {}) => ({
     t.reactiveUrl = t.initData.reactiveUrl
 
     this.$watch('reactive', async function (value) {
+      let values = JSON.parse(JSON.stringify(value))
+
       if (!t.blockWatch) {
         let focused = document.activeElement
 
@@ -73,13 +75,23 @@ export default (name = '', initData = {}, reactive = {}) => ({
           t.$nextTick(() => (t.blockWatch = false))
         })
 
+        const choices = focused.closest('.choices')
+        const select = choices?.querySelector('select')
+
+        if (select && select.multiple) {
+          await t.$nextTick(() => {
+            values[select.getAttribute('data-reactive-column')] =
+              select.dataset.choicesValue.split(',')
+          })
+        }
+
         request(
           t,
           t.reactiveUrl,
           'post',
           {
             _component_name: t.name,
-            values: value,
+            values: values,
           },
           {},
           componentRequestData,

src/UI/resources/js/Components/Select.js

@@ -1,7 +1,7 @@
 import Choices from 'choices.js'
 import {createPopper} from '@popperjs/core'
 import debounce from '../Support/Debounce.js'
-import {crudFormQuery, prepareFormData} from '../Support/Forms.js'
+import {crudFormQuery, getQueryString, prepareFormData} from '../Support/Forms.js'
 import {dispatchEvents as de} from '../Support/DispatchEvents.js'
 import {formToJSON} from 'axios'
 import {DEFAULT_CONFIG} from 'choices.js/src/scripts/defaults'
@@ -195,7 +195,17 @@ export default (asyncUrl = '') => ({
       ...this.customOptions,
     })
 
-    this.$el.addEventListener('change', () => (this.isLoadedOptions = false), false)
+    this.setDataValues()
+
+    this.$el.addEventListener(
+      'change',
+      () => {
+        this.isLoadedOptions = false
+
+        this.setDataValues()
+      },
+      false,
+    )
 
     if (asyncUrl) {
       this.$el.addEventListener(
@@ -274,6 +284,8 @@ export default (asyncUrl = '') => ({
 
     if (this.removeItemButton) {
       this.$el.parentElement.addEventListener('click', event => {
+        event.target.closest('.choices')?.querySelector('select')?.focus()
+
         if (event.target.classList.contains('choices__button--remove')) {
           const choiceElement = event.target.closest('.choices__item')
           const id = choiceElement.getAttribute('data-id')
@@ -305,6 +317,11 @@ export default (asyncUrl = '') => ({
       })
     }
   },
+  setDataValues() {
+    if (this.$el.getAttribute('multiple')) {
+      this.$el.setAttribute('data-choices-value', this.choicesInstance.getValue(true).join(','))
+    }
+  },
   async asyncSearch() {
     const query = this.searchTerms.value ?? null
     let canRequest = this.$el.dataset.asyncOnInit || (query !== null && query.length)
@@ -325,6 +342,10 @@ export default (asyncUrl = '') => ({
         formQuery = crudFormQuery(inputs)
       }
 
+      if (form === null) {
+        formQuery = getQueryString({value: this.choicesInstance.getValue(true)})
+      }
+
       options = await this.fromUrl(url.toString() + (formQuery.length ? '&' + formQuery : ''))
       options = options.map(item => {
         const {properties, ...other} = item
@@ -344,7 +365,7 @@ export default (asyncUrl = '') => ({
     if (exclude !== '*') {
       extra['_data'] = form
         ? formToJSON(prepareFormData(new FormData(form), exclude))
-        : {value: this.$el.value}
+        : {value: this.choicesInstance.getValue(true)}
     }
 
     de(componentEvent, '', this, extra)

src/UI/resources/js/Request/Sets.js

@@ -36,6 +36,8 @@ export function listComponentRequest(component, pushState = false) {
     delete eventData.sort
   }
 
+  const originalUrl = url
+
   url = urlWithQuery(url, getQueryString(eventData))
 
   let stopLoading = function (data, t) {
@@ -45,7 +47,7 @@ export function listComponentRequest(component, pushState = false) {
   let componentRequestData = new ComponentRequestData()
   componentRequestData
     .withBeforeHandleResponse(function (data, t) {
-      const query = url.slice(url.indexOf('?') + 1)
+      const query = originalUrl.slice(originalUrl.indexOf('?') + 1)
 
       if (pushState) {
         history.pushState({}, '', query ? '?' + query : location.pathname)

src/UI/resources/js/Support/DispatchEvents.js

@@ -20,7 +20,8 @@ export function dispatchEvents(events, type, component, extraProperties = {}) {
 
       let eventName = parts[0]
 
-      let attributes = extraProperties
+      const attributes = {}
+      Object.assign(attributes, extraProperties)
 
       if (Array.isArray(parts) && parts.length > 1) {
         let params = parts[1].split(';')

src/UI/resources/js/Support/URLs.js

@@ -27,5 +27,9 @@ export function prepareQueryParams(params, exclude = null) {
 }
 
 export function mergeURLString(url, merge) {
+  if (merge === '') {
+    return url
+  }
+
   return url + (url.includes('?') ? '&' + merge : '?' + merge)
 }

src/UI/resources/views/components/cards.blade.php

@@ -14,9 +14,8 @@
     {{ (int) $async }},
     '{{ $asyncUrl }}'
 )"
-         data-pushstate="{{ $attributes->get('data-pushstate', false)}}"
         @defineEventWhen($async, 'cards_updated', $name, 'asyncRequest')
-        {{ $attributes->only(['data-events'])}}
+        {{ $attributes }}
     >
         <x-moonshine::loader x-show="loading" />
         <div x-show="!loading">

src/UI/resources/views/components/table/builder.blade.php

@@ -32,11 +32,10 @@ class="js-table-builder-container"
     {{ (int) $async }},
     '{{ $asyncUrl }}'
 )"
-         data-pushstate="{{ $attributes->get('data-pushstate', false)}}"
         @defineEvent('table_row_added', $name, 'add(true)')
         @defineEvent('table_reindex', $name, 'resolveReindex')
         @defineEventWhen($async, 'table_updated', $name, 'asyncRequest')
-        {{ $attributes->only(['data-events'])}}
+        {{ $attributes }}
     >
         @if($async && $searchable)
             <div class="flex items-center gap-2">

src/UI/src/Components/FormBuilder.php

@@ -445,7 +445,7 @@ protected function viewData(): array
             fn (FieldContract $field): FieldContract => $field->formName($this->getName())
         );
         $fields->prepend(
-            Hidden::make('_component_name')->setValue($this->getName())
+            Hidden::make('_component_name')->formName($this->getName())->setValue($this->getName())
         );
 
         $reactiveFields = $onlyFields->reactiveFields()

tests/Feature/Commands/ResourceCommandTest.php

@@ -5,6 +5,7 @@
 namespace MoonShine\Tests\Feature\Commands;
 
 use MoonShine\Laravel\Commands\MakeResourceCommand;
+use MoonShine\MenuManager\MenuItem;
 use MoonShine\Tests\TestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
@@ -19,9 +20,12 @@ final class ResourceCommandTest extends TestCase
     #[TestDox('it successful file created')]
     public function successfulCreated(): void
     {
+        $reflector = new \ReflectionClass(moonshineConfig()->getLayout());
+
         $name = 'DeleteMeResource';
         $file = "$name.php";
         $path = __DIR__ . "/../../../app/MoonShine/Resources/$file";
+        $layoutPath = $reflector->getFileName();
 
         @unlink($path);
 
@@ -37,6 +41,11 @@ public function successfulCreated(): void
             ->assertSuccessful();
 
         $this->assertFileExists($path);
+
+        $layoutContent = file_get_contents($layoutPath);
+
+        $this->assertStringContainsString(MenuItem::class, $layoutContent);
+        $this->assertStringContainsString('DeleteMeResource', $layoutContent);
     }
 
     #[Test]