From 6aa5e2b1cac9a2e3b6f3230ed931e7fe81791f8c 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, 19 Jun 2026 15:07:03 +0300
Subject: [PATCH] =?UTF-8?q?IsDeleted=20s=C3=BCtunu=20eklendi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Seeds/LanguagesData.json                  |  6 +++++
 .../edit/form-fields/FormFieldTabLookup.tsx   | 15 +++++++++--
 ui/src/views/admin/listForm/lookupQuery.ts    | 25 +++++++++++++++++++
 .../admin/listForm/wizard/WizardStep3.tsx     | 15 +++++++++--
 4 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 ui/src/views/admin/listForm/lookupQuery.ts

diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
index 554979d..4df81ab 100644
--- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
+++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
@@ -17588,6 +17588,12 @@
             "en": "Columns load after selecting a Select Command",
             "tr": "Select Command seçince sütunlar yüklenir"
         },
+        {
+            "resourceName": "Platform",
+            "key": "ListForms.Wizard.Step3.SelectTable",
+            "en": "Select Table",
+            "tr": "Tablo Seç"
+        },
         {
             "resourceName": "Platform",
             "key": "ListForms.Wizard.Step3.IncludeInEditingForm",
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 8998101..f72ec57 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
@@ -13,6 +13,7 @@ import { number, object, string } from 'yup'
 import { cascadeFilterOperator, columnLookupDataSourceTypeListOptions } from '../options'
 import { FormFieldEditProps } from './FormFields'
 import { ColumnCascadeFilterOperatorEnum, UiLookupDataSourceTypeEnum } from '@/proxy/form/models'
+import { buildLookupQuery } from '../../lookupQuery'
 
 const schema = object().shape({
   lookupDto: object()
@@ -190,7 +191,12 @@ function TablePickerModal({
                 </div>
                 {keyCol && nameCol && (
                   <div className="rounded bg-gray-50 dark:bg-gray-800 px-2 py-1.5 text-[10px] font-mono text-gray-500 dark:text-gray-400 break-all">
-                    {`SELECT "${keyCol}" AS "Key", "${nameCol}" AS "Name" FROM "${pickerTable?.tableName}" ORDER BY "${nameCol}";`}
+                    {buildLookupQuery({
+                      keyColumn: keyCol,
+                      nameColumn: nameCol,
+                      tableName: pickerTable?.tableName,
+                      columns: pickerColumns,
+                    })}
                   </div>
                 )}
                 <button
@@ -198,7 +204,12 @@ function TablePickerModal({
                   disabled={!keyCol || !nameCol}
                   onClick={() => {
                     onSelect(
-                      `SELECT "${keyCol}" AS "Key", "${nameCol}" AS "Name" FROM "${pickerTable?.tableName}" ORDER BY "${nameCol}";`,
+                      buildLookupQuery({
+                        keyColumn: keyCol,
+                        nameColumn: nameCol,
+                        tableName: pickerTable?.tableName,
+                        columns: pickerColumns,
+                      }),
                     )
                   }}
                   className="mt-1 w-full py-1.5 text-xs font-semibold rounded bg-indigo-600 text-white hover:bg-indigo-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
diff --git a/ui/src/views/admin/listForm/lookupQuery.ts b/ui/src/views/admin/listForm/lookupQuery.ts
new file mode 100644
index 0000000..f51d2b4
--- /dev/null
+++ b/ui/src/views/admin/listForm/lookupQuery.ts
@@ -0,0 +1,25 @@
+import type { DatabaseColumnDto } from '@/proxy/sql-query-manager/models'
+
+const IS_DELETED_COLUMN = 'IsDeleted'
+
+export function tableHasIsDeletedColumn(columns: DatabaseColumnDto[]) {
+  return columns.some(
+    (column) => column.columnName.toLowerCase() === IS_DELETED_COLUMN.toLowerCase(),
+  )
+}
+
+export function buildLookupQuery({
+  keyColumn,
+  nameColumn,
+  tableName,
+  columns,
+}: {
+  keyColumn: string
+  nameColumn: string
+  tableName?: string
+  columns: DatabaseColumnDto[]
+}) {
+  const whereClause = tableHasIsDeletedColumn(columns) ? ` WHERE "${IS_DELETED_COLUMN}" = 0` : ''
+
+  return `SELECT "${keyColumn}" AS "Key", "${nameColumn}" AS "Name" FROM "${tableName}"${whereClause} ORDER BY "${nameColumn}";`
+}
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep3.tsx b/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
index 0d2ae47..44c9a93 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
@@ -30,6 +30,7 @@ import {
   FaCode,
 } from 'react-icons/fa'
 import { UiLookupDataSourceTypeEnum } from '@/proxy/form/models'
+import { buildLookupQuery } from '../lookupQuery'
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 export interface WizardGroupItem {
@@ -516,14 +517,24 @@ function SortableItem({
                     </div>
                     {pickerKeyCol && pickerNameCol && (
                       <div className="rounded bg-gray-50 dark:bg-gray-800 px-2 py-1.5 text-[10px] font-mono text-gray-500 dark:text-gray-400 break-all">
-                        {`SELECT "${pickerKeyCol}" AS "Key", "${pickerNameCol}" AS "Name" FROM "${pickerTable?.tableName}" ORDER BY "${pickerNameCol}";`}
+                        {buildLookupQuery({
+                          keyColumn: pickerKeyCol,
+                          nameColumn: pickerNameCol,
+                          tableName: pickerTable?.tableName,
+                          columns: pickerColumns,
+                        })}
                       </div>
                     )}
                     <button
                       type="button"
                       disabled={!pickerKeyCol || !pickerNameCol}
                       onClick={() => {
-                        const q = `SELECT "${pickerKeyCol}" AS "Key", "${pickerNameCol}" AS "Name" FROM "${pickerTable?.tableName}" ORDER BY "${pickerNameCol}";`
+                        const q = buildLookupQuery({
+                          keyColumn: pickerKeyCol,
+                          nameColumn: pickerNameCol,
+                          tableName: pickerTable?.tableName,
+                          columns: pickerColumns,
+                        })
                         onLookupQueryChange(q)
                         setIsTablePickerOpen(false)
                       }}