From 3a76807a2b521bffe2a4389c8a529469544f2bf2 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 24 Jun 2024 13:12:29 +0300
Subject: [PATCH] parent field in activities and other dashlets

---
 .../Crm/Resources/metadata/dashlets/Calls.json   |  3 +++
 .../Crm/Resources/metadata/dashlets/Cases.json   |  3 +++
 .../Resources/metadata/dashlets/Meetings.json    |  3 +++
 .../Crm/Resources/metadata/dashlets/Tasks.json   |  3 +++
 .../Crm/Tools/Activities/UpcomingService.php     |  8 ++++++++
 .../modules/crm/src/views/dashlets/activities.js | 16 ++++++++++++++--
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
index f575d6879d..2075693616 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
@@ -38,6 +38,9 @@
                     [
                         {
                             "name": "dateStart"
+                        },
+                        {
+                            "name": "parent"
                         }
                     ]
                 ]
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
index e84e3afa1b..6b36f07393 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
@@ -47,6 +47,9 @@
                         },
                         {
                             "name": "priority"
+                        },
+                        {
+                            "name": "account"
                         }
                     ]
                 ]
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
index 39a2d526d5..0e60a89f66 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
@@ -38,6 +38,9 @@
                     [
                         {
                             "name": "dateStart"
+                        },
+                        {
+                            "name": "parent"
                         }
                     ]
                 ]
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
index 9812c25192..c038c9cde1 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
@@ -40,6 +40,9 @@
                         },
                         {
                             "name": "dateEnd"
+                        },
+                        {
+                            "name": "parent"
                         }
                     ]
                 ]
diff --git a/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php b/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php
index 0b4aaa8766..788ca6c49f 100644
--- a/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php
+++ b/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php
@@ -33,6 +33,7 @@ use Espo\Core\Acl;
 use Espo\Core\Exceptions\BadRequest;
 use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\ORM\Entity as CoreEntity;
 use Espo\Core\Select\Bool\Filters\OnlyMy;
 use Espo\Core\Utils\Config;
 use Espo\Core\Utils\DateTime as DateTimeUtil;
@@ -175,6 +176,13 @@ class UpcomingService
                 $entity->set('id', $itemId);
             }
 
+            if (
+                $entity instanceof CoreEntity &&
+                $entity->hasLinkParentField('parent')
+            ) {
+                $entity->loadParentNameField('parent');
+            }
+
             $collection->append($entity);
         }
 
diff --git a/client/modules/crm/src/views/dashlets/activities.js b/client/modules/crm/src/views/dashlets/activities.js
index a40a30b74a..912155ee0b 100644
--- a/client/modules/crm/src/views/dashlets/activities.js
+++ b/client/modules/crm/src/views/dashlets/activities.js
@@ -54,7 +54,13 @@ class ActivitiesDashletView extends BaseDashletView {
                 },
             ],
             [
-                {name: 'dateStart'},
+                {
+                    name: 'dateStart',
+                    soft: true
+                },
+                {
+                    name: 'parent',
+                },
             ],
         ],
     }
@@ -76,11 +82,17 @@ class ActivitiesDashletView extends BaseDashletView {
                     },
                 ],
                 [
-                    {name: 'dateEnd'},
+                    {
+                        name: 'dateEnd',
+                        soft: true
+                    },
                     {
                         name: 'priority',
                         view: 'crm:views/task/fields/priority-for-dashlet',
                     },
+                    {
+                        name: 'parent',
+                    },
                 ],
             ]
         }