From c752e8fc91d43bbff4cf4b899814ca66264ecba0 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 2 Oct 2019 11:44:28 +0300
Subject: [PATCH] job front end fixes

---
 .../Espo/Resources/layouts/Job/detail.json    | 28 +++++++++++++++++++
 .../Resources/metadata/entityDefs/Job.json    |  2 +-
 client/src/views/admin/job/fields/name.js     |  5 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 application/Espo/Resources/layouts/Job/detail.json

diff --git a/application/Espo/Resources/layouts/Job/detail.json b/application/Espo/Resources/layouts/Job/detail.json
new file mode 100644
index 0000000000..667eea760a
--- /dev/null
+++ b/application/Espo/Resources/layouts/Job/detail.json
@@ -0,0 +1,28 @@
+[
+    {
+        "label":"",
+        "rows":[
+            [{"name":"name"}, {"name": "status"}],
+            [{"name":"queue"}, {"name":"number"}]
+        ]
+    },
+    {
+        "label":"",
+        "rows":[
+            [{"name":"executeTime"}, {"name": "createdAt"}],
+            [{"name":"startedAt"}, {"name": "modifiedAt"}],
+            [{"name":"executedAt"}, false],
+            [{"name":"attempts"}, false],
+            [{"name":"failedAttempts"}, false]
+        ]
+    },
+    {
+        "label":"",
+        "rows":[
+            [{"name":"scheduledJob"}, {"name":"targetType"}],
+            [{"name":"serviceName"}, {"name":"targetId"}],
+            [{"name":"methodName"}, {"name":"job"}],
+            [{"name": "data", "fullWidth": true}]
+        ]
+    }
+]
diff --git a/application/Espo/Resources/metadata/entityDefs/Job.json b/application/Espo/Resources/metadata/entityDefs/Job.json
index 69bd930683..71d45b0bf2 100644
--- a/application/Espo/Resources/metadata/entityDefs/Job.json
+++ b/application/Espo/Resources/metadata/entityDefs/Job.json
@@ -104,7 +104,7 @@
     "collection": {
         "orderBy": "number",
         "order": "desc",
-        "textFilterFields": ["name", "methodName", "serviceName", "scheduledJob"]
+        "textFilterFields": ["id", "name", "methodName", "serviceName", "scheduledJob"]
     },
     "indexes": {
         "executeTime": {
diff --git a/client/src/views/admin/job/fields/name.js b/client/src/views/admin/job/fields/name.js
index c3b073806e..54aca96003 100644
--- a/client/src/views/admin/job/fields/name.js
+++ b/client/src/views/admin/job/fields/name.js
@@ -26,12 +26,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep) {
+define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep) {
 
     return Dep.extend({
 
         getValueForDisplay: function () {
-            if (this.mode == 'list' || this.mode == 'detail') {
+            if (this.mode == 'list' || this.mode == 'detail' || this.mode === 'listLink') {
                 if (!this.model.get('name')) {
                     return this.model.get('serviceName') + ': ' + this.model.get('methodName');
                 } else {
@@ -42,4 +42,3 @@ Espo.define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep
 
     });
 });
-