diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json index 4f56b08..c2ba40a 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json @@ -13210,9 +13210,9 @@ }, { "resourceName": "Platform", - "key": "App.Listform.ListformField.EmployeeId", - "en": "Employee", - "tr": "Çalışan" + "key": "App.Listform.ListformField.UserId", + "en": "User", + "tr": "Kullanıcı" }, { "resourceName": "Platform", diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 91832f7..950ea54 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -3966,7 +3966,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order = 4, DataField = "CoverImage", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "ReadTime", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "CategoryId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 7, DataField = "EmployeeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 7, DataField = "UserId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 8, DataField = "ViewCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, new EditingFormItemDto { Order = 9, DataField = "LikeCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, new EditingFormItemDto { Order = 10, DataField = "CommentCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat() }, @@ -4133,8 +4133,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, - FieldName = "EmployeeId", - CaptionName = "App.Listform.ListformField.EmployeeId", + FieldName = "UserId", + CaptionName = "App.Listform.ListformField.UserId", Width = 200, ListOrderNo = 8, Visible = true, @@ -4142,7 +4142,12 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsDeleted = false, AllowSearch = true, ValidationRuleJson = DefaultValidationRuleRequiredJson, - LookupJson = LookupQueryValues.UserValues, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.UserValues + }), ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(listForm.Name), PivotSettingsJson = DefaultPivotSettingsJson, diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Skill.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Skill.cs index f9de7fd..5ddf317 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Skill.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Skill.cs @@ -1,6 +1,5 @@ using System; using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/BlogPost.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/BlogPost.cs index 34e70ac..b5bfc39 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/BlogPost.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/BlogPost.cs @@ -1,5 +1,4 @@ using System; -using Microsoft.AspNetCore.Identity; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantData.json b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantData.json index eaf8a06..dd4e7eb 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantData.json +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantData.json @@ -518,7 +518,7 @@ "Summary": "blog.posts.ai.excerpt", "CoverImage": "https://images.pexels.com/photos/8386434/pexels-photo-8386434.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.technology", - "EmployeeCode": "EMP-001" + "UserName": "system@sozsoft.com" }, { "Title": "blog.posts.web.title", @@ -529,7 +529,7 @@ "Summary": "blog.posts.web.excerpt", "CoverImage": "https://images.pexels.com/photos/11035471/pexels-photo-11035471.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.webdev", - "EmployeeCode": "EMP-002" + "UserName": "system@sozsoft.com" }, { "Title": "blog.posts.security.title", @@ -540,7 +540,7 @@ "Summary": "blog.posts.security.excerpt", "CoverImage": "https://images.pexels.com/photos/5380642/pexels-photo-5380642.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.security", - "EmployeeCode": "EMP-003" + "UserName": "system@sozsoft.com" }, { "Title": "blog.posts.mobile.title", @@ -551,7 +551,7 @@ "ReadTime": "4 dk", "CoverImage": "https://images.pexels.com/photos/13017583/pexels-photo-13017583.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.mobile", - "EmployeeCode": "EMP-002" + "UserName": "system@sozsoft.com" }, { "Title": "blog.posts.database.title", @@ -562,7 +562,7 @@ "ReadTime": "8 dk", "CoverImage": "https://images.pexels.com/photos/325229/pexels-photo-325229.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.database", - "EmployeeCode": "EMP-004" + "UserName": "system@sozsoft.com" }, { "Title": "blog.posts.digital.title", @@ -573,7 +573,7 @@ "ReadTime": "6 dk", "CoverImage": "https://images.pexels.com/photos/7681091/pexels-photo-7681091.jpeg?auto=compress&cs=tinysrgb&w=1920", "CategoryName": "blog.categories.digital", - "EmployeeCode": "EMP-005" + "UserName": "system@sozsoft.com" } ], "Contacts": [ diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs index 6b688e1..4e793d5 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs @@ -665,9 +665,9 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency if (!exists) { var category = await _blogCategoryRepository.FirstOrDefaultAsync(x => x.Name == item.CategoryName); - var employee = await _repositoryUser.FindByNormalizedUserNameAsync(item.UserName); + var user = await _repositoryUser.FindByNormalizedUserNameAsync(item.UserName); - if (category != null && employee != null) + if (category != null && user != null) { await _blogPostsRepository.InsertAsync(new BlogPost { @@ -679,7 +679,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency CoverImage = item.CoverImage, ReadTime = item.ReadTime, CategoryId = category.Id, - UserId = employee.Id, + UserId = user.Id, IsPublished = true, PublishedAt = DateTime.UtcNow }); diff --git a/ui/src/proxy/blog/blog.ts b/ui/src/proxy/blog/blog.ts index d4c0b9c..eaf3fcf 100644 --- a/ui/src/proxy/blog/blog.ts +++ b/ui/src/proxy/blog/blog.ts @@ -8,10 +8,11 @@ export interface BlogPost { contentEn?: string summary: string coverImage?: string - employee: { + userid: string + user: { id: string name: string - avatar?: string + username: string } category: { id: string diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx index 6391b8c..1509ab3 100644 --- a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx +++ b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx @@ -113,20 +113,20 @@ function FormFields({ schema = table.schemaName name = table.tableName } else { - const view = dbObjects.views.find((v) => v.viewName === cmd) + const view = dbObjects.views.find((v) => v.objectName === cmd) if (view) { schema = view.schemaName - name = view.viewName + name = view.objectName } else { - const fn = dbObjects.functions.find((f) => f.functionName === cmd) + const fn = dbObjects.functions.find((f) => f.objectName === cmd) if (fn) { schema = fn.schemaName - name = fn.functionName + name = fn.objectName } else { - const sp = dbObjects.storedProcedures.find((p) => p.procedureName === cmd) + const sp = dbObjects.storedProcedures.find((p) => p.objectName === cmd) if (sp) { schema = sp.schemaName - name = sp.procedureName + name = sp.objectName } } } @@ -163,6 +163,7 @@ function FormFields({ await postListFormField({ listFormCode, fieldName: col.columnName, + captionName: `App.Listform.ListformField.${col.columnName}`, sourceDbType: sqlDataTypeToDbType(col.dataType) as any, cultureName, }) @@ -225,7 +226,7 @@ function FormFields({ }) setNull(resp?.data?.items) setFields(resp?.data?.items) - + console.log('getFields', resp?.data?.items) if (resp.data?.items) { setFieldList( resp?.data?.items.map((f: ColumnFormatEditDto) => ({ diff --git a/ui/src/views/public/Blog.tsx b/ui/src/views/public/Blog.tsx index e758e2a..365b3e1 100644 --- a/ui/src/views/public/Blog.tsx +++ b/ui/src/views/public/Blog.tsx @@ -195,7 +195,7 @@ const Blog = () => {
- {post.employee.name} + {post.user.username}
diff --git a/ui/src/views/public/BlogDetail.tsx b/ui/src/views/public/BlogDetail.tsx index aa476ee..3a54fbc 100644 --- a/ui/src/views/public/BlogDetail.tsx +++ b/ui/src/views/public/BlogDetail.tsx @@ -12,10 +12,10 @@ import { APP_NAME } from '@/constants/app.constant' interface PostData { image?: string - employee?: { + user?: { id: string name: string - avatar?: string + username: string } } @@ -39,7 +39,7 @@ const BlogDetail: React.FC = () => { setBlogPost(response) setPostData({ image: response.coverImage, - employee: response.employee, + user: response.user, }) } else { setError('Blog post ID is missing.') @@ -107,7 +107,7 @@ const BlogDetail: React.FC = () => {
- {postData.employee?.name} + {postData.user?.username}
{blogPost.publishedAt && showDbDateAsIs(blogPost.publishedAt)}