From a6f898ef02d45bc6909456abadb6b619de1240b4 Mon Sep 17 00:00:00 2001
From: izica <artemiztomska@gmail.com>
Date: Mon, 6 Dec 2021 22:39:37 +0700
Subject: [PATCH] fix

---
 README.md                                     |   4 +-
 .../views/widgets/relation_panel.blade.php    | 318 ++++--------------
 .../views/widgets/relation_table.blade.php    |  28 +-
 3 files changed, 86 insertions(+), 264 deletions(-)

diff --git a/README.md b/README.md
index dee7fe1..43489dd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Laravel Backpack Relations Widgets
+sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder## Laravel Backpack Relations Widgets
 1. [Installation](#installation)
 2. [Screenshots](#screenshots)
 3. [Features](#features)
@@ -57,7 +57,7 @@ composer require izica/relations-widgets-for-backpack
     * `button_edit` (optional) - set `false` to hide
     * `button_delete` (optional) - set `false` to hide
     * `visible` (optional) - `closure` for hiding or showing panel
-    * `fields` (optional) - columns `array`, by default get columns from `fillable` in model
+    * `columns` (optional) - columns `array`, by default get columns from `fillable` in model
         * `name` - name
         * `label` - for field
         * `closure` - use `closure` instead of name field for passing value,
diff --git a/src/resources/views/widgets/relation_panel.blade.php b/src/resources/views/widgets/relation_panel.blade.php
index 3e699fc..ce60e59 100644
--- a/src/resources/views/widgets/relation_panel.blade.php
+++ b/src/resources/views/widgets/relation_panel.blade.php
@@ -1,279 +1,91 @@
 @php
-    if(!isset($entry)){
+    $entry_relation = data_get($entry, $widget['name']);
+    if(!isset($entry) || $entry_relation === null){
         return;
     }
     if(isset($widget['visible']) && is_callable($widget['visible'])){
-        if(!$widget['visible']($entry)){
+        if(!$widget['visible']($entry_relation)){
             return;
         }
     }
-
-    $searchName = "{$widget['name']}_search";
-    $paginationName = "{$widget['name']}_page";
-    $widgetId = "relation-table-{$widget['name']}";
-
-    if (!isset($widget['buttons']) || $widget['buttons'] !== false) {
-        $widget['buttons'] = true;
-    }
-    if (!isset($widget['button_create']) || $widget['button_create'] !== false) {
-        $widget['button_create'] = true;
+    if(!isset($widget['fields'])){
+        $widget['fields'] = [];
+        foreach ($entry_relation->getFillable() as $propertyName){
+            $widget['fields'][] = [
+                'label' => $crud->makeLabel($propertyName),
+                'name' => $propertyName,
+            ];
+        }
     }
-     if (!isset($widget['button_show']) || $widget['button_show'] !== false) {
+
+    if (!isset($widget['button_show']) || $widget['button_show'] !== false) {
         $widget['button_show'] = true;
     }
+
     if (!isset($widget['button_edit']) || $widget['button_edit'] !== false) {
         $widget['button_edit'] = true;
     }
-    if (!isset($widget['button_delete']) || $widget['button_delete'] !== false) {
-        $widget['button_delete'] = true;
-    }
-    if (!isset($widget['search']) || !is_callable($widget['search'])) {
-        $widget['search'] = false;
-    }
-    if (!isset($widget['per_page'])) {
-        $widget['per_page'] = null;
-    }
-    if(!isset($widget['columns'])){
-        $widget['columns'] = [];
-
-        try {
-            $item = get_class($entry->{$widget['name']}()->getRelated());
-            $item = new $item();
 
-            $widget['columns'] = [];
-            foreach ($item->getFillable() as $property){
-                $widget['columns'][] = [
-                    'label' => $crud->makeLabel($property),
-                    'name'  => $property,
-                ];
-            }
-        } catch (Exception $e){}
-    }
-    if(!isset($widget['columns']) && !isset($widget['model'])){
-        $widget['columns'] = [];
+    if (!isset($widget['buttons']) || $widget['buttons'] !== false) {
+        $widget['buttons'] = true;
     }
 
-    $createUrl = backpack_url($widget['backpack_crud'] . "/create");
-    if (isset($widget['relation_attribute'])) {
-        $createUrl .= "?{$widget['relation_attribute']}={$entry->id}";
-    }
 
-    $query = $entry->{$widget['name']}();
-    if(is_callable($widget['search']) && isset($_GET[$searchName])){
-        $query = $widget['search']($query, $_GET[$searchName]);
-    }
-    if($widget['per_page']) {
-        $items = $query->paginate($widget['per_page'], ['*'], $paginationName)->fragment($widgetId);
-    } else {
-        $items = $query->get();
-    }
 @endphp
-<div id="{{$widgetId}}" class="dataTables_wrapper">
-    <div class="row mb-0">
-        <div class="col-sm-6">
-            <div class="d-flex align-items-center mb-2">
-                <h5 class="mr-2 mb-0">{{$widget['label']}}</h5>
-                @if ($widget['button_create'] === true)
-                    <a
-                            href="{{ $createUrl }}"
-                            class="btn btn-primary"
-                            data-style="zoom-in"
-                    >
-                        <span class="ladda-label"><i class="la la-plus"></i> {{ trans('backpack::crud.add') }}</span>
-                    </a>
-                @endif
-            </div>
-        </div>
-        @if ($widget['search'] !== false)
-            <form
-                    class="offset-3 col-sm-3"
-                    onsubmit="
-                            location.hash = 'hack';
-                            location.hash = '';
-                            location.href=this.action + '{{$widgetId}}';
-                            return true;
-                            "
-            >
-                <input
-                        type="search"
-                        name="{{$searchName}}"
-                        class="form-control"
-                        placeholder="{{ trans('backpack::crud.search') }}"
-                        value="{{$_GET[$searchName] ?? ''}}"
-                />
-            </form>
-        @endif
-    </div>
-    <table
-            class="bg-white table table-striped table-hover nowrap rounded shadow-xs border-xs dataTable dtr-inline"
-            cellspacing="0"
-            aria-describedby="crudTable_info" role="grid"
-    >
-        <thead>
-        <tr role="row">
-            @foreach($widget['columns'] as $column)
-                <th>{{$column['label']}}</th>
-            @endforeach
-            @if($widget['buttons'] === true)
-                <th>{{ trans('backpack::crud.actions') }}</th>
-            @endif
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($items as $item)
-            <tr role="row">
-                @foreach($widget['columns'] as $column)
+
+<div class="row">
+    <div class="col-md-8">
+        <h5>{{$widget['label']}}</h5>
+        <div class="card no-padding no-border">
+            <table class="table table-striped mb-0">
+                <tbody>
+                @foreach($widget['fields'] as $field)
                     @php
+                        if(isset($field['visible']) && is_callable($field['visible'])){
+                            if(!$field['visible']($entry_relation)){
+                                continue;
+                            }
+                        }
                         $value = '';
-                        if(isset($column['closure'])){
-                            $value = $column['closure']($item);
+                        if(isset($field['closure'])){
+                            $value = $field['closure']($entry_relation);
                         }
-                        if(isset($column['name'])){
-                             $value = data_get($item, $column['name']);
+                        if(isset($field['name'])){
+                             $value = data_get($entry_relation, $field['name']);
                         }
                     @endphp
-                    <td>
-                        <span>{!!$value!!}</span>
-                    </td>
+                    <tr>
+                        <td>
+                            <strong>{{$field['label'] ?? ''}}:</strong>
+                        </td>
+                        <td>
+                            <span>{!!$value ?? ''!!}</span>
+                        </td>
+                    </tr>
                 @endforeach
-                @if($widget['buttons'] === true)
-                    <td>
-                        @if ($widget['button_show'] === true)
-                            <a href="{{ backpack_url($widget['backpack_crud'] . "/" . $item->id . "/show") }}"
-                               class="btn btn-sm btn-link">
-                                <i class="la la-eye"></i> {{ trans('backpack::crud.preview') }}
-                            </a>
-                        @endif
-                        @if ($widget['button_edit'] === true)
-                            <a href="{{ backpack_url($widget['backpack_crud'] . "/" . $item->id . "/edit") }}"
-                               class="btn btn-sm btn-link">
-                                <i class="la la-edit"></i> {{ trans('backpack::crud.edit') }}
-                            </a>
-                        @endif
-                        @if ($widget['button_delete'] === true)
-                            <a href="javascript:void(0)" onclick="deleteEntryRelationHasManyWidget(this)"
-                               data-route="{{ backpack_url($widget['backpack_crud'] . "/" . $item->id) }}"
-                               class="btn btn-sm btn-link" data-button-type="delete">
-                                <i class="la la-trash"></i> {{ trans('backpack::crud.delete') }}
-                            </a>
-                        @endif
-                    </td>
+                @if($widget['buttons'])
+                    <tr>
+                        <td>
+                            <strong>{{ trans('backpack::crud.actions') }}</strong>
+                        </td>
+                        <td>
+                            @if ($widget['button_show'] === true)
+                                <a href="{{ backpack_url($widget['backpack_crud'] . "/" . $entry_relation->id . "/show") }}"
+                                   class="btn btn-sm btn-link">
+                                    <i class="la la-eye"></i> {{ trans('backpack::crud.preview') }}
+                                </a>
+                            @endif
+                            @if ($widget['button_edit'] === true)
+                                <a href="{{ backpack_url($widget['backpack_crud'] . "/" . $entry_relation->id . "/edit") }}"
+                                   class="btn btn-sm btn-link">
+                                    <i class="la la-edit"></i> {{ trans('backpack::crud.edit') }}
+                                </a>
+                            @endif
+                        </td>
+                    </tr>
                 @endif
-            </tr>
-        @endforeach
-        </tbody>
-        <tfoot>
-        <tr>
-            @foreach($widget['columns'] as $column)
-                <th>{{$column['label']}}</th>
-            @endforeach
-            @if($widget['buttons'] === true)
-                <th rowspan="1" colspan="1">{{ trans('backpack::crud.actions') }}</th>
-            @endif
-        </tr>
-        </tfoot>
-    </table>
-    @if ($widget['per_page'])
-        {{$items->links('backpack::rwfb-pagination')}}
-    @endif
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
-
-@push('after_scripts') @if (request()->ajax()) @endpush @endif
-<script>
-    if (typeof deleteEntryRelationHasManyWidget != 'function') {
-        $('[data-button-type=delete]').unbind('click');
-
-        function deleteEntryRelationHasManyWidget(button) {
-            // ask for confirmation before deleting an item
-            // e.preventDefault();
-            var button = $(button);
-            var route = button.attr('data-route');
-            var row = button.closest('tr');
-
-            swal({
-                title: "{!! trans('backpack::base.warning') !!}",
-                text: "{!! trans('backpack::crud.delete_confirm') !!}",
-                icon: 'warning',
-                buttons: {
-                    cancel: {
-                        text: "{!! trans('backpack::crud.cancel') !!}",
-                        value: null,
-                        visible: true,
-                        className: 'bg-secondary',
-                        closeModal: true
-                    },
-                    delete: {
-                        text: "{!! trans('backpack::crud.delete') !!}",
-                        value: true,
-                        visible: true,
-                        className: 'bg-danger'
-                    }
-                }
-            }).then((value) => {
-                if (value) {
-                    $.ajax({
-                        url: route,
-                        type: 'DELETE',
-                        success: function (result) {
-                            if (result == 1) {
-                                // Show a success notification bubble
-                                new Noty({
-                                    type: 'success',
-                                    text: "{!! '<strong>'.trans('backpack::crud.delete_confirmation_title').'</strong><br>'.trans('backpack::crud.delete_confirmation_message') !!}"
-                                }).show();
-
-                                // Hide the modal, if any
-                                $('.modal').modal('hide');
-
-                                // Remove the details row, if it is open
-                                if (row.hasClass('shown')) {
-                                    row.next().remove();
-                                }
-                                // Remove the row from the datatable
-                                row.remove();
-                            } else {
-                                // if the result is an array, it means
-                                // we have notification bubbles to show
-                                if (result instanceof Object) {
-                                    // trigger one or more bubble notifications
-                                    Object.entries(result).forEach(function (entry, index) {
-                                        var type = entry[0];
-                                        entry[1].forEach(function (message, i) {
-                                            new Noty({
-                                                type: type,
-                                                text: message
-                                            }).show();
-                                        });
-                                    });
-                                } else {// Show an error alert
-                                    swal({
-                                        title: "{!! trans('backpack::crud.delete_confirmation_not_title') !!}",
-                                        text: "{!! trans('backpack::crud.delete_confirmation_not_message') !!}",
-                                        icon: 'error',
-                                        timer: 4000,
-                                        buttons: false
-                                    });
-                                }
-                            }
-                        },
-                        error: function (result) {
-                            // Show an alert with the result
-                            swal({
-                                title: "{!! trans('backpack::crud.delete_confirmation_not_title') !!}",
-                                text: "{!! trans('backpack::crud.delete_confirmation_not_message') !!}",
-                                icon: 'error',
-                                timer: 4000,
-                                buttons: false
-                            });
-                        }
-                    });
-                }
-            });
-
-        }
-    }
-
-    // make it so that the function above is run after each DataTable draw event
-    // crud.addFunctionToDataTablesDrawEventQueue('deleteEntry');
-</script>
-@if (!request()->ajax()) @endpush @endif
diff --git a/src/resources/views/widgets/relation_table.blade.php b/src/resources/views/widgets/relation_table.blade.php
index a4c4669..3e699fc 100644
--- a/src/resources/views/widgets/relation_table.blade.php
+++ b/src/resources/views/widgets/relation_table.blade.php
@@ -8,7 +8,8 @@
         }
     }
 
-    $searchName = "{$widget['name']}-search";
+    $searchName = "{$widget['name']}_search";
+    $paginationName = "{$widget['name']}_page";
     $widgetId = "relation-table-{$widget['name']}";
 
     if (!isset($widget['buttons']) || $widget['buttons'] !== false) {
@@ -26,6 +27,12 @@
     if (!isset($widget['button_delete']) || $widget['button_delete'] !== false) {
         $widget['button_delete'] = true;
     }
+    if (!isset($widget['search']) || !is_callable($widget['search'])) {
+        $widget['search'] = false;
+    }
+    if (!isset($widget['per_page'])) {
+        $widget['per_page'] = null;
+    }
     if(!isset($widget['columns'])){
         $widget['columns'] = [];
 
@@ -47,21 +54,21 @@
     }
 
     $createUrl = backpack_url($widget['backpack_crud'] . "/create");
-    if (isset($widget['relation_column'])) {
-        $createUrl .= "?{$widget['relation_column']}={$entry->id}";
-    }
-
-    if (!isset($widget['search']) || !is_callable($widget['search'])) {
-        $widget['search'] = false;
+    if (isset($widget['relation_attribute'])) {
+        $createUrl .= "?{$widget['relation_attribute']}={$entry->id}";
     }
 
     $query = $entry->{$widget['name']}();
     if(is_callable($widget['search']) && isset($_GET[$searchName])){
         $query = $widget['search']($query, $_GET[$searchName]);
     }
-    $items = $query->get();
+    if($widget['per_page']) {
+        $items = $query->paginate($widget['per_page'], ['*'], $paginationName)->fragment($widgetId);
+    } else {
+        $items = $query->get();
+    }
 @endphp
-<div id="{{$widgetId}}">
+<div id="{{$widgetId}}" class="dataTables_wrapper">
     <div class="row mb-0">
         <div class="col-sm-6">
             <div class="d-flex align-items-center mb-2">
@@ -166,6 +173,9 @@ class="btn btn-sm btn-link" data-button-type="delete">
         </tr>
         </tfoot>
     </table>
+    @if ($widget['per_page'])
+        {{$items->links('backpack::rwfb-pagination')}}
+    @endif
 </div>
 
 @push('after_scripts') @if (request()->ajax()) @endpush @endif