Skip to content

Commit 65abfd3

Browse files
ilestisilestis
committed
Fix various issues
1 parent 4369ea3 commit 65abfd3

15 files changed

+55
-45
lines changed

‎app/Http/Controllers/EntityCreatorController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function store(Request $request, Campaign $campaign, EntityType $entityTy
107107

108108
$values = $this->inputFields;
109109
// To prevent observer from creating duplicate tags.
110-
request()->replace(['tags' => $values['tags']]);
110+
$this->request->merge(['tags' => $values['tags']]);
111111

112112
foreach ($names as $name) {
113113
if (empty($name)) {

‎app/View/Components/Alert.php

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function __construct(
1515
public string $type,
1616
public ?string $id = null,
1717
public bool $dismissible = false,
18+
public ?string $class = null,
1819
public bool $hidden = false,
1920
) {}
2021

‎app/View/Components/Form.php

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function __construct(
2020
public bool $unsaved = false,
2121
public bool $direct = false,
2222
public string $id = '',
23+
public string $class = '',
2324
public array $extra = [],
2425
) {
2526
// Guarantee uppercase method for the tests in the blade file

‎resources/js/quick-creator.js

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ const quickCreatorDuplicateName = () => {
5656
}
5757

5858
const warning = this.parentNode.querySelector('.duplicate-entity-warning');
59+
if (!warning) {
60+
return;
61+
}
5962
warning.classList.add('hidden');
6063
// Check if an entity of the same type already exists, and warn when it does.
6164
const url = this.dataset.live + '?q=' + this.value + '&type=' + this.dataset.type;

‎resources/views/components/form.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@if ($files) enctype="multipart/form-data" @endif
77
@if ($unsaved) data-unload="1" @endif
88
@if ($shortcut && $method !== 'DELETE') data-shortcut="1" @endif
9-
{{ $attributes->merge(['class' => '']) }}
9+
class="w-full {{ $class }}"
1010
@if (!empty($id)) id="{{ $id }}" @endif
1111

1212
{!! $extra() !!}

‎resources/views/components/form/families.blade.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
field="families"
3434
:label="\App\Facades\Module::plural(config('entities.ids.family'), __('entities.families'))">
3535

36-
@if ($quickCreator)<div class="join w-full">@endif
3736

3837
<select multiple="multiple" name="families[]" class="w-full select2 join-item" data-tags="true" style="width: 100%" data-url="{{ route('search-list', [$campaign, config('entities.ids.family')]) }}" data-new-tag="{{ __('crud.actions.new') }}" data-allow-clear="true" data-allow-new="{{ $dynamicNew ? 'true' : false}}" data-placeholder="" id="{{ $fieldUniqIdentifier }}">
3938
@foreach ($selectedOption as $key => $val)
@@ -42,10 +41,12 @@
4241
</select>
4342

4443
@if ($quickCreator)
45-
<a class="quick-creator-subform btn2 bg-base-200 join-item btn-sm" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.family'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new family" tabindex="0">
46-
<span class="fa-solid fa-plus"></span>
44+
<x-slot name="action">
45+
<a class="quick-creator-subform text-xs cursor-pointer" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.family'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new family" tabindex="0">
46+
<x-icon class="plus" />
47+
{{ __('crud.actions.new') }}
4748
</a>
48-
</div>
49+
</x-slot>
4950
@endif
5051
</x-forms.field>
5152

‎resources/views/components/form/locations.blade.php

+11-8
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
$quickCreator = auth()->user()->can('create', [$campaign->getEntityTypes()->where('id', config('entities.ids.location'))->first(), $campaign]);
3030
}
3131
?>
32-
<label>
33-
{!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!}
34-
</label>
3532

36-
@if ($quickCreator)<div class="join w-full">@endif
33+
<x-forms.field
34+
field="locations"
35+
:label="\App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations'))">
36+
3737

3838
<select multiple="multiple" name="locations[]" class="w-full select2 join-item" data-tags="true" style="width: 100%" data-url="{{ route('search-list', [$campaign, config('entities.ids.location')]) }}" data-allow-clear="true" data-new-tag="{{ __('crud.actions.new') }}" data-allow-new="{{ $dynamicNew ? 'true' : false}}" data-placeholder="{{ __('crud.placeholders.multiple') }}" id="{{ $fieldUniqIdentifier }}">
3939
@foreach ($selectedOption as $key => $val)
@@ -42,8 +42,11 @@
4242
</select>
4343

4444
@if ($quickCreator)
45-
<a class="quick-creator-subform btn2 bg-base-200 join-item btn-sm" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.location'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new location" tabindex="0">
46-
<span class="fa-solid fa-plus"></span>
47-
</a>
48-
</div>
45+
<x-slot name="action">
46+
<a class="quick-creator-subform text-xs cursor-pointer" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.location'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new location" tabindex="0">
47+
<x-icon class="plus" />
48+
{{ __('crud.actions.new') }}
49+
</a>
50+
</x-slot>
4951
@endif
52+
</x-forms.field>

‎resources/views/components/form/races.blade.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
field="races"
3333
:label="\App\Facades\Module::plural(config('entities.ids.race'), __('entities.races'))">
3434

35-
@if ($quickCreator)<div class="join w-full">@endif
36-
3735
<select
3836
id="{{ $fieldUniqIdentifier }}"
3937
multiple="multiple"
@@ -52,9 +50,11 @@ class=" select2 join-item"
5250
</select>
5351

5452
@if ($quickCreator)
55-
<a class="quick-creator-subform btn2 bg-base-200 join-item" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.race'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new race" tabindex="0">
56-
<span class="fa-solid fa-plus"></span>
53+
<x-slot name="action">
54+
<a class="quick-creator-subform text-xs cursor-pointer" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => config('entities.ids.race'), 'origin' => 'entity-form', 'target' => $fieldUniqIdentifier, 'multi' => true]) }}" aria-label="Create a new race" tabindex="0">
55+
<x-icon class="plus" />
56+
{{ __('crud.actions.new') }}
5757
</a>
58-
</div>
58+
</x-slot>
5959
@endif
6060
</x-forms.field>

