User Details ve Genel düzenlemeler

api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs

@@ -7,7 +7,7 @@ namespace Sozsoft.Platform.AiBots;
 [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class AiBotToAiBotDtoMapper : TwoWayMapperBase<AiBot, AiBotDto>
 {
-public override partial AiBotDto Map(AiBot source);
+    public override partial AiBotDto Map(AiBot source);
 
     public override partial void Map(AiBot source, AiBotDto destination);
 

api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json

@@ -3108,6 +3108,12 @@
             "en": "Lockout Settings",
             "tr": "Kilit Ayarları"
         },
+        {
+            "resourceName": "Platform",
+            "key": "Abp.Identity.User.LockoutManagement.ConnectionsTimes",
+            "en": "Connections Times",
+            "tr": "Bağlantı Süreleri"
+        },
         {
             "resourceName": "Platform",
             "key": "Abp.Identity.User.UserInformation.Name",

api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs

@@ -4168,7 +4168,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep
                     EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto>()
                     {
                         new() {
-                            Order = 1, ColCount = 2, ColSpan = 1, ItemType = "group", Items =
+                            Order = 1, ColCount = 4, ColSpan = 1, ItemType = "group", Items =
                             [
                                 new EditingFormItemDto { Order = 1, DataField = "CategoryId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
                                 new EditingFormItemDto { Order = 2, DataField = "TypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
@@ -4176,9 +4176,9 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep
                                 new EditingFormItemDto { Order = 4, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
                                 new EditingFormItemDto { Order = 5, DataField = "Place", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
                                 new EditingFormItemDto { Order = 6, DataField = "UserId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
-                                new EditingFormItemDto { Order = 7, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea },
+                                new EditingFormItemDto { Order = 7, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
-                                new EditingFormItemDto { Order = 8, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
+                                new EditingFormItemDto { Order = 8, DataField = "ParticipantsCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox },
-                                new EditingFormItemDto { Order = 9, DataField = "ParticipantsCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox },
+                                new EditingFormItemDto { Order = 9, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea },
                                 new EditingFormItemDto { Order = 10, DataField = "Photos", ColSpan = 1, EditorType2 = EditorTypes.dxImageUpload, EditorOptions = EditorOptionValues.ImageUploadOptions },
                             ]}
                     }),
@@ -4474,7 +4474,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep
                     EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 250, true, true, true, true, false),
                     EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto>() {
                         new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[
-                            new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
+                            new EditingFormItemDto { Order = 1, DataField = "UserId", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox },
                         ]}
                     }),
                     InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson(),

api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs

@@ -76,7 +76,7 @@ public static class PlatformConsts
     public static class Branches
     {
         public const string BranchCode = "DEMO";
-        public const string BranchName = "Demo Şube";
+        public const string BranchName = "Demo";
         public const long BranchVknTckn = 52849619172;
         public const string BranchTaxOffice = "Sarıgazi";
         public const string BranchMobileNumber = "5449476346";

ui/src/views/admin/organization-unit/OrganizationUnits.tsx

@@ -59,13 +59,11 @@ import {
   FaMinusCircle,
   FaPlusCircle,
   FaTrash,
-  FaSitemap,
-  FaCogs,
   FaTrashAlt,
   FaEdit,
   FaUsers,
   FaUserPlus,
-  FaUserShield,
+  FaUserFriends,
 } from 'react-icons/fa'
 import { object, string } from 'yup'
 import { ROUTES_ENUM } from '@/routes/route.constant'
@@ -389,8 +387,8 @@ const OrganizationUnits = () => {
     return (
       <div
         className={classNames(
-          'h-6 text-md flex gap-2 items-center',
+          'h-8 text-md flex gap-2 items-center',
-          node.isSelected ? 'bg-indigo-200' : '',
+          node.isSelected ? 'bg-indigo-200 text-black dark:text-black' : '',
         )}
         style={style}
         ref={dragHandle}
@@ -403,7 +401,7 @@ const OrganizationUnits = () => {
             {node.isInternal && (node.isOpen ? <FaMinusCircle /> : <FaPlusCircle />)}
           </div>
 
-          <FaFolder className="ml-2 w-3" color="#337ab7" />
+          <FaFolder className="w-3" color="#337ab7" />
 
           <span className="node-text m-1">
             {node.isEditing ? (
@@ -431,17 +429,23 @@ const OrganizationUnits = () => {
         <div className="file-actions">
           <div className="flex gap-1 folderFileActions">
             <Button
-              icon={<FaUserPlus size="20" color="#2d6da3" />}
+              size='xs'
+              variant='plain'
+              icon={<FaUserPlus color="#2d6da3" />}
               onClick={() => setIsMoveAllUsersOpen(true)}
               title={translate('::Abp.Identity.OrganizationUnit.MoveAllUsers')}
             ></Button>
             <Button
-              icon={<FaEdit size="20" className="text-teal-900" />}
+              size='xs'
+              variant='plain'
+              icon={<FaEdit className="text-teal-900" />}
               onClick={() => node.edit()}
               title={translate('::Abp.Identity.OrganizationUnit.Rename')}
             ></Button>
             <Button
-              icon={<FaTrashAlt size="20" color="#d9534f" />}
+              size='xs'
+              variant='plain'
+              icon={<FaTrashAlt color="#d9534f" />}
               onClick={() => setDeleteRow({ id: node.data.id, name: 'Organization Unit' })}
               title={translate('::Delete')}
             ></Button>
@@ -469,7 +473,7 @@ const OrganizationUnits = () => {
                   <Button
                     variant="solid"
                     size="sm"
-                    icon={activeOu ? <FaSitemap /> : <FaCogs />}
+                    icon={activeOu ? <FaUserFriends /> : <FaUserPlus />}
                     title={translate('::Abp.Identity.OrganizationUnit.AddUnit')}
                     onClick={(e) => {
                       e.preventDefault()