From eaf07447a0cba3f57c8908ad703ae6effe663ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Fri, 15 Aug 2025 16:42:27 +0300 Subject: [PATCH] Report Category Entity ve Seeder --- .../Seeds/ListFormsSeeder.cs | 44 +++---- .../Seeds/SeederData.json | 111 +++++++++++++++--- .../PlatformConsts.cs | 2 +- ui/dev-dist/sw.js | 2 +- ui/src/views/admin/chart/ChartEdit.tsx | 5 +- ui/src/views/admin/listForm/edit/FormEdit.tsx | 5 +- 6 files changed, 127 insertions(+), 42 deletions(-) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs index 33314964..0cfd2a18 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs @@ -13124,12 +13124,12 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { - C = AppCodes.Reports.Default + ".Create", - R = AppCodes.Reports.Default, - U = AppCodes.Reports.Default + ".Update", - D = AppCodes.Reports.Default + ".Delete", - E = AppCodes.Reports.Default + ".Export", - I = AppCodes.Reports.Default + ".Import" + C = AppCodes.Reports.Categories + ".Create", + R = AppCodes.Reports.Categories, + U = AppCodes.Reports.Categories + ".Update", + D = AppCodes.Reports.Categories + ".Delete", + E = AppCodes.Reports.Categories + ".Export", + I = AppCodes.Reports.Categories + ".Import" }), PagerOptionJson = JsonSerializer.Serialize(new GridPagerOptionDto { @@ -13186,7 +13186,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency FieldName = "Id", Width = 100, ListOrderNo = 1, - Visible = true, + Visible = false, IsActive = true, IsDeleted = false, ValidationRuleJson = JsonSerializer.Serialize(new[] @@ -13195,9 +13195,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { - C = AppCodes.Reports.Default + ".Create", - R = AppCodes.Reports.Default, - U = AppCodes.Reports.Default + ".Update", + C = AppCodes.Reports.Categories + ".Create", + R = AppCodes.Reports.Categories, + U = AppCodes.Reports.Categories + ".Update", E = true, Deny = false }) @@ -13208,7 +13208,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 300, + Width = 200, ListOrderNo = 2, Visible = true, IsActive = true, @@ -13220,9 +13220,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { - C = AppCodes.Reports.Default + ".Create", - R = AppCodes.Reports.Default, - U = AppCodes.Reports.Default + ".Update", + C = AppCodes.Reports.Categories + ".Create", + R = AppCodes.Reports.Categories, + U = AppCodes.Reports.Categories + ".Update", E = true, Deny = false }) @@ -13233,7 +13233,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", - Width = 100, + Width = 500, ListOrderNo = 3, Visible = true, IsActive = true, @@ -13241,9 +13241,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency AllowSearch = true, PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { - C = AppCodes.Reports.Default + ".Create", - R = AppCodes.Reports.Default, - U = AppCodes.Reports.Default + ".Update", + C = AppCodes.Reports.Categories + ".Create", + R = AppCodes.Reports.Categories, + U = AppCodes.Reports.Categories + ".Update", E = true, Deny = false }) @@ -13254,7 +13254,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Icon", - Width = 100, + Width = 200, ListOrderNo = 4, Visible = true, IsActive = true, @@ -13262,9 +13262,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency AllowSearch = true, PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { - C = AppCodes.Reports.Default + ".Create", - R = AppCodes.Reports.Default, - U = AppCodes.Reports.Default + ".Update", + C = AppCodes.Reports.Categories + ".Create", + R = AppCodes.Reports.Categories, + U = AppCodes.Reports.Categories + ".Update", E = true, Deny = false }) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json index 74ce1870..bbcead10 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json @@ -1264,9 +1264,21 @@ { "resourceName": "Platform", "key": "App.Reports", + "en": "Reports", + "tr": "Raporlar" + }, + { + "resourceName": "Platform", + "key": "App.Reports.Management", "en": "Report Management", "tr": "Rapor Yönetimi" }, + { + "resourceName": "Platform", + "key": "App.Reports.Categories", + "en": "Report Categories", + "tr": "Rapor Kategorileri" + }, { "resourceName": "Platform", "key": "App.Menus.Menu", @@ -10089,16 +10101,38 @@ "RequiredPermissionName": "App.DeveloperKit", "IsDisabled": false }, + { "ParentCode": "App.Saas", "Code": "App.Reports", "DisplayName": "App.Reports", "Order": 14, - "Url": "/admin/reports", + "Url": null, "Icon": "FcDocument", - "RequiredPermissionName": "App.Reports", + "RequiredPermissionName": null, "IsDisabled": false }, + { + "ParentCode": "App.Reports", + "Code": "App.Reports.Categories", + "DisplayName": "App.Reports.Categories", + "Order": 1, + "Url": "/admin/list/list-reportcategory", + "Icon": "FcProcess", + "RequiredPermissionName": "App.Reports.Categories", + "IsDisabled": false + }, + { + "ParentCode": "App.Reports", + "Code": "App.Reports.Management", + "DisplayName": "App.Reports.Management", + "Order": 2, + "Url": "/admin/report/management", + "Icon": "FcSimCardChip", + "RequiredPermissionName": "App.Reports.Management", + "IsDisabled": false + }, + { "ParentCode": null, "Code": "App.Administration", @@ -12676,48 +12710,97 @@ { "GroupName": "App.Reports", - "Name": "App.Reports", + "Name": "App.Reports.Management", "ParentName": null, - "DisplayName": "App.Reports", + "DisplayName": "App.Reports.Management", "IsEnabled": true, "MultiTenancySide": 2 }, { "GroupName": "App.Reports", - "Name": "App.Reports.Create", - "ParentName": "App.Reports", + "Name": "App.Reports.Management.Create", + "ParentName": "App.Reports.Management", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 2 }, { "GroupName": "App.Reports", - "Name": "App.Reports.Delete", - "ParentName": "App.Reports", + "Name": "App.Reports.Management.Delete", + "ParentName": "App.Reports.Management", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 2 }, { "GroupName": "App.Reports", - "Name": "App.Reports.Export", - "ParentName": "App.Reports", + "Name": "App.Reports.Management.Export", + "ParentName": "App.Reports.Management", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 2 }, { "GroupName": "App.Reports", - "Name": "App.Reports.Import", - "ParentName": "App.Reports", + "Name": "App.Reports.Management.Import", + "ParentName": "App.Reports.Management", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 2 }, { "GroupName": "App.Reports", - "Name": "App.Reports.Update", - "ParentName": "App.Reports", + "Name": "App.Reports.Management.Update", + "ParentName": "App.Reports.Management", + "DisplayName": "Update", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories", + "ParentName": null, + "DisplayName": "App.Reports.Categories", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories.Create", + "ParentName": "App.Reports.Categories", + "DisplayName": "Create", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories.Delete", + "ParentName": "App.Reports.Categories", + "DisplayName": "Delete", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories.Export", + "ParentName": "App.Reports.Categories", + "DisplayName": "Export", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories.Import", + "ParentName": "App.Reports.Categories", + "DisplayName": "Import", + "IsEnabled": true, + "MultiTenancySide": 2 + }, + { + "GroupName": "App.Reports", + "Name": "App.Reports.Categories.Update", + "ParentName": "App.Reports.Categories", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 2 diff --git a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs index de792fb2..d066d7f8 100644 --- a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs @@ -336,6 +336,7 @@ public static class PlatformConsts public const string LanguageText = "list-languagetext"; public const string Menu = "list-menu"; public const string Listform = "list-listform"; + public const string ListformField = "list-listformfield"; public const string SettingDefinition = "list-settingdefinition"; public const string Chart = "list-chart"; public const string DataSource = "list-datasource"; @@ -367,7 +368,6 @@ public static class PlatformConsts public const string InstallmentOption = "list-installmentoption"; public const string PurchaseOrder = "list-purchaseorder"; public const string ReportCategory = "list-reportcategory"; - public const string ListformField = "list-listformfield"; } public static class Forms diff --git a/ui/dev-dist/sw.js b/ui/dev-dist/sw.js index 192eec02..72da90da 100644 --- a/ui/dev-dist/sw.js +++ b/ui/dev-dist/sw.js @@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", - "revision": "0.fu6htabtdto" + "revision": "0.9uf8m2a8h2o" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/ui/src/views/admin/chart/ChartEdit.tsx b/ui/src/views/admin/chart/ChartEdit.tsx index 12c6de56..eb328b1f 100644 --- a/ui/src/views/admin/chart/ChartEdit.tsx +++ b/ui/src/views/admin/chart/ChartEdit.tsx @@ -81,6 +81,7 @@ import { ChartSeriesDto, ChartValueAxisDto, } from '@/proxy/charts/models' +import { Container } from '@/components/shared' const chartPanesValidationSchema = object().shape({ name: string().required(), @@ -262,7 +263,7 @@ function ChartEdit() { }, [chartCode]) return chartValues && roleList && userList && permissionOptions ? ( -
+
- + ) : ( <> ) diff --git a/ui/src/views/admin/listForm/edit/FormEdit.tsx b/ui/src/views/admin/listForm/edit/FormEdit.tsx index 4344c473..8485cacc 100644 --- a/ui/src/views/admin/listForm/edit/FormEdit.tsx +++ b/ui/src/views/admin/listForm/edit/FormEdit.tsx @@ -30,6 +30,7 @@ import { getRoles, getUsers } from '@/services/identity.service' import { GridOptionsEditDto, ListFormCustomizationDto } from '@/proxy/form/models' import { IdentityRoleDto, IdentityUserDto } from '@/proxy/admin/models' import { getListFormCustomizations } from '@/services/admin/list-form-customization.service' +import { Container } from '@/components/shared' export interface FormEditProps { onSubmit: ( @@ -143,7 +144,7 @@ const FormEdit = () => { } return listFormCode && listFormValues && customizations && roleList && userList ? ( - <> + { > - + ) : ( <> )