From d1149730be99fdc8e59e91ce3b02c863a08d4aa1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Oct 2024 16:31:17 +0100
Subject: [PATCH] Apply blade component to files views

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Helpers/StorageHelper.php              |   1 +
 resources/views/accessories/view.blade.php | 104 +----------
 resources/views/blade/filestable.blade.php | 140 ++++++++++++++
 resources/views/components/view.blade.php  |  98 +---------
 resources/views/consumables/view.blade.php | 102 +----------
 resources/views/hardware/view.blade.php    | 201 +--------------------
 resources/views/licenses/view.blade.php    |  97 +---------
 resources/views/models/view.blade.php      |  98 +---------
 resources/views/users/view.blade.php       | 104 +----------
 9 files changed, 192 insertions(+), 753 deletions(-)
 create mode 100644 resources/views/blade/filestable.blade.php

diff --git a/app/Helpers/StorageHelper.php b/app/Helpers/StorageHelper.php
index ef0facc27b..950e70cc49 100644
--- a/app/Helpers/StorageHelper.php
+++ b/app/Helpers/StorageHelper.php
@@ -29,6 +29,7 @@ class StorageHelper
 
     /**
      * This determines the file types that should be allowed inline and checks their fileinfo extension
+     * to determine that they are safe to display inline.
      *
      * @author <A. Gianotto> [<snipe@snipe.net]>
      * @since v7.0.14
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 1f7e5f0b9a..e3f98bf61a 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -154,103 +154,17 @@
 
                     @can('accessories.files', $accessory)
                         <div class="tab-pane" id="files">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <x-filestable
+                                        filepath="private_uploads/accessories/"
+                                        showfile_routename="show.accessoryfile"
+                                        deletefile_routename="delete/accessoryfile"
+                                        :object="$accessory" />
 
-                            <div class="table table-responsive">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                <table
-                                        data-cookie-id-table="accessoryUploadsTable"
-                                        data-id-table="accessoryUploadsTable"
-                                        id="accessoryUploadsTable"
-                                        data-search="true"
-                                        data-pagination="true"
-                                        data-side-pagination="client"
-                                        data-show-columns="true"
-                                        data-show-export="true"
-                                        data-show-footer="true"
-                                        data-toolbar="#upload-toolbar"
-                                        data-show-refresh="true"
-                                        data-sort-order="asc"
-                                        data-sort-name="name"
-                                        class="table table-striped snipe-table"
-                                        data-export-options='{
-            "fileName": "export-accessories-uploads-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}",
-            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-            }'>
-                                    <thead>
-                                    <tr>
-                                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    @if ($accessory->uploads->count() > 0)
-                                        @foreach ($accessory->uploads as $file)
-                                            <tr>
-                                                <td>
-                                                    <x-icon type="paperclip" class="fa-2x" />
-                                                    <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                                                    <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                                                </td>
-                                                <td>
-                                                    @if ($file->filename)
-                                                        @if ( Helper::checkUploadIsImage($file->get_src('accessories')))
-                                                            <a href="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                                                        @endif
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    {{ $file->filename }}
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}">
-                                                    {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}
-                                                </td>
-
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td style="white-space: nowrap;">
-                                                    @if ($file->filename)
-                                                        <a href="{{ route('show.accessoryfile', [$accessory->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                                            <i class="fas fa-download" aria-hidden="true"></i>
-                                                            <span class="sr-only">{{ trans('general.download') }}</span>
-                                                        </a>
-
-                                                        <a href="{{ route('show.accessoryfile', [$accessory->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                            <x-icon type="external-link" />
-                                                        </a>
-
-                                                    @endif
-                                                </td>
-                                                <td>{{ $file->created_at }}</td>
-                                                <td>
-                                                    <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/accessoryfile', [$accessory->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                                                        <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                                                        <span class="sr-only">{{ trans('general.delete') }}</span>
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                    @else
-                                        <tr>
-                                            <td colspan="8">{{ trans('general.no_results') }}</td>
-                                        </tr>
-                                    @endif
-                                    </tbody>
-                                </table>
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                </div> <!-- /.tab-pane -->
+                        </div> <!-- /.tab-pane -->
                 @endcan
             </div>
         </div>
diff --git a/resources/views/blade/filestable.blade.php b/resources/views/blade/filestable.blade.php
new file mode 100644
index 0000000000..8d258d606d
--- /dev/null
+++ b/resources/views/blade/filestable.blade.php
@@ -0,0 +1,140 @@
+<!-- begin redirect submit options -->
+@props([
+    'filepath',
+    'object',
+    'showfile_routename',
+    'deletefile_routename',
+])
+
+<!-- begin non-ajaxed file listing table -->
+<div class="table-responsive">
+    <table
+            data-cookie-id-table="{{ $object }}UploadsTable"
+            data-id-table="{{ $object }}UploadsTable"
+            id="{{ $object }}UploadsTable"
+            data-search="true"
+            data-pagination="true"
+            data-side-pagination="client"
+            data-show-columns="true"
+            data-show-fullscreen="true"
+            data-show-export="true"
+            data-show-footer="true"
+            data-toolbar="#upload-toolbar"
+            data-show-refresh="true"
+            data-sort-order="asc"
+            data-sort-name="name"
+            class="table table-striped snipe-table"
+            data-export-options='{
+                    "fileName": "export-license-uploads-{{ str_slug($object->name) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
+                    }'>
+
+        <thead>
+        <tr>
+            <th data-visible="false" data-field="id" data-sortable="true">
+                {{trans('general.id')}}
+            </th>
+            <th data-visible="true" data-field="type" data-sortable="true">
+                {{trans('general.file_type')}}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">
+                {{ trans('general.image') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">
+                {{ trans('general.file_name') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">
+                {{ trans('general.filesize') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">
+                {{ trans('general.notes') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">
+                {{ trans('general.download') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">
+                {{ trans('general.created_at') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_by" data-sortable="true">
+                {{ trans('general.created_by') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">
+                {{ trans('table.actions') }}
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+        @foreach ($object->uploads as $file)
+            <tr>
+                <td>
+                    {{ $file->id }}
+                </td>
+                <td data-sort-value="{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}">
+                    @if (Storage::exists($filepath.$file->filename))
+                        <span class="sr-only">{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}</span>
+                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true" data-tooltip="true" data-title="{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}"></i>
+                    @endif
+                </td>
+                <td>
+                    @if (($file->filename) && (Storage::exists($filepath.$file->filename)))
+                        @if (Helper::checkUploadIsImage($file->get_src($object)))
+                            <a href="{{ route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) }}" data-toggle="lightbox" data-type="image">
+                                <img src="{{ route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) }}" class="img-thumbnail" style="max-width: 50px;">
+                            </a>
+                        @else
+                            {{ trans('general.preview_not_available') }}
+                        @endif
+                    @else
+                        <x-icon type="x" class="text-danger" />
+                        {{ trans('general.file_not_found') }}
+                    @endif
+                </td>
+                <td>
+                    {{ $file->filename }}
+                </td>
+                <td data-value="{{ (Storage::exists($filepath.$file->filename)) ? Storage::size($filepath.$file->filename) : '' }}">
+                    {{ (Storage::exists($filepath.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size($filepath.$file->filename)) : '' }}
+                </td>
+
+                <td>
+                    @if ($file->note)
+                        {{ $file->note }}
+                    @endif
+                </td>
+                <td style="white-space: nowrap;">
+                    @if ($file->filename)
+                        @if (Storage::exists($filepath.$file->filename))
+                            <a href="{{ route($showfile_routename, [$object->id, $file->id]) }}" class="btn btn-sm btn-default">
+                                <x-icon type="download" />
+                                <span class="sr-only">
+                                    {{ trans('general.download') }}
+                                </span>
+                            </a>
+
+                            <a href="{{ StorageHelper::allowSafeInline($filepath.$file->filename) ? route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) : '#' }}" class="btn btn-sm btn-default{{ StorageHelper::allowSafeInline($filepath.$file->filename) ? '' : ' disabled' }}" target="_blank">
+                                <x-icon type="external-link" />
+                            </a>
+                        @endif
+                    @endif
+                </td>
+                <td>
+                    {{ $file->created_at }}
+                </td>
+                <td>
+                    {{ $file->created_by }}
+                </td>
+                <td>
+                    <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route($deletefile_routename, [$object->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
+                        <x-icon type="delete" />
+                        <span class="sr-only">{{ trans('general.delete') }}</span>
+                    </a>
+                </td>
+
+
+            </tr>
+        @endforeach
+
+        </tbody>
+    </table>
+</div>
+<!-- end non-ajaxed file listing table -->
\ No newline at end of file
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 287b0b23a8..5bd185bedf 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -140,96 +140,14 @@
 
         @can('components.files', $component)
           <div class="tab-pane" id="files">
-
-            <div class="table-responsive">
-              <table
-                      data-cookie-id-table="componentUploadsTable"
-                      data-id-table="componentUploadsTable"
-                      id="componentUploadsTable"
-                      data-search="true"
-                      data-pagination="true"
-                      data-side-pagination="client"
-                      data-show-columns="true"
-                      data-show-export="true"
-                      data-show-footer="true"
-                      data-toolbar="#upload-toolbar"
-                      data-show-refresh="true"
-                      data-sort-order="asc"
-                      data-sort-name="name"
-                      class="table table-striped snipe-table"
-                      data-export-options='{
-                    "fileName": "export-components-uploads-{{ str_slug($component->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                @if ($component->uploads->count() > 0)
-                  @foreach ($component->uploads as $file)
-                    <tr>
-                      <td>
-                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                        <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          @if ( Helper::checkUploadIsImage($file->get_src('components')))
-                            <a href="{{ route('show.componentfile', ['componentId' => $component->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.componentfile', ['componentId' => $component->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                          @endif
-                        @endif
-                      </td>
-                      <td>
-                        {{ $file->filename }}
-                      </td>
-                      <td data-value="{{ (Storage::exists('private_uploads/components/'.$file->filename) ? Storage::size('private_uploads/components/'.$file->filename) : '') }}">
-                        {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/components/'.$file->filename) ? Storage::size('private_uploads/components/'.$file->filename) : '') }}
-                      </td>
-
-                      <td>
-                        @if ($file->note)
-                          {{ $file->note }}
-                        @endif
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          <nobr><a href="{{ route('show.componentfile', [$component->id, $file->id]) }}" class="btn btn-sm btn-default">
-                            <x-icon type="download" />
-                            <span class="sr-only">{{ trans('general.download') }}</span>
-                          </a>
-
-                          <a href="{{ route('show.componentfile', [$component->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                            <x-icon type="external-link" />
-                          </a>
-                          </nobr>
-                        @endif
-                      </td>
-                      <td>{{ $file->created_at }}</td>
-                      <td>
-                        <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/componentfile', [$component->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                          <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                          <span class="sr-only">{{ trans('general.delete') }}</span>
-                        </a>
-                      </td>
-                    </tr>
-                  @endforeach
-                @else
-                  <tr>
-                    <td colspan="8">{{ trans('general.no_results') }}</td>
-                  </tr>
-                @endif
-                </tbody>
-              </table>
+            <div class="row">
+              <div class="col-md-12">
+                <x-filestable
+                        filepath="private_uploads/components/"
+                        showfile_routename="show.componentfile"
+                        deletefile_routename="delete/componentfile"
+                        :object="$component" />
+              </div>
             </div>
           </div> <!-- /.tab-pane -->
         @endcan
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 88ea19195f..87650ac9eb 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -428,102 +428,18 @@
 
 
           <div class="tab-pane" id="files">
+
             <div class="row">
+              <div class="col-md-12">
+                <x-filestable
+                        filepath="private_uploads/consumables/"
+                        showfile_routename="show.consumablefile"
+                        deletefile_routename="delete/consumablefile"
+                        :object="$consumable" />
 
-              <div class="col-md-12 col-sm-12">
-                <div class="table-responsive">
-
-                    <table
-                            data-cookie-id-table="consumableUploadsTable"
-                            data-id-table="consumableUploadsTable"
-                            id="consumableUploadsTable"
-                            data-search="true"
-                            data-pagination="true"
-                            data-side-pagination="client"
-                            data-show-columns="true"
-                            data-show-export="true"
-                            data-show-footer="true"
-                            data-toolbar="#upload-toolbar"
-                            data-show-refresh="true"
-                            data-sort-order="asc"
-                            data-sort-name="name"
-                            class="table table-striped snipe-table"
-                            data-export-options='{
-                    "fileName": "export-consumables-uploads-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-                      <thead>
-                      <tr>
-                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                      </tr>
-                      </thead>
-                      <tbody>
-                      @if ($consumable->uploads->count() > 0)
-                        @foreach ($consumable->uploads as $file)
-                          <tr>
-                            <td>
-                              <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                              <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                            </td>
-                            <td>
-                              @if ($file->filename)
-                                @if ( Helper::checkUploadIsImage($file->get_src('consumables')))
-                                  <a href="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                                @endif
-                              @endif
-                            </td>
-                            <td>
-                              {{ $file->filename }}
-                            </td>
-                            <td data-value="{{ (Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }}">
-                              {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }}
-                            </td>
-
-                            <td>
-                              @if ($file->note)
-                                {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!}
-                              @endif
-                            </td>
-                            <td>
-                              @if ($file->filename)
-                                <a href="{{ route('show.consumablefile', [$consumable->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                  <i class="fas fa-download" aria-hidden="true"></i>
-                                  <span class="sr-only">{{ trans('general.download') }}</span>
-                                </a>
-
-                                <a href="{{ route('show.consumablefile', [$consumable->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                  <x-icon type="external-link" />
-                                </a>
-                              @endif
-                            </td>
-                            <td>{{ $file->created_at }}</td>
-                            <td>
-                              <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/consumablefile', [$consumable->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                                <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                                <span class="sr-only">{{ trans('general.delete') }}</span>
-                              </a>
-
-                            </td>
-                          </tr>
-                        @endforeach
-                      @else
-                        <tr>
-                          <td colspan="8">{{ trans('general.no_results') }}</td>
-                        </tr>
-                      @endif
-                      </tbody>
-                    </table>
-                </div>
               </div>
-            </div> <!--/ROW-->
+            </div>
+
           </div><!--/FILES-->
 
           <div class="tab-pane" id="history">
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 1e040b7603..f93c26cf8e 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1362,102 +1362,11 @@
                     <div class="tab-pane fade" id="files">
                         <div class="row{{ ($asset->uploads->count() > 0 ) ? '' : ' hidden-print' }}">
                             <div class="col-md-12">
-
-                                @if ($asset->uploads->count() > 0)
-                                    <table
-                                            class="table table-striped snipe-table"
-                                            id="assetFileHistory"
-                                            data-pagination="true"
-                                            data-id-table="assetFileHistory"
-                                            data-search="true"
-                                            data-side-pagination="client"
-                                            data-sortable="true"
-                                            data-show-columns="true"
-                                            data-show-fullscreen="true"
-                                            data-show-refresh="true"
-                                            data-sort-order="desc"
-                                            data-sort-name="created_at"
-                                            data-show-export="true"
-                                            data-export-options='{
-                         "fileName": "export-asset-{{ $asset->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                            data-cookie-id-table="assetFileHistory">
-                                        <thead>
-                                        <tr>
-                                            <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        @foreach ($asset->uploads as $file)
-                                            <tr>
-                                                <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                                <td>
-                                                    @if ( Helper::checkUploadIsImage($file->get_src('assets')))
-                                                        <a href="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
-                                                            <img src="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (Storage::exists('private_uploads/assets/'.$file->filename))
-                                                        {{ $file->filename }}
-                                                    @else
-                                                        <del>{{ $file->filename }}</del>
-                                                    @endif
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }}">
-                                                    {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }}
-                                                </td>
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename)))
-                                                        <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'download'=>'true']) }}" class="btn btn-sm btn-default hidden-print">
-                                                            <x-icon type="download" />
-                                                        </a>
-
-                                                        <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default hidden-print" target="_blank">
-                                                            <x-icon type="external-link" />
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if ($file->created_at)
-                                                        {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @can('update', \App\Models\Asset::class)
-                                                        <a class="btn delete-asset btn-sm btn-danger btn-sm hidden-print" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
-                                                            <x-icon type="delete" />
-                                                        </a>
-                                                    @endcan
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                        </tbody>
-                                    </table>
-
-                                @else
-
-                                    <div class="alert alert-info alert-block hidden-print">
-                                        <x-icon type="info-circle" />
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
-
+                                <x-filestable
+                                        filepath="private_uploads/assets/"
+                                        showfile_routename="show/assetfile"
+                                        deletefile_routename="delete/modelfile"
+                                        :object="$asset" />
                             </div> <!-- /.col-md-12 -->
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane files -->
@@ -1467,101 +1376,11 @@
                         <div class="row{{ (($asset->model) && ($asset->model->uploads->count() > 0)) ? '' : ' hidden-print' }}">
                             <div class="col-md-12">
 
-                                @if (($asset->model) && ($asset->model->uploads->count() > 0))
-                                    <table
-                                            class="table table-striped snipe-table"
-                                            id="assetModelFileHistory"
-                                            data-pagination="true"
-                                            data-id-table="assetModelFileHistory"
-                                            data-search="true"
-                                            data-side-pagination="client"
-                                            data-sortable="true"
-                                            data-show-columns="true"
-                                            data-show-fullscreen="true"
-                                            data-show-refresh="true"
-                                            data-sort-order="desc"
-                                            data-sort-name="created_at"
-                                            data-show-export="true"
-                                            data-export-options='{
-                         "fileName": "export-assetmodel-{{ $asset->model->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                            data-cookie-id-table="assetFileHistory">
-                                        <thead>
-                                        <tr>
-                                            <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        @foreach ($asset->model->uploads as $file)
-                                            <tr>
-                                                <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                                <td>
-                                                    @if ( Helper::checkUploadIsImage($file->get_src('assetmodels')))
-                                                        <a href="{{ route('show/modelfile', ['modelID' => $asset->model->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
-                                                            <img src="{{ route('show/modelfile', ['modelID' => $asset->model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (Storage::exists('private_uploads/assetmodels/'.$file->filename))
-                                                        {{ $file->filename }}
-                                                    @else
-                                                        <del>{{ $file->filename }}</del>
-                                                    @endif
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Storage::size('private_uploads/assetmodels/'.$file->filename) : '' }}">
-                                                    {{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) : '' }}
-                                                </td>
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
-                                                        <a href="{{ route('show/modelfile', [$asset->model->id, $file->id]) }}" class="btn btn-sm btn-default hidden-print">
-                                                            <x-icon type="download" class="hidden-print" />
-                                                        </a>
-
-                                                        <a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default hidden-print" target="_blank">
-                                                            <x-icon type="external-link" class="hidden-print" />
-                                                        </a>
-
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if ($file->created_at)
-                                                        {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @can('update', \App\Models\AssetModel::class)
-                                                        <a class="btn delete-asset btn-sm btn-danger btn-sm hidden-print" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
-                                                            <x-icon type="delete" class="hidden-print"/></i>
-                                                        </a>
-                                                    @endcan
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                        </tbody>
-                                    </table>
-
-                                @else
-
-                                    <div class="alert alert-info alert-block">
-                                        <x-icon type="info-circle" />
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
+                                <x-filestable
+                                        filepath="private_uploads/assetmodels/"
+                                        showfile_routename="show/modelfile"
+                                        deletefile_routename="userfile.destroy"
+                                        :object="$asset->model" />
 
                             </div> <!-- /.col-md-12 -->
                         </div> <!-- /.row -->
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index c20ef87b2d..2de0f9d6e0 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -464,100 +464,13 @@
 
         @can('licenses.files', $license)
         <div class="tab-pane" id="files">
-          <div class="table-responsive">
-            <table
-                data-cookie-id-table="licenseUploadsTable"
-                data-id-table="licenseUploadsTable"
-                id="licenseUploadsTable"
-                data-search="true"
-                data-pagination="true"
-                data-side-pagination="client"
-                data-show-columns="true"
-                data-show-export="true"
-                data-show-footer="true"
-                data-toolbar="#upload-toolbar"
-                data-show-refresh="true"
-                data-sort-order="asc"
-                data-sort-name="name"
-                class="table table-striped snipe-table"
-                data-export-options='{
-                    "fileName": "export-license-uploads-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-            <thead>
-              <tr>
-                <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-              </tr>
-            </thead>
-            <tbody>
-            @if ($license->uploads->count() > 0)
-              @foreach ($license->uploads as $file)
-              <tr>
-                <td>
-                  <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                  <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
 
-                </td>
-                <td>
-                  @if ($file->filename)
-                    @if ((Storage::exists('private_uploads/licenses/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('licenses'))))
-                      <a href="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                    @endif
-                  @endif
-                </td>
-                <td>
-                  @if (Storage::exists('private_uploads/licenses/'.$file->filename))
-                    {{ $file->filename }}
-                  @else
-                    <del>{{ $file->filename }}</del>
-                  @endif
-                </td>
-                <td data-value="{{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Storage::size('private_uploads/licenses/'.$file->filename) : '' }}">
-                  {{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/licenses/'.$file->filename)) : '' }}
-                </td>
+          <x-filestable
+                  filepath="private_uploads/licenses/"
+                  showfile_routename="show.licensefile"
+                  deletefile_routename="delete/licensefile"
+                  :object="$license" />
 
-                <td>
-                  @if ($file->note)
-                    {{ $file->note }}
-                  @endif
-                </td>
-                <td>
-                  @if ($file->filename)
-                    <a href="{{ route('show.licensefile', [$license->id, $file->id]) }}" class="btn btn-sm btn-default">
-                      <x-icon type="download"/>
-                      <span class="sr-only">{{ trans('general.download') }}</span>
-                    </a>
-
-                    <a href="{{ route('show.licensefile', [$license->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                      <x-icon type="external-link" />
-                    </a>
-
-                  @endif
-                </td>
-                <td>{{ $file->created_at }}</td>
-                <td>
-                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                    <x-icon type="delete" />
-                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                  </a>
-                </td>
-              </tr>
-              @endforeach
-            @else
-              <tr>
-              <td colspan="8">{{ trans('general.no_results') }}</td>
-              </tr>
-            @endif
-            </tbody>
-          </table>
-          </div>
         </div> <!-- /.tab-pane -->
         @endcan
 
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 65f9bdd4fe..f26b9babd4 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -107,99 +107,11 @@
                     <div class="row">
                         <div class="col-md-12">
 
-                            @if ($model->uploads->count() > 0)
-                                <table
-                                        class="table table-striped snipe-table"
-                                        id="modelFileHistory"
-                                        data-pagination="true"
-                                        data-id-table="modelFileHistory"
-                                        data-search="true"
-                                        data-side-pagination="client"
-                                        data-sortable="true"
-                                        data-show-columns="true"
-                                        data-show-fullscreen="true"
-                                        data-show-refresh="true"
-                                        data-sort-order="desc"
-                                        data-sort-name="created_at"
-                                        data-show-export="true"
-                                        data-export-options='{
-                         "fileName": "export-asset-{{ $model->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                        data-cookie-id-table="assetFileHistory">
-                                    <thead>
-                                    <tr>
-                                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-
-                                    @foreach ($model->uploads as $file)
-                                        <tr>
-                                            <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                            <td>
-                                                @if ((Storage::exists('private_uploads/assetmodels/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('assetmodels'))))
-                                                    <a href="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' => $file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}">
-                                                        <img src="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                    </a>
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if (Storage::exists('private_uploads/assetmodels/'.$file->filename))
-                                                    {{ $file->filename }}
-                                                @else
-                                                    <del>{{ $file->filename }}</del>
-                                                @endif
-                                            </td>
-                                            <td data-value="{{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Storage::size('private_uploads/assetmodels/'.$file->filename) : '' }}">
-                                                {{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) : '' }}
-                                            </td>
-                                            <td>
-                                                @if ($file->note)
-                                                    {{ $file->note }}
-                                                @endif
-                                            </td>
-                                            <td style="white-space: nowrap">
-                                                @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
-                                                    <a href="{{ route('show/modelfile', [$model->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                                        <i class="fas fa-download" aria-hidden="true"></i>
-                                                    </a>
-
-                                                    <a href="{{ route('show/modelfile', [$model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                        <x-icon type="external-link" />
-                                                    </a>
-
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if ($file->created_at)
-                                                    {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @can('update', \App\Models\AssetModel::class)
-                                                    <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
-                                                @endcan
-                                            </td>
-                                        </tr>
-                                    @endforeach
-                                    </tbody>
-                                </table>
-
-                            @else
-
-                                <div class="alert alert-info alert-block">
-                                    <i class="fas fa-info-circle"></i>
-                                    {{ trans('general.no_results') }}
-                                </div>
-                            @endif
+                            <x-filestable
+                                    filepath="private_uploads/assetmodels/"
+                                    showfile_routename="show/modelfile"
+                                    deletefile_routename="delete/modelfile"
+                                    :object="$model" />
 
                         </div> <!-- /.col-md-12 -->
                     </div> <!-- /.row -->
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 7821b87402..495d0a2ca6 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -971,105 +971,11 @@
           <div class="row">
 
             <div class="col-md-12 col-sm-12">
-              <div class="table-responsive">
-                  <table
-                          data-cookie-id-table="userUploadsTable"
-                          data-id-table="userUploadsTable"
-                          id="userUploadsTable"
-                          data-search="true"
-                          data-pagination="true"
-                          data-side-pagination="client"
-                          data-show-columns="true"
-                          data-show-fullscreen="true"
-                          data-show-export="true"
-                          data-show-footer="true"
-                          data-toolbar="#upload-toolbar"
-                          data-show-refresh="true"
-                          data-sort-order="asc"
-                          data-sort-name="name"
-                          class="table table-striped snipe-table"
-                          data-export-options='{
-                    "fileName": "export-license-uploads-{{ str_slug($user->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-
-                  <thead>
-                    <tr>
-                        <th data-visible="true" data-field="type" data-sortable="true">{{trans('general.file_type')}}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    @foreach ($user->uploads as $file)
-                        <tr>
-                            <td>
-                                @if (Storage::exists('private_uploads/users/'.$file->filename))
-                                    <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true" data-tooltip="true" data-title="{{ pathinfo('private_uploads/users/'.$file->filename, PATHINFO_EXTENSION) }}"></i>
-                                    <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-                                @endif
-                            </td>
-                            <td>
-                                @if (($file->filename) && (Storage::exists('private_uploads/users/'.$file->filename)))
-                                   @if (Helper::checkUploadIsImage($file->get_src('users')))
-                                        <a href="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" data-toggle="lightbox" data-type="image">
-                                            <img src="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" class="img-thumbnail" style="max-width: 50px;">
-                                        </a>
-                                    @else
-                                        {{ trans('general.preview_not_available') }}
-                                    @endif
-                                @else
-                                    <x-icon type="x" class="text-danger" />
-                                        {{ trans('general.file_not_found') }}
-                                @endif
-                            </td>
-                            <td>
-                                {{ $file->filename }}
-                            </td>
-                            <td data-value="{{ (Storage::exists('private_uploads/users/'.$file->filename)) ? Storage::size('private_uploads/users/'.$file->filename) : '' }}">
-                                {{ (Storage::exists('private_uploads/users/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) : '' }}
-                            </td>
-
-                            <td>
-                                @if ($file->note)
-                                    {{ $file->note }}
-                                @endif
-                            </td>
-                            <td>
-                                @if ($file->filename)
-                                    @if (Storage::exists('private_uploads/users/'.$file->filename))
-                                        <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                            <x-icon type="download" />
-                                            <span class="sr-only">{{ trans('general.download') }}</span>
-                                        </a>
-
-                                        <a href="{{ StorageHelper::allowSafeInline('private_uploads/users/'.$file->filename) ? route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) : '#' }}" class="btn btn-sm btn-default{{ StorageHelper::allowSafeInline('private_uploads/users/'.$file->filename) ? '' : ' disabled' }}" target="_blank">
-                                            <x-icon type="external-link" />
-                                        </a>
-                                    @endif
-                                @endif
-                            </td>
-                            <td>{{ $file->created_at }}</td>
-
-                            <td>
-                                <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
-                                    <x-icon type="delete" />
-                                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                                </a>
-                            </td>
-
-
-                        </tr>
-                    @endforeach
-
-                  </tbody>
-                </table>
-              </div>
+                <x-filestable
+                        filepath="private_uploads/users/"
+                        showfile_routename="show/userfile"
+                        deletefile_routename="userfile.destroy"
+                        :object="$user" />
             </div>
           </div> <!--/ROW-->
         </div><!--/FILES-->