From d0c8be5697afb24982fc56d420de327a9da0f630 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 11 May 2023 12:07:14 +0200
Subject: [PATCH] refs #5517, #5667 Fix crudModel status, log fixes

---
 front/core/components/crud-model/crud-model.js | 6 +++---
 front/core/components/crud-model/index.spec.js | 2 +-
 front/core/components/data-viewer/index.js     | 5 ++---
 front/salix/components/log/index.html          | 9 ++++++---
 front/salix/components/log/style.scss          | 4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/front/core/components/crud-model/crud-model.js b/front/core/components/crud-model/crud-model.js
index 495a7d2b03..421a79f9b0 100644
--- a/front/core/components/crud-model/crud-model.js
+++ b/front/core/components/crud-model/crud-model.js
@@ -139,7 +139,7 @@ export default class CrudModel extends ModelProxy {
             filter.limit = this.page * this.limit;
         }
 
-        return this.sendRequest(filter, append, true);
+        return this.sendRequest(filter, append);
     }
 
     clear() {
@@ -231,12 +231,12 @@ export default class CrudModel extends ModelProxy {
         return params;
     }
 
-    sendRequest(filter, append, loadMore) {
+    sendRequest(filter, append) {
         this.cancelRequest();
         this.canceler = this.$q.defer();
         this.isPaging = append;
 
-        if (!loadMore)
+        if (!append && this.status != 'ready')
             this.status = 'loading';
 
         let params = Object.assign(
diff --git a/front/core/components/crud-model/index.spec.js b/front/core/components/crud-model/index.spec.js
index e424760987..7eab80405c 100644
--- a/front/core/components/crud-model/index.spec.js
+++ b/front/core/components/crud-model/index.spec.js
@@ -150,7 +150,7 @@ describe('Component vnCrudModel', () => {
 
             controller.loadMore(true);
 
-            expect(controller.sendRequest).toHaveBeenCalledWith({'skip': 2}, true, true);
+            expect(controller.sendRequest).toHaveBeenCalledWith({'skip': 2}, true);
         });
     });
 
diff --git a/front/core/components/data-viewer/index.js b/front/core/components/data-viewer/index.js
index 8d0d944022..b480997daf 100644
--- a/front/core/components/data-viewer/index.js
+++ b/front/core/components/data-viewer/index.js
@@ -7,11 +7,10 @@ export default class DataViewer {
     }
 
     get status() {
-        if (this.model)
-            return this.model.status;
-
         if (this.isLoading)
             return 'loading';
+        if (this.model)
+            return this.model.status;
         if (!this.data)
             return 'clear';
         if (this.data.length)
diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index b7697a1fdc..c6b1ade2af 100644
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@@ -14,9 +14,12 @@
     order="changedModel"
     auto-load="true">
 </vn-crud-model>
-<vn-data-viewer model="model" class="vn-w-md vn-px-sm">
+<vn-data-viewer
+    model="model"
+    is-loading="model.isLoading"
+    class="vn-w-md vn-px-sm">
     <div class="change vn-mb-sm" ng-repeat="log in $ctrl.logs">
-        <div class="user-wrapper">
+        <div class="left">
             <vn-avatar class="vn-mt-xs"
                 ng-class="::{system: !log.user}"
                 val="{{::log.user ? log.user.nickname : 'System'}}"
@@ -33,7 +36,7 @@
             <div class="header vn-mb-sm">
                 <div
                     class="date text-secondary text-caption"
-                    title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}">
+                    title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm:ss'}}">
                     {{::$ctrl.relativeDate(log.creationDate)}}
                 </div>
                 <span class="chip" ng-class="::$ctrl.actionsClass[log.action]" translate>
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index b78dc38241..381b99039e 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -4,7 +4,7 @@ vn-log {
     .change {
         display: flex;
 
-        & > .user-wrapper {
+        & > .left {
             position: relative;
             padding-right: 10px;
 
@@ -34,7 +34,7 @@ vn-log {
                 bottom: -8px;
             }
         }
-        &:last-child > .user-wrapper > .line {
+        &:last-child > .left > .line {
             display: none;
         }
         .detail {