From ca18bbc6a87368da11f1e6e11b56214ef0cc3a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?=
 <76204082+iamsedatozturk@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:00:48 +0300
Subject: [PATCH] =?UTF-8?q?Genel=20d=C3=BCzenlemeler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Seeds/ListFormsSeeder.cs                  | 15 ++++++++----
 ui/src/shared/useListFormColumns.ts           |  1 +
 .../form-fields/FormFieldTabJoinOptions.tsx   |  1 -
 .../edit/form-fields/FormFieldTabLookup.tsx   | 23 ++++++++++++++++---
 .../admin/role-management/RolesPermission.tsx |  2 +-
 .../admin/user-management/UsersPermission.tsx |  2 +-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs
index f03a59f1..6f6ebf33 100644
--- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs
+++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Kurs.Languages.Languages;
@@ -10526,7 +10527,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
                     CultureName = LanguageCodes.En,
                     SourceDbType = DbType.String,
                     FieldName = "CountryCode",
-                    Width = 200,
+                    Width = 400,
                     ListOrderNo = 2,
                     Visible = true,
                     IsActive = true,
@@ -10801,7 +10802,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
                         DataSourceType = UiLookupDataSourceTypeEnum.Query,
                         DisplayExpr = "Name",
                         ValueExpr = "Key",
-                        LookupQuery = $"SELECT \"{DbTablePrefix}Country\".\"Code\" AS \"Key\", \"{DbTablePrefix}Country\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}Country\" ORDER BY \"{DbTablePrefix}Country\".\"Name\""
+                        LookupQuery = $"SELECT \"{DbTablePrefix}Country\".\"Code\" AS \"Key\", \"{DbTablePrefix}Country\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}Country\" ORDER BY \"{DbTablePrefix}Country\".\"Name\"",
+                        CascadeEmptyFields = "CityCode"
                     }),
                     ValidationRuleJson = JsonSerializer.Serialize(new[]
                     {
@@ -10834,7 +10836,10 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
                         DataSourceType = UiLookupDataSourceTypeEnum.Query,
                         DisplayExpr = "Name",
                         ValueExpr = "Key",
-                        LookupQuery = $"SELECT \"{DbTablePrefix}City\".\"Code\" AS \"Key\", \"{DbTablePrefix}City\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}City\" ORDER BY \"{DbTablePrefix}City\".\"Name\""
+                        LookupQuery = $"SELECT \"{DbTablePrefix}City\".\"Code\" AS \"Key\", \"{DbTablePrefix}City\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}City\" WHERE \"PCity\".\"CountryCode\" = @param0 OR @param0 IS NULL ORDER BY \"{DbTablePrefix}City\".\"Name\"",
+                        CascadeRelationField = "CountryCode",
+                        CascadeFilterOperator="=",
+                        CascadeParentFields = "CountryCode"
                     }),
                     ValidationRuleJson = JsonSerializer.Serialize(new[]
                     {
@@ -11097,7 +11102,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
 
             #region SkillType Fields
             await _listFormFieldRepository.InsertManyAsync([
-                new()
+                        new ()
                 {
                     ListFormCode = listFormSkillType.ListFormCode,
                     CultureName = LanguageCodes.En,
@@ -11144,7 +11149,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
                         Deny = false
                     })
                 }
-            ]);
+                    ]);
             #endregion
         }
         #endregion
diff --git a/ui/src/shared/useListFormColumns.ts b/ui/src/shared/useListFormColumns.ts
index 9c6eb64d..cc70fa9b 100644
--- a/ui/src/shared/useListFormColumns.ts
+++ b/ui/src/shared/useListFormColumns.ts
@@ -11,6 +11,7 @@ import { usePermission } from '../utils/hooks/usePermission'
 import { GridColumnData } from '../views/list/GridColumnData'
 import {
   ColumnFormatDto,
+  EditingFormItemDto,
   GridDto,
   PlatformEditorTypes,
   UiCommandButtonPositionTypeEnum,
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx
index 60727659..63cc4396 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx
@@ -178,7 +178,6 @@ function FormFieldTabJoinOptions({
                   autoComplete="off"
                   name="columnJoinTableDto.joinCondition2"
                   placeholder={translate('::ListForms.ListFormFieldEdit.JoinOptionsJoinCondition2')}
-                  component={Input}
                 >
                   {({ field, form }: FieldProps<GridColumnJoinConditionEnum>) => (
                     <Select
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
index 3ea2daaa..44a1053f 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
@@ -26,6 +26,23 @@ const schema = object().shape({
     .required(),
 })
 
+function getNormalizedInitialValues(initialValues: ColumnFormatEditDto) {
+  return {
+    ...initialValues,
+    lookupDto: {
+      ...initialValues.lookupDto,
+      dataSourceType: initialValues.lookupDto?.dataSourceType ?? undefined,
+      valueExpr: initialValues.lookupDto?.valueExpr ?? '',
+      displayExpr: initialValues.lookupDto?.displayExpr ?? '',
+      cascadeRelationField: initialValues.lookupDto?.cascadeRelationField ?? '',
+      cascadeParentFields: initialValues.lookupDto?.cascadeParentFields ?? '',
+      cascadeFilterOperator: initialValues.lookupDto?.cascadeFilterOperator ?? undefined,
+      cascadeEmptyFields: initialValues.lookupDto?.cascadeEmptyFields ?? '',
+      lookupQuery: initialValues.lookupDto?.lookupQuery ?? '',
+    },
+  }
+}
+
 function FormFieldTabLookup({
   listFormCode,
   initialValues,
@@ -40,10 +57,10 @@ function FormFieldTabLookup({
     <Container className="grid xl:grid-cols-2">
       <Formik
         enableReinitialize
-        initialValues={initialValues}
+        initialValues={getNormalizedInitialValues(initialValues)}
         validationSchema={schema}
-        onSubmit={async (values, formikHelpers) => {
-          await onSubmit(ListFormFieldEditTabs.LookupForm, values, formikHelpers)
+        onSubmit={async (values) => {
+          await onSubmit(ListFormFieldEditTabs.LookupForm, values)
         }}
       >
         {({ touched, errors, isSubmitting, values }) => (
diff --git a/ui/src/views/admin/role-management/RolesPermission.tsx b/ui/src/views/admin/role-management/RolesPermission.tsx
index 685aca93..c792c37f 100644
--- a/ui/src/views/admin/role-management/RolesPermission.tsx
+++ b/ui/src/views/admin/role-management/RolesPermission.tsx
@@ -91,7 +91,7 @@ function RolesPermission({
 
         updatePermissions(providerName, name, { permissions: updatePermList })
         toast.push(<Notification title={'Permission updated'} type="success" />, {
-          placement: 'top-center',
+          placement: 'top-end',
         })
       }
 
diff --git a/ui/src/views/admin/user-management/UsersPermission.tsx b/ui/src/views/admin/user-management/UsersPermission.tsx
index c56008cc..15d70d3d 100644
--- a/ui/src/views/admin/user-management/UsersPermission.tsx
+++ b/ui/src/views/admin/user-management/UsersPermission.tsx
@@ -94,7 +94,7 @@ function UsersPermission({
 
         updatePermissions(providerName, id, { permissions: updatePermList })
         toast.push(<Notification title={'Permission updated'} type="success" />, {
-          placement: 'top-center',
+          placement: 'top-end',
         })
       }