updated advanced pack to 3.12.0:

Reports: Non-aggregated columns in Grid report export. Normalized table mode for 2-dimensional Grid reports. Ability to create internal reports via the UI. Ability to show/hide and resize columns in the list report result view.
2026-02-07 16:09:20 +01:00
parent 26db904407
commit f95246f99f
384 changed files with 6184 additions and 3643 deletions
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/CreateWorkflows.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/CreateWorkflows.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/Prepare.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/Prepare.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/RemoveRoundRobin.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/RemoveRoundRobin.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/RemoveWorkflows.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnFlowchart/RemoveWorkflows.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RejectFlowNodes.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RejectFlowNodes.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RemoveRelated.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RemoveRelated.php
@@ -0,0 +1,55 @@
+<?php
+/***********************************************************************************
+ * The contents of this file are subject to the Extension License Agreement
+ * ("Agreement") which can be viewed at
+ * https://www.espocrm.com/extension-license-agreement/.
+ * By copying, installing downloading, or using this file, You have unconditionally
+ * agreed to the terms and conditions of the Agreement, and You may not use this
+ * file except in compliance with the Agreement. Under the terms of the Agreement,
+ * You shall not license, sublicense, sell, resell, rent, lease, lend, distribute,
+ * redistribute, market, publish, commercialize, or otherwise transfer rights or
+ * usage to the software or any modified version or derivative work of the software
+ * created by or for you.
+ *
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
+ *
+ * License ID: 19bc86a68a7bb01f458cb391d43a9212
+ ************************************************************************************/
+
+namespace Espo\Modules\Advanced\Hooks\BpmnProcess;
+
+use Espo\Core\Field\DateTime;
+use Espo\Core\Hook\Hook\AfterRemove;
+use Espo\Modules\Advanced\Entities\BpmnFlowNode;
+use Espo\Modules\Advanced\Entities\BpmnProcess;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
+use Espo\ORM\Query\UpdateBuilder;
+use Espo\ORM\Repository\Option\RemoveOptions;
+
+/**
+ * @implements AfterRemove<BpmnProcess>
+ */
+class RemoveRelated implements AfterRemove
+{
+    public function __construct(
+        private EntityManager $entityManager,
+    ) {}
+
+    public function afterRemove(Entity $entity, RemoveOptions $options): void
+    {
+        $query = UpdateBuilder::create()
+            ->in(BpmnFlowNode::ENTITY_TYPE)
+            ->where([
+                BpmnFlowNode::ATTR_PROCESS_ID => $entity->getId(),
+            ])
+            ->set([
+                Attribute::DELETED => true,
+                'modifiedAt' => DateTime::createNow()->toString(),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+}
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RootProcess.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/RootProcess.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/StartProcess.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/StartProcess.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/StopProcess.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/StopProcess.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/SubProcesses.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnProcess/SubProcesses.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnUserTask/Prepare.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnUserTask/Prepare.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/BpmnUserTask/Resolve.php
+++ b/custom/Espo/Modules/Advanced/Hooks/BpmnUserTask/Resolve.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/CampaignTrackingUrl/Signal.php
+++ b/custom/Espo/Modules/Advanced/Hooks/CampaignTrackingUrl/Signal.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Common/Signal.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Common/Signal.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Common/UpdateDeferredFlowNodes.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Common/UpdateDeferredFlowNodes.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Common/Workflow.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Common/Workflow.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Report/Prepare.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Report/Prepare.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
@@ -19,11 +19,16 @@
 namespace Espo\Modules\Advanced\Hooks\Report;

 use Espo\Modules\Advanced\Entities\Report;
-use Espo\Modules\Advanced\Entities\Report as ReportEntity;
+use Espo\Modules\Advanced\Tools\Report\GridType\Data;
+use Espo\Modules\Advanced\Tools\Report\Internal\InternalReportHelper;
 use Espo\ORM\Entity;

 class Prepare
 {
+    public function __construct(
+        private InternalReportHelper $internalReportHelper,
+    ) {}
+
    /**
     * @param Report $entity
     */
@@ -40,11 +45,35 @@ class Prepare
        }

        if (
-            $entity->get('type') === ReportEntity::TYPE_GRID &&
+            $entity->getType() === Report::TYPE_GRID &&
            ($entity->has('chartOneColumns') || $entity->has('chartOneY2Columns'))
        ) {
            $this->handleChartDataList($entity);
        }
+
+        if ($entity->getInternalClassName()) {
+            $entity->set('isInternal', true);
+
+            if ($entity->isAttributeChanged('internalClassName')) {
+                $this->internalReportHelper->populateFields($entity);
+            }
+        }
+
+        if (
+            $entity->getType() !== Report::TYPE_GRID ||
+            count($entity->getGroupBy()) < 2
+        ) {
+            $entity->setTableMode(Data::TABLE_MODE_REGULAR);
+        }
+
+        if (
+            $entity->getType() === Report::TYPE_GRID &&
+            count($entity->getGroupBy()) >= 2 &&
+            $entity->getTableMode() === Data::TABLE_MODE_NORMALIZED
+        ) {
+            $entity->setChartType(null);
+        }
+
    }

    private function handleChartDataList(Report $entity): void
@@ -87,7 +116,7 @@ class Prepare
            }
        }

-        $chartType = $entity->get('chartType');
+        $chartType = $entity->getChartType();

        if (!in_array($chartType, ['BarVertical', 'BarHorizontal', 'Line'])) {
            $newY2 = null;
--- a/custom/Espo/Modules/Advanced/Hooks/TargetList/Signal.php
+++ b/custom/Espo/Modules/Advanced/Hooks/TargetList/Signal.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Workflow/ReloadWorkflows.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Workflow/ReloadWorkflows.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Workflow/RemoveJobs.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Workflow/RemoveJobs.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/
--- a/custom/Espo/Modules/Advanced/Hooks/Workflow/RemoveRoundRobin.php
+++ b/custom/Espo/Modules/Advanced/Hooks/Workflow/RemoveRoundRobin.php
@@ -11,7 +11,7 @@
 * usage to the software or any modified version or derivative work of the software
 * created by or for you.
 *
- * Copyright (C) 2015-2025 EspoCRM, Inc.
+ * Copyright (C) 2015-2026 EspoCRM, Inc.
 *
 * License ID: 19bc86a68a7bb01f458cb391d43a9212
 ************************************************************************************/