From 09211d96418c87c65a904f2c9c7bde004f2d1584 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Tue, 24 Mar 2020 10:37:24 +0300
Subject: [PATCH] #590 Photo upload in profile needs to simpler

---
 .../resources/assets/css/profile.css          |  5 -----
 .../Profile/Profile/ProfileFormHandler.php    |  2 ++
 .../resources/less/input.less                 |  4 ++++
 .../resources/less/upload.less                |  5 +++++
 .../resources/views/upload/index.twig         |  2 +-
 .../src/Table/UploadTableBuilder.php          | 22 -------------------
 .../src/Table/ValueTableBuilder.php           | 22 -------------------
 7 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile.css b/addons/default/visiosoft/profile-module/resources/assets/css/profile.css
index 367582e6a..9ccc05938 100644
--- a/addons/default/visiosoft/profile-module/resources/assets/css/profile.css
+++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile.css
@@ -2,9 +2,4 @@
     background-color: #343a40 !important;
     border-color: #343a40 #343a40 #343a40;
     color: white!important;
-}
-
-/* Hide profile upload table */
-.selected.file-rows-table table td:first-child ~ td {
-    display: none;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
index 412ad244d..c6a4bc663 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -26,6 +26,8 @@ class ProfileFormHandler
 
         if ($builder->getPostValue('file') != null) {
             $parameters['file_id'] = $builder->getPostValue('file');
+        } elseif (empty($builder->getPostValue('file'))) {
+            $parameters['file_id'] = null;
         }
 
         $userModel->newQuery()->where('id', Auth::id())->update($parameters);
diff --git a/addons/default/visiosoft/singlefile-field_type/resources/less/input.less b/addons/default/visiosoft/singlefile-field_type/resources/less/input.less
index 9436d9322..a0e0ecf5a 100644
--- a/addons/default/visiosoft/singlefile-field_type/resources/less/input.less
+++ b/addons/default/visiosoft/singlefile-field_type/resources/less/input.less
@@ -5,6 +5,10 @@
         table {
             tr {
                 td {
+                    a, a:hover {
+                        color: #fff;
+                    }
+
                     padding: 9px 0;
                     border-top: none;
                     border-bottom: none;
diff --git a/addons/default/visiosoft/singlefile-field_type/resources/less/upload.less b/addons/default/visiosoft/singlefile-field_type/resources/less/upload.less
index 125e4e785..97ba8b167 100644
--- a/addons/default/visiosoft/singlefile-field_type/resources/less/upload.less
+++ b/addons/default/visiosoft/singlefile-field_type/resources/less/upload.less
@@ -33,6 +33,7 @@
 
         progress {
             margin-bottom: 0.25em;
+            width: 100%;
         }
 
         .progress-upload {
@@ -48,3 +49,7 @@
         }
     }
 }
+
+.btn-success {
+    color: #fff !important;
+}
diff --git a/addons/default/visiosoft/singlefile-field_type/resources/views/upload/index.twig b/addons/default/visiosoft/singlefile-field_type/resources/views/upload/index.twig
index 7b59abd98..6fc30839b 100644
--- a/addons/default/visiosoft/singlefile-field_type/resources/views/upload/index.twig
+++ b/addons/default/visiosoft/singlefile-field_type/resources/views/upload/index.twig
@@ -17,7 +17,7 @@
     {% include "visiosoft.field_type.singlefile::upload/partials/body" %}
     {% include "visiosoft.field_type.singlefile::upload/partials/template" %}
 
-    <div class="uploaded">
+    <div class="uploaded px-3">
         {{ table.content|raw }}
     </div>
 
diff --git a/addons/default/visiosoft/singlefile-field_type/src/Table/UploadTableBuilder.php b/addons/default/visiosoft/singlefile-field_type/src/Table/UploadTableBuilder.php
index 5d5c5f24c..5648f608d 100644
--- a/addons/default/visiosoft/singlefile-field_type/src/Table/UploadTableBuilder.php
+++ b/addons/default/visiosoft/singlefile-field_type/src/Table/UploadTableBuilder.php
@@ -51,28 +51,6 @@ class UploadTableBuilder extends TableBuilder
         'entry.preview' => [
             'heading' => 'anomaly.module.files::field.preview.name',
         ],
-        'name'          => [
-            'sort_column' => 'name',
-            'wrapper'     => '
-                    <strong>{value.file}</strong>
-                    <br>
-                    <small class="text-muted">{value.disk}://{value.folder}/{value.file}</small>
-                    <br>
-                    <span>{value.size} {value.keywords}</span>',
-            'value'       => [
-                'file'     => 'entry.name',
-                'folder'   => 'entry.folder.slug',
-                'keywords' => 'entry.keywords.labels|join',
-                'disk'     => 'entry.folder.disk.slug',
-                'size'     => 'entry.size_label',
-            ],
-        ],
-        'size'          => [
-            'sort_column' => 'size',
-            'value'       => 'entry.readable_size',
-        ],
-        'mime_type',
-        'folder',
     ];
 
     /**
diff --git a/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php
index 3705294b8..d9e5a4698 100644
--- a/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php
+++ b/addons/default/visiosoft/singlefile-field_type/src/Table/ValueTableBuilder.php
@@ -37,28 +37,6 @@ class ValueTableBuilder extends TableBuilder
         'entry.preview' => [
             'heading' => 'anomaly.module.files::field.preview.name',
         ],
-        'name'          => [
-            'sort_column' => 'name',
-            'wrapper'     => '
-                    <strong>{value.file}</strong>
-                    <br>
-                    <small class="text-muted">{value.disk}://{value.folder}/{value.file}</small>
-                    <br>
-                    <span>{value.size} {value.keywords}</span>',
-            'value'       => [
-                'file'     => 'entry.name',
-                'folder'   => 'entry.folder.slug',
-                'keywords' => 'entry.keywords.labels|join',
-                'disk'     => 'entry.folder.disk.slug',
-                'size'     => 'entry.size_label',
-            ],
-        ],
-        'size'          => [
-            'sort_column' => 'size',
-            'value'       => 'entry.readable_size',
-        ],
-        'mime_type',
-        'folder',
     ];
 
     /**