Updates

Author: ilestis

app/Http/Controllers/Api/v1/EntityTagApiController.php

@@ -16,7 +16,7 @@ public function index(Campaign $campaign, Entity $entity)
         $this->authorize('access', $campaign);
         $this->authorize('view', $entity);
 
-        return Resource::collection($entity->tags()->paginate());
+        return Resource::collection($entity->tags()->withPivot('id')->paginate());
     }
 
     public function show(Campaign $campaign, Entity $entity, EntityTag $entityTag)

app/Http/Controllers/CrudController.php

@@ -352,7 +352,12 @@ public function crudCreate($params = [])
             $params['title'] = __('crud.titles.new', ['module' => $singular]);
         }
 
-        return view('cruds.forms.create', array_merge(['name' => $this->view], $params));
+        $view = 'cruds.forms.create';
+        $override = $this->view . '.forms.create';
+        if (view()->exists($override)) {
+            $view = $override;
+        }
+        return view($view, array_merge(['name' => $this->view], $params));
     }
 
     public function crudStore(Request $request, bool $redirectToCreated = false)
@@ -518,7 +523,12 @@ public function crudEdit(Model|MiscModel $model)
             $params['entity'] = $model->entity;
         }
 
-        return view('cruds.forms.edit', $params);
+        $view = 'cruds.forms.edit';
+        $override = $this->view . '.forms.edit';
+        if (view()->exists($override)) {
+            $view = $override;
+        }
+        return view($view, $params);
     }
 
     /**

app/Http/Resources/Api/EntityTagResource.php

@@ -19,7 +19,6 @@ public function toArray(Request $request): array
         $model = $this->resource;
 
         return [
-            'id' => $model->id,
             'tag_id' => $model->tag_id,
         ];
     }

app/Models/Concerns/Taggable.php

@@ -27,7 +27,6 @@ public static function bootTaggable(): void
     public function tags(): BelongsToMany
     {
         return $this->belongsToMany(Tag::class, $this->getTagPivotTableName())
-            ->withPivot('id')
             ->with('entity')
             ->has('entity');
     }

lang/en/bookmarks.php

@@ -12,17 +12,14 @@
     ],
     'fields'            => [
         'active'            => 'Active',
-        'dashboard'         => 'Dashboard',
+        'dashboard' => 'Dashboard',
         'default_dashboard' => 'Default dashboard',
-        'entity'            => 'Entity',
         'filters'           => 'Filters',
         'menu'              => 'Subpage',
         'position'          => 'Position',
-        'random'            => 'Random',
         'random_type'       => 'Random Entity Type',
         'selector'          => 'Bookmark Configuration',
         'target'            => 'Target',
-        'type'              => 'Entity List',
     ],
     'helpers'           => [
         'active'            => 'Inactive bookmarks won\'t appear in the interface.',
@@ -33,6 +30,7 @@
         'random'            => 'Use this field to have a bookmark pointing to a random entity. You can filter the link to only go to a specific entity type.',
         'selector'          => 'Configure where this bookmark goes when a user clicks on it in the sidebar.',
         'type'              => 'Set up this bookmark to go directly to a list of entities. To filter the results, copy parts of the url on the filtered entity list after the :? sign into the :filter field.',
+        'css' => 'Add a CSS class that will be added to the bookmark\'s link in the sidebar.',
     ],
     'placeholders'      => [
         'filters'   => 'location_id=15&type=city',
@@ -50,4 +48,11 @@
     'visibilities'      => [
         'is_active' => 'Show the bookmark in the sidebar',
     ],
+    'targets' => [
+        'select' => 'Choose an option',
+        'entity' => 'A single entity',
+        'random' => 'A random entity',
+        'type' => 'List of entities of a specific entity type/module',
+        'dashboard' => 'One of the campaign\'s dashboards',
+    ]
 ];

resources/js/quick-links.js

@@ -5,15 +5,15 @@ const initQuickLinksForm = () => {
     }
     selector.addEventListener('change', function (e) {
         e.preventDefault();
-        let selected = selector.options[selector.selectedIndex];
+        const selected = selector.options[selector.selectedIndex];
 
         const subforms = document.querySelectorAll('.bookmark-subform');
         subforms.forEach(subform => {
-            subform.classList.add('hidden');
+            subform.classList.add('opacity-0', 'invisible', 'h-0');
         });
         let target = document.querySelector(selected.dataset.target);
         if (target) {
-            target.classList.remove('hidden');
+            target.classList.remove('opacity-0', 'invisible', 'h-0');
         }
     });
 };

resources/js/togglers.js

@@ -44,6 +44,10 @@ const registerEntityPrivacyAlert = () => {
     }
     field.addEventListener('change', function () {
         let selector = document.getElementById('entity-is-private');
+        // Bookmarks have this field but no permissions. This should be handled differently
+        if (!selector) {
+            return;
+        }
         if (this.checked) {
             selector.classList.remove('hidden')
         } else {

resources/views/bookmarks/datagrid.blade.php

@@ -11,11 +11,11 @@
                 if ($model->isDashboard()) {
                     return '<i class="fa-solid fa-th-large"></i> ' . __('bookmarks.fields.dashboard');
                 } elseif ($model->isEntity()) {
-                    return '<i class="fa-solid fa-star"></i> ' . __('bookmarks.fields.entity');
+                    return '<i class="fa-solid fa-star"></i> ' . __('entities.entity');
                 } elseif ($model->isList()) {
-                    return '<i class="fa-solid fa-th-list"></i> ' . __('bookmarks.fields.type');
+                    return '<i class="fa-solid fa-th-list"></i> ' . __('crud.fields.entity_type');
                 } elseif ($model->isRandom()) {
-                    return '<i class="fa-solid fa-question"></i> ' . __('bookmarks.fields.random');
+                    return '<i class="fa-solid fa-question"></i> ' . __('dashboard.setup.widgets.random');
                 }
                 return '';
             },

resources/views/bookmarks/form/_entry.blade.php

@@ -52,7 +52,7 @@
 <x-grid type="1/1">
     <x-helper>
             {!! __('bookmarks.helpers.entity', [
-            'menu' => '<code>' . __('bookmarks.fields.menu') . '</code>',
+            'menu' => '<span class="font-extrabold">' . __('bookmarks.fields.menu') . '</span>',
             ]) !!}
     </x-helper>
 
@@ -61,7 +61,7 @@
             'name' => 'entity_id',
             'required' => true,
             'preset' => !empty($model) && $model->target ? $model->target : null,
-            'label' => __('bookmarks.fields.entity'),
+            'label' => __('entities.entity'),
         ])
 
         <x-forms.field field="menu" :label="__('bookmarks.fields.menu')">