From c5e8cf06d8d6597f3ac020743488ae61a2bf0b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= <sedat.ozturk@sozsoft.com>
Date: Tue, 6 Jan 2026 20:59:47 +0300
Subject: [PATCH] Devexpress 25.1.7

---
 .../Seeds/MenusData.json                       |  4 ++--
 .../Erp.Platform.HttpApi.Host.csproj           | 10 ++--------
 ui/package-lock.json                           | 18 +++++++++---------
 ui/package.json                                | 10 +++++-----
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json
index 3bbb8f07..05904fa9 100644
--- a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json
+++ b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json
@@ -457,14 +457,14 @@
         },
         {
             "key": "admin.devexpressReportView",
-            "path": "/admin/reports/reportviewer",
+            "path": "/admin/reports/reportviewer/:id",
             "componentPath": "@/views/report/DevexpressReportViewer",
             "routeType": "protected",
             "authority": []
         },
         {
             "key": "admin.devexpressReportDesigner",
-            "path": "/admin/reports/reportdesigner",
+            "path": "/admin/reports/reportdesigner/:id",
             "componentPath": "@/views/report/DevexpressReportDesigner",
             "routeType": "protected",
             "authority": []
diff --git a/api/src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj b/api/src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj
index 7c15982e..9e6a8038 100644
--- a/api/src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj
+++ b/api/src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DevExpress.AspNetCore.Reporting" Version="25.2.3" />
-    <PackageReference Include="DevExpress.Drawing.Skia" Version="25.2.3" />
+    <PackageReference Include="DevExpress.AspNetCore.Reporting" Version="25.1.7" />
+    <PackageReference Include="DevExpress.Drawing.Skia" Version="25.1.7" />
     <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="9.0.2" />
     <PackageReference Include="Volo.Abp.Autofac" Version="9.0.2" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="9.0.2" />
@@ -44,11 +44,5 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="PredefinedReports\TestReport.cs">
-      <SubType>XtraReport</SubType>
-    </Compile>
-  </ItemGroup>
-
 </Project>
 
diff --git a/ui/package-lock.json b/ui/package-lock.json
index fb300f97..7127d08a 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -29,17 +29,17 @@
         "axios": "^1.7.9",
         "classnames": "^2.5.1",
         "dayjs": "^1.11.13",
-        "devexpress-reporting-react": "25.1.7",
-        "devextreme": "25.1.7",
-        "devextreme-dist": "25.1.7",
-        "devextreme-react": "25.1.7",
+        "devexpress-reporting-react": "^25.1.7",
+        "devextreme": "^25.1.7",
+        "devextreme-dist": "^25.1.7",
+        "devextreme-react": "^25.1.7",
         "easy-peasy": "^6.0.5",
         "emoji-picker-react": "^4.14.1",
         "exceljs": "^4.4.0",
         "file-saver": "^2.0.2",
         "formik": "^2.4.6",
         "framer-motion": "^11.15.0",
-        "jspdf": "^3.0.1",
+        "jspdf": "^4.0.0",
         "jwt-decode": "^4.0.0",
         "lodash": "^4.17.21",
         "react": "^18.3.1",
@@ -8890,12 +8890,12 @@
       }
     },
     "node_modules/jspdf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-3.0.2.tgz",
-      "integrity": "sha512-G0fQDJ5fAm6UW78HG6lNXyq09l0PrA1rpNY5i+ly17Zb1fMMFSmS+3lw4cnrAPGyouv2Y0ylujbY2Ieq3DSlKA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.0.0.tgz",
+      "integrity": "sha512-w12U97Z6edKd2tXDn3LzTLg7C7QLJlx0BPfM3ecjK2BckUl9/81vZ+r5gK4/3KQdhAcEZhENUxRhtgYBj75MqQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.26.9",
+        "@babel/runtime": "^7.28.4",
         "fast-png": "^6.2.0",
         "fflate": "^0.8.1"
       },
diff --git a/ui/package.json b/ui/package.json
index 44e9dc2a..cfd4cd1d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -37,17 +37,17 @@
     "axios": "^1.7.9",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.13",
-    "devextreme": "25.1.7",
-    "devextreme-dist": "25.1.7",
-    "devextreme-react": "25.1.7",
-    "devexpress-reporting-react": "25.1.7",
+    "devexpress-reporting-react": "^25.1.7",
+    "devextreme": "^25.1.7",
+    "devextreme-dist": "^25.1.7",
+    "devextreme-react": "^25.1.7",
     "easy-peasy": "^6.0.5",
     "emoji-picker-react": "^4.14.1",
     "exceljs": "^4.4.0",
     "file-saver": "^2.0.2",
     "formik": "^2.4.6",
     "framer-motion": "^11.15.0",
-    "jspdf": "^3.0.1",
+    "jspdf": "^4.0.0",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
     "react": "^18.3.1",