‎resources/views/components/forms/field.blade.php

+15-11
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@
33
@if ($hidden) hidden @endif"
44
>
55
@if (isset($label) && !empty($label))
6-
<label class="" @if (isset($id)) for="{{ $id }}" @endif>
7-
{!! $label !!}
8-
@if ($tooltip && isset($helper))
9-
@if (isset($link))
10-
<a href="{{ $link }}" target="_blank">
6+
<div class="flex items-center justify-between">
7+
<label class="" @if (isset($id)) for="{{ $id }}" @endif>
8+
{!! $label !!}
9+
@if ($tooltip && isset($helper))
10+
@if (isset($link))
11+
<a href="{{ $link }}" target="_blank">
12+
<x-helpers.tooltip :title="$helper" />
13+
</a>
14+
@else
1115
<x-helpers.tooltip :title="$helper" />
12-
</a>
13-
@else
14-
<x-helpers.tooltip :title="$helper" />
16+
@endif
1517
@endif
16-
@endif
17-
</label>
18-
@else
18+
</label>
19+
@isset($action)
20+
{!! $action !!}
21+
@endisset
22+
</div>
1923
@endif
2024
{!! $slot !!}
2125
@if (isset($helper) && !empty($helper))

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

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
:helper="$helper"
77
tooltip>
88

9-
@if ($canNew && !$dynamicNew)
10-
<div class="join w-full">
11-
@endif
12-
139
<select
1410
@if ($multiple) multiple="multiple" @endif
1511
name="{{ $name }}"
@@ -31,10 +27,11 @@ class="w-full select2 join-item"
3127
</select>
3228

