Tag children add multiple entities

app/Http/Controllers/Tags/ChildController.php

@@ -79,8 +79,8 @@ public function store(StoreTagEntity $request, Campaign $campaign, Tag $tag)
             $redirectUrlOptions['tag_id'] = $tag->id;
         }
 
-        $tag->attachEntity($request->only('entity_id'));
+        $count = $tag->attachEntities($request->only('entities'));
         return redirect()->route('entities.show', $redirectUrlOptions)
-            ->with('success', trans('tags.children.create.success', ['name' => $tag->name]));
+            ->with('success', trans_choice('tags.children.create.attach_success', $count, ['name' => $tag->name, 'count' => $count]));
     }
 }

app/Http/Requests/StoreTagEntity.php

@@ -25,7 +25,10 @@
     {
         return [
             'tag_id' => 'required|exists:entities,id',
-            'entity_id' => 'required|exists:entities,id|different:tag_id',
+            'entities' => 'required',
+            'entities' => [
+                '*' => 'different:tag_id|exists:entities,id',
+            ],
         ];
     }
 }

app/Models/Tag.php

@@ -275,26 +275,28 @@ public function hasColour(): bool
     }
 
     /**
-     * Attach an entity to the tag
+     * Attach entities to the tag
      */
-    public function attachEntity(array $request): bool
+    public function attachEntities(array $request): int
     {
-        $entityId = Arr::get($request, 'entity_id');
-        $entity = Entity::with('tags')->findOrFail($entityId);
-
-        // Make sure the tag isn't already attached to the entity
-        foreach ($entity->entityTags as $tag) {
-            if ($tag->tag_id == $this->id) {
-                return true;
+        $entityIds = Arr::get($request, 'entities');
+        $entities = Entity::with('tags')->findOrFail($entityIds);
+        $count = 0;
+        foreach ($entities as $entity) {
+            // Make sure the tag isn't already attached to the entity
+            foreach ($entity->tags as $tag) {
+                if ($tag->tag_id == $this->id) {
+                    continue;
+                }
             }
-        }
 
-        $entityTag = EntityTag::create([
-            'tag_id' => $this->id,
-            'entity_id' => $entityId
-        ]);
-
-        return $entityTag !== false;
+            EntityTag::create([
+                'tag_id' => $this->id,
+                'entity_id' => $entity->id,
+            ]);
+            $count++;
+        }
+        return $count;
     }
 
     /**

app/View/Components/Forms/Foreign.php

@@ -23,6 +23,7 @@ class Foreign extends Component
     public bool $allowNew;
     public bool $allowClear;
     public bool $required;
+    public bool $multiple;
     public ?string $entityType;
     public ?string $label;
     public ?string $placeholder;
@@ -46,6 +47,7 @@ public function __construct(
         bool $allowClear = false,
         bool $required = false,
         bool $parent = false,
+        bool $multiple = false,
         string $entityType = null,
         string $key = null,
         string $label = null,
@@ -74,6 +76,7 @@ public function __construct(
         $this->className = $class;
         $this->entityTypeID = $entityTypeID;
         $this->campaign = $campaign;
+        $this->multiple = $multiple;
     }
 
     /**

lang/en/tags.php

@@ -6,8 +6,8 @@
             'add'   => 'Add to tag',
         ],
         'create'    => [
-            'success'   => 'Added the tag :name to the entity.',
-            'title'     => 'Add an entity to :name',
+            'attach_success' => '{1} Added :count entity to tag :name.|[2,*] Added :count entities to tag :name.',
+            'modal_title'    => 'Add entities to :name',
         ],
     ],
     'create'        => [

resources/views/components/forms/foreign.blade.php

@@ -11,7 +11,7 @@
     @endif
 
     <select 
-            multiple="$multiple"
+            @if ($multiple) multiple="multiple" @endif
             name="{{ $name }}" 
             id="{{ $id }}"
             class="w-full select2 join-item"
@@ -23,7 +23,6 @@ class="w-full select2 join-item"
             data-allow-clear="{{ $allowClear ? 'true' : 'false' }}"
             @if (!empty($dropdownParent)) data-dropdown-parent="{{ $dropdownParent }}" @endif
             :dropdownParent="request()->ajax() ? '#primary-dialog' : null"
-
     >
         @foreach ($options as $key => $value)
             @if ($multiple)

resources/views/tags/entities/_form.blade.php

@@ -1,12 +1,17 @@
 <?php /** @var \App\Models\Tag $model */?>
 {{ csrf_field() }}
 <x-grid type="1/1">
-@include('cruds.fields.entity', [
-    'placeholder' => __('entities/relations.placeholders.target'),
-    'preset' => false,
-    'route' => 'search.tag-children',
-    'dropdownParent' => request()->ajax() ? '#primary-dialog' : null
-])
+    <x-forms.foreign
+        field="entities"
+        :required="true"
+        label="abilities.show.tabs.entities"
+        :multiple="true"
+        name="entities[]"
+        id="entities[]"
+        :campaign="$campaign"
+        :route="route('search.tag-children', [$campaign, 'exclude-entity' => true])"
+    >
+    </x-forms.foreign>
 </x-grid>
 
 

resources/views/tags/entities/create.blade.php

@@ -1,6 +1,6 @@
 <?php /** @var \App\Models\Tag $model */ ?>
 @extends('layouts.' . (request()->ajax() ? 'ajax' : 'app'), [
-    'title' => __('tags.children.create.title', ['name' => $model->name]),
+    'title' => __('tags.children.create.modal_title', ['name' => $model->name]),
     'description' => '',
     'breadcrumbs' => [
         Breadcrumb::entity($model->entity)->list(),
@@ -10,9 +10,15 @@
 ])
 
 @section('content')
-    {!! Form::open(['route' => $formOptions, 'method' => 'POST']) !!}
+    {!! Form::open([
+        'route' => $formOptions, 
+        'method' => 'POST',
+        'data-shortcut' => 1,
+        'class' => 'ajax-subform',
+    ]) !!}
+
     @include('partials.forms.form', [
-        'title' => __('tags.children.create.title', ['name' => $model->name]),
+        'title' => __('tags.children.create.modal_title', ['name' => $model->name]),
         'content' => 'tags.entities._form',
         'submit' =>  __('tags.children.actions.add'),
         'dialog' => true,