diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/HostData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/HostData.json
index 5daded9..a1feb0d 100644
--- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/HostData.json
+++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/HostData.json
@@ -44,7 +44,7 @@
             "code": "App.SiteManagement.Theme.Style",
             "nameKey": "App.SiteManagement.Theme.Style",
             "descriptionKey": "App.SiteManagement.Theme.Style.Description",
-            "defaultValue": "dx.material.blue.light.compact",
+            "defaultValue": "dx.material.blue.dark.compact",
             "isVisibleToClients": true,
             "providers": "U|G|D",
             "isInherited": false,
diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
index ae31970..a47b0eb 100644
--- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
+++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
@@ -10254,6 +10254,12 @@
             "en": "Active",
             "tr": "Aktif"
         },
+        {
+            "resourceName": "Platform",
+            "key": "App.Status.Inactive",
+            "en": "Inactive",
+            "tr": "Pasif"
+        },
         {
             "resourceName": "Platform",
             "key": "App.DeveloperKit.ComponentEditor.Save",
diff --git a/ui/src/components/codeLayout/ComponentCodeEditor.tsx b/ui/src/components/codeLayout/ComponentCodeEditor.tsx
index c659223..bf3219c 100644
--- a/ui/src/components/codeLayout/ComponentCodeEditor.tsx
+++ b/ui/src/components/codeLayout/ComponentCodeEditor.tsx
@@ -13,9 +13,7 @@ interface ComponentCodeEditorProps {
   onResetCodeChanges: () => void
   language?: string
   theme?: 'vs-dark' | 'light'
-  parseError?: string | null
   onCursorChange?: (componentId: string | null) => void
-  onDrop?: (componentDef: ComponentDefinition, position: { line: number; column: number }) => void
   onComponentAdded?: (componentDef: ComponentDefinition) => void
   onComponentSave: () => void
 }
@@ -24,6 +22,7 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
   code,
   onChange,
   onApplyCodeChanges,
+  onResetCodeChanges,
   language = 'typescript',
   theme = 'vs-dark',
   onCursorChange,
@@ -48,7 +47,6 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
 
   const editorRef = useRef<any>(null)
   const containerRef = useRef<HTMLDivElement>(null)
-  const cursorChangeTimeout = useRef<number | null>(null)
   // Refs to keep latest values accessible inside native DOM listeners
   const localCodeRef = useRef(localCode)
   const dropCallbacksRef = useRef({ onChange, onComponentAdded, onApplyCodeChanges })
@@ -66,14 +64,6 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
     dropCallbacksRef.current = { onChange, onComponentAdded, onApplyCodeChanges }
   }, [onChange, onComponentAdded, onApplyCodeChanges])
 
-  useEffect(() => {
-    return () => {
-      if (cursorChangeTimeout.current) {
-        clearTimeout(cursorChangeTimeout.current)
-      }
-    }
-  }, [])
-
   const findComponentIdAtPosition = (
     code: string,
     position: { lineNumber: number; column: number },
@@ -169,7 +159,10 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
             if (ch === '(') parenDepth++
             else if (ch === ')') {
               parenDepth--
-              if (parenDepth <= 0) { insideReturn = false; break }
+              if (parenDepth <= 0) {
+                insideReturn = false
+                break
+              }
             }
           }
         }
@@ -178,7 +171,10 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
           if (ch === '(') parenDepth++
           else if (ch === ')') {
             parenDepth--
-            if (parenDepth <= 0) { insideReturn = false; break }
+            if (parenDepth <= 0) {
+              insideReturn = false
+              break
+            }
           }
         }
       }
@@ -186,15 +182,11 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
     return insideReturn
   }
 
-  const handleEditorCursorChange = (_event: any) => {
+  const handleEditorCursorChange = () => {
     if (!editorRef.current) return
     const position = editorRef.current.getPosition()
     if (!position) return
 
-    // Throttle the cursor change to avoid too many calls
-    if (cursorChangeTimeout.current) {
-      clearTimeout(cursorChangeTimeout.current)
-    }
     const id = findComponentIdAtPosition(localCode, position)
     if (onCursorChange) onCursorChange(id)
   }
@@ -242,12 +234,19 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
           let componentDefData: string | undefined
           for (const fmt of ['application/json', 'text/plain']) {
             const d = nativeEvent.dataTransfer.getData(fmt)
-            if (d) { componentDefData = d; break }
+            if (d) {
+              componentDefData = d
+              break
+            }
           }
           if (!componentDefData) return
 
           let componentDef: any
-          try { componentDef = JSON.parse(componentDefData) } catch { return }
+          try {
+            componentDef = JSON.parse(componentDefData)
+          } catch {
+            return
+          }
           if (!componentDef?.name) return
 
           // Resolve the drop position inside Monaco
@@ -300,8 +299,11 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
           const newCode = newLines.join('\n')
 
           setLocalCode(newCode)
-          const { onChange: onChg, onComponentAdded: onAdded, onApplyCodeChanges: onApply } =
-            dropCallbacksRef.current
+          const {
+            onChange: onChg,
+            onComponentAdded: onAdded,
+            onApplyCodeChanges: onApply,
+          } = dropCallbacksRef.current
           onChg(newCode)
           if (onAdded) onAdded(componentDefWithId)
           setTimeout(() => onApply(newCode), 100)
@@ -346,6 +348,7 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
   const handleResetChanges = () => {
     setLocalCode(code)
     setHasChanges(false)
+    onResetCodeChanges()
   }
 
   // Drag & Drop handlers for Code Editor
@@ -561,53 +564,53 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
       <div className="bg-gray-800 border-b border-gray-700 p-4 flex items-end justify-between shrink-0">
         <div className="flex items-center gap-2">
           <Button
-            onClick={handleFormatCode}
             loading={isFormatting}
             icon={<FaCode className="w-4 h-4" />}
             variant="default"
             size="sm"
+            onClick={handleFormatCode}
           >
             Formatla
           </Button>
 
           <Button
-            onClick={() => setShowSettings(!showSettings)}
             icon={<FaCog className="w-4 h-4" />}
             variant={showSettings ? 'solid' : 'default'}
             color="blue-600"
             size="sm"
+            onClick={() => setShowSettings(!showSettings)}
           >
             Ayarlar
           </Button>
 
           <Button
-            onClick={handleResetChanges}
             icon={<FaTimes className="w-4 h-4" />}
             variant="solid"
             color="red-600"
             size="sm"
+            onClick={handleResetChanges}
           >
             Sıfırla
           </Button>
 
           <Button
-            onClick={handleApplyChanges}
             icon={<FaCheck className="w-4 h-4" />}
             variant="solid"
             color="green-600"
             size="sm"
+            onClick={handleApplyChanges}
           >
             Uygula
           </Button>
         </div>
         <div className="col-span-2 flex items-center justify-end">
           <Button
-            onClick={onComponentSave}
             icon={<FaSave className="w-4 h-4" />}
             variant="solid"
             color="yellow-600"
             size="sm"
             className="shadow-sm"
+            onClick={onComponentSave}
           >
             Kaydet
           </Button>
@@ -622,8 +625,8 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
               <label className="block text-sm font-medium text-gray-300 mb-2">Tema</label>
               <select
                 value={editorTheme}
-                onChange={(e) => setEditorTheme(e.target.value as 'vs-dark' | 'light')}
                 className="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-md text-white text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+                onChange={(e) => setEditorTheme(e.target.value as 'vs-dark' | 'light')}
               >
                 <option value="vs-dark">Koyu</option>
                 <option value="light">Açık</option>
@@ -637,8 +640,8 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
                 min="10"
                 max="24"
                 value={fontSize}
-                onChange={(e) => setFontSize(parseInt(e.target.value))}
                 className="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-md text-white text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+                onChange={(e) => setFontSize(parseInt(e.target.value))}
               />
             </div>
 
@@ -648,8 +651,8 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
               </label>
               <select
                 value={wordWrap}
-                onChange={(e) => setWordWrap(e.target.value as 'on' | 'off')}
                 className="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-md text-white text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
+                onChange={(e) => setWordWrap(e.target.value as 'on' | 'off')}
               >
                 <option value="on">Açık</option>
                 <option value="off">Kapalı</option>
@@ -659,11 +662,11 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
             <div>
               <label className="block text-sm font-medium text-gray-300 mb-2">Mini Harita</label>
               <Button
-                onClick={() => setMinimap(!minimap)}
                 block
                 variant={minimap ? 'solid' : 'default'}
                 color="blue-600"
                 size="sm"
+                onClick={() => setMinimap(!minimap)}
               >
                 {minimap ? 'Etkin' : 'Devre Dışı'}
               </Button>
@@ -680,8 +683,6 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
           language={language}
           theme={editorTheme}
           value={localCode}
-          onChange={handleCodeChange}
-          onMount={handleEditorDidMount}
           options={{
             fontSize: fontSize,
             wordWrap: wordWrap,
@@ -748,6 +749,8 @@ export const ComponentCodeEditor: React.FC<ComponentCodeEditorProps> = ({
             formatOnPaste: true,
             formatOnType: true,
           }}
+          onChange={handleCodeChange}
+          onMount={handleEditorDidMount}
         />
       </div>
 
diff --git a/ui/src/components/codeLayout/PropertyPanel.tsx b/ui/src/components/codeLayout/PropertyPanel.tsx
index c870e5f..e19c4e6 100644
--- a/ui/src/components/codeLayout/PropertyPanel.tsx
+++ b/ui/src/components/codeLayout/PropertyPanel.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import React, { useState, useEffect } from "react";
 import TailwindModal from "./TailwindModal";
 import { ComponentInfo, HookInfo, PropertyInfo } from "../../proxy/developerKit/componentInfo";
 import { getComponentDefinition } from "./data/componentDefinitions";
@@ -113,15 +113,6 @@ const PropertyPanel: React.FC<PropertyPanelProps> = ({
     setHasHookChanges(true);
   };
 
-  // Handle local event changes
-  const handleLocalEventChange = (eventName: string, value: string) => {
-    setPendingEvents((prev) => ({
-      ...prev,
-      [eventName]: value,
-    }));
-    setHasChanges(true);
-  };
-
   // Apply only property/event changes
   const handleApplyPropChanges = () => {
     if (!selectedComponent) return;
@@ -222,7 +213,7 @@ const PropertyPanel: React.FC<PropertyPanelProps> = ({
     if (property.type === "array") {
       try {
         arrayInputValue = JSON.stringify(value, null, 2);
-      } catch (e) {
+      } catch {
         arrayInputValue = "";
         arrayError = "Array verisi gösterilemiyor.";
       }
@@ -365,7 +356,7 @@ const PropertyPanel: React.FC<PropertyPanelProps> = ({
                     const parsed = JSON.parse(e.target.value);
                     handleLocalPropertyChange(property.name, parsed);
                     arrayError = "";
-                  } catch (err) {
+                  } catch {
                     arrayError = "Geçersiz JSON formatı";
                   }
                 }}
diff --git a/ui/src/components/codeLayout/TailwindModal.tsx b/ui/src/components/codeLayout/TailwindModal.tsx
index 216ae6c..1d74d0a 100644
--- a/ui/src/components/codeLayout/TailwindModal.tsx
+++ b/ui/src/components/codeLayout/TailwindModal.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { searchTailwindClasses, TAILWIND_CLASSES } from './data/tailwindClasses';
 import { Button } from '../ui';
 import { FaTimes } from 'react-icons/fa';
@@ -40,12 +40,6 @@ const TailwindModal: React.FC<TailwindModalProps> = ({
     // Don't close modal - let user select multiple classes
   };
 
-  const handleAddToCurrentValue = (className: string) => {
-    const newValue = currentValue ? `${currentValue} ${className}` : className;
-    onSelectClass(newValue);
-    // Don't close modal - let user continue selecting
-  };
-
   if (!isOpen) return null;
 
   return (
diff --git a/ui/src/components/codeLayout/editorSettings/global.d.ts b/ui/src/components/codeLayout/editorSettings/global.d.ts
index b45379d..530afd7 100644
--- a/ui/src/components/codeLayout/editorSettings/global.d.ts
+++ b/ui/src/components/codeLayout/editorSettings/global.d.ts
@@ -1,3 +1,5 @@
+import React from 'react';
+
 declare interface Window {
   ReactDOM?: {
     render: (element: React.ReactNode, container: Element) => void;
diff --git a/ui/src/components/common/InfoSection.tsx b/ui/src/components/common/InfoSection.tsx
index b01715d..04d726d 100644
--- a/ui/src/components/common/InfoSection.tsx
+++ b/ui/src/components/common/InfoSection.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import classNames from "classnames";
 
 interface InfoSectionProps {
diff --git a/ui/src/components/common/Widget.tsx b/ui/src/components/common/Widget.tsx
index 03e4a81..3132e7d 100644
--- a/ui/src/components/common/Widget.tsx
+++ b/ui/src/components/common/Widget.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import classNames from "classnames";
 import { iconList } from "./iconList";
 
diff --git a/ui/src/components/common/WidgetGroup.tsx b/ui/src/components/common/WidgetGroup.tsx
index dadd6eb..eee6275 100644
--- a/ui/src/components/common/WidgetGroup.tsx
+++ b/ui/src/components/common/WidgetGroup.tsx
@@ -1,6 +1,5 @@
 import classNames from "classnames";
 import Widget, { type colorType } from "./Widget";
-import { useNavigate } from "react-router-dom";
 import { WidgetEditDto, WidgetGroupDto } from "../../types/common";
 
 export default function WidgetGroup({
@@ -8,8 +7,6 @@ export default function WidgetGroup({
 }: {
   widgetGroups: WidgetGroupDto[];
 }) {
-  const navigate = useNavigate();
-
   return (
     <div>
       {widgetGroups.map((group, gIdx) => (
diff --git a/ui/src/components/layouts/AuthLayout/Side.tsx b/ui/src/components/layouts/AuthLayout/Side.tsx
index 4700aaa..8491e50 100644
--- a/ui/src/components/layouts/AuthLayout/Side.tsx
+++ b/ui/src/components/layouts/AuthLayout/Side.tsx
@@ -1,4 +1,4 @@
-import { cloneElement } from 'react'
+import React, { cloneElement } from 'react'
 import Avatar from '@/components/ui/Avatar'
 import Logo from '@/components/template/Logo'
 import { APP_NAME } from '@/constants/app.constant'
diff --git a/ui/src/components/layouts/DeveloperLayout.tsx b/ui/src/components/layouts/DeveloperLayout.tsx
index e794866..3b22c8b 100644
--- a/ui/src/components/layouts/DeveloperLayout.tsx
+++ b/ui/src/components/layouts/DeveloperLayout.tsx
@@ -1,44 +1,10 @@
-import React from 'react'
-import { FaTachometerAlt, FaDatabase, FaBolt, FaServer, FaPuzzlePiece } from 'react-icons/fa'
-import { useLocalization } from '@/utils/hooks/useLocalization'
-import { useLocation, useNavigate } from 'react-router-dom'
-import { ROUTES_ENUM } from '@/routes/route.constant'
+import type { PropsWithChildren } from 'react'
 import { Container } from '../shared'
 
-interface DeveloperLayoutProps {
-  children: React.ReactNode
-}
-
-const DeveloperLayout: React.FC<DeveloperLayoutProps> = ({ children }) => {
-  const { translate } = useLocalization()
-  const location = useLocation()
-  const navigate = useNavigate()
-
-  const navigation = [
-    {
-      id: 'entities',
-      label: translate('::App.DeveloperKit.Entity'),
-      icon: FaDatabase,
-      path: ROUTES_ENUM.protected.saas.developerKit.entities,
-    },
-    {
-      id: 'endpoints',
-      label: translate('::App.DeveloperKit.CrudEndpoints'),
-      icon: FaServer,
-      path: ROUTES_ENUM.protected.saas.developerKit.endpoints,
-    },
-    {
-      id: 'components',
-      label: translate('::App.DeveloperKit.Components'),
-      icon: FaPuzzlePiece,
-      path: ROUTES_ENUM.protected.saas.developerKit.components,
-    },
-  ]
-
+const DeveloperLayout = ({ children }: PropsWithChildren) => {
   return (
     <Container>
       <div className="flex flex-col lg:flex-row gap-8">
-        {/* Main Content */}
         <div className="flex-1">{children}</div>
       </div>
     </Container>
diff --git a/ui/src/components/orders/BillingControls.tsx b/ui/src/components/orders/BillingControls.tsx
index 7fbbe95..da1e0d2 100644
--- a/ui/src/components/orders/BillingControls.tsx
+++ b/ui/src/components/orders/BillingControls.tsx
@@ -23,7 +23,6 @@ export const BillingControls: React.FC<BillingControlsProps> = ({
   setGlobalBillingCycle,
   setGlobalPeriod,
   onCartClick,
-  onNavigate,
   cartItemsCount,
   cartState,
 }) => {
diff --git a/ui/src/components/orders/OrderSuccess.tsx b/ui/src/components/orders/OrderSuccess.tsx
index 4c53cb5..902c155 100644
--- a/ui/src/components/orders/OrderSuccess.tsx
+++ b/ui/src/components/orders/OrderSuccess.tsx
@@ -10,7 +10,7 @@ interface OrderSuccessProps {
   onBackToShop: () => void
 }
 
-export const OrderSuccess: React.FC<OrderSuccessProps> = ({ orderId, onBackToShop }) => {
+export const OrderSuccess: React.FC<OrderSuccessProps> = ({ orderId }) => {
   const navigate = useNavigate()
   const { translate } = useLocalization()
 
diff --git a/ui/src/components/orders/ProductCard.tsx b/ui/src/components/orders/ProductCard.tsx
index 1e21b8b..d9a8c9d 100644
--- a/ui/src/components/orders/ProductCard.tsx
+++ b/ui/src/components/orders/ProductCard.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { FaPlus, FaMinus } from 'react-icons/fa'
-import { BillingCycle, Product, ProductDto } from '@/proxy/order/models'
+import { BillingCycle, ProductDto } from '@/proxy/order/models'
 import { CartState } from '@/utils/cartUtils'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Button } from '@/components/ui'
diff --git a/ui/src/components/shared/ActionLink.tsx b/ui/src/components/shared/ActionLink.tsx
index 9acbeaf..7ddd2cc 100644
--- a/ui/src/components/shared/ActionLink.tsx
+++ b/ui/src/components/shared/ActionLink.tsx
@@ -4,14 +4,14 @@ import { Link } from 'react-router-dom'
 import type { CommonProps } from '@/proxy/common'
 import type { ComponentPropsWithoutRef } from 'react'
 
-interface ActionLink extends CommonProps, ComponentPropsWithoutRef<'a'> {
+interface ActionLinkProps extends CommonProps, ComponentPropsWithoutRef<'a'> {
     themeColor?: boolean
     to?: string
     href?: string
     reloadDocument?: boolean
 }
 
-const ActionLink = (props: ActionLink) => {
+const ActionLink = (props: ActionLinkProps) => {
     const {
         children,
         className,
diff --git a/ui/src/components/shared/DbMigrateLogPanel.tsx b/ui/src/components/shared/DbMigrateLogPanel.tsx
index 25e62aa..8420cb3 100644
--- a/ui/src/components/shared/DbMigrateLogPanel.tsx
+++ b/ui/src/components/shared/DbMigrateLogPanel.tsx
@@ -1,5 +1,4 @@
 import { MigrateLogEntry } from '@/proxy/setup/models'
-import { useLocalization } from '@/utils/hooks/useLocalization'
 import { useEffect, useRef, useState } from 'react'
 import { createRoot } from 'react-dom/client'
 import { Button } from '@/components/ui'
diff --git a/ui/src/components/shared/SegmentItemOption.tsx b/ui/src/components/shared/SegmentItemOption.tsx
index 2b67b59..febddf2 100644
--- a/ui/src/components/shared/SegmentItemOption.tsx
+++ b/ui/src/components/shared/SegmentItemOption.tsx
@@ -1,4 +1,4 @@
-import { forwardRef } from 'react'
+import React, { forwardRef } from 'react'
 import classNames from 'classnames'
 import useThemeClass from '@/utils/hooks/useThemeClass'
 import { FaCheckCircle } from 'react-icons/fa'
diff --git a/ui/src/contexts/ComponentContext.tsx b/ui/src/contexts/ComponentContext.tsx
index 1821872..c0dd121 100644
--- a/ui/src/contexts/ComponentContext.tsx
+++ b/ui/src/contexts/ComponentContext.tsx
@@ -179,34 +179,58 @@ export const ComponentProvider: React.FC<{ children: React.ReactNode }> = ({ chi
   useEffect(() => {
     // Example components for testing
     const HelloWorldComponent: React.ComponentType<unknown> = () => {
-      return React.createElement('div', { 
-        className: 'p-6 bg-blue-50 rounded-lg' 
-      }, [
-        React.createElement('h1', { 
-          className: 'text-2xl font-bold text-blue-900 mb-4' 
-        }, 'Hello World!'),
-        React.createElement('p', { 
-          className: 'text-blue-700' 
-        }, 'Bu manuel kayıtlı bir komponent!')
-      ])
+      return React.createElement(
+        'div',
+        {
+          className: 'p-6 bg-blue-50 rounded-lg',
+        },
+        [
+          React.createElement(
+            'h1',
+            {
+              className: 'text-2xl font-bold text-blue-900 mb-4',
+            },
+            'Hello World!',
+          ),
+          React.createElement(
+            'p',
+            {
+              className: 'text-blue-700',
+            },
+            'Bu manuel kayıtlı bir komponent!',
+          ),
+        ],
+      )
     }
 
     const TestListComponent: React.ComponentType<unknown> = () => {
-      return React.createElement('div', { 
-        className: 'p-6 bg-green-50 rounded-lg' 
-      }, [
-        React.createElement('h1', { 
-          className: 'text-2xl font-bold text-green-900 mb-4' 
-        }, 'Test List'),
-        React.createElement('p', { 
-          className: 'text-green-700' 
-        }, 'Bu da test için kayıtlı komponent!')
-      ])
+      return React.createElement(
+        'div',
+        {
+          className: 'p-6 bg-green-50 rounded-lg',
+        },
+        [
+          React.createElement(
+            'h1',
+            {
+              className: 'text-2xl font-bold text-green-900 mb-4',
+            },
+            'Test List',
+          ),
+          React.createElement(
+            'p',
+            {
+              className: 'text-green-700',
+            },
+            'Bu da test için kayıtlı komponent!',
+          ),
+        ],
+      )
     }
 
     registerComponent('HelloWorld', HelloWorldComponent)
     registerComponent('TestList', TestListComponent)
-  }, [])  // Empty dependency array - only run once
+  }, []) // Empty dependency array - only run once
 
   // Component compilation functions (moved from ComponentRegistryProvider)
   const extractComponentInfo = useCallback((code: string, defaultName = '') => {
@@ -269,8 +293,8 @@ export const ComponentProvider: React.FC<{ children: React.ReactNode }> = ({ chi
       const componentDefinitions = componentInfos
         .map((info) => {
           const componentVariables = componentInfos
-            .filter(other => other.name !== info.name)
-            .map(other => `const ${other.name} = ${other.name}_Component;`)
+            .filter((other) => other.name !== info.name)
+            .map((other) => `const ${other.name} = ${other.name}_Component;`)
             .join('\n          ')
 
           return `
@@ -314,12 +338,90 @@ export const ComponentProvider: React.FC<{ children: React.ReactNode }> = ({ chi
       }
 
       const componentsFactory = new Function(
-        'React', 'Alert', 'Avatar', 'Badge', 'Button', 'Calendar', 'Card', 'Checkbox', 'ConfigProvider', 'DatePicker', 'Dialog', 'Drawer', 'Dropdown', 'FormItem', 'FormContainer', 'Input', 'InputGroup', 'Menu', 'MenuItem', 'Notification', 'Pagination', 'Progress', 'Radio', 'RangeCalendar', 'ScrollBar', 'Segment', 'Select', 'Skeleton', 'Spinner', 'Steps', 'Switcher', 'Table', 'Tabs', 'Tag', 'TimeInput', 'Timeline', 'toast', 'Tooltip', 'Upload', 'axios',
+        'React',
+        'Alert',
+        'Avatar',
+        'Badge',
+        'Button',
+        'Calendar',
+        'Card',
+        'Checkbox',
+        'ConfigProvider',
+        'DatePicker',
+        'Dialog',
+        'Drawer',
+        'Dropdown',
+        'FormItem',
+        'FormContainer',
+        'Input',
+        'InputGroup',
+        'Menu',
+        'MenuItem',
+        'Notification',
+        'Pagination',
+        'Progress',
+        'Radio',
+        'RangeCalendar',
+        'ScrollBar',
+        'Segment',
+        'Select',
+        'Skeleton',
+        'Spinner',
+        'Steps',
+        'Switcher',
+        'Table',
+        'Tabs',
+        'Tag',
+        'TimeInput',
+        'Timeline',
+        'toast',
+        'Tooltip',
+        'Upload',
+        'axios',
         `return ${compiledBundle}`,
       )
 
       const compiledComponentsRegistry = componentsFactory(
-        React, Alert, Avatar, Badge, Button, Calendar, Card, Checkbox, ConfigProvider, DatePicker, Dialog, Drawer, Dropdown, FormItem, FormContainer, Input, InputGroup, Menu, MenuItem, Notification, Pagination, Progress, Radio, RangeCalendar, ScrollBar, Segment, Select, Skeleton, Spinner, Steps, Switcher, Table, Tabs, Tag, TimeInput, Timeline, toast, Tooltip, Upload, axios,
+        React,
+        Alert,
+        Avatar,
+        Badge,
+        Button,
+        Calendar,
+        Card,
+        Checkbox,
+        ConfigProvider,
+        DatePicker,
+        Dialog,
+        Drawer,
+        Dropdown,
+        FormItem,
+        FormContainer,
+        Input,
+        InputGroup,
+        Menu,
+        MenuItem,
+        Notification,
+        Pagination,
+        Progress,
+        Radio,
+        RangeCalendar,
+        ScrollBar,
+        Segment,
+        Select,
+        Skeleton,
+        Spinner,
+        Steps,
+        Switcher,
+        Table,
+        Tabs,
+        Tag,
+        TimeInput,
+        Timeline,
+        toast,
+        Tooltip,
+        Upload,
+        axios,
       )
 
       setCompiledComponents(compiledComponentsRegistry)
@@ -352,14 +454,11 @@ export const ComponentProvider: React.FC<{ children: React.ReactNode }> = ({ chi
     [components, compiledComponents],
   )
 
-  const compileAndRender = useCallback(
-    (code: string, props: ComponentProps = {}) => {
-      if (!code?.trim()) return null
-      // Simplified version - can be extended later
-      return <div>Code compilation not implemented yet</div>
-    },
-    [],
-  )
+  const compileAndRender = useCallback((code: string) => {
+    if (!code?.trim()) return null
+    // Simplified version - can be extended later
+    return <div>Code compilation not implemented yet</div>
+  }, [])
 
   const isComponentRegistered = useCallback(
     (name: string) => {
diff --git a/ui/src/contexts/DemoContext.tsx b/ui/src/contexts/DemoContext.tsx
index 369cd0e..a62dfbf 100644
--- a/ui/src/contexts/DemoContext.tsx
+++ b/ui/src/contexts/DemoContext.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext } from 'react'
+import { createContext, useContext } from 'react'
 
 interface DemoContextValue {
   openDemo: () => void
diff --git a/ui/src/contexts/ScrollContext.tsx b/ui/src/contexts/ScrollContext.tsx
index 6d3ddba..ec65d32 100644
--- a/ui/src/contexts/ScrollContext.tsx
+++ b/ui/src/contexts/ScrollContext.tsx
@@ -1,5 +1,5 @@
 // ScrollContext.tsx
-import React, { createContext, useContext } from 'react'
+import { createContext, useContext } from 'react'
 
 export const ScrollContext = createContext<boolean>(false)
 
diff --git a/ui/src/routes/dynamicRouteLoader.tsx b/ui/src/routes/dynamicRouteLoader.tsx
index 2e8beb9..654bdc3 100644
--- a/ui/src/routes/dynamicRouteLoader.tsx
+++ b/ui/src/routes/dynamicRouteLoader.tsx
@@ -1,5 +1,5 @@
+import React, { lazy } from 'react'
 import { RouteDto } from '@/proxy/routes/models'
-import { lazy } from 'react'
 
 // Tüm view bileşenlerini import et (vite özel)
 // shared klasörü hariç, çünkü bu bileşenler genellikle başka yerlerde statik import ediliyor
diff --git a/ui/src/services/admin/list-form.service.ts b/ui/src/services/admin/list-form.service.ts
index c076dfb..1bff277 100644
--- a/ui/src/services/admin/list-form.service.ts
+++ b/ui/src/services/admin/list-form.service.ts
@@ -50,7 +50,7 @@ export const deleteListFormJsonRow = (id: string, field: string, index: number)
     url: `/api/admin/list-form-json-row/${id}?field=${field}&index=${index}`,
   })
 
-export const getListFormSelectQueryByCode = (listFormCode?: string, op: number = -1) =>
+export const getListFormSelectQueryByCode = (listFormCode?: string) =>
   apiService.fetchData<string>({
     method: 'GET',
     url: `/api/admin/list-form-query-preview/form-select-query`,
diff --git a/ui/src/services/note.service.ts b/ui/src/services/note.service.ts
index a0e9576..293b906 100644
--- a/ui/src/services/note.service.ts
+++ b/ui/src/services/note.service.ts
@@ -56,7 +56,7 @@ class NoteService {
     })
   }
 
-  async downloadFile(savedFileName: string, fileName: string, fileType: string) {
+  async downloadFile(savedFileName: string, fileName: string) {
     const response = await apiService.fetchData<NoteFileDto>({
       url: `/api/app/note/download?savedFileName=${savedFileName}`,
       method: 'GET',
diff --git a/ui/src/services/order.service.ts b/ui/src/services/order.service.ts
index 1735d1c..164e669 100644
--- a/ui/src/services/order.service.ts
+++ b/ui/src/services/order.service.ts
@@ -1,5 +1,5 @@
 import { InstallmentOptionDto, OrderDto, PaymentMethodDto, ProductDto } from '@/proxy/order/models'
-import apiService, { Config } from '@/services/api.service'
+import apiService from '@/services/api.service'
 import axios from 'axios'
 
 export class OrderService {
diff --git a/ui/src/services/platformApi.service.ts b/ui/src/services/platformApi.service.ts
index 6107868..1a1673b 100644
--- a/ui/src/services/platformApi.service.ts
+++ b/ui/src/services/platformApi.service.ts
@@ -111,7 +111,7 @@ platformApiService.interceptors.response.use(
           signOut()
           error.silent = true
         }
-      } catch (error2) {
+      } catch {
         await revokeTokens({
           token: auth.session.token,
           refreshToken: auth.session.refreshToken,
diff --git a/ui/src/types/hr.ts b/ui/src/types/hr.ts
deleted file mode 100644
index 0e778f0..0000000
--- a/ui/src/types/hr.ts
+++ /dev/null
@@ -1,663 +0,0 @@
-import { DepartmentDto, EmployeeDto } from '@/proxy/intranet/models'
-
-export interface Address {
-  // Adres
-  country: string
-  state: string
-  city: string
-  street: string
-  postalCode: string
-}
-
-export interface HrCostCenter {
-  // İnsan Kaynakları Masraf Merkezi
-  id: string
-  code: string
-  name: string
-  description?: string
-  parentCostCenterId?: string
-  parentCostCenter?: HrCostCenter
-  subCostCenters: HrCostCenter[]
-  responsibleEmployeeId?: string
-  responsibleEmployee?: EmployeeDto
-  departmentId?: string
-  department?: DepartmentDto
-  costCenterType: CostCenterType
-  budgetedAmount: number
-  actualAmount: number
-  currency: string
-  fiscalYear: string
-  isActive: boolean
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrPerformanceEvaluation {
-  // İnsan Kaynakları Performans Değerlendirmesi
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  evaluatorId: string
-  evaluator?: EmployeeDto
-  evaluationPeriod: string
-  evaluationType: EvaluationTypeEnum
-  overallRating: number
-  goals: HrPerformanceGoal[]
-  competencies: HrCompetencyRating[]
-  strengths: string[]
-  areasForImprovement: string[]
-  developmentPlan: string[]
-  comments?: string
-  status: EvaluationStatusEnum
-  dueDate: Date
-  completedDate?: Date
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrPerformanceGoal {
-  // İnsan Kaynakları Performans Hedefi
-  id: string
-  evaluationId: string
-  goalDescription: string
-  targetValue?: string
-  actualValue?: string
-  weight: number
-  rating: number
-  comments?: string
-}
-
-export interface HrCompetencyRating {
-  // İnsan Kaynakları Yeterlilik Değerlendirmesi
-  id: string
-  evaluationId: string
-  competencyName: string
-  expectedLevel: number
-  actualLevel: number
-  rating: number
-  comments?: string
-}
-
-export interface HrTraining {
-  // İnsan Kaynakları Eğitimi
-  id: string
-  trainingCode: string
-  title: string
-  description?: string
-  trainingType: TrainingTypeEnum
-  provider: string
-  startDate: Date
-  endDate: Date
-  duration: number
-  location?: string
-  isOnline: boolean
-  maxParticipants?: number
-  cost: number
-  currency: string
-  status: TrainingStatusEnum
-  participants: HrTrainingParticipant[]
-  materials: string[]
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrTrainingParticipant {
-  // İnsan Kaynakları Eğitim Katılımcısı
-  id: string
-  trainingId: string
-  employeeId: string
-  employee?: EmployeeDto
-  enrollmentDate: Date
-  completionDate?: Date
-  status: ParticipationStatusEnum
-  score?: number
-  feedback?: string
-  certificateIssued: boolean
-}
-
-export interface HrWorkSchedule {
-  // İnsan Kaynakları Çalışma Programı
-  id: string
-  scheduleCode: string
-  name: string
-  description?: string
-  workingDays: HrWorkingDay[]
-  totalHoursPerWeek: number
-  isFlexible: boolean
-  isActive: boolean
-}
-
-export interface HrWorkingDay {
-  // İnsan Kaynakları Çalışma Günü
-  dayOfWeek: number // 0-6 (Sunday-Saturday)
-  isWorkingDay: boolean
-  startTime?: string
-  endTime?: string
-  breakDuration?: number // minutes
-}
-
-export interface HrDisciplinaryAction {
-  // İnsan Kaynakları Disiplin Cezası
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  actionType: DisciplinaryActionTypeEnum
-  reason: string
-  description: string
-  actionDate: Date
-  issuedBy: string
-  severity: DisciplinarySeverityEnum
-  status: DisciplinaryStatusEnum
-  expiryDate?: Date
-  attachments: string[]
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrEmergencyContact {
-  // İnsan Kaynakları Acil Durum İletişim
-  name: string
-  relationship: string
-  phoneNumber: string
-  email?: string
-  address?: Address
-}
-
-export interface HrEmploymentType {
-  // İnsan Kaynakları İstihdam Türü
-  id: string
-  name: string
-  count?: number
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrPayroll {
-  // İnsan Kaynakları Maaş Bordrosu
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  period: string
-  baseSalary: number
-  allowances: HrPayrollAllowance[] // İnsan Kaynakları Maaş Ek Ödemeleri
-  deductions: HrPayrollDeduction[] // İnsan Kaynakları Maaş Kesintileri
-  overtime: number
-  bonus: number
-  grossSalary: number
-  netSalary: number
-  tax: number
-  socialSecurity: number
-  status: PayrollStatusEnum
-  paymentDate?: Date
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrPayrollAllowance {
-  // İnsan Kaynakları Maaş Ek Ödemesi
-  id: string
-  name: string
-  amount: number
-  taxable: boolean
-}
-
-export interface HrPayrollDeduction {
-  // İnsan Kaynakları Maaş Kesintisi
-  id: string
-  name: string
-  amount: number
-  mandatory: boolean
-}
-
-export interface HrBadge {
-  // İnsan Kaynakları Rozeti
-  id: string
-  code: string
-  name: string
-  description: string
-  icon: string
-  color: string
-  backgroundColor: string
-  category: BadgeCategoryEnum
-  criteria: string
-  points: number
-  rarity: BadgeRarityEnum
-  isActive: boolean
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrOrganizationChart {
-  // İnsan Kaynakları Organizasyon Şeması
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  parentId?: string
-  parent?: HrOrganizationChart
-  children?: HrOrganizationChart[]
-  level: number
-  position: string
-  isActive: boolean
-}
-
-export interface HrEmployeeBadge {
-  // İnsan Kaynakları Çalışan Rozeti
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  badgeId: string
-  badge?: HrBadge
-  earnedDate: Date
-  expiryDate?: Date
-  reason?: string
-  notes?: string
-  isActive: boolean
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrEvaluation360Template {
-  // İnsan Kaynakları 360 Derece Değerlendirme Şablonu
-  id: string
-  name: string
-  description: string
-  isActive: boolean
-  questionGroups: HrQuestionGroup[]
-  applicablePositions: string[] // JobPosition ID'leri
-  applicableDepartments: string[] // Department ID'leri
-  assessorTypes: AssessorTypeEnum[] // Değerlendiriciler
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrQuestionGroup {
-  // İnsan Kaynakları Soru Grubu
-  id: string
-  templateId: string
-  groupName: string
-  description?: string
-  weight: number // Bu grubun toplam puandaki ağırlığı (%)
-  order: number
-  questions: HrEvaluationQuestion[]
-}
-
-export interface HrEvaluationQuestion {
-  // İnsan Kaynakları Değerlendirme Sorusu
-  id: string
-  groupId: string
-  questionText: string
-  questionType: QuestionTypeEnum
-  isRequired: boolean
-  weight: number // Bu sorunun grup içindeki ağırlığı (%)
-  order: number
-  options?: HrQuestionOption[] // Çoktan seçmeli sorular için
-  minRating?: number
-  maxRating?: number
-  ratingLabels?: string[] // Rating için etiketler (örn: ["Zayıf", "Orta", "İyi", "Mükemmel"])
-}
-
-export interface HrQuestionOption {
-  // İnsan Kaynakları Soru Seçeneği
-  id: string
-  questionId: string
-  optionText: string
-  value: number
-  order: number
-}
-
-export interface HrEvaluation360 {
-  // İnsan Kaynakları 360 Derece Değerlendirme Kampanyası
-  id: string
-  name: string
-  description: string
-  templateId: string
-  template?: HrEvaluation360Template
-  evaluationPeriod: string
-  startDate: Date
-  endDate: Date
-  status: CampaignStatusEnum
-  departmentId?: string // Hedef departman
-  targetEmployees: string[] // Değerlendirilecek Employee ID'leri
-  settings: HrEvaluation360Settings
-  creationTime: Date
-  lastModificationTime: Date
-}
-
-export interface HrEvaluation360Settings {
-  // İnsan Kaynakları 360 Derece Değerlendirme Ayarları
-  allowSelfEvaluation: boolean
-  requireManagerEvaluation: boolean
-  minPeerEvaluations: number
-  minSubordinateEvaluations: number
-  allowAnonymousFeedback: boolean
-  sendReminderEmails: boolean
-  reminderIntervalDays: number
-}
-
-export interface HrEvaluation360Participant {
-  // İnsan Kaynakları 360 Derece Değerlendirme Katılımcısı
-  id: string
-  campaignId: string
-  evaluatedEmployeeId: string // Değerlendirilen kişi
-  evaluatedEmployee?: EmployeeDto
-  evaluatorId: string // Değerlendiren kişi
-  evaluator?: EmployeeDto
-  evaluatorType: AssessorTypeEnum
-  status: ParticipantStatusEnum
-  invitedDate: Date
-  startedDate?: Date
-  completedDate?: Date
-  responses: HrEvaluation360Response[]
-  overallScore?: number
-  notes?: string
-}
-
-export interface HrEvaluation360Response {
-  // İnsan Kaynakları 360 Derece Değerlendirme Cevabı
-  id: string
-  participantId: string
-  questionId: string
-  question?: HrEvaluationQuestion
-  responseValue: string | number // Cevap değeri
-  responseText?: string // Metin cevaplar için
-  score: number // Hesaplanan puan
-  submittedDate: Date
-}
-
-export interface HrEvaluation360Result {
-  // İnsan Kaynakları 360 Derece Değerlendirme Sonucu
-  id: string
-  campaignId: string
-  employeeId: string
-  employee?: EmployeeDto
-  participants: HrEvaluation360Participant[] // Bu sonuca katkıda bulunan değerlendiriciler
-  overallScore: number
-  maxPossibleScore: number
-  scorePercentage: number
-  groupScores: HrGroupScore[]
-  assessorTypeScores: HrAssessorTypeScore[]
-  strengths: string[]
-  developmentAreas: string[]
-  actionPlan: string[]
-  managerComments?: string
-  hrComments?: string
-  status: ResultStatusEnum
-  generatedDate: Date
-  approvedBy?: string
-  approvedDate?: Date
-}
-
-export interface HrGroupScore {
-  // İnsan Kaynakları Grup Puanı
-  groupId: string
-  groupName: string
-  score: number
-  maxScore: number
-  percentage: number
-  responseCount: number
-}
-
-export interface HrAssessorTypeScore {
-  // İnsan Kaynakları Değerlendirici Türü Puanı
-  assessorType: AssessorTypeEnum
-  assessorCount: number
-  averageScore: number
-  maxScore: number
-  percentage: number
-}
-
-export enum PayrollStatusEnum {
-  // Maaş Durumu
-  Draft = 'DRAFT', // Taslak
-  Calculated = 'CALCULATED', // Hesaplandı
-  Approved = 'APPROVED', // Onaylandı
-  Paid = 'PAID', // Ödendi
-  Cancelled = 'CANCELLED', // İptal edildi
-}
-
-export enum GoalStatusEnum {
-  // Hedef Durumu
-  NotStarted = 'NOT_STARTED', // Başlanmadı
-  InProgress = 'IN_PROGRESS', // Devam Ediyor
-  Completed = 'COMPLETED', // Tamamlandı
-  Overdue = 'OVERDUE', // Geçmiş
-  Cancelled = 'CANCELLED', // İptal edildi
-}
-
-export enum BadgeCategoryEnum {
-  // Rozet Kategorisi
-  Performance = 'PERFORMANCE', // Performans
-  Leadership = 'LEADERSHIP', // Liderlik
-  Innovation = 'INNOVATION', // Yenilik
-  Teamwork = 'TEAMWORK', // Takım Çalışması
-  Customer = 'CUSTOMER', // Müşteri
-  Safety = 'SAFETY', // Güvenlik
-  Attendance = 'ATTENDANCE', // Devamsızlık
-  Training = 'TRAINING', // Eğitim
-  Project = 'PROJECT', // Proje
-  Special = 'SPECIAL', // Özel
-}
-
-export enum BadgeRarityEnum {
-  // Rozet Nadirliği
-  Common = 'COMMON', // Orta
-  Uncommon = 'UNCOMMON', // Yaygın olmayan
-  Rare = 'RARE', // Nadir
-  Epic = 'EPIC', // Epik
-  Legendary = 'LEGENDARY', // Efsanevi
-}
-
-export enum ResultStatusEnum {
-  // Sonuç Durumu
-  Pending = 'PENDING', // Beklemede
-  InReview = 'IN_REVIEW', // İnceleniyor
-  Approved = 'APPROVED', // Onaylandı
-  Published = 'PUBLISHED', // Yayınlandı
-}
-
-export enum GenderEnum {
-  // Cinsiyet
-  Male = 'MALE', // Erkek
-  Female = 'FEMALE', // Kadın
-  Other = 'OTHER', // Diğer
-}
-
-export enum MaritalStatusEnum {
-  // Medeni Durum
-  Single = 'SINGLE', // Bekar
-  Married = 'MARRIED', // Evli
-  Divorced = 'DIVORCED', // Boşanmış
-  Widowed = 'WIDOWED', // Dul
-}
-
-export enum CostCenterType {
-  // Masraf Merkezi Türü
-  Revenue = 'REVENUE', // Gelir
-  Standard = 'STANDARD', // Standart
-  Discretionary = 'DISCRETIONARY', // İsteğe bağlı
-  Investment = 'INVESTMENT', // Yatırım
-  Service = 'SERVICE', // Hizmet
-  Production = 'PRODUCTION', // Üretim
-  Support = 'SUPPORT', // Destek
-  Administrative = 'ADMINISTRATIVE', // İdari
-}
-
-export enum EmploymentTypeEnum {
-  // İstihdam Türü
-  FullTime = 'FULL_TIME', // Tam Zamanlı
-  PartTime = 'PART_TIME', // Yarı Zamanlı
-  Contract = 'CONTRACT', // Sözleşmeli
-  Intern = 'INTERN', // Stajyer
-  Temporary = 'TEMPORARY', // Geçici
-  Consultant = 'CONSULTANT', // Danışman
-}
-
-export enum EmployeeStatusEnum {
-  // Çalışan Durumu
-  Active = 'ACTIVE', // Aktif
-  Inactive = 'INACTIVE', // Pasif
-  OnLeave = 'ON_LEAVE', // İzinli
-  Suspended = 'SUSPENDED', // Askıya Alındı
-  Terminated = 'TERMINATED', // İşten Ayrıldı
-}
-
-export enum JobLevelEnum {
-  // İş Seviyesi
-  Entry = 'ENTRY', // Giriş
-  Junior = 'JUNIOR', // Junior
-  Mid = 'MID', // Orta
-  Senior = 'SENIOR', // Kıdemli
-  Lead = 'LEAD', // Lider
-  Manager = 'MANAGER', // Yönetici
-  Director = 'DIRECTOR', // Direktör
-  Executive = 'EXECUTIVE', // İcra
-}
-
-export enum LeaveTypeEnum {
-  // İzin Türü
-  Annual = 'Annual', // Yıllık
-  Sick = 'Sick', // Hastalık
-  Maternity = 'Maternity', // Doğum
-  Paternity = 'Paternity', // Babalık
-  Personal = 'Personal', // Kişisel
-  Emergency = 'Emergency', // Acil
-  Study = 'Study', // Eğitim
-  Unpaid = 'Unpaid', // Ücretsiz
-}
-
-export enum LeaveStatusEnum {
-  // İzin Durumu
-  Pending = 'Pending', // Beklemede
-  Approved = 'Approved', // Onaylandı
-  Rejected = 'Rejected', // Reddedildi
-  Cancelled = 'Cancelled', // İptal edildi
-}
-
-export enum EvaluationStatusEnum {
-  // Değerlendirme Durumu
-  NotStarted = 'NOT_STARTED', // Başlanmadı
-  InProgress = 'IN_PROGRESS', // Devam Ediyor
-  PendingReview = 'PENDING_REVIEW', // İnceleme Bekliyor
-  Completed = 'COMPLETED', // Tamamlandı
-  Overdue = 'OVERDUE', // Geçmiş
-}
-
-export enum TrainingTypeEnum {
-  // Eğitim Türü
-  Technical = 'TECHNICAL', // Teknik
-  Soft_Skills = 'SOFT_SKILLS', // Yumuşak Beceriler
-  Leadership = 'LEADERSHIP', // Liderlik
-  Compliance = 'COMPLIANCE', // Uyum
-  Safety = 'SAFETY', // Güvenlik
-  Product = 'PRODUCT', // Ürün
-  Process = 'PROCESS', // Süreç
-}
-
-export enum TrainingStatusEnum {
-  // Eğitim Durumu
-  Planned = 'PLANNED', // Planlandı
-  Open = 'OPEN', // Açık
-  InProgress = 'IN_PROGRESS', // Devam Ediyor
-  Completed = 'COMPLETED', // Tamamlandı
-  Cancelled = 'CANCELLED', // İptal Edildi
-}
-
-export enum ParticipationStatusEnum {
-  // Katılım Durumu
-  Enrolled = 'ENROLLED', // Kayıtlı
-  InProgress = 'IN_PROGRESS', // Devam Ediyor
-  Completed = 'COMPLETED', // Tamamlandı
-  Failed = 'FAILED', // Başarısız
-  Withdrawn = 'WITHDRAWN', // Çekildi
-}
-
-export enum DisciplinaryActionTypeEnum {
-  // Disiplin Cezası Türü
-  Verbal_Warning = 'VERBAL_WARNING', // Sözlü Uyarı
-  Written_Warning = 'WRITTEN_WARNING', // Yazılı Uyarı
-  Final_Warning = 'FINAL_WARNING', // Son Uyarı
-  Suspension = 'SUSPENSION', // Askıya Alma
-  Termination = 'TERMINATION', // İşten Çıkarma
-  Demotion = 'DEMOTION', // Aşağı Alma
-}
-
-export enum DisciplinarySeverityEnum {
-  // Disiplin Cezası Şiddeti
-  Minor = 'MINOR', // Hafif
-  Major = 'MAJOR', // Ağır
-  Severe = 'SEVERE', // Ciddi
-}
-
-export enum DisciplinaryStatusEnum {
-  // Disiplin Cezası Durumu
-  Active = 'ACTIVE', // Aktif
-  Resolved = 'RESOLVED', // Çözüldü
-  Expired = 'EXPIRED', // Süresi Dolmuş
-  Appealed = 'APPEALED', // İtiraz Edilmiş
-}
-
-export enum AssessorTypeEnum {
-  // Değerlendirici Türü
-  Self = 'SELF', // Kendi
-  Manager = 'MANAGER', // Yönetici
-  Peer = 'PEER', // Meslektaş
-  Subordinate = 'SUBORDINATE', // Ast
-  Customer = 'CUSTOMER', // Müşteri
-  OtherDepartment = 'OTHER_DEPARTMENT', // Diğer Departman
-  HRUpperManagement = 'HR_UPPER_MANAGEMENT', // İK/Üst Yönetim
-  External = 'EXTERNAL', // Dış paydaş değerlendirmesi (mevcut)
-}
-
-export enum EvaluationTypeEnum {
-  // Değerlendirme Türü
-  Annual = 'ANNUAL', // Yıllık
-  Quarterly = 'QUARTERLY', // Çeyrek
-  Probation = 'PROBATION', // Deneme Süresi
-  Project = 'PROJECT', // Proje
-  Competency = 'COMPETENCY', // Yeterlilik
-  Leadership = 'LEADERSHIP', // Liderlik
-  Degree360 = 'DEGREE_360', // 360° Derece değerlendirme
-}
-
-export enum CampaignStatusEnum {
-  // Kampanya Durumu
-  Draft = 'DRAFT', // Taslak
-  Active = 'ACTIVE', // Aktif
-  Completed = 'COMPLETED', // Tamamlandı
-  Cancelled = 'CANCELLED', // İptal Edildi
-}
-
-export enum ParticipantStatusEnum {
-  // Katılımcı Durumu
-  Invited = 'INVITED', // Davet Edildi
-  Started = 'STARTED', // Başladı
-  Completed = 'COMPLETED', // Tamamlandı
-  Expired = 'EXPIRED', // Süresi Dolmuş
-  Declined = 'DECLINED', // Reddedildi
-}
-
-export enum QuestionTypeEnum {
-  // Soru Türü
-  Rating = 'RATING', // 1-5 puan verme
-  MultipleChoice = 'MULTIPLE_CHOICE', // Çoktan seçmeli
-  Text = 'TEXT', // Metin cevap
-  YesNo = 'YES_NO', // Evet/Hayır
-  Scale = 'SCALE', // Ölçek (1-10 gibi)
-}
-
-export const getQuestionTypeText = (type: QuestionTypeEnum) => {
-  switch (type) {
-    case QuestionTypeEnum.Rating:
-      return 'Puanlama'
-    case QuestionTypeEnum.MultipleChoice:
-      return 'Çoktan Seçmeli'
-    case QuestionTypeEnum.Text:
-      return 'Metin'
-    case QuestionTypeEnum.YesNo:
-      return 'Evet/Hayır'
-    case QuestionTypeEnum.Scale:
-      return 'Ölçek'
-    default:
-      return 'Bilinmeyen'
-  }
-}
diff --git a/ui/src/utils/deepParseJson.ts b/ui/src/utils/deepParseJson.ts
index 362386c..14ea4d8 100644
--- a/ui/src/utils/deepParseJson.ts
+++ b/ui/src/utils/deepParseJson.ts
@@ -11,7 +11,7 @@ function deepParseJson(jsonString: Json): Json {
         }
         try {
             return deepParseJson(JSON.parse(jsonString))
-        } catch (err) {
+        } catch {
             return jsonString
         }
     } else if (Array.isArray(jsonString)) {
diff --git a/ui/src/views/admin/activityLog/ActivityLog.tsx b/ui/src/views/admin/activityLog/ActivityLog.tsx
index f8437dd..0b363d6 100644
--- a/ui/src/views/admin/activityLog/ActivityLog.tsx
+++ b/ui/src/views/admin/activityLog/ActivityLog.tsx
@@ -7,12 +7,8 @@ import { NotificationDto } from '@/proxy/notification/models'
 import { getList } from '@/services/notification.service'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import dayjs from 'dayjs'
-import { Dictionary } from 'lodash'
-import forOwn from 'lodash/forOwn'
 import groupBy from 'lodash/groupBy'
-import has from 'lodash/has'
-import merge from 'lodash/merge'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import Log from './components/Log'
 import LogFilter from './components/LogFilter'
 import { Helmet } from 'react-helmet'
@@ -21,12 +17,13 @@ import { DIR_RTL } from '@/constants/theme.constant'
 import { useStoreState } from '@/store'
 
 const itemsPerPage = 10
+type NotificationGroups = Record<string, NotificationDto[]>
 
 const ActivityLog = () => {
   const { translate } = useLocalization()
 
   const [loading, setLoading] = useState(false)
-  const [notifications, setNotifications] = useState<Dictionary<NotificationDto[]>>({})
+  const [notifications, setNotifications] = useState<NotificationGroups>({})
   const [page, setPage] = useState(0)
   const [hasMore, setHasMore] = useState(false)
   const [isFilterDrawerOpen, setIsFilterDrawerOpen] = useState(false)
@@ -41,38 +38,43 @@ const ActivityLog = () => {
     NotificationChannels.WhatsApp,
   ])
 
-  const fetchData = async (isLoadmore: boolean = false) => {
+  const fetchData = useCallback(async (isLoadmore: boolean = false) => {
     setLoading(true)
-    const response = await getList({
-      maxResultCount: itemsPerPage,
-      skipCount: page * itemsPerPage,
-      sorting: 'CreationTime DESC',
-      channels: filter,
-      isListRequest: true,
-    })
-    const items = response.data?.items ?? []
-
-    const currentItemCount = page * itemsPerPage + items.length
-    setHasMore((response.data?.totalCount ?? 0) > currentItemCount)
-    const logs = groupBy(items, (a) => dayjs(a.creationTime).format('YYYY-MM-DD'))
-
-    if (isLoadmore) {
-      forOwn(notifications, function (value, key) {
-        if (has(logs, key)) {
-          notifications[key] = [...notifications[key], ...logs[key]]
-          delete logs[key]
-        }
+    try {
+      const response = await getList({
+        maxResultCount: itemsPerPage,
+        skipCount: page * itemsPerPage,
+        sorting: 'CreationTime DESC',
+        channels: filter,
+        isListRequest: true,
       })
-      setNotifications(merge(notifications, logs))
-    } else {
-      setNotifications(logs)
+      const items = response.data?.items ?? []
+
+      const currentItemCount = page * itemsPerPage + items.length
+      setHasMore((response.data?.totalCount ?? 0) > currentItemCount)
+      const logs = groupBy(items, (a) => dayjs(a.creationTime).format('YYYY-MM-DD'))
+
+      if (isLoadmore) {
+        setNotifications((prev) => {
+          const next: NotificationGroups = { ...prev }
+
+          for (const [key, value] of Object.entries(logs)) {
+            next[key] = [...(next[key] ?? []), ...value]
+          }
+
+          return next
+        })
+      } else {
+        setNotifications(logs)
+      }
+    } finally {
+      setLoading(false)
     }
-    setLoading(false)
-  }
+  }, [filter, page])
 
   useEffect(() => {
     fetchData(page > 0)
-  }, [page, filter])
+  }, [fetchData, page])
 
   const handleFilterChange = (value: string[]) => {
     setPage(0)
@@ -111,13 +113,13 @@ const ActivityLog = () => {
               <Log
                 notifications={notifications}
                 isLoading={loading}
-                onLoadMore={() => setPage((prev) => prev + 1)}
                 loadable={hasMore}
+                onLoadMore={() => setPage((prev) => prev + 1)}
               ></Log>
             </div>
 
             <div className="hidden lg:block">
-              <LogFilter filter={filter} onFilterChange={handleFilterChange} useAffix className="dark:bg-gray-800" />
+              <LogFilter useAffix filter={filter} className="dark:bg-gray-800" onFilterChange={handleFilterChange} />
             </div>
           </div>
         </div>
@@ -132,9 +134,9 @@ const ActivityLog = () => {
         >
           <LogFilter
             filter={filter}
-            onFilterChange={handleFilterChange}
             useAffix={false}
             className="border-none p-0 dark:bg-gray-800"
+            onFilterChange={handleFilterChange}
           />
         </Drawer>
       </AdaptableCard>
diff --git a/ui/src/views/admin/activityLog/components/Log.tsx b/ui/src/views/admin/activityLog/components/Log.tsx
index ada92f9..d3e2ca2 100644
--- a/ui/src/views/admin/activityLog/components/Log.tsx
+++ b/ui/src/views/admin/activityLog/components/Log.tsx
@@ -5,7 +5,6 @@ import { AVATAR_URL } from '@/constants/app.constant'
 import { NotificationDto } from '@/proxy/notification/models'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import dayjs from 'dayjs'
-import { Dictionary } from 'lodash'
 import isEmpty from 'lodash/isEmpty'
 import keys from 'lodash/keys'
 import Event from './Event'
@@ -18,7 +17,7 @@ const Log = ({
   isLoading,
   loadable,
 }: {
-  notifications: Dictionary<NotificationDto[]>
+  notifications: Record<string, NotificationDto[]>
   onLoadMore: () => void
   isLoading: boolean
   loadable: boolean
@@ -38,7 +37,7 @@ const Log = ({
               {isEmpty(notifications[group]) ? (
                 <Timeline.Item className="dark:text-gray-400">Bildirim yok</Timeline.Item>
               ) : (
-                notifications[group].map((notification, i) => (
+                notifications[group].map((notification) => (
                   <Timeline.Item
                     key={notification.id}
                     media={
@@ -57,7 +56,7 @@ const Log = ({
         ))}
         <div className="text-center">
           {loadable ? (
-            <Button size="sm" loading={isLoading} onClick={onLoadMore} variant='solid'>
+            <Button size="sm" loading={isLoading} variant='solid' onClick={onLoadMore}>
               {translate('::Abp.Identity.ActivityLogs.LoadMore')}
             </Button>
           ) : (
diff --git a/ui/src/views/admin/files/FileManager.tsx b/ui/src/views/admin/files/FileManager.tsx
index 09a3813..4648c43 100644
--- a/ui/src/views/admin/files/FileManager.tsx
+++ b/ui/src/views/admin/files/FileManager.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useRef } from 'react'
+import { useState, useEffect, useCallback, useRef, type MouseEvent } from 'react'
 import { Helmet } from 'react-helmet'
 import { Button, Input, Select, toast, Notification, Spinner } from '@/components/ui'
 import { useStoreState } from '@/store'
@@ -251,7 +251,7 @@ const FileManager = () => {
     })
   }
 
-  const handleItemDoubleClick = (item: FileItemType, event?: React.MouseEvent) => {
+  const handleItemDoubleClick = (item: FileItemType, event?: MouseEvent) => {
     // Prevent text selection and other default behaviors
     if (event) {
       event.preventDefault()
@@ -409,7 +409,7 @@ const FileManager = () => {
       if (hasFiles) {
         toast.push(
           <Notification title="Security Warning" type="warning">
-            Folder '{item.name}' contains files and cannot be deleted for security reasons.
+            Folder {item.name} contains files and cannot be deleted for security reasons.
           </Notification>,
         )
         return
@@ -491,6 +491,8 @@ const FileManager = () => {
     return () => {
       document.removeEventListener('keydown', handleKeyDown)
     }
+    // Keyboard shortcuts should bind once per selection/list state snapshot.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedItems, filteredItems])
 
   // Bulk operations
@@ -710,7 +712,7 @@ const FileManager = () => {
           setLoading(false)
         }
       }
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification title="Error" type="danger">
           Invalid clipboard data
@@ -738,18 +740,18 @@ const FileManager = () => {
             <Button
               variant="plain"
               icon={<FaArrowUp />}
-              onClick={goUpOneLevel}
               size="sm"
               disabled={breadcrumbItems.length <= 1}
               className="text-gray-600 hover:text-blue-600 flex-shrink-0"
               title="Go up one level"
+              onClick={goUpOneLevel}
             />
             <Button
               variant="solid"
               icon={<FaCloudUploadAlt />}
-              onClick={() => setUploadModalOpen(true)}
               size="sm"
               className="flex-shrink-0"
+              onClick={() => setUploadModalOpen(true)}
             >
               <span className="hidden sm:inline">{translate('::FileManager.UploadFiles')}</span>
               <span className="sm:hidden">{translate('::FileManager.Upload')}</span>
@@ -757,9 +759,9 @@ const FileManager = () => {
             <Button
               variant="default"
               icon={<FaFolder />}
-              onClick={() => setCreateFolderModalOpen(true)}
               size="sm"
               className="flex-shrink-0"
+              onClick={() => setCreateFolderModalOpen(true)}
             >
               <span className="hidden sm:inline">{translate('::FileManager.CreateFolder')}</span>
               <span className="sm:hidden">{translate('::FileManager.Create')}</span>
@@ -769,33 +771,37 @@ const FileManager = () => {
             <Button
               variant="plain"
               icon={<FaCopy />}
-              onClick={copySelectedItems}
               disabled={selectedItems.length === 0}
               size="sm"
               className="text-gray-600 hover:text-blue-600 disabled:opacity-50 flex-shrink-0"
               title={translate('::FileManager.CopySelectedItems')}
+              onClick={copySelectedItems}
             />
             <Button
               variant="plain"
               icon={<FaCut />}
-              onClick={cutSelectedItems}
               disabled={selectedItems.length === 0}
               size="sm"
               className="text-gray-600 hover:text-orange-600 disabled:opacity-50 flex-shrink-0"
               title={translate('::FileManager.CutSelectedItems')}
+              onClick={cutSelectedItems}
             />
             <Button
               variant="plain"
               icon={<FaPaste />}
-              onClick={pasteItems}
               disabled={!hasClipboardData}
               size="sm"
               className="text-gray-600 hover:text-green-600 disabled:opacity-50 flex-shrink-0"
               title={translate('::FileManager.PasteSelectedItems')}
+              onClick={pasteItems}
             />
             <Button
               variant="plain"
               icon={<FaEdit />}
+              size="sm"
+              disabled={selectedItems.length !== 1}
+              className="text-gray-600 hover:text-blue-600 flex-shrink-0"
+              title={translate('::FileManager.RenameSelectedItem')}
               onClick={() => {
                 if (selectedItems.length === 1) {
                   const itemToRename = filteredItems.find((item) => item.id === selectedItems[0])
@@ -810,15 +816,21 @@ const FileManager = () => {
                   }
                 }
               }}
-              size="sm"
-              disabled={selectedItems.length !== 1}
-              className="text-gray-600 hover:text-blue-600 flex-shrink-0"
-              title={translate('::FileManager.RenameSelectedItem')}
             ></Button>
 
             <Button
               variant="plain"
               icon={<FaDownload />}
+              size="sm"
+              disabled={
+                selectedItems.length !== 1 ||
+                (() => {
+                  const selectedItem = filteredItems.find((item) => item.id === selectedItems[0])
+                  return selectedItem?.type !== 'file'
+                })()
+              }
+              className="text-gray-600 hover:text-green-600 flex-shrink-0"
+              title={translate('::FileManager.DownloadSelectedFile')}
               onClick={() => {
                 if (selectedItems.length === 1) {
                   const itemToDownload = filteredItems.find((item) => item.id === selectedItems[0])
@@ -833,26 +845,16 @@ const FileManager = () => {
                   }
                 }
               }}
-              size="sm"
-              disabled={
-                selectedItems.length !== 1 ||
-                (() => {
-                  const selectedItem = filteredItems.find((item) => item.id === selectedItems[0])
-                  return selectedItem?.type !== 'file'
-                })()
-              }
-              className="text-gray-600 hover:text-green-600 flex-shrink-0"
-              title={translate('::FileManager.DownloadSelectedFile')}
             ></Button>
 
             <Button
               variant="plain"
               icon={<FaTrash />}
-              onClick={deleteSelectedItems}
               size="sm"
               disabled={selectedItems.length === 0}
               className="text-gray-600 hover:text-red-600 flex-shrink-0"
               title={translate('::FileManager.DeleteSelectedItems')}
+              onClick={deleteSelectedItems}
             >
               <span>{translate('::Delete')}</span> {selectedItems.length > 0 && `(${selectedItems.length})`}
             </Button>
@@ -869,11 +871,6 @@ const FileManager = () => {
                     <FaSquare />
                   )
                 }
-                onClick={
-                  selectedItems.length === filteredItems.filter((item) => !item.isReadOnly).length
-                    ? deselectAllItems
-                    : selectAllItems
-                }
                 size="sm"
                 className="text-gray-600 hover:text-blue-600 flex-shrink-0"
                 title={
@@ -881,6 +878,11 @@ const FileManager = () => {
                     ? 'Deselect all selectable items'
                     : 'Select all selectable items'
                 }
+                onClick={
+                  selectedItems.length === filteredItems.filter((item) => !item.isReadOnly).length
+                    ? deselectAllItems
+                    : selectAllItems
+                }
               >
                 <span className="hidden lg:inline">
                   {selectedItems.length === filteredItems.filter((item) => !item.isReadOnly).length
@@ -904,9 +906,9 @@ const FileManager = () => {
                 size="sm"
                 placeholder={translate('::FileManager.SearchFiles')}
                 value={filters.searchTerm}
-                onChange={(e) => setFilters((prev) => ({ ...prev, searchTerm: e.target.value }))}
                 prefix={<FaSearch className="text-gray-400" />}
                 className="w-full sm:w-36 md:w-48"
+                onChange={(e) => setFilters((prev) => ({ ...prev, searchTerm: e.target.value }))}
               />
             </div>
 
@@ -954,15 +956,15 @@ const FileManager = () => {
                 size="sm"
                 icon={<FaTh />}
                 variant={viewMode === 'grid' ? 'solid' : 'default'}
-                onClick={() => setViewMode('grid')}
                 title="Grid view"
+                onClick={() => setViewMode('grid')}
               />
               <Button
                 size="sm"
                 icon={<FaList />}
                 variant={viewMode === 'list' ? 'solid' : 'default'}
-                onClick={() => setViewMode('list')}
                 title="List view"
+                onClick={() => setViewMode('list')}
               />
             </div>
           </div>
@@ -1131,40 +1133,40 @@ const FileManager = () => {
       {/* Modals */}
       <FileUploadModal
         isOpen={uploadModalOpen}
-        onClose={() => setUploadModalOpen(false)}
-        onUpload={handleUploadFiles}
         currentFolderId={currentFolderId}
         loading={uploading}
+        onClose={() => setUploadModalOpen(false)}
+        onUpload={handleUploadFiles}
       />
 
       <CreateFolderModal
         isOpen={createFolderModalOpen}
-        onClose={() => setCreateFolderModalOpen(false)}
-        onCreate={handleCreateFolder}
         loading={creating}
         currentFolderId={currentFolderId}
+        onClose={() => setCreateFolderModalOpen(false)}
+        onCreate={handleCreateFolder}
       />
 
       <RenameItemModal
         isOpen={renameModalOpen}
+        item={itemToRename}
+        loading={renaming}
         onClose={() => {
           setRenameModalOpen(false)
           setItemToRename(undefined)
         }}
         onRename={handleRenameItem}
-        item={itemToRename}
-        loading={renaming}
       />
 
       <DeleteConfirmModal
         isOpen={deleteModalOpen}
+        items={itemsToDelete}
+        loading={deleting}
         onClose={() => {
           setDeleteModalOpen(false)
           setItemsToDelete([])
         }}
         onDelete={handleDeleteItems}
-        items={itemsToDelete}
-        loading={deleting}
       />
     </Container>
   )
diff --git a/ui/src/views/admin/files/components/Breadcrumb.tsx b/ui/src/views/admin/files/components/Breadcrumb.tsx
index eef0892..2e01957 100644
--- a/ui/src/views/admin/files/components/Breadcrumb.tsx
+++ b/ui/src/views/admin/files/components/Breadcrumb.tsx
@@ -27,7 +27,6 @@ const Breadcrumb = forwardRef<HTMLDivElement, BreadcrumbProps>((props, ref) => {
                 <FaFolder className="h-4 w-4 mr-1" />
               )
             }
-            onClick={() => onNavigate(item)}
             className={classNames(
               'flex items-center px-2 py-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors',
               index === items.length - 1
@@ -35,6 +34,7 @@ const Breadcrumb = forwardRef<HTMLDivElement, BreadcrumbProps>((props, ref) => {
                 : 'text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100',
             )}
             disabled={index === items.length - 1}
+            onClick={() => onNavigate(item)}
           >
             <span className="truncate max-w-32">{item.name}</span>
           </Button>
diff --git a/ui/src/views/admin/files/components/FileItem.tsx b/ui/src/views/admin/files/components/FileItem.tsx
index a7f76d5..2764f9d 100644
--- a/ui/src/views/admin/files/components/FileItem.tsx
+++ b/ui/src/views/admin/files/components/FileItem.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useState, useEffect } from 'react'
+import { forwardRef, useState, useEffect, type ChangeEvent, type MouseEvent } from 'react'
 import classNames from 'classnames'
 import {
   FaFolder,
@@ -16,7 +16,6 @@ import {
   FaLink,
 } from 'react-icons/fa'
 import { toast, Notification } from '@/components/ui'
-// import { Dropdown } from '@/components/ui' // Artık kullanmıyoruz
 import type { FileItem as FileItemType, FileActionMenuItem } from '@/types/fileManagement'
 import { FILE_URL } from '@/constants/app.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -26,7 +25,7 @@ export interface FileItemProps {
   selected?: boolean
   viewMode?: 'grid' | 'list'
   onSelect?: (item: FileItemType) => void
-  onDoubleClick?: (item: FileItemType, event?: React.MouseEvent) => void
+  onDoubleClick?: (item: FileItemType, event?: MouseEvent) => void
   onCreateFolder?: (parentItem: FileItemType) => void
   onRename?: (item: FileItemType) => void
   onMove?: (item: FileItemType) => void
@@ -141,11 +140,11 @@ const FileItem = forwardRef<HTMLDivElement, FileItemProps>((props, ref) => {
     onSelect?.(item)
   }
 
-  const handleDoubleClick = (e: React.MouseEvent) => {
+  const handleDoubleClick = (e: MouseEvent) => {
     onDoubleClick?.(item, e)
   }
 
-  const handleContextMenu = (e: React.MouseEvent) => {
+  const handleContextMenu = (e: MouseEvent) => {
     e.preventDefault()
     e.stopPropagation()
     
@@ -171,12 +170,12 @@ const FileItem = forwardRef<HTMLDivElement, FileItemProps>((props, ref) => {
     }
   }, [dropdownOpen])
 
-  const handleCheckboxChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleCheckboxChange = (e: ChangeEvent<HTMLInputElement>) => {
     e.stopPropagation() // Prevent item selection when clicking checkbox
     onToggleSelect?.(item)
   }
 
-  const handleCheckboxClick = (e: React.MouseEvent) => {
+  const handleCheckboxClick = (e: MouseEvent) => {
     e.stopPropagation() // Prevent item selection when clicking checkbox
   }
 
@@ -216,7 +215,7 @@ const FileItem = forwardRef<HTMLDivElement, FileItemProps>((props, ref) => {
                 () => {
                   toast.push(
                     <Notification type="success" title="Başarılı">
-                      Dosya URL'si panoya kopyalandı
+                      Dosya URL&apos;si panoya kopyalandı
                     </Notification>,
                   )
                 },
@@ -367,9 +366,9 @@ const FileItem = forwardRef<HTMLDivElement, FileItemProps>((props, ref) => {
             <input
               type="checkbox"
               checked={selected}
+              className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
               onChange={handleCheckboxChange}
               onClick={handleCheckboxClick}
-              className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
             />
           ) : (
             <div className="w-4 h-4" /> // Boş alan bırak
@@ -464,9 +463,9 @@ const FileItem = forwardRef<HTMLDivElement, FileItemProps>((props, ref) => {
           <input
             type="checkbox"
             checked={selected}
+            className="w-4 h-4 text-blue-600 bg-white border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 shadow-sm"
             onChange={handleCheckboxChange}
             onClick={handleCheckboxClick}
-            className="w-4 h-4 text-blue-600 bg-white border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 shadow-sm"
           />
         </div>
       )}
diff --git a/ui/src/views/admin/files/components/FileModals.tsx b/ui/src/views/admin/files/components/FileModals.tsx
index ce64cb1..625320a 100644
--- a/ui/src/views/admin/files/components/FileModals.tsx
+++ b/ui/src/views/admin/files/components/FileModals.tsx
@@ -1,6 +1,5 @@
-import { forwardRef, useState, useEffect } from 'react'
+import { forwardRef, useState, useEffect, type FormEvent } from 'react'
 import { Dialog, Button, Input, FormItem } from '@/components/ui'
-import { FaTimes } from 'react-icons/fa'
 import type { FileItem } from '@/types/fileManagement'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 
@@ -20,7 +19,7 @@ export const CreateFolderModal = forwardRef<HTMLDivElement, CreateFolderModalPro
     const [error, setError] = useState('')
     const { translate } = useLocalization()
 
-    const handleSubmit = async (e: React.FormEvent) => {
+    const handleSubmit = async (e: FormEvent) => {
       e.preventDefault()
 
       if (!folderName.trim()) {
@@ -33,7 +32,7 @@ export const CreateFolderModal = forwardRef<HTMLDivElement, CreateFolderModalPro
         setFolderName('')
         setError('')
         onClose()
-      } catch (err) {
+      } catch {
         setError('Failed to create folder')
       }
     }
@@ -47,27 +46,27 @@ export const CreateFolderModal = forwardRef<HTMLDivElement, CreateFolderModalPro
     return (
       <Dialog isOpen={isOpen} onClose={handleClose}>
         <div ref={ref}>
-          <form onSubmit={handleSubmit} className="py-6">
+          <form className="py-6" onSubmit={handleSubmit}>
             <FormItem label={translate('::FileManager.FolderName')} invalid={!!error} errorMessage={error}>
               <Input
-                value={folderName}
-                onChange={(e) => setFolderName(e.target.value)}
                 autoFocus
+                value={folderName}
                 className="mt-2"
+                onChange={(e) => setFolderName(e.target.value)}
               />
             </FormItem>
           </form>
 
           <div className="flex justify-end space-x-2 pt-4 border-t">
-            <Button size='sm' variant="default" onClick={handleClose} disabled={loading}>
+            <Button size='sm' variant="default" disabled={loading} onClick={handleClose}>
               {translate('::Cancel')}
             </Button>
             <Button
               size='sm'
               variant="solid"
-              onClick={handleSubmit}
               loading={loading}
               disabled={!folderName.trim()}
+              onClick={handleSubmit}
             >
               {translate('::FileManager.CreateFolder')}
             </Button>
@@ -102,7 +101,7 @@ export const RenameItemModal = forwardRef<HTMLDivElement, RenameItemModalProps>(
     }
   }, [item])
 
-  const handleSubmit = async (e: React.FormEvent) => {
+  const handleSubmit = async (e: FormEvent) => {
     e.preventDefault()
 
     if (!newName.trim()) {
@@ -119,7 +118,7 @@ export const RenameItemModal = forwardRef<HTMLDivElement, RenameItemModalProps>(
       await onRename(newName.trim())
       setError('')
       onClose()
-    } catch (err) {
+    } catch {
       setError(`Failed to rename ${item?.type}`)
     }
   }
@@ -141,31 +140,31 @@ export const RenameItemModal = forwardRef<HTMLDivElement, RenameItemModalProps>(
           </h3>
         </div>
 
-        <form onSubmit={handleSubmit} className="py-6">
+        <form className="py-6" onSubmit={handleSubmit}>
           <FormItem
             label={translate(`::FileManager.${item.type === 'folder' ? 'FolderName' : 'FileName'}`)}
             invalid={!!error}
             errorMessage={error}
           >
             <Input
-              value={newName}
-              onChange={(e) => setNewName(e.target.value)}
-              placeholder={`Enter ${translate(`::FileManager.${item.type === 'folder' ? 'FolderName' : 'FileName'}`)}`}
               autoFocus
+              value={newName}
+              placeholder={`Enter ${translate(`::FileManager.${item.type === 'folder' ? 'FolderName' : 'FileName'}`)}`}
+              onChange={(e) => setNewName(e.target.value)}
             />
           </FormItem>
         </form>
 
         <div className="flex justify-end space-x-2 pt-4 border-t">
-          <Button size='sm' variant="default" onClick={handleClose} disabled={loading}>
+          <Button size='sm' variant="default" disabled={loading} onClick={handleClose}>
             {translate('::Cancel')}
           </Button>
           <Button
             size='sm'
             variant="solid"
-            onClick={handleSubmit}
             loading={loading}
             disabled={!newName.trim()}
+            onClick={handleSubmit}
           >
             {translate('::App.Listform.ListformField.Rename')}
           </Button>
@@ -195,7 +194,7 @@ export const DeleteConfirmModal = forwardRef<HTMLDivElement, DeleteConfirmModalP
       try {
         await onDelete()
         onClose()
-      } catch (err) {
+      } catch {
         // Error handling is done in parent component
       }
     }
@@ -240,14 +239,14 @@ export const DeleteConfirmModal = forwardRef<HTMLDivElement, DeleteConfirmModalP
           </div>
 
           <div className="flex justify-end space-x-2 pt-4 border-t">
-            <Button size='sm' variant="default" onClick={onClose} disabled={loading}>
+            <Button size='sm' variant="default" disabled={loading} onClick={onClose}>
               {translate('::Cancel')}
             </Button>
             <Button
               size='sm'
               variant="solid"
-              onClick={handleDelete}
               loading={loading}
+              onClick={handleDelete}
             >
               {translate('::Delete')}
             </Button>
diff --git a/ui/src/views/admin/files/components/FileUploadModal.tsx b/ui/src/views/admin/files/components/FileUploadModal.tsx
index 8e1e42c..0d48e5a 100644
--- a/ui/src/views/admin/files/components/FileUploadModal.tsx
+++ b/ui/src/views/admin/files/components/FileUploadModal.tsx
@@ -1,4 +1,11 @@
-import { forwardRef, useState, useCallback, useRef } from 'react'
+import {
+  forwardRef,
+  useState,
+  useCallback,
+  useRef,
+  type ChangeEvent,
+  type DragEvent,
+} from 'react'
 import { Dialog, Button, Progress } from '@/components/ui'
 import { FaCloudUploadAlt, FaTimes } from 'react-icons/fa'
 import classNames from 'classnames'
@@ -22,7 +29,7 @@ interface UploadFileWithProgress {
 }
 
 const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props, ref) => {
-  const { isOpen, onClose, onUpload, currentFolderId, loading = false, className } = props
+  const { isOpen, onClose, onUpload, className } = props
 
   const [uploadFiles, setUploadFiles] = useState<UploadFileWithProgress[]>([])
   const [isDragOver, setIsDragOver] = useState(false)
@@ -53,24 +60,24 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
     setUploadFiles((prev) => [...prev, ...newFiles])
   }, [])
 
-  const handleFileInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleFileInputChange = (e: ChangeEvent<HTMLInputElement>) => {
     if (e.target.files) {
       handleFilesSelect(e.target.files)
     }
   }
 
-  const handleDragOver = useCallback((e: React.DragEvent) => {
+  const handleDragOver = useCallback((e: DragEvent) => {
     e.preventDefault()
     setIsDragOver(true)
   }, [])
 
-  const handleDragLeave = useCallback((e: React.DragEvent) => {
+  const handleDragLeave = useCallback((e: DragEvent) => {
     e.preventDefault()
     setIsDragOver(false)
   }, [])
 
   const handleDrop = useCallback(
-    (e: React.DragEvent) => {
+    (e: DragEvent) => {
       e.preventDefault()
       setIsDragOver(false)
 
@@ -216,10 +223,6 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
     }
   }
 
-  const clearCompletedFiles = () => {
-    setUploadFiles((prev) => prev.filter((f) => f.status !== 'completed'))
-  }
-
   const clearErrorFiles = () => {
     setUploadFiles((prev) => prev.filter((f) => f.status !== 'error'))
   }
@@ -231,7 +234,7 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
   const hasError = errorFiles > 0
 
   return (
-    <Dialog isOpen={isOpen} onClose={handleClose} className={className}>
+    <Dialog isOpen={isOpen} className={className} onClose={handleClose}>
       <div ref={ref}>
         <div className="flex items-center justify-between pb-2 border-b">
           <h3 className="text-lg font-semibold">Upload Files</h3>
@@ -251,11 +254,11 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
           >
             <input
               ref={fileInputRef}
-              type="file"
               multiple
+              type="file"
               className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
-              onChange={handleFileInputChange}
               disabled={uploading}
+              onChange={handleFileInputChange}
             />
 
             <FaCloudUploadAlt className="mx-auto h-12 w-12 text-gray-400 mb-4" />
@@ -318,9 +321,9 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
                       variant="plain"
                       size="sm"
                       icon={<FaTimes />}
-                      onClick={() => removeFile(file.id)}
                       disabled={uploading}
                       className="ml-2 flex-shrink-0"
+                      onClick={() => removeFile(file.id)}
                     />
                   )}
                 </div>
@@ -349,21 +352,21 @@ const FileUploadModal = forwardRef<HTMLDivElement, FileUploadModalProps>((props,
             {hasError && !uploading && (
               <Button
                 variant="plain"
-                onClick={clearErrorFiles}
                 className="text-red-600 hover:text-red-700"
+                onClick={clearErrorFiles}
               >
                 Clear Errors
               </Button>
             )}
-            <Button size="sm" variant="default" onClick={handleClose} disabled={uploading}>
+            <Button size="sm" variant="default" disabled={uploading} onClick={handleClose}>
               {uploading ? 'Uploading...' : 'Close'}
             </Button>
             <Button
               size="sm"
               variant="solid"
-              onClick={handleUpload}
               disabled={pendingFiles === 0 || uploading}
               loading={uploading}
+              onClick={handleUpload}
             >
               {uploading ? 'Uploading...' : `Upload ${pendingFiles} File(s)`}
             </Button>
diff --git a/ui/src/views/admin/hr/OrgChart.tsx b/ui/src/views/admin/hr/OrgChart.tsx
index f02358e..3a0248a 100644
--- a/ui/src/views/admin/hr/OrgChart.tsx
+++ b/ui/src/views/admin/hr/OrgChart.tsx
@@ -1,4 +1,15 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  type Dispatch,
+  type MutableRefObject,
+  type SetStateAction,
+  type WheelEvent,
+  type MouseEvent as ReactMouseEvent,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import {
   FaSitemap,
   FaBriefcase,
@@ -19,11 +30,10 @@ import {
   OrgChartUserDto,
 } from '@/services/orgChart.service'
 import { useLocalization } from '@/utils/hooks/useLocalization'
-import { APP_NAME } from '@/constants/app.constant'
+import { AVATAR_URL, APP_NAME } from '@/constants/app.constant'
 import Loading from '@/components/shared/Loading'
 import { useCurrentMenuIcon } from '@/utils/hooks/useCurrentMenuIcon'
 import { Avatar, Button } from '@/components/ui'
-import { AVATAR_URL } from '@/constants/app.constant'
 import { useStoreState } from '@/store'
 import UserProfileCard from '@/views/intranet/SocialWall/UserProfileCard'
 
@@ -436,9 +446,9 @@ function OrgChartNode({
   tenantId?: string
   zoom: number
   positions: PositionMap
-  setPositions: React.Dispatch<React.SetStateAction<PositionMap>>
-  nodeRefs: React.MutableRefObject<NodeRefMap>
-  cardRefs: React.MutableRefObject<CardRefMap>
+  setPositions: Dispatch<SetStateAction<PositionMap>>
+  nodeRefs: MutableRefObject<NodeRefMap>
+  cardRefs: MutableRefObject<CardRefMap>
   requestRepaint: () => void
   applySelfTransform?: boolean
 }) {
@@ -451,9 +461,8 @@ function OrgChartNode({
   const levelColor = LEVEL_COLORS[depth % LEVEL_COLORS.length]
   const borderColor = levelColor.border
   const headerBg = levelColor.header
-  const badgeBg = levelColor.badge
 
-  const handleDragStart = (e: React.MouseEvent<HTMLDivElement>) => {
+  const handleDragStart = (e: ReactMouseEvent<HTMLDivElement>) => {
     const target = e.target as HTMLElement
     if (target.closest('[data-stop-drag="true"]')) {
       return
@@ -508,12 +517,12 @@ function OrgChartNode({
         ref={(el) => {
           cardRefs.current[node.id] = el
         }}
-        onMouseDown={handleDragStart}
         data-card=""
         data-depth={depth}
         data-users-visible={showUsers ? 'true' : 'false'}
         className={`relative bg-white border ${borderColor} rounded-xl shadow-sm w-36 sm:w-44 md:w-52 hover:shadow-md transition-shadow`}
         style={{ cursor: dragging ? 'grabbing' : 'grab' }}
+        onMouseDown={handleDragStart}
       >
         {/* Header bar */}
         <div
@@ -534,10 +543,6 @@ function OrgChartNode({
           {hasChildren && (
             <Button
               data-stop-drag="true"
-              onClick={() => {
-                setCollapsed((c) => !c)
-                requestRepaint()
-              }}
               variant="plain"
               shape="circle"
               icon={
@@ -548,6 +553,10 @@ function OrgChartNode({
                 )
               }
               className="ml-1 !h-5 !w-5 flex-shrink-0 !px-0 text-white opacity-70 transition-opacity hover:opacity-100"
+              onClick={() => {
+                setCollapsed((c) => !c)
+                requestRepaint()
+              }}
             ></Button>
           )}
         </div>
@@ -590,7 +599,7 @@ function OrgChartNode({
       {/* Children */}
       {hasChildren && !collapsed && (
         <div className="mt-6 sm:mt-8 md:mt-10 flex items-start gap-4 sm:gap-6 md:gap-10">
-          {node.children.map((child, idx) => {
+          {node.children.map((child) => {
             const childPosition = positions[child.id] ?? { x: 0, y: 0 }
 
             return (
@@ -639,7 +648,7 @@ function OrgChartTree({
   tenantId?: string
   zoom: number
   positions: PositionMap
-  setPositions: React.Dispatch<React.SetStateAction<PositionMap>>
+  setPositions: Dispatch<SetStateAction<PositionMap>>
   edges: EdgeLink[]
 }) {
   const containerRef = useRef<HTMLDivElement>(null)
@@ -836,7 +845,7 @@ const OrgChart = () => {
     setPositions({})
   }, [mode])
 
-  const handleWheelZoom = (e: React.WheelEvent<HTMLDivElement>) => {
+  const handleWheelZoom = (e: WheelEvent<HTMLDivElement>) => {
     if (!e.ctrlKey) {
       return
     }
@@ -882,7 +891,6 @@ const OrgChart = () => {
           <div className="flex flex-wrap items-center gap-2">
             <div className="flex items-center bg-slate-100 dark:bg-gray-800 rounded-lg p-1 gap-1">
               <Button
-                onClick={() => setMode('department')}
                 variant="plain"
                 shape="none"
                 icon={<FaBuilding className="h-3.5 w-3.5 flex-shrink-0" />}
@@ -892,13 +900,13 @@ const OrgChart = () => {
                     ? '!bg-blue-600 !text-white shadow-sm ring-1 ring-blue-300/70 dark:ring-blue-400/70'
                     : '!bg-transparent text-slate-600 hover:!bg-white hover:text-slate-800 dark:text-gray-300 dark:hover:!bg-gray-700 dark:hover:text-white'
                 }`}
+                onClick={() => setMode('department')}
               >
                 <span className="hidden sm:inline">
                   {translate('::App.Hr.Department') || 'Departman'}
                 </span>
               </Button>
               <Button
-                onClick={() => setMode('jobPosition')}
                 variant="plain"
                 shape="none"
                 icon={<FaBriefcase className="h-3.5 w-3.5 flex-shrink-0" />}
@@ -908,6 +916,7 @@ const OrgChart = () => {
                     ? '!bg-purple-600 !text-white shadow-sm ring-1 ring-purple-300/70 dark:ring-purple-400/70'
                     : '!bg-transparent text-slate-600 hover:!bg-white hover:text-slate-800 dark:text-gray-300 dark:hover:!bg-gray-700 dark:hover:text-white'
                 }`}
+                onClick={() => setMode('jobPosition')}
               >
                 <span className="hidden sm:inline">
                   {translate('::App.Hr.JobPosition') || 'Pozisyon'}
@@ -920,8 +929,8 @@ const OrgChart = () => {
                 <input
                   type="checkbox"
                   checked={showUsers}
-                  onChange={(e) => setShowUsers(e.target.checked)}
                   className="h-4 w-4 rounded border-slate-300 dark:border-gray-600 text-blue-600 focus:ring-blue-500"
+                  onChange={(e) => setShowUsers(e.target.checked)}
                 />
                 <span className="hidden sm:inline">
                   {translate('::App.Definitions.OrgChart.ShowUsers') || 'Kullanıcılar'}
@@ -931,42 +940,42 @@ const OrgChart = () => {
 
             <div className="flex items-center bg-slate-100 dark:bg-gray-800 rounded-lg p-1 gap-1">
               <Button
-                onClick={handleZoomOut}
                 variant="plain"
                 shape="none"
                 icon={<FaSearchMinus className="h-3.5 w-3.5" />}
                 className="!h-7 !w-7 !rounded-md !px-0 text-slate-600 hover:!bg-white hover:text-slate-800 dark:text-gray-300 dark:hover:!bg-gray-700 dark:hover:text-white sm:!h-8 sm:!w-8"
                 title="Zoom Out"
+                onClick={handleZoomOut}
               />
               <span className="text-xs font-medium text-slate-600 dark:text-gray-300 px-1 min-w-[36px] sm:min-w-[46px] text-center">
                 {Math.round(zoom * 100)}%
               </span>
               <Button
-                onClick={handleZoomIn}
                 variant="plain"
                 shape="none"
                 icon={<FaSearchPlus className="h-3.5 w-3.5" />}
                 className="!h-7 !w-7 !rounded-md !px-0 text-slate-600 hover:!bg-white hover:text-slate-800 dark:text-gray-300 dark:hover:!bg-gray-700 dark:hover:text-white sm:!h-8 sm:!w-8"
                 title="Zoom In"
+                onClick={handleZoomIn}
               />
               <Button
-                onClick={handleZoomReset}
                 variant="plain"
                 shape="none"
                 icon={<FaUndo className="h-3.5 w-3.5" />}
                 className="!h-7 !w-7 !rounded-md !px-0 text-slate-600 hover:!bg-white hover:text-slate-800 dark:text-gray-300 dark:hover:!bg-gray-700 dark:hover:text-white sm:!h-8 sm:!w-8"
                 title="Reset Zoom"
+                onClick={handleZoomReset}
               />
             </div>
 
             <Button
-              onClick={handleExportJpg}
               disabled={exporting || loading}
               variant="plain"
               shape="none"
               icon={<FaFileImage className="h-3.5 w-3.5 flex-shrink-0" />}
               className="!inline-flex !h-auto !items-center !justify-center gap-1.5 !rounded-lg bg-slate-100 !p-1.5 text-xs font-medium text-slate-600 transition-colors hover:!bg-slate-200 disabled:opacity-50 dark:bg-gray-800 dark:text-gray-300 dark:hover:!bg-gray-700 sm:!p-2 sm:text-sm"
               title="JPG olarak indir"
+              onClick={handleExportJpg}
             >
               <span className="hidden sm:inline">{exporting ? 'İşleniyor…' : 'Export'}</span>
             </Button>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabAnimation.tsx b/ui/src/views/admin/listForm/edit/ChartTabAnimation.tsx
index 84cc7cc..6607aef 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabAnimation.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabAnimation.tsx
@@ -1,4 +1,4 @@
-import { Card, Checkbox, FormContainer, FormItem, Input, Select, Button } from '@/components/ui'
+import { Checkbox, FormContainer, FormItem, Input, Select, Button } from '@/components/ui'
 import { SelectBoxOption } from '@/types/shared'
 import { Field, FieldProps, Form, Formik } from 'formik'
 import { object } from 'yup'
@@ -26,7 +26,7 @@ function ChartTabAnimation(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartAnimationForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <FormItem
@@ -79,7 +79,7 @@ function ChartTabAnimation(props: FormEditProps) {
               <Field type="number" name="animationDto.maxPointCountSupported" component={Input} />
             </FormItem>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabAnnotations.tsx b/ui/src/views/admin/listForm/edit/ChartTabAnnotations.tsx
index 26ea6a8..6aac15b 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabAnnotations.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabAnnotations.tsx
@@ -68,7 +68,7 @@ function ChartTabAnnotations(props: FormEditProps) {
         )
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <Tabs defaultValue="annotations_general">
@@ -121,7 +121,7 @@ function ChartTabAnnotations(props: FormEditProps) {
                                 size="sm"
                                 title="Edit"
                                 icon={<FaEdit />}
-                                onClick={async (e) => {
+                                onClick={async () => {
                                   setJsonRowOpModalData({
                                     tabName: ListFormEditTabs.ChartAnnotations.GeneralJsonRow,
                                     operation: 'update',
@@ -660,7 +660,7 @@ function ChartTabAnnotations(props: FormEditProps) {
               </TabContent>
             </Tabs>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabAxis.tsx b/ui/src/views/admin/listForm/edit/ChartTabAxis.tsx
index 3538308..11e298a 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabAxis.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabAxis.tsx
@@ -60,7 +60,7 @@ function ChartTabAxis(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartAxis.CommonAxisForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <Tabs defaultValue="axis_value">
@@ -114,7 +114,7 @@ function ChartTabAxis(props: FormEditProps) {
                                 size="sm"
                                 title="Edit"
                                 icon={<FaEdit />}
-                                onClick={async (e) => {
+                                onClick={async () => {
                                   setJsonRowOpModalData({
                                     tabName: ListFormEditTabs.ChartAxis.ValueAxisJsonRow,
                                     operation: 'update',
@@ -541,7 +541,7 @@ function ChartTabAxis(props: FormEditProps) {
               </TabContent>
             </Tabs>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabCommonSettings.tsx b/ui/src/views/admin/listForm/edit/ChartTabCommonSettings.tsx
index d38dd24..81d3866 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabCommonSettings.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabCommonSettings.tsx
@@ -13,7 +13,7 @@ import TabList from '@/components/ui/Tabs/TabList'
 import TabNav from '@/components/ui/Tabs/TabNav'
 import { IdentityRoleDto } from '@/proxy/admin/models'
 import { SelectBoxOption } from '@/types/shared'
-import { Field, FieldProps, Form, Formik, FormikErrors, FormikTouched } from 'formik'
+import { Field, FieldProps, Form, Formik } from 'formik'
 import { FormEditProps } from '../../listForm/edit/FormEdit'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { useStoreState } from '@/store/store'
@@ -53,7 +53,7 @@ function ChartTabCommonSettings(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartCommon, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <Tabs defaultValue="commonSettings_general">
@@ -716,7 +716,7 @@ function ChartTabCommonSettings(props: FormEditProps) {
               </TabContent>
             </Tabs>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabCrosshair.tsx b/ui/src/views/admin/listForm/edit/ChartTabCrosshair.tsx
index e85bfd8..369df23 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabCrosshair.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabCrosshair.tsx
@@ -26,7 +26,7 @@ function ChartTabCrosshair(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartCrosshairForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-3">
@@ -336,7 +336,7 @@ function ChartTabCrosshair(props: FormEditProps) {
               </Card>
             </div>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabExport.tsx b/ui/src/views/admin/listForm/edit/ChartTabExport.tsx
index dc549eb..7df54a0 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabExport.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabExport.tsx
@@ -1,4 +1,4 @@
-import { Button, Card, Checkbox, FormContainer, FormItem, Input } from '@/components/ui'
+import { Button, Checkbox, FormContainer, FormItem, Input } from '@/components/ui'
 import { Field, FieldProps, Form, Formik } from 'formik'
 import { FormEditProps } from '../../listForm/edit/FormEdit'
 import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -24,7 +24,7 @@ function ChartTabExport(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartExportForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting }) => (
         <Form>
           <FormContainer size="sm">
             <FormItem label="Enabled">
@@ -65,7 +65,7 @@ function ChartTabExport(props: FormEditProps) {
             </FormItem>
             
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabLegend.tsx b/ui/src/views/admin/listForm/edit/ChartTabLegend.tsx
index e39769c..6b0ef91 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabLegend.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabLegend.tsx
@@ -5,12 +5,8 @@ import {
   FormContainer,
   FormItem,
   Input,
-  Select,
-  Tabs,
+  Select
 } from '@/components/ui'
-import TabContent from '@/components/ui/Tabs/TabContent'
-import TabList from '@/components/ui/Tabs/TabList'
-import TabNav from '@/components/ui/Tabs/TabNav'
 import { SelectBoxOption } from '@/types/shared'
 import { Field, FieldProps, Form, Formik } from 'formik'
 import { FormEditProps } from '../../listForm/edit/FormEdit'
@@ -42,7 +38,7 @@ function ChartTabLegend(props: FormEditProps) {
         await props.onSubmit(ListFormEditTabs.ChartLegendForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
@@ -216,7 +212,7 @@ function ChartTabLegend(props: FormEditProps) {
               </Card>
             </div>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabPanes.tsx b/ui/src/views/admin/listForm/edit/ChartTabPanes.tsx
index 6be8ddb..b747ab9 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabPanes.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabPanes.tsx
@@ -43,7 +43,7 @@ function ChartTabPanes(props: FormEditProps) {
         )
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting }) => (
         <Form>
           <FormContainer size="sm">
             <Card className="my-2">
@@ -110,7 +110,7 @@ function ChartTabPanes(props: FormEditProps) {
                             size="sm"
                             title="Edit"
                             icon={<FaEdit />}
-                            onClick={async (e) => {
+                            onClick={async () => {
                               setJsonRowOpModalData({
                                 tabName: ListFormEditTabs.ChartPanes.PanesJsonRow,
                                 operation: 'update',
@@ -155,7 +155,7 @@ function ChartTabPanes(props: FormEditProps) {
               setData={setJsonRowOpModalData}
             />
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabSeries.tsx b/ui/src/views/admin/listForm/edit/ChartTabSeries.tsx
index 833fa02..2a9b8ac 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabSeries.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabSeries.tsx
@@ -34,7 +34,7 @@ import {
   chartSeriesSelectionModeOptions,
   chartSeriesDashStyleOptions,
 } from './options'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { JsonRowDialogData } from './json-row-operations/types'
 import JsonRowOpDialogSeries from './json-row-operations/JsonRowOpDialogSeries'
 import CreatableSelect from 'react-select/creatable'
@@ -52,25 +52,22 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
   const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
 
   const listFormValues = useStoreState((s) => s.admin.lists.values)
-  if (!listFormValues) {
-    return null
-  }
 
-  const valueAxisList = () => {
-    return listFormValues?.valueAxisDto.map((key: ChartValueAxisDto) => ({
+  const valueAxisList = useMemo(() => {
+    return (listFormValues?.valueAxisDto ?? []).map((key: ChartValueAxisDto) => ({
       value: key.name,
       label: key.name,
     }))
-  }
+  }, [listFormValues?.valueAxisDto])
 
-  const valuePaneList = () => {
-    return listFormValues?.panesDto.map((key: ChartPanesDto) => ({
+  const valuePaneList = useMemo(() => {
+    return (listFormValues?.panesDto ?? []).map((key: ChartPanesDto) => ({
       value: key.name,
       label: key.name,
     }))
-  }
+  }, [listFormValues?.panesDto])
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!props.listFormCode) {
       return
     }
@@ -101,13 +98,17 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
         },
       )
     }
-  }
+  }, [props.listFormCode])
 
   useEffect(() => {
     if (props.listFormCode) {
       getFields()
     }
-  }, [props.listFormCode])
+  }, [getFields, props.listFormCode])
+
+  if (!listFormValues) {
+    return null
+  }
 
   return (
     <Formik
@@ -121,7 +122,7 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
         )
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <Tabs defaultValue="series_general">
@@ -176,7 +177,7 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                                 size="sm"
                                 title="Edit"
                                 icon={<FaEdit />}
-                                onClick={async (e) => {
+                                onClick={async () => {
                                   setJsonRowOpModalData({
                                     tabName: ListFormEditTabs.ChartSeries.GeneralJsonRow,
                                     operation: 'update',
@@ -346,9 +347,9 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                                 (option) =>
                                   option.value === values.commonSeriesSettingsDto.argumentField,
                               )}
-                              onChange={(option) => form.setFieldValue(field.name, option?.value)}
                               menuPlacement="auto"
                               maxMenuHeight={150}
+                              onChange={(option) => form.setFieldValue(field.name, option?.value)}
                             />
                           )}
                         </Field>
@@ -362,7 +363,7 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                         }
                         errorMessage={errors.commonSeriesSettingsDto?.valueField}
                       >
-                        <Field type="text" name="valueField">
+                        <Field type="text" name="commonSeriesSettingsDto.valueField">
                           {({ field, form }: FieldProps<SelectBoxOption>) => (
                             <Select
                               componentAs={CreatableSelect}
@@ -374,9 +375,9 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                                 (option) =>
                                   option.value === values.commonSeriesSettingsDto.valueField,
                               )}
-                              onChange={(option) => form.setFieldValue(field.name, option?.value)}
                               menuPlacement="auto"
                               maxMenuHeight={150}
+                              onChange={(option) => form.setFieldValue(field.name, option?.value)}
                             />
                           )}
                         </Field>
@@ -398,9 +399,9 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                             <Select
                               field={field}
                               form={form}
-                              options={valueAxisList()}
+                              options={valueAxisList}
                               isClearable={true}
-                              value={valueAxisList()?.find(
+                              value={valueAxisList.find(
                                 (option) => option.value === values.commonSeriesSettingsDto.axis,
                               )}
                               onChange={(option) => form.setFieldValue(field.name, option?.value)}
@@ -424,9 +425,9 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
                             <Select
                               field={field}
                               form={form}
-                              options={valuePaneList()}
+                              options={valuePaneList}
                               isClearable={true}
-                              value={valuePaneList()?.find(
+                              value={valuePaneList.find(
                                 (option) => option.value === values.commonSeriesSettingsDto.pane,
                               )}
                               onChange={(option) => form.setFieldValue(field.name, option?.value)}
@@ -523,7 +524,7 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
               </TabContent>
             </Tabs>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/ChartTabZoomAndPan.tsx b/ui/src/views/admin/listForm/edit/ChartTabZoomAndPan.tsx
index 435ed95..9f215bd 100644
--- a/ui/src/views/admin/listForm/edit/ChartTabZoomAndPan.tsx
+++ b/ui/src/views/admin/listForm/edit/ChartTabZoomAndPan.tsx
@@ -26,7 +26,7 @@ const ChartTabZoomAndPan = (props: FormEditProps) => {
         await props.onSubmit(ListFormEditTabs.ChartZoomForm, values, formikHelpers)
       }}
     >
-      {({ touched, errors, resetForm, isSubmitting, values }) => (
+      {({ touched, errors, isSubmitting, values }) => (
         <Form>
           <FormContainer size="sm">
             <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
@@ -176,7 +176,7 @@ const ChartTabZoomAndPan = (props: FormEditProps) => {
               </Card>
             </div>
             <div className="mt-4">
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </div>
diff --git a/ui/src/views/admin/listForm/edit/FormCustomization.tsx b/ui/src/views/admin/listForm/edit/FormCustomization.tsx
index 93ea16f..20c2a62 100644
--- a/ui/src/views/admin/listForm/edit/FormCustomization.tsx
+++ b/ui/src/views/admin/listForm/edit/FormCustomization.tsx
@@ -294,7 +294,7 @@ function FormCustomization({
                     />
                   </FormItem>
 
-                  <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+                  <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                     {isSubmitting ? translate('::Saving') : translate('::Save')}
                   </Button>
                 </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormEdit.tsx b/ui/src/views/admin/listForm/edit/FormEdit.tsx
index 504e13e..ded4e06 100644
--- a/ui/src/views/admin/listForm/edit/FormEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/FormEdit.tsx
@@ -1,4 +1,4 @@
-import { Alert, Badge, Notification, Tabs, toast } from '@/components/ui'
+import { Badge, Notification, Tabs, toast } from '@/components/ui'
 import TabContent from '@/components/ui/Tabs/TabContent'
 import TabList from '@/components/ui/Tabs/TabList'
 import TabNav from '@/components/ui/Tabs/TabNav'
@@ -7,7 +7,7 @@ import { SelectBoxOption } from '@/types/shared'
 import { useStoreActions, useStoreState } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { FormikHelpers } from 'formik'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { Helmet } from 'react-helmet'
 import { Link, useParams } from 'react-router-dom'
 import FormCustomization from './FormCustomization'
@@ -27,8 +27,7 @@ import FormTabSubForm from './FormTabSubForm'
 import FormFields from './form-fields/FormFields'
 import { putListForms } from '@/services/admin/list-form.service'
 import { getRoles, getUsers } from '@/services/identity.service'
-import { GridOptionsEditDto, ListFormCustomizationDto } from '@/proxy/form/models'
-import { SelectCommandTypeEnum } from '@/proxy/form/models'
+import { SelectCommandTypeEnum, GridOptionsEditDto, ListFormCustomizationDto } from '@/proxy/form/models'
 import { IdentityRoleDto, IdentityUserDto } from '@/proxy/admin/models'
 import { getListFormCustomizations } from '@/services/admin/list-form-customization.service'
 import { sqlObjectManagerService } from '@/services/sql-query-manager.service'
@@ -95,7 +94,7 @@ const FormEdit = () => {
     }
   }, [languages])
 
-  const getRoleList = async () => {
+  const getRoleList = useCallback(async () => {
     const response = await getRoles()
     if (response.data?.items) {
       setRoleList(
@@ -105,9 +104,9 @@ const FormEdit = () => {
         })),
       )
     }
-  }
+  }, [])
 
-  const getUserList = async () => {
+  const getUserList = useCallback(async () => {
     const response = await getUsers(0, 1000)
     if (response.data?.items) {
       setUserList(
@@ -117,17 +116,17 @@ const FormEdit = () => {
         })),
       )
     }
-  }
+  }, [])
 
-  const getCustomizations = async () => {
+  const getCustomizations = useCallback(async () => {
     if (!listFormCode) {
       return
     }
     const resp = await getListFormCustomizations({ listFormCode, maxResultCount: 1000 })
     setCustomizations(resp?.data?.items)
-  }
+  }, [listFormCode])
 
-  const refreshData = async () => {
+  const refreshData = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -135,7 +134,7 @@ const FormEdit = () => {
     await getCustomizations()
     await getRoleList()
     await getUserList()
-  }
+  }, [getCustomizations, getListFormValues, getRoleList, getUserList, listFormCode])
 
   const listFormType = listFormValues?.listFormType || 'List'
   const [activeFormType, setActiveFormType] = useState<string>(listFormType)
@@ -144,7 +143,7 @@ const FormEdit = () => {
   //LİST FORM ve LİST FORM FİELDS AİT BİLGİLER
   useEffect(() => {
     refreshData()
-  }, [listFormCode])
+  }, [refreshData])
 
   useEffect(() => {
     const loadWorkflowColumns = async () => {
@@ -378,9 +377,9 @@ const FormEdit = () => {
 
         <TabContent value="details" className="px-2">
           <FormTabDetails
-            onSubmit={onSubmit}
             roleList={roleList}
             userList={userList}
+            onSubmit={onSubmit}
             onFormTypeChange={setActiveFormType}
           />
         </TabContent>
@@ -442,7 +441,7 @@ const FormEdit = () => {
           <FormTabSubForm />
         </TabContent>
         <TabContent value="widget" className="px-2">
-          <FormTabWidgets listFormCode={listFormCode} />
+          <FormTabWidgets />
         </TabContent>
         <TabContent value="workflow" className="px-2">
           <FormTabWorkflow
@@ -478,7 +477,7 @@ const FormEdit = () => {
           <ChartTabCommonSettings onSubmit={onSubmit} />
         </TabContent>
         <TabContent value="series" className="px-2">
-          <ChartTabSeries onSubmit={onSubmit} listFormCode={listFormCode} />
+          <ChartTabSeries listFormCode={listFormCode} onSubmit={onSubmit} />
         </TabContent>
         <TabContent value="panes" className="px-2">
           <ChartTabPanes onSubmit={onSubmit} />
diff --git a/ui/src/views/admin/listForm/edit/FormTabColumns.tsx b/ui/src/views/admin/listForm/edit/FormTabColumns.tsx
index c4ee30d..5c4761d 100644
--- a/ui/src/views/admin/listForm/edit/FormTabColumns.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabColumns.tsx
@@ -1,13 +1,10 @@
 import { Container } from '@/components/shared'
 import {
   Button,
-  Card,
   Checkbox,
   FormContainer,
   FormItem,
-  Input,
   Select,
-  Tabs,
 } from '@/components/ui'
 import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
 import { useStoreState } from '@/store'
@@ -310,7 +307,7 @@ function FormTabColumns(props: FormEditProps) {
                 </div>
               </div>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit" className="my-2">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit" className="my-2">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabCommands.tsx b/ui/src/views/admin/listForm/edit/FormTabCommands.tsx
index f9a6bcd..ec6d38a 100644
--- a/ui/src/views/admin/listForm/edit/FormTabCommands.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabCommands.tsx
@@ -78,7 +78,7 @@ function FormTabCommands() {
                       size="sm"
                       title="Edit"
                       icon={<FaEdit />}
-                      onClick={async (e) => {
+                      onClick={async () => {
                         setJsonRowOpModalData({
                           tabName: ListFormEditTabs.CommandColumnsJsonRow,
                           operation: 'update',
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseDataSource.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseDataSource.tsx
index 740f78a..6538b85 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseDataSource.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseDataSource.tsx
@@ -263,10 +263,10 @@ function FormTabDatabaseDataSource(props: FormEditProps) {
                         : []
                       return (
                         <Select
+                          isClearable
                           componentAs={CreatableSelect}
                           field={field}
                           form={form}
-                          isClearable
                           isLoading={isLoadingDbObjects}
                           options={grouped}
                           placeholder={
@@ -346,10 +346,10 @@ function FormTabDatabaseDataSource(props: FormEditProps) {
                   <Field type="text" autoComplete="off" name="keyFieldName">
                     {({ field, form }: FieldProps<string>) => (
                       <Select
+                        isClearable
                         componentAs={CreatableSelect}
                         field={field}
                         form={form}
-                        isClearable
                         isLoading={isLoadingColumns}
                         placeholder={
                           isLoadingColumns
@@ -387,7 +387,7 @@ function FormTabDatabaseDataSource(props: FormEditProps) {
                 </FormItem>
               </Card>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting}>
+              <Button block size="sm" variant="solid" loading={isSubmitting}>
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
index a6f659e..cb7bef5 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
@@ -48,7 +48,7 @@ function FormTabDatabaseDelete({
           await onSubmit(ListFormEditTabs.Database.Delete.DeleteForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, values, isSubmitting }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <Card className="my-2">
@@ -116,7 +116,7 @@ function FormTabDatabaseDelete({
                   </FormItem>
                 </div>
 
-                <Button size="sm" block variant="solid" loading={isSubmitting}>
+                <Button block size="sm" variant="solid" loading={isSubmitting}>
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </Card>
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
index b9fccdc..0392035 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
@@ -48,7 +48,7 @@ function FormTabDatabaseInsert({
           await onSubmit(ListFormEditTabs.Database.Insert.InsertForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, values, isSubmitting }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <Card className="my-2">
@@ -114,7 +114,7 @@ function FormTabDatabaseInsert({
                     />
                   </FormItem>
                 </div>
-                <Button size="sm" block variant="solid" loading={isSubmitting}>
+                <Button block size="sm" variant="solid" loading={isSubmitting}>
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </Card>
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
index 4b8b6c8..183b83b 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
@@ -48,7 +48,7 @@ function FormTabDatabaseSelect({
           await onSubmit(ListFormEditTabs.Database.Select.SelectForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, values, isSubmitting }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <Card className="my-2">
@@ -65,7 +65,7 @@ function FormTabDatabaseSelect({
                     component={Input}
                   />
                 </FormItem>
-                <Button size="sm" block variant="solid" loading={isSubmitting}>
+                <Button block size="sm" variant="solid" loading={isSubmitting}>
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </Card>
diff --git a/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx b/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
index 7905536..54ac19d 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
@@ -48,7 +48,7 @@ function FormTabDatabaseUpdate({
           await onSubmit(ListFormEditTabs.Database.Update.UpdateForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, values, isSubmitting }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <Card className="my-2">
@@ -114,7 +114,7 @@ function FormTabDatabaseUpdate({
                     />
                   </FormItem>
                 </div>
-                <Button size="sm" block variant="solid" loading={isSubmitting}>
+                <Button block size="sm" variant="solid" loading={isSubmitting}>
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </Card>
diff --git a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx
index 1cb3254..9c5cbb5 100644
--- a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx
@@ -1,4 +1,3 @@
-import { Container } from '@/components/shared'
 import { Button, Card, Checkbox, FormContainer, FormItem, Input, Select } from '@/components/ui'
 import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
 import { LanguageInfo } from '@/proxy/config/models'
@@ -47,9 +46,6 @@ function FormTabDetails(
 
   const languages = useStoreState((state) => state.abpConfig.config?.localization.languages)
   const listFormValues = useStoreState((s) => s.admin.lists.values)
-  if (!listFormValues) {
-    return null
-  }
 
   useEffect(() => {
     if (languages) {
@@ -62,6 +58,10 @@ function FormTabDetails(
     }
   }, [languages])
 
+  if (!listFormValues) {
+    return null
+  }
+
   return (
     <Formik
       initialValues={listFormValues}
@@ -437,7 +437,7 @@ function FormTabDetails(
               </Card>
             </div>
 
-            <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+            <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
               {isSubmitting ? translate('::Saving') : translate('::Save')}
             </Button>
           </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabEdit.tsx b/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
index bc3f51d..3590d82 100644
--- a/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabEdit.tsx
@@ -454,7 +454,7 @@ function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
                   )}
                 </Card>
               </div>
-              <Button size="sm" block variant="solid" loading={isSubmitting}>
+              <Button block size="sm" variant="solid" loading={isSubmitting}>
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabFilters.tsx b/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
index e4cceea..fabcf92 100644
--- a/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabFilters.tsx
@@ -1,7 +1,6 @@
 import { Container } from '@/components/shared'
 import {
   Button,
-  Card,
   Checkbox,
   FormContainer,
   FormItem,
@@ -18,15 +17,10 @@ import * as Yup from 'yup'
 import { FormEditProps } from './FormEdit'
 import {
   applyFilterOptions,
-  overflowWrapOptions,
-  sortModeOptions,
-  whiteSpaceOptions,
 } from './options'
 import TabList from '@/components/ui/Tabs/TabList'
 import TabNav from '@/components/ui/Tabs/TabNav'
 import TabContent from '@/components/ui/Tabs/TabContent'
-import { GridOptionsSortModeEnum } from '@/proxy/form/models'
-import { SelectBoxOption } from '@/types/shared'
 
 const validationSchema = Yup.object().shape({})
 
@@ -304,7 +298,7 @@ function FormTabFilters(props: FormEditProps) {
                 </TabContent>
               </Tabs>
 
-              <Button size="sm"  block variant="solid" loading={isSubmitting} type="submit">
+              <Button block  size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabGantt.tsx b/ui/src/views/admin/listForm/edit/FormTabGantt.tsx
index 51913fe..a2d0951 100644
--- a/ui/src/views/admin/listForm/edit/FormTabGantt.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabGantt.tsx
@@ -16,9 +16,9 @@ import { Field, FieldProps, Form, Formik } from 'formik'
 import * as Yup from 'yup'
 import { FormEditProps } from './FormEdit'
 import { SelectBoxOption } from '@/types/shared'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { getListFormFields } from '@/services/admin/list-form-field.service'
-import { groupBy } from 'lodash'
+import groupBy from 'lodash/groupBy'
 import { useParams } from 'react-router-dom'
 import { GanttScaleType } from 'devextreme/ui/gantt'
 import { gantScaleOptions } from './options'
@@ -30,7 +30,7 @@ function FormTabGantt(props: FormEditProps) {
   const { translate } = useLocalization()
   const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -61,11 +61,11 @@ function FormTabGantt(props: FormEditProps) {
         },
       )
     }
-  }
+  }, [listFormCode])
 
   useEffect(() => {
     getFields()
-  }, [listFormCode])
+  }, [getFields])
 
   const listFormValues = useStoreState((s) => s.admin.lists.values)
   if (!listFormValues) {
@@ -471,7 +471,7 @@ function FormTabGantt(props: FormEditProps) {
               </Card>
             </div>
 
-            <Button size="sm" block variant="solid" loading={isSubmitting} type="submit" className="my-2">
+            <Button block size="sm" variant="solid" loading={isSubmitting} type="submit" className="my-2">
               {isSubmitting ? translate('::Saving') : translate('::Save')}
             </Button>
           </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabGroup.tsx b/ui/src/views/admin/listForm/edit/FormTabGroup.tsx
index 8eafc4f..a390e97 100644
--- a/ui/src/views/admin/listForm/edit/FormTabGroup.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabGroup.tsx
@@ -26,7 +26,7 @@ function FormTabGroup(props: FormEditProps) {
           await props.onSubmit(ListFormEditTabs.GroupForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem
@@ -54,7 +54,7 @@ function FormTabGroup(props: FormEditProps) {
                 />
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabPager.tsx b/ui/src/views/admin/listForm/edit/FormTabPager.tsx
index 9208722..db04c92 100644
--- a/ui/src/views/admin/listForm/edit/FormTabPager.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabPager.tsx
@@ -235,7 +235,7 @@ function FormTabPager(props: FormEditProps) {
                 </div>
               </div>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
index e1e68f1..3866cd0 100644
--- a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
@@ -26,28 +26,27 @@ function FormTabPermissions(props: FormEditProps) {
   const { translate } = useLocalization()
 
   const listFormValues = useStoreState((s) => s.admin.lists.values)
+
+  useEffect(() => {
+    const loadPermissions = async () => {
+      const response = await getPermissionsList()
+      if (response.data) {
+        setPermissions(
+          response.data.map((permission: PermissionDefinitionRecord) => ({
+            value: permission.name,
+            label: permission.name,
+          })),
+        )
+      }
+    }
+
+    loadPermissions()
+  }, [])
+
   if (!listFormValues) {
     return null
   }
 
-  const getPermissionList = async () => {
-    const response = await getPermissionsList()
-    if (response.data) {
-      setPermissions(
-        response.data.map((permission: PermissionDefinitionRecord) => ({
-          value: permission.name,
-          label: permission.name,
-        })),
-      )
-    }
-  }
-
-  useEffect(() => {
-    if (permissions) {
-      getPermissionList()
-    }
-  }, [permissions])
-
   return (
     <Container className="grid xl:grid-cols-2">
       <Formik
@@ -239,7 +238,7 @@ function FormTabPermissions(props: FormEditProps) {
                 </FormItem>
               )}
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabPivots.tsx b/ui/src/views/admin/listForm/edit/FormTabPivots.tsx
index ed8c392..a679bb6 100644
--- a/ui/src/views/admin/listForm/edit/FormTabPivots.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabPivots.tsx
@@ -186,7 +186,7 @@ function FormTabColumns(props: FormEditProps) {
                 </div>
               </div>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit" className="my-2">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit" className="my-2">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabRow.tsx b/ui/src/views/admin/listForm/edit/FormTabRow.tsx
index 05ae0b7..0adc651 100644
--- a/ui/src/views/admin/listForm/edit/FormTabRow.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabRow.tsx
@@ -98,7 +98,7 @@ function FormTabRow(props: FormEditProps) {
                 </Field>
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabScheduler.tsx b/ui/src/views/admin/listForm/edit/FormTabScheduler.tsx
index c5bb0f3..6a22972 100644
--- a/ui/src/views/admin/listForm/edit/FormTabScheduler.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabScheduler.tsx
@@ -16,9 +16,9 @@ import { Field, FieldProps, Form, Formik } from 'formik'
 import * as Yup from 'yup'
 import { FormEditProps } from './FormEdit'
 import { SelectBoxOption } from '@/types/shared'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { getListFormFields } from '@/services/admin/list-form-field.service'
-import { groupBy } from 'lodash'
+import groupBy from 'lodash/groupBy'
 import { useParams } from 'react-router-dom'
 import { firstDayOfWeekOptions, schedulerViewOptions } from './options'
 
@@ -29,7 +29,7 @@ function FormTabScheduler(props: FormEditProps) {
   const { translate } = useLocalization()
   const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -60,11 +60,11 @@ function FormTabScheduler(props: FormEditProps) {
         },
       )
     }
-  }
+  }, [listFormCode])
 
   useEffect(() => {
     getFields()
-  }, [listFormCode])
+  }, [getFields])
 
   const listFormValues = useStoreState((s) => s.admin.lists.values)
   if (!listFormValues) {
@@ -363,7 +363,7 @@ function FormTabScheduler(props: FormEditProps) {
                 </FormItem>
               </Card>
             </div>
-            <Button size="sm" block variant="solid" loading={isSubmitting} type="submit" className="my-2">
+            <Button block size="sm" variant="solid" loading={isSubmitting} type="submit" className="my-2">
               {isSubmitting ? translate('::Saving') : translate('::Save')}
             </Button>{' '}
           </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabSearch.tsx b/ui/src/views/admin/listForm/edit/FormTabSearch.tsx
index 56e1187..2fc28d7 100644
--- a/ui/src/views/admin/listForm/edit/FormTabSearch.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabSearch.tsx
@@ -26,7 +26,7 @@ function FormTabSearch(props: FormEditProps) {
           await props.onSubmit(ListFormEditTabs.SearchForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem
@@ -55,7 +55,7 @@ function FormTabSearch(props: FormEditProps) {
                 />
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabSelect.tsx b/ui/src/views/admin/listForm/edit/FormTabSelect.tsx
index e5468fb..b84ffab 100644
--- a/ui/src/views/admin/listForm/edit/FormTabSelect.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabSelect.tsx
@@ -128,7 +128,7 @@ function FormTabSelect(props: FormEditProps) {
                 />
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabSorting.tsx b/ui/src/views/admin/listForm/edit/FormTabSorting.tsx
index e00a396..fc0131b 100644
--- a/ui/src/views/admin/listForm/edit/FormTabSorting.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabSorting.tsx
@@ -1,32 +1,20 @@
 import { Container } from '@/components/shared'
 import {
   Button,
-  Card,
-  Checkbox,
   FormContainer,
   FormItem,
-  Input,
   Select,
-  Tabs,
 } from '@/components/ui'
 import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
 import { useStoreState } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
-import { ApplyFilterMode } from 'devextreme/common/grids'
 import { Field, FieldProps, Form, Formik } from 'formik'
 import * as Yup from 'yup'
 import { FormEditProps } from './FormEdit'
 import {
-  applyFilterOptions,
-  overflowWrapOptions,
   sortModeOptions,
-  whiteSpaceOptions,
 } from './options'
-import TabList from '@/components/ui/Tabs/TabList'
-import TabNav from '@/components/ui/Tabs/TabNav'
-import TabContent from '@/components/ui/Tabs/TabContent'
 import { GridOptionsSortModeEnum } from '@/proxy/form/models'
-import { SelectBoxOption } from '@/types/shared'
 
 const validationSchema = Yup.object().shape({})
 
@@ -74,7 +62,7 @@ function FormTabSorting(props: FormEditProps) {
                 </Field>
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabState.tsx b/ui/src/views/admin/listForm/edit/FormTabState.tsx
index 24815e6..7170ae5 100644
--- a/ui/src/views/admin/listForm/edit/FormTabState.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabState.tsx
@@ -97,7 +97,7 @@ function FormTabState(props: FormEditProps) {
                 />
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabTree.tsx b/ui/src/views/admin/listForm/edit/FormTabTree.tsx
index fe253f4..0778d44 100644
--- a/ui/src/views/admin/listForm/edit/FormTabTree.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabTree.tsx
@@ -7,7 +7,6 @@ import {
   Input,
   Select,
   toast,
-  Card,
 } from '@/components/ui'
 import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
 import { useStoreState } from '@/store'
@@ -16,9 +15,9 @@ import { Field, FieldProps, Form, Formik } from 'formik'
 import * as Yup from 'yup'
 import { FormEditProps } from './FormEdit'
 import { SelectBoxOption } from '@/types/shared'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { getListFormFields } from '@/services/admin/list-form-field.service'
-import { groupBy } from 'lodash'
+import groupBy from 'lodash/groupBy'
 import { useParams } from 'react-router-dom'
 
 const validationSchema = Yup.object().shape({})
@@ -28,7 +27,7 @@ function FormTabTree(props: FormEditProps) {
   const { translate } = useLocalization()
   const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -59,11 +58,11 @@ function FormTabTree(props: FormEditProps) {
         },
       )
     }
-  }
+  }, [listFormCode])
 
   useEffect(() => {
     getFields()
-  }, [listFormCode])
+  }, [getFields])
 
   const listFormValues = useStoreState((s) => s.admin.lists.values)
   if (!listFormValues) {
@@ -185,7 +184,7 @@ function FormTabTree(props: FormEditProps) {
                 component={Checkbox}
               />
             </FormItem>
-            <Button size="sm" block variant="solid" loading={isSubmitting} type="submit" className="my-2">
+            <Button block size="sm" variant="solid" loading={isSubmitting} type="submit" className="my-2">
               {isSubmitting ? translate('::Saving') : translate('::Save')}
             </Button>
           </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx b/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
index 940e3d5..880017f 100644
--- a/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
@@ -13,7 +13,7 @@ import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
 import { JsonRowDialogData } from './json-row-operations/types'
 import JsonRowOpDialogWidget from './json-row-operations/JsonRowOpDialogWidget'
 
-function FormTabWidgets(props: { listFormCode: string }) {
+function FormTabWidgets() {
   const [isJsonRowOpDialogOpen, setIsJsonRowOpDialogOpen] = useState(false)
   const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
   const { translate } = useLocalization()
diff --git a/ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx b/ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx
index bcb0d24..09ef9c8 100644
--- a/ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx
+++ b/ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx
@@ -12,7 +12,7 @@ import { workflowService, type WorkflowCriteriaDto } from '@/services/workflow.s
 import { WorkflowDesigner } from '../workflow/WorkflowDesigner'
 import { SelectBoxOption } from '@/types/shared'
 import { Field, FieldProps, Form, Formik } from 'formik'
-import { Button, Card, Checkbox, FormContainer, FormItem, Input, Select } from '@/components/ui'
+import { Button, Card, Checkbox, FormContainer, FormItem, Select } from '@/components/ui'
 import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
 import { bool, object, string } from 'yup'
 import { useStoreState } from '@/store/store'
@@ -450,7 +450,7 @@ export function FormTabWorkflow(
                   </FormItem>
                 </div>
 
-                <Button size="sm" block variant="solid" type="submit" loading={isSubmitting}>
+                <Button block size="sm" variant="solid" type="submit" loading={isSubmitting}>
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </Card>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
index db452c8..45c2d17 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldEdit.tsx
@@ -22,12 +22,10 @@ import { FormFieldEditProps } from './FormFields'
 import FormFieldTabPivotSetting from './FormFieldTabPivotSetting'
 
 function FormFieldEdit({
-  listFormCode,
   item,
   onSubmit,
-  fields
+  fields,
 }: {
-  listFormCode: string
   item: ColumnFormatEditDto | null
   fields: ColumnFormatEditDto[]
 } & FormFieldEditProps) {
@@ -74,114 +72,60 @@ function FormFieldEdit({
           <TabNav value="pivotSetting">
             {translate('::ListForms.ListFormFieldEdit.TabPivotSettings')}
           </TabNav>
-        </TabList>
+          </TabList>
         <div className="pt-4">
           <TabContent value="details">
-            <FormFieldTabDetails
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabDetails initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="options">
-            <FormFieldTabOptions
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabOptions initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="permissions">
-            <FormFieldTabPermissions
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabPermissions initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="customization">
-            <FormFieldTabCustomization
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabCustomization initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="filtering">
-            <FormFieldTabFiltering
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabFiltering initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="headering">
-            <FormFieldTabHeadering
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabHeadering initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="grouping">
-            <FormFieldTabGrouping
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabGrouping initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="groupSummary">
             <FormFieldTabGroupSummary
-              listFormCode={listFormCode}
               initialValues={item}
-              onSubmit={onSubmit}
               fields={fields}
+              onSubmit={onSubmit}
             />
           </TabContent>
           <TabContent value="totalSummary">
             <FormFieldTabTotalSummary
-              listFormCode={listFormCode}
               initialValues={item}
-              onSubmit={onSubmit}
               fields={fields}
+              onSubmit={onSubmit}
             />
           </TabContent>
           <TabContent value="joinOptions">
-            <FormFieldTabJoinOptions
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabJoinOptions initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="lookup">
-            <FormFieldTabLookup
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabLookup initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="cssOptions">
-            <FormFieldTabCssOptions
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabCssOptions initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="validationRules">
-            <FormFieldTabValidationRules
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabValidationRules initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="conditionalFormatting">
-            <FormFieldTabConditionalFormatting
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabConditionalFormatting initialValues={item} onSubmit={onSubmit} />
           </TabContent>
           <TabContent value="pivotSetting">
-            <FormFieldTabPivotSetting
-              listFormCode={listFormCode}
-              initialValues={item}
-              onSubmit={onSubmit}
-            />
+            <FormFieldTabPivotSetting initialValues={item} onSubmit={onSubmit} />
           </TabContent>
         </div>
       </Tabs>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabConditionalFormatting.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabConditionalFormatting.tsx
index edc9d12..34daaa5 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabConditionalFormatting.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabConditionalFormatting.tsx
@@ -46,11 +46,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabConditionalFormatting({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -219,7 +217,7 @@ function FormFieldTabConditionalFormatting({
             }
           }}
         >
-          {({ touched, errors, resetForm, values }) => (
+          {({ touched, errors, values }) => (
             <Form>
               <FormContainer size="sm">
                 <FormItem
@@ -316,7 +314,7 @@ function FormFieldTabConditionalFormatting({
                   />
                 </FormItem>
 
-                <Button size="sm" block variant="solid" loading={isLoading} type="submit">
+                <Button block size="sm" variant="solid" loading={isLoading} type="submit">
                   {isLoading ? translate('::Saving') : translate('::Save')}
                 </Button>
               </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCssOptions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCssOptions.tsx
index e42498f..4910bec 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCssOptions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCssOptions.tsx
@@ -12,11 +12,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabCssOptions({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -31,7 +29,7 @@ function FormFieldTabCssOptions({
           await onSubmit(ListFormFieldEditTabs.CssOptionsForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem
@@ -63,7 +61,7 @@ function FormFieldTabCssOptions({
                 />
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCustomization.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCustomization.tsx
index 4fb5ba5..1094d71 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCustomization.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabCustomization.tsx
@@ -20,11 +20,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabCustomization({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -39,7 +37,7 @@ function FormFieldTabCustomization({
           await onSubmit(ListFormFieldEditTabs.CustomizationForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ isSubmitting, values }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem label={translate('::ListForms.ListFormFieldEdit.CustomizationFixed')}>
@@ -70,7 +68,7 @@ function FormFieldTabCustomization({
                 </Field>
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx
index 1370b2d..f662d4e 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabDetails.tsx
@@ -23,11 +23,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabDetails({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -156,7 +154,7 @@ function FormFieldTabDetails({
             onClose={() => setIsEditorOptionsDialogOpen(false)}
             onApply={(val) => setFieldValue('editorOptions', val)}
           />
-          <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+          <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
             {isSubmitting ? translate('::Saving') : translate('::Save')}
           </Button>
         </Form>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabFiltering.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabFiltering.tsx
index 1c4ffb1..4c3979a 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabFiltering.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabFiltering.tsx
@@ -17,11 +17,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabFiltering({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -36,7 +34,7 @@ function FormFieldTabFiltering({
           await onSubmit(ListFormFieldEditTabs.FilteringForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem
@@ -84,7 +82,7 @@ function FormFieldTabFiltering({
                 />
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGroupSummary.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGroupSummary.tsx
index 7c4a371..1791483 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGroupSummary.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGroupSummary.tsx
@@ -23,12 +23,10 @@ const schema = object().shape({
 })
 
 function FormFieldTabGroupSummary({
-  listFormCode,
   initialValues,
   onSubmit,
   fields,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
   fields: ColumnFormatEditDto[]
 } & FormFieldEditProps) {
@@ -176,7 +174,7 @@ function FormFieldTabGroupSummary({
                 />
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGrouping.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGrouping.tsx
index e7f7aec..883be7f 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGrouping.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabGrouping.tsx
@@ -17,11 +17,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabGrouping({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -36,7 +34,7 @@ function FormFieldTabGrouping({
           await onSubmit(ListFormFieldEditTabs.GroupingForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem label={translate('::ListForms.ListFormFieldEdit.GroupingAllowGrouping')}>
@@ -61,7 +59,7 @@ function FormFieldTabGrouping({
                 />
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
index e847989..3e6d8a4 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabHeadering.tsx
@@ -17,11 +17,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabHeadering({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -36,7 +34,7 @@ function FormFieldTabHeadering({
           await onSubmit(ListFormFieldEditTabs.HeaderingForm, values, formikHelpers)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, isSubmitting }) => (
           <Form>
             <FormContainer size="sm">
               <FormItem
@@ -65,7 +63,7 @@ function FormFieldTabHeadering({
                 />
               </FormItem>
 
-              <Button  size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button  block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
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 a795620..599e3eb 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabJoinOptions.tsx
@@ -1,5 +1,4 @@
-import { Container } from '@/components/shared'
-import { Button, Card, FormContainer, FormItem, Input, Select } from '@/components/ui'
+import { Button, Card, FormItem, Input, Select } from '@/components/ui'
 import {
   ColumnFormatEditDto,
   GridColumnJoinConditionEnum,
@@ -29,11 +28,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabJoinOptions({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -234,7 +231,7 @@ function FormFieldTabJoinOptions({
               </FormItem>
             </Card>
           </div>
-          <Button  size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+          <Button  block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
             {isSubmitting ? translate('::Saving') : translate('::Save')}
           </Button>
         </Form>
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 377960d..2521fcd 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabLookup.tsx
@@ -1,5 +1,4 @@
-import { Container } from '@/components/shared'
-import { Button, Card, Checkbox, FormContainer, FormItem, Input, Select } from '@/components/ui'
+import { Button, Card, FormItem, Input, Select } from '@/components/ui'
 import { ColumnFormatEditDto, ListFormFieldEditTabs } from '@/proxy/admin/list-form-field/models'
 import type { DatabaseColumnDto, SqlObjectExplorerDto } from '@/proxy/sql-query-manager/models'
 import { sqlObjectManagerService } from '@/services/sql-query-manager.service'
@@ -70,11 +69,11 @@ function TablePickerModal({
             {step === 'columns' && (
               <Button
                 type="button"
-                onClick={() => setStep('table')}
                 variant="plain"
                 shape="circle"
                 icon={<FaArrowLeft className="text-xs" />}
                 className="!h-6 !w-6 !px-0 text-gray-400 transition-colors hover:!bg-transparent hover:text-indigo-500"
+                onClick={() => setStep('table')}
               />
             )}
             <span className="text-sm font-semibold text-gray-700 dark:text-gray-200">
@@ -85,11 +84,11 @@ function TablePickerModal({
           </div>
           <Button
             type="button"
-            onClick={onClose}
             variant="plain"
             shape="circle"
             icon={<FaTimes />}
             className="!h-7 !w-7 !px-0 text-gray-400 hover:!bg-transparent hover:text-gray-600 dark:hover:text-gray-200"
+            onClick={onClose}
           />
         </div>
 
@@ -100,9 +99,9 @@ function TablePickerModal({
               <input
                 autoFocus
                 value={tableSearch}
-                onChange={(e) => setTableSearch(e.target.value)}
                 placeholder={translate('::Search') || 'Ara...'}
                 className="w-full text-xs px-2 py-1.5 rounded border border-gray-200 dark:border-gray-600 bg-gray-50 dark:bg-gray-800 text-gray-700 dark:text-gray-200 focus:outline-none focus:border-indigo-400"
+                onChange={(e) => setTableSearch(e.target.value)}
               />
             </div>
             <div className="overflow-y-auto flex-1 p-2">
@@ -117,6 +116,9 @@ function TablePickerModal({
                     <Button
                       key={t.fullName}
                       type="button"
+                      variant="plain"
+                      shape="none"
+                      className="w-full !h-auto !justify-start !rounded !px-3 !py-2 text-left font-mono text-xs text-gray-700 transition-colors hover:!bg-indigo-50 dark:text-gray-200 dark:hover:!bg-indigo-900/30"
                       onClick={async () => {
                         setPickerTable(t)
                         setStep('columns')
@@ -137,9 +139,6 @@ function TablePickerModal({
                           setIsLoadingColumns(false)
                         }
                       }}
-                      variant="plain"
-                      shape="none"
-                      className="w-full !h-auto !justify-start !rounded !px-3 !py-2 text-left font-mono text-xs text-gray-700 transition-colors hover:!bg-indigo-50 dark:text-gray-200 dark:hover:!bg-indigo-900/30"
                     >
                       <span className="text-gray-400 mr-1">{t.schemaName}.</span>
                       {t.tableName}
@@ -165,8 +164,8 @@ function TablePickerModal({
                   </label>
                   <select
                     value={keyCol}
-                    onChange={(e) => setKeyCol(e.target.value)}
                     className="w-full text-xs h-8 px-2 rounded border border-gray-200 dark:border-gray-600 bg-gray-50 dark:bg-gray-700 text-gray-700 dark:text-gray-200 focus:outline-none focus:border-indigo-400"
+                    onChange={(e) => setKeyCol(e.target.value)}
                   >
                     <option value="">-- Seçiniz --</option>
                     {pickerColumns.map((c) => (
@@ -182,8 +181,8 @@ function TablePickerModal({
                   </label>
                   <select
                     value={nameCol}
-                    onChange={(e) => setNameCol(e.target.value)}
                     className="w-full text-xs h-8 px-2 rounded border border-gray-200 dark:border-gray-600 bg-gray-50 dark:bg-gray-700 text-gray-700 dark:text-gray-200 focus:outline-none focus:border-indigo-400"
+                    onChange={(e) => setNameCol(e.target.value)}
                   >
                     <option value="">-- Seçiniz --</option>
                     {pickerColumns.map((c) => (
@@ -204,8 +203,10 @@ function TablePickerModal({
                   </div>
                 )}
                 <Button
+                  block
                   type="button"
                   disabled={!keyCol || !nameCol}
+                  variant="solid"
                   onClick={() => {
                     onSelect(
                       buildLookupQuery({
@@ -216,8 +217,6 @@ function TablePickerModal({
                       }),
                     )
                   }}
-                  block
-                  variant="solid"
                 >
                   {translate('::OK')}
                 </Button>
@@ -248,11 +247,9 @@ function getNormalizedInitialValues(initialValues: ColumnFormatEditDto) {
 }
 
 function FormFieldTabLookup({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -317,11 +314,11 @@ function FormFieldTabLookup({
                 extra={
                   <Button
                     type="button"
-                    onClick={openTablePicker}
                     variant="plain"
                     shape="none"
                     icon={<FaPlus className="text-[8px]" />}
                     className="ml-2 !h-auto !items-center gap-1 !rounded border border-indigo-200 bg-indigo-50 !px-1.5 !py-0.5 text-[10px] font-medium text-indigo-600 transition-colors hover:!bg-indigo-100 dark:border-indigo-700 dark:bg-indigo-900/20 dark:text-indigo-400 dark:hover:!bg-indigo-800/40"
+                    onClick={openTablePicker}
                   >
                     {translate('::ListForms.Wizard.Step3.GenerateFromTable') || 'Tablodan Oluştur'}
                   </Button>
@@ -465,7 +462,7 @@ function FormFieldTabLookup({
               </FormItem>
             </Card>
           </div>
-          <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+          <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
             {isSubmitting ? translate('::Saving') : translate('::Save')}
           </Button>
         </Form>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
index b91623e..4c85f0f 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabOptions.tsx
@@ -1,5 +1,4 @@
-import { Container } from '@/components/shared'
-import { Button, Card, Checkbox, FormContainer, FormItem, Input, Select } from '@/components/ui'
+import { Button, Card, Checkbox, FormItem, Input, Select } from '@/components/ui'
 import { ColumnFormatEditDto, ListFormFieldEditTabs } from '@/proxy/admin/list-form-field/models'
 import { SelectBoxOption } from '@/types/shared'
 import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -22,11 +21,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabOptions({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -113,7 +110,7 @@ function FormFieldTabOptions({
             </Card>
           </div>
 
-          <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+          <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
             {isSubmitting ? translate('::Saving') : translate('::Save')}
           </Button>
         </Form>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
index 8c0fcbf..cd18a7f 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPermissions.tsx
@@ -21,11 +21,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabPermissions({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -159,7 +157,7 @@ function FormFieldTabPermissions({
                 <Field name="permissionDto.i" component={Checkbox} />
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPivotSetting.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPivotSetting.tsx
index 0d35415..6c9ace9 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPivotSetting.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabPivotSetting.tsx
@@ -1,5 +1,4 @@
-import { Container } from '@/components/shared'
-import { Button, Card, Checkbox, FormContainer, FormItem, Input, Select } from '@/components/ui'
+import { Button, Card, Checkbox, FormItem, Select } from '@/components/ui'
 import { ColumnFormatEditDto, ListFormFieldEditTabs } from '@/proxy/admin/list-form-field/models'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik } from 'formik'
@@ -28,11 +27,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabPivotSetting({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -214,7 +211,7 @@ function FormFieldTabPivotSetting({
               </FormItem>
             </Card>
           </div>
-          <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+          <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
             {isSubmitting ? translate('::Saving') : translate('::Save')}
           </Button>
         </Form>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
index 59c3d23..9f300dc 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabTotalSummary.tsx
@@ -8,7 +8,6 @@ import { columnSummaryTypeListOptions } from '../options'
 import { FormFieldEditProps } from './FormFields'
 import { tooltipFormatListOptions } from '@/proxy/admin/list-form/options'
 import { SelectBoxOption } from '@/types/shared'
-import { useState } from 'react'
 
 const schema = object().shape({
   columnTotalSummaryDto: object()
@@ -24,12 +23,10 @@ const schema = object().shape({
 })
 
 function FormFieldTabTotalSummary({
-  listFormCode,
   initialValues,
   onSubmit,
   fields,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
   fields: ColumnFormatEditDto[]
 } & FormFieldEditProps) {
@@ -177,7 +174,7 @@ function FormFieldTabTotalSummary({
                 />
               </FormItem>
 
-              <Button size="sm" className="mt-1" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" className="mt-1" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? translate('::Saving') : translate('::Save')}
               </Button>
             </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabValidationRules.tsx b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabValidationRules.tsx
index 3122155..aaf481f 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabValidationRules.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFieldTabValidationRules.tsx
@@ -60,11 +60,9 @@ const schema = object().shape({
 })
 
 function FormFieldTabValidationRules({
-  listFormCode,
   initialValues,
   onSubmit,
 }: {
-  listFormCode: string
   initialValues: ColumnFormatEditDto
 } & FormFieldEditProps) {
   const { translate } = useLocalization()
@@ -229,7 +227,7 @@ function FormFieldTabValidationRules({
             }
           }}
         >
-          {({ touched, errors, resetForm, values }) => (
+          {({ touched, errors, values }) => (
             <Form>
               <FormContainer size="sm">
                 <FormItem
@@ -355,7 +353,7 @@ function FormFieldTabValidationRules({
                   <Field name="trim" placeholder="Trim" component={Checkbox} />
                 </FormItem>
 
-                <Button size="sm" className="mt-1" block variant="solid" loading={isLoading} type="submit">
+                <Button block size="sm" className="mt-1" variant="solid" loading={isLoading} type="submit">
                   {isLoading ? translate('::Saving') : translate('::Save')}
                 </Button>
               </FormContainer>
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 39a5013..2ac092e 100644
--- a/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx
+++ b/ui/src/views/admin/listForm/edit/form-fields/FormFields.tsx
@@ -35,7 +35,7 @@ import { useLocalization } from '@/utils/hooks/useLocalization'
 import setNull from '@/utils/setNull'
 import classNames from 'classnames'
 import { Field, FieldProps, Form, Formik, FormikHelpers } from 'formik'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { FaFileMedical, FaCopy, FaEyeSlash, FaMinus, FaTimes, FaTable } from 'react-icons/fa'
 import { number, object, string } from 'yup'
 import FormFieldEdit from './FormFieldEdit'
@@ -219,7 +219,7 @@ function FormFields({
     await getFields()
   }
 
-  const getFields = async (cultureName?: string, roleId?: string, userId?: string) => {
+  const getFields = useCallback(async (cultureName?: string, roleId?: string, userId?: string) => {
     if (!listFormCode) {
       return
     }
@@ -254,11 +254,11 @@ function FormFields({
         },
       )
     }
-  }
+  }, [listFormCode])
 
   useEffect(() => {
     getFields()
-  }, [listFormCode])
+  }, [getFields])
 
   useEffect(() => {
     if (!fields || !row) {
@@ -266,10 +266,10 @@ function FormFields({
     }
 
     const newRow = fields.find((f) => f.id === row.id)
-    if (newRow) {
+    if (newRow && newRow !== row) {
       setRow(newRow)
     }
-  }, [fields])
+  }, [fields, row])
 
   const onSubmit = async (
     editType: string,
@@ -390,7 +390,7 @@ function FormFields({
                 </Field>
               </FormItem>
 
-              <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+              <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                 {isSubmitting ? '...' : translate('::ListForms.ListFormField.Filter')}
               </Button>
             </FormContainer>
@@ -454,14 +454,14 @@ function FormFields({
                 <TBody>
                   {fields.map((field) => (
                     <Tr
+                      key={field.id}
                       className={classNames(
                         'cursor-pointer',
                         field.id === row?.id ? 'bg-sozsoft-active dark:bg-gray-600' : '',
                       )}
-                      onClick={(e: any) => {
+                      onClick={() => {
                         setRow(field)
                       }}
-                      key={field.id}
                     >
                       <Td className="flex items-center !p-0">
                         <Button
@@ -505,7 +505,7 @@ function FormFields({
               </Table>
             </div>
             <div className="2xl:col-span-3 lg:col-span-3 xl:col-span-2">
-              <FormFieldEdit listFormCode={listFormCode} item={row} onSubmit={onSubmit} fields={fields} />
+              <FormFieldEdit item={row} fields={fields} onSubmit={onSubmit} />
             </div>
           </div>
         </AdaptableCard>
@@ -684,7 +684,7 @@ function FormFields({
                   </Field>
                 </FormItem>
 
-                <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+                <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </FormContainer>
@@ -793,7 +793,7 @@ function FormFields({
             }
           }}
         >
-          {({ touched, errors, resetForm, isSubmitting, values }) => (
+          {({ touched, errors, isSubmitting, values }) => (
             <Form>
               <FormContainer size="sm">
                 <FormItem
@@ -1023,7 +1023,7 @@ function FormFields({
                     <Field name="copiedFields.pivotSetting" component={Checkbox} className="mr-1" />
                   </FormItem>
                 </div>
-                <Button size="sm" block variant="solid" loading={isSubmitting} type="submit">
+                <Button block size="sm" variant="solid" loading={isSubmitting} type="submit">
                   {isSubmitting ? translate('::Saving') : translate('::Save')}
                 </Button>
               </FormContainer>
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/EditorOptionsBuilderDialog.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/EditorOptionsBuilderDialog.tsx
index 541e3aa..e34c4ac 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/EditorOptionsBuilderDialog.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/EditorOptionsBuilderDialog.tsx
@@ -1,7 +1,7 @@
 import { Button, Dialog } from '@/components/ui'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { useEffect, useMemo, useState } from 'react'
-import { FaCheck, FaCode, FaPlus, FaSlidersH, FaTimes, FaTrash } from 'react-icons/fa'
+import { FaCheck, FaCode, FaPlus, FaTimes, FaTrash } from 'react-icons/fa'
 
 type CustomOption = {
   id: string
@@ -295,51 +295,52 @@ function EditorOptionsBuilderDialog({
       <Button
         type="button"
         size="sm"
-        onClick={clearOptions}
         title="editorOptions alanını boşaltır. Backend'e boş string kaydedilir."
+        onClick={clearOptions}
       >
         NULL / Empty
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset({ disabled: true })}
         title='{"disabled": true} ekler.'
+        onClick={() => addPreset({ disabled: true })}
       >
         disabled
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset({ tooltip: { enabled: true } })}
         title='{"tooltip": {"enabled": true}} ekler.'
+        onClick={() => addPreset({ tooltip: { enabled: true } })}
       >
         Tooltip
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset({ format: { type: 'fixedPoint', precision: 2 } })}
         title="Ondalık format precision 2 ekler."
+        onClick={() => addPreset({ format: { type: 'fixedPoint', precision: 2 } })}
       >
         fixedPoint precision 2
       </Button>
       <Button
         type="button"
         size="sm"
+        title="Pasif ve precision 2 fixedPoint formatını birlikte ekler."
         onClick={() =>
           addPreset({
             disabled: true,
             format: { type: 'fixedPoint', precision: 2 },
           })
         }
-        title="Pasif ve precision 2 fixedPoint formatını birlikte ekler."
       >
         disabled fixedPoint 2
       </Button>
       <Button
         type="button"
         size="sm"
+        title="Precision 1, mask behavior, spin buttons ve pasif ayarını ekler."
         onClick={() =>
           addPreset({
             format: { type: 'fixedPoint', precision: 1 },
@@ -348,13 +349,13 @@ function EditorOptionsBuilderDialog({
             disabled: true,
           })
         }
-        title="Precision 1, mask behavior, spin buttons ve pasif ayarını ekler."
       >
         disabled fixedPoint 1
       </Button>
       <Button
         type="button"
         size="sm"
+        title="NumberBox için precision 2, mask behavior ve spin buttons ekler."
         onClick={() =>
           addPreset({
             format: { type: 'fixedPoint', precision: 2 },
@@ -362,34 +363,34 @@ function EditorOptionsBuilderDialog({
             showSpinButtons: true,
           })
         }
-        title="NumberBox için precision 2, mask behavior ve spin buttons ekler."
       >
         numberSpin precision 2
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset({ format: 'dd/MM/yyyy', displayFormat: 'dd/MM/yyyy' })}
         title="DateBox için gün/ay/yıl formatını ekler."
+        onClick={() => addPreset({ format: 'dd/MM/yyyy', displayFormat: 'dd/MM/yyyy' })}
       >
         date dd/MM/yyyy
       </Button>
       <Button
         type="button"
         size="sm"
+        title="DateBox için gün/ay/yıl saat:dakika formatını ekler."
         onClick={() =>
           addPreset({
             format: 'dd/MM/yyyy HH:mm',
             displayFormat: 'dd/MM/yyyy HH:mm',
           })
         }
-        title="DateBox için gün/ay/yıl saat:dakika formatını ekler."
       >
         dateTime dd/MM/yyyy HH:mm
       </Button>
       <Button
         type="button"
         size="sm"
+        title="Telefon maskesi, yer tutucu ve Türkçe hata mesajı ekler."
         onClick={() =>
           addPreset({
             format: 'phoneGlobal',
@@ -400,13 +401,13 @@ function EditorOptionsBuilderDialog({
             placeholder: '(555) 123-4567',
           })
         }
-        title="Telefon maskesi, yer tutucu ve Türkçe hata mesajı ekler."
       >
         phoneGlobal mask
       </Button>
       <Button
         type="button"
         size="sm"
+        title="Saat seçimi için dxDateBox time picker ayarları ekler."
         onClick={() =>
           addPreset({
             type: 'time',
@@ -417,32 +418,31 @@ function EditorOptionsBuilderDialog({
             width: '100%',
           })
         }
-        title="Saat seçimi için dxDateBox time picker ayarları ekler."
       >
         time picker
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset({ width: 80, height: 80, multiple: true })}
         title="ImageUpload için 80x80 ve multiple ayarlarını ekler."
+        onClick={() => addPreset({ width: 80, height: 80, multiple: true })}
       >
         multi image
       </Button>
-      <Button type="button" size="sm" onClick={() => addPreset({ height: 60 })} title='{"height": 60} ekler.'>
+      <Button type="button" size="sm" title='{"height": 60} ekler.' onClick={() => addPreset({ height: 60 })}>
         Height 60
       </Button>
-      <Button type="button" size="sm" onClick={() => addPreset({ height: 100 })} title='{"height": 100} ekler.'>
+      <Button type="button" size="sm" title='{"height": 100} ekler.' onClick={() => addPreset({ height: 100 })}>
         Height 100
       </Button>
-      <Button type="button" size="sm" onClick={() => addPreset({ height: 200 })} title='{"height": 200} ekler.'>
+      <Button type="button" size="sm" title='{"height": 200} ekler.' onClick={() => addPreset({ height: 200 })}>
         Height 200
       </Button>
       <Button
         type="button"
         size="sm"
-        onClick={() => addPreset(buildHtmlEditorOptions())}
         title="HtmlEditor toolbar, image upload ve media resizing ayarlarını ekler."
+        onClick={() => addPreset(buildHtmlEditorOptions())}
       >
         htmlEditor toolbar
       </Button>
@@ -451,12 +451,12 @@ function EditorOptionsBuilderDialog({
 
   return (
     <Dialog
+      preventScroll
       isOpen={isOpen}
       width={1320}
       height="88vh"
       contentClassName="flex flex-col"
       style={{ overlay: { zIndex: 1300 } }}
-      preventScroll
       onClose={onClose}
       onRequestClose={onClose}
     >
@@ -545,9 +545,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.width)}
-                    onChange={(event) => setOptionValue('width', event.target.value)}
                     placeholder="100% veya 240"
                     title="Örnek: 100%, 240, 80"
+                    onChange={(event) => setOptionValue('width', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -555,15 +555,15 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.height)}
+                    placeholder="200"
+                    type="number"
+                    title="Editor yüksekliği. Örnek: 60, 100, 200"
                     onChange={(event) =>
                       setOptionValue(
                         'height',
                         event.target.value ? Number(event.target.value) : undefined,
                       )
                     }
-                    placeholder="200"
-                    type="number"
-                    title="Editor yüksekliği. Örnek: 60, 100, 200"
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -571,9 +571,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.placeholder)}
-                    onChange={(event) => setOptionValue('placeholder', event.target.value)}
                     placeholder="Placeholder"
                     title="Editor boşken görünecek metin."
+                    onChange={(event) => setOptionValue('placeholder', event.target.value)}
                   />
                 </label>
               </div>
@@ -592,9 +592,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.label)}
-                    onChange={(event) => setOptionValue('label', event.target.value)}
                     placeholder="Alan etiketi"
                     title="Editor içi label metni."
+                    onChange={(event) => setOptionValue('label', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -602,8 +602,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.labelMode)}
-                    onChange={(event) => setOptionValue('labelMode', event.target.value)}
                     title="Label gösterim modu."
+                    onChange={(event) => setOptionValue('labelMode', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="static">static</option>
@@ -617,8 +617,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.stylingMode)}
-                    onChange={(event) => setOptionValue('stylingMode', event.target.value)}
                     title="DevExtreme editor görünüm stili."
+                    onChange={(event) => setOptionValue('stylingMode', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="outlined">outlined</option>
@@ -631,9 +631,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.hint)}
-                    onChange={(event) => setOptionValue('hint', event.target.value)}
                     placeholder="Tooltip/hint metni"
                     title="Editor üzerine gelince gösterilecek hint."
+                    onChange={(event) => setOptionValue('hint', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -641,9 +641,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.valueChangeEvent)}
-                    onChange={(event) => setOptionValue('valueChangeEvent', event.target.value)}
                     placeholder="change veya input"
                     title="Değer değişimini tetikleyecek DOM event adı. Örnek: change, input, keyup."
+                    onChange={(event) => setOptionValue('valueChangeEvent', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -651,11 +651,11 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(getByPath(options, 'inputAttr.aria-label'))}
+                    placeholder="Erişilebilir ad"
+                    title="Input için aria-label."
                     onChange={(event) =>
                       setOptionPathValue('inputAttr.aria-label', event.target.value)
                     }
-                    placeholder="Erişilebilir ad"
-                    title="Input için aria-label."
                   />
                 </label>
               </div>
@@ -674,8 +674,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.mode)}
-                    onChange={(event) => setOptionValue('mode', event.target.value)}
                     title="Input mode. TextBox/NumberBox için kullanılabilir."
+                    onChange={(event) => setOptionValue('mode', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="text">text</option>
@@ -692,15 +692,15 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.maxLength)}
+                    placeholder="50"
+                    type="number"
+                    title="Maksimum karakter sayısı."
                     onChange={(event) =>
                       setOptionValue(
                         'maxLength',
                         event.target.value ? Number(event.target.value) : undefined,
                       )
                     }
-                    placeholder="50"
-                    type="number"
-                    title="Maksimum karakter sayısı."
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -708,9 +708,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.mask)}
-                    onChange={(event) => setOptionValue('mask', event.target.value)}
                     placeholder="(000) 000-0000"
                     title="TextBox mask değeri."
+                    onChange={(event) => setOptionValue('mask', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -718,9 +718,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.maskInvalidMessage)}
-                    onChange={(event) => setOptionValue('maskInvalidMessage', event.target.value)}
                     placeholder="Geçerli değer girin"
                     title="Mask geçersiz olduğunda gösterilecek mesaj."
+                    onChange={(event) => setOptionValue('maskInvalidMessage', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -728,8 +728,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.showMaskMode)}
-                    onChange={(event) => setOptionValue('showMaskMode', event.target.value)}
                     title="Mask ne zaman gösterilsin?"
+                    onChange={(event) => setOptionValue('showMaskMode', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="always">always</option>
@@ -741,9 +741,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(getByPath(options, 'maskRules.X'))}
-                    onChange={(event) => setOptionPathValue('maskRules.X', event.target.value)}
                     placeholder="[0-9]"
                     title="Custom mask rule. Örnek: X -> [0-9]"
+                    onChange={(event) => setOptionPathValue('maskRules.X', event.target.value)}
                   />
                 </label>
               </div>
@@ -763,15 +763,15 @@ function EditorOptionsBuilderDialog({
                     <input
                       className={baseInputClass}
                       value={toInputValue(options[key])}
+                      placeholder={key === 'step' ? '1' : '0'}
+                      type="number"
+                      title={`${key} numeric option.`}
                       onChange={(event) =>
                         setOptionValue(
                           key,
                           event.target.value ? Number(event.target.value) : undefined,
                         )
                       }
-                      placeholder={key === 'step' ? '1' : '0'}
-                      type="number"
-                      title={`${key} numeric option.`}
                     />
                   </label>
                 ))}
@@ -780,8 +780,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(getByPath(options, 'format.type'))}
-                    onChange={(event) => setOptionPathValue('format.type', event.target.value)}
                     title="NumberBox format type."
+                    onChange={(event) => setOptionPathValue('format.type', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="fixedPoint">fixedPoint</option>
@@ -795,15 +795,15 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(getByPath(options, 'format.precision'))}
+                    placeholder="2"
+                    type="number"
+                    title="Ondalık hassasiyeti."
                     onChange={(event) =>
                       setOptionPathValue(
                         'format.precision',
                         event.target.value ? Number(event.target.value) : undefined,
                       )
                     }
-                    placeholder="2"
-                    type="number"
-                    title="Ondalık hassasiyeti."
                   />
                 </label>
               </div>
@@ -822,8 +822,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.type)}
-                    onChange={(event) => setOptionValue('type', event.target.value)}
                     title="DateBox type."
+                    onChange={(event) => setOptionValue('type', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="date">date</option>
@@ -836,8 +836,8 @@ function EditorOptionsBuilderDialog({
                   <select
                     className={baseInputClass}
                     value={toSelectValue(options.pickerType)}
-                    onChange={(event) => setOptionValue('pickerType', event.target.value)}
                     title="DateBox picker type."
+                    onChange={(event) => setOptionValue('pickerType', event.target.value)}
                   >
                     <option value="">Seç</option>
                     <option value="calendar">calendar</option>
@@ -851,9 +851,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.displayFormat)}
-                    onChange={(event) => setOptionValue('displayFormat', event.target.value)}
                     placeholder="dd/MM/yyyy veya HH:mm"
                     title="DateBox display format."
+                    onChange={(event) => setOptionValue('displayFormat', event.target.value)}
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -861,11 +861,11 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.dateSerializationFormat)}
+                    placeholder="yyyy-MM-ddTHH:mm:ss"
+                    title="Kaydedilecek date serialization format."
                     onChange={(event) =>
                       setOptionValue('dateSerializationFormat', event.target.value)
                     }
-                    placeholder="yyyy-MM-ddTHH:mm:ss"
-                    title="Kaydedilecek date serialization format."
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -873,15 +873,15 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.interval)}
+                    placeholder="5"
+                    type="number"
+                    title="Time list aralığı dakika cinsinden."
                     onChange={(event) =>
                       setOptionValue(
                         'interval',
                         event.target.value ? Number(event.target.value) : undefined,
                       )
                     }
-                    placeholder="5"
-                    type="number"
-                    title="Time list aralığı dakika cinsinden."
                   />
                 </label>
                 <label className="text-xs text-gray-500">
@@ -889,9 +889,9 @@ function EditorOptionsBuilderDialog({
                   <input
                     className={baseInputClass}
                     value={toInputValue(options.invalidDateMessage)}
-                    onChange={(event) => setOptionValue('invalidDateMessage', event.target.value)}
                     placeholder="Geçerli tarih/saat girin"
                     title="Geçersiz tarih mesajı."
+                    onChange={(event) => setOptionValue('invalidDateMessage', event.target.value)}
                   />
                 </label>
               </div>
@@ -932,6 +932,8 @@ function EditorOptionsBuilderDialog({
                     <input
                       className={`${baseInputClass} col-span-4`}
                       value={option.path}
+                      placeholder="path.to.option"
+                      title="Nokta ile nested path yaz. Örnek: toolbar.multiline"
                       onChange={(event) =>
                         setCustomOptions((current) =>
                           current.map((item) =>
@@ -939,8 +941,6 @@ function EditorOptionsBuilderDialog({
                           ),
                         )
                       }
-                      placeholder="path.to.option"
-                      title="Nokta ile nested path yaz. Örnek: toolbar.multiline"
                     />
                     <select
                       className={`${baseInputClass} col-span-2`}
@@ -963,6 +963,8 @@ function EditorOptionsBuilderDialog({
                     <input
                       className={`${baseInputClass} col-span-5`}
                       value={option.value}
+                      placeholder={option.type === 'boolean' ? 'true / false' : 'value'}
+                      title="Tip JSON ise object/array yazabilirsin. Tip boolean ise true veya false yaz."
                       onChange={(event) =>
                         setCustomOptions((current) =>
                           current.map((item) =>
@@ -970,8 +972,6 @@ function EditorOptionsBuilderDialog({
                           ),
                         )
                       }
-                      placeholder={option.type === 'boolean' ? 'true / false' : 'value'}
-                      title="Tip JSON ise object/array yazabilirsin. Tip boolean ise true veya false yaz."
                     />
                     <Button
                       type="button"
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/EditorScriptBuilderDialog.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/EditorScriptBuilderDialog.tsx
index 5577301..de371e9 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/EditorScriptBuilderDialog.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/EditorScriptBuilderDialog.tsx
@@ -3,7 +3,7 @@ import { SelectBoxOption } from '@/types/shared'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import Editor from '@monaco-editor/react'
 import { useEffect, useMemo, useState } from 'react'
-import { FaBolt, FaCheck, FaCode, FaMagic, FaPlus, FaTimes, FaTrash } from 'react-icons/fa'
+import { FaCheck, FaCode, FaMagic, FaPlus, FaTimes, FaTrash } from 'react-icons/fa'
 
 type CopyMapping = {
   id: string
@@ -597,12 +597,6 @@ function EditorScriptBuilderDialog({
     setAmountTotalField((current) => current || findField('TotalAmount'))
   }
 
-  const fillTimeDefaults = () => {
-    setTimeStartField((current) => current || findField('StartTime'))
-    setTimeEndField((current) => current || findField('EndTime'))
-    setTimeTargetField((current) => current || findField('TotalHours'))
-  }
-
   const resetBuilderSelections = () => {
     setCopyMappings([])
     setDaysStartField('')
@@ -834,12 +828,12 @@ function EditorScriptBuilderDialog({
 
   return (
     <Dialog
+      preventScroll
       isOpen={isOpen}
       width={1100}
       height="82vh"
       contentClassName="flex flex-col"
       style={{ overlay: { zIndex: 1300 } }}
-      preventScroll
       onClose={onClose}
       onRequestClose={onClose}
     >
@@ -898,6 +892,8 @@ function EditorScriptBuilderDialog({
                         <input
                           className={baseInputClass}
                           value={mapping.source}
+                          placeholder="Örn: unitPrice veya Customer.Name"
+                          title="Seçilen kayıttaki kolon/path. Örnek: Quantity, UnitPrice, Customer.Name"
                           onChange={(event) =>
                             setCopyMappings((current) =>
                               current.map((item) =>
@@ -907,8 +903,6 @@ function EditorScriptBuilderDialog({
                               ),
                             )
                           }
-                          placeholder="Örn: unitPrice veya Customer.Name"
-                          title="Seçilen kayıttaki kolon/path. Örnek: Quantity, UnitPrice, Customer.Name"
                         />
                       </label>
                       <div className="col-span-12 md:col-span-5">
@@ -1012,11 +1006,11 @@ function EditorScriptBuilderDialog({
                             action.operator === 'empty' ||
                             action.operator === 'notEmpty'
                           }
+                          placeholder="Örn: Aktif, 1000"
+                          title="Koşulda kullanılacak sabit değer. Örnek: Aktif, 0, True"
                           onChange={(event) =>
                             updateConditionalAction(action.id, { value: event.target.value })
                           }
-                          placeholder="Örn: Aktif, 1000"
-                          title="Koşulda kullanılacak sabit değer. Örnek: Aktif, 0, True"
                         />
                       </label>
                       <div className={actionIconCellClass}>
@@ -1054,7 +1048,7 @@ function EditorScriptBuilderDialog({
                           <option value="confirm">Onay iste</option>
                           <option value="calculate">Formül hesapla</option>
                           <option value="setReadOnly">ReadOnly ayarla</option>
-                          <option value="apiToField">API sonucunu field'a yaz</option>
+                          <option value="apiToField">API sonucunu field&apos;a yaz</option>
                         </select>
                       </label>
 
@@ -1077,11 +1071,11 @@ function EditorScriptBuilderDialog({
                           <input
                             className={baseInputClass}
                             value={action.textValue}
+                            placeholder="text, {Field} or {selected.Name}"
+                            title="Sabit metin veya token yaz. Örnek: {Name}, {value}, {selected.DisplayName}"
                             onChange={(event) =>
                               updateConditionalAction(action.id, { textValue: event.target.value })
                             }
-                            placeholder="text, {Field} or {selected.Name}"
-                            title="Sabit metin veya token yaz. Örnek: {Name}, {value}, {selected.DisplayName}"
                           />
                         </label>
                       )}
@@ -1129,11 +1123,11 @@ function EditorScriptBuilderDialog({
                             <input
                               className={baseInputClass}
                               value={action.apiUrl}
+                              placeholder="/api/path/{Id}"
+                              title="Token kullanabilirsin: /api/orders/{OrderId}, /api/x/{selected.Id}, /api/y/{value}"
                               onChange={(event) =>
                                 updateConditionalAction(action.id, { apiUrl: event.target.value })
                               }
-                              placeholder="/api/path/{Id}"
-                              title="Token kullanabilirsin: /api/orders/{OrderId}, /api/x/{selected.Id}, /api/y/{value}"
                             />
                           </label>
                           <label className={`${fieldLabelClass} col-span-12 md:col-span-3`}>
@@ -1141,13 +1135,13 @@ function EditorScriptBuilderDialog({
                             <input
                               className={baseInputClass}
                               value={action.responsePath}
+                              placeholder="data.value"
+                              title="API JSON cevabından okunacak path. Boş bırakırsan tüm JSON hedef field'a yazılır."
                               onChange={(event) =>
                                 updateConditionalAction(action.id, {
                                   responsePath: event.target.value,
                                 })
                               }
-                              placeholder="data.value"
-                              title="API JSON cevabından okunacak path. Boş bırakırsan tüm JSON hedef field'a yazılır."
                             />
                           </label>
                         </>
@@ -1160,13 +1154,13 @@ function EditorScriptBuilderDialog({
                             <input
                               className={baseInputClass}
                               value={action.textValue}
+                              placeholder="/report?id={Id}&type={selected.Type}"
+                              title="Açılacak URL. Token destekler: {Id}, {value}, {selected.Type}"
                               onChange={(event) =>
                                 updateConditionalAction(action.id, {
                                   textValue: event.target.value,
                                 })
                               }
-                              placeholder="/report?id={Id}&type={selected.Type}"
-                              title="Açılacak URL. Token destekler: {Id}, {value}, {selected.Type}"
                             />
                           </label>
                           <label className={`${fieldLabelClass} col-span-12 md:col-span-2`}>
@@ -1194,11 +1188,11 @@ function EditorScriptBuilderDialog({
                           <input
                             className={baseInputClass}
                             value={action.message}
+                            placeholder="{Field} tokenları ile mesaj"
+                            title="Alert/confirm mesajı. Token destekler: {Name}, {value}, {selected.Name}"
                             onChange={(event) =>
                               updateConditionalAction(action.id, { message: event.target.value })
                             }
-                            placeholder="{Field} tokenları ile mesaj"
-                            title="Alert/confirm mesajı. Token destekler: {Name}, {value}, {selected.Name}"
                           />
                         </label>
                       )}
@@ -1209,11 +1203,11 @@ function EditorScriptBuilderDialog({
                           <input
                             className={baseInputClass}
                             value={action.formula}
+                            placeholder="Number(data.Quantity || 0) * Number(data.UnitPrice || 0)"
+                            title="JavaScript expression yaz. data=formData, selected=selectedItem, value=e.value olarak kullanılır."
                             onChange={(event) =>
                               updateConditionalAction(action.id, { formula: event.target.value })
                             }
-                            placeholder="Number(data.Quantity || 0) * Number(data.UnitPrice || 0)"
-                            title="JavaScript expression yaz. data=formData, selected=selectedItem, value=e.value olarak kullanılır."
                           />
                         </label>
                       )}
@@ -1292,9 +1286,9 @@ function EditorScriptBuilderDialog({
               <input
                 className={baseInputClass}
                 value={serviceCall}
-                onChange={(event) => setServiceCall(event.target.value)}
                 placeholder="UiEvalService.ApiGenerateBackgroundWorkers();"
                 title="Global servis çağrısı. Örnek: UiEvalService.ApiGenerateBackgroundWorkers();"
+                onChange={(event) => setServiceCall(event.target.value)}
               />
             </div>
           </section>
@@ -1340,7 +1334,6 @@ function EditorScriptBuilderDialog({
                 language="typescript"
                 theme="vs-dark"
                 value={scriptEditorValue}
-                onChange={(nextValue) => setScriptEditorValue(nextValue || '')}
                 options={{
                   automaticLayout: true,
                   fontSize: 12,
@@ -1349,6 +1342,7 @@ function EditorScriptBuilderDialog({
                   tabSize: 2,
                   wordWrap: 'on',
                 }}
+                onChange={(nextValue) => setScriptEditorValue(nextValue || '')}
               />
             </div>
           </section>
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAnnotation.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAnnotation.tsx
index 7cda97c..1c64b94 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAnnotation.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAnnotation.tsx
@@ -88,10 +88,10 @@ function JsonRowOpDialogAnnotation({
       id="annotationOperation"
       isOpen={isOpen}
       preventScroll={true}
-      onClose={handleClose}
-      onRequestClose={handleClose}
       width={900}
       height="90vh"
+      onClose={handleClose}
+      onRequestClose={handleClose}
     >
       {(data.operation === 'create' || data.operation === 'update') && (
         <Formik
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
index 5783be7..b1deb17 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
@@ -16,7 +16,7 @@ import { useStoreActions } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldArray, FieldProps, Form, Formik } from 'formik'
 import groupBy from 'lodash/groupBy'
-import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react'
 import { FaBolt, FaCalendarMinus, FaCalendarPlus, FaSlidersH, FaTag } from 'react-icons/fa'
 import { number, object, string } from 'yup'
 import {
@@ -82,7 +82,7 @@ function JsonRowOpDialogEditForm({
   const [scriptBuilderIndex, setScriptBuilderIndex] = useState<number | null>(null)
   const [isHelperOpen, setIsHelperOpen] = useState(false)
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -113,7 +113,7 @@ function JsonRowOpDialogEditForm({
         },
       )
     }
-  }
+  }, [listFormCode])
 
   const handleClose = async (e?: any) => {
     if (e) {
@@ -133,7 +133,7 @@ function JsonRowOpDialogEditForm({
     if (isOpen && data) {
       getFields()
     }
-  }, [isOpen, data])
+  }, [isOpen, data, getFields])
 
   if (!data || !fieldList?.length) {
     return null
@@ -279,10 +279,10 @@ function JsonRowOpDialogEditForm({
 
                   <Dialog
                     isOpen={isHelperOpen}
-                    onClose={() => setIsHelperOpen(false)}
-                    onRequestClose={() => setIsHelperOpen(false)}
                     preventScroll={true}
                     width={1000}
+                    onClose={() => setIsHelperOpen(false)}
+                    onRequestClose={() => setIsHelperOpen(false)}
                   >
                     <h5 className="mb-4">Helper</h5>
 
@@ -396,11 +396,11 @@ function JsonRowOpDialogEditForm({
                                               )
                                             : null
                                         }
+                                        menuPlacement="auto"
+                                        maxMenuHeight={150}
                                         onChange={(option) =>
                                           form.setFieldValue(field.name, option?.value)
                                         }
-                                        menuPlacement="auto"
-                                        maxMenuHeight={150}
                                       />
                                     )}
                                   </Field>
@@ -422,12 +422,12 @@ function JsonRowOpDialogEditForm({
                                           (option) =>
                                             option.value === values.items?.at(index)?.editorType2,
                                         )}
-                                        onChange={(option) =>
-                                          form.setFieldValue(field.name, option?.value)
-                                        }
                                         className="flex-1"
                                         menuPlacement="auto"
                                         maxMenuHeight={150}
+                                        onChange={(option) =>
+                                          form.setFieldValue(field.name, option?.value)
+                                        }
                                       />
                                     )}
                                   </Field>
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx
index 1f52494..8fabb7f 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx
@@ -10,10 +10,10 @@ import {
 } from '@/components/ui'
 import { ListFormJsonRowDto } from '@/proxy/admin/list-form/models'
 import { SelectBoxOption } from '@/types/shared'
-import { useStoreActions, useStoreState } from '@/store'
+import { useStoreActions } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik } from 'formik'
-import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react'
 import { object, string } from 'yup'
 import { JsonRowDialogData } from './types'
 import {
@@ -22,10 +22,10 @@ import {
   postListFormJsonRow,
   putListFormJsonRow,
 } from '@/services/admin/list-form.service'
-import { cascadeFilterOperator, colSpanOptions } from '../options'
+import { cascadeFilterOperator } from '../options'
 import CreatableSelect from 'react-select/creatable'
 import { getListFormFields } from '@/services/admin/list-form-field.service'
-import { groupBy } from 'lodash'
+import groupBy from 'lodash/groupBy'
 import { extraFilterControlTypeOptions } from '@/proxy/admin/list-form/options'
 
 const schema = object().shape({
@@ -73,7 +73,7 @@ function JsonRowOpDialogExtraFilter({
     setIsOpen(false)
   }
 
-  const getFields = async () => {
+  const getFields = useCallback(async () => {
     if (!listFormCode) {
       return
     }
@@ -104,13 +104,13 @@ function JsonRowOpDialogExtraFilter({
         },
       )
     }
-  }
+  }, [listFormCode])
 
   useEffect(() => {
     if (isOpen && data) {
       getFields()
     }
-  }, [isOpen, data])
+  }, [isOpen, data, getFields])
 
   if (!data || !fieldList?.length) {
     return null
@@ -121,9 +121,9 @@ function JsonRowOpDialogExtraFilter({
       id="extraFilterOperation"
       isOpen={isOpen}
       preventScroll={true}
+      width={data.operation === 'create' || data.operation === 'update' ? 'sm' : '450px'}
       onClose={handleClose}
       onRequestClose={handleClose}
-      width={data.operation === 'create' || data.operation === 'update' ? 'sm' : '450px'}
     >
       {(data.operation === 'create' || data.operation === 'update') && (
         <>
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogPane.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogPane.tsx
index 4016ac1..1c4565c 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogPane.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogPane.tsx
@@ -5,15 +5,13 @@ import {
   FormItem,
   Input,
   Notification,
-  Select,
-  Tabs,
   toast,
 } from '@/components/ui'
 import { ListFormJsonRowDto } from '@/proxy/admin/list-form/models'
 import { useStoreActions } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik } from 'formik'
-import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, SetStateAction } from 'react'
 import { number, object, string } from 'yup'
 import { JsonRowDialogData } from './types'
 import {
@@ -114,7 +112,7 @@ function JsonRowOpDialogPane({
               }
             }}
           >
-            {({ touched, errors, values, isSubmitting }) => (
+            {({ touched, errors, isSubmitting }) => (
               <Form>
                 <FormContainer size="sm">
                   <div className="h-full overflow-y-auto p-2">
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSeries.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSeries.tsx
index 153ea89..a5b1613 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSeries.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSeries.tsx
@@ -14,7 +14,7 @@ import { SelectBoxOption } from '@/types/shared'
 import { useStoreActions, useStoreState } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik } from 'formik'
-import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, SetStateAction } from 'react'
 import { boolean, number, object, string } from 'yup'
 import { JsonRowDialogData } from './types'
 import {
@@ -30,7 +30,6 @@ import {
   columnSummaryTypeListOptions,
 } from '../options'
 import { ChartPanesDto, ChartValueAxisDto } from '@/proxy/admin/charts/models'
-import CreatableSelect from 'react-select/creatable'
 import { tooltipFormatListOptions } from '@/proxy/admin/list-form/options'
 
 const schema = object().shape({
@@ -129,10 +128,10 @@ function JsonRowOpDialogSeries({
       id="paneOperation"
       isOpen={isOpen}
       preventScroll={true}
-      onClose={handleClose}
-      onRequestClose={handleClose}
       width={900}
       height="90vh"
+      onClose={handleClose}
+      onRequestClose={handleClose}
     >
       {(data.operation === 'create' || data.operation === 'update') && (
         <Formik
@@ -282,9 +281,9 @@ function JsonRowOpDialogSeries({
                             value={fieldList?.find(
                               (option) => option.value === values.argumentField,
                             )}
-                            onChange={(option) => form.setFieldValue(field.name, option?.value)}
                             menuPlacement="auto"
                             maxMenuHeight={150}
+                            onChange={(option) => form.setFieldValue(field.name, option?.value)}
                           />
                         )}
                       </Field>
@@ -303,9 +302,9 @@ function JsonRowOpDialogSeries({
                             isClearable={true}
                             options={fieldList}
                             value={fieldList?.find((option) => option.value === values.valueField)}
-                            onChange={(option) => form.setFieldValue(field.name, option?.value)}
                             menuPlacement="auto"
                             maxMenuHeight={150}
+                            onChange={(option) => form.setFieldValue(field.name, option?.value)}
                           />
                         )}
                       </Field>
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSubForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSubForm.tsx
index e1bb0fb..770df14 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSubForm.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSubForm.tsx
@@ -122,7 +122,7 @@ function JsonRowOpDialogSubForm({
     }
 
     loadData()
-  }, [isOpen, listFormValues?.listFormCode])
+  }, [isOpen, listFormValues?.listFormCode, translate])
 
   useEffect(() => {
     if (isOpen) {
diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogWidget.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogWidget.tsx
index 967fce5..fd976f9 100644
--- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogWidget.tsx
+++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogWidget.tsx
@@ -12,10 +12,10 @@ import {
 import SqlEditor from '@/views/developerKit/SqlEditor'
 import { ListFormJsonRowDto } from '@/proxy/admin/list-form/models'
 import { SelectBoxOption } from '@/types/shared'
-import { useStoreActions, useStoreState } from '@/store'
+import { useStoreActions } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik } from 'formik'
-import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { Dispatch, SetStateAction } from 'react'
 import { number, object, string } from 'yup'
 import { JsonRowDialogData } from './types'
 import {
@@ -77,10 +77,10 @@ function JsonRowOpDialogWidget({
       id="widgetOperation"
       isOpen={isOpen}
       preventScroll={true}
-      onClose={handleClose}
-      onRequestClose={handleClose}
       width={data.operation === 'create' || data.operation === 'update' ? 900 : 450}
       height="90vh"
+      onClose={handleClose}
+      onRequestClose={handleClose}
     >
       {(data.operation === 'create' || data.operation === 'update') && (
         <Formik
@@ -243,13 +243,9 @@ function JsonRowOpDialogWidget({
                           <div className="space-y-3">
                             <div>
                               <code className="text-xs bg-gray-800 p-1 rounded block mt-1">
-                                SELECT 'Aktif' as title, COUNT(Id) as value,
-                                <br />
-                                &nbsp;&nbsp;'blue' as color, 'FaChartBar' as icon,
-                                <br />
-                                &nbsp;&nbsp;'Aktif kayıtlar' as subTitle
-                                <br />
-                                FROM YourTable WHERE IsActive = 1
+                                {
+                                  "SELECT 'Aktif' as title, COUNT(Id) as value, 'blue' as color, 'FaChartBar' as icon, 'Aktif kayıtlar' as subTitle FROM YourTable WHERE IsActive = 1"
+                                }
                               </code>
                             </div>
                           </div>
@@ -269,8 +265,8 @@ function JsonRowOpDialogWidget({
                       >
                         <SqlEditor
                           value={values.sqlQuery || ''}
-                          onChange={(value) => setFieldValue('sqlQuery', value || '')}
                           height="35vh"
+                          onChange={(value) => setFieldValue('sqlQuery', value || '')}
                         />
                       </div>
                     </FormItem>
diff --git a/ui/src/views/admin/listForm/wizard/Wizard.tsx b/ui/src/views/admin/listForm/wizard/Wizard.tsx
index b8012f7..2aca572 100644
--- a/ui/src/views/admin/listForm/wizard/Wizard.tsx
+++ b/ui/src/views/admin/listForm/wizard/Wizard.tsx
@@ -10,7 +10,6 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import * as Yup from 'yup'
 import { getMenus } from '@/services/menu.service'
 import { getPermissions } from '@/services/identity.service'
-import { DbTypeEnum, SelectCommandTypeEnum } from '@/proxy/form/models'
 import { getDataSources } from '@/services/data-source.service'
 import { sqlObjectManagerService } from '@/services/sql-query-manager.service'
 import type { SqlObjectExplorerDto, DatabaseColumnDto } from '@/proxy/sql-query-manager/models'
@@ -32,13 +31,15 @@ import { Container } from '@/components/shared'
 import { sqlDataTypeToDbType } from '../edit/options'
 import { useStoreActions } from '@/store/store'
 import { deleteWizardFile, getWizardFile, postListFormWizard } from '@/services/wizard.service'
-import { UiLookupDataSourceTypeEnum } from '@/proxy/form/models'
 import { ListFormWizardDto } from '@/proxy/admin/wizard/models'
 import {
   ListFormWorkflowCriteriaDto,
   SubFormDto,
   WidgetEditDto,
   WorkflowDto,
+  UiLookupDataSourceTypeEnum,
+  DbTypeEnum,
+  SelectCommandTypeEnum,
 } from '@/proxy/form/models'
 
 // ─── Formik initial values & validation ──────────────────────────────────────
@@ -271,7 +272,9 @@ const Wizard = () => {
       setSelectCommandColumns(cols)
       const colNames = new Set(cols.map((c) => c.columnName.toLowerCase()))
       const hasTenantColumn = colNames.has('tenantid')
-      const selectableColumns = cols.filter((c) => isAutoSelectedColumn(c.columnName, hasTenantColumn))
+      const selectableColumns = cols.filter((c) =>
+        isAutoSelectedColumn(c.columnName, hasTenantColumn),
+      )
       setSelectedColumns(new Set(selectableColumns.map((c) => c.columnName)))
       setEditingGroups([])
       // Auto-check isTenant / isBranch based on column presence
@@ -297,7 +300,11 @@ const Wizard = () => {
   const toggleColumn = (col: string) =>
     setSelectedColumns((prev) => {
       const next = new Set(prev)
-      next.has(col) ? next.delete(col) : next.add(col)
+      if (next.has(col)) {
+        next.delete(col)
+      } else {
+        next.add(col)
+      }
       return next
     })
 
@@ -548,15 +555,17 @@ const Wizard = () => {
     const previousSpacedLabel = toSpacedLabel(formik?.values.wizardName ?? '')
     const derived = deriveListFormCode(name)
 
-    const setAutoText = (field: keyof Pick<
-      ListFormWizardDto,
-      | 'languageTextMenuEn'
-      | 'languageTextMenuTr'
-      | 'languageTextTitleEn'
-      | 'languageTextTitleTr'
-      | 'languageTextDescEn'
-      | 'languageTextDescTr'
-    >) => {
+    const setAutoText = (
+      field: keyof Pick<
+        ListFormWizardDto,
+        | 'languageTextMenuEn'
+        | 'languageTextMenuTr'
+        | 'languageTextTitleEn'
+        | 'languageTextTitleTr'
+        | 'languageTextDescEn'
+        | 'languageTextDescTr'
+      >,
+    ) => {
       const current = formik?.values[field]
       if (!current || current === previousSpacedLabel) {
         formik?.setFieldValue(field, spacedLabel)
@@ -789,7 +798,7 @@ const Wizard = () => {
           setSubmitting(false)
         }}
       >
-        {({ touched, errors, isSubmitting, values }) => (
+        {({ touched, errors, values }) => (
           <Form onKeyDown={preventEnterSubmit}>
             <FormContainer size={currentStep >= 2 ? undefined : 'sm'}>
               {/* ─── Step 1: Basic Info ─────────────────────────────── */}
@@ -856,7 +865,6 @@ const Wizard = () => {
                   groups={editingGroups}
                   onGroupsChange={setEditingGroups}
                   dbObjects={dbObjects}
-                  isLoadingDbObjects={isLoadingDbObjects}
                   dsCode={currentDataSource}
                   translate={translate}
                   onBack={() => setCurrentStep(1)}
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep1.tsx b/ui/src/views/admin/listForm/wizard/WizardStep1.tsx
index 3193b78..0035db5 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep1.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep1.tsx
@@ -321,7 +321,8 @@ function MenuTreeInline({
   const toggle = (code: string) =>
     setExpanded((prev) => {
       const n = new Set(prev)
-      n.has(code) ? n.delete(code) : n.add(code)
+      if (n.has(code)) n.delete(code)
+      else n.add(code)
       return n
     })
 
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep3.tsx b/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
index 6be2369..dea2185 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep3.tsx
@@ -64,7 +64,6 @@ export interface WizardStep3Props {
   groups: WizardGroup[]
   onGroupsChange: (groups: WizardGroup[]) => void
   dbObjects: SqlObjectExplorerDto | null
-  isLoadingDbObjects: boolean
   dsCode: string
   translate: (key: string) => string
   onBack: () => void
@@ -794,7 +793,6 @@ const WizardStep3 = ({
   groups,
   onGroupsChange,
   dbObjects,
-  isLoadingDbObjects: _isLoadingDbObjects,
   dsCode,
   translate,
   onBack,
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep5.tsx b/ui/src/views/admin/listForm/wizard/WizardStep5.tsx
index 1fe3756..37bf1f2 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep5.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep5.tsx
@@ -239,10 +239,10 @@ function WizardStep5({ widgets, translate, onChange, onBack, onNext }: Props) {
                     title={
                       <div className="text-xs max-h-96 overflow-y-auto">
                         <div className="font-semibold mb-2">SQL Query Examples:</div>
-                        <code className="block rounded bg-gray-800 p-2 text-xs text-white">
-                          SELECT 'Aktif' as title, COUNT(Id) as value, 'blue' as color, 'FaChartBar'
-                          as icon, 'Aktif kayitlar' as subTitle FROM YourTable
-                        </code>
+
+                        <pre className="block rounded bg-gray-800 p-2 text-xs text-white whitespace-pre-wrap">
+                          <code>{`SELECT 'Aktif' as title, COUNT(Id) as value, 'blue' as color, 'FaChartBar' as icon, 'Aktif kayitlar' as subTitle FROM YourTable`}</code>
+                        </pre>
                       </div>
                     }
                   >
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep6.tsx b/ui/src/views/admin/listForm/wizard/WizardStep6.tsx
index 75bb89f..f0bfe2c 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep6.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep6.tsx
@@ -45,7 +45,7 @@ const toDesignerCriteria = (items: ListFormWorkflowCriteriaDto[]): WorkflowCrite
   }))
 
 const toWizardCriteria = (items: WorkflowCriteriaDto[]): ListFormWorkflowCriteriaDto[] =>
-  items.map(({ nodeId: _nodeId, ...item }) => item)
+  items.map(({ ...item }) => item)
 
 function WizardStep6({
   listFormCode,
diff --git a/ui/src/views/admin/listForm/wizard/WizardStep7.tsx b/ui/src/views/admin/listForm/wizard/WizardStep7.tsx
index 8efced2..44685fa 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStep7.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStep7.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@/components/ui'
 import type { DatabaseColumnDto } from '@/proxy/sql-query-manager/models'
-import { useState } from 'react'
+import React, { useState } from 'react'
 import {
   FaArrowLeft,
   FaCheckCircle,
diff --git a/ui/src/views/admin/listForm/workflow/WorkflowCanvas.tsx b/ui/src/views/admin/listForm/workflow/WorkflowCanvas.tsx
index ad35170..65e2ac1 100644
--- a/ui/src/views/admin/listForm/workflow/WorkflowCanvas.tsx
+++ b/ui/src/views/admin/listForm/workflow/WorkflowCanvas.tsx
@@ -217,7 +217,6 @@ export function WorkflowCanvas({
               <Arrow
                 key={link.key}
                 link={link}
-                criteria={arrowCriteria}
                 pendingLink={pendingLink}
                 onBeginLink={onBeginLink}
               />
@@ -254,7 +253,6 @@ export function WorkflowCanvas({
               <ArrowLabel
                 key={`${link.key}-label`}
                 link={link}
-                criteria={arrowCriteria}
                 pendingLink={pendingLink}
               />
             ))}
@@ -292,6 +290,7 @@ function FlowNode({
   return (
     <Button
       ref={setNodeRef}
+      data-flow-node
       type="button"
       variant="plain"
       shape="none"
@@ -307,7 +306,6 @@ function FlowNode({
           'border-red-600': item.kind === 'End',
         },
       )}
-      data-flow-node
       style={style}
       {...listeners}
       {...attributes}
@@ -434,16 +432,14 @@ function FlowNode({
 
 function Arrow({
   link,
-  criteria,
   pendingLink,
   onBeginLink,
 }: {
   link: WorkflowLink
-  criteria: WorkflowCriteriaDto[]
   pendingLink: PendingLink
   onBeginLink: (sourceId: string, outcome: string) => void
 }) {
-  const route = buildArrowRoute(link.source, link.target, link.sourcePort, criteria)
+  const route = buildArrowRoute(link.source, link.target, link.sourcePort)
   const d = roundedPolylinePath(route.points)
   const tone = linkTone(link)
   const isActive =
@@ -458,8 +454,8 @@ function Arrow({
 
   return (
     <g
-      className={classNames('group cursor-pointer outline-none', linkToneClass(tone))}
       data-flow-link
+      className={classNames('group cursor-pointer outline-none', linkToneClass(tone))}
       role="button"
       tabIndex={0}
       onClick={selectLink}
@@ -496,16 +492,14 @@ function Arrow({
 
 function ArrowLabel({
   link,
-  criteria,
   pendingLink,
 }: {
   link: WorkflowLink
-  criteria: WorkflowCriteriaDto[]
   pendingLink: PendingLink
 }) {
   if (!link.label) return null
 
-  const route = buildArrowRoute(link.source, link.target, link.sourcePort, criteria)
+  const route = buildArrowRoute(link.source, link.target, link.sourcePort)
   const labelPoint = route.labelPoint
   const tone = linkTone(link)
   const labelWidth = Math.max(38, (link.label || '').length * 6 + 14)
@@ -514,11 +508,11 @@ function ArrowLabel({
 
   return (
     <g
+      data-flow-link
       className={classNames(linkToneClass(tone), {
         '[&_text]:text-[11px] [&_text]:font-bold [&_rect]:fill-white [&_rect]:[stroke-width:1.5] dark:[&_rect]:fill-gray-900':
           isActive,
       })}
-      data-flow-link
     >
       <rect
         className="fill-white/90 stroke-[var(--link-soft)] [stroke-width:1] dark:fill-gray-900/90"
@@ -571,7 +565,7 @@ function portSideClass(side: string) {
   return '-translate-x-1/2'
 }
 
-function buildArrowRoute(source: any, target: any, sourcePort: any = null, criteria: any[] = []) {
+function buildArrowRoute(source: any, target: any, sourcePort: any = null) {
   const sourceLeft = Number(source.positionX || 0)
   const sourceTop = Number(source.positionY || 0)
   const targetLeft = Number(target.positionX || 0)
diff --git a/ui/src/views/admin/listForm/workflow/WorkflowCriteria.tsx b/ui/src/views/admin/listForm/workflow/WorkflowCriteria.tsx
index 9d3bda1..b9e729c 100644
--- a/ui/src/views/admin/listForm/workflow/WorkflowCriteria.tsx
+++ b/ui/src/views/admin/listForm/workflow/WorkflowCriteria.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import { FaEdit, FaTrash } from 'react-icons/fa'
 import classNames from 'classnames'
 import { Button, Dialog, FormContainer, FormItem, Input, Select, Table } from '@/components/ui'
@@ -12,7 +12,6 @@ import {
   compareOutcomeRuleText,
   criteriaSummary,
   emptyCompareOutcome1,
-  emptyCompareOutcome2,
   targetTitle,
 } from '@/utils/workflow/workflowHelpers'
 import type { CompareOutcomeDto, WorkflowCriteriaDto } from '@/services/workflow.service'
@@ -57,12 +56,16 @@ export function WorkflowCriteria({
   const numericCompareColumn = selectCommandColumns.find((column) =>
     isNumericDataType(column.dataType),
   )
-  const compareColumnOptions = selectCommandColumns.length
-    ? selectCommandColumns.map((column) => ({
-        value: column.columnName,
-        label: `${column.columnName} (${column.dataType})`,
-      }))
-    : []
+  const compareColumnOptions = useMemo(
+    () =>
+      selectCommandColumns.length
+        ? selectCommandColumns.map((column) => ({
+            value: column.columnName,
+            label: `${column.columnName} (${column.dataType})`,
+          }))
+        : [],
+    [selectCommandColumns],
+  )
   const defaultCompareColumn =
     numericCompareColumn?.columnName ?? compareColumnOptions[0]?.value ?? 'Price'
 
@@ -154,8 +157,8 @@ export function WorkflowCriteria({
       required={required}
       options={targetOptions}
       value={value || ''}
-      onChange={onSelectTarget}
       className={className}
+      onChange={onSelectTarget}
     />
   )
   const closeDialog = () => onSelect('')
@@ -236,13 +239,13 @@ export function WorkflowCriteria({
         </TBody>
       </Table>
 
-      <Dialog isOpen={!!selectedId} onClose={closeDialog} onRequestClose={closeDialog} width="lg">
-        <form onSubmit={onSubmit} className="flex flex-1 flex-col min-h-0">
+      <Dialog isOpen={!!selectedId} width="lg" onClose={closeDialog} onRequestClose={closeDialog}>
+        <form className="flex flex-1 flex-col min-h-0" onSubmit={onSubmit}>
           <Dialog.Body className="flex flex-col">
             <div className="flex-1 min-h-0 overflow-y-auto pr-1">
               <FormContainer size="sm">
                 <div className="grid grid-cols-2 gap-1">
-                  <FormItem label={translate('::App.Platform.Type')} asterisk>
+                  <FormItem asterisk label={translate('::App.Platform.Type')}>
                     <SelectField
                       required
                       options={kindOptions}
@@ -250,7 +253,7 @@ export function WorkflowCriteria({
                       onChange={(value) => setField('kind', value)}
                     />
                   </FormItem>
-                  <FormItem label={translate('::App.Listform.ListformField.Title')} asterisk>
+                  <FormItem asterisk label={translate('::App.Listform.ListformField.Title')}>
                     <Input
                       required
                       value={formValues.title}
@@ -259,8 +262,8 @@ export function WorkflowCriteria({
                   </FormItem>
                   {(formValues.kind === 'Approval' || formValues.kind === 'Inform') && (
                     <FormItem
-                      label={translate('::App.Listform.ListformField.Approver')}
                       asterisk
+                      label={translate('::App.Listform.ListformField.Approver')}
                     >
                       <SelectField
                         required
@@ -273,8 +276,8 @@ export function WorkflowCriteria({
 
                   {(formValues.kind === 'Start' || formValues.kind === 'Inform') && (
                     <FormItem
-                      label={translate('::App.Listform.ListformField.NextOnStart')}
                       asterisk
+                      label={translate('::App.Listform.ListformField.NextOnStart')}
                     >
                       {targetSelect(
                         formValues.nextOnStart,
@@ -287,8 +290,8 @@ export function WorkflowCriteria({
                   {formValues.kind === 'Approval' && (
                     <>
                       <FormItem
-                        label={translate('::App.Listform.ListformField.NextOnApprove')}
                         asterisk
+                        label={translate('::App.Listform.ListformField.NextOnApprove')}
                       >
                         {targetSelect(
                           formValues.nextOnApprove,
@@ -297,8 +300,8 @@ export function WorkflowCriteria({
                         )}
                       </FormItem>
                       <FormItem
-                        label={translate('::App.Listform.ListformField.NextOnReject')}
                         asterisk
+                        label={translate('::App.Listform.ListformField.NextOnReject')}
                       >
                         {targetSelect(
                           formValues.nextOnReject,
@@ -360,12 +363,12 @@ export function WorkflowCriteria({
                                 required
                                 value={outcome.label}
                                 aria-label="Durum adı zorunlu"
+                                className="flex-[5]"
                                 onChange={(event) =>
                                   updateCompareOutcome(index, {
                                     label: event.target.value,
                                   })
                                 }
-                                className="flex-[5]"
                               />
                               {targetSelect(
                                 outcome.targetId,
@@ -397,42 +400,42 @@ export function WorkflowCriteria({
                                   <SelectField
                                     options={compareColumnOptions}
                                     value={condition.compareColumn}
+                                    className="flex-[4]"
                                     onChange={(value) =>
                                       updateCompareCondition(index, conditionIndex, {
                                         compareColumn: value,
                                       })
                                     }
-                                    className="flex-[4]"
                                   />
                                   <SelectField
                                     options={operatorOptions}
                                     value={condition.compareOperator}
+                                    className="flex-[3]"
                                     onChange={(value) =>
                                       updateCompareCondition(index, conditionIndex, {
                                         compareOperator: value,
                                       })
                                     }
-                                    className="flex-[3]"
                                   />
                                   <Input
                                     required
                                     type="number"
                                     step="0.01"
                                     value={condition.compareValue}
+                                    className="flex-[3]"
                                     onChange={(event) =>
                                       updateCompareCondition(index, conditionIndex, {
                                         compareValue: event.target.value,
                                       })
                                     }
-                                    className="flex-[3]"
                                   />
                                   <Button
                                     type="button"
                                     size="sm"
                                     variant="plain"
                                     disabled={(outcome.conditions || []).length <= 1}
-                                    onClick={() => removeCompareCondition(index, conditionIndex)}
                                     className="flex-[1]"
+                                    onClick={() => removeCompareCondition(index, conditionIndex)}
                                   >
                                     Sil
                                   </Button>
@@ -440,8 +443,8 @@ export function WorkflowCriteria({
                                   <Button
                                     type="button"
                                     size="sm"
-                                    onClick={() => addCompareCondition(index)}
                                     className="flex-[1]"
+                                    onClick={() => addCompareCondition(index)}
                                   >
                                     {translate('::Insert')}
                                   </Button>
@@ -508,14 +511,14 @@ function SelectField({
       <Select
         options={options}
         value={selectedOption}
-        onChange={(option: any) => onChange(option?.value ?? '')}
         className={className}
+        onChange={(option: any) => onChange(option?.value ?? '')}
       />
       {required && (
         <input
+          required
           tabIndex={-1}
           className="pointer-events-none h-0 w-0 opacity-0"
-          required
           value={value}
           onChange={() => undefined}
         />
diff --git a/ui/src/views/admin/listForm/workflow/WorkflowDesigner.tsx b/ui/src/views/admin/listForm/workflow/WorkflowDesigner.tsx
index 03dfce1..5950387 100644
--- a/ui/src/views/admin/listForm/workflow/WorkflowDesigner.tsx
+++ b/ui/src/views/admin/listForm/workflow/WorkflowDesigner.tsx
@@ -82,8 +82,6 @@ export function WorkflowDesigner({
   onZoomIn,
   onZoomOut,
 }: WorkflowDesignerProps) {
-  const { translate } = useLocalization()
-
   return (
     <div className="min-h-screen">
       <main className="grid">
diff --git a/ui/src/views/admin/notification/CreateNotification.tsx b/ui/src/views/admin/notification/CreateNotification.tsx
index 19eea4b..d2ac762 100644
--- a/ui/src/views/admin/notification/CreateNotification.tsx
+++ b/ui/src/views/admin/notification/CreateNotification.tsx
@@ -10,7 +10,6 @@ import {
 import { postMyNotificationByNotificationRuleId } from '@/services/notification.service'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, Form, Formik, FormikHelpers } from 'formik'
-import { useState } from 'react'
 import * as Yup from 'yup'
 
 export interface NotificationDto {
@@ -33,7 +32,6 @@ function CreateNotification({
   id: string
 }) {
   const { translate } = useLocalization()
-  const [loading, setLoading] = useState(true)
 
   const handleSubmit = async (
     values: NotificationDto,
@@ -43,7 +41,6 @@ function CreateNotification({
       return
     }
 
-    setLoading(true)
     setSubmitting(true)
 
     try {
@@ -57,7 +54,7 @@ function CreateNotification({
         },
       )
       onDialogClose()
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification type="danger" duration={2000}>
           {'Hata'}
@@ -67,7 +64,6 @@ function CreateNotification({
         },
       )
     } finally {
-      setLoading(false)
       setSubmitting(false)
     }
   }
@@ -76,7 +72,7 @@ function CreateNotification({
     <Dialog isOpen={open} onClose={onDialogClose} onRequestClose={onDialogClose}>
       <h5 className="mb-4">{id}</h5>
       <Formik initialValues={{ id, message: '' }} validationSchema={scheme} onSubmit={handleSubmit}>
-        {({ touched, errors, values, isSubmitting }) => {
+        {({ touched, errors, isSubmitting }) => {
           return (
             <Form>
               <FormContainer size="sm">
diff --git a/ui/src/views/admin/profile/Profile.tsx b/ui/src/views/admin/profile/Profile.tsx
index e5852e2..f970e6b 100644
--- a/ui/src/views/admin/profile/Profile.tsx
+++ b/ui/src/views/admin/profile/Profile.tsx
@@ -3,31 +3,17 @@ import Container from '@/components/shared/Container'
 import Tabs from '@/components/ui/Tabs'
 import { APP_NAME } from '@/constants/app.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
-import { Suspense, lazy, useState } from 'react'
+import { Suspense, lazy, type ReactNode } from 'react'
 import { Helmet } from 'react-helmet'
-import { FaCheckCircle, FaCompressAlt, FaNode, FaUser } from 'react-icons/fa'
+import { FaCheckCircle, FaCompressAlt, FaUser } from 'react-icons/fa'
 import { useLocation, useNavigate } from 'react-router-dom'
 
-type AccountSetting = {
-  profile: {
-    firstName?: string
-    lastName?: string
-    avatar?: string
-    lang?: string
-  }
-  loginHistory: {
-    type: string
-    deviceName: string
-    time: number
-    location: string
-  }[]
-}
-
 const General = lazy(() => import('./components/General'))
 const Password = lazy(() => import('./components/Password'))
 const NotificationSettings = lazy(() => import('./components/NotificationSettings'))
 
 const { TabNav, TabList } = Tabs
+const PROFILE_BASE_PATH = '/admin/profile'
 
 const Profile = () => {
   const { translate } = useLocalization()
@@ -36,7 +22,7 @@ const Profile = () => {
     {
       label: string
       path: string
-      icon?: JSX.Element
+      icon?: ReactNode
     }
   > = {
     general: {
@@ -58,15 +44,12 @@ const Profile = () => {
 
   const location = useLocation()
   const path = location.pathname.substring(location.pathname.lastIndexOf('/') + 1)
-  const [currentTab, setCurrentTab] = useState(path)
-  const [data, setData] = useState<Partial<AccountSetting>>({})
   const navigate = useNavigate()
-
-  const PROFILE_BASE_PATH = '/admin/profile'
+  const currentTab =
+    Object.entries(settingsMenu).find(([, setting]) => setting.path === path)?.[0] ?? 'general'
 
   const onTabChange = (val: string) => {
     if (settingsMenu[val]) {
-      setCurrentTab(settingsMenu[val].path)
       navigate(`${PROFILE_BASE_PATH}/${settingsMenu[val].path}`)
     }
   }
@@ -94,8 +77,8 @@ const Profile = () => {
         <div className="px-4 py-6">
           <Suspense fallback={<></>}>
             {currentTab === 'general' && <General />}
-            {currentTab === 'password' && <Password data={data.loginHistory} />}
-            {currentTab === 'notification-settings' && <NotificationSettings />}
+            {currentTab === 'password' && <Password />}
+            {currentTab === 'notificationSettings' && <NotificationSettings />}
           </Suspense>
         </div>
       </AdaptableCard>
diff --git a/ui/src/views/admin/profile/components/General.tsx b/ui/src/views/admin/profile/components/General.tsx
index 4953639..3a108c3 100644
--- a/ui/src/views/admin/profile/components/General.tsx
+++ b/ui/src/views/admin/profile/components/General.tsx
@@ -9,7 +9,7 @@ import { useLocalization } from '@/utils/hooks/useLocalization'
 import dayjs from 'dayjs'
 import { Field, Form, Formik } from 'formik'
 
-import { useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import {
   CircleStencil,
   Cropper,
@@ -29,7 +29,6 @@ import {
   FaUniversity,
 } from 'react-icons/fa'
 import * as Yup from 'yup'
-import isEmpty from 'lodash/isEmpty'
 import { ProfileDto, UpdateProfileDto } from '@/proxy/account/models'
 import { getProfile, updateProfile } from '@/services/account.service'
 import { CountryDto, getCountry } from '@/services/home.service'
@@ -58,7 +57,7 @@ const General = () => {
   const cropperRef = useRef<CropperRef>(null)
   const previewRef = useRef<CropperPreviewRef>(null)
 
-  const fetchData = async () => {
+  const fetchData = useCallback(async () => {
     setLoading(true)
     const [response, countryResponse] = await Promise.all([getProfile(), getCountry()])
     setProfileData(response.data)
@@ -69,13 +68,11 @@ const General = () => {
       surname: response.data.surname,
     })
     setLoading(false)
-  }
+  }, [auth.user.avatar])
 
   useEffect(() => {
-    if (isEmpty(profileData)) {
-      fetchData()
-    }
-  }, [])
+    fetchData()
+  }, [fetchData])
 
   const onChooseImage = async (file: File[]) => {
     if (file[0]) {
@@ -282,16 +279,16 @@ const General = () => {
                   </FormItem>
                   <FormItem label={translate('::Abp.Identity.User.UserInformation.PhoneNumber')}>
                     <Input
-                      type="text"
                       disabled
+                      type="text"
                       prefix={<FaPhone className="text-xl" />}
                       value={profileData?.phoneNumber}
                     ></Input>
                   </FormItem>
                   <FormItem label={translate('::RocketUsername')}>
                     <Input
-                      type="text"
                       disabled
+                      type="text"
                       prefix={<FaFacebookMessenger className="text-xl" />}
                       value={profileData?.extraProperties?.['RocketUsername'] as string | undefined}
                     ></Input>
@@ -305,8 +302,8 @@ const General = () => {
 
                   <FormItem label={translate('::Abp.Account.HomeAddress')}>
                     <Input
-                      type="text"
                       disabled
+                      type="text"
                       prefix={<FaHome className="text-xl" />}
                       value={getProfileExtraValue('HomeAddress')}
                     ></Input>
@@ -333,8 +330,8 @@ const General = () => {
                   </FormItem>
                   <FormItem label={translate('::Abp.Account.GraduationSchool')}>
                     <Input
-                      type="text"
                       disabled
+                      type="text"
                       prefix={<FaUniversity className="text-xl" />}
                       value={getProfileExtraValue('GraduationSchool')}
                     ></Input>
@@ -357,15 +354,15 @@ const General = () => {
                         <Cropper
                           ref={cropperRef}
                           src={image}
+                          className="cropper max-h-[300px] max-w-[300px]"
+                          stencilComponent={CircleStencil}
+                          minHeight={100}
+                          minWidth={100}
                           onUpdate={(cropper) => {
                             setTimeout(() => {
                               previewRef.current?.update(cropper)
                             }, 100)
                           }}
-                          className="cropper max-h-[300px] max-w-[300px]"
-                          stencilComponent={CircleStencil}
-                          minHeight={100}
-                          minWidth={100}
                         />
                       ) : (
                         <img
diff --git a/ui/src/views/admin/profile/components/NotificationSettings.tsx b/ui/src/views/admin/profile/components/NotificationSettings.tsx
index df4501a..16ae265 100644
--- a/ui/src/views/admin/profile/components/NotificationSettings.tsx
+++ b/ui/src/views/admin/profile/components/NotificationSettings.tsx
@@ -7,10 +7,8 @@ import {
   getMyNotificationTypes,
   postMyNotificationRule,
 } from '@/services/notification-rule.service'
-import classNames from 'classnames'
-import isEmpty from 'lodash/isEmpty'
-import { useEffect, useState } from 'react'
-import { FaHistory } from 'react-icons/fa';
+import { useCallback, useEffect, useState } from 'react'
+import { FaHistory } from 'react-icons/fa'
 
 const { Tr, Th, Td, THead, TBody } = Table
 
@@ -20,7 +18,7 @@ const NotificationSettings = () => {
   const [notificationTypes, setNotificationTypes] = useState<string[]>([])
   const [channels, setChannels] = useState<string[]>([])
 
-  const fetchData = async () => {
+  const fetchData = useCallback(async () => {
     setLoading(true)
     const channels = Object.keys(NotificationChannels)
     setChannels(channels)
@@ -34,7 +32,7 @@ const NotificationSettings = () => {
       const x: NotificationRuleDto[] = []
       for (const channel of channels) {
         const rule = rules.find(
-          (a) => a.channel == channel && a.notificationType == notificationType,
+          (a) => a.channel === channel && a.notificationType === notificationType,
         )
         x.push(
           rule ??
@@ -49,13 +47,11 @@ const NotificationSettings = () => {
     }
     setList(finalList)
     setLoading(false)
-  }
+  }, [])
 
   useEffect(() => {
-    if (isEmpty(list)) {
-      fetchData()
-    }
-  }, [])
+    fetchData()
+  }, [fetchData])
 
   const onClickCheckbox = async (checked: boolean, rule: NotificationRuleDto) => {
     await postMyNotificationRule({
@@ -63,18 +59,18 @@ const NotificationSettings = () => {
       notificationType: rule.notificationType,
       isActive: checked,
     })
-    fetchData()
+    await fetchData()
   }
 
   const resetMyNotifications = async (notificationType: string) => {
     await deleteMyNotificationRules(notificationType)
-    fetchData()
+    await fetchData()
   }
 
   return (
     <>
       {loading ? (
-        <div className={classNames('flex items-center justify-center')}>
+        <div className="flex items-center justify-center">
           <Spinner size={40} />
         </div>
       ) : (
@@ -115,8 +111,8 @@ const NotificationSettings = () => {
                           name={a + b}
                           disabled={list[m][n].isFixed}
                           checked={list[m][n].isActive}
-                          onChange={(e) => onClickCheckbox(e, list[m][n])}
                           color={list[m][n].isCustomized ? 'red-500' : undefined}
+                          onChange={(e) => onClickCheckbox(e, list[m][n])}
                         ></Checkbox>
                       </Td>
                     ))}
diff --git a/ui/src/views/admin/profile/components/Password.tsx b/ui/src/views/admin/profile/components/Password.tsx
index 16e247c..0eb9612 100644
--- a/ui/src/views/admin/profile/components/Password.tsx
+++ b/ui/src/views/admin/profile/components/Password.tsx
@@ -8,35 +8,14 @@ import { useLocalization } from '@/utils/hooks/useLocalization'
 import FormDesription from '@/views/shared/FormDesription'
 import FormRow from '@/views/shared/FormRow'
 import { Field, Form, Formik } from 'formik'
-import { FaDesktop, FaMobileAlt, FaTabletAlt } from 'react-icons/fa'
 import * as Yup from 'yup'
 
-type LoginHistory = {
-  type: string
-  deviceName: string
-  time: number
-  location: string
-}
-
 type PasswordFormModel = {
   password: string
   newPassword: string
   confirmNewPassword: string
 }
 
-const LoginHistoryIcon = ({ type }: { type: string }) => {
-  switch (type) {
-    case 'Desktop':
-      return <FaDesktop />
-    case 'Mobile':
-      return <FaMobileAlt />
-    case 'Tablet':
-      return <FaTabletAlt />
-    default:
-      return <FaDesktop />
-  }
-}
-
 const validationSchema = Yup.object().shape({
   password: Yup.string().required(),
   newPassword: Yup.string()
@@ -49,7 +28,7 @@ const validationSchema = Yup.object().shape({
   confirmNewPassword: Yup.string().oneOf([Yup.ref('newPassword'), ''], 'Password not match'),
 })
 
-const Password = ({ data }: { data?: LoginHistory[] }) => {
+const Password = () => {
   const onFormSubmit = async (
     values: PasswordFormModel,
     setSubmitting: (isSubmitting: boolean) => void,
@@ -144,48 +123,8 @@ const Password = ({ data }: { data?: LoginHistory[] }) => {
               </FormContainer>
             </Form>
           )
-        }}
+      }}
       </Formik>
-      {/* <div className="mt-6">
-        <FormDesription
-          title="Where you're signed in"
-          desc="You're signed in to your account on these devices."
-        />
-        {data && (
-          <div className="rounded-lg border border-gray-200 dark:border-gray-600 mt-6">
-            {data.map((log, index) => (
-              <div
-                key={log.deviceName}
-                className={classNames(
-                  'flex items-center px-4 py-6',
-                  !isLastChild(data, index) && 'border-b border-gray-200 dark:border-gray-600',
-                )}
-              >
-                <div className="flex items-center">
-                  <div className="text-3xl">
-                    <LoginHistoryIcon type={log.type} />
-                  </div>
-                  <div className="ml-3 rtl:mr-3">
-                    <div className="flex items-center">
-                      <div className="text-gray-900 dark:text-gray-100 font-semibold">
-                        {log.deviceName}
-                      </div>
-                      {index === 0 && (
-                        <Tag className="bg-emerald-100 text-emerald-600 dark:bg-emerald-500/20 dark:text-emerald-100 rounded-md border-0 mx-2">
-                          <span className="capitalize"> Current </span>
-                        </Tag>
-                      )}
-                    </div>
-                    <span>
-                      {log.location} • {dayjs.unix(log.time).format('DD-MMM-YYYY, hh:mm A')}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            ))}
-          </div>
-        )}
-      </div> */}
     </>
   )
 }
diff --git a/ui/src/views/admin/role-management/RolesPermission.tsx b/ui/src/views/admin/role-management/RolesPermission.tsx
index 9818b14..aa21206 100644
--- a/ui/src/views/admin/role-management/RolesPermission.tsx
+++ b/ui/src/views/admin/role-management/RolesPermission.tsx
@@ -24,7 +24,6 @@ function PermissionDialogContent({
   translate,
   permissionList,
   selectedGroup,
-  selectedGroupPermissions,
   filteredPermissions,
   isAllSelected,
   isAllSelectedForGroup,
@@ -40,7 +39,6 @@ function PermissionDialogContent({
   changeGroup,
   togglePermission,
   isParent,
-  getChildren,
   onClickCheckbox,
   setSearchTerm,
   setCopyDialogOpen,
@@ -488,6 +486,7 @@ function RolesPermission({
         const res = await getRoles()
         setRoleList(res.data.items?.map((r: any) => r.name) || [])
       } catch (e) {
+        console.error('Failed to fetch roles:', e)
         setRoleList([])
       }
     }
@@ -515,6 +514,7 @@ function RolesPermission({
       setCopyDialogOpen(false)
       setCopyDialogRole('')
     } catch (e) {
+      console.error('Failed to copy permissions:', e)
       toast.push(<Notification title={translate('::CopyFailed')} type="danger" />, {
         placement: 'top-end',
       })
diff --git a/ui/src/views/admin/tenant-management/TenantsConnectionString.tsx b/ui/src/views/admin/tenant-management/TenantsConnectionString.tsx
index 95ee1a3..985d7f9 100644
--- a/ui/src/views/admin/tenant-management/TenantsConnectionString.tsx
+++ b/ui/src/views/admin/tenant-management/TenantsConnectionString.tsx
@@ -20,7 +20,7 @@ import {
 } from '@/services/tenant.service'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Field, FieldProps, Form, Formik, FormikHelpers } from 'formik'
-import { Suspense, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useState, type MouseEvent } from 'react'
 import * as Yup from 'yup'
 import { dataSourceTypeOptions } from '../listForm/edit/options'
 import { DataSourceTypeEnum } from '@/proxy/form/models'
@@ -60,25 +60,15 @@ function TenantConnectionString({
 }) {
   const { translate } = useLocalization()
   const [currentTab, setCurrentTab] = useState('cs')
-  const [loading, setLoading] = useState(true)
   const [connectionString, setConnectionString] = useState<ConnectionStringDto>()
 
-  const fetchDataTenants = async () => {
+  const fetchDataTenants = useCallback(async () => {
     if (!id) {
       return
     }
-    setLoading(true)
     const response = await getTenantDefaultConnectionString(id)
-    let value = ''
-    let isNew = false
-
-    if (response.data.length == 0) {
-      isNew = true
-      value = ''
-    } else {
-      isNew = false
-      value = response.data
-    }
+    const isNew = response.data.length === 0
+    const value = isNew ? '' : response.data
 
     setConnectionString({
       id,
@@ -87,19 +77,17 @@ function TenantConnectionString({
       isNew,
       ...(value && { dataSourceType: value.startsWith('Server') ? 1 : 2 }),
     })
-    setLoading(false)
-  }
+  }, [id])
 
   useEffect(() => {
+    setConnectionString(undefined)
     fetchDataTenants()
-  }, [id])
+  }, [fetchDataTenants])
 
   const deleteConnectionString = async () => {
     if (!id) {
       return
     }
-    setLoading(true)
-
     try {
       await deleteTenantDefaultConnectionString(id)
       toast.push(
@@ -111,7 +99,7 @@ function TenantConnectionString({
         },
       )
       onDialogClose()
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification type="danger" duration={2000}>
           {'Hata'}
@@ -120,8 +108,6 @@ function TenantConnectionString({
           placement: 'top-end',
         },
       )
-    } finally {
-      setLoading(false)
     }
   }
 
@@ -133,7 +119,6 @@ function TenantConnectionString({
       return
     }
 
-    setLoading(true)
     setSubmitting(true)
 
     try {
@@ -148,8 +133,7 @@ function TenantConnectionString({
       )
 
       await fetchDataTenants()
-      //onDialogClose()
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification type="danger" duration={2000}>
           {'Hata'}
@@ -159,20 +143,19 @@ function TenantConnectionString({
         },
       )
     } finally {
-      setLoading(false)
       setSubmitting(false)
     }
   }
 
   const [pwInputType, setPwInputType] = useState('password')
 
-  const onPasswordVisibleClick = (e: React.MouseEvent<HTMLSpanElement>) => {
+  const onPasswordVisibleClick = (e: MouseEvent<HTMLSpanElement>) => {
     e.preventDefault()
     setPwInputType(pwInputType === 'password' ? 'text' : 'password')
   }
 
   const passwordVisible = (
-    <span className="cursor-pointer" onClick={(e) => onPasswordVisibleClick(e as any)}>
+    <span className="cursor-pointer" onClick={onPasswordVisibleClick}>
       {pwInputType === 'password' ? <FaEyeSlash /> : <FaEye />}
     </span>
   )
@@ -185,7 +168,6 @@ function TenantConnectionString({
       return
     }
 
-    setLoading(true)
     setSubmitting(true)
 
     try {
@@ -216,7 +198,6 @@ function TenantConnectionString({
         },
       )
     } finally {
-      setLoading(false)
       setSubmitting(false)
     }
   }
@@ -243,177 +224,175 @@ function TenantConnectionString({
         </TabList>
       </Tabs>
       <div className="px-4 py-6">
-        <Suspense fallback={<></>}>
-          {currentTab === 'cs' && (
-            <Formik
-              initialValues={connectionString}
-              validationSchema={schemaCs}
-              onSubmit={handleSubmit}
-            >
-              {({ touched, errors, values, isSubmitting }) => {
-                return (
-                  <Form>
-                    <FormContainer size="sm">
-                      <FormItem
-                        label={translate('AbpAccount::DisplayName:Name')}
-                        invalid={errors.name && touched.name}
-                        errorMessage={errors.name}
+        {currentTab === 'cs' && (
+          <Formik
+            initialValues={connectionString}
+            validationSchema={schemaCs}
+            onSubmit={handleSubmit}
+          >
+            {({ touched, errors, values, isSubmitting }) => {
+              return (
+                <Form>
+                  <FormContainer size="sm">
+                    <FormItem
+                      label={translate('AbpAccount::DisplayName:Name')}
+                      invalid={errors.name && touched.name}
+                      errorMessage={errors.name}
+                    >
+                      <Field
+                        disabled
+                        type="text"
+                        autoComplete="off"
+                        name="name"
+                        placeholder="Name"
+                        component={Input}
+                      />
+                    </FormItem>
+
+                    <FormItem
+                      label={translate('::ListForms.ListFormFieldEdit.LookupDataSourceType')}
+                      invalid={errors.dataSourceType && touched.dataSourceType}
+                      errorMessage={errors.dataSourceType}
+                    >
+                      <Field
+                        type="text"
+                        autoComplete="off"
+                        name="dataSourceType"
+                        placeholder={translate(
+                          '::ListForms.ListFormFieldEdit.LookupDataSourceType',
+                        )}
                       >
-                        <Field
-                          type="text"
-                          autoComplete="off"
-                          name="name"
-                          placeholder="Name"
-                          disabled
-                          component={Input}
-                        />
-                      </FormItem>
+                        {({ field, form }: FieldProps<DataSourceTypeEnum>) => (
+                          <Select
+                            autoFocus
+                            field={field}
+                            form={form}
+                            isClearable={true}
+                            options={dataSourceTypeOptions}
+                            value={dataSourceTypeOptions?.find(
+                              (option: any) => option.value === values.dataSourceType,
+                            )}
+                            onChange={(option) => {
+                              form.setFieldValue(field.name, option?.value)
 
-                      <FormItem
-                        label={translate('::ListForms.ListFormFieldEdit.LookupDataSourceType')}
-                        invalid={errors.dataSourceType && touched.dataSourceType}
-                        errorMessage={errors.dataSourceType}
+                              if (option?.value === 1)
+                                //PostgreSQL
+                                form.setFieldValue(
+                                  'value',
+                                  'Server=sql;Database=' +
+                                    name +
+                                    ';User Id=sa;password=@Password;Trusted_Connection=False;TrustServerCertificate=True;Connection Timeout=60;',
+                                )
+                              else if (option?.value === 2)
+                                //MsSql
+                                form.setFieldValue(
+                                  'value',
+                                  'User ID=sa;Password=@Password;Host=postgres;Port=5432;Database=' +
+                                    name +
+                                    ';',
+                                )
+                            }}
+                          />
+                        )}
+                      </Field>
+                    </FormItem>
+
+                    <FormItem
+                      label={translate('::App.Listform.ListformField.ConnectionString')}
+                      invalid={errors.value && touched.value}
+                      errorMessage={errors.value}
+                    >
+                      <Field
+                        textArea="true"
+                        type="text"
+                        autoComplete="off"
+                        name="value"
+                        placeholder="Value"
+                        component={Input}
+                      />
+                    </FormItem>
+
+                    <div className="mt-6 flex flex-row justify-end gap-3">
+                      <Button
+                        disabled={connectionString.isNew}
+                        className="mr-auto"
+                        type="button"
+                        variant="plain"
+                        onClick={deleteConnectionString}
                       >
-                        <Field
-                          type="text"
-                          autoComplete="off"
-                          name="dataSourceType"
-                          placeholder={translate(
-                            '::ListForms.ListFormFieldEdit.LookupDataSourceType',
-                          )}
-                        >
-                          {({ field, form }: FieldProps<DataSourceTypeEnum>) => (
-                            <Select
-                              field={field}
-                              form={form}
-                              autoFocus
-                              isClearable={true}
-                              options={dataSourceTypeOptions}
-                              value={dataSourceTypeOptions?.filter(
-                                (option: any) => option.value === values.dataSourceType,
-                              )}
-                              onChange={(option) => {
-                                form.setFieldValue(field.name, option?.value)
+                        {translate('::Delete')}
+                      </Button>
+                      <Button type="button" variant="plain" onClick={onDialogClose}>
+                        {translate('::Cancel')}
+                      </Button>
+                      <Button variant="solid" loading={isSubmitting} type="submit">
+                        {isSubmitting ? translate('::Saving') : translate('::Save')}
+                      </Button>
+                    </div>
+                  </FormContainer>
+                </Form>
+              )
+            }}
+          </Formik>
+        )}
+        {currentTab === 'seed' && (
+          <Formik
+            initialValues={{ id, adminEmail: '', adminPassword: '' } as SeedTenantDataInput}
+            validationSchema={schemaSeed}
+            onSubmit={handleSubmitSeed}
+          >
+            {({ touched, errors, isSubmitting }) => {
+              return (
+                <Form>
+                  <FormContainer size="sm">
+                    <FormItem
+                      label={translate('::Abp.Account.EmailAddress')}
+                      invalid={errors.adminEmail && touched.adminEmail}
+                      errorMessage={errors.adminEmail}
+                    >
+                      <Field
+                        autoFocus
+                        type="text"
+                        autoComplete="off"
+                        name="adminEmail"
+                        component={Input}
+                      />
+                    </FormItem>
 
-                                if (option?.value == 1)
-                                  //PostgreSQL
-                                  form.setFieldValue(
-                                    'value',
-                                    'Server=sql;Database=' +
-                                      name +
-                                      ';User Id=sa;password=@Password;Trusted_Connection=False;TrustServerCertificate=True;Connection Timeout=60;',
-                                  )
-                                else if (option?.value == 2)
-                                  //MsSql
-                                  form.setFieldValue(
-                                    'value',
-                                    'User ID=sa;Password=@Password;Host=postgres;Port=5432;Database=' +
-                                      name +
-                                      ';',
-                                  )
-                              }}
-                            />
-                          )}
-                        </Field>
-                      </FormItem>
+                    <FormItem
+                      label={translate('::Abp.Identity.Password')}
+                      invalid={errors.adminPassword && touched.adminPassword}
+                      errorMessage={errors.adminPassword}
+                    >
+                      <Field
+                        type={pwInputType}
+                        suffix={passwordVisible}
+                        autoComplete="off"
+                        name="adminPassword"
+                        component={Input}
+                      />
+                    </FormItem>
 
-                      <FormItem
-                        label={translate('::App.Listform.ListformField.ConnectionString')}
-                        invalid={errors.value && touched.value}
-                        errorMessage={errors.value}
-                      >
-                        <Field
-                          textArea="true"
-                          type="text"
-                          autoComplete="off"
-                          name="value"
-                          placeholder="Value"
-                          component={Input}
-                        />
-                      </FormItem>
-
-                      <div className="mt-6 flex flex-row justify-end gap-3">
-                        <Button
-                          disabled={connectionString.isNew}
-                          className="mr-auto"
-                          type="button"
-                          variant="plain"
-                          onClick={deleteConnectionString}
-                        >
-                          {translate('::Delete')}
-                        </Button>
-                        <Button type="button" variant="plain" onClick={onDialogClose}>
-                          {translate('::Cancel')}
-                        </Button>
-                        <Button variant="solid" loading={isSubmitting} type="submit">
-                          {isSubmitting ? translate('::Saving') : translate('::Save')}
-                        </Button>
-                      </div>
-                    </FormContainer>
-                  </Form>
-                )
-              }}
-            </Formik>
-          )}
-          {currentTab === 'seed' && (
-            <Formik
-              initialValues={{ id, adminEmail: '', adminPassword: '' } as SeedTenantDataInput}
-              validationSchema={schemaSeed}
-              onSubmit={handleSubmitSeed}
-            >
-              {({ touched, errors, values, isSubmitting }) => {
-                return (
-                  <Form>
-                    <FormContainer size="sm">
-                      <FormItem
-                        label={translate('::Abp.Account.EmailAddress')}
-                        invalid={errors.adminEmail && touched.adminEmail}
-                        errorMessage={errors.adminEmail}
-                      >
-                        <Field
-                          type="text"
-                          autoFocus
-                          autoComplete="off"
-                          name="adminEmail"
-                          component={Input}
-                        />
-                      </FormItem>
-
-                      <FormItem
-                        label={translate('::Abp.Identity.Password')}
-                        invalid={errors.adminPassword && touched.adminPassword}
-                        errorMessage={errors.adminPassword}
-                      >
-                        <Field
-                          type={pwInputType}
-                          suffix={passwordVisible}
-                          autoComplete="off"
-                          name="adminPassword"
-                          component={Input}
-                        />
-                      </FormItem>
-
-                      <div className="mt-6 flex flex-row justify-end gap-3">
-                        <Button type="button" variant="plain" onClick={onDialogClose}>
-                          {translate('::Cancel')}
-                        </Button>
-                        <Button variant="solid" loading={isSubmitting} type="submit">
-                          {isSubmitting
-                            ? connectionString.isNew
-                              ? translate('::Abp.Identity.UserCreating')
-                              : translate('::AbpTenantManagement.Tenants.DatabaseSeeding')
-                            : connectionString.isNew
-                              ? translate('::Abp.Identity.CreateUser')
-                              : translate('::AbpTenantManagement.Tenants.DatabaseSeed')}
-                        </Button>
-                      </div>
-                    </FormContainer>
-                  </Form>
-                )
-              }}
-            </Formik>
-          )}
-        </Suspense>
+                    <div className="mt-6 flex flex-row justify-end gap-3">
+                      <Button type="button" variant="plain" onClick={onDialogClose}>
+                        {translate('::Cancel')}
+                      </Button>
+                      <Button variant="solid" loading={isSubmitting} type="submit">
+                        {isSubmitting
+                          ? connectionString.isNew
+                            ? translate('::Abp.Identity.UserCreating')
+                            : translate('::AbpTenantManagement.Tenants.DatabaseSeeding')
+                          : connectionString.isNew
+                            ? translate('::Abp.Identity.CreateUser')
+                            : translate('::AbpTenantManagement.Tenants.DatabaseSeed')}
+                      </Button>
+                    </div>
+                  </FormContainer>
+                </Form>
+              )
+            }}
+          </Formik>
+        )}
       </div>
     </Dialog>
   )
diff --git a/ui/src/views/admin/user-management/Details.tsx b/ui/src/views/admin/user-management/Details.tsx
index 0d109d6..cf30c7d 100644
--- a/ui/src/views/admin/user-management/Details.tsx
+++ b/ui/src/views/admin/user-management/Details.tsx
@@ -77,7 +77,7 @@ import 'react-advanced-cropper/dist/style.css'
 import { useParams } from 'react-router-dom'
 import * as Yup from 'yup'
 import { SelectBoxOption, SelectBoxOptionWithGroup } from '@/types/shared'
-import { AdaptableCard, ConfirmDialog, Container } from '@/components/shared'
+import { AdaptableCard, ConfirmDialog } from '@/components/shared'
 import { AssignedClaimViewModel, UserInfoViewModel } from '@/proxy/admin/models'
 import { APP_NAME, AVATAR_URL } from '@/constants/app.constant'
 import { useStoreActions, useStoreState } from '@/store'
@@ -92,7 +92,6 @@ function UserDetails() {
   const { userId } = useParams()
   const { translate } = useLocalization()
   const [userDetails, setUserDetails] = useState<UserInfoViewModel>()
-  const [loading, setLoading] = useState(true)
   const [open, setOpen] = useState(false)
   const [confirmDeleteClaim, setConfirmDeleteClaim] = useState<AssignedClaimViewModel | null>(null)
   const [countries, setCountries] = useState<CountryDto[]>([])
@@ -106,7 +105,6 @@ function UserDetails() {
   const { setting } = useSetting()
 
   const isEmailUpdateEnabled = setting('Abp.Identity.User.IsEmailUpdateEnabled')
-  const isRequireVerifiedAccount = setting('Abp.Identity.Profile.General.RequireVerifiedAccount')
   const isRequireConfirmedEmail = setting('Abp.Identity.SignIn.RequireConfirmedEmail')
   const isRequireConfirmedPhoneNumber = setting('Abp.Identity.SignIn.RequireConfirmedPhoneNumber')
   const isTwoFactorEnabled = setting('Abp.Account.TwoFactor.Enabled')
@@ -198,7 +196,6 @@ function UserDetails() {
     values: ClaimTypeDto,
     { setSubmitting }: FormikHelpers<ClaimTypeDto>,
   ) => {
-    setLoading(true)
     setSubmitting(true)
 
     try {
@@ -213,7 +210,7 @@ function UserDetails() {
       )
       setOpen(false)
       getUser()
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification type="danger" duration={2000}>
           {'Hata'}
@@ -223,7 +220,6 @@ function UserDetails() {
         },
       )
     } finally {
-      setLoading(false)
       setSubmitting(false)
     }
   }
@@ -262,7 +258,7 @@ function UserDetails() {
               <Formik
                 enableReinitialize
                 initialValues={userDetails}
-                onSubmit={async (values, { resetForm, setSubmitting }) => {
+                onSubmit={async (values, { setSubmitting }) => {
                   setSubmitting(true)
                   await putUserDetail({ ...values })
                   if (values.id === auth.user.id) {
@@ -643,7 +639,7 @@ function UserDetails() {
                               </h6>
                               <div className="border-2 rounded-lg p-4">
                                 <FieldArray name="branches">
-                                  {({ form, remove, push }) => (
+                                  {() => (
                                     <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-2 text-center">
                                       {branches && branches.length > 0
                                         ? branches.map((_, index: number) => (
@@ -675,7 +671,7 @@ function UserDetails() {
                               </h6>
                               <div className="border-2 rounded-lg p-4">
                                 <FieldArray name="roles">
-                                  {({ form, remove, push }) => (
+                                  {() => (
                                     <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-2 text-center">
                                       {roles && roles.length > 0
                                         ? roles.map((_, index: number) => (
@@ -720,7 +716,7 @@ function UserDetails() {
               <Formik
                 enableReinitialize
                 initialValues={userDetails}
-                onSubmit={async (values, { resetForm, setSubmitting }) => {
+                onSubmit={async (values, { setSubmitting }) => {
                   setSubmitting(true)
                   await putUserDetail({ ...values })
 
@@ -902,7 +898,7 @@ function UserDetails() {
               <Formik
                 enableReinitialize
                 initialValues={userDetails}
-                onSubmit={async (values, { resetForm, setSubmitting }) => {
+                onSubmit={async (values, { setSubmitting }) => {
                   setSubmitting(true)
                   await putUserDetail({ ...values })
 
@@ -1655,7 +1651,7 @@ function UserDetails() {
                         size="sm"
                         title="Add"
                         icon={<FaFileAlt />}
-                        onClick={async (e) => {
+                        onClick={() => {
                           setOpen(true)
                         }}
                       />
@@ -1665,25 +1661,26 @@ function UserDetails() {
                   </Tr>
                 </THead>
                 <TBody>
-                  {userDetails.claims.filter((a) => a.isAssigned === true) &&
-                  userDetails.claims.filter((a) => a.isAssigned === true).length > 0 ? (
-                    userDetails.claims.map((claim) => (
-                      <Tr key={claim.id}>
-                        <Td>
-                          <Button
-                            shape="circle"
-                            variant="plain"
-                            type="button"
-                            size="sm"
-                            title="Delete"
-                            icon={<FaTrashAlt />}
-                            onClick={() => setConfirmDeleteClaim(claim)}
-                          />
-                        </Td>
-                        <Td>{claim.claimType}</Td>
-                        <Td>{claim.claimValue}</Td>
-                      </Tr>
-                    ))
+                  {userDetails.claims.some((a) => a.isAssigned === true) ? (
+                    userDetails.claims
+                      .filter((claim) => claim.isAssigned === true)
+                      .map((claim) => (
+                        <Tr key={claim.id}>
+                          <Td>
+                            <Button
+                              shape="circle"
+                              variant="plain"
+                              type="button"
+                              size="sm"
+                              title="Delete"
+                              icon={<FaTrashAlt />}
+                              onClick={() => setConfirmDeleteClaim(claim)}
+                            />
+                          </Td>
+                          <Td>{claim.claimType}</Td>
+                          <Td>{claim.claimValue}</Td>
+                        </Tr>
+                      ))
                   ) : (
                     <Tr>
                       <Td colSpan={3} className="text-center">
diff --git a/ui/src/views/admin/user-management/Users.tsx b/ui/src/views/admin/user-management/Users.tsx
index 4a46054..6d25000 100644
--- a/ui/src/views/admin/user-management/Users.tsx
+++ b/ui/src/views/admin/user-management/Users.tsx
@@ -1,45 +1,26 @@
-import { ActionLink } from '@/components/shared'
 import AdaptableCard from '@/components/shared/AdaptableCard'
 import Container from '@/components/shared/Container'
-import { Table, toast } from '@/components/ui'
-import { useConfig } from '@/components/ui/ConfigProvider'
-import Notification from '@/components/ui/Notification'
-import { getPermissions, getUsers, updatePermissions } from '@/services/identity.service'
-import { useStoreState } from '@/store'
+import { Table } from '@/components/ui'
+import { getUsers } from '@/services/identity.service'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import useThemeClass from '@/utils/hooks/useThemeClass'
 import isEmpty from 'lodash/isEmpty'
-import { ChangeEvent, useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { Helmet } from 'react-helmet'
 import UsersPermission from './UsersPermission'
-import {
-  GetPermissionListResultDto,
-  IdentityUserDto,
-  PermissionGrantInfoDto,
-  PermissionGroupDto,
-  PermissionWithGroupName,
-  PermissionWithStyle,
-  UpdatePermissionDto,
-} from '@/proxy/admin/models'
+import { IdentityUserDto } from '@/proxy/admin/models'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { APP_NAME } from '@/constants/app.constant'
+import ActionLink from '@/components/shared/ActionLink'
 
 const { Tr, Th, Td, THead, TBody } = Table
 
 const Users = () => {
-  const providerName = 'U'
   const { textTheme } = useThemeClass()
-  const [isLoading, setIsLoading] = useState(false)
   const [userList, setUserList] = useState<IdentityUserDto[]>([])
   const [activeUser, setActiveUser] = useState<IdentityUserDto>()
-  const [permissionList, setPermissionList] = useState<GetPermissionListResultDto>()
-  const [selectedGroup, setSelectedGroup] = useState<PermissionGroupDto | undefined>()
-  const [selectedGroupPermissions, setSelectedGroupPermissions] = useState<PermissionWithStyle[]>(
-    [],
-  )
   const [permissionDialogOpen, setPermissionDialogOpen] = useState(false)
 
-  const mode = useStoreState((state) => state.theme.mode)
   const { translate } = useLocalization()
 
   const fetchData = async () => {
@@ -56,164 +37,9 @@ const Users = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  const fetchDataPermissions = async (user?: IdentityUserDto, userid?: string) => {
-    if (!user || !userid) {
-      return
-    }
-
+  const openPermissionDialog = (user: IdentityUserDto) => {
     setActiveUser(user)
-    const response = await getPermissions(providerName, userid)
-    setPermissionList(response.data)
-  }
-
-  const onDialogClose = async () => {
-    setPermissionDialogOpen(false)
-    setSelectedGroup(undefined)
-    setSelectedGroupPermissions([])
-    await fetchDataPermissions(activeUser, activeUser?.id)
-  }
-
-  function getPermissionsWithGroupName(groups: PermissionGroupDto[]): PermissionWithGroupName[] {
-    return groups.reduce(
-      (acc, val) => [
-        ...acc,
-        ...val.permissions.map<PermissionWithGroupName>((p) => ({
-          ...p,
-          groupName: val.name || '',
-        })),
-      ],
-      [] as PermissionWithGroupName[],
-    )
-  }
-
-  const onDialogOk = async () => {
-    setIsLoading(true)
-    setTimeout(async () => {
-      if (permissionList?.groups && activeUser?.id) {
-        const listPermissions = await getPermissions(providerName, activeUser.id)
-        const unChangedPermissions = getPermissionsWithGroupName(listPermissions.data?.groups)
-        const changedPermissions = getPermissionsWithGroupName(permissionList.groups)
-
-        const updatePermList: UpdatePermissionDto[] = changedPermissions
-          .filter((per) =>
-            (unChangedPermissions.find((unChanged) => unChanged.name === per.name) || {})
-              .isGranted === per.isGranted
-              ? false
-              : true,
-          )
-          .map(({ name, isGranted }) => ({ name, isGranted }))
-
-        updatePermissions(providerName, activeUser.id, { permissions: updatePermList })
-        toast.push(<Notification title={'Permission updated'} type="success" />, {
-          placement: 'top-end',
-        })
-      }
-
-      setPermissionDialogOpen(false)
-      setIsLoading(false)
-    }, 1000)
-  }
-
-  const { direction } = useConfig()
-  const className = `m${direction[0]}-`
-
-  function findMargin(
-    permissions: PermissionGrantInfoDto[],
-    permission: PermissionGrantInfoDto,
-    level = 0,
-  ): number {
-    const parentPermission = permissions.find((per) => per.name === permission.parentName)
-    if (parentPermission) {
-      return findMargin(permissions, parentPermission, level + 1)
-    } else {
-      return level
-    }
-  }
-
-  const isAllSelected = useMemo(
-    () =>
-      permissionList?.groups.every((group) =>
-        group.permissions.every((permission) => permission.isGranted),
-      ),
-    [permissionList],
-  )
-
-  const isAllSelectedForGroup = useMemo(
-    () => selectedGroupPermissions.every((permission) => permission.isGranted),
-    [selectedGroupPermissions],
-  )
-
-  const onSelectAll = (value: boolean, e: ChangeEvent<HTMLInputElement>) => {
-    if (!permissionList) {
-      return
-    }
-
-    const currentGroupName = selectedGroup?.name
-    setSelectedGroup(undefined)
-    setSelectedGroupPermissions([])
-
-    if (e.target.name === 'group') {
-      permissionList?.groups
-        .find((group) => group.name === selectedGroup?.name)
-        ?.permissions.forEach((permission) => {
-          permission.isGranted = value
-        })
-    } else {
-      permissionList?.groups.forEach((group) => {
-        group.permissions.forEach((permission) => {
-          permission.isGranted = value
-        })
-      })
-    }
-
-    setPermissionList({ ...permissionList })
-
-    changeGroup(currentGroupName)
-  }
-
-  const changeGroup = (groupName?: string) => {
-    const group = permissionList?.groups.find((a) => a.name === groupName)
-
-    if (!group) {
-      setSelectedGroup(undefined)
-      setSelectedGroupPermissions([])
-      return
-    }
-
-    setSelectedGroup(group)
-
-    const selectedGroupPerm = group.permissions.map(
-      (permission) =>
-        ({
-          ...permission,
-          class: className + findMargin(group.permissions, permission) * 4,
-        }) as PermissionWithStyle,
-    )
-
-    setSelectedGroupPermissions(selectedGroupPerm)
-  }
-
-  function onClickCheckbox(clickedPermission: PermissionGrantInfoDto) {
-    if (!permissionList) {
-      return
-    }
-
-    const groupPerm = selectedGroupPermissions.map((per) => {
-      if (clickedPermission.name === per.name) {
-        return { ...per, isGranted: !per.isGranted }
-      } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) {
-        return { ...per, isGranted: false }
-      } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) {
-        return { ...per, isGranted: true }
-      }
-      return per
-    })
-    const permGroup = permissionList?.groups.find((a) => a.name === selectedGroup?.name)
-    if (permGroup) {
-      permGroup.permissions = groupPerm
-    }
-    setPermissionList({ ...permissionList })
-    setSelectedGroupPermissions(groupPerm)
+    setPermissionDialogOpen(true)
   }
 
   return (
@@ -241,10 +67,7 @@ const Users = () => {
                   <Td>
                     <div
                       className={`${textTheme} cursor-pointer select-none font-semibold`}
-                      onClick={async () => {
-                        await fetchDataPermissions(user, user?.id)
-                        setPermissionDialogOpen(true)
-                      }}
+                      onClick={() => openPermissionDialog(user)}
                     >
                       {translate('::Permission')}
                     </div>
@@ -273,8 +96,8 @@ const Users = () => {
         <UsersPermission
           open={permissionDialogOpen}
           onDialogClose={() => setPermissionDialogOpen(false)}
-          name={activeUser.id}
-          id={''}
+          name={`${activeUser.name ?? ''} ${activeUser.surname ?? ''}`.trim() || activeUser.email || activeUser.id}
+          id={activeUser.id}
         ></UsersPermission>
       )}
     </>
diff --git a/ui/src/views/admin/user-management/UsersPermission.tsx b/ui/src/views/admin/user-management/UsersPermission.tsx
index a1b8617..d8dff3e 100644
--- a/ui/src/views/admin/user-management/UsersPermission.tsx
+++ b/ui/src/views/admin/user-management/UsersPermission.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames'
 import { FaChevronRight, FaChevronDown } from 'react-icons/fa'
 import { Badge, Button, Checkbox, Dialog, Input, Menu, toast } from '@/components/ui'
-type OpenState = Record<string, boolean>
 import { useConfig } from '@/components/ui/ConfigProvider'
 import { useDialogContext } from '@/components/ui/Dialog/Dialog'
 import Notification from '@/components/ui/Notification'
@@ -11,19 +10,19 @@ import {
   PermissionGroupDto,
   PermissionWithGroupName,
   PermissionWithStyle,
-  ProviderInfoDto,
 } from '@/proxy/admin/models'
 import { getPermissions, updatePermissions } from '@/services/identity.service'
 import { useStoreActions, useStoreState } from '@/store'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { ChangeEvent, useEffect, useMemo, useState } from 'react'
 
+type OpenState = Record<string, boolean>
+
 function UserPermissionDialogContent({
   name,
   translate,
   permissionList,
   selectedGroup,
-  selectedGroupPermissions,
   filteredPermissions,
   isAllSelected,
   isAllSelectedForGroup,
@@ -411,13 +410,6 @@ function UsersPermission({
     fetchDataPermissions()
   }, [id])
 
-  const isGrantedByOtherProviderName = (grantedProviders: ProviderInfoDto[]): boolean => {
-    if (grantedProviders.length) {
-      return grantedProviders.findIndex((p) => p.providerName !== providerName) > -1
-    }
-    return false
-  }
-
   // --- Search ve recursive treeview ---
   // Collapse/expand için recursive düzende izinleri döndür
   const [searchTerm, setSearchTerm] = useState('')
@@ -468,7 +460,6 @@ function UsersPermission({
           translate={translate}
           permissionList={permissionList}
           selectedGroup={selectedGroup}
-          selectedGroupPermissions={selectedGroupPermissions}
           filteredPermissions={filteredPermissions}
           isAllSelected={isAllSelected}
           isAllSelectedForGroup={isAllSelectedForGroup}
diff --git a/ui/src/views/admin/videoroom/ChatPanel.tsx b/ui/src/views/admin/videoroom/ChatPanel.tsx
index 328df04..0f202aa 100644
--- a/ui/src/views/admin/videoroom/ChatPanel.tsx
+++ b/ui/src/views/admin/videoroom/ChatPanel.tsx
@@ -4,7 +4,7 @@ import {
   VideoroomSettingsDto,
   MessageType,
 } from '@/proxy/videoroom/models'
-import React, { useRef, useEffect } from 'react'
+import { useRef, useEffect, type FormEvent } from 'react'
 import { FaTimes, FaUsers, FaUser, FaBullhorn, FaPaperPlane } from 'react-icons/fa'
 import { Button } from '@/components/ui'
 
@@ -18,13 +18,13 @@ interface ChatPanelProps {
   setMessageMode: (mode: MessageType) => void
   selectedRecipient: { id: string; name: string } | null
   setSelectedRecipient: (recipient: { id: string; name: string } | null) => void
-  onSendMessage: (e: React.FormEvent) => void
+  onSendMessage: (e: FormEvent) => void
   onClose: () => void
   formatTime: (timestamp: string) => string
   classSettings: VideoroomSettingsDto
 }
 
-const ChatPanel: React.FC<ChatPanelProps> = ({
+const ChatPanel = ({
   user,
   participants,
   chatMessages,
@@ -38,7 +38,7 @@ const ChatPanel: React.FC<ChatPanelProps> = ({
   onClose,
   formatTime,
   classSettings,
-}) => {
+}: ChatPanelProps) => {
   const messagesEndRef = useRef<HTMLDivElement>(null)
 
   useEffect(() => {
diff --git a/ui/src/views/admin/videoroom/Dashboard.tsx b/ui/src/views/admin/videoroom/Dashboard.tsx
index 6c37d6c..b0d0125 100644
--- a/ui/src/views/admin/videoroom/Dashboard.tsx
+++ b/ui/src/views/admin/videoroom/Dashboard.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { motion } from 'framer-motion'
 import { FaEye, FaUsers, FaCrown } from 'react-icons/fa'
 import { useStoreActions, useStoreState } from '@/store/store'
@@ -8,7 +7,7 @@ import { Helmet } from 'react-helmet'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { Role } from '@/proxy/videoroom/models'
 
-const Dashboard: React.FC = () => {
+const Dashboard = () => {
   const navigate = useNavigate()
   const { translate } = useLocalization()
   const { user } = useStoreState((state) => state.auth)
diff --git a/ui/src/views/admin/videoroom/DocumentsPanel.tsx b/ui/src/views/admin/videoroom/DocumentsPanel.tsx
index c9b9373..48850fc 100644
--- a/ui/src/views/admin/videoroom/DocumentsPanel.tsx
+++ b/ui/src/views/admin/videoroom/DocumentsPanel.tsx
@@ -1,5 +1,5 @@
-import { VideoroomDocumentDto } from '@/proxy/videoroom/models';
-import React, { useRef, useState } from 'react'
+import { VideoroomDocumentDto } from '@/proxy/videoroom/models'
+import { useRef, useState, type ChangeEvent, type DragEvent, type ReactNode } from 'react'
 import { FaTimes, FaFile, FaEye, FaDownload, FaTrash } from 'react-icons/fa'
 import { Button } from '@/components/ui'
 
@@ -11,10 +11,10 @@ interface DocumentsPanelProps {
   onView: (doc: VideoroomDocumentDto) => void
   onClose: () => void
   formatFileSize: (bytes: number) => string
-  getFileIcon: (type: string) => JSX.Element
+  getFileIcon: (type: string) => ReactNode
 }
 
-const DocumentsPanel: React.FC<DocumentsPanelProps> = ({
+const DocumentsPanel = ({
   user,
   documents,
   onUpload,
@@ -23,11 +23,11 @@ const DocumentsPanel: React.FC<DocumentsPanelProps> = ({
   onClose,
   formatFileSize,
   getFileIcon,
-}) => {
+}: DocumentsPanelProps) => {
   const fileInputRef = useRef<HTMLInputElement>(null)
   const [dragOver, setDragOver] = useState(false)
 
-  const handleDrop = (e: React.DragEvent) => {
+  const handleDrop = (e: DragEvent) => {
     e.preventDefault()
     setDragOver(false)
     if (user.role !== 'teacher') return
@@ -35,7 +35,7 @@ const DocumentsPanel: React.FC<DocumentsPanelProps> = ({
     files.forEach((file) => onUpload(file))
   }
 
-  const handleFileSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleFileSelect = (e: ChangeEvent<HTMLInputElement>) => {
     if (user.role !== 'teacher') return
     const files = Array.from(e.target.files || [])
     files.forEach((file) => onUpload(file))
diff --git a/ui/src/views/admin/videoroom/KickParticipantModal.tsx b/ui/src/views/admin/videoroom/KickParticipantModal.tsx
index 5b8e088..6f810cd 100644
--- a/ui/src/views/admin/videoroom/KickParticipantModal.tsx
+++ b/ui/src/views/admin/videoroom/KickParticipantModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { motion } from 'framer-motion'
 import { FaUserTimes, FaExclamationTriangle } from 'react-icons/fa'
 import { Button } from '@/components/ui'
@@ -10,12 +9,12 @@ interface KickParticipantModalProps {
   onConfirm: (participantId: string, participantName: string) => void
 }
 
-export const KickParticipantModal: React.FC<KickParticipantModalProps> = ({
+export const KickParticipantModal = ({
   participant,
   isOpen,
   onClose,
   onConfirm,
-}) => {
+}: KickParticipantModalProps) => {
   if (!isOpen || !participant) return null
 
   const handleConfirm = () => {
@@ -43,7 +42,7 @@ export const KickParticipantModal: React.FC<KickParticipantModalProps> = ({
 
           <div className="mb-6">
             <p className="text-gray-700 mb-2">
-              <strong>"{participant.name}"</strong> adlı katılımcıyı sınıftan çıkarmak
+              <strong>{participant.name}</strong> adlı katılımcıyı sınıftan çıkarmak
               istediğinizden emin misiniz?
             </p>
             <div className="bg-yellow-50 border border-yellow-200 rounded-lg p-3">
diff --git a/ui/src/views/admin/videoroom/LayoutPanel.tsx b/ui/src/views/admin/videoroom/LayoutPanel.tsx
index e315260..36ad323 100644
--- a/ui/src/views/admin/videoroom/LayoutPanel.tsx
+++ b/ui/src/views/admin/videoroom/LayoutPanel.tsx
@@ -1,5 +1,4 @@
 import { VideoroomLayoutDto } from '@/proxy/videoroom/models'
-import React from 'react'
 import { FaTimes, FaTh, FaExpand, FaDesktop, FaUsers } from 'react-icons/fa'
 import { Button } from '@/components/ui'
 
@@ -27,12 +26,12 @@ const getLayoutIcon = (type: string) => {
   }
 }
 
-const LayoutPanel: React.FC<LayoutPanelProps> = ({
+const LayoutPanel = ({
   layouts,
   currentLayout,
   onChangeLayout,
   onClose,
-}) => {
+}: LayoutPanelProps) => {
   return (
     <div className="h-full bg-white flex flex-col text-gray-900">
       <div className="p-4 border-b border-gray-200">
diff --git a/ui/src/views/admin/videoroom/ParticipantsPanel.tsx b/ui/src/views/admin/videoroom/ParticipantsPanel.tsx
index 7ef1d62..a8991bb 100644
--- a/ui/src/views/admin/videoroom/ParticipantsPanel.tsx
+++ b/ui/src/views/admin/videoroom/ParticipantsPanel.tsx
@@ -1,5 +1,5 @@
 import { VideoroomAttendanceDto, VideoroomParticipantDto } from '@/proxy/videoroom/models'
-import React, { useState } from 'react'
+import { useState } from 'react'
 import {
   FaTimes,
   FaUsers,
@@ -18,28 +18,25 @@ interface ParticipantsPanelProps {
   attendanceRecords: VideoroomAttendanceDto[]
   onMuteParticipant: (participantId: string, isMuted: boolean, isTeacher: boolean) => void
   onKickParticipant: (participantId: string, participantName: string) => void
-  onApproveHandRaise: (participantId: string) => void
   onDismissHandRaise: (participantId: string) => void
   onClose: () => void
   formatTime: (timestamp: string) => string
   formatDuration: (minutes: number) => string
 }
 
-const ParticipantsPanel: React.FC<ParticipantsPanelProps> = ({
+const ParticipantsPanel = ({
   user,
   participants,
   attendanceRecords,
   onMuteParticipant,
   onKickParticipant,
   onClose,
-  onApproveHandRaise,
   onDismissHandRaise,
   formatTime,
   formatDuration,
-}) => {
+}: ParticipantsPanelProps) => {
   const [activeTab, setActiveTab] = useState<'participants' | 'attendance'>('participants')
 
-  // El kaldıranları bul
   const handRaised = participants.filter((p) => p.isHandRaised)
 
   return (
diff --git a/ui/src/views/admin/videoroom/RoomDetail.tsx b/ui/src/views/admin/videoroom/RoomDetail.tsx
index 07497ee..1b87fbc 100644
--- a/ui/src/views/admin/videoroom/RoomDetail.tsx
+++ b/ui/src/views/admin/videoroom/RoomDetail.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react'
+import { useState, useEffect, useRef, type FormEvent } from 'react'
 import { motion } from 'framer-motion'
 import {
   FaComments,
@@ -27,15 +27,14 @@ import { SignalRService } from '@/services/videoroom/signalr'
 import { WebRTCService } from '@/services/videoroom/webrtc'
 import { useStoreState } from '@/store/store'
 import { KickParticipantModal } from '@/views/admin/videoroom/KickParticipantModal'
-import { useParams } from 'react-router-dom'
 import {
   getVideoroomAttandances,
   getVideoroomById,
   getVideoroomChats,
+  endVideoroom
 } from '@/services/videoroom.service'
 import { showDbDateAsIs } from '@/utils/dateUtils'
-import { useNavigate } from 'react-router-dom'
-import { endVideoroom } from '@/services/videoroom.service'
+import { useNavigate, useParams } from 'react-router-dom'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { Helmet } from 'react-helmet'
 import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -81,15 +80,7 @@ const newClassSession: VideoroomDto = {
   settingsDto: undefined,
 }
 
-const RoomDetail: React.FC = () => {
-  // El kaldırma onayla/iptal fonksiyonları en başta tanımlanmalı
-  // (props olarak kullanılmadan önce)
-  const handleApproveHandRaise = async (participantId: string) => {
-    if (signalRServiceRef.current && user.role === 'teacher') {
-      await signalRServiceRef.current.approveHandRaise(classSession.id, participantId)
-    }
-  }
-
+const RoomDetail = () => {
   const handleDismissHandRaise = async (participantId: string) => {
     if (signalRServiceRef.current && user.role === 'teacher') {
       await signalRServiceRef.current.dismissHandRaise(classSession.id, participantId)
@@ -440,6 +431,7 @@ const RoomDetail: React.FC = () => {
         true,
       )
     } catch (error) {
+      console.error('Sınıf servisleri başlatılamadı:', error)
       toast.push(
         <Notification
           title="❌ Sınıf servisleri başlatılamadı. Bağlantınızı veya tarayıcı izinlerini kontrol edin."
@@ -484,6 +476,7 @@ const RoomDetail: React.FC = () => {
       // Başka sayfaya yönlendir
       navigate(ROUTES_ENUM.protected.admin.videoroom.roomList)
     } catch (err) {
+      console.error('Çıkış sırasında hata oluştu:', err)
       toast.push(<Notification title="⚠️ Çıkış sırasında hata oluştu" type="warning" />, {
         placement: 'top-end',
       })
@@ -491,7 +484,7 @@ const RoomDetail: React.FC = () => {
     }
   }
 
-  const handleSendMessage = async (e: React.FormEvent) => {
+  const handleSendMessage = async (e: FormEvent) => {
     e.preventDefault()
     if (newMessage.trim() && signalRServiceRef.current) {
       if (messageMode === 'private' && selectedRecipient) {
@@ -506,6 +499,7 @@ const RoomDetail: React.FC = () => {
             user.role === 'teacher',
           )
         } catch (error) {
+          console.error('Özel mesaj gönderilemedi:', error)
           toast.push(<Notification title="❌ Özel mesaj gönderilemedi" type="danger" />, {
             placement: 'top-end',
           })
@@ -520,6 +514,7 @@ const RoomDetail: React.FC = () => {
             user.role === 'teacher',
           )
         } catch (error) {
+          console.error('Duyuru gönderilemedi:', error)
           toast.push(<Notification title="❌ Duyuru gönderilemedi" type="danger" />, {
             placement: 'top-end',
           })
@@ -534,6 +529,7 @@ const RoomDetail: React.FC = () => {
             user.role === 'teacher',
           )
         } catch (error) {
+          console.error('Genel mesaj gönderilemedi:', error)
           toast.push(<Notification title="❌ Genel mesaj gönderilemedi" type="danger" />, {
             placement: 'top-end',
           })
@@ -557,6 +553,7 @@ const RoomDetail: React.FC = () => {
           isTeacher,
         )
       } catch (err) {
+        console.error('Katılımcı susturulamadı:', err)
         toast.push(<Notification title="❌ Katılımcı susturulamadı" type="danger" />, {
           placement: 'top-end',
         })
@@ -619,6 +616,7 @@ const RoomDetail: React.FC = () => {
           }),
         )
       } catch (error) {
+        console.error('Katılımcı atılamadı:', error)
         toast.push(<Notification title="❌ Katılımcı atılamadı" type="danger" />, {
           placement: 'top-end',
         })
@@ -661,6 +659,7 @@ const RoomDetail: React.FC = () => {
       try {
         mic = await navigator.mediaDevices.getUserMedia({ audio: true })
       } catch (err) {
+        console.error('Mikrofon alınamadı:', err)
         toast.push(
           <Notification
             title="⚠️ Mikrofon alınamadı. Sadece ekran paylaşımı yapılacak."
@@ -684,6 +683,7 @@ const RoomDetail: React.FC = () => {
         handleStopScreenShare()
       }
     } catch (error) {
+      console.error('Ekran paylaşımı başlatılamadı:', error)
       toast.push(<Notification title="❌ Ekran paylaşımı başlatılamadı" type="danger" />, {
         placement: 'top-end',
       })
@@ -728,10 +728,6 @@ const RoomDetail: React.FC = () => {
     setActiveSidePanel(activeSidePanel === panelType ? null : panelType)
   }
 
-  const handleSettingsChange = (newSettings: Partial<VideoroomSettingsDto>) => {
-    setClassSettings((prev) => ({ ...prev, ...newSettings }))
-  }
-
   const formatTime = (timestamp: string) => {
     return new Date(timestamp).toLocaleTimeString('tr-TR', {
       hour: '2-digit',
@@ -803,7 +799,6 @@ const RoomDetail: React.FC = () => {
             attendanceRecords={attendanceRecords}
             onMuteParticipant={handleMuteParticipant}
             onKickParticipant={handleKickParticipant}
-            onApproveHandRaise={handleApproveHandRaise}
             onDismissHandRaise={handleDismissHandRaise}
             onClose={() => setActiveSidePanel(null)}
             formatTime={formatTime}
@@ -904,9 +899,6 @@ const RoomDetail: React.FC = () => {
                     isTeacher={user.role === 'teacher'}
                     isAudioEnabled={isAudioEnabled}
                     isVideoEnabled={isVideoEnabled}
-                    onToggleAudio={user.role === 'observer' ? () => {} : handleToggleAudio}
-                    onToggleVideo={user.role === 'observer' ? () => {} : handleToggleVideo}
-                    onLeaveCall={handleLeaveCall}
                     onMuteParticipant={handleMuteParticipant}
                     layout={currentLayout ?? layouts[0]}
                     focusedParticipant={focusedParticipant}
diff --git a/ui/src/views/admin/videoroom/RoomList.tsx b/ui/src/views/admin/videoroom/RoomList.tsx
index 223b0e1..3c7ab5b 100644
--- a/ui/src/views/admin/videoroom/RoomList.tsx
+++ b/ui/src/views/admin/videoroom/RoomList.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState, type FormEvent } from 'react'
 import { showDbDateAsIs } from '@/utils/dateUtils'
 import { useNavigate } from 'react-router-dom'
 import { motion } from 'framer-motion'
@@ -11,8 +11,6 @@ import {
   FaEdit,
   FaTrash,
   FaEye,
-  FaHourglassEnd,
-  FaDoorOpen,
   FaSearch,
 } from 'react-icons/fa'
 
@@ -39,11 +37,10 @@ export interface RoomProps {
   className: string
   showButtons: boolean
   title: string
-  classes: string
   event?: () => void
 }
 
-const RoomList: React.FC = () => {
+const RoomList = () => {
   const navigate = useNavigate()
   const { user } = useStoreState((state) => state.auth)
   const { translate } = useLocalization()
@@ -116,7 +113,7 @@ const RoomList: React.FC = () => {
     getVideoroomList(0, 1000, '', searchTerm)
   }, [searchTerm])
 
-  const handleCreateClass = async (e: React.FormEvent) => {
+  const handleCreateClass = async (e: FormEvent) => {
     e.preventDefault()
 
     try {
@@ -130,7 +127,7 @@ const RoomList: React.FC = () => {
     }
   }
 
-  const handleEditClass = async (e: React.FormEvent) => {
+  const handleEditClass = async (e: FormEvent) => {
     e.preventDefault()
     if (!videoroom) return
 
@@ -214,14 +211,12 @@ const RoomList: React.FC = () => {
           user.role === 'teacher' && classSession.teacherId === user.id
             ? translate('::App.Videoroom.Start')
             : translate('::App.Videoroom.Join'),
-        classes:
-          user.role === 'teacher' && classSession.teacherId === user.id
-            ? 'bg-green-600 text-white hover:bg-green-700'
-            : 'bg-blue-600 text-white hover:bg-blue-700',
         event: () => {
-          user.role === 'teacher' && classSession.teacherId === user.id
-            ? handleStartClass(classSession)
-            : handleJoinClass(classSession)
+          if (user.role === 'teacher' && classSession.teacherId === user.id) {
+            handleStartClass(classSession)
+          } else {
+            handleJoinClass(classSession)
+          }
         },
       }
     }
@@ -240,10 +235,6 @@ const RoomList: React.FC = () => {
           user.role === 'teacher' && classSession.teacherId === user.id
             ? translate('::App.Videoroom.Start')
             : translate('::App.Videoroom.Join'),
-        classes:
-          user.role === 'teacher' && classSession.teacherId === user.id
-            ? 'bg-green-600 text-white hover:bg-green-700'
-            : 'bg-blue-600 text-white hover:bg-blue-700',
         event: () => {
           handleJoinClass(classSession)
         },
@@ -256,7 +247,6 @@ const RoomList: React.FC = () => {
       className: 'bg-gray-100 text-gray-800',
       showButtons: false,
       title: '',
-      classes: '',
       event: () => {},
     }
   }
@@ -365,8 +355,7 @@ const RoomList: React.FC = () => {
           ) : (
             <div className="grid gap-3">
               {videoList.map((classSession, index) => {
-                const { status, className, showButtons, title, classes, event } =
-                  getClassProps(classSession)
+                const { status, className, showButtons, title, event } = getClassProps(classSession)
                 const isActive = !classSession.actualStartTime && !classSession.actualEndTime
                 const isOpen = classSession.actualStartTime && !classSession.actualEndTime
                 const accentColor = isOpen
diff --git a/ui/src/views/admin/videoroom/RoomParticipant.tsx b/ui/src/views/admin/videoroom/RoomParticipant.tsx
index 738ba54..d1ccccb 100644
--- a/ui/src/views/admin/videoroom/RoomParticipant.tsx
+++ b/ui/src/views/admin/videoroom/RoomParticipant.tsx
@@ -1,5 +1,4 @@
-import React from 'react'
-import { FaMicrophoneSlash, FaExpand, FaUserTimes } from 'react-icons/fa'
+import { FaMicrophoneSlash, FaUserTimes } from 'react-icons/fa'
 import { VideoPlayer } from './VideoPlayer'
 import { VideoroomParticipantDto, VideoroomLayoutDto } from '@/proxy/videoroom/models'
 import { Button } from '@/components/ui'
@@ -12,9 +11,6 @@ interface RoomParticipantProps {
   isTeacher: boolean
   isAudioEnabled: boolean
   isVideoEnabled: boolean
-  onToggleAudio: () => void
-  onToggleVideo: () => void
-  onLeaveCall: () => void
   onMuteParticipant?: (participantId: string, isMuted: boolean, isTeacher: boolean) => void
   layout: VideoroomLayoutDto
   focusedParticipant?: string
@@ -23,7 +19,7 @@ interface RoomParticipantProps {
   hasSidePanel?: boolean
 }
 
-export const RoomParticipant: React.FC<RoomParticipantProps> = ({
+export const RoomParticipant = ({
   participants,
   localStream,
   currentUserId,
@@ -31,22 +27,19 @@ export const RoomParticipant: React.FC<RoomParticipantProps> = ({
   isTeacher,
   isAudioEnabled,
   isVideoEnabled,
-  onToggleAudio,
-  onToggleVideo,
-  onLeaveCall,
   onMuteParticipant,
   layout,
   focusedParticipant,
   onParticipantFocus,
   onKickParticipant,
   hasSidePanel = false,
-}) => {
+}: RoomParticipantProps) => {
   // Only show current user's video once
   const currentUserParticipant = {
     id: currentUserId,
     name: currentUserName,
     isTeacher,
-    stream: localStream ?? undefined, // null yerine undefined
+    stream: localStream ?? undefined,
   } as unknown as VideoroomParticipantDto
 
   // Eğer hiç katılımcı yoksa ve localStream de yoksa hiçbir şey render etme
@@ -233,9 +226,6 @@ export const RoomParticipant: React.FC<RoomParticipantProps> = ({
           isVideoEnabled={
             participant.id === currentUserId ? isVideoEnabled : !participant.isVideoMuted
           }
-          onToggleAudio={participant.id === currentUserId ? onToggleAudio : undefined}
-          onToggleVideo={participant.id === currentUserId ? onToggleVideo : undefined}
-          onLeaveCall={participant.id === currentUserId ? onLeaveCall : undefined}
         />
       </div>
       {/* Teacher controls for students */}
diff --git a/ui/src/views/admin/videoroom/ScreenSharePanel.tsx b/ui/src/views/admin/videoroom/ScreenSharePanel.tsx
index ddd5eda..81a54aa 100644
--- a/ui/src/views/admin/videoroom/ScreenSharePanel.tsx
+++ b/ui/src/views/admin/videoroom/ScreenSharePanel.tsx
@@ -1,22 +1,30 @@
-import React from 'react';
-import { FaDesktop, FaStop, FaPlay } from 'react-icons/fa';
-import { Button } from '@/components/ui';
+import { useEffect, useRef } from 'react'
+import { FaDesktop, FaStop, FaPlay } from 'react-icons/fa'
+import { Button } from '@/components/ui'
 
 interface ScreenSharePanelProps {
-  isSharing: boolean;
-  onStartShare: () => void;
-  onStopShare: () => void;
-  sharedScreen?: MediaStream;
-  sharerName?: string;
+  isSharing: boolean
+  onStartShare: () => void
+  onStopShare: () => void
+  sharedScreen?: MediaStream
+  sharerName?: string
 }
 
-export const ScreenSharePanel: React.FC<ScreenSharePanelProps> = ({
+export const ScreenSharePanel = ({
   isSharing,
   onStartShare,
   onStopShare,
   sharedScreen,
   sharerName,
-}) => {
+}: ScreenSharePanelProps) => {
+  const videoRef = useRef<HTMLVideoElement>(null)
+
+  useEffect(() => {
+    if (videoRef.current) {
+      videoRef.current.srcObject = sharedScreen ?? null
+    }
+  }, [sharedScreen])
+
   return (
     <div className="bg-white rounded-lg shadow-md p-4 mb-4">
       <div className="flex items-center justify-between mb-4">
@@ -24,7 +32,7 @@ export const ScreenSharePanel: React.FC<ScreenSharePanelProps> = ({
           <FaDesktop className="text-blue-600" size={20} />
           <h3 className="font-semibold text-gray-800">Ekran Paylaşımı</h3>
         </div>
-        
+
         {isSharing ? (
           <Button
             type="button"
@@ -53,17 +61,13 @@ export const ScreenSharePanel: React.FC<ScreenSharePanelProps> = ({
       {sharedScreen && (
         <div className="relative bg-gray-900 rounded-lg overflow-hidden aspect-video">
           <video
+            ref={videoRef}
             autoPlay
             playsInline
             muted
             className="w-full h-full object-contain"
-            ref={(video) => {
-              if (video && sharedScreen) {
-                video.srcObject = sharedScreen;
-              }
-            }}
           />
-          
+
           {sharerName && (
             <div className="absolute bottom-2 left-2 bg-black bg-opacity-50 text-white px-2 py-1 rounded text-sm">
               {sharerName} ekranını paylaşıyor
@@ -79,5 +83,5 @@ export const ScreenSharePanel: React.FC<ScreenSharePanelProps> = ({
         </div>
       )}
     </div>
-  );
-};
+  )
+}
diff --git a/ui/src/views/admin/videoroom/VideoPlayer.tsx b/ui/src/views/admin/videoroom/VideoPlayer.tsx
index ad5e6c9..fca7467 100644
--- a/ui/src/views/admin/videoroom/VideoPlayer.tsx
+++ b/ui/src/views/admin/videoroom/VideoPlayer.tsx
@@ -1,9 +1,12 @@
-import React, { useRef, useEffect } from 'react'
+import { useRef, useEffect } from 'react'
 import { FaMicrophoneSlash, FaVideoSlash } from 'react-icons/fa'
 
-const VideoOff: React.FC<{ size?: number; className?: string }> = ({
+const VideoOff = ({
   size = 24,
   className = '',
+}: {
+  size?: number
+  className?: string
 }) => <FaVideoSlash size={size} className={className} />
 
 interface VideoPlayerProps {
@@ -12,18 +15,15 @@ interface VideoPlayerProps {
   userName: string
   isAudioEnabled?: boolean
   isVideoEnabled?: boolean
-  onToggleAudio?: () => void
-  onToggleVideo?: () => void
-  onLeaveCall?: () => void
 }
 
-export const VideoPlayer: React.FC<VideoPlayerProps> = ({
+export const VideoPlayer = ({
   stream,
   isLocal = false,
   userName,
   isAudioEnabled = true,
   isVideoEnabled = true,
-}) => {
+}: VideoPlayerProps) => {
   const videoRef = useRef<HTMLVideoElement>(null)
 
   useEffect(() => {
diff --git a/ui/src/views/ai/Assistant.tsx b/ui/src/views/ai/Assistant.tsx
index 30e9f8c..60c0285 100644
--- a/ui/src/views/ai/Assistant.tsx
+++ b/ui/src/views/ai/Assistant.tsx
@@ -355,7 +355,7 @@ const Assistant = () => {
   // Mesaj içeriği render
   const renderMessageContent = (message: Message) => {
     if (message.role === 'assistant' && isContentObject(message.content)) {
-      const { type, question, sql, answer, chart, error, columns, rows, rowCount } =
+      const { type, sql, answer, chart, error, columns, rows, rowCount } =
         message.content as BaseContent & {
           error?: string
         }
diff --git a/ui/src/views/auth/SendConfirmationCode.tsx b/ui/src/views/auth/SendConfirmationCode.tsx
index 30787d8..591a547 100644
--- a/ui/src/views/auth/SendConfirmationCode.tsx
+++ b/ui/src/views/auth/SendConfirmationCode.tsx
@@ -2,7 +2,7 @@ import useAccount from '@/utils/hooks/useAccount'
 import { Alert, Button, FormContainer, FormItem, Input } from '@/components/ui'
 import { Field, Form, Formik } from 'formik'
 import * as Yup from 'yup'
-import { ActionLink, TenantSelector } from '@/components/shared'
+import { TenantSelector } from '@/components/shared'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { store, useStoreActions } from '@/store'
 import Captcha from '@/components/shared/Captcha'
@@ -11,6 +11,7 @@ import { Helmet } from 'react-helmet'
 import { APP_NAME } from '@/constants/app.constant'
 import { TurnstileInstance } from '@marsidev/react-turnstile'
 import { useEffect, useRef, useState } from 'react'
+import ActionLink from '@/components/shared/ActionLink'
 
 type FormSchema = {
   email: string
diff --git a/ui/src/views/branch/BranchSeed.tsx b/ui/src/views/branch/BranchSeed.tsx
index 0b6495e..892ac4d 100644
--- a/ui/src/views/branch/BranchSeed.tsx
+++ b/ui/src/views/branch/BranchSeed.tsx
@@ -1,19 +1,12 @@
 import classNames from 'classnames'
 import { useState } from 'react'
-import { Badge, Button } from '@/components/ui'
+import { Badge, Button, Dialog, Notification, toast } from '@/components/ui'
 import { Container } from '@/components/shared'
-import { Dialog, Notification, toast } from '@/components/ui'
 import { useDialogContext } from '@/components/ui/Dialog/Dialog'
 import type { BranchSeedResultDto } from '@/proxy/branch/seed'
 import { runBranchSeed } from '@/services/branch.service'
 
-function BranchSeedContent({
-  id,
-  name,
-}: {
-  id: string
-  name: string
-}) {
+function BranchSeedContent({ id, name }: { id: string; name: string }) {
   const { isMaximized } = useDialogContext()
   const [isLoading, setIsLoading] = useState(false)
   const [result, setResult] = useState<BranchSeedResultDto | null>(null)
diff --git a/ui/src/views/developerKit/ComponentCodeLayout.tsx b/ui/src/views/developerKit/ComponentCodeLayout.tsx
index fc16746..e3b7dd7 100644
--- a/ui/src/views/developerKit/ComponentCodeLayout.tsx
+++ b/ui/src/views/developerKit/ComponentCodeLayout.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useRef } from 'react'
+import React, { useState, useEffect, useCallback, useRef } from 'react'
 import { FaThLarge } from 'react-icons/fa'
 import {
   parseReactCode,
@@ -7,15 +7,12 @@ import {
   generateHookCode,
   generateHookVariableName,
   removeHookFromCode,
-  generateUniqueId,
   removeComponentAndHooksFromCode,
-  generateComponentJSX,
-  insertJSXAtPosition,
 } from '../../utils/codeParser'
 import { ComponentLibrary } from '../../components/codeLayout/ComponentLibrary'
 import { Splitter } from '../../components/codeLayout/Splitter'
 import { PanelManager } from '../../components/codeLayout/PanelManager'
-import { ComponentDefinition, ComponentInfo, EditorState } from '../../proxy/developerKit/componentInfo'
+import { ComponentDefinition, EditorState } from '../../proxy/developerKit/componentInfo'
 import PropertyPanel from '../../components/codeLayout/PropertyPanel'
 import ComponentSelector from '../../components/codeLayout/ComponentSelector'
 import { useParams } from 'react-router-dom'
@@ -51,7 +48,6 @@ function ComponentCodeLayout() {
 
   const isEditing = !!id
   const [code, setCode] = useState<string>(INITIAL_CODE)
-  const [hasCodeChanges, setHasCodeChanges] = useState(false)
   const [isLoaded, setIsLoaded] = useState(false)
   const parseDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   const [name, setName] = useState('')
@@ -75,12 +71,11 @@ function ComponentCodeLayout() {
       console.error('Error saving component:', error)
       alert('Failed to save component. Please try again.')
     } finally {
-      setHasCodeChanges(false)
       setIsLoaded(true)
 
       toast.push(
         <Notification type="success" duration={2000}>
-          "Bileşen başarıyla kaydedildi."
+          Bileşen başarıyla kaydedildi.
         </Notification>,
         {
           placement: 'top-end',
@@ -115,44 +110,6 @@ function ComponentCodeLayout() {
     }
   }, [id, isEditing, getComponent, isLoaded])
 
-  // NEW: Handle drop to Code Editor instead of Canvas
-  const handleDropToCodeEditor = (
-    componentDef: ComponentDefinition,
-    position: { line: number; column: number },
-  ): void => {
-    if (!componentDef || typeof componentDef !== 'object') {
-      console.error('Component definition is null or undefined')
-      return
-    }
-    if (!componentDef.name) {
-      console.error('Invalid component definition in handleDropToCodeEditor')
-      return
-    }
-
-    const propertiesObj: Record<string, any> = {}
-    if (Array.isArray(componentDef.properties)) {
-      componentDef.properties.forEach((prop) => {
-        propertiesObj[prop.name] = prop
-      })
-    }
-    const newComponent: ComponentInfo = {
-      id: generateUniqueId(),
-      type: componentDef.name, // type alanı componentDef.name olmalı
-      props: propertiesObj,
-      name: componentDef.name,
-      startLine: 0,
-      endLine: 0,
-      startColumn: 0,
-      endColumn: 0,
-    }
-
-    // Generate JSX string for this component
-    const componentJSX = generateComponentJSX(newComponent)
-
-    // Insert the JSX at the cursor position in the code editor
-    setCode(insertJSXAtPosition(code, componentJSX, position))
-  }
-
   const handleAppDragOver = (e: React.DragEvent<HTMLDivElement>) => {
     e.preventDefault()
   }
@@ -180,7 +137,6 @@ function ComponentCodeLayout() {
     (value: string | undefined) => {
       if (value !== undefined) {
         setCode(value)
-        setHasCodeChanges(value !== editorState.code)
       }
     },
     [editorState.code],
@@ -189,13 +145,11 @@ function ComponentCodeLayout() {
   // Apply code changes
   const handleApplyCodeChanges = useCallback(() => {
     parseAndUpdateComponents(code)
-    setHasCodeChanges(false)
   }, [parseAndUpdateComponents, code])
 
   // Reset code changes
   const handleResetCodeChanges = useCallback(() => {
     setCode(editorState.code)
-    setHasCodeChanges(false)
   }, [editorState.code])
 
   // Handle property changes from Property Panel
@@ -649,7 +603,6 @@ function ComponentCodeLayout() {
             onChange={handleCodeChange}
             onApplyCodeChanges={handleApplyCodeChanges}
             onResetCodeChanges={handleResetCodeChanges}
-            onDrop={handleDropToCodeEditor}
             onComponentSave={handleSave}
           />
         </div>
diff --git a/ui/src/views/developerKit/ComponentEditor.tsx b/ui/src/views/developerKit/ComponentEditor.tsx
index 4bb858c..db097f3 100644
--- a/ui/src/views/developerKit/ComponentEditor.tsx
+++ b/ui/src/views/developerKit/ComponentEditor.tsx
@@ -1,31 +1,14 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect } from 'react'
 import { useParams, useNavigate, Link } from 'react-router-dom'
 import { useComponents } from '../../contexts/ComponentContext'
-import {
-  FaRegSave,
-  FaArrowLeft,
-  FaExclamationCircle,
-  FaSync,
-  FaCode,
-  FaEye,
-  FaCog,
-} from 'react-icons/fa'
-import { parseReactCode } from '../../utils/codeParser'
+import { FaRegSave, FaArrowLeft, FaSync, FaCode, FaEye, FaCog } from 'react-icons/fa'
 import ComponentPreview from '../../components/componentEditor/ComponentPreview'
-import { EditorState } from '../../proxy/developerKit/componentInfo'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
-import { Formik, Form, Field, FieldProps } from 'formik'
+import { Formik, Form, Field } from 'formik'
 import * as Yup from 'yup'
 import { Button, Checkbox, FormContainer, FormItem, Input } from '@/components/ui'
 
-// Error tipini tanımla
-interface ValidationError {
-  message: string
-  severity: number
-  startLineNumber?: number
-}
-
 // Validation schema
 const validationSchema = Yup.object({
   name: Yup.string().required(),
@@ -42,18 +25,10 @@ const ComponentEditor: React.FC = () => {
 
   const { getComponent, addComponent, updateComponent } = useComponents()
 
-  const [validationErrors, setValidationErrors] = useState<ValidationError[]>([])
   const [isLoaded, setIsLoaded] = useState(false)
 
   const isEditing = !!id
 
-  //Eksikler Dahil edit modunda
-  const [editorState, setEditorState] = useState<EditorState>({
-    code: '',
-    components: [],
-    selectedComponentId: null,
-  })
-
   // Initial values for Formik
   const [initialValues, setInitialValues] = useState({
     name: '',
@@ -63,24 +38,6 @@ const ComponentEditor: React.FC = () => {
     isActive: true,
   })
 
-  const parseAndUpdateComponents = useCallback((code: string) => {
-    try {
-      const parsed = parseReactCode(code)
-      setEditorState((prev) => ({
-        ...prev,
-        code,
-        components: parsed.components,
-      }))
-    } catch (error) {
-      const msg = error instanceof Error ? error.message : 'Koddan komponentler parse edilemedi.'
-      console.log('Parse error:', msg)
-      setEditorState((prev) => ({
-        ...prev,
-        code, // Only update the code, keep existing components
-      }))
-    }
-  }, [])
-
   // Load existing component data - sadece edit modunda
   useEffect(() => {
     if (isEditing && id && !isLoaded) {
@@ -104,14 +61,13 @@ const ComponentEditor: React.FC = () => {
         }
 
         setInitialValues(values)
-        parseAndUpdateComponents(component.code)
         setIsLoaded(true)
       }
     } else if (!isEditing && !isLoaded) {
       // Yeni komponent için boş başla - TEMPLATE YOK
       setIsLoaded(true)
     }
-  }, [id, isEditing, getComponent, isLoaded, parseAndUpdateComponents])
+  }, [id, isEditing, getComponent, isLoaded])
 
   // Generate component template based on name
   const generateComponentTemplate = (componentName: string): string => {
@@ -138,27 +94,6 @@ export default ${pascalCaseName}Component;`
       return
     }
 
-    const criticalErrors = validationErrors.filter((error) => {
-      const message = error.message.toLowerCase()
-      return (
-        !message.includes('can only be used in typescript files') &&
-        !message.includes('type annotations can only be used') &&
-        !message.includes('jsx-runtime') &&
-        !message.includes('corresponding type declarations') &&
-        error.severity === 8
-      )
-    })
-
-    if (criticalErrors.length > 0) {
-      const proceed = window.confirm(
-        `There are ${criticalErrors.length} critical error(s) in your code. Do you want to save anyway?`,
-      )
-      if (!proceed) {
-        setSubmitting(false)
-        return
-      }
-    }
-
     try {
       const componentData = {
         name: values.name.trim(),
@@ -221,7 +156,9 @@ export default ${pascalCaseName}Component;`
                             : translate('::App.DeveloperKit.ComponentEditor.Title.Create')}
                         </h1>
                         <p className="text-xs text-slate-500 dark:text-gray-400 leading-tight">
-                          {isEditing ? 'Modify your React component' : 'Create a new React component'}
+                          {isEditing
+                            ? 'Modify your React component'
+                            : 'Create a new React component'}
                         </p>
                       </div>
                     </div>
@@ -240,11 +177,11 @@ export default ${pascalCaseName}Component;`
 
                     <Button
                       type="button"
-                      variant='solid'
+                      variant="solid"
                       size="sm"
-                      onClick={submitForm}
                       disabled={isSubmitting || !values.name.trim() || !isValid}
                       className="flex items-center gap-2 text-white px-4 py-2 rounded-lg hover:bg-emerald-700 dark:hover:bg-emerald-800 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+                      onClick={submitForm}
                     >
                       <FaRegSave className="w-4 h-4" />
                       {isSubmitting
@@ -275,10 +212,10 @@ export default ${pascalCaseName}Component;`
                       errorMessage={errors.name as string}
                     >
                       <Field
+                        autoFocus
                         name="name"
                         type="text"
                         component={Input}
-                        autoFocus
                         placeholder="e.g., Button, Card, Modal"
                         onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                           const newName = e.target.value
@@ -289,17 +226,18 @@ export default ${pascalCaseName}Component;`
                           if (!isEditing && newName.trim()) {
                             const currentCode = values.code.trim()
                             const isCodeEmpty = !currentCode
-                            const isCodeDefaultTemplate = currentCode.includes('Component = ({') &&
+                            const isCodeDefaultTemplate =
+                              currentCode.includes('Component = ({') &&
                               currentCode.includes('export default') &&
                               currentCode.includes('<span>{title}</span>')
 
                             if (isCodeEmpty || isCodeDefaultTemplate) {
                               const template = generateComponentTemplate(newName)
                               setFieldValue('code', template)
-                              parseAndUpdateComponents(template)
                             }
                           }
-                        } } />
+                        }}
+                      />
                     </FormItem>
 
                     <FormItem
@@ -311,7 +249,8 @@ export default ${pascalCaseName}Component;`
                         name="description"
                         type="text"
                         component={Input}
-                        placeholder="Brief description of the component" />
+                        placeholder="Brief description of the component"
+                      />
                     </FormItem>
 
                     <FormItem
@@ -328,7 +267,8 @@ export default ${pascalCaseName}Component;`
                         rows={10}
                         onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
                           setFieldValue('code', e.target.value)
-                        } } />
+                        }}
+                      />
                     </FormItem>
 
                     <FormItem
@@ -337,18 +277,21 @@ export default ${pascalCaseName}Component;`
                       errorMessage={errors.dependencies as string}
                     >
                       <Field name="dependencies">
-                        {({ field }: FieldProps) => (
+                        {() => (
                           <Input
                             type="text"
                             value={(values.dependencies || []).join(', ')}
-                            onChange={(e) => setFieldValue(
-                              'dependencies',
-                              e.target.value
-                                .split(',')
-                                .map((s) => s.trim())
-                                .filter(Boolean)
-                            )}
-                            placeholder="MyComponent, AnotherComponent, etc." />
+                            placeholder="MyComponent, AnotherComponent, etc."
+                            onChange={(e) =>
+                              setFieldValue(
+                                'dependencies',
+                                e.target.value
+                                  .split(',')
+                                  .map((s) => s.trim())
+                                  .filter(Boolean),
+                              )
+                            }
+                          />
                         )}
                       </Field>
                     </FormItem>
@@ -360,49 +303,8 @@ export default ${pascalCaseName}Component;`
                 </div>
               </div>
 
-              {/* Right Side - Preview and Validation */}
+              {/* Right Side - Preview */}
               <div className="space-y-4 col-span-2">
-                {/* Validation Errors */}
-                {validationErrors.length > 0 && (
-                  <div className="bg-red-50 dark:bg-red-950 border border-red-200 dark:border-red-700 rounded-lg p-3 shadow-sm">
-                    <div className="flex items-start gap-2">
-                      <div className="bg-red-100 dark:bg-red-900 rounded-full p-1.5">
-                        <FaExclamationCircle className="w-4 h-4 text-red-600 dark:text-red-400" />
-                      </div>
-                      <div className="flex-1">
-                        <h3 className="text-base font-semibold text-red-800 dark:text-red-300 mb-1">
-                          Validation Issues
-                        </h3>
-                        <p className="text-xs text-red-700 dark:text-red-400 mb-3">
-                          {validationErrors.length} issue
-                          {validationErrors.length !== 1 ? 's' : ''} found in your code
-                        </p>
-                        <div className="space-y-1.5 max-h-32 overflow-y-auto">
-                          {validationErrors.slice(0, 5).map((error, index) => (
-                            <div
-                              key={index}
-                              className="bg-white dark:bg-gray-900 p-2 rounded border border-red-100 dark:border-red-700"
-                            >
-                              <div className="text-xs text-red-800 dark:text-red-300">
-                                <span className="font-medium bg-red-100 dark:bg-red-900 px-1.5 py-0.5 rounded text-xs">
-                                  Line {error.startLineNumber}
-                                </span>
-                                <span className="ml-2">{error.message}</span>
-                              </div>
-                            </div>
-                          ))}
-                          {validationErrors.length > 5 && (
-                            <div className="text-xs text-red-600 dark:text-red-400 italic text-center py-1">
-                              ... and {validationErrors.length - 5} more issue
-                              {validationErrors.length - 5 !== 1 ? 's' : ''}
-                            </div>
-                          )}
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                )}
-
                 {/* Component Preview */}
                 <div className="bg-white dark:bg-gray-900 rounded-lg shadow-sm border border-slate-200 dark:border-gray-700 p-3">
                   <div className="flex items-center gap-2 mb-3">
diff --git a/ui/src/views/developerKit/ComponentManager.tsx b/ui/src/views/developerKit/ComponentManager.tsx
index 991dd1a..c4078a8 100644
--- a/ui/src/views/developerKit/ComponentManager.tsx
+++ b/ui/src/views/developerKit/ComponentManager.tsx
@@ -55,7 +55,7 @@ const ComponentManager: React.FC = () => {
     }
   }
 
-  const handleDelete = async (id: string, name: string) => {
+  const handleDelete = async (id: string) => {
     if (window.confirm(translate('::App.DeveloperKit.Component.ConfirmDelete'))) {
       try {
         await deleteComponent(id)
@@ -221,13 +221,13 @@ const ComponentManager: React.FC = () => {
                     >
                       {component.isActive ? (
                         <>
-                          <FaEye className="w-3 h-3" />
-                          {translate('::App.DeveloperKit.Component.Active')}
+                          <FaEye className="w-4 h-4" />
+                          {translate('::App.Status.Active')}
                         </>
                       ) : (
                         <>
-                          <FaEyeSlash className="w-3 h-3" />
-                          {translate('::App.DeveloperKit.Component.Inactive')}
+                          <FaEyeSlash className="w-4 h-4" />
+                          {translate('::App.Status.Inactive')}
                         </>
                       )}
                     </Button>
@@ -249,7 +249,7 @@ const ComponentManager: React.FC = () => {
                       }
                       title={translate('::App.DeveloperKit.Component.Edit')}
                     >
-                      <FaRegEdit className="w-3 h-3" />
+                      <FaRegEdit className="w-4 h-4" />
                     </Button>
                     <Button
                       type="button"
@@ -266,17 +266,17 @@ const ComponentManager: React.FC = () => {
                       }
                       title={translate('::App.DeveloperKit.Component.View')}
                     >
-                      <FaEye className="w-3 h-3" />
+                      <FaEye className="w-4 h-4" />
                     </Button>
                     <Button
                       type="button"
                       variant="solid"
                       shape="circle"
                       color="red-600"
-                      onClick={() => handleDelete(component.id, component.name)}
+                      onClick={() => handleDelete(component.id)}
                       title={translate('::App.DeveloperKit.Component.Delete')}
                     >
-                      <FaTrashAlt className="w-3 h-3" />
+                      <FaTrashAlt className="w-4 h-4" />
                     </Button>
                   </div>
                 </div>
diff --git a/ui/src/views/developerKit/CrudEndpointManager.tsx b/ui/src/views/developerKit/CrudEndpointManager.tsx
index 563ce52..38bf51f 100644
--- a/ui/src/views/developerKit/CrudEndpointManager.tsx
+++ b/ui/src/views/developerKit/CrudEndpointManager.tsx
@@ -2,7 +2,6 @@
 import axios from 'axios'
 import {
   FaSearch,
-  FaGlobe,
   FaCopy,
   FaCheckCircle,
   FaExclamationCircle,
@@ -16,7 +15,6 @@ import {
   FaToggleOff,
   FaChevronRight,
   FaChevronDown,
-  FaServer,
 } from 'react-icons/fa'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import Widget from '@/components/common/Widget'
diff --git a/ui/src/views/developerKit/DynamicServiceEditor.tsx b/ui/src/views/developerKit/DynamicServiceEditor.tsx
index 89949e2..85a106d 100644
--- a/ui/src/views/developerKit/DynamicServiceEditor.tsx
+++ b/ui/src/views/developerKit/DynamicServiceEditor.tsx
@@ -7,7 +7,6 @@ import {
   FaCheckCircle,
   FaExclamationCircle,
   FaSpinner,
-  FaExternalLinkAlt,
   FaArrowLeft,
   FaCog,
   FaCode,
diff --git a/ui/src/views/developerKit/SqlEditor.tsx b/ui/src/views/developerKit/SqlEditor.tsx
index ff23cba..0ccf8a2 100644
--- a/ui/src/views/developerKit/SqlEditor.tsx
+++ b/ui/src/views/developerKit/SqlEditor.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, forwardRef, useImperativeHandle } from 'react'
+import { useRef, forwardRef, useImperativeHandle } from 'react'
 import Editor, { Monaco } from '@monaco-editor/react'
 import { useConfig } from '@/components/ui/ConfigProvider'
 import type { editor } from 'monaco-editor'
@@ -25,7 +25,6 @@ const SqlEditor = forwardRef<SqlEditorRef, SqlEditorProps>((
     onExecute,
     onSave,
     readOnly = false,
-    height = '100%',
   }: SqlEditorProps,
   ref
 ) => {
@@ -66,7 +65,7 @@ const SqlEditor = forwardRef<SqlEditorRef, SqlEditorProps>((
 
     // Configure SQL language features
     monaco.languages.registerCompletionItemProvider('sql', {
-      provideCompletionItems: (model, position) => {
+      provideCompletionItems: (model: any, position: any) => {
         const word = model.getWordUntilPosition(position)
         const range = {
           startLineNumber: position.lineNumber,
diff --git a/ui/src/views/developerKit/SqlObjectExplorer.tsx b/ui/src/views/developerKit/SqlObjectExplorer.tsx
index 8c66767..2a00a41 100644
--- a/ui/src/views/developerKit/SqlObjectExplorer.tsx
+++ b/ui/src/views/developerKit/SqlObjectExplorer.tsx
@@ -167,7 +167,11 @@ const SqlObjectExplorer = ({
   const toggleNode = (nodeId: string) => {
     setExpandedNodes((prev) => {
       const next = new Set(prev)
-      next.has(nodeId) ? next.delete(nodeId) : next.add(nodeId)
+      if (next.has(nodeId)) {
+        next.delete(nodeId)
+      } else {
+        next.add(nodeId)
+      }
       return next
     })
   }
diff --git a/ui/src/views/developerKit/SqlQueryManager.tsx b/ui/src/views/developerKit/SqlQueryManager.tsx
index 0d491b6..d1f81ab 100644
--- a/ui/src/views/developerKit/SqlQueryManager.tsx
+++ b/ui/src/views/developerKit/SqlQueryManager.tsx
@@ -17,8 +17,9 @@ import {
   FaArrowLeft,
   FaArrowRight,
   FaEye,
+  FaCheckCircle,
+  FaFolderOpen
 } from 'react-icons/fa'
-import { FaCheckCircle } from 'react-icons/fa'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import SqlObjectExplorer, { type SqlExplorerSelectedObject } from './SqlObjectExplorer'
 import SqlEditor, { SqlEditorRef } from './SqlEditor'
@@ -30,7 +31,6 @@ import { useStoreState } from '@/store/store'
 import { APP_NAME } from '@/constants/app.constant'
 import { UiEvalService } from '@/services/UiEvalService'
 import { FcAcceptDatabase } from 'react-icons/fc'
-import { FaFolderOpen } from 'react-icons/fa'
 
 interface SqlManagerState {
   dataSources: DataSourceDto[]
@@ -124,7 +124,7 @@ const SqlQueryManager = () => {
           selectedDataSource: items[0].code ?? null,
         }))
       }
-    } catch (error) {
+    } catch {
       toast.push(
         <Notification type="danger" title={translate('::App.Platform.Error')}>
           {translate('::App.Platform.FailedtoloadDatasources')}
@@ -178,91 +178,6 @@ const SqlQueryManager = () => {
   const isPostgreSql = selectedDataSourceType === DataSourceTypeEnum.Postgresql
   const sqlDataDirectoryName = isPostgreSql ? 'PostgresData' : 'SqlData'
 
-  const buildTableScriptQuery = (schemaName: string, tableName: string) => {
-    const fullName = getSafeFullName(schemaName, tableName)
-    const escapedFullName = escapeSqlLiteral(fullName)
-
-    return `DECLARE @ObjectId INT = OBJECT_ID(N'${escapedFullName}');
-
-IF @ObjectId IS NULL
-BEGIN
-    SELECT CAST('' AS NVARCHAR(MAX)) AS Script;
-    RETURN;
-END;
-
-;WITH cols AS
-(
-    SELECT
-        c.column_id,
-        '        ' + QUOTENAME(c.name) + ' ' +
-        CASE
-            WHEN t.name IN ('varchar', 'char', 'varbinary', 'binary') THEN
-                t.name + '(' + CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length AS VARCHAR(10)) END + ')'
-            WHEN t.name IN ('nvarchar', 'nchar') THEN
-                t.name + '(' + CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length / 2 AS VARCHAR(10)) END + ')'
-            WHEN t.name IN ('decimal', 'numeric') THEN
-                t.name + '(' + CAST(c.precision AS VARCHAR(10)) + ',' + CAST(c.scale AS VARCHAR(10)) + ')'
-            WHEN t.name IN ('datetime2', 'datetimeoffset', 'time') THEN
-                t.name + '(' + CAST(c.scale AS VARCHAR(10)) + ')'
-            ELSE t.name
-        END +
-        CASE
-            WHEN ic.object_id IS NOT NULL
-                THEN ' IDENTITY(' + CAST(ic.seed_value AS VARCHAR(30)) + ',' + CAST(ic.increment_value AS VARCHAR(30)) + ')'
-            ELSE ''
-        END +
-        CASE WHEN c.is_nullable = 1 THEN ' NULL' ELSE ' NOT NULL' END +
-        ISNULL(' DEFAULT ' + dc.definition, '') AS line
-    FROM sys.columns c
-    INNER JOIN sys.types t ON c.user_type_id = t.user_type_id
-    LEFT JOIN sys.identity_columns ic ON c.object_id = ic.object_id AND c.column_id = ic.column_id
-    LEFT JOIN sys.default_constraints dc ON c.default_object_id = dc.object_id
-    WHERE c.object_id = @ObjectId
-),
-pk AS
-(
-    SELECT
-        '        CONSTRAINT ' + QUOTENAME(k.name) + ' PRIMARY KEY ' +
-        CASE WHEN i.type = 1 THEN 'CLUSTERED' ELSE 'NONCLUSTERED' END +
-        CHAR(13) + CHAR(10) + '    (' + CHAR(13) + CHAR(10) +
-        (
-            SELECT '        ' + QUOTENAME(c.name) + CASE WHEN ic.is_descending_key = 1 THEN ' DESC' ELSE ' ASC' END + CHAR(13) + CHAR(10)
-            FROM sys.index_columns ic
-            INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
-            WHERE ic.object_id = i.object_id
-              AND ic.index_id = i.index_id
-              AND ic.is_included_column = 0
-            ORDER BY ic.key_ordinal
-            FOR XML PATH(''), TYPE
-        ).value('.', 'NVARCHAR(MAX)') +
-        '    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]' AS line
-    FROM sys.key_constraints k
-    INNER JOIN sys.indexes i ON k.parent_object_id = i.object_id AND k.unique_index_id = i.index_id
-    WHERE k.parent_object_id = @ObjectId
-      AND k.type = 'PK'
-)
-SELECT
-    'IF OBJECT_ID(N''${escapedFullName}'', ''U'') IS NULL' + CHAR(13) + CHAR(10) +
-    'BEGIN' + CHAR(13) + CHAR(10) +
-    '    CREATE TABLE ${fullName}' + CHAR(13) + CHAR(10) +
-    '    (' + CHAR(13) + CHAR(10) +
-    STUFF(
-        (
-            SELECT ',' + CHAR(13) + CHAR(10) + line
-            FROM cols
-            ORDER BY column_id
-            FOR XML PATH(''), TYPE
-        ).value('.', 'NVARCHAR(MAX)')
-    ,1,3,'') +
-    ISNULL(
-        (
-            SELECT ',' + CHAR(13) + CHAR(10) + line
-            FROM pk
-        ),
-        ''
-    ) + CHAR(13) + CHAR(10) + '    ) ON [PRIMARY]' + CHAR(13) + CHAR(10) + 'END' + CHAR(13) + CHAR(10) + 'GO' AS Script;`
-  }
-
   const getTableCreateScript = async (schemaName: string, tableName: string): Promise<string> => {
     if (!state.selectedDataSource) return ''
 
@@ -586,23 +501,6 @@ GO`,
     }))
   }, [])
 
-  const handleUseTemplateFromDialog = useCallback(
-    (templateContent: string, templateType: string) => {
-      // Check if editor has content
-      const hasUserContent = state.editorContent?.trim() && state.isDirty
-
-      if (hasUserContent) {
-        // Ask for confirmation
-        setPendingTemplate({ content: templateContent, type: templateType })
-        setShowTemplateConfirmDialog(true)
-      } else {
-        // Apply template directly
-        applyTemplate(templateContent)
-      }
-    },
-    [state.editorContent, state.isDirty, applyTemplate],
-  )
-
   const handleTemplateSelect = useCallback(
     (template: string, templateType: string) => {
       // If template is already provided (e.g., from table click), use it
diff --git a/ui/src/views/developerKit/SqlResultsGrid.tsx b/ui/src/views/developerKit/SqlResultsGrid.tsx
index 6b0f1ab..c55eb6b 100644
--- a/ui/src/views/developerKit/SqlResultsGrid.tsx
+++ b/ui/src/views/developerKit/SqlResultsGrid.tsx
@@ -178,6 +178,10 @@ const SqlResultsGrid = ({
     setValidationError('')
   }
 
+  const normalizeBoolean = (value: unknown): boolean => {
+    return value === true || value === 'true' || value === 1 || value === '1'
+  }
+
   const openEditDialog = () => {
     const row = focusedRow
     if (!row) return
@@ -426,7 +430,7 @@ const SqlResultsGrid = ({
                       setFormValues((current) => ({ ...current, [column.name]: checked }))
                     }
                   >
-                    {Boolean(value) ? 'True' : 'False'}
+                    {normalizeBoolean(value) ? 'True' : 'False'}
                   </Checkbox>
                 ) : isDateColumn(column) ? (
                   isDateTimeColumn(column) ? (
diff --git a/ui/src/views/developerKit/SqlTableDesignerDialog.tsx b/ui/src/views/developerKit/SqlTableDesignerDialog.tsx
index 845f932..d1f4169 100644
--- a/ui/src/views/developerKit/SqlTableDesignerDialog.tsx
+++ b/ui/src/views/developerKit/SqlTableDesignerDialog.tsx
@@ -1,5 +1,4 @@
-import { useState, useCallback, useMemo, useEffect } from 'react'
-import classNames from 'classnames'
+import React, { useState, useCallback, useMemo, useEffect } from 'react'
 import { createPortal } from 'react-dom'
 import { Button, Dialog, Notification, toast, Checkbox } from '@/components/ui'
 import {
@@ -830,13 +829,6 @@ function generateAlterTableSql(
   return lines.join('\n')
 }
 
-const STEPS = [
-  'Sütun Tasarımı',
-  'Entity Ayarları',
-  'Index / Key',
-  'İlişkiler',
-  'T-SQL Önizleme',
-] as const
 type Step = 0 | 1 | 2 | 3 | 4
 
 function StepContentWrapper({ children }: { children: React.ReactNode }) {
@@ -942,7 +934,11 @@ function SimpleMenuTreeSelect({
   const toggle = (code: string) =>
     setExpanded((prev) => {
       const n = new Set(prev)
-      n.has(code) ? n.delete(code) : n.add(code)
+      if (n.has(code)) {
+        n.delete(code)
+      } else {
+        n.add(code)
+      }
       return n
     })
 
@@ -1485,7 +1481,7 @@ const SqlTableDesignerDialog = ({
 
   const openEditFk = (rel: SqlTableRelation) => {
     setEditingFkId(rel.id)
-    const { id: _id, ...rest } = rel
+    const { ...rest } = rel
     setFkForm(rest)
     loadTargetColumns(rest.referencedTable)
     setFkModalOpen(true)
@@ -1548,7 +1544,7 @@ const SqlTableDesignerDialog = ({
 
   const openEditIndex = (idx: TableIndex) => {
     setEditingIndexId(idx.id)
-    const { id: _id, ...rest } = idx
+    const { ...rest } = idx
     setIndexForm(rest)
     setIndexModalOpen(true)
   }
@@ -1755,7 +1751,7 @@ const SqlTableDesignerDialog = ({
                 onClick={importColumnsFromRememberedCreateTable}
                 disabled={isEditMode}
               >
-                CREATE TABLE'dan Kolonları Yapıştır
+                CREATE TABLE Kolonları Yapıştır
               </Button>
             </div>
             <div className="flex items-center gap-2">
@@ -1970,7 +1966,7 @@ const SqlTableDesignerDialog = ({
                 size="xs"
                 variant="solid"
                 color="green-500"
-                className="!h-auto !px-2 !py-0.5 hover:!bg-green-600 disabled:opacity-40 disabled:cursor-not-allowed"
+                className="flex items-center gap-2 !h-auto !px-2 !py-1 hover:!bg-green-600 disabled:opacity-40 disabled:cursor-not-allowed"
               >
                 <FaPlus className="text-xs" />{' '}
                 {translate('::ListForms.Wizard.Step1.AddNewMenu') || 'Add Menu'}
@@ -1984,7 +1980,7 @@ const SqlTableDesignerDialog = ({
                   }}
                   size="xs"
                   variant="default"
-                  className="!h-auto !px-2 !py-0.5 border-gray-300 dark:border-gray-600 text-gray-500 hover:text-red-500 hover:border-red-400"
+                  className="flex items-center gap-2!h-auto !px-2 !py-1 border-gray-300 dark:border-gray-600 text-gray-500 hover:text-red-500 hover:border-red-400"
                 >
                   <FaTimes className="text-xs" />{' '}
                   {translate('::ListForms.Wizard.ClearSelection') || 'Clear'}
@@ -2088,7 +2084,7 @@ const SqlTableDesignerDialog = ({
               size="xs"
               variant="solid"
               color="indigo-600"
-              className="!h-auto !px-3 !py-1.5 !rounded-lg hover:!bg-indigo-700 transition-colors"
+              className="flex items-center gap-2 !h-auto !px-2 !py-1 !rounded-lg hover:!bg-indigo-700 transition-colors"
             >
               <FaPlus className="w-2.5 h-2.5" />{' '}
               {translate('::App.SqlQueryManager.AddRelationship')}
@@ -2453,7 +2449,7 @@ const SqlTableDesignerDialog = ({
               size="xs"
               variant="solid"
               color="indigo-600"
-              className="!h-auto !px-3 !py-1.5 !rounded-lg hover:!bg-indigo-700 transition-colors"
+              className="flex items-center gap-2 !h-auto !px-2 !py-1 !rounded-lg hover:!bg-indigo-700 transition-colors"
             >
               <FaPlus className="w-2.5 h-2.5" /> {translate('::App.SqlQueryManager.AddIndexKey')}
             </Button>
diff --git a/ui/src/views/form/FormButtons.tsx b/ui/src/views/form/FormButtons.tsx
index 3a79913..bc3e32d 100644
--- a/ui/src/views/form/FormButtons.tsx
+++ b/ui/src/views/form/FormButtons.tsx
@@ -20,7 +20,6 @@ import { PermissionResults, RowMode } from './types'
 import { GridDto } from '@/proxy/form/models'
 import { ROUTES_ENUM } from '@/routes/route.constant'
 import { usePermission } from '@/utils/hooks/usePermission'
-import { GridExtraFilterState } from '../list/Utils'
 import { usePWA } from '@/utils/hooks/usePWA'
 import { layoutTypes } from '../admin/listForm/edit/types'
 
@@ -61,9 +60,7 @@ const FormButtons = (props: {
     onActionView,
   } = props
 
-  const [loading, setLoading] = useState(false)
   const [deleteRowId, setDeleteRowId] = useState<string>()
-  const [extraFilters, setExtraFilters] = useState<GridExtraFilterState[]>([])
   const { checkPermission } = usePermission()
   const isPwaMode = usePWA()
 
@@ -95,7 +92,6 @@ const FormButtons = (props: {
       return
     }
 
-    setLoading(true)
     try {
       await dataSource.remove(id)
       setDeleteRowId(undefined)
@@ -116,9 +112,7 @@ const FormButtons = (props: {
       toast.push(<Notification title={error.message} type="danger" />, {
         placement: 'top-end',
       })
-    } finally {
-      setLoading(false)
-    }
+    } 
   }
 
   const toolbarExcludedNames = ['deleteAllRecords', 'deleteSelectedRecords', 'refreshButton']
diff --git a/ui/src/views/form/FormDevExpress.tsx b/ui/src/views/form/FormDevExpress.tsx
index b9d1fe9..d802f79 100644
--- a/ui/src/views/form/FormDevExpress.tsx
+++ b/ui/src/views/form/FormDevExpress.tsx
@@ -511,7 +511,7 @@ const FormDevExpress = (props: {
         if (!didAutoFocusRef.current && firstItem?.dataField && !isTouchLikeDevice()) {
           didAutoFocusRef.current = true
           const editor = e.component.getEditor(firstItem.dataField)
-          mode !== 'view' && editor?.focus()
+          if (mode !== 'view') editor?.focus()
         }
       }}
     >
diff --git a/ui/src/views/form/FormNew.tsx b/ui/src/views/form/FormNew.tsx
index 3ffac4d..af6d0fc 100644
--- a/ui/src/views/form/FormNew.tsx
+++ b/ui/src/views/form/FormNew.tsx
@@ -4,7 +4,7 @@ import { DataType } from 'devextreme/common'
 import { SimpleItem } from 'devextreme/ui/form'
 import { useEffect, useRef, useState } from 'react'
 import { Helmet } from 'react-helmet'
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
+import { useParams, useSearchParams } from 'react-router-dom'
 import FormButtons from './FormButtons'
 import FormDevExpress from './FormDevExpress'
 import { FormProps } from './types'
@@ -28,11 +28,9 @@ const FormNew = (
   const [searchParams] = useSearchParams()
   const { translate } = useLocalization()
   const MenuIcon = useCurrentMenuIcon('w-5 h-5')
-  const navigate = useNavigate()
   const initializedListFormCodeRef = useRef<string>()
 
   const {
-    fetchData,
     setFormData,
     loading,
     handleSubmit,
@@ -126,7 +124,7 @@ const FormNew = (
         case 'object':
           try {
             newValue = JSON.parse(newParams.get(colFormat.fieldName) as string)
-          } catch (error) {
+          } catch {
             newValue = updatedData[colFormat.fieldName]
           }
           break
@@ -190,7 +188,7 @@ const FormNew = (
     }
 
     // Grid'den gelen columnFormat'ları kullanarak default değerleri set et
-    for (const colFormat of gridDto?.columnFormats) {
+    for (const colFormat of gridDto?.columnFormats || []) {
       if (!colFormat.fieldName) {
         continue
       }
diff --git a/ui/src/views/form/SubForms.tsx b/ui/src/views/form/SubForms.tsx
index 8cb78e7..6c15c7c 100644
--- a/ui/src/views/form/SubForms.tsx
+++ b/ui/src/views/form/SubForms.tsx
@@ -87,7 +87,7 @@ const SubForms = (props: {
       className="mt-2"
     >
       <TabList>
-        {subForms.map((subForm, i) => {
+        {subForms.map((subForm) => {
           return (
             <TabNav
               key={subForm.code}
@@ -99,7 +99,7 @@ const SubForms = (props: {
           )
         })}
       </TabList>
-      {subForms.map((subForm, i) => {
+      {subForms.map((subForm) => {
         return (
           <TabContent key={subForm.code} value={subForm.code} className="pt-1">
             {subForm.tabType == SubFormTabTypeEnum.List && (
@@ -213,7 +213,7 @@ const SubForms = (props: {
               ))}
             {subForm.tabType == SubFormTabTypeEnum.Chart && (
               <Chart
-                id={gridDto?.gridOptions.id!}
+                id={gridDto?.gridOptions.id as string}
                 listFormCode={subForm.code}
                 isSubForm={true}
                 level={level + 1}
diff --git a/ui/src/views/form/editors/TagBoxEditorComponent.tsx b/ui/src/views/form/editors/TagBoxEditorComponent.tsx
index e973942..8621337 100644
--- a/ui/src/views/form/editors/TagBoxEditorComponent.tsx
+++ b/ui/src/views/form/editors/TagBoxEditorComponent.tsx
@@ -5,7 +5,6 @@ import { ReactElement } from 'react'
 const TagBoxEditorComponent = ({
   value,
   setDefaultValue,
-  values,
   options,
   onValueChanged,
   col,
diff --git a/ui/src/views/form/editors/imageHoverPreview.ts b/ui/src/views/form/editors/imageHoverPreview.ts
index 524cca8..68aae0d 100644
--- a/ui/src/views/form/editors/imageHoverPreview.ts
+++ b/ui/src/views/form/editors/imageHoverPreview.ts
@@ -1,3 +1,5 @@
+import React from 'react'
+
 const NO_IMAGE = '/img/others/no-image.png'
 
 let previewElement: HTMLDivElement | null = null
diff --git a/ui/src/views/form/notes/NotePanel.tsx b/ui/src/views/form/notes/NotePanel.tsx
index 9795719..3980758 100644
--- a/ui/src/views/form/notes/NotePanel.tsx
+++ b/ui/src/views/form/notes/NotePanel.tsx
@@ -28,7 +28,6 @@ export const NotePanel: React.FC<NotePanelProps> = ({
   const [isDragging, setIsDragging] = useState(false)
   const [dragStart, setDragStart] = useState({ y: 0, startTop: 0 })
   const buttonRef = useRef<HTMLDivElement>(null)
-  const [showEntityInfo, setShowEntityInfo] = useState(false)
   const { translate } = useLocalization()
 
   // Fetch activities
@@ -48,7 +47,7 @@ export const NotePanel: React.FC<NotePanelProps> = ({
   const handleDownloadFile = async (fileData: any) => {
     if (!fileData?.SavedFileName) return
     try {
-      await noteService.downloadFile(fileData.SavedFileName, fileData.FileName, fileData.FileType)
+      await noteService.downloadFile(fileData.SavedFileName, fileData.FileName)
     } catch (err) {
       console.error(translate('::ListForms.ListForm.NotesPanel.DownloadFailed'), err)
     }
@@ -177,9 +176,7 @@ export const NotePanel: React.FC<NotePanelProps> = ({
 
             {/* 👇 Açılır Kayıt Bilgisi İçeriği */}
             <div
-              className={`transition-all duration-300 overflow-hidden ${
-                showEntityInfo ? 'max-h-20 mt-2 opacity-100' : 'max-h-0 opacity-0'
-              }`}
+              className={`transition-all duration-300 overflow-hidden max-h-0 opacity-0`}
             ></div>
           </div>
 
diff --git a/ui/src/views/form/useFormData.tsx b/ui/src/views/form/useFormData.tsx
index c602389..67d2686 100644
--- a/ui/src/views/form/useFormData.tsx
+++ b/ui/src/views/form/useFormData.tsx
@@ -236,9 +236,7 @@ const useGridData = (props: {
               let parsedEditorOptions: Record<string, any> = {}
               const colData = gridDto.columnFormats.find((x) => x.fieldName === i.dataField)
 
-              try {
-                parsedEditorOptions = i.editorOptions ? JSON.parse(i.editorOptions) : {}
-              } catch {}
+              parsedEditorOptions = i.editorOptions ? JSON.parse(i.editorOptions) : {}
               const lookupEditorOptions = colData?.lookupDto?.dataSourceType
                 ? {
                     dataSource: getLookupDataSource(colData?.editorOptions, colData, formData),
diff --git a/ui/src/views/form/useLookupDataSource.ts b/ui/src/views/form/useLookupDataSource.ts
index bf83777..6fcca5d 100644
--- a/ui/src/views/form/useLookupDataSource.ts
+++ b/ui/src/views/form/useLookupDataSource.ts
@@ -111,7 +111,7 @@ const createLookupApiDataSource = (
         let { data } = response
         if (!data) return []
         if (!Array.isArray(data)) data = [data]
-        return data.map((a: any) => ({
+        return data.map(() => ({
           key: eval(keySelector),
           name: eval(nameSelector),
           group: eval(groupSelector),
diff --git a/ui/src/views/forum/Forum.tsx b/ui/src/views/forum/Forum.tsx
index dc71295..ca01239 100644
--- a/ui/src/views/forum/Forum.tsx
+++ b/ui/src/views/forum/Forum.tsx
@@ -1,6 +1,5 @@
-import { ForumCategory, ForumPost, ForumTopic } from '@/proxy/forum/forum'
-import { useStoreState } from '@/store/store'
-import React, { useState, useEffect } from 'react'
+import { ForumCategory, ForumTopic } from '@/proxy/forum/forum'
+import { useState, useEffect } from 'react'
 import { useForumData } from './useForumData'
 import { ForumView } from './forum/ForumView'
 import { Container } from '@/components/shared'
@@ -12,7 +11,6 @@ import { Button } from '@/components/ui'
 export function Forum() {
   const { translate } = useLocalization()
 
-  const { user } = useStoreState((state) => state.auth)
   const {
     categories,
     topics,
@@ -80,8 +78,6 @@ export function Forum() {
         onCreatePost={(postData) => createPost(postData).then(() => {})}
         onLikePost={(id) => likePost(id).then(() => {})}
         onUnlikePost={(id) => unlikePost(id).then(() => {})}
-        currentUserId={user.id}
-        currentUserName={user.name}
         selectedCategory={selectedCategory}
         selectedTopic={selectedTopic}
         viewState={forumViewState}
diff --git a/ui/src/views/forum/admin/AdminView.tsx b/ui/src/views/forum/admin/AdminView.tsx
index bbb8abd..209af28 100644
--- a/ui/src/views/forum/admin/AdminView.tsx
+++ b/ui/src/views/forum/admin/AdminView.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import { FaFolder, FaCommentAlt, FaFileAlt, FaChartBar } from 'react-icons/fa'
 import { CategoryManagement } from './CategoryManagement'
 import { TopicManagement } from './TopicManagement'
diff --git a/ui/src/views/forum/admin/CategoryManagement.tsx b/ui/src/views/forum/admin/CategoryManagement.tsx
index ff88cf1..e27e3f7 100644
--- a/ui/src/views/forum/admin/CategoryManagement.tsx
+++ b/ui/src/views/forum/admin/CategoryManagement.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import {
   FaPlus,
   FaEdit,
@@ -50,17 +50,6 @@ export function CategoryManagement({
   const { tenant } = useStoreState((state) => state.auth)
   const [showCreateForm, setShowCreateForm] = useState(false)
   const [editingCategory, setEditingCategory] = useState<ForumCategory | null>(null)
-  const [formData, setFormData] = useState({
-    name: '',
-    slug: '',
-    description: '',
-    icon: '',
-    displayOrder: 0,
-    isActive: true,
-    isLocked: false,
-    tenantId: '',
-  })
-  const [submitting, setSubmitting] = useState(false)
   const [showConfirm, setShowConfirm] = useState(false)
   const [categoryToDelete, setCategoryToDelete] = useState<ForumCategory | null>(null)
 
@@ -80,52 +69,8 @@ export function CategoryManagement({
     setShowConfirm(true)
   }
 
-  const resetForm = () => {
-    setFormData({
-      name: '',
-      slug: '',
-      description: '',
-      icon: '',
-      displayOrder: 0,
-      isActive: true,
-      isLocked: false,
-      tenantId: '',
-    })
-    setShowCreateForm(false)
-    setEditingCategory(null)
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (submitting) return
-
-    try {
-      setSubmitting(true)
-      if (editingCategory) {
-        await onUpdateCategory(editingCategory.id, formData)
-      } else {
-        await onCreateCategory(formData)
-      }
-      resetForm()
-    } catch (error) {
-      console.error('Error submitting form:', error)
-    } finally {
-      setSubmitting(false)
-    }
-  }
-
   const handleEdit = (category: ForumCategory) => {
     setEditingCategory(category)
-    setFormData({
-      name: category.name,
-      slug: category.slug,
-      description: category.description,
-      icon: category.icon,
-      displayOrder: category.displayOrder,
-      isActive: category.isActive,
-      isLocked: category.isLocked,
-      tenantId: tenant.tenantId ?? '',
-    })
     setShowCreateForm(true)
   }
 
@@ -145,20 +90,6 @@ export function CategoryManagement({
     }
   }
 
-  const handleDelete = async (id: string) => {
-    if (
-      confirm(
-        'Are you sure you want to delete this category? This will also delete all topics and posts in this category.',
-      )
-    ) {
-      try {
-        await onDeleteCategory(id)
-      } catch (error) {
-        console.error('Error deleting category:', error)
-      }
-    }
-  }
-
   return (
     <div className="space-y-3">
       {/* Create/Edit Form */}
@@ -200,7 +131,7 @@ export function CategoryManagement({
               }
             }}
           >
-            {({ errors, touched, isSubmitting, values }) => (
+            {({ errors, touched, isSubmitting }) => (
               <Form>
                 <FormContainer className="space-y-4">
                   <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
@@ -332,7 +263,7 @@ export function CategoryManagement({
           </div>
         ) : (
           <div className="divide-y divide-gray-200 dark:divide-gray-800">
-            {categories
+            {[...categories]
               .sort((a, b) => a.displayOrder - b.displayOrder)
               .map((category) => (
                 <div
diff --git a/ui/src/views/forum/admin/PostManagement.tsx b/ui/src/views/forum/admin/PostManagement.tsx
index eff5edc..597da61 100644
--- a/ui/src/views/forum/admin/PostManagement.tsx
+++ b/ui/src/views/forum/admin/PostManagement.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import {
   FaPlus,
   FaEdit,
@@ -16,7 +16,7 @@ import { Formik, Form, Field, FieldProps } from 'formik'
 import * as Yup from 'yup'
 import { FormContainer, FormItem, Button } from '@/components/ui'
 import { ConfirmDialog } from '@/components/shared'
-import { showDbDateAsIs } from '@/utils/dateUtils'
+import { formatForumDate } from '../forum/utils'
 import {
   fontFamilyOptions,
   fontSizeOptions,
@@ -54,16 +54,8 @@ export function PostManagement({
 }: PostManagementProps) {
   const { translate } = useLocalization()
   const { tenant } = useStoreState((state) => state.auth)
-  const [content, setContent] = useState('')
   const [showCreateForm, setShowCreateForm] = useState(false)
   const [editingPost, setEditingPost] = useState<ForumPost | null>(null)
-  const [formData, setFormData] = useState({
-    topicId: '',
-    parentPostId: '',
-    tenantId: '',
-    isAcceptedAnswer: false,
-  })
-  const [submitting, setSubmitting] = useState(false)
   const [showConfirm, setShowConfirm] = useState(false)
   const [postToDelete, setPostToDelete] = useState<ForumPost | null>(null)
 
@@ -72,48 +64,8 @@ export function PostManagement({
     setShowConfirm(true)
   }
 
-  const resetForm = () => {
-    setFormData({
-      topicId: '',
-      parentPostId: '',
-      tenantId: '',
-      isAcceptedAnswer: false,
-    })
-    setShowCreateForm(false)
-    setEditingPost(null)
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (submitting || !content.trim()) return
-
-    try {
-      setSubmitting(true)
-      const data = { ...formData, content: content.trim() }
-
-      if (editingPost) {
-        await onUpdatePost(editingPost.id, data)
-      } else {
-        await onCreatePost(data)
-      }
-
-      resetForm()
-    } catch (error) {
-      console.error('Error submitting form:', error)
-    } finally {
-      setSubmitting(false)
-    }
-  }
-
   const handleEdit = (post: ForumPost) => {
     setEditingPost(post)
-    setFormData({
-      topicId: post.topicId,
-      parentPostId: '',
-      tenantId: tenant.tenantId ?? '',
-      isAcceptedAnswer: post.isAcceptedAnswer,
-    })
-    setContent(post.content)
     setShowCreateForm(true)
   }
 
@@ -129,25 +81,11 @@ export function PostManagement({
     }
   }
 
-  const handleDelete = async (id: string) => {
-    if (confirm('Are you sure you want to delete this post?')) {
-      try {
-        await onDeletePost(id)
-      } catch (error) {
-        console.error('Error deleting post:', error)
-      }
-    }
-  }
-
   const getTopicTitle = (topicId: string) => {
     const topic = topics.find((t) => t.id === topicId)
     return topic ? topic.title : 'Unknown Topic'
   }
 
-  const formatDate = (value: string | Date) => {
-    return showDbDateAsIs(typeof value === 'string' ? value : value.toISOString())
-  }
-
   const postValidationSchema = Yup.object().shape({
     topicId: Yup.string().required(),
     content: Yup.string()
@@ -352,7 +290,7 @@ export function PostManagement({
           </div>
         ) : (
           <div className="divide-y divide-gray-200 dark:divide-gray-800">
-            {posts
+            {[...posts]
               .sort(
                 (a, b) => new Date(b.creationTime).getTime() - new Date(a.creationTime).getTime(),
               )
@@ -383,7 +321,7 @@ export function PostManagement({
 
                       <div className="flex items-center justify-between text-sm text-gray-500 dark:text-gray-400">
                         <div className="flex items-center space-x-4">
-                          <span>{formatDate(post.creationTime)}</span>
+                          <span>{formatForumDate(post.creationTime)}</span>
                           <div className="flex items-center space-x-1">
                             <FaHeart className="w-4 h-4" />
                             <span>{post.likeCount} likes</span>
diff --git a/ui/src/views/forum/admin/TopicManagement.tsx b/ui/src/views/forum/admin/TopicManagement.tsx
index 7e02797..cc75e76 100644
--- a/ui/src/views/forum/admin/TopicManagement.tsx
+++ b/ui/src/views/forum/admin/TopicManagement.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import {
   FaPlus,
   FaEdit,
@@ -19,7 +19,7 @@ import { Formik, Form, Field } from 'formik'
 import * as Yup from 'yup'
 import { FormContainer, FormItem, Button } from '@/components/ui'
 import { ConfirmDialog } from '@/components/shared'
-import { showDbDateAsIs } from '@/utils/dateUtils'
+import { formatForumDate } from '../forum/utils'
 
 interface TopicManagementProps {
   topics: ForumTopic[]
@@ -61,67 +61,16 @@ export function TopicManagement({
   const { tenant } = useStoreState((state) => state.auth)
   const [showCreateForm, setShowCreateForm] = useState(false)
   const [editingTopic, setEditingTopic] = useState<ForumTopic | null>(null)
-  const [formData, setFormData] = useState({
-    title: '',
-    content: '',
-    categoryId: '',
-    isPinned: false,
-    isLocked: false,
-    isSolved: false,
-    tenantId: '',
-  })
-  const [submitting, setSubmitting] = useState(false)
   const [showConfirm, setShowConfirm] = useState(false)
   const [topicToDelete, setTopicToDelete] = useState<ForumTopic | null>(null)
-  const resetForm = () => {
-    setFormData({
-      title: '',
-      content: '',
-      categoryId: '',
-      isPinned: false,
-      isLocked: false,
-      isSolved: false,
-      tenantId: '',
-    })
-    setShowCreateForm(false)
-    setEditingTopic(null)
-  }
 
   const confirmDeleteTopic = (topic: ForumTopic) => {
     setTopicToDelete(topic)
     setShowConfirm(true)
   }
 
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (submitting) return
-
-    try {
-      setSubmitting(true)
-      if (editingTopic) {
-        await onUpdateTopic(editingTopic.id, formData)
-      } else {
-        await onCreateTopic(formData)
-      }
-      resetForm()
-    } catch (error) {
-      console.error('Error submitting form:', error)
-    } finally {
-      setSubmitting(false)
-    }
-  }
-
   const handleEdit = (topic: ForumTopic) => {
     setEditingTopic(topic)
-    setFormData({
-      title: topic.title,
-      content: topic.content,
-      categoryId: topic.categoryId,
-      isPinned: topic.isPinned,
-      isLocked: topic.isLocked,
-      isSolved: topic.isSolved,
-      tenantId: tenant.tenantId ?? '',
-    })
     setShowCreateForm(true)
   }
 
@@ -161,29 +110,11 @@ export function TopicManagement({
     }
   }
 
-  const handleDelete = async (id: string) => {
-    if (
-      confirm(
-        'Are you sure you want to delete this topic? This will also delete all posts in this topic.',
-      )
-    ) {
-      try {
-        await onDeleteTopic(id)
-      } catch (error) {
-        console.error('Error deleting topic:', error)
-      }
-    }
-  }
-
   const getCategoryName = (categoryId: string) => {
     const category = categories.find((c) => c.id === categoryId)
     return category ? category.name : 'Unknown Category'
   }
 
-  const formatDate = (value: string | Date) => {
-    return showDbDateAsIs(typeof value === 'string' ? value : value.toISOString())
-  }
-
   const topicInitialValues = {
     title: '',
     content: '',
@@ -357,7 +288,7 @@ export function TopicManagement({
           </div>
         ) : (
           <div className="divide-y divide-gray-200 dark:divide-gray-800">
-            {topics
+            {[...topics]
               .sort(
                 (a, b) => new Date(b.creationTime).getTime() - new Date(a.creationTime).getTime(),
               )
@@ -391,7 +322,7 @@ export function TopicManagement({
                         <div className="flex items-center space-x-4">
                           <span className="font-medium">{getCategoryName(topic.categoryId)}</span>
                           <span>by {topic.authorName}</span>
-                          <span>{formatDate(topic.creationTime)}</span>
+                          <span>{formatForumDate(topic.creationTime)}</span>
                         </div>
                         <div className="flex items-center space-x-4">
                           <div className="flex items-center space-x-1">
diff --git a/ui/src/views/forum/forum/ForumCategoryCard.tsx b/ui/src/views/forum/forum/ForumCategoryCard.tsx
index 8bc1ec5..174f8cd 100644
--- a/ui/src/views/forum/forum/ForumCategoryCard.tsx
+++ b/ui/src/views/forum/forum/ForumCategoryCard.tsx
@@ -1,5 +1,6 @@
-import { FaComment, FaLock, FaArrowUp } from 'react-icons/fa';
+import { FaComment, FaLock, FaArrowUp } from 'react-icons/fa'
 import { ForumCategory } from '@/proxy/forum/forum'
+import { formatForumRelativeDate } from './utils'
 
 interface CategoryCardProps {
   category: ForumCategory
@@ -7,20 +8,6 @@ interface CategoryCardProps {
 }
 
 export function ForumCategoryCard({ category, onClick }: CategoryCardProps) {
-  const formatDate = (dateString?: string) => {
-    if (!dateString) return 'Never'
-
-    const date = new Date(dateString)
-    const now = new Date()
-
-    // Zaman farkını doğru hesapla
-    const diffTime = date.getTime() - now.getTime()
-    const diffDays = Math.round(diffTime / (1000 * 60 * 60 * 24))
-
-    // Intl.RelativeTimeFormat doğru yönle çalışır
-    return new Intl.RelativeTimeFormat('en', { numeric: 'auto' }).format(diffDays, 'day')
-  }
-
   return (
     <div
       onClick={onClick}
@@ -51,7 +38,9 @@ export function ForumCategoryCard({ category, onClick }: CategoryCardProps) {
         </div>
         <div className="text-right text-sm text-gray-500 dark:text-gray-400 ml-4">
           <div>Last post</div>
-          <div className="font-medium text-gray-700 dark:text-gray-200">{formatDate(category.lastPostDate)}</div>
+          <div className="font-medium text-gray-700 dark:text-gray-200">
+            {formatForumRelativeDate(category.lastPostDate)}
+          </div>
         </div>
       </div>
     </div>
diff --git a/ui/src/views/forum/forum/ForumPostCard.tsx b/ui/src/views/forum/forum/ForumPostCard.tsx
index 42b106e..0a9b068 100644
--- a/ui/src/views/forum/forum/ForumPostCard.tsx
+++ b/ui/src/views/forum/forum/ForumPostCard.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
 import { FaHeart, FaCheckCircle, FaReply } from 'react-icons/fa'
 import { ForumPost } from '@/proxy/forum/forum'
 import { AVATAR_URL } from '@/constants/app.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
-import { showDbDateAsIs } from '@/utils/dateUtils'
 import { Button } from '@/components/ui'
+import { formatForumDate } from './utils'
 
 interface PostCardProps {
   post: ForumPost
@@ -22,9 +21,6 @@ export function ForumPostCard({
   isLiked = false,
 }: PostCardProps) {
   const { translate } = useLocalization()
-  const formatDate = (value: string | Date) => {
-    return showDbDateAsIs(typeof value === 'string' ? value : value.toISOString())
-  }
 
   return (
     <div
@@ -54,7 +50,9 @@ export function ForumPostCard({
                 </div>
               )}
             </div>
-            <span className="text-sm text-gray-500 dark:text-gray-400">{formatDate(post.creationTime)}</span>
+            <span className="text-sm text-gray-500 dark:text-gray-400">
+              {formatForumDate(post.creationTime)}
+            </span>
           </div>
 
           <div className="prose prose-sm max-w-none mb-4">
diff --git a/ui/src/views/forum/forum/ForumTopicCard.tsx b/ui/src/views/forum/forum/ForumTopicCard.tsx
index e85d0c9..eeec9c3 100644
--- a/ui/src/views/forum/forum/ForumTopicCard.tsx
+++ b/ui/src/views/forum/forum/ForumTopicCard.tsx
@@ -1,7 +1,8 @@
-import { FaComment, FaHeart, FaEye, FaThumbtack, FaLock, FaCheckCircle } from 'react-icons/fa';
+import { FaComment, FaHeart, FaEye, FaThumbtack, FaLock, FaCheckCircle } from 'react-icons/fa'
 import { ForumTopic } from '@/proxy/forum/forum'
 import { AVATAR_URL } from '@/constants/app.constant'
 import { useLocalization } from '@/utils/hooks/useLocalization'
+import { formatForumRelativeDate } from './utils'
 
 interface TopicCardProps {
   topic: ForumTopic
@@ -10,19 +11,6 @@ interface TopicCardProps {
 
 export function ForumTopicCard({ topic, onClick }: TopicCardProps) {
   const { translate } = useLocalization()
-  const formatDate = (dateString?: string) => {
-    if (!dateString) return 'Never'
-
-    const date = new Date(dateString)
-    const now = new Date()
-
-    // Zaman farkını doğru hesapla
-    const diffTime = date.getTime() - now.getTime()
-    const diffDays = Math.round(diffTime / (1000 * 60 * 60 * 24))
-
-    // Intl.RelativeTimeFormat doğru yönle çalışır
-    return new Intl.RelativeTimeFormat('en', { numeric: 'auto' }).format(diffDays, 'day')
-  }
 
   return (
     <div
@@ -71,7 +59,9 @@ export function ForumTopicCard({ topic, onClick }: TopicCardProps) {
             className="w-10 h-10 rounded-full border"
           />
           <div className="text-sm font-medium text-gray-700 dark:text-gray-200">{topic.authorName}</div>
-          <div className="text-xs text-gray-500 dark:text-gray-400">{formatDate(topic.creationTime)}</div>
+          <div className="text-xs text-gray-500 dark:text-gray-400">
+            {formatForumRelativeDate(topic.creationTime)}
+          </div>
         </div>
       </div>
 
@@ -82,7 +72,7 @@ export function ForumTopicCard({ topic, onClick }: TopicCardProps) {
               {translate('::App.Forum.TopicManagement.Lastreplyby')}{' '}
               <span className="font-medium text-gray-700 dark:text-gray-200">{topic.lastPostUserName}</span>
               {' '}
-              <span>{formatDate(topic.lastPostDate)}</span>
+              <span>{formatForumRelativeDate(topic.lastPostDate)}</span>
             </span>
           </div>
         </div>
diff --git a/ui/src/views/forum/forum/ForumView.tsx b/ui/src/views/forum/forum/ForumView.tsx
index c74721c..7243dc2 100644
--- a/ui/src/views/forum/forum/ForumView.tsx
+++ b/ui/src/views/forum/forum/ForumView.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import { FaArrowLeft, FaPlus, FaSpinner, FaSearch } from 'react-icons/fa'
 import { CreateTopicModal } from './CreateTopicModal'
 import { CreatePostModal } from './CreatePostModal'
@@ -34,8 +34,6 @@ interface ForumViewProps {
   }) => Promise<void>
   onLikePost: (id: string) => Promise<void>
   onUnlikePost: (id: string) => Promise<void>
-  currentUserId: string
-  currentUserName: string
   selectedCategory?: ForumCategory | null
   selectedTopic?: ForumTopic | null
   viewState?: 'categories' | 'topics' | 'posts'
@@ -161,28 +159,6 @@ export function ForumView({
     }
   }
 
-  const handleBack = () => {
-    if (viewState === 'posts') {
-      onTopicSelect?.(null) // 🔧 seçili topic'i temizle
-      if (onViewStateChange) {
-        onViewStateChange('topics')
-      } else {
-        setLocalViewState('topics')
-        setLocalSelectedTopic(null) // 🔧 local state için de temizle
-      }
-    } else if (viewState === 'topics') {
-      onCategorySelect?.(null) // 🔧 seçili category'yi temizle
-      onTopicSelect?.(null) // 🔧 topic'i de temizlik amaçlı sıfırla
-      if (onViewStateChange) {
-        onViewStateChange('categories')
-      } else {
-        setLocalViewState('categories')
-        setLocalSelectedCategory(null)
-        setLocalSelectedTopic(null)
-      }
-    }
-  }
-
   const handleBreadcrumbClick = (target: 'forum' | 'category') => {
     if (target === 'forum') {
       onViewStateChange?.('categories')
@@ -260,12 +236,19 @@ export function ForumView({
       const isLiked = likedPosts.has(postId)
 
       if (isLiked) {
-        isFirst ? await forumService.unlikeTopic(postId) : await onUnlikePost(postId)
+        if (isFirst) {
+          await forumService.unlikeTopic(postId)
+        } else {
+          await onUnlikePost(postId)
+        }
       } else {
-        isFirst ? await forumService.likeTopic(postId) : await onLikePost(postId)
+        if (isFirst) {
+          await forumService.likeTopic(postId)
+        } else {
+          await onLikePost(postId)
+        }
       }
 
-      // 🔁 toggle liked state
       setLikedPosts((prev) => {
         const updated = new Set(prev)
         if (isLiked) updated.delete(postId)
@@ -401,7 +384,7 @@ export function ForumView({
         <div className="space-y-3">
           <div>
             <div className="space-y-4">
-              {categories
+              {[...categories]
                 .filter((cat) => cat.isActive)
                 .sort((a, b) => a.displayOrder - b.displayOrder)
                 .map((category) => (
@@ -422,7 +405,7 @@ export function ForumView({
           <div>
             <h2 className="text-2xl font-bold text-gray-900 mb-6">{selectedCategory.name}</h2>
             <div className="space-y-4">
-              {filteredTopics
+              {[...filteredTopics]
                 .sort((a, b) => {
                   if (a.isPinned && !b.isPinned) return -1
                   if (!a.isPinned && b.isPinned) return 1
diff --git a/ui/src/views/forum/forum/SearchModal.tsx b/ui/src/views/forum/forum/SearchModal.tsx
index 26e5fb5..d3e657c 100644
--- a/ui/src/views/forum/forum/SearchModal.tsx
+++ b/ui/src/views/forum/forum/SearchModal.tsx
@@ -1,9 +1,9 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect, type KeyboardEvent } from 'react'
 import { FaTimes, FaSearch, FaFolder, FaRegComment, FaFileAlt } from 'react-icons/fa'
 import { ForumCategory, ForumPost, ForumTopic } from '@/proxy/forum/forum'
-import { showDbDateAsIs } from '@/utils/dateUtils'
 import { useForumSearch } from '@/utils/hooks/useForumSearch'
 import Button from '@/components/ui/Button'
+import { formatForumDate } from './utils'
 
 interface SearchModalProps {
   isOpen: boolean
@@ -26,7 +26,7 @@ export function SearchModal({
   onTopicSelect,
   onPostSelect,
 }: SearchModalProps) {
-  const { searchQuery, setSearchQuery, searchResults, clearSearch, hasResults } = useForumSearch({
+  const { searchQuery, setSearchQuery, searchResults, hasResults } = useForumSearch({
     categories,
     topics,
     posts,
@@ -40,10 +40,15 @@ export function SearchModal({
     }
   }, [isOpen, searchResults])
 
-  const handleKeyDown = (e: React.KeyboardEvent) => {
+  const handleKeyDown = (e: KeyboardEvent) => {
     const totalResults =
       searchResults.categories.length + searchResults.topics.length + searchResults.posts.length
 
+    if (totalResults === 0 && ['ArrowDown', 'ArrowUp', 'Enter'].includes(e.key)) {
+      e.preventDefault()
+      return
+    }
+
     if (e.key === 'ArrowDown') {
       e.preventDefault()
       setSelectedIndex((prev) => (prev + 1) % totalResults)
@@ -85,10 +90,6 @@ export function SearchModal({
     }
   }
 
-  const formatDate = (value: string | Date) => {
-    return showDbDateAsIs(typeof value === 'string' ? value : value.toISOString())
-  }
-
   const getTopicTitle = (topicId: string) => {
     const topic = topics.find((t) => t.id === topicId)
     return topic ? topic.title : 'Unknown Topic'
@@ -127,7 +128,7 @@ export function SearchModal({
             </div>
           ) : !hasResults ? (
             <div className="p-8 text-center text-gray-500 dark:text-gray-400">
-              <p>No results found for "{searchQuery}"</p>
+              <p>No results found for {searchQuery}</p>
             </div>
           ) : (
             <div className="py-2">
@@ -209,7 +210,7 @@ export function SearchModal({
                               {topic.title}
                             </div>
                             <div className="text-sm text-gray-500 dark:text-gray-400">
-                              by {topic.authorName} • {formatDate(topic.creationTime)}
+                              by {topic.authorName} • {formatForumDate(topic.creationTime)}
                             </div>
                           </div>
                         </div>
@@ -261,7 +262,7 @@ export function SearchModal({
                               dangerouslySetInnerHTML={{ __html: post.content }}
                             ></div>
                             <div className="text-xs text-gray-500 mt-1">
-                              by {post.authorName} • {formatDate(post.creationTime)}
+                              by {post.authorName} • {formatForumDate(post.creationTime)}
                             </div>
                           </div>
                         </div>
diff --git a/ui/src/views/forum/forum/utils.tsx b/ui/src/views/forum/forum/utils.tsx
index 054822d..5460333 100644
--- a/ui/src/views/forum/forum/utils.tsx
+++ b/ui/src/views/forum/forum/utils.tsx
@@ -1,16 +1,15 @@
 import { ForumPost } from '@/proxy/forum/forum'
+import { showDbDateAsIs } from '@/utils/dateUtils'
 
 export function buildPostTree(posts: ForumPost[]): ForumPost[] {
   const postMap = new Map<string, ForumPost>()
 
-  // 1. Her post için children array'i eklenmiş yeni bir nesne oluştur
   posts.forEach((post) => {
     postMap.set(post.id, { ...post, children: [] })
   })
 
   const roots: ForumPost[] = []
 
-  // 2. Her post'un parent'ı varsa ilgili parent'ın children listesine ekle
   postMap.forEach((post) => {
     if (post.parentPostId && postMap.has(post.parentPostId)) {
       postMap.get(post.parentPostId)!.children.push(post)
@@ -21,3 +20,16 @@ export function buildPostTree(posts: ForumPost[]): ForumPost[] {
 
   return roots
 }
+
+export function formatForumDate(value: string | Date) {
+  return showDbDateAsIs(typeof value === 'string' ? value : value.toISOString())
+}
+
+export function formatForumRelativeDate(dateString?: string) {
+  if (!dateString) return 'Never'
+
+  const diffTime = new Date(dateString).getTime() - Date.now()
+  const diffDays = Math.round(diffTime / (1000 * 60 * 60 * 24))
+
+  return new Intl.RelativeTimeFormat('en', { numeric: 'auto' }).format(diffDays, 'day')
+}
diff --git a/ui/src/views/intranet/widgets/Surveys.tsx b/ui/src/views/intranet/widgets/Surveys.tsx
index e2aea6e..94acc6d 100644
--- a/ui/src/views/intranet/widgets/Surveys.tsx
+++ b/ui/src/views/intranet/widgets/Surveys.tsx
@@ -30,7 +30,7 @@ const Surveys: React.FC<SurveysProps> = ({ surveys, onTakeSurvey }) => {
       </div>
 
       <div className="p-3 space-y-4 bg-white dark:bg-gray-800">
-        {surveys?.map((survey, index) => {
+        {surveys?.map((survey) => {
           const daysLeft = dayjs(survey.deadline).diff(dayjs(), 'day')
           const urgency = daysLeft <= 3 ? 'urgent' : daysLeft <= 7 ? 'warning' : 'normal'
           const isCompleted = !!survey.myResponse
diff --git a/ui/src/views/list/Chart.tsx b/ui/src/views/list/Chart.tsx
index 475e60a..424a6cc 100644
--- a/ui/src/views/list/Chart.tsx
+++ b/ui/src/views/list/Chart.tsx
@@ -46,7 +46,7 @@ type LookupDisplayValues = Record<string, Map<string, string>>
 const Chart = (props: ChartProps) => {
   // State UserId güncellemesi için
   const { userName } = useStoreState((s) => s.auth.user)
-  const { id, listFormCode, filter, isSubForm, level, gridDto, refreshGridDto } = props
+  const { id, listFormCode, isSubForm, gridDto, refreshGridDto } = props
   const { translate } = useLocalization()
   const { checkPermission } = usePermission()
   const isPwaMode = usePWA()
@@ -102,8 +102,6 @@ const Chart = (props: ChartProps) => {
     searchParams ? new URLSearchParams(searchParams) : new URLSearchParams(),
   )
 
-  const [allSeries, setAllSeries] = useState<ChartSeriesDto[]>([])
-
   const lookupColumns = useMemo<GridColumnData[]>(
     () =>
       gridDto?.columnFormats
@@ -137,8 +135,6 @@ const Chart = (props: ChartProps) => {
       const initialSeries = gridDto.gridOptions.seriesDto.map((s, index) => ({ ...s, index }))
       const userSeriesData = initialSeries.filter((s) => s.userId === userName)
 
-      setAllSeries(initialSeries)
-
       // Kullanıcının serisi varsa onu kullan, yoksa tüm serileri kullan
       const seriesToUse = userSeriesData.length > 0 ? userSeriesData : initialSeries
 
diff --git a/ui/src/views/list/ChartDrawer.tsx b/ui/src/views/list/ChartDrawer.tsx
index 863cafe..93f6513 100644
--- a/ui/src/views/list/ChartDrawer.tsx
+++ b/ui/src/views/list/ChartDrawer.tsx
@@ -22,6 +22,22 @@ interface ChartDrawerProps {
   onPreviewChange: (series: ChartSeriesDto[]) => void
 }
 
+interface PreviewUpdaterProps {
+  series: ChartSeriesDto[]
+  onPreviewChange: (series: ChartSeriesDto[]) => void
+}
+
+const PreviewUpdater = ({ series, onPreviewChange }: PreviewUpdaterProps) => {
+  useEffect(() => {
+    const validSeries = series.filter((s) => s.argumentField && s.valueField && s.summaryType)
+    if (validSeries.length > 0) {
+      onPreviewChange(validSeries)
+    }
+  }, [onPreviewChange, series])
+
+  return null
+}
+
 const ChartDrawer = ({
   open,
   onClose,
@@ -126,18 +142,10 @@ const ChartDrawer = ({
           }}
         >
           {({ setFieldValue, values, isSubmitting }) => {
-            // Preview'ı her değişiklikte otomatik güncelle
-            useEffect(() => {
-              const validSeries = values.series.filter(
-                (s) => s.argumentField && s.valueField && s.summaryType,
-              )
-              if (validSeries.length > 0) {
-                onPreviewChange(validSeries)
-              }
-            }, [values.series])
-
             return (
               <Form className="flex flex-col h-full">
+                <PreviewUpdater series={values.series} onPreviewChange={onPreviewChange} />
+
                 {/* Header */}
                 <div className="flex items-center justify-between p-4 border-b border-gray-200 bg-gray-50 dark:border-gray-700 dark:bg-gray-800">
                   <h2 className="text-lg font-semibold flex items-center gap-2 text-gray-900 dark:text-gray-100">
diff --git a/ui/src/views/list/GanttView.tsx b/ui/src/views/list/GanttView.tsx
index 60fc791..56bbb4d 100644
--- a/ui/src/views/list/GanttView.tsx
+++ b/ui/src/views/list/GanttView.tsx
@@ -1,6 +1,6 @@
 import Container from '@/components/shared/Container'
 import { APP_NAME, DX_CLASSNAMES } from '@/constants/app.constant'
-import { GridDto, SubFormTabTypeEnum } from '@/proxy/form/models'
+import { GridDto } from '@/proxy/form/models'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import Gantt, {
   Column,
@@ -30,7 +30,6 @@ import CustomStore from 'devextreme/data/custom_store'
 import { GridColumnData } from './GridColumnData'
 import { Loading } from '@/components/shared'
 import { usePermission } from '@/utils/hooks/usePermission'
-import SubForms from '../form/SubForms'
 
 interface GanttViewProps {
   listFormCode: string
@@ -42,7 +41,7 @@ interface GanttViewProps {
 }
 
 const GanttView = (props: GanttViewProps) => {
-  const { listFormCode, searchParams, isSubForm, level, gridDto: extGridDto } = props
+  const { listFormCode, searchParams, isSubForm, gridDto: extGridDto } = props
   const { translate } = useLocalization()
   const isPwaMode = usePWA()
 
diff --git a/ui/src/views/list/List.tsx b/ui/src/views/list/List.tsx
index c915997..a5e875f 100644
--- a/ui/src/views/list/List.tsx
+++ b/ui/src/views/list/List.tsx
@@ -279,7 +279,7 @@ const List: React.FC = () => {
 
         {viewMode === 'chart' && (
           <Chart
-            id={gridDto?.gridOptions.id!}
+            id={gridDto?.gridOptions.id as string}
             listFormCode={listFormCode}
             filter={searchParams.toString()}
             isSubForm={true}
diff --git a/ui/src/views/list/Pivot.tsx b/ui/src/views/list/Pivot.tsx
index b2ace53..d769313 100644
--- a/ui/src/views/list/Pivot.tsx
+++ b/ui/src/views/list/Pivot.tsx
@@ -30,7 +30,6 @@ import {
   pivotFieldConvertDataType,
   setGridPanelColor,
 } from './Utils'
-import { useFilters } from './useFilters'
 import WidgetGroup from '@/components/common/WidgetGroup'
 import { Notification, toast } from '@/components/ui'
 import { usePermission } from '@/utils/hooks/usePermission'
@@ -58,7 +57,7 @@ const statedGridPanelColor = 'rgba(50, 200, 200, 0.5)' // kullanici tanimli grid
 type LookupDisplayValues = Record<string, Map<string, string>>
 
 const Pivot = (props: PivotProps) => {
-  const { listFormCode, searchParams, isSubForm, level, gridDto } = props
+  const { listFormCode, searchParams, isSubForm, gridDto } = props
   const { translate } = useLocalization()
   const { checkPermission } = usePermission()
   const isPwaMode = usePWA()
@@ -78,11 +77,6 @@ const Pivot = (props: PivotProps) => {
     return gridDto?.gridOptions.stateStoringDto?.storageKey ?? ''
   }, [gridDto?.gridOptions.stateStoringDto?.storageKey])
 
-  const { filterToolbarData, ...filterData } = useFilters({
-    gridDto,
-    gridRef,
-    listFormCode,
-  })
 
   const { createSelectDataSource } = useListFormCustomDataSource({ gridRef })
   const { getBandedColumns, loadLookupDisplayValues } = useListFormColumns({
@@ -147,25 +141,6 @@ const Pivot = (props: PivotProps) => {
     }
   }, [])
 
-  const moveAllFieldsToFilterArea = useCallback(() => {
-    const grid = gridRef.current?.instance()
-    if (!grid) return
-
-    const ds = grid.getDataSource()
-    if (!ds) return
-
-    const fields = ds.fields()
-
-    fields.forEach((field: any) => {
-      field.area = 'filter' // tüm alanları filtre alanına taşı
-      field.areaIndex = undefined
-    })
-
-    ds.fields(fields)
-    ds.reload() // PivotGrid’i yeniden yükle
-    grid.repaint() // UI güncelle
-  }, [])
-
   const resetPivotGridState = useCallback(async () => {
     const grid = gridRef.current?.instance()
     if (grid) {
diff --git a/ui/src/views/list/SchedulerView.tsx b/ui/src/views/list/SchedulerView.tsx
index 36f6ba4..f20de1a 100644
--- a/ui/src/views/list/SchedulerView.tsx
+++ b/ui/src/views/list/SchedulerView.tsx
@@ -5,6 +5,7 @@ import {
   GridDto,
   PlatformEditorTypes,
   UiLookupDataSourceTypeEnum,
+  EditingFormItemDto
 } from '@/proxy/form/models'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import Scheduler, {
@@ -27,7 +28,6 @@ import { usePWA } from '@/utils/hooks/usePWA'
 import CustomStore from 'devextreme/data/custom_store'
 import { Loading } from '@/components/shared'
 import { usePermission } from '@/utils/hooks/usePermission'
-import { EditingFormItemDto } from '@/proxy/form/models'
 import { RowMode, SimpleItemWithColData } from '../form/types'
 import { captionize } from 'devextreme/core/utils/inflector'
 import { AppointmentFormOpeningEvent } from 'devextreme/ui/scheduler'
diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx
index ae5f41f..f9df011 100644
--- a/ui/src/views/list/Tree.tsx
+++ b/ui/src/views/list/Tree.tsx
@@ -582,7 +582,7 @@ const Tree = (props: TreeProps) => {
       useMobileEditPopup || (gridDto?.gridOptions.editingOptionDto?.popup?.fullScreen ?? false),
     )
 
-    for (const colFormat of gridDto?.columnFormats) {
+    for (const colFormat of gridDto?.columnFormats ?? []) {
       if (!colFormat.fieldName) {
         continue
       }
@@ -631,7 +631,8 @@ const Tree = (props: TreeProps) => {
             case 'object':
               try {
                 e.data[colFormat.fieldName] = JSON.parse(val)
-              } catch {}
+              } 
+            catch {}
               break
             default:
               e.data[colFormat.fieldName] = val
diff --git a/ui/src/views/list/editors/ImageUploadEditorComponent.tsx b/ui/src/views/list/editors/ImageUploadEditorComponent.tsx
index 331cb79..838ee92 100644
--- a/ui/src/views/list/editors/ImageUploadEditorComponent.tsx
+++ b/ui/src/views/list/editors/ImageUploadEditorComponent.tsx
@@ -1,4 +1,5 @@
-import { ReactElement, useRef, useState } from 'react'
+import type { ReactElement } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { FaSpinner, FaUpload } from 'react-icons/fa'
 import { Button } from '@/components/ui'
 import {
@@ -7,43 +8,105 @@ import {
   showImageHoverPreview,
 } from '../../form/editors/imageHoverPreview'
 
+type ImageUploadOptions = {
+  accept?: string
+  fileFieldName?: string
+  height?: number | string
+  multiple?: boolean | string
+  uploadUrl?: string
+  width?: number | string
+}
+
+const parseJsonObject = (value: unknown) => {
+  if (!value) return undefined
+  if (typeof value === 'object' && !Array.isArray(value)) return value as Record<string, unknown>
+  if (typeof value !== 'string') return undefined
+
+  try {
+    const parsed = JSON.parse(value)
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+      ? (parsed as Record<string, unknown>)
+      : undefined
+  } catch {
+    return undefined
+  }
+}
+
+const normalizeImageValue = (value: unknown): string[] => {
+  if (!value) return []
+  if (Array.isArray(value)) return value.flatMap(normalizeImageValue)
+
+  if (typeof value === 'string') {
+    const trimmed = value.trim()
+    if (!trimmed) return []
+
+    if (trimmed.startsWith('[')) {
+      try {
+        const parsed = JSON.parse(trimmed)
+        if (Array.isArray(parsed)) return parsed.flatMap(normalizeImageValue)
+      } catch {
+        return [trimmed]
+      }
+    }
+
+    return [trimmed]
+  }
+
+  return [String(value)].filter(Boolean)
+}
+
+const normalizeSize = (value: unknown, fallback: number) => {
+  const size = Number(value)
+  return Number.isFinite(size) && size > 0 ? size : fallback
+}
+
+const resolveOptions = (column: any): ImageUploadOptions => {
+  const configuredOptions = column?.extras?.imageUploadOptions
+  if (configuredOptions && Object.keys(configuredOptions).length > 0) {
+    return configuredOptions
+  }
+
+  const parsedOptions = parseJsonObject(column?.extras?.editorOptions ?? column?.editorOptions)
+  return parsedOptions ?? {}
+}
+
+const resolveUploadedUrl = (data: unknown) => {
+  if (typeof data === 'string') return data
+  if (!data || typeof data !== 'object') return ''
+
+  const record = data as Record<string, unknown>
+  return String(record.url ?? record.fileUrl ?? record.path ?? '').trim()
+}
+
+const toBase64 = (file: File): Promise<string> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => resolve(reader.result as string)
+    reader.onerror = reject
+    reader.readAsDataURL(file)
+  })
+
 const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
   const col = cellElement.column
+  const [uploading, setUploading] = useState(false)
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [urls, setUrls] = useState<string[]>(() => normalizeImageValue(cellElement.value))
+
+  useEffect(() => {
+    setUrls(normalizeImageValue(cellElement.value))
+  }, [cellElement.value])
+
+  const options = useMemo(() => resolveOptions(col), [col])
+
   if (!col) {
     return <></>
   }
 
-  // options: önce column.extras.imageUploadOptions, yoksa editorOptions JSON'undan parse et
-  let options: any = col.extras?.imageUploadOptions
-  if (!options || Object.keys(options).length === 0) {
-    try {
-      const raw = col.extras?.editorOptions ?? col.editorOptions
-      if (raw) {
-        const parsed = typeof raw === 'string' ? JSON.parse(raw) : raw
-        options = parsed
-      }
-    } catch {
-      // ignore
-    }
-  }
-  options = options ?? {}
   // JSON'dan string olarak gelebilir: "true" / "false"
   const isMultiple: boolean = options.multiple === true || options.multiple === 'true'
 
-  const [uploading, setUploading] = useState(false)
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  const thumbW: number = options.width ?? 40
-  const thumbH: number = options.height ?? 40
-
-  const currentValue = cellElement.value
-  const initialUrls: string[] = currentValue
-    ? Array.isArray(currentValue)
-      ? currentValue.filter(Boolean)
-      : [currentValue].filter(Boolean)
-    : []
-
-  const [urls, setUrls] = useState<string[]>(initialUrls)
+  const thumbW = normalizeSize(options.width, 40)
+  const thumbH = normalizeSize(options.height, 40)
 
   const removeImage = (index: number) => {
     const newUrls = urls.filter((_, i) => i !== index)
@@ -55,14 +118,6 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
     }
   }
 
-  const toBase64 = (file: File): Promise<string> =>
-    new Promise((resolve, reject) => {
-      const reader = new FileReader()
-      reader.onload = () => resolve(reader.result as string)
-      reader.onerror = reject
-      reader.readAsDataURL(file)
-    })
-
   const handleFiles = async (files: FileList | null) => {
     if (!files?.length) return
 
@@ -79,7 +134,7 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
           const res = await fetch(options.uploadUrl, { method: 'POST', body: formData })
           if (!res.ok) throw new Error(`Upload failed: ${res.status}`)
           const data = await res.json()
-          const url: string = data?.url ?? data?.fileUrl ?? data?.path ?? data
+          const url = resolveUploadedUrl(data)
           uploadedUrls.push(url)
         } else {
           // uploadUrl yapılandırılmamışsa base64 olarak sakla
@@ -107,10 +162,6 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
           <img
             src={url}
             alt=""
-            onMouseEnter={(event) => showImageHoverPreview(url, event)}
-            onMouseMove={(event) => showImageHoverPreview(url, event)}
-            onMouseLeave={hideImageHoverPreview}
-            onClick={() => openImageInNewTab(url)}
             style={{
               width: thumbW,
               height: thumbH,
@@ -119,11 +170,14 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
               border: '1px solid #ddd',
               cursor: 'zoom-in',
             }}
+            onMouseEnter={(event) => showImageHoverPreview(url, event)}
+            onMouseMove={(event) => showImageHoverPreview(url, event)}
+            onMouseLeave={hideImageHoverPreview}
+            onClick={() => openImageInNewTab(url)}
           />
           <Button
             type="button"
             title="Sil"
-            onClick={() => removeImage(i)}
             variant="plain"
             shape="circle"
             className="!absolute !h-[18px] !w-[18px] !bg-red-600 !p-0 !text-[11px] !text-white hover:!bg-red-700 active:!bg-red-800"
@@ -143,6 +197,7 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
               padding: 0,
               textAlign: 'center',
             }}
+            onClick={() => removeImage(i)}
           >
             ×
           </Button>
@@ -161,7 +216,6 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
         type="button"
         title="Görsel Yükle"
         disabled={uploading}
-        onClick={() => inputRef.current?.click()}
         variant="solid"
         shape="none"
         className="!h-auto !rounded !px-2.5 !py-1 !text-[13px]"
@@ -177,6 +231,7 @@ const ImageUploadEditorComponent = (cellElement: any): ReactElement => {
           alignItems: 'center',
           gap: 4,
         }}
+        onClick={() => inputRef.current?.click()}
       >
         {uploading ? (
           <FaSpinner style={{ fontSize: 14 }} className="spin" />
diff --git a/ui/src/views/list/useFilters.tsx b/ui/src/views/list/useFilters.tsx
index ed246f8..e9c1aef 100644
--- a/ui/src/views/list/useFilters.tsx
+++ b/ui/src/views/list/useFilters.tsx
@@ -57,10 +57,6 @@ const isTreeList = (grid: GridInstance): grid is dxTreeList => {
   return 'getRootNode' in grid
 }
 
-const isGantt = (grid: GridInstance): grid is dxGantt => {
-  return 'getTaskData' in grid
-}
-
 const supportsState = (grid: GridInstance): grid is dxDataGrid | dxTreeList => {
   return 'state' in grid && typeof (grid as any).state === 'function'
 }
@@ -340,7 +336,7 @@ const useFilters = ({
   const [isPermissionUsersModalOpen, setIsPermissionUsersModalOpen] = useState(false)
 
   const filteredGridPanelColor = 'rgba(10, 200, 10, 0.5)' // kullanici tanimli filtre ile filtrelenmis gridin paneline ait renk
-  const statedGridPanelColor = 'rgba(50, 200, 200, 0.5)' // kullanici tanimli gridState ile islem gormus gridin paneline ait renk
+  //const statedGridPanelColor = 'rgba(50, 200, 200, 0.5)' // kullanici tanimli gridState ile islem gormus gridin paneline ait renk
 
   const grdOpt = gridDto?.gridOptions
   const config = useStoreState((state) => state.abpConfig.config)
diff --git a/ui/src/views/list/useListFormColumns.ts b/ui/src/views/list/useListFormColumns.ts
index 73e4b2a..fa55386 100644
--- a/ui/src/views/list/useListFormColumns.ts
+++ b/ui/src/views/list/useListFormColumns.ts
@@ -9,7 +9,6 @@ import { usePWA } from '@/utils/hooks/usePWA'
 import { useDialogContext } from '../shared/DialogContext'
 import { dynamicFetch } from '@/services/form.service'
 import { GridColumnData } from './GridColumnData'
-import { useLocation } from 'react-router-dom'
 import {
   ColumnFormatDto,
   EditingFormItemDto,
@@ -381,7 +380,6 @@ const useListFormColumns = ({
   const { translate } = useLocalization()
   const { checkPermission } = usePermission()
   const isPwaMode = usePWA()
-  const location = useLocation()
 
   useEffect(() => {
     // listFormCode değişince lookup cache temizlensin (farklı form farklı lookuplar)
@@ -488,7 +486,7 @@ const useListFormColumns = ({
     store: new CustomStore({
       key,
       loadMode: 'raw',
-      load: async (loadOptions) => {
+      load: async () => {
         // load fonksiyonu sync sonuç döndürüyor olabilir, o yüzden Promise.resolve ile sar
         return cachedLoader(`static:${key}`, () => Promise.resolve(load()))
       },
@@ -504,7 +502,7 @@ const useListFormColumns = ({
   ) => {
     return new CustomStore({
       loadMode: 'raw',
-      load: async (loadOptions) => {
+      load: async () => {
         if (!isSubForm && listFormCode && !window.location.pathname.includes(listFormCode)) {
           return
         }
@@ -526,7 +524,7 @@ const useListFormColumns = ({
               ...a,
             }))
           })
-        } catch (error: any) {
+        } catch {
           return null
         }
       },
@@ -542,7 +540,7 @@ const useListFormColumns = ({
     return new CustomStore({
       key: keyName,
       loadMode: 'raw',
-      load: async (loadOptions) => {
+      load: async () => {
         if (!isSubForm && listFormCode && !window.location.pathname.includes(listFormCode)) {
           return
         }
@@ -713,7 +711,7 @@ const useListFormColumns = ({
             if (gridRef?.current?.instance()) {
               gridRef.current.instance().refresh()
             }
-          } catch (err) {
+          } catch {
             // Hata yönetimi
             alert(translate('::App.Platform.DuplicateError'))
           }
diff --git a/ui/src/views/list/useListFormCustomDataSource.ts b/ui/src/views/list/useListFormCustomDataSource.ts
index f37020c..db4aa7a 100644
--- a/ui/src/views/list/useListFormCustomDataSource.ts
+++ b/ui/src/views/list/useListFormCustomDataSource.ts
@@ -290,7 +290,7 @@ const useListFormCustomDataSource = ({
             }
                         
             return retValue
-          } catch (error: any) {
+          } catch {
             // toast.push(
             //   <Notification type="danger" duration={2000}>
             //     Select error
@@ -334,7 +334,7 @@ const useListFormCustomDataSource = ({
           try {
             const response = await dynamicFetch('list-form-select/select', 'GET', parameters)
             return response.data.totalCount
-          } catch (error: any) {
+          } catch {
             // toast.push(
             //   <Notification type="danger" duration={2000}>
             //     TotalCount error
@@ -357,7 +357,7 @@ const useListFormCustomDataSource = ({
           try {
             const response = await dynamicFetch('list-form-select/select', 'GET', parameters)
             return response.data.data[0]
-          } catch (error: any) {
+          } catch {
             // toast.push(
             //   <Notification type="danger" duration={2000}>
             //     ByKey error
diff --git a/ui/src/views/menu/MenuItemComponent.tsx b/ui/src/views/menu/MenuItemComponent.tsx
index ebbf1de..0535365 100644
--- a/ui/src/views/menu/MenuItemComponent.tsx
+++ b/ui/src/views/menu/MenuItemComponent.tsx
@@ -5,7 +5,6 @@ import { MenuItem } from '@/proxy/menus/menu'
 import { useLocalization } from '@/utils/hooks/useLocalization'
 import { MenuService } from '@/services/menu.service'
 import navigationIcon from '@/proxy/menus/navigation-icon.config'
-import { FaQuestionCircle } from 'react-icons/fa'
 import {
   Button,
   Dialog,
@@ -20,7 +19,7 @@ import {
 import { Field, FieldProps, Form, Formik } from 'formik'
 import { SelectBoxOption } from '@/types/shared'
 import * as Yup from 'yup'
-import { FaExternalLinkAlt, FaPlus, FaTrashAlt } from 'react-icons/fa'
+import { FaQuestionCircle, FaPlus, FaTrashAlt } from 'react-icons/fa'
 import { MenuDto } from '@/proxy/menus/models'
 
 interface MenuItemComponentProps {
@@ -256,6 +255,7 @@ export const MenuItemComponent: React.FC<MenuItemComponentProps> = ({
                 setIsModalOpen(false)
                 refetch()
               } catch (error) {
+                console.error('Failed to save menu item:', error)
                 toast.push(
                   <Notification title="Hata" type="danger">
                     {translate('::IslemBasarisiz')}
diff --git a/ui/src/views/menu/MenuManager.tsx b/ui/src/views/menu/MenuManager.tsx
index dbde9a5..ae82146 100644
--- a/ui/src/views/menu/MenuManager.tsx
+++ b/ui/src/views/menu/MenuManager.tsx
@@ -1,6 +1,5 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import { SortableMenuTree } from './SortableMenuTree'
-import { MenuItem } from '@/proxy/menus/menu'
 import { useMenuData } from '@/utils/hooks/useMenuData'
 import { FaRegBell, FaSpinner, FaBars, FaRegSave } from 'react-icons/fa'
 import { Container } from '@/components/shared'
@@ -15,40 +14,23 @@ export const MenuManager = () => {
   const [isSaving, setIsSaving] = useState(false)
   const { translate } = useLocalization()
 
-  const [saveMessage, setSaveMessage] = useState<{
-    type: 'success' | 'error'
-    text: string
-  } | null>(null)
-
-  const handleMenuChange = (updatedItems: MenuItem[]) => {
-    setMenuItems(updatedItems)
-  }
-
   const handleSave = async () => {
     if (!isDesignMode) return
 
     try {
       setIsSaving(true)
-      setSaveMessage(null)
 
       await saveMenuData(menuItems)
-      setSaveMessage({ type: 'success', text: 'Menu configuration saved successfully!' })
-      setTimeout(() => setSaveMessage(null), 3000)
       setIsDesignMode(false)
     } catch (err) {
-      setSaveMessage({
-        type: 'error',
-        text: err instanceof Error ? err.message : 'Failed to save menu configuration',
-      })
-      setTimeout(() => setSaveMessage(null), 5000)
+      console.error('Failed to save menu configuration:', err)
     } finally {
       setIsSaving(false)
     }
   }
 
   const handleToggleDesignMode = () => {
-    setIsDesignMode(!isDesignMode)
-    setSaveMessage(null)
+    setIsDesignMode((current) => !current)
   }
 
   if (loading) {
@@ -72,10 +54,10 @@ export const MenuManager = () => {
           </div>
           <p className="text-gray-600 dark:text-gray-300 mb-6">{error}</p>
           <Button
-            onClick={refetch}
             block
             variant="solid"
             className="!rounded-lg !py-2 hover:!bg-blue-700 dark:bg-blue-700 dark:hover:!bg-blue-800 transition-colors"
+            onClick={refetch}
           >
             Retry
           </Button>
@@ -90,7 +72,7 @@ export const MenuManager = () => {
         titleTemplate={`%s | ${APP_NAME}`}
         title={translate('::' + 'App.Menus.Manager')}
         defaultTitle={APP_NAME}
-      ></Helmet>
+      />
 
       <div className="bg-white dark:bg-gray-800 rounded px-2 sm:px-2 lg:px-3 py-3">
         <div className="flex items-center justify-between mb-2 flex-wrap gap-4">
@@ -114,13 +96,13 @@ export const MenuManager = () => {
                 Design Mode
               </span>
               <Button
-                onClick={handleToggleDesignMode}
                 variant="plain"
                 shape="none"
                 className={`
           relative !inline-flex !h-6 !w-11 !min-w-11 !justify-start !rounded-full !border-0 !px-0 !items-center transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2
           ${isDesignMode ? 'bg-blue-600 hover:!bg-blue-600 dark:bg-blue-700 dark:hover:!bg-blue-700' : 'bg-gray-200 hover:!bg-gray-200 dark:bg-gray-700 dark:hover:!bg-gray-700'}
         `}
+                onClick={handleToggleDesignMode}
               >
                 <span
                   className={`
@@ -131,40 +113,38 @@ export const MenuManager = () => {
               </Button>
             </div>
 
-            {
-              <Button
-                onClick={handleSave}
-                disabled={!isDesignMode || isSaving}
-                size="sm"
-                variant="solid"
-                className={`
+            <Button
+              disabled={!isDesignMode || isSaving}
+              size="sm"
+              variant="solid"
+              className={`
                               !inline-flex !h-auto !items-center !justify-center gap-2 !rounded-lg !px-2 !py-1 transition-colors
                               ${isDesignMode ? 'text-white' : 'cursor-not-allowed'}
                               ${isSaving ? 'opacity-50' : ''}
                             `}
-              >
-                {isSaving ? (
-                  <>
-                    <FaSpinner size={10} className="animate-spin" />
-                    {translate('::Saving')}
-                  </>
-                ) : (
-                  <>
-                    <FaRegSave size={10} />
-                    {translate('::App.SaveChanges')}
-                  </>
-                )}
-              </Button>
-            }
+              onClick={handleSave}
+            >
+              {isSaving ? (
+                <>
+                  <FaSpinner size={10} className="animate-spin" />
+                  {translate('::Saving')}
+                </>
+              ) : (
+                <>
+                  <FaRegSave size={10} />
+                  {translate('::App.SaveChanges')}
+                </>
+              )}
+            </Button>
           </div>
         </div>
 
         {menuItems.length > 0 ? (
           <SortableMenuTree
             items={menuItems}
-            onItemsChange={handleMenuChange}
             isDesignMode={isDesignMode}
             refetch={refetch}
+            onItemsChange={setMenuItems}
           />
         ) : (
           <div className="text-center py-12 text-gray-500 dark:text-gray-400">
diff --git a/ui/src/views/public/About.tsx b/ui/src/views/public/About.tsx
index 2d44e36..ea21c63 100644
--- a/ui/src/views/public/About.tsx
+++ b/ui/src/views/public/About.tsx
@@ -8,8 +8,7 @@ import { useLocalization } from '@/utils/hooks/useLocalization'
 import Loading from '@/components/shared/Loading'
 import { APP_NAME } from '@/constants/app.constant'
 import { Button, Notification, toast } from '@/components/ui'
-import { useStoreState } from '@/store'
-import { useStoreActions } from '@/store'
+import { useStoreState, useStoreActions } from '@/store'
 import DesignerDrawer from './designer/DesignerDrawer'
 import SelectableBlock from './designer/SelectableBlock'
 import { DesignerSelection } from './designer/types'
diff --git a/ui/src/views/public/Home.tsx b/ui/src/views/public/Home.tsx
index 7030e55..57f20d4 100644
--- a/ui/src/views/public/Home.tsx
+++ b/ui/src/views/public/Home.tsx
@@ -839,13 +839,13 @@ const Home: React.FC = () => {
         ctaButtonLabelValue: content.ctaButtonLabel,
         ctaButtonStyleKey: content.ctaButtonStyleKey,
         ctaButtonStyleValue: content.ctaButtonStyle,
-        slides: content.slides.map((slide, slideIndex) => ({
+        slides: content.slides.map((slide) => ({
           titleKey: slide.titleKey || '',
           titleValue: slide.title,
           subtitleKey: slide.subtitleKey || '',
           subtitleValue: slide.subtitle,
           styleClass: slide.styleClass,
-          services: slide.services.map((service, serviceIndex) => ({
+          services: slide.services.map((service) => ({
             icon: service.icon,
             titleKey: service.titleKey || '',
             titleValue: service.title,
@@ -854,7 +854,7 @@ const Home: React.FC = () => {
             styleClass: service.styleClass,
           })),
         })),
-        features: content.features.map((feature, index) => ({
+        features: content.features.map((feature) => ({
           icon: feature.icon,
           titleKey: feature.titleKey || '',
           titleValue: feature.title,
@@ -862,7 +862,7 @@ const Home: React.FC = () => {
           descriptionValue: feature.description,
           styleClass: feature.styleClass,
         })),
-        solutions: content.solutions.map((solution, index) => ({
+        solutions: content.solutions.map((solution) => ({
           icon: solution.icon,
           colorClass: solution.colorClass,
           titleKey: solution.titleKey || '',
diff --git a/ui/src/views/public/Services.tsx b/ui/src/views/public/Services.tsx
index 5a2581d..ab944bb 100644
--- a/ui/src/views/public/Services.tsx
+++ b/ui/src/views/public/Services.tsx
@@ -9,8 +9,7 @@ import { getServices, saveServicesPage } from '@/services/service.service'
 import navigationIcon from '@/proxy/menus/navigation-icon.config'
 import { Loading } from '@/components/shared'
 import { APP_NAME } from '@/constants/app.constant'
-import { useStoreState } from '@/store'
-import { useStoreActions } from '@/store'
+import { useStoreState, useStoreActions } from '@/store'
 import DesignerDrawer from './designer/DesignerDrawer'
 import SelectableBlock from './designer/SelectableBlock'
 import { DesignerSelection } from './designer/types'
diff --git a/ui/src/views/public/designer/DesignerDrawer.tsx b/ui/src/views/public/designer/DesignerDrawer.tsx
index 1599237..3f0b911 100644
--- a/ui/src/views/public/designer/DesignerDrawer.tsx
+++ b/ui/src/views/public/designer/DesignerDrawer.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import Avatar from '@/components/ui/Avatar'
 import { Button, Input } from '@/components/ui'
 import { IconPickerField } from '@/views/shared/MenuAddDialog'
@@ -40,7 +41,6 @@ const DesignerDrawer: React.FC<DesignerDrawerProps> = ({
   onClose,
   onSave,
   onLanguageChange,
-  onReset,
   onFieldChange,
 }) => {
   const { translate } = useLocalization()
diff --git a/ui/src/views/public/designer/SelectableBlock.tsx b/ui/src/views/public/designer/SelectableBlock.tsx
index b4d93f1..e72e2c9 100644
--- a/ui/src/views/public/designer/SelectableBlock.tsx
+++ b/ui/src/views/public/designer/SelectableBlock.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { PropsWithChildren } from 'react'
+import React, { PropsWithChildren } from 'react'
 
 interface SelectableBlockProps extends PropsWithChildren {
   id: string
diff --git a/ui/src/views/report/DevexpressReportDesigner.tsx b/ui/src/views/report/DevexpressReportDesigner.tsx
index 9f7e20f..629dfc6 100644
--- a/ui/src/views/report/DevexpressReportDesigner.tsx
+++ b/ui/src/views/report/DevexpressReportDesigner.tsx
@@ -14,7 +14,6 @@ const ReportDesigner = lazy(() =>
 )
 
 const VIEWER_THEME_LINK_ID = 'devexpress-report-viewer-theme'
-const VIEWER_DARK_OVERRIDES_ID = 'devexpress-report-viewer-dark-overrides'
 const REPORT_DESIGNER_CSS_ID = 'devexpress-report-designer-css'
 
 const getViewerClassName = (isDarkMode: boolean) =>
diff --git a/ui/src/views/report/DevexpressReportViewer.tsx b/ui/src/views/report/DevexpressReportViewer.tsx
index 01e3dbf..68080d1 100644
--- a/ui/src/views/report/DevexpressReportViewer.tsx
+++ b/ui/src/views/report/DevexpressReportViewer.tsx
@@ -1,4 +1,5 @@
-import React, { useMemo, useEffect, useState, useCallback, useRef } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import type { FC } from 'react'
 import { Container } from '@/components/shared'
 import { Helmet } from 'react-helmet'
 import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -15,9 +16,24 @@ import { useStoreState } from '@/store'
 import { createReportQueryString, createReportUrl } from './reportRouteParams'
 
 const VIEWER_THEME_LINK_ID = 'devexpress-report-viewer-theme'
-const VIEWER_DARK_OVERRIDES_ID = 'devexpress-report-viewer-dark-overrides'
 const DEFAULT_REPORT_ZOOM = 1
 
+interface ReportPreviewModel {
+  autoFitBy?: ZoomAutoBy
+  originalZoom?: number
+  zoom?: number
+}
+
+interface ReportPreviewContainer {
+  reportPreview?: ReportPreviewModel
+  ReportPreview?: ReportPreviewModel
+  previewModel?: ReportPreviewContainer
+  args?: ReportPreviewContainer
+  sender?: ReportPreviewContainer & {
+    GetReportPreview?: () => ReportPreviewModel
+  }
+}
+
 const getViewerClassName = (isDarkMode: boolean) =>
   [
     'dx-viewport',
@@ -62,7 +78,7 @@ const loadViewerCss = (isDarkMode: boolean) => {
   }
 }
 
-const DevexpressReportViewer: React.FC = () => {
+const DevexpressReportViewer: FC = () => {
   const { translate } = useLocalization()
   const { report, listFormCode, id } = useParams<{
     report: string
@@ -76,35 +92,42 @@ const DevexpressReportViewer: React.FC = () => {
   const configCultureName = useStoreState(
     (state) => state.abpConfig.config?.localization.currentCulture.cultureName,
   )
-  const [isRequestAuthReady, setIsRequestAuthReady] = useState(false)
-  const previewModelRef = useRef<any>(null)
+  const [configuredRequestKey, setConfiguredRequestKey] = useState<string>()
+  const previewModelRef = useRef<ReportPreviewModel>()
   const isDarkMode = themeMode === MODE_DARK
   const reportCultureName = cultureName || configCultureName
+  const requestConfigKey = `${token ?? ''}\u0000${reportCultureName ?? ''}`
 
-  const getReportPreview = useCallback((eventOrModel?: any) => {
-    const eventArgs = eventOrModel?.args
-    const sender = eventOrModel?.sender
-    const candidates = [
-      eventArgs?.reportPreview,
-      eventArgs?.ReportPreview,
-      eventArgs?.previewModel?.reportPreview,
-      eventOrModel?.reportPreview,
-      eventOrModel?.ReportPreview,
-      eventOrModel?.previewModel?.reportPreview,
-      sender?.GetReportPreview?.(),
-      sender?.previewModel?.reportPreview,
-      previewModelRef.current,
-    ]
+  const getReportPreview = useCallback(
+    (eventOrModel?: ReportPreviewContainer | ReportPreviewModel) => {
+      const event = eventOrModel as ReportPreviewContainer | undefined
+      const eventArgs = event?.args
+      const sender = event?.sender
+      const previewModel = event?.previewModel
+      const candidates = [
+        eventArgs?.reportPreview,
+        eventArgs?.ReportPreview,
+        eventArgs?.previewModel?.reportPreview,
+        event?.reportPreview,
+        event?.ReportPreview,
+        previewModel?.reportPreview,
+        sender?.GetReportPreview?.(),
+        sender?.previewModel?.reportPreview,
+        eventOrModel as ReportPreviewModel | undefined,
+        previewModelRef.current,
+      ]
 
-    return candidates.find(
-      (candidate) =>
-        candidate &&
-        ('zoom' in candidate || 'originalZoom' in candidate || 'autoFitBy' in candidate),
-    )
-  }, [])
+      return candidates.find(
+        (candidate) =>
+          candidate &&
+          ('zoom' in candidate || 'originalZoom' in candidate || 'autoFitBy' in candidate),
+      )
+    },
+    [],
+  )
 
   const setDefaultZoom = useCallback(
-    (eventOrModel?: any) => {
+    (eventOrModel?: ReportPreviewContainer | ReportPreviewModel) => {
       const preview = getReportPreview(eventOrModel)
       if (!preview) return
 
@@ -121,32 +144,17 @@ const DevexpressReportViewer: React.FC = () => {
   }, [isDarkMode])
 
   useEffect(() => {
-    setIsRequestAuthReady(false)
-    const authorization = token ? `Bearer ${token}` : undefined
+    const nextHeaders = { ...(ajaxSetup.ajaxSettings.headers ?? {}) }
+    delete nextHeaders.Authorization
+    delete nextHeaders['Accept-Language']
 
-    const ajaxHeaders = ajaxSetup.ajaxSettings.headers ?? {}
-
-    if (authorization) {
-      ajaxSetup.ajaxSettings.headers = {
-        ...ajaxHeaders,
-        Authorization: authorization,
-        ...(reportCultureName ? { 'Accept-Language': reportCultureName } : {}),
-      }
-      setIsRequestAuthReady(true)
-      return
+    ajaxSetup.ajaxSettings.headers = {
+      ...nextHeaders,
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      ...(reportCultureName ? { 'Accept-Language': reportCultureName } : {}),
     }
-
-    const {
-      Authorization: _ajaxAuthorization,
-      'Accept-Language': _ajaxAcceptLanguage,
-      ...nextAjaxHeaders
-    } = ajaxHeaders
-    if (reportCultureName) {
-      nextAjaxHeaders['Accept-Language'] = reportCultureName
-    }
-    ajaxSetup.ajaxSettings.headers = nextAjaxHeaders
-    setIsRequestAuthReady(true)
-  }, [token, reportCultureName])
+    setConfiguredRequestKey(requestConfigKey)
+  }, [token, reportCultureName, requestConfigKey])
 
   const reportUrlWithParams = useMemo(() => {
     const searchParams = new URLSearchParams(location.search)
@@ -168,12 +176,9 @@ const DevexpressReportViewer: React.FC = () => {
         defaultTitle={APP_NAME}
       />
 
-      {isRequestAuthReady && (
+      {configuredRequestKey === requestConfigKey && (
         <ReportViewer key={reportUrlWithParams} reportUrl={reportUrlWithParams}>
-          <Callbacks
-            BeforeRender={setDefaultZoom}
-            DocumentReady={setDefaultZoom}
-          />
+          <Callbacks BeforeRender={setDefaultZoom} DocumentReady={setDefaultZoom} />
           <RequestOptions host={import.meta.env.VITE_API_URL} invokeAction="/DXXRDV" />
         </ReportViewer>
       )}
diff --git a/ui/src/views/settings/Settings.tsx b/ui/src/views/settings/Settings.tsx
index 22223f8..85de773 100644
--- a/ui/src/views/settings/Settings.tsx
+++ b/ui/src/views/settings/Settings.tsx
@@ -166,7 +166,7 @@ const Settings = () => {
                     }, 1000)
                   }}
                 >
-                  {({ values, touched, errors, isSubmitting }) => (
+                  {({ values, isSubmitting }) => (
                     <Form>
                       <FormContainer>
                         {subGroup.settings.map((setting) => (
diff --git a/ui/src/views/shared/FormRow.tsx b/ui/src/views/shared/FormRow.tsx
index 9eb77d0..1a1d205 100644
--- a/ui/src/views/shared/FormRow.tsx
+++ b/ui/src/views/shared/FormRow.tsx
@@ -3,7 +3,7 @@ import { FormItem } from '@/components/ui/Form'
 import type { PropsWithChildren } from 'react'
 import type { FormikTouched, FormikErrors } from 'formik'
 
-type FormRow<T> = PropsWithChildren<{
+type FormRowProps<T> = PropsWithChildren<{
     label: string
     errors: FormikErrors<T>
     touched: FormikTouched<T>
@@ -12,7 +12,7 @@ type FormRow<T> = PropsWithChildren<{
     alignCenter?: boolean
 }>
 
-const FormRow = <T extends Record<string, unknown>>(props: FormRow<T>) => {
+const FormRow = <T extends Record<string, unknown>>(props: FormRowProps<T>) => {
     const {
         label,
         children,
diff --git a/ui/src/views/version/ChangeLog.tsx b/ui/src/views/version/ChangeLog.tsx
index 286a88b..bd94323 100644
--- a/ui/src/views/version/ChangeLog.tsx
+++ b/ui/src/views/version/ChangeLog.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react"
+import React, { useEffect, useState } from "react"
 import AdaptableCard from "@/components/shared/AdaptableCard"
 import Container from "@/components/shared/Container"
 import { FaTag, FaRegCheckCircle } from "react-icons/fa"