3329
@if ($canNew && !$dynamicNew)
34-
<a class="quick-creator-subform btn2 bg-base-200 join-item btn-sm" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => $entityTypeID, 'origin' => 'entity-form', 'target' => $id]) }}" aria-label="Create a new element" tabindex="0">
30+
<x-slot name="action">
31+
<a class="quick-creator-subform text-xs cursor-pointer" data-url="{{ route('entity-creator.form', [$campaign, 'entity_type' => $entityTypeID, 'origin' => 'entity-form', 'target' => $id]) }}" aria-label="Create a new element" tabindex="0">
3532
<x-icon class="plus" />
36-
<span class="sr-only">{{ __('crud.create') }}</span>
33+
{{ __('crud.actions.new') }}
3734
</a>
38-
</div>
35+
</x-slot>
3936
@endif
4037
</x-forms.field>

‎resources/views/cruds/forms/_premium.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<textarea name="tooltip" class="" id="tooltip" rows="3" placeholder="{{ __('fields.tooltip.description') }}">{!! old('tooltip', FormCopy::field('tooltip')->string() ?: $entity->tooltip ?? null) !!}</textarea>
3232

33-
<p class="text-neutral-content">
33+
<x-slot name="helper">
3434
@php
3535
$tooltipTags = [];
3636
foreach (config('purify.configs.tooltips.allowed') as $tag) {
@@ -39,7 +39,7 @@
3939
$tooltipTags = implode(', ', $tooltipTags);
4040
@endphp
4141
{!! __('fields.tooltip.helper', ['tags' => $tooltipTags]) !!}
42-
</p>
42+
</x-slot>
4343
@else
4444
@include('cruds.fields.helpers.boosted', ['key' => 'fields.tooltip.boosted-description'])
4545
@endif

‎resources/views/entities/creator/form.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class="w-full"
4545
data-live="{{ route('search-list', [$campaign, $entityType]) }}"
4646
@endif data-bulk="true" id="{{ !isset($entityType) ? 'qq-post-name-field' : 'qq-name-field' }}" data-1p-ignore="true" />
4747
@endif
48-
<x-alert type="warning" class=" my-1 duplicate-entity-warning" :hidden="true">
48+
<x-alert type="warning" class="my-1 duplicate-entity-warning" :hidden="true">
4949
{{ __('entities.creator.duplicate') }}<br />
5050
<span class="duplicate-entities"></span>
5151
</x-alert>

‎resources/views/entities/creator/forms/journal.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<div class="grid gap-5 grid-cols-1 md:grid-cols-2">
3-
@include('cruds.fields.type', ['base' => \App\Models\Journal::class, 'trans' => 'journals'])
4-
@include('cruds.fields.journal', ['isParent' => true, 'dynamicNew' => true])
3+
@include('cruds.fields.type', ['base' => \App\Models\Journal::class, 'trans' => 'journals'])
4+
@include('cruds.fields.journal', ['isParent' => true, 'dynamicNew' => true])
55
</div>
66

7-
@include('cruds.fields.character', ['label' => __('journals.fields.author')])
7+
@include('cruds.fields.author')

‎resources/views/entities/creator/forms/quest.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@include('cruds.fields.type', ['base' => \App\Models\Quest::class, 'trans' => 'quests'])
22
<x-grid>
33
@include('cruds.fields.quest', ['isParent' => true, 'dynamicNew' => auth()->user()->can('create', [$campaign->getEntityTypes()->where('id', config('entities.ids.quest'))->first(), $campaign])])
4-
@include('cruds.fields.character', ['label' => 'quests.fields.instigator'])
4+
@include('cruds.fields.instigator')
55
@include('cruds.fields.location', ['dynamicNew' => auth()->user()->can('create', [$campaign->getEntityTypes()->where('id', config('entities.ids.location'))->first(), $campaign])])
66
</x-grid>

‎resources/views/entities/creator/selection.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<article id="qq-modal-form" class="!hidden p-4 md:px-6">
1313
</article>
1414
<div class="container">
15-
<article id="qq-modal-selection p-4 md:px-6">
15+
<article id="qq-modal-selection" class="p-4 md:px-6">
1616
<div class="quick-creator-body flex flex-col gap-5">
1717
@includeWhen(isset($new), 'entities.creator._created', ['success' => $new ?? null, 'dismissable' => false])
1818

0 commit comments

Comments
 (0)