Merge pull request #272 from Worklenz/development

Development

.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(npm run build:*)",
+      "Bash(npm run type-check:*)",
+      "Bash(npm run:*)"
+    ],
+    "deny": []
+  }
+}

test_sort_fix.sql

@@ -0,0 +1,41 @@
+-- Test script to verify the sort order constraint fix
+
+-- Test the helper function
+SELECT get_sort_column_name('status');    -- Should return 'status_sort_order'
+SELECT get_sort_column_name('priority');  -- Should return 'priority_sort_order'
+SELECT get_sort_column_name('phase');     -- Should return 'phase_sort_order'
+SELECT get_sort_column_name('members');   -- Should return 'member_sort_order'
+SELECT get_sort_column_name('unknown');   -- Should return 'status_sort_order' (default)
+
+-- Test bulk update function (example - would need real project_id and task_ids)
+/*
+SELECT update_task_sort_orders_bulk(
+    '[
+        {"task_id": "example-uuid", "sort_order": 1, "status_id": "status-uuid"},
+        {"task_id": "example-uuid-2", "sort_order": 2, "status_id": "status-uuid"}
+    ]'::json,
+    'status'
+);
+*/
+
+-- Verify that sort_order constraint still exists and works
+SELECT 
+    tc.constraint_name,
+    tc.table_name,
+    kcu.column_name
+FROM information_schema.table_constraints tc
+JOIN information_schema.key_column_usage kcu 
+    ON tc.constraint_name = kcu.constraint_name
+WHERE tc.constraint_name = 'tasks_sort_order_unique';
+
+-- Check that new sort order columns don't have unique constraints (which is correct)
+SELECT 
+    tc.constraint_name,
+    tc.table_name,
+    kcu.column_name
+FROM information_schema.table_constraints tc
+JOIN information_schema.key_column_usage kcu 
+    ON tc.constraint_name = kcu.constraint_name
+WHERE kcu.table_name = 'tasks'
+  AND kcu.column_name IN ('status_sort_order', 'priority_sort_order', 'phase_sort_order', 'member_sort_order')
+  AND tc.constraint_type = 'UNIQUE';

test_sort_orders.sql

@@ -0,0 +1,30 @@
+-- Test script to validate the separate sort order implementation
+
+-- Check if new columns exist
+SELECT column_name, data_type, is_nullable, column_default
+FROM information_schema.columns 
+WHERE table_name = 'tasks' 
+  AND column_name IN ('status_sort_order', 'priority_sort_order', 'phase_sort_order', 'member_sort_order')
+ORDER BY column_name;
+
+-- Check if helper function exists
+SELECT routine_name, routine_type
+FROM information_schema.routines 
+WHERE routine_name IN ('get_sort_column_name', 'update_task_sort_orders_bulk', 'handle_task_list_sort_order_change');
+
+-- Sample test data to verify different sort orders work
+-- (This would be run after the migrations)
+/*
+-- Test: Tasks should have different orders for different groupings
+SELECT 
+  id, 
+  name, 
+  sort_order, 
+  status_sort_order, 
+  priority_sort_order, 
+  phase_sort_order, 
+  member_sort_order
+FROM tasks 
+WHERE project_id = '<test-project-id>'
+ORDER BY status_sort_order;
+*/

worklenz-backend/database/migrations/fix_duplicate_sort_orders.sql

@@ -0,0 +1,300 @@
+-- Fix Duplicate Sort Orders Script
+-- This script detects and fixes duplicate sort order values that break task ordering
+
+-- 1. DETECTION QUERIES - Run these first to see the scope of the problem
+
+-- Check for duplicates in main sort_order column
+SELECT 
+    project_id,
+    sort_order,
+    COUNT(*) as duplicate_count,
+    STRING_AGG(id::text, ', ') as task_ids
+FROM tasks 
+WHERE project_id IS NOT NULL
+GROUP BY project_id, sort_order 
+HAVING COUNT(*) > 1
+ORDER BY project_id, sort_order;
+
+-- Check for duplicates in status_sort_order
+SELECT 
+    project_id,
+    status_sort_order,
+    COUNT(*) as duplicate_count,
+    STRING_AGG(id::text, ', ') as task_ids
+FROM tasks 
+WHERE project_id IS NOT NULL
+GROUP BY project_id, status_sort_order 
+HAVING COUNT(*) > 1
+ORDER BY project_id, status_sort_order;
+
+-- Check for duplicates in priority_sort_order
+SELECT 
+    project_id,
+    priority_sort_order,
+    COUNT(*) as duplicate_count,
+    STRING_AGG(id::text, ', ') as task_ids
+FROM tasks 
+WHERE project_id IS NOT NULL
+GROUP BY project_id, priority_sort_order 
+HAVING COUNT(*) > 1
+ORDER BY project_id, priority_sort_order;
+
+-- Check for duplicates in phase_sort_order
+SELECT 
+    project_id,
+    phase_sort_order,
+    COUNT(*) as duplicate_count,
+    STRING_AGG(id::text, ', ') as task_ids
+FROM tasks 
+WHERE project_id IS NOT NULL
+GROUP BY project_id, phase_sort_order 
+HAVING COUNT(*) > 1
+ORDER BY project_id, phase_sort_order;
+
+-- Note: member_sort_order removed - no longer used
+
+-- 2. CLEANUP FUNCTIONS
+
+-- Fix duplicates in main sort_order column
+CREATE OR REPLACE FUNCTION fix_sort_order_duplicates() RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _project RECORD;
+    _task RECORD;
+    _counter INTEGER;
+BEGIN
+    -- For each project, reassign sort_order values to ensure uniqueness
+    FOR _project IN 
+        SELECT DISTINCT project_id 
+        FROM tasks 
+        WHERE project_id IS NOT NULL
+    LOOP
+        _counter := 0;
+        
+        -- Reassign sort_order values sequentially for this project
+        FOR _task IN 
+            SELECT id 
+            FROM tasks 
+            WHERE project_id = _project.project_id 
+            ORDER BY sort_order, created_at
+        LOOP
+            UPDATE tasks 
+            SET sort_order = _counter 
+            WHERE id = _task.id;
+            
+            _counter := _counter + 1;
+        END LOOP;
+    END LOOP;
+    
+    RAISE NOTICE 'Fixed sort_order duplicates for all projects';
+END
+$$;
+
+-- Fix duplicates in status_sort_order column
+CREATE OR REPLACE FUNCTION fix_status_sort_order_duplicates() RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _project RECORD;
+    _task RECORD;
+    _counter INTEGER;
+BEGIN
+    FOR _project IN 
+        SELECT DISTINCT project_id 
+        FROM tasks 
+        WHERE project_id IS NOT NULL
+    LOOP
+        _counter := 0;
+        
+        FOR _task IN 
+            SELECT id 
+            FROM tasks 
+            WHERE project_id = _project.project_id 
+            ORDER BY status_sort_order, created_at
+        LOOP
+            UPDATE tasks 
+            SET status_sort_order = _counter 
+            WHERE id = _task.id;
+            
+            _counter := _counter + 1;
+        END LOOP;
+    END LOOP;
+    
+    RAISE NOTICE 'Fixed status_sort_order duplicates for all projects';
+END
+$$;
+
+-- Fix duplicates in priority_sort_order column
+CREATE OR REPLACE FUNCTION fix_priority_sort_order_duplicates() RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _project RECORD;
+    _task RECORD;
+    _counter INTEGER;
+BEGIN
+    FOR _project IN 
+        SELECT DISTINCT project_id 
+        FROM tasks 
+        WHERE project_id IS NOT NULL
+    LOOP
+        _counter := 0;
+        
+        FOR _task IN 
+            SELECT id 
+            FROM tasks 
+            WHERE project_id = _project.project_id 
+            ORDER BY priority_sort_order, created_at
+        LOOP
+            UPDATE tasks 
+            SET priority_sort_order = _counter 
+            WHERE id = _task.id;
+            
+            _counter := _counter + 1;
+        END LOOP;
+    END LOOP;
+    
+    RAISE NOTICE 'Fixed priority_sort_order duplicates for all projects';
+END
+$$;
+
+-- Fix duplicates in phase_sort_order column
+CREATE OR REPLACE FUNCTION fix_phase_sort_order_duplicates() RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _project RECORD;
+    _task RECORD;
+    _counter INTEGER;
+BEGIN
+    FOR _project IN 
+        SELECT DISTINCT project_id 
+        FROM tasks 
+        WHERE project_id IS NOT NULL
+    LOOP
+        _counter := 0;
+        
+        FOR _task IN 
+            SELECT id 
+            FROM tasks 
+            WHERE project_id = _project.project_id 
+            ORDER BY phase_sort_order, created_at
+        LOOP
+            UPDATE tasks 
+            SET phase_sort_order = _counter 
+            WHERE id = _task.id;
+            
+            _counter := _counter + 1;
+        END LOOP;
+    END LOOP;
+    
+    RAISE NOTICE 'Fixed phase_sort_order duplicates for all projects';
+END
+$$;
+
+-- Note: fix_member_sort_order_duplicates() removed - no longer needed
+
+-- Master function to fix all sort order duplicates
+CREATE OR REPLACE FUNCTION fix_all_duplicate_sort_orders() RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    RAISE NOTICE 'Starting sort order cleanup for all columns...';
+    
+    PERFORM fix_sort_order_duplicates();
+    PERFORM fix_status_sort_order_duplicates();
+    PERFORM fix_priority_sort_order_duplicates();
+    PERFORM fix_phase_sort_order_duplicates();
+    
+    RAISE NOTICE 'Completed sort order cleanup for all columns';
+END
+$$;
+
+-- 3. VERIFICATION FUNCTION
+
+-- Verify that duplicates have been fixed
+CREATE OR REPLACE FUNCTION verify_sort_order_integrity() RETURNS TABLE(
+    column_name text,
+    project_id uuid,
+    duplicate_count bigint,
+    status text
+)
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    -- Check sort_order duplicates
+    RETURN QUERY
+    SELECT 
+        'sort_order'::text as column_name,
+        t.project_id,
+        COUNT(*) as duplicate_count,
+        CASE WHEN COUNT(*) > 1 THEN 'DUPLICATES FOUND' ELSE 'OK' END as status
+    FROM tasks t
+    WHERE t.project_id IS NOT NULL
+    GROUP BY t.project_id, t.sort_order
+    HAVING COUNT(*) > 1;
+    
+    -- Check status_sort_order duplicates
+    RETURN QUERY
+    SELECT 
+        'status_sort_order'::text as column_name,
+        t.project_id,
+        COUNT(*) as duplicate_count,
+        CASE WHEN COUNT(*) > 1 THEN 'DUPLICATES FOUND' ELSE 'OK' END as status
+    FROM tasks t
+    WHERE t.project_id IS NOT NULL
+    GROUP BY t.project_id, t.status_sort_order
+    HAVING COUNT(*) > 1;
+    
+    -- Check priority_sort_order duplicates
+    RETURN QUERY
+    SELECT 
+        'priority_sort_order'::text as column_name,
+        t.project_id,
+        COUNT(*) as duplicate_count,
+        CASE WHEN COUNT(*) > 1 THEN 'DUPLICATES FOUND' ELSE 'OK' END as status
+    FROM tasks t
+    WHERE t.project_id IS NOT NULL
+    GROUP BY t.project_id, t.priority_sort_order
+    HAVING COUNT(*) > 1;
+    
+    -- Check phase_sort_order duplicates
+    RETURN QUERY
+    SELECT 
+        'phase_sort_order'::text as column_name,
+        t.project_id,
+        COUNT(*) as duplicate_count,
+        CASE WHEN COUNT(*) > 1 THEN 'DUPLICATES FOUND' ELSE 'OK' END as status
+    FROM tasks t
+    WHERE t.project_id IS NOT NULL
+    GROUP BY t.project_id, t.phase_sort_order
+    HAVING COUNT(*) > 1;
+    
+    -- Note: member_sort_order verification removed - column no longer used
+    
+END
+$$;
+
+-- 4. USAGE INSTRUCTIONS
+
+/*
+USAGE:
+
+1. First, run the detection queries to see which projects have duplicates
+2. Then run this to fix all duplicates:
+   SELECT fix_all_duplicate_sort_orders();
+3. Finally, verify the fix worked:
+   SELECT * FROM verify_sort_order_integrity();
+   
+If verification returns no rows, all duplicates have been fixed successfully.
+
+WARNING: This will reassign sort order values based on current order + creation time.
+Make sure to backup your database before running these functions.
+*/

worklenz-backend/database/migrations/release-2.1.2/20250715000000-add-grouping-sort-orders.sql

@@ -0,0 +1,37 @@
+-- Migration: Add separate sort order columns for different grouping types
+-- This allows users to maintain different task orders when switching between grouping views
+
+-- Add new sort order columns
+ALTER TABLE tasks ADD COLUMN IF NOT EXISTS status_sort_order INTEGER DEFAULT 0;
+ALTER TABLE tasks ADD COLUMN IF NOT EXISTS priority_sort_order INTEGER DEFAULT 0;
+ALTER TABLE tasks ADD COLUMN IF NOT EXISTS phase_sort_order INTEGER DEFAULT 0;
+ALTER TABLE tasks ADD COLUMN IF NOT EXISTS member_sort_order INTEGER DEFAULT 0;
+
+-- Initialize new columns with current sort_order values
+UPDATE tasks SET 
+  status_sort_order = sort_order,
+  priority_sort_order = sort_order,
+  phase_sort_order = sort_order,
+  member_sort_order = sort_order
+WHERE status_sort_order = 0 
+   OR priority_sort_order = 0 
+   OR phase_sort_order = 0 
+   OR member_sort_order = 0;
+
+-- Add constraints to ensure non-negative values
+ALTER TABLE tasks ADD CONSTRAINT tasks_status_sort_order_check CHECK (status_sort_order >= 0);
+ALTER TABLE tasks ADD CONSTRAINT tasks_priority_sort_order_check CHECK (priority_sort_order >= 0);
+ALTER TABLE tasks ADD CONSTRAINT tasks_phase_sort_order_check CHECK (phase_sort_order >= 0);
+ALTER TABLE tasks ADD CONSTRAINT tasks_member_sort_order_check CHECK (member_sort_order >= 0);
+
+-- Add indexes for performance (since these will be used for ordering)
+CREATE INDEX IF NOT EXISTS idx_tasks_status_sort_order ON tasks(project_id, status_sort_order);
+CREATE INDEX IF NOT EXISTS idx_tasks_priority_sort_order ON tasks(project_id, priority_sort_order);
+CREATE INDEX IF NOT EXISTS idx_tasks_phase_sort_order ON tasks(project_id, phase_sort_order);
+CREATE INDEX IF NOT EXISTS idx_tasks_member_sort_order ON tasks(project_id, member_sort_order);
+
+-- Update comments for documentation
+COMMENT ON COLUMN tasks.status_sort_order IS 'Sort order when grouped by status';
+COMMENT ON COLUMN tasks.priority_sort_order IS 'Sort order when grouped by priority';
+COMMENT ON COLUMN tasks.phase_sort_order IS 'Sort order when grouped by phase';
+COMMENT ON COLUMN tasks.member_sort_order IS 'Sort order when grouped by members/assignees';

worklenz-backend/database/migrations/release-2.1.2/20250715000001-update-sort-functions.sql

@@ -0,0 +1,172 @@
+-- Migration: Update database functions to handle grouping-specific sort orders
+
+-- Function to get the appropriate sort column name based on grouping type
+CREATE OR REPLACE FUNCTION get_sort_column_name(_group_by TEXT) RETURNS TEXT
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    CASE _group_by
+        WHEN 'status' THEN RETURN 'status_sort_order';
+        WHEN 'priority' THEN RETURN 'priority_sort_order';
+        WHEN 'phase' THEN RETURN 'phase_sort_order';
+        WHEN 'members' THEN RETURN 'member_sort_order';
+        ELSE RETURN 'sort_order'; -- fallback to general sort_order
+    END CASE;
+END;
+$$;
+
+-- Updated bulk sort order function to handle different sort columns
+CREATE OR REPLACE FUNCTION update_task_sort_orders_bulk(_updates json, _group_by text DEFAULT 'status') RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _update_record RECORD;
+    _sort_column TEXT;
+    _sql TEXT;
+BEGIN
+    -- Get the appropriate sort column based on grouping
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Simple approach: update each task's sort_order from the provided array
+    FOR _update_record IN 
+        SELECT 
+            (item->>'task_id')::uuid as task_id,
+            (item->>'sort_order')::int as sort_order,
+            (item->>'status_id')::uuid as status_id,
+            (item->>'priority_id')::uuid as priority_id,
+            (item->>'phase_id')::uuid as phase_id
+        FROM json_array_elements(_updates) as item
+    LOOP
+        -- Update the appropriate sort column and other fields using dynamic SQL
+        -- Only update sort_order if we're using the default sorting
+        IF _sort_column = 'sort_order' THEN
+            UPDATE tasks SET 
+                sort_order = _update_record.sort_order,
+                status_id = COALESCE(_update_record.status_id, status_id),
+                priority_id = COALESCE(_update_record.priority_id, priority_id)
+            WHERE id = _update_record.task_id;
+        ELSE
+            -- Update only the grouping-specific sort column, not the main sort_order
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, ' ||
+                    'status_id = COALESCE($2, status_id), ' ||
+                    'priority_id = COALESCE($3, priority_id) ' ||
+                    'WHERE id = $4';
+            
+            EXECUTE _sql USING 
+                _update_record.sort_order,
+                _update_record.status_id,
+                _update_record.priority_id,
+                _update_record.task_id;
+        END IF;
+        
+        -- Handle phase updates separately since it's in a different table
+        IF _update_record.phase_id IS NOT NULL THEN
+            INSERT INTO task_phase (task_id, phase_id)
+            VALUES (_update_record.task_id, _update_record.phase_id)
+            ON CONFLICT (task_id) DO UPDATE SET phase_id = _update_record.phase_id;
+        END IF;
+    END LOOP;
+END;
+$$;
+
+-- Updated main sort order change handler
+CREATE OR REPLACE FUNCTION handle_task_list_sort_order_change(_body json) RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _from_index INT;
+    _to_index   INT;
+    _task_id    UUID;
+    _project_id UUID;
+    _from_group UUID;
+    _to_group   UUID;
+    _group_by   TEXT;
+    _batch_size INT := 100;
+    _sort_column TEXT;
+    _sql TEXT;
+BEGIN
+    _project_id = (_body ->> 'project_id')::UUID;
+    _task_id = (_body ->> 'task_id')::UUID;
+    _from_index = (_body ->> 'from_index')::INT;
+    _to_index = (_body ->> 'to_index')::INT;
+    _from_group = (_body ->> 'from_group')::UUID;
+    _to_group = (_body ->> 'to_group')::UUID;
+    _group_by = (_body ->> 'group_by')::TEXT;
+    
+    -- Get the appropriate sort column
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Handle group changes
+    IF (_from_group <> _to_group OR (_from_group <> _to_group) IS NULL) THEN
+        IF (_group_by = 'status') THEN
+            UPDATE tasks 
+            SET status_id = _to_group 
+            WHERE id = _task_id 
+              AND status_id = _from_group
+              AND project_id = _project_id;
+        END IF;
+        
+        IF (_group_by = 'priority') THEN
+            UPDATE tasks 
+            SET priority_id = _to_group 
+            WHERE id = _task_id 
+              AND priority_id = _from_group
+              AND project_id = _project_id;
+        END IF;
+        
+        IF (_group_by = 'phase') THEN
+            IF (is_null_or_empty(_to_group) IS FALSE) THEN
+                INSERT INTO task_phase (task_id, phase_id)
+                VALUES (_task_id, _to_group)
+                ON CONFLICT (task_id) DO UPDATE SET phase_id = _to_group;
+            ELSE
+                DELETE FROM task_phase WHERE task_id = _task_id;
+            END IF;
+        END IF;
+    END IF;
+
+    -- Handle sort order changes using dynamic SQL
+    IF (_from_index <> _to_index) THEN
+        -- For the main sort_order column, we need to be careful about unique constraints
+        IF _sort_column = 'sort_order' THEN
+            -- Use a transaction-safe approach for the main sort_order column
+            IF (_to_index > _from_index) THEN
+                -- Moving down: decrease sort_order for items between old and new position
+                UPDATE tasks SET sort_order = sort_order - 1 
+                WHERE project_id = _project_id 
+                  AND sort_order > _from_index 
+                  AND sort_order <= _to_index;
+            ELSE
+                -- Moving up: increase sort_order for items between new and old position  
+                UPDATE tasks SET sort_order = sort_order + 1 
+                WHERE project_id = _project_id 
+                  AND sort_order >= _to_index 
+                  AND sort_order < _from_index;
+            END IF;
+            
+            -- Set the new sort_order for the moved task
+            UPDATE tasks SET sort_order = _to_index WHERE id = _task_id;
+        ELSE
+            -- For grouping-specific columns, use dynamic SQL since there's no unique constraint
+            IF (_to_index > _from_index) THEN
+                -- Moving down: decrease sort_order for items between old and new position
+                _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' - 1 ' ||
+                       'WHERE project_id = $1 AND ' || _sort_column || ' > $2 AND ' || _sort_column || ' <= $3';
+                EXECUTE _sql USING _project_id, _from_index, _to_index;
+            ELSE
+                -- Moving up: increase sort_order for items between new and old position  
+                _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' + 1 ' ||
+                       'WHERE project_id = $1 AND ' || _sort_column || ' >= $2 AND ' || _sort_column || ' < $3';
+                EXECUTE _sql USING _project_id, _to_index, _from_index;
+            END IF;
+            
+            -- Set the new sort_order for the moved task
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1 WHERE id = $2';
+            EXECUTE _sql USING _to_index, _task_id;
+        END IF;
+    END IF;
+END;
+$$;

worklenz-backend/database/migrations/release-2.1.2/20250715000002-fix-sort-constraint.sql

@@ -0,0 +1,179 @@
+-- Migration: Fix sort order constraint violations
+
+-- First, let's ensure all existing tasks have unique sort_order values within each project
+-- This is a one-time fix to ensure data consistency
+
+DO $$
+DECLARE
+    _project RECORD;
+    _task RECORD;
+    _counter INTEGER;
+BEGIN
+    -- For each project, reassign sort_order values to ensure uniqueness
+    FOR _project IN 
+        SELECT DISTINCT project_id 
+        FROM tasks 
+        WHERE project_id IS NOT NULL
+    LOOP
+        _counter := 0;
+        
+        -- Reassign sort_order values sequentially for this project
+        FOR _task IN 
+            SELECT id 
+            FROM tasks 
+            WHERE project_id = _project.project_id 
+            ORDER BY sort_order, created_at
+        LOOP
+            UPDATE tasks 
+            SET sort_order = _counter 
+            WHERE id = _task.id;
+            
+            _counter := _counter + 1;
+        END LOOP;
+    END LOOP;
+END
+$$;
+
+-- Now create a better version of our functions that properly handles the constraints
+
+-- Updated bulk sort order function that avoids sort_order conflicts
+CREATE OR REPLACE FUNCTION update_task_sort_orders_bulk(_updates json, _group_by text DEFAULT 'status') RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _update_record RECORD;
+    _sort_column TEXT;
+    _sql TEXT;
+BEGIN
+    -- Get the appropriate sort column based on grouping
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Process each update record
+    FOR _update_record IN 
+        SELECT 
+            (item->>'task_id')::uuid as task_id,
+            (item->>'sort_order')::int as sort_order,
+            (item->>'status_id')::uuid as status_id,
+            (item->>'priority_id')::uuid as priority_id,
+            (item->>'phase_id')::uuid as phase_id
+        FROM json_array_elements(_updates) as item
+    LOOP
+        -- Update the grouping-specific sort column and other fields
+        _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, ' ||
+                'status_id = COALESCE($2, status_id), ' ||
+                'priority_id = COALESCE($3, priority_id), ' ||
+                'updated_at = CURRENT_TIMESTAMP ' ||
+                'WHERE id = $4';
+        
+        EXECUTE _sql USING 
+            _update_record.sort_order,
+            _update_record.status_id,
+            _update_record.priority_id,
+            _update_record.task_id;
+        
+        -- Handle phase updates separately since it's in a different table
+        IF _update_record.phase_id IS NOT NULL THEN
+            INSERT INTO task_phase (task_id, phase_id)
+            VALUES (_update_record.task_id, _update_record.phase_id)
+            ON CONFLICT (task_id) DO UPDATE SET phase_id = _update_record.phase_id;
+        END IF;
+    END LOOP;
+END;
+$$;
+
+-- Also update the helper function to be more explicit
+CREATE OR REPLACE FUNCTION get_sort_column_name(_group_by TEXT) RETURNS TEXT
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    CASE _group_by
+        WHEN 'status' THEN RETURN 'status_sort_order';
+        WHEN 'priority' THEN RETURN 'priority_sort_order';
+        WHEN 'phase' THEN RETURN 'phase_sort_order';
+        WHEN 'members' THEN RETURN 'member_sort_order';
+        -- For backward compatibility, still support general sort_order but be explicit
+        WHEN 'general' THEN RETURN 'sort_order';
+        ELSE RETURN 'status_sort_order'; -- Default to status sorting
+    END CASE;
+END;
+$$;
+
+-- Updated main sort order change handler that avoids conflicts
+CREATE OR REPLACE FUNCTION handle_task_list_sort_order_change(_body json) RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _from_index INT;
+    _to_index   INT;
+    _task_id    UUID;
+    _project_id UUID;
+    _from_group UUID;
+    _to_group   UUID;
+    _group_by   TEXT;
+    _sort_column TEXT;
+    _sql TEXT;
+BEGIN
+    _project_id = (_body ->> 'project_id')::UUID;
+    _task_id = (_body ->> 'task_id')::UUID;
+    _from_index = (_body ->> 'from_index')::INT;
+    _to_index = (_body ->> 'to_index')::INT;
+    _from_group = (_body ->> 'from_group')::UUID;
+    _to_group = (_body ->> 'to_group')::UUID;
+    _group_by = (_body ->> 'group_by')::TEXT;
+    
+    -- Get the appropriate sort column
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Handle group changes first
+    IF (_from_group <> _to_group OR (_from_group <> _to_group) IS NULL) THEN
+        IF (_group_by = 'status') THEN
+            UPDATE tasks 
+            SET status_id = _to_group, updated_at = CURRENT_TIMESTAMP
+            WHERE id = _task_id 
+              AND project_id = _project_id;
+        END IF;
+        
+        IF (_group_by = 'priority') THEN
+            UPDATE tasks 
+            SET priority_id = _to_group, updated_at = CURRENT_TIMESTAMP
+            WHERE id = _task_id 
+              AND project_id = _project_id;
+        END IF;
+        
+        IF (_group_by = 'phase') THEN
+            IF (is_null_or_empty(_to_group) IS FALSE) THEN
+                INSERT INTO task_phase (task_id, phase_id)
+                VALUES (_task_id, _to_group)
+                ON CONFLICT (task_id) DO UPDATE SET phase_id = _to_group;
+            ELSE
+                DELETE FROM task_phase WHERE task_id = _task_id;
+            END IF;
+        END IF;
+    END IF;
+
+    -- Handle sort order changes for the grouping-specific column only
+    IF (_from_index <> _to_index) THEN
+        -- Update the grouping-specific sort order (no unique constraint issues)
+        IF (_to_index > _from_index) THEN
+            -- Moving down: decrease sort order for items between old and new position
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' - 1, ' ||
+                   'updated_at = CURRENT_TIMESTAMP ' ||
+                   'WHERE project_id = $1 AND ' || _sort_column || ' > $2 AND ' || _sort_column || ' <= $3';
+            EXECUTE _sql USING _project_id, _from_index, _to_index;
+        ELSE
+            -- Moving up: increase sort order for items between new and old position  
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' + 1, ' ||
+                   'updated_at = CURRENT_TIMESTAMP ' ||
+                   'WHERE project_id = $1 AND ' || _sort_column || ' >= $2 AND ' || _sort_column || ' < $3';
+            EXECUTE _sql USING _project_id, _to_index, _from_index;
+        END IF;
+        
+        -- Set the new sort order for the moved task
+        _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, updated_at = CURRENT_TIMESTAMP WHERE id = $2';
+        EXECUTE _sql USING _to_index, _task_id;
+    END IF;
+END;
+$$;

worklenz-backend/database/sql/1_tables.sql

@@ -1391,27 +1391,30 @@ ALTER TABLE task_work_log
         CHECK (time_spent >= (0)::NUMERIC);
 
 CREATE TABLE IF NOT EXISTS tasks (
-    id                 UUID                     DEFAULT uuid_generate_v4() NOT NULL,
-    name               TEXT                                                NOT NULL,
-    description        TEXT,
-    done               BOOLEAN                  DEFAULT FALSE              NOT NULL,
-    total_minutes      NUMERIC                  DEFAULT 0                  NOT NULL,
-    archived           BOOLEAN                  DEFAULT FALSE              NOT NULL,
-    task_no            BIGINT                                              NOT NULL,
-    start_date         TIMESTAMP WITH TIME ZONE,
-    end_date           TIMESTAMP WITH TIME ZONE,
-    priority_id        UUID                                                NOT NULL,
-    project_id         UUID                                                NOT NULL,
-    reporter_id        UUID                                                NOT NULL,
-    parent_task_id     UUID,
-    status_id          UUID                                                NOT NULL,
-    completed_at       TIMESTAMP WITH TIME ZONE,
-    created_at         TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP  NOT NULL,
-    updated_at         TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP  NOT NULL,
-    sort_order         INTEGER                  DEFAULT 0                  NOT NULL,
-    roadmap_sort_order INTEGER                  DEFAULT 0                  NOT NULL,
-    billable           BOOLEAN                  DEFAULT TRUE,
-    schedule_id        UUID
+    id                  UUID                     DEFAULT uuid_generate_v4() NOT NULL,
+    name                TEXT                                                NOT NULL,
+    description         TEXT,
+    done                BOOLEAN                  DEFAULT FALSE              NOT NULL,
+    total_minutes       NUMERIC                  DEFAULT 0                  NOT NULL,
+    archived            BOOLEAN                  DEFAULT FALSE              NOT NULL,
+    task_no             BIGINT                                              NOT NULL,
+    start_date          TIMESTAMP WITH TIME ZONE,
+    end_date            TIMESTAMP WITH TIME ZONE,
+    priority_id         UUID                                                NOT NULL,
+    project_id          UUID                                                NOT NULL,
+    reporter_id         UUID                                                NOT NULL,
+    parent_task_id      UUID,
+    status_id           UUID                                                NOT NULL,
+    completed_at        TIMESTAMP WITH TIME ZONE,
+    created_at          TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP  NOT NULL,
+    updated_at          TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP  NOT NULL,
+    sort_order          INTEGER                  DEFAULT 0                  NOT NULL,
+    roadmap_sort_order  INTEGER                  DEFAULT 0                  NOT NULL,
+    status_sort_order   INTEGER                  DEFAULT 0                  NOT NULL,
+    priority_sort_order INTEGER                  DEFAULT 0                  NOT NULL,
+    phase_sort_order    INTEGER                  DEFAULT 0                  NOT NULL,
+    billable            BOOLEAN                  DEFAULT TRUE,
+    schedule_id         UUID
 );
 
 ALTER TABLE tasks
@@ -1499,6 +1502,21 @@ ALTER TABLE tasks
     ADD CONSTRAINT tasks_total_minutes_check
         CHECK ((total_minutes >= (0)::NUMERIC) AND (total_minutes <= (999999)::NUMERIC));
 
+-- Add constraints for new sort order columns
+ALTER TABLE tasks ADD CONSTRAINT tasks_status_sort_order_check CHECK (status_sort_order >= 0);
+ALTER TABLE tasks ADD CONSTRAINT tasks_priority_sort_order_check CHECK (priority_sort_order >= 0);
+ALTER TABLE tasks ADD CONSTRAINT tasks_phase_sort_order_check CHECK (phase_sort_order >= 0);
+
+-- Add indexes for performance on new sort order columns
+CREATE INDEX IF NOT EXISTS idx_tasks_status_sort_order ON tasks(project_id, status_sort_order);
+CREATE INDEX IF NOT EXISTS idx_tasks_priority_sort_order ON tasks(project_id, priority_sort_order);
+CREATE INDEX IF NOT EXISTS idx_tasks_phase_sort_order ON tasks(project_id, phase_sort_order);
+
+-- Add comments for documentation
+COMMENT ON COLUMN tasks.status_sort_order IS 'Sort order when grouped by status';
+COMMENT ON COLUMN tasks.priority_sort_order IS 'Sort order when grouped by priority';
+COMMENT ON COLUMN tasks.phase_sort_order IS 'Sort order when grouped by phase';
+
 CREATE TABLE IF NOT EXISTS tasks_assignees (
     task_id           UUID                                               NOT NULL,
     project_member_id UUID                                               NOT NULL,

worklenz-backend/database/sql/4_functions.sql

@@ -4313,6 +4313,24 @@ BEGIN
 END
 $$;
 
+-- Helper function to get the appropriate sort column name based on grouping type
+CREATE OR REPLACE FUNCTION get_sort_column_name(_group_by TEXT) RETURNS TEXT
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    CASE _group_by
+        WHEN 'status' THEN RETURN 'status_sort_order';
+        WHEN 'priority' THEN RETURN 'priority_sort_order';
+        WHEN 'phase' THEN RETURN 'phase_sort_order';
+        WHEN 'members' THEN RETURN 'member_sort_order';
+        -- For backward compatibility, still support general sort_order but be explicit
+        WHEN 'general' THEN RETURN 'sort_order';
+        ELSE RETURN 'status_sort_order'; -- Default to status sorting
+    END CASE;
+END;
+$$;
+
 CREATE OR REPLACE FUNCTION handle_task_list_sort_order_change(_body json) RETURNS void
     LANGUAGE plpgsql
 AS
@@ -4325,66 +4343,67 @@ DECLARE
     _from_group UUID;
     _to_group   UUID;
     _group_by   TEXT;
-    _batch_size INT := 100; -- PERFORMANCE OPTIMIZATION: Batch size for large updates
+    _sort_column TEXT;
+    _sql TEXT;
 BEGIN
     _project_id = (_body ->> 'project_id')::UUID;
     _task_id = (_body ->> 'task_id')::UUID;
-
-    _from_index = (_body ->> 'from_index')::INT; -- from sort_order
-    _to_index = (_body ->> 'to_index')::INT; -- to sort_order
-
+    _from_index = (_body ->> 'from_index')::INT;
+    _to_index = (_body ->> 'to_index')::INT;
     _from_group = (_body ->> 'from_group')::UUID;
     _to_group = (_body ->> 'to_group')::UUID;
-
     _group_by = (_body ->> 'group_by')::TEXT;
-
-    -- PERFORMANCE OPTIMIZATION: Use CTE for better query planning
-    IF (_from_group <> _to_group OR (_from_group <> _to_group) IS NULL)
-    THEN
-        -- PERFORMANCE OPTIMIZATION: Batch update group changes
-        IF (_group_by = 'status')
-        THEN
+    
+    -- Get the appropriate sort column
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Handle group changes first
+    IF (_from_group <> _to_group OR (_from_group <> _to_group) IS NULL) THEN
+        IF (_group_by = 'status') THEN
             UPDATE tasks 
-            SET status_id = _to_group 
+            SET status_id = _to_group, updated_at = CURRENT_TIMESTAMP
             WHERE id = _task_id 
-              AND status_id = _from_group
               AND project_id = _project_id;
         END IF;
-
-        IF (_group_by = 'priority')
-        THEN
+        
+        IF (_group_by = 'priority') THEN
             UPDATE tasks 
-            SET priority_id = _to_group 
+            SET priority_id = _to_group, updated_at = CURRENT_TIMESTAMP
             WHERE id = _task_id 
-              AND priority_id = _from_group
               AND project_id = _project_id;
         END IF;
-
-        IF (_group_by = 'phase')
-        THEN
-            IF (is_null_or_empty(_to_group) IS FALSE)
-            THEN
+        
+        IF (_group_by = 'phase') THEN
+            IF (is_null_or_empty(_to_group) IS FALSE) THEN
                 INSERT INTO task_phase (task_id, phase_id)
                 VALUES (_task_id, _to_group)
                 ON CONFLICT (task_id) DO UPDATE SET phase_id = _to_group;
-            END IF;
-            IF (is_null_or_empty(_to_group) IS TRUE)
-            THEN
-                DELETE
-                FROM task_phase
-                WHERE task_id = _task_id;
+            ELSE
+                DELETE FROM task_phase WHERE task_id = _task_id;
             END IF;
         END IF;
+    END IF;
 
-        -- PERFORMANCE OPTIMIZATION: Optimized sort order handling
-        IF ((_body ->> 'to_last_index')::BOOLEAN IS TRUE AND _from_index < _to_index)
-        THEN
-            PERFORM handle_task_list_sort_inside_group_optimized(_from_index, _to_index, _task_id, _project_id, _batch_size);
+    -- Handle sort order changes for the grouping-specific column only
+    IF (_from_index <> _to_index) THEN
+        -- Update the grouping-specific sort order (no unique constraint issues)
+        IF (_to_index > _from_index) THEN
+            -- Moving down: decrease sort order for items between old and new position
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' - 1, ' ||
+                   'updated_at = CURRENT_TIMESTAMP ' ||
+                   'WHERE project_id = $1 AND ' || _sort_column || ' > $2 AND ' || _sort_column || ' <= $3';
+            EXECUTE _sql USING _project_id, _from_index, _to_index;
         ELSE
-            PERFORM handle_task_list_sort_between_groups_optimized(_from_index, _to_index, _task_id, _project_id, _batch_size);
+            -- Moving up: increase sort order for items between new and old position  
+            _sql := 'UPDATE tasks SET ' || _sort_column || ' = ' || _sort_column || ' + 1, ' ||
+                   'updated_at = CURRENT_TIMESTAMP ' ||
+                   'WHERE project_id = $1 AND ' || _sort_column || ' >= $2 AND ' || _sort_column || ' < $3';
+            EXECUTE _sql USING _project_id, _to_index, _from_index;
         END IF;
-    ELSE
-        PERFORM handle_task_list_sort_inside_group_optimized(_from_index, _to_index, _task_id, _project_id, _batch_size);
+        
+        -- Set the new sort order for the moved task
+        _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, updated_at = CURRENT_TIMESTAMP WHERE id = $2';
+        EXECUTE _sql USING _to_index, _task_id;
     END IF;
 END
 $$;
@@ -4589,31 +4608,31 @@ BEGIN
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
     VALUES (_project_id, 'Progress', 'PROGRESS', 3, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Members', 'ASSIGNEES', 4, TRUE);
+    VALUES (_project_id, 'Status', 'STATUS', 4, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Labels', 'LABELS', 5, TRUE);
+    VALUES (_project_id, 'Members', 'ASSIGNEES', 5, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Status', 'STATUS', 6, TRUE);
+    VALUES (_project_id, 'Labels', 'LABELS', 6, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Priority', 'PRIORITY', 7, TRUE);
+    VALUES (_project_id, 'Phase', 'PHASE', 7, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Time Tracking', 'TIME_TRACKING', 8, TRUE);
+    VALUES (_project_id, 'Priority', 'PRIORITY', 8, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Estimation', 'ESTIMATION', 9, FALSE);
+    VALUES (_project_id, 'Time Tracking', 'TIME_TRACKING', 9, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Start Date', 'START_DATE', 10, FALSE);
+    VALUES (_project_id, 'Estimation', 'ESTIMATION', 10, FALSE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Due Date', 'DUE_DATE', 11, TRUE);
+    VALUES (_project_id, 'Start Date', 'START_DATE', 11, FALSE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Completed Date', 'COMPLETED_DATE', 12, FALSE);
+    VALUES (_project_id, 'Due Date', 'DUE_DATE', 12, TRUE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Created Date', 'CREATED_DATE', 13, FALSE);
+    VALUES (_project_id, 'Completed Date', 'COMPLETED_DATE', 13, FALSE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Last Updated', 'LAST_UPDATED', 14, FALSE);
+    VALUES (_project_id, 'Created Date', 'CREATED_DATE', 14, FALSE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Reporter', 'REPORTER', 15, FALSE);
+    VALUES (_project_id, 'Last Updated', 'LAST_UPDATED', 15, FALSE);
     INSERT INTO project_task_list_cols (project_id, name, key, index, pinned)
-    VALUES (_project_id, 'Phase', 'PHASE', 16, FALSE);
+    VALUES (_project_id, 'Reporter', 'REPORTER', 16, FALSE);
 END
 $$;
 
@@ -6521,15 +6540,20 @@ BEGIN
 END
 $$;
 
--- Simple function to update task sort orders in bulk
-CREATE OR REPLACE FUNCTION update_task_sort_orders_bulk(_updates json) RETURNS void
+-- Updated bulk sort order function that avoids sort_order conflicts
+CREATE OR REPLACE FUNCTION update_task_sort_orders_bulk(_updates json, _group_by text DEFAULT 'status') RETURNS void
     LANGUAGE plpgsql
 AS
 $$
 DECLARE
     _update_record RECORD;
+    _sort_column TEXT;
+    _sql TEXT;
 BEGIN
-    -- Simple approach: update each task's sort_order from the provided array
+    -- Get the appropriate sort column based on grouping
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Process each update record
     FOR _update_record IN 
         SELECT 
             (item->>'task_id')::uuid as task_id,
@@ -6539,12 +6563,18 @@ BEGIN
             (item->>'phase_id')::uuid as phase_id
         FROM json_array_elements(_updates) as item
     LOOP
-        UPDATE tasks 
-        SET 
-            sort_order = _update_record.sort_order,
-            status_id = COALESCE(_update_record.status_id, status_id),
-            priority_id = COALESCE(_update_record.priority_id, priority_id)
-        WHERE id = _update_record.task_id;
+        -- Update the grouping-specific sort column and other fields
+        _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, ' ||
+                'status_id = COALESCE($2, status_id), ' ||
+                'priority_id = COALESCE($3, priority_id), ' ||
+                'updated_at = CURRENT_TIMESTAMP ' ||
+                'WHERE id = $4';
+        
+        EXECUTE _sql USING 
+            _update_record.sort_order,
+            _update_record.status_id,
+            _update_record.priority_id,
+            _update_record.task_id;
         
         -- Handle phase updates separately since it's in a different table
         IF _update_record.phase_id IS NOT NULL THEN
@@ -6555,3 +6585,66 @@ BEGIN
     END LOOP;
 END
 $$;
+
+-- Function to get the appropriate sort column name based on grouping type
+CREATE OR REPLACE FUNCTION get_sort_column_name(_group_by TEXT) RETURNS TEXT
+    LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    CASE _group_by
+        WHEN 'status' THEN RETURN 'status_sort_order';
+        WHEN 'priority' THEN RETURN 'priority_sort_order';
+        WHEN 'phase' THEN RETURN 'phase_sort_order';
+        -- For backward compatibility, still support general sort_order but be explicit
+        WHEN 'general' THEN RETURN 'sort_order';
+        ELSE RETURN 'status_sort_order'; -- Default to status sorting
+    END CASE;
+END;
+$$;
+
+-- Updated bulk sort order function to handle different sort columns
+CREATE OR REPLACE FUNCTION update_task_sort_orders_bulk(_updates json, _group_by text DEFAULT 'status') RETURNS void
+    LANGUAGE plpgsql
+AS
+$$
+DECLARE
+    _update_record RECORD;
+    _sort_column TEXT;
+    _sql TEXT;
+BEGIN
+    -- Get the appropriate sort column based on grouping
+    _sort_column := get_sort_column_name(_group_by);
+    
+    -- Process each update record
+    FOR _update_record IN 
+        SELECT 
+            (item->>'task_id')::uuid as task_id,
+            (item->>'sort_order')::int as sort_order,
+            (item->>'status_id')::uuid as status_id,
+            (item->>'priority_id')::uuid as priority_id,
+            (item->>'phase_id')::uuid as phase_id
+        FROM json_array_elements(_updates) as item
+    LOOP
+        -- Update the grouping-specific sort column and other fields
+        _sql := 'UPDATE tasks SET ' || _sort_column || ' = $1, ' ||
+                'status_id = COALESCE($2, status_id), ' ||
+                'priority_id = COALESCE($3, priority_id), ' ||
+                'updated_at = CURRENT_TIMESTAMP ' ||
+                'WHERE id = $4';
+        
+        EXECUTE _sql USING 
+            _update_record.sort_order,
+            _update_record.status_id,
+            _update_record.priority_id,
+            _update_record.task_id;
+        
+        -- Handle phase updates separately since it's in a different table
+        IF _update_record.phase_id IS NOT NULL THEN
+            INSERT INTO task_phase (task_id, phase_id)
+            VALUES (_update_record.task_id, _update_record.phase_id)
+            ON CONFLICT (task_id) DO UPDATE SET phase_id = _update_record.phase_id;
+        END IF;
+    END LOOP;
+END;
+$$;

worklenz-backend/src/controllers/tasks-controller-v2.ts

@@ -109,12 +109,29 @@ export default class TasksControllerV2 extends TasksControllerBase {
   }
 
   private static getQuery(userId: string, options: ParsedQs) {
-    const searchField = options.search ? ["t.name", "CONCAT((SELECT key FROM projects WHERE id = t.project_id), '-', task_no)"] : "sort_order";
+    // Determine which sort column to use based on grouping
+    const groupBy = options.group || 'status';
+    let defaultSortColumn = 'sort_order';
+    switch (groupBy) {
+      case 'status':
+        defaultSortColumn = 'status_sort_order';
+        break;
+      case 'priority':
+        defaultSortColumn = 'priority_sort_order';
+        break;
+      case 'phase':
+        defaultSortColumn = 'phase_sort_order';
+        break;
+      default:
+        defaultSortColumn = 'sort_order';
+    }
+
+    const searchField = options.search ? ["t.name", "CONCAT((SELECT key FROM projects WHERE id = t.project_id), '-', task_no)"] : defaultSortColumn;
     const { searchQuery, sortField } = TasksControllerV2.toPaginationOptions(options, searchField);
 
     const isSubTasks = !!options.parent_task;
 
-    const sortFields = sortField.replace(/ascend/g, "ASC").replace(/descend/g, "DESC") || "sort_order";
+    const sortFields = sortField.replace(/ascend/g, "ASC").replace(/descend/g, "DESC") || defaultSortColumn;
 
     // Filter tasks by statuses
     const statusesFilter = TasksControllerV2.getFilterByStatusWhereClosure(options.statuses as string);
@@ -196,6 +213,9 @@ export default class TasksControllerV2 extends TasksControllerBase {
              t.archived,
              t.description,
              t.sort_order,
+             t.status_sort_order,
+             t.priority_sort_order,
+             t.phase_sort_order,
              t.progress_value,
              t.manual_progress,
              t.weight,
@@ -1088,7 +1108,7 @@ export default class TasksControllerV2 extends TasksControllerBase {
         custom_column_values: task.custom_column_values || {}, // Include custom column values
         createdAt: task.created_at || new Date().toISOString(),
         updatedAt: task.updated_at || new Date().toISOString(),
-        order: typeof task.sort_order === "number" ? task.sort_order : 0,
+        order: TasksControllerV2.getTaskSortOrder(task, groupBy),
         // Additional metadata for frontend
         originalStatusId: task.status,
         originalPriorityId: task.priority,
@@ -1292,6 +1312,19 @@ export default class TasksControllerV2 extends TasksControllerBase {
     }));
   }
 
+  private static getTaskSortOrder(task: any, groupBy: string): number {
+    switch (groupBy) {
+      case GroupBy.STATUS:
+        return typeof task.status_sort_order === "number" ? task.status_sort_order : 0;
+      case GroupBy.PRIORITY:
+        return typeof task.priority_sort_order === "number" ? task.priority_sort_order : 0;
+      case GroupBy.PHASE:
+        return typeof task.phase_sort_order === "number" ? task.phase_sort_order : 0;
+      default:
+        return typeof task.sort_order === "number" ? task.sort_order : 0;
+    }
+  }
+
   private static getDefaultGroupColor(groupBy: string, groupValue: string): string {
     const colorMaps: Record<string, Record<string, string>> = {
       [GroupBy.STATUS]: {

worklenz-backend/src/socket.io/commands/on-task-sort-order-change.ts

@@ -53,11 +53,27 @@ function notifyStatusChange(socket: Socket, config: Config) {
 }
 
 async function emitSortOrderChange(data: ChangeRequest, socket: Socket) {
+  // Determine which sort column to use based on group_by
+  let sortColumn = "sort_order";
+  switch (data.group_by) {
+    case "status":
+      sortColumn = "status_sort_order";
+      break;
+    case "priority":
+      sortColumn = "priority_sort_order";
+      break;
+    case "phase":
+      sortColumn = "phase_sort_order";
+      break;
+    default:
+      sortColumn = "sort_order";
+  }
+
   const q = `
-    SELECT id, sort_order, completed_at
+    SELECT id, sort_order, ${sortColumn} as current_sort_order, completed_at
     FROM tasks
     WHERE project_id = $1
-    ORDER BY sort_order;
+    ORDER BY ${sortColumn};
   `;
   const tasks = await db.query(q, [data.project_id]);
   socket.emit(SocketEvents.TASK_SORT_ORDER_CHANGE.toString(), tasks.rows);
@@ -84,9 +100,9 @@ export async function on_task_sort_order_change(_io: Server, socket: Socket, dat
         }
       }
 
-      // Use the simple bulk update function
-      const q = `SELECT update_task_sort_orders_bulk($1);`;
-      await db.query(q, [JSON.stringify(data.task_updates)]);
+      // Use the simple bulk update function with group_by parameter
+      const q = `SELECT update_task_sort_orders_bulk($1, $2);`;
+      await db.query(q, [JSON.stringify(data.task_updates), data.group_by || "status"]);
       await emitSortOrderChange(data, socket);
       
       // Handle notifications and logging

worklenz-frontend/public/locales/alb/task-drawer/task-drawer.json

@@ -1,37 +1,43 @@
 {
   "taskHeader": {
-    "taskNamePlaceholder": "Shkruani Detyrën tuaj",
-    "deleteTask": "Fshi Detyrën"
+    "taskNamePlaceholder": "Shkruani detyrën tuaj",
+    "deleteTask": "Fshi detyrën",
+    "parentTask": "Detyra kryesore",
+    "currentTask": "Detyra aktuale",
+    "back": "Kthehu",
+    "backToParent": "Kthehu te detyra kryesore",
+    "toParentTask": "te detyra kryesore",
+    "loadingHierarchy": "Duke ngarkuar hierarkinë..."
   },
   "taskInfoTab": {
     "title": "Informacioni",
     "details": {
       "title": "Detajet",
-      "task-key": "Çelësi i Detyrës",
+      "task-key": "Çelësi i detyrës",
       "phase": "Faza",
-      "assignees": "Të Caktuar",
-      "due-date": "Data e Përfundimit",
-      "time-estimation": "Vlerësimi i Kohës",
+      "assignees": "Të caktuarit",
+      "due-date": "Data e përfundimit",
+      "time-estimation": "Vlerësimi i kohës",
       "priority": "Prioriteti",
       "labels": "Etiketat",
-      "billable": "E Faturueshme",
+      "billable": "I faturueshëm",
       "notify": "Njofto",
       "when-done-notify": "Kur përfundon, njofto",
-      "start-date": "Data e Fillimit",
-      "end-date": "Data e Përfundimit",
-      "hide-start-date": "Fshih Datën e Fillimit",
-      "show-start-date": "Shfaq Datën e Fillimit",
+      "start-date": "Data e fillimit",
+      "end-date": "Data e përfundimit",
+      "hide-start-date": "Fshih datën e fillimit",
+      "show-start-date": "Shfaq datën e fillimit",
       "hours": "Orë",
       "minutes": "Minuta",
-      "progressValue": "Vlera e Progresit",
-      "progressValueTooltip": "Vendosni përqindjen e progresit (0-100%)",
+      "progressValue": "Vlera e progresit",
+      "progressValueTooltip": "Vendos përqindjen e progresit (0-100%)",
       "progressValueRequired": "Ju lutemi vendosni një vlerë progresi",
       "progressValueRange": "Progresi duhet të jetë midis 0 dhe 100",
-      "taskWeight": "Pesha e Detyrës",
-      "taskWeightTooltip": "Vendosni peshën e kësaj nëndetyre (përqindje)",
+      "taskWeight": "Pesha e detyrës",
+      "taskWeightTooltip": "Vendos peshën e kësaj nëndetyre (përqindje)",
       "taskWeightRequired": "Ju lutemi vendosni një peshë detyre",
       "taskWeightRange": "Pesha duhet të jetë midis 0 dhe 100",
-      "recurring": "E Përsëritur"
+      "recurring": "Përsëritëse"
     },
     "labels": {
       "labelInputPlaceholder": "Kërko ose krijo",
@@ -43,71 +49,71 @@
     },
     "subTasks": {
       "title": "Nëndetyrat",
-      "addSubTask": "Shto Nëndetyrë",
+      "addSubTask": "Shto nëndetyrë",
       "addSubTaskInputPlaceholder": "Shkruani detyrën tuaj dhe shtypni enter",
-      "refreshSubTasks": "Rifresko Nëndetyrat",
-      "edit": "Modifiko",
+      "refreshSubTasks": "Rifresko nëndetyrat",
+      "edit": "Redakto",
       "delete": "Fshi",
-      "confirmDeleteSubTask": "Jeni i sigurt që doni të fshini këtë nëndetyrë?",
-      "deleteSubTask": "Fshi Nëndetyrën"
+      "confirmDeleteSubTask": "Jeni i sigurt që dëshironi ta fshini këtë nëndetyrë?",
+      "deleteSubTask": "Fshi nëndetyrën"
     },
     "dependencies": {
       "title": "Varësitë",
       "addDependency": "+ Shto varësi të re",
       "blockedBy": "Bllokuar nga",
-      "searchTask": "Shkruani për të kërkuar detyrë",
+      "searchTask": "Shkruaj për të kërkuar detyrën",
       "noTasksFound": "Nuk u gjetën detyra",
-      "confirmDeleteDependency": "Jeni i sigurt që doni të fshini?"
+      "confirmDeleteDependency": "Jeni i sigurt që dëshironi ta fshini?"
     },
     "attachments": {
       "title": "Bashkëngjitjet",
-      "chooseOrDropFileToUpload": "Zgjidhni ose hidhni skedar për të ngarkuar",
+      "chooseOrDropFileToUpload": "Zgjidh ose lësho skedarin për ta ngarkuar",
       "uploading": "Duke ngarkuar..."
     },
     "comments": {
       "title": "Komentet",
       "addComment": "+ Shto koment të ri",
-      "noComments": "Ende pa komente. Bëhu i pari që komenton!",
+      "noComments": "Ende pa komente. Bëhu i pari që komentoni!",
       "delete": "Fshi",
-      "confirmDeleteComment": "Jeni i sigurt që doni të fshini këtë koment?",
+      "confirmDeleteComment": "Jeni i sigurt që dëshironi ta fshini këtë koment?",
       "addCommentPlaceholder": "Shto një koment...",
       "cancel": "Anulo",
       "commentButton": "Komento",
       "attachFiles": "Bashkëngjit skedarë",
       "addMoreFiles": "Shto më shumë skedarë",
-      "selectedFiles": "Skedarët e Zgjedhur (Deri në 25MB, Maksimumi {count})",
-      "maxFilesError": "Mund të ngarkoni maksimum {count} skedarë",
-      "processFilesError": "Dështoi përpunimi i skedarëve",
+      "selectedFiles": "Skedarët e zgjedhur (Deri në 25MB, Maksimumi {count})",
+      "maxFilesError": "Mund të ngarkoni maksimumi {count} skedarë",
+      "processFilesError": "Dështoi në përpunimin e skedarëve",
       "addCommentError": "Ju lutemi shtoni një koment ose bashkëngjitni skedarë",
       "createdBy": "Krijuar {{time}} nga {{user}}",
       "updatedTime": "Përditësuar {{time}}"
     },
     "searchInputPlaceholder": "Kërko sipas emrit",
-    "pendingInvitation": "Ftesë në Pritje"
+    "pendingInvitation": "Ftesë në pritje"
   },
   "taskTimeLogTab": {
-    "title": "Regjistri i Kohës",
-    "addTimeLog": "Shto regjistrim të ri kohe",
-    "totalLogged": "Totali i Regjistruar",
+    "title": "Regjistri i kohës",
+    "addTimeLog": "Shto regjistër të ri kohe",
+    "totalLogged": "Totali i regjistruar",
     "exportToExcel": "Eksporto në Excel",
-    "noTimeLogsFound": "Nuk u gjetën regjistra kohe",
+    "noTimeLogsFound": "Nuk u gjetën regjistrime kohe",
     "timeLogForm": {
       "date": "Data",
-      "startTime": "Koha e Fillimit",
-      "endTime": "Koha e Përfundimit",
-      "workDescription": "Përshkrimi i Punës",
+      "startTime": "Ora e fillimit",
+      "endTime": "Ora e përfundimit",
+      "workDescription": "Përshkrimi i punës",
       "descriptionPlaceholder": "Shto një përshkrim",
       "logTime": "Regjistro kohën",
       "updateTime": "Përditëso kohën",
       "cancel": "Anulo",
       "selectDateError": "Ju lutemi zgjidhni një datë",
-      "selectStartTimeError": "Ju lutemi zgjidhni kohën e fillimit",
-      "selectEndTimeError": "Ju lutemi zgjidhni kohën e përfundimit",
-      "endTimeAfterStartError": "Koha e përfundimit duhet të jetë pas kohës së fillimit"
+      "selectStartTimeError": "Ju lutemi zgjidhni orën e fillimit",
+      "selectEndTimeError": "Ju lutemi zgjidhni orën e përfundimit",
+      "endTimeAfterStartError": "Ora e përfundimit duhet të jetë pas orës së fillimit"
     }
   },
   "taskActivityLogTab": {
-    "title": "Regjistri i Aktivitetit",
+    "title": "Regjistri i aktivitetit",
     "add": "SHTO",
     "remove": "HIQE",
     "none": "Asnjë",
@@ -115,9 +121,9 @@
     "createdTask": "krijoi detyrën."
   },
   "taskProgress": {
-    "markAsDoneTitle": "Shëno Detyrën si të Kryer?",
-    "confirmMarkAsDone": "Po, shëno si të kryer",
-    "cancelMarkAsDone": "Jo, mbaj statusin aktual",
-    "markAsDoneDescription": "Keni vendosur progresin në 100%. Doni të përditësoni statusin e detyrës në \"Kryer\"?"
+    "markAsDoneTitle": "Shëno detyrën si të përfunduar?",
+    "confirmMarkAsDone": "Po, shënoje si të përfunduar",
+    "cancelMarkAsDone": "Jo, mbaj gjendjen aktuale",
+    "markAsDoneDescription": "Keni vendosur progresin në 100%. Dëshironi ta përditësoni gjendjen e detyrës në \"Përfunduar\"?"
   }
 }

worklenz-frontend/public/locales/alb/task-list-table.json

@@ -39,6 +39,7 @@
   "addTaskText": "Shto Detyrë",
   "addSubTaskText": "+ Shto Nën-Detyrë",
   "noTasksInGroup": "Nuk ka detyra në këtë grup",
+  "dropTaskHere": "Lëshoje detyrën këtu",
   "addTaskInputPlaceholder": "Shkruaj detyrën dhe shtyp Enter",
 
   "openButton": "Hap",

worklenz-frontend/public/locales/de/task-drawer/task-drawer.json

@@ -1,22 +1,28 @@
 {
   "taskHeader": {
     "taskNamePlaceholder": "Geben Sie Ihre Aufgabe ein",
-    "deleteTask": "Aufgabe löschen"
+    "deleteTask": "Aufgabe löschen",
+    "parentTask": "Übergeordnete Aufgabe",
+    "currentTask": "Aktuelle Aufgabe",
+    "back": "Zurück",
+    "backToParent": "Zurück zur übergeordneten Aufgabe",
+    "toParentTask": "zur übergeordneten Aufgabe",
+    "loadingHierarchy": "Hierarchie wird geladen..."
   },
   "taskInfoTab": {
     "title": "Info",
     "details": {
       "title": "Details",
-      "task-key": "Aufgaben-Schlüssel",
+      "task-key": "Aufgabenschlüssel",
       "phase": "Phase",
-      "assignees": "Beauftragte",
+      "assignees": "Zugewiesene",
       "due-date": "Fälligkeitsdatum",
       "time-estimation": "Zeitschätzung",
       "priority": "Priorität",
       "labels": "Labels",
       "billable": "Abrechenbar",
       "notify": "Benachrichtigen",
-      "when-done-notify": "Bei Abschluss benachrichtigen",
+      "when-done-notify": "Bei Fertigstellung benachrichtigen",
       "start-date": "Startdatum",
       "end-date": "Enddatum",
       "hide-start-date": "Startdatum ausblenden",
@@ -24,50 +30,50 @@
       "hours": "Stunden",
       "minutes": "Minuten",
       "progressValue": "Fortschrittswert",
-      "progressValueTooltip": "Fortschritt in Prozent einstellen (0-100%)",
+      "progressValueTooltip": "Setzen Sie den Fortschrittsprozentsatz (0-100%)",
       "progressValueRequired": "Bitte geben Sie einen Fortschrittswert ein",
       "progressValueRange": "Fortschritt muss zwischen 0 und 100 liegen",
       "taskWeight": "Aufgabengewicht",
-      "taskWeightTooltip": "Gewicht dieser Teilaufgabe festlegen (Prozent)",
+      "taskWeightTooltip": "Setzen Sie das Gewicht dieser Unteraufgabe (Prozentsatz)",
       "taskWeightRequired": "Bitte geben Sie ein Aufgabengewicht ein",
       "taskWeightRange": "Gewicht muss zwischen 0 und 100 liegen",
       "recurring": "Wiederkehrend"
     },
     "labels": {
       "labelInputPlaceholder": "Suchen oder erstellen",
-      "labelsSelectorInputTip": "Enter drücken zum Erstellen"
+      "labelsSelectorInputTip": "Drücken Sie Enter zum Erstellen"
     },
     "description": {
       "title": "Beschreibung",
-      "placeholder": "Detailliertere Beschreibung hinzufügen..."
+      "placeholder": "Fügen Sie eine detailliertere Beschreibung hinzu..."
     },
     "subTasks": {
-      "title": "Teilaufgaben",
-      "addSubTask": "Teilaufgabe hinzufügen",
+      "title": "Unteraufgaben",
+      "addSubTask": "Unteraufgabe hinzufügen",
       "addSubTaskInputPlaceholder": "Geben Sie Ihre Aufgabe ein und drücken Sie Enter",
-      "refreshSubTasks": "Teilaufgaben aktualisieren",
+      "refreshSubTasks": "Unteraufgaben aktualisieren",
       "edit": "Bearbeiten",
       "delete": "Löschen",
-      "confirmDeleteSubTask": "Sind Sie sicher, dass Sie diese Teilaufgabe löschen möchten?",
-      "deleteSubTask": "Teilaufgabe löschen"
+      "confirmDeleteSubTask": "Sind Sie sicher, dass Sie diese Unteraufgabe löschen möchten?",
+      "deleteSubTask": "Unteraufgabe löschen"
     },
     "dependencies": {
       "title": "Abhängigkeiten",
       "addDependency": "+ Neue Abhängigkeit hinzufügen",
       "blockedBy": "Blockiert von",
-      "searchTask": "Aufgabe suchen",
+      "searchTask": "Zum Suchen der Aufgabe eingeben",
       "noTasksFound": "Keine Aufgaben gefunden",
       "confirmDeleteDependency": "Sind Sie sicher, dass Sie löschen möchten?"
     },
     "attachments": {
       "title": "Anhänge",
-      "chooseOrDropFileToUpload": "Datei zum Hochladen wählen oder ablegen",
+      "chooseOrDropFileToUpload": "Datei zum Hochladen auswählen oder ablegen",
       "uploading": "Wird hochgeladen..."
     },
     "comments": {
       "title": "Kommentare",
       "addComment": "+ Neuen Kommentar hinzufügen",
-      "noComments": "Noch keine Kommentare. Seien Sie der Erste!",
+      "noComments": "Noch keine Kommentare. Seien Sie der Erste, der kommentiert!",
       "delete": "Löschen",
       "confirmDeleteComment": "Sind Sie sicher, dass Sie diesen Kommentar löschen möchten?",
       "addCommentPlaceholder": "Kommentar hinzufügen...",
@@ -75,9 +81,9 @@
       "commentButton": "Kommentieren",
       "attachFiles": "Dateien anhängen",
       "addMoreFiles": "Weitere Dateien hinzufügen",
-      "selectedFiles": "Ausgewählte Dateien (Bis zu 25MB, Maximum {count})",
+      "selectedFiles": "Ausgewählte Dateien (Bis zu 25MB, Maximum von {count})",
       "maxFilesError": "Sie können maximal {count} Dateien hochladen",
-      "processFilesError": "Fehler beim Verarbeiten der Dateien",
+      "processFilesError": "Dateien konnten nicht verarbeitet werden",
       "addCommentError": "Bitte fügen Sie einen Kommentar hinzu oder hängen Sie Dateien an",
       "createdBy": "Erstellt {{time}} von {{user}}",
       "updatedTime": "Aktualisiert {{time}}"
@@ -86,18 +92,18 @@
     "pendingInvitation": "Ausstehende Einladung"
   },
   "taskTimeLogTab": {
-    "title": "Zeiterfassung",
-    "addTimeLog": "Neuen Zeiteintrag hinzufügen",
-    "totalLogged": "Gesamt erfasst",
+    "title": "Zeitprotokoll",
+    "addTimeLog": "Neues Zeitprotokoll hinzufügen",
+    "totalLogged": "Gesamt protokolliert",
     "exportToExcel": "Nach Excel exportieren",
-    "noTimeLogsFound": "Keine Zeiteinträge gefunden",
+    "noTimeLogsFound": "Keine Zeitprotokolle gefunden",
     "timeLogForm": {
       "date": "Datum",
       "startTime": "Startzeit",
       "endTime": "Endzeit",
       "workDescription": "Arbeitsbeschreibung",
       "descriptionPlaceholder": "Beschreibung hinzufügen",
-      "logTime": "Zeit erfassen",
+      "logTime": "Zeit protokollieren",
       "updateTime": "Zeit aktualisieren",
       "cancel": "Abbrechen",
       "selectDateError": "Bitte wählen Sie ein Datum",

worklenz-frontend/public/locales/de/task-list-table.json

@@ -40,6 +40,7 @@
   "addSubTaskText": "+ Unteraufgabe hinzufügen",
   "addTaskInputPlaceholder": "Aufgabe eingeben und Enter drücken",
   "noTasksInGroup": "Keine Aufgaben in dieser Gruppe",
+  "dropTaskHere": "Aufgabe hier ablegen",
 
   "openButton": "Öffnen",
   "okButton": "OK",

worklenz-frontend/public/locales/en/task-drawer/task-drawer.json

@@ -1,7 +1,13 @@
 {
   "taskHeader": {
     "taskNamePlaceholder": "Type your Task",
-    "deleteTask": "Delete Task"
+    "deleteTask": "Delete Task",
+    "parentTask": "Parent Task",
+    "currentTask": "Current Task",
+    "back": "Back",
+    "backToParent": "Back to Parent Task",
+    "toParentTask": "to parent task",
+    "loadingHierarchy": "Loading hierarchy..."
   },
   "taskInfoTab": {
     "title": "Info",

worklenz-frontend/public/locales/en/task-list-table.json

@@ -40,6 +40,7 @@
   "addSubTaskText": "Add Sub Task",
   "addTaskInputPlaceholder": "Type your task and hit enter",
   "noTasksInGroup": "No tasks in this group",
+  "dropTaskHere": "Drop task here",
 
   "openButton": "Open",
   "okButton": "Ok",

worklenz-frontend/public/locales/es/task-drawer/task-drawer.json

@@ -1,35 +1,41 @@
 {
   "taskHeader": {
-    "taskNamePlaceholder": "Escriba su Tarea",
-    "deleteTask": "Eliminar Tarea"
+    "taskNamePlaceholder": "Escribe tu tarea",
+    "deleteTask": "Eliminar tarea",
+    "parentTask": "Tarea principal",
+    "currentTask": "Tarea actual",
+    "back": "Volver",
+    "backToParent": "Volver a la tarea principal",
+    "toParentTask": "a la tarea principal",
+    "loadingHierarchy": "Cargando jerarquía..."
   },
   "taskInfoTab": {
     "title": "Información",
     "details": {
       "title": "Detalles",
-      "task-key": "Clave de Tarea",
+      "task-key": "Clave de tarea",
       "phase": "Fase",
       "assignees": "Asignados",
-      "due-date": "Fecha de Vencimiento",
-      "time-estimation": "Estimación de Tiempo",
+      "due-date": "Fecha de vencimiento",
+      "time-estimation": "Estimación de tiempo",
       "priority": "Prioridad",
       "labels": "Etiquetas",
       "billable": "Facturable",
       "notify": "Notificar",
-      "when-done-notify": "Al terminar, notificar",
-      "start-date": "Fecha de Inicio",
-      "end-date": "Fecha de Fin",
-      "hide-start-date": "Ocultar Fecha de Inicio",
-      "show-start-date": "Mostrar Fecha de Inicio",
+      "when-done-notify": "Al finalizar, notificar",
+      "start-date": "Fecha de inicio",
+      "end-date": "Fecha de finalización",
+      "hide-start-date": "Ocultar fecha de inicio",
+      "show-start-date": "Mostrar fecha de inicio",
       "hours": "Horas",
       "minutes": "Minutos",
-      "progressValue": "Valor de Progreso",
+      "progressValue": "Valor de progreso",
       "progressValueTooltip": "Establecer el porcentaje de progreso (0-100%)",
-      "progressValueRequired": "Por favor, introduzca un valor de progreso",
+      "progressValueRequired": "Por favor ingrese un valor de progreso",
       "progressValueRange": "El progreso debe estar entre 0 y 100",
-      "taskWeight": "Peso de la Tarea",
+      "taskWeight": "Peso de la tarea",
       "taskWeightTooltip": "Establecer el peso de esta subtarea (porcentaje)",
-      "taskWeightRequired": "Por favor, introduzca un peso de tarea",
+      "taskWeightRequired": "Por favor ingrese un peso de tarea",
       "taskWeightRange": "El peso debe estar entre 0 y 100",
       "recurring": "Recurrente"
     },
@@ -39,85 +45,85 @@
     },
     "description": {
       "title": "Descripción",
-      "placeholder": "Añadir una descripción más detallada..."
+      "placeholder": "Añade una descripción más detallada..."
     },
     "subTasks": {
-      "title": "Sub Tareas",
-      "addSubTask": "Agregar Sub Tarea",
-      "addSubTaskInputPlaceholder": "Escriba su tarea y presione enter",
-      "refreshSubTasks": "Actualizar Sub Tareas",
+      "title": "Subtareas",
+      "addSubTask": "Añadir subtarea",
+      "addSubTaskInputPlaceholder": "Escribe tu tarea y presiona enter",
+      "refreshSubTasks": "Actualizar subtareas",
       "edit": "Editar",
       "delete": "Eliminar",
-      "confirmDeleteSubTask": "¿Está seguro de que desea eliminar esta subtarea?",
-      "deleteSubTask": "Eliminar Sub Tarea"
+      "confirmDeleteSubTask": "¿Estás seguro de que quieres eliminar esta subtarea?",
+      "deleteSubTask": "Eliminar subtarea"
     },
     "dependencies": {
       "title": "Dependencias",
-      "addDependency": "+ Agregar nueva dependencia",
+      "addDependency": "+ Añadir nueva dependencia",
       "blockedBy": "Bloqueado por",
-      "searchTask": "Escribir para buscar tarea",
+      "searchTask": "Escribe para buscar tarea",
       "noTasksFound": "No se encontraron tareas",
-      "confirmDeleteDependency": "¿Está seguro de que desea eliminar?"
+      "confirmDeleteDependency": "¿Estás seguro de que quieres eliminar?"
     },
     "attachments": {
       "title": "Adjuntos",
-      "chooseOrDropFileToUpload": "Elija o arrastre un archivo para subir",
+      "chooseOrDropFileToUpload": "Elige o arrastra archivo para subir",
       "uploading": "Subiendo..."
     },
     "comments": {
       "title": "Comentarios",
-      "addComment": "+ Agregar nuevo comentario",
+      "addComment": "+ Añadir nuevo comentario",
       "noComments": "Aún no hay comentarios. ¡Sé el primero en comentar!",
       "delete": "Eliminar",
-      "confirmDeleteComment": "¿Está seguro de que desea eliminar este comentario?",
-      "addCommentPlaceholder": "Agregar un comentario...",
+      "confirmDeleteComment": "¿Estás seguro de que quieres eliminar este comentario?",
+      "addCommentPlaceholder": "Añadir un comentario...",
       "cancel": "Cancelar",
       "commentButton": "Comentar",
       "attachFiles": "Adjuntar archivos",
-      "addMoreFiles": "Agregar más archivos",
-      "selectedFiles": "Archivos Seleccionados (Hasta 25MB, Máximo {count})",
-      "maxFilesError": "Solo puede subir un máximo de {count} archivos",
+      "addMoreFiles": "Añadir más archivos",
+      "selectedFiles": "Archivos seleccionados (Hasta 25MB, Máximo de {count})",
+      "maxFilesError": "Solo puedes subir un máximo de {count} archivos",
       "processFilesError": "Error al procesar archivos",
-      "addCommentError": "Por favor agregue un comentario o adjunte archivos",
+      "addCommentError": "Por favor añade un comentario o adjunta archivos",
       "createdBy": "Creado {{time}} por {{user}}",
       "updatedTime": "Actualizado {{time}}"
     },
     "searchInputPlaceholder": "Buscar por nombre",
-    "pendingInvitation": "Invitación Pendiente"
+    "pendingInvitation": "Invitación pendiente"
   },
   "taskTimeLogTab": {
-    "title": "Registro de Tiempo",
+    "title": "Registro de tiempo",
     "addTimeLog": "Añadir nuevo registro de tiempo",
-    "totalLogged": "Total Registrado",
+    "totalLogged": "Total registrado",
     "exportToExcel": "Exportar a Excel",
     "noTimeLogsFound": "No se encontraron registros de tiempo",
     "timeLogForm": {
       "date": "Fecha",
-      "startTime": "Hora de Inicio",
-      "endTime": "Hora de Fin",
-      "workDescription": "Descripción del Trabajo",
-      "descriptionPlaceholder": "Agregar una descripción",
+      "startTime": "Hora de inicio",
+      "endTime": "Hora de finalización",
+      "workDescription": "Descripción del trabajo",
+      "descriptionPlaceholder": "Añadir una descripción",
       "logTime": "Registrar tiempo",
       "updateTime": "Actualizar tiempo",
       "cancel": "Cancelar",
-      "selectDateError": "Por favor seleccione una fecha",
-      "selectStartTimeError": "Por favor seleccione la hora de inicio",
-      "selectEndTimeError": "Por favor seleccione la hora de fin",
-      "endTimeAfterStartError": "La hora de fin debe ser posterior a la hora de inicio"
+      "selectDateError": "Por favor selecciona una fecha",
+      "selectStartTimeError": "Por favor selecciona hora de inicio",
+      "selectEndTimeError": "Por favor selecciona hora de finalización",
+      "endTimeAfterStartError": "La hora de finalización debe ser posterior a la de inicio"
     }
   },
   "taskActivityLogTab": {
-    "title": "Registro de Actividad",
-    "add": "AGREGAR",
-    "remove": "QUITAR",
+    "title": "Registro de actividad",
+    "add": "AÑADIR",
+    "remove": "ELIMINAR",
     "none": "Ninguno",
     "weight": "Peso",
     "createdTask": "creó la tarea."
   },
   "taskProgress": {
-    "markAsDoneTitle": "¿Marcar Tarea como Completada?",
+    "markAsDoneTitle": "¿Marcar tarea como completada?",
     "confirmMarkAsDone": "Sí, marcar como completada",
     "cancelMarkAsDone": "No, mantener estado actual",
-    "markAsDoneDescription": "Ha establecido el progreso al 100%. ¿Le gustaría actualizar el estado de la tarea a \"Completada\"?"
+    "markAsDoneDescription": "Has establecido el progreso al 100%. ¿Te gustaría actualizar el estado de la tarea a \"Completada\"?"
   }
 }

worklenz-frontend/public/locales/es/task-list-table.json

@@ -39,6 +39,7 @@
   "addTaskText": "Agregar tarea",
   "addSubTaskText": "Agregar subtarea",
   "noTasksInGroup": "No hay tareas en este grupo",
+  "dropTaskHere": "Soltar tarea aquí",
   "addTaskInputPlaceholder": "Escribe tu tarea y presiona enter",
 
   "openButton": "Abrir",

worklenz-frontend/public/locales/pt/task-drawer/task-drawer.json

@@ -1,33 +1,39 @@
 {
   "taskHeader": {
-    "taskNamePlaceholder": "Digite sua Tarefa",
-    "deleteTask": "Deletar Tarefa"
+    "taskNamePlaceholder": "Digite sua tarefa",
+    "deleteTask": "Excluir tarefa",
+    "parentTask": "Tarefa principal",
+    "currentTask": "Tarefa atual",
+    "back": "Voltar",
+    "backToParent": "Voltar à tarefa principal",
+    "toParentTask": "à tarefa principal",
+    "loadingHierarchy": "Carregando hierarquia..."
   },
   "taskInfoTab": {
     "title": "Informações",
     "details": {
       "title": "Detalhes",
-      "task-key": "Chave da Tarefa",
+      "task-key": "Chave da tarefa",
       "phase": "Fase",
       "assignees": "Responsáveis",
-      "due-date": "Data de Vencimento",
-      "time-estimation": "Estimativa de Tempo",
+      "due-date": "Data de vencimento",
+      "time-estimation": "Estimativa de tempo",
       "priority": "Prioridade",
       "labels": "Etiquetas",
       "billable": "Faturável",
       "notify": "Notificar",
-      "when-done-notify": "Quando concluído, notificar",
-      "start-date": "Data de Início",
-      "end-date": "Data de Fim",
-      "hide-start-date": "Ocultar Data de Início",
-      "show-start-date": "Mostrar Data de Início",
+      "when-done-notify": "Ao concluir, notificar",
+      "start-date": "Data de início",
+      "end-date": "Data de término",
+      "hide-start-date": "Ocultar data de início",
+      "show-start-date": "Mostrar data de início",
       "hours": "Horas",
       "minutes": "Minutos",
-      "progressValue": "Valor do Progresso",
+      "progressValue": "Valor do progresso",
       "progressValueTooltip": "Definir a porcentagem de progresso (0-100%)",
       "progressValueRequired": "Por favor, insira um valor de progresso",
       "progressValueRange": "O progresso deve estar entre 0 e 100",
-      "taskWeight": "Peso da Tarefa",
+      "taskWeight": "Peso da tarefa",
       "taskWeightTooltip": "Definir o peso desta subtarefa (porcentagem)",
       "taskWeightRequired": "Por favor, insira um peso da tarefa",
       "taskWeightRange": "O peso deve estar entre 0 e 100",
@@ -39,17 +45,17 @@
     },
     "description": {
       "title": "Descrição",
-      "placeholder": "Adicionar uma descrição mais detalhada..."
+      "placeholder": "Adicione uma descrição mais detalhada..."
     },
     "subTasks": {
-      "title": "Sub Tarefas",
-      "addSubTask": "Adicionar Sub Tarefa",
+      "title": "Subtarefas",
+      "addSubTask": "Adicionar subtarefa",
       "addSubTaskInputPlaceholder": "Digite sua tarefa e pressione enter",
-      "refreshSubTasks": "Atualizar Sub Tarefas",
+      "refreshSubTasks": "Atualizar subtarefas",
       "edit": "Editar",
-      "delete": "Deletar",
-      "confirmDeleteSubTask": "Tem certeza de que deseja deletar esta subtarefa?",
-      "deleteSubTask": "Deletar Sub Tarefa"
+      "delete": "Excluir",
+      "confirmDeleteSubTask": "Tem certeza de que deseja excluir esta subtarefa?",
+      "deleteSubTask": "Excluir subtarefa"
     },
     "dependencies": {
       "title": "Dependências",
@@ -57,57 +63,57 @@
       "blockedBy": "Bloqueado por",
       "searchTask": "Digite para pesquisar tarefa",
       "noTasksFound": "Nenhuma tarefa encontrada",
-      "confirmDeleteDependency": "Tem certeza de que deseja deletar?"
+      "confirmDeleteDependency": "Tem certeza de que deseja excluir?"
     },
     "attachments": {
       "title": "Anexos",
-      "chooseOrDropFileToUpload": "Escolha ou arraste um arquivo para upload",
+      "chooseOrDropFileToUpload": "Escolha ou arraste arquivo para enviar",
       "uploading": "Enviando..."
     },
     "comments": {
       "title": "Comentários",
       "addComment": "+ Adicionar novo comentário",
       "noComments": "Ainda não há comentários. Seja o primeiro a comentar!",
-      "delete": "Deletar",
-      "confirmDeleteComment": "Tem certeza de que deseja deletar este comentário?",
+      "delete": "Excluir",
+      "confirmDeleteComment": "Tem certeza de que deseja excluir este comentário?",
       "addCommentPlaceholder": "Adicionar um comentário...",
       "cancel": "Cancelar",
       "commentButton": "Comentar",
       "attachFiles": "Anexar arquivos",
       "addMoreFiles": "Adicionar mais arquivos",
-      "selectedFiles": "Arquivos Selecionados (Até 25MB, Máximo {count})",
-      "maxFilesError": "Você pode fazer upload de no máximo {count} arquivos",
+      "selectedFiles": "Arquivos selecionados (Até 25MB, Máximo de {count})",
+      "maxFilesError": "Você pode enviar no máximo {count} arquivos",
       "processFilesError": "Falha ao processar arquivos",
-      "addCommentError": "Por favor adicione um comentário ou anexe arquivos",
+      "addCommentError": "Por favor, adicione um comentário ou anexe arquivos",
       "createdBy": "Criado {{time}} por {{user}}",
       "updatedTime": "Atualizado {{time}}"
     },
     "searchInputPlaceholder": "Pesquisar por nome",
-    "pendingInvitation": "Convite Pendente"
+    "pendingInvitation": "Convite pendente"
   },
   "taskTimeLogTab": {
-    "title": "Registro de Tempo",
+    "title": "Registro de tempo",
     "addTimeLog": "Adicionar novo registro de tempo",
-    "totalLogged": "Total Registrado",
+    "totalLogged": "Total registrado",
     "exportToExcel": "Exportar para Excel",
     "noTimeLogsFound": "Nenhum registro de tempo encontrado",
     "timeLogForm": {
       "date": "Data",
-      "startTime": "Hora de Início",
-      "endTime": "Hora de Fim",
-      "workDescription": "Descrição do Trabalho",
+      "startTime": "Hora de início",
+      "endTime": "Hora de término",
+      "workDescription": "Descrição do trabalho",
       "descriptionPlaceholder": "Adicionar uma descrição",
       "logTime": "Registrar tempo",
       "updateTime": "Atualizar tempo",
       "cancel": "Cancelar",
-      "selectDateError": "Por favor selecione uma data",
-      "selectStartTimeError": "Por favor selecione a hora de início",
-      "selectEndTimeError": "Por favor selecione a hora de fim",
-      "endTimeAfterStartError": "A hora de fim deve ser posterior à hora de início"
+      "selectDateError": "Por favor, selecione uma data",
+      "selectStartTimeError": "Por favor, selecione a hora de início",
+      "selectEndTimeError": "Por favor, selecione a hora de término",
+      "endTimeAfterStartError": "A hora de término deve ser posterior à hora de início"
     }
   },
   "taskActivityLogTab": {
-    "title": "Registro de Atividade",
+    "title": "Registro de atividade",
     "add": "ADICIONAR",
     "remove": "REMOVER",
     "none": "Nenhum",
@@ -115,7 +121,7 @@
     "createdTask": "criou a tarefa."
   },
   "taskProgress": {
-    "markAsDoneTitle": "Marcar Tarefa como Concluída?",
+    "markAsDoneTitle": "Marcar tarefa como concluída?",
     "confirmMarkAsDone": "Sim, marcar como concluída",
     "cancelMarkAsDone": "Não, manter status atual",
     "markAsDoneDescription": "Você definiu o progresso para 100%. Gostaria de atualizar o status da tarefa para \"Concluída\"?"

worklenz-frontend/public/locales/pt/task-list-table.json

@@ -39,6 +39,7 @@
   "addTaskText": "Adicionar Tarefa",
   "addSubTaskText": "+ Adicionar Subtarefa",
   "noTasksInGroup": "Nenhuma tarefa neste grupo",
+  "dropTaskHere": "Soltar tarefa aqui",
   "addTaskInputPlaceholder": "Digite sua tarefa e pressione enter",
 
   "openButton": "Abrir",

worklenz-frontend/public/locales/zh/task-drawer/task-drawer.json

@@ -1,22 +1,28 @@
 {
   "taskHeader": {
     "taskNamePlaceholder": "输入您的任务",
-    "deleteTask": "删除任务"
+    "deleteTask": "删除任务",
+    "parentTask": "父任务",
+    "currentTask": "当前任务",
+    "back": "返回",
+    "backToParent": "返回父任务",
+    "toParentTask": "到父任务",
+    "loadingHierarchy": "加载层次结构..."
   },
   "taskInfoTab": {
     "title": "信息",
     "details": {
-      "title": "详情",
+      "title": "详细信息",
       "task-key": "任务键",
       "phase": "阶段",
-      "assignees": "受让人",
+      "assignees": "受理人",
       "due-date": "截止日期",
       "time-estimation": "时间估算",
       "priority": "优先级",
       "labels": "标签",
       "billable": "可计费",
       "notify": "通知",
-      "when-done-notify": "完成时，通知",
+      "when-done-notify": "完成时通知",
       "start-date": "开始日期",
       "end-date": "结束日期",
       "hide-start-date": "隐藏开始日期",
@@ -24,18 +30,18 @@
       "hours": "小时",
       "minutes": "分钟",
       "progressValue": "进度值",
-      "progressValueTooltip": "设置进度百分比（0-100%）",
+      "progressValueTooltip": "设置进度百分比 (0-100%)",
       "progressValueRequired": "请输入进度值",
-      "progressValueRange": "进度必须在0到100之间",
+      "progressValueRange": "进度必须在 0 到 100 之间",
       "taskWeight": "任务权重",
-      "taskWeightTooltip": "设置此子任务的权重（百分比）",
+      "taskWeightTooltip": "设置此子任务的权重 (百分比)",
       "taskWeightRequired": "请输入任务权重",
-      "taskWeightRange": "权重必须在0到100之间",
+      "taskWeightRange": "权重必须在 0 到 100 之间",
       "recurring": "重复"
     },
     "labels": {
       "labelInputPlaceholder": "搜索或创建",
-      "labelsSelectorInputTip": "按回车创建"
+      "labelsSelectorInputTip": "按 Enter 键创建"
     },
     "description": {
       "title": "描述",
@@ -44,7 +50,7 @@
     "subTasks": {
       "title": "子任务",
       "addSubTask": "添加子任务",
-      "addSubTaskInputPlaceholder": "输入您的任务并按回车",
+      "addSubTaskInputPlaceholder": "输入您的任务并按回车键",
       "refreshSubTasks": "刷新子任务",
       "edit": "编辑",
       "delete": "删除",
@@ -52,10 +58,10 @@
       "deleteSubTask": "删除子任务"
     },
     "dependencies": {
-      "title": "依赖关系",
-      "addDependency": "+ 添加新依赖",
+      "title": "依赖项",
+      "addDependency": "+ 添加新依赖项",
       "blockedBy": "被阻止",
-      "searchTask": "输入搜索任务",
+      "searchTask": "输入以搜索任务",
       "noTasksFound": "未找到任务",
       "confirmDeleteDependency": "您确定要删除吗？"
     },
@@ -67,7 +73,7 @@
     "comments": {
       "title": "评论",
       "addComment": "+ 添加新评论",
-      "noComments": "还没有评论。成为第一个评论的人！",
+      "noComments": "还没有评论。成为第一个评论者！",
       "delete": "删除",
       "confirmDeleteComment": "您确定要删除此评论吗？",
       "addCommentPlaceholder": "添加评论...",
@@ -75,12 +81,12 @@
       "commentButton": "评论",
       "attachFiles": "附加文件",
       "addMoreFiles": "添加更多文件",
-      "selectedFiles": "已选择的文件（最多25MB，最大{count}个）",
-      "maxFilesError": "您最多只能上传{count}个文件",
+      "selectedFiles": "选定文件 (最多 25MB，最多 {count} 个)",
+      "maxFilesError": "您最多只能上传 {count} 个文件",
       "processFilesError": "处理文件失败",
       "addCommentError": "请添加评论或附加文件",
-      "createdBy": "{{time}}由{{user}}创建",
-      "updatedTime": "更新于{{time}}"
+      "createdBy": "由 {{user}} 在 {{time}} 创建",
+      "updatedTime": "更新于 {{time}}"
     },
     "searchInputPlaceholder": "按名称搜索",
     "pendingInvitation": "待处理邀请"
@@ -88,8 +94,8 @@
   "taskTimeLogTab": {
     "title": "时间日志",
     "addTimeLog": "添加新时间日志",
-    "totalLogged": "总记录时间",
-    "exportToExcel": "导出到Excel",
+    "totalLogged": "总计记录",
+    "exportToExcel": "导出到 Excel",
     "noTimeLogsFound": "未找到时间日志",
     "timeLogForm": {
       "date": "日期",
@@ -103,7 +109,7 @@
       "selectDateError": "请选择日期",
       "selectStartTimeError": "请选择开始时间",
       "selectEndTimeError": "请选择结束时间",
-      "endTimeAfterStartError": "结束时间必须在开始时间之后"
+      "endTimeAfterStartError": "结束时间必须晚于开始时间"
     }
   },
   "taskActivityLogTab": {
@@ -116,8 +122,8 @@
   },
   "taskProgress": {
     "markAsDoneTitle": "将任务标记为完成？",
-    "confirmMarkAsDone": "是的，标记为完成",
-    "cancelMarkAsDone": "不，保持当前状态",
-    "markAsDoneDescription": "您已将进度设置为100%。您想将任务状态更新为\"完成\"吗？"
+    "confirmMarkAsDone": "是，标记为完成",
+    "cancelMarkAsDone": "否，保持当前状态",
+    "markAsDoneDescription": "您已将进度设置为 100%。您想将任务状态更新为\"完成\"吗？"
   }
 }

worklenz-frontend/public/locales/zh/task-list-table.json

@@ -37,6 +37,7 @@
   "addSubTaskText": "+ 添加子任务",
   "addTaskInputPlaceholder": "输入任务并按回车键",
   "noTasksInGroup": "此组中没有任务",
+  "dropTaskHere": "将任务拖到这里",
   "openButton": "打开",
   "okButton": "确定",
   "noLabelsFound": "未找到标签",

worklenz-frontend/public/sw.js

@@ -331,6 +331,13 @@ self.addEventListener('message', event => {
       });
       break;
       
+    case 'LOGOUT':
+      // Special handler for logout - clear all caches and unregister
+      handleLogout().then(() => {
+        event.ports[0].postMessage({ success: true });
+      });
+      break;
+      
     default:
       console.log('Service Worker: Unknown message type', type);
   }
@@ -342,4 +349,19 @@ async function clearAllCaches() {
   console.log('Service Worker: All caches cleared');
 }
 
+async function handleLogout() {
+  try {
+    // Clear all caches
+    await clearAllCaches();
+    
+    // Unregister the service worker to force fresh registration on next visit
+    await self.registration.unregister();
+    
+    console.log('Service Worker: Logout handled - caches cleared and unregistered');
+  } catch (error) {
+    console.error('Service Worker: Error during logout handling', error);
+    throw error;
+  }
+}
+
 console.log('Service Worker: Loaded successfully'); 

worklenz-frontend/src/App.tsx

@@ -5,6 +5,7 @@ import i18next from 'i18next';
 
 // Components
 import ThemeWrapper from './features/theme/ThemeWrapper';
+import ModuleErrorBoundary from './components/ModuleErrorBoundary';
 
 // Routes
 import router from './app/routes';
@@ -13,6 +14,7 @@ import router from './app/routes';
 import { useAppSelector } from './hooks/useAppSelector';
 import { initMixpanel } from './utils/mixpanelInit';
 import { initializeCsrfToken } from './api/api-client';
+import CacheCleanup from './utils/cache-cleanup';
 
 // Types & Constants
 import { Language } from './features/i18n/localesSlice';
@@ -113,6 +115,56 @@ const App: React.FC = memo(() => {
     };
   }, []);
 
+  // Global error handlers for module loading issues
+  useEffect(() => {
+    const handleUnhandledRejection = (event: PromiseRejectionEvent) => {
+      const error = event.reason;
+      
+      // Check if this is a module loading error
+      if (
+        error?.message?.includes('Failed to fetch dynamically imported module') ||
+        error?.message?.includes('Loading chunk') ||
+        error?.name === 'ChunkLoadError'
+      ) {
+        console.error('Unhandled module loading error:', error);
+        event.preventDefault(); // Prevent default browser error handling
+        
+        // Clear caches and reload
+        CacheCleanup.clearAllCaches()
+          .then(() => CacheCleanup.forceReload('/auth/login'))
+          .catch(() => window.location.reload());
+      }
+    };
+
+    const handleError = (event: ErrorEvent) => {
+      const error = event.error;
+      
+      // Check if this is a module loading error
+      if (
+        error?.message?.includes('Failed to fetch dynamically imported module') ||
+        error?.message?.includes('Loading chunk') ||
+        error?.name === 'ChunkLoadError'
+      ) {
+        console.error('Global module loading error:', error);
+        event.preventDefault(); // Prevent default browser error handling
+        
+        // Clear caches and reload
+        CacheCleanup.clearAllCaches()
+          .then(() => CacheCleanup.forceReload('/auth/login'))
+          .catch(() => window.location.reload());
+      }
+    };
+
+    // Add global error handlers
+    window.addEventListener('unhandledrejection', handleUnhandledRejection);
+    window.addEventListener('error', handleError);
+
+    return () => {
+      window.removeEventListener('unhandledrejection', handleUnhandledRejection);
+      window.removeEventListener('error', handleError);
+    };
+  }, []);
+
   // Register service worker
   useEffect(() => {
     registerSW({
@@ -150,12 +202,14 @@ const App: React.FC = memo(() => {
   return (
     <Suspense fallback={<SuspenseFallback />}>
       <ThemeWrapper>
-        <RouterProvider
-          router={router}
-          future={{
-            v7_startTransition: true,
-          }}
-        />
+        <ModuleErrorBoundary>
+          <RouterProvider
+            router={router}
+            future={{
+              v7_startTransition: true,
+            }}
+          />
+        </ModuleErrorBoundary>
       </ThemeWrapper>
     </Suspense>
   );

worklenz-frontend/src/app/routes/index.tsx

@@ -90,6 +90,23 @@ export const SetupGuard = memo(({ children }: GuardProps) => {
 
 SetupGuard.displayName = 'SetupGuard';
 
+// Combined guard for routes that require both authentication and setup completion
+export const AuthAndSetupGuard = memo(({ children }: GuardProps) => {
+  const { isAuthenticated, isSetupComplete, location } = useAuthStatus();
+
+  if (!isAuthenticated) {
+    return <Navigate to="/auth" state={{ from: location }} replace />;
+  }
+
+  if (!isSetupComplete) {
+    return <Navigate to="/worklenz/setup" />;
+  }
+
+  return <>{children}</>;
+});
+
+AuthAndSetupGuard.displayName = 'AuthAndSetupGuard';
+
 // Optimized route wrapping function with Suspense boundaries
 const wrapRoutes = (
   routes: RouteObject[],
@@ -171,9 +188,11 @@ StaticLicenseExpired.displayName = 'StaticLicenseExpired';
 // Create route arrays (moved outside of useMemo to avoid hook violations)
 const publicRoutes = [...rootRoutes, ...authRoutes, notFoundRoute];
 
-const protectedMainRoutes = wrapRoutes(mainRoutes, AuthGuard);
+// Apply combined guard to main routes that require both auth and setup completion
+const protectedMainRoutes = wrapRoutes(mainRoutes, AuthAndSetupGuard);
 const adminRoutes = wrapRoutes(reportingRoutes, AdminGuard);
-const setupRoutes = wrapRoutes([accountSetupRoute], SetupGuard);
+// Setup route should be accessible without setup completion, only requires authentication
+const setupRoutes = wrapRoutes([accountSetupRoute], AuthGuard);
 
 // License expiry check function
 const withLicenseExpiryCheck = (routes: RouteObject[]): RouteObject[] => {

worklenz-frontend/src/components/CustomColordLabel.tsx

@@ -39,7 +39,7 @@ const CustomColordLabel = React.forwardRef<HTMLSpanElement, CustomColordLabelPro
       <Tooltip title={label.name}>
         <span
           ref={ref}
-          className="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium shrink-0 max-w-[120px]"
+          className="inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium shrink-0 max-w-[100px]"
           style={{ 
             backgroundColor,
             color: textColor,

worklenz-frontend/src/components/CustomNumberLabel.tsx

@@ -21,8 +21,8 @@ const CustomNumberLabel = React.forwardRef<HTMLSpanElement, CustomNumberLabelPro
       <Tooltip title={labelList.join(', ')}>
         <span
           ref={ref}
-          className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium text-white cursor-help"
-          style={{ backgroundColor }}
+          className="inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium cursor-help"
+          style={{ backgroundColor, color: 'white' }}
         >
           {namesString}
         </span>

worklenz-frontend/src/components/ModuleErrorBoundary.tsx

@@ -0,0 +1,110 @@
+import React, { Component, ErrorInfo, ReactNode } from 'react';
+import { Button, Result } from 'antd';
+import CacheCleanup from '@/utils/cache-cleanup';
+
+interface Props {
+  children: ReactNode;
+}
+
+interface State {
+  hasError: boolean;
+  error?: Error;
+}
+
+class ModuleErrorBoundary extends Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError(error: Error): State {
+    // Check if this is a module loading error
+    const isModuleError = 
+      error.message.includes('Failed to fetch dynamically imported module') ||
+      error.message.includes('Loading chunk') ||
+      error.message.includes('Loading CSS chunk') ||
+      error.name === 'ChunkLoadError';
+
+    if (isModuleError) {
+      return { hasError: true, error };
+    }
+
+    // For other errors, let them bubble up
+    return { hasError: false };
+  }
+
+  componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+    console.error('Module Error Boundary caught an error:', error, errorInfo);
+    
+    // If this is a module loading error, clear caches and reload
+    if (this.state.hasError) {
+      this.handleModuleError();
+    }
+  }
+
+  private async handleModuleError() {
+    try {
+      console.log('Handling module loading error - clearing caches...');
+      
+      // Clear all caches
+      await CacheCleanup.clearAllCaches();
+      
+      // Force reload to login page
+      CacheCleanup.forceReload('/auth/login');
+    } catch (cacheError) {
+      console.error('Failed to handle module error:', cacheError);
+      // Fallback: just reload the page
+      window.location.reload();
+    }
+  }
+
+  private handleRetry = async () => {
+    try {
+      await CacheCleanup.clearAllCaches();
+      CacheCleanup.forceReload('/auth/login');
+    } catch (error) {
+      console.error('Retry failed:', error);
+      window.location.reload();
+    }
+  };
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <div style={{ 
+          display: 'flex', 
+          justifyContent: 'center', 
+          alignItems: 'center', 
+          minHeight: '100vh',
+          padding: '20px'
+        }}>
+          <Result
+            status="error"
+            title="Module Loading Error"
+            subTitle="There was an issue loading the application. This usually happens after updates or during logout."
+            extra={[
+              <Button 
+                type="primary" 
+                key="retry" 
+                onClick={this.handleRetry}
+                loading={false}
+              >
+                Retry
+              </Button>,
+              <Button 
+                key="reload" 
+                onClick={() => window.location.reload()}
+              >
+                Reload Page
+              </Button>
+            ]}
+          />
+        </div>
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
+export default ModuleErrorBoundary; 

worklenz-frontend/src/components/account-setup/project-step.tsx

@@ -1,5 +1,5 @@
 import React, { startTransition, useEffect, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
@@ -18,6 +18,11 @@ import { IAccountSetupRequest } from '@/types/project-templates/project-template
 import { evt_account_setup_template_complete } from '@/shared/worklenz-analytics-events';
 import { useMixpanelTracking } from '@/hooks/useMixpanelTracking';
 import { createPortal } from 'react-dom';
+import { useAppDispatch } from '@/hooks/useAppDispatch';
+import { verifyAuthentication } from '@/features/auth/authSlice';
+import { setUser } from '@/features/user/userSlice';
+import { setSession } from '@/utils/session-helper';
+import { IAuthorizeResponse } from '@/types/auth/login.types';
 
 const { Title } = Typography;
 
@@ -29,7 +34,7 @@ interface Props {
 
 export const ProjectStep: React.FC<Props> = ({ onEnter, styles, isDarkMode = false }) => {
   const { t } = useTranslation('account-setup');
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
   const navigate = useNavigate();
   const { trackMixpanelEvent } = useMixpanelTracking();
 
@@ -69,6 +74,18 @@ export const ProjectStep: React.FC<Props> = ({ onEnter, styles, isDarkMode = fal
       if (res.done && res.body.id) {
         toggleTemplateSelector(false);
         trackMixpanelEvent(evt_account_setup_template_complete);
+        
+        // Refresh user session to update setup_completed status
+        try {
+          const authResponse = await dispatch(verifyAuthentication()).unwrap() as IAuthorizeResponse;
+          if (authResponse?.authenticated && authResponse?.user) {
+            setSession(authResponse.user);
+            dispatch(setUser(authResponse.user));
+          }
+        } catch (error) {
+          logger.error('Failed to refresh user session after template setup completion', error);
+        }
+        
         navigate(`/worklenz/projects/${res.body.id}?tab=tasks-list&pinned_tab=tasks-list`);
       }
     } catch (error) {

worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoardNativeDnD/EnhancedKanbanBoardNativeDnD.tsx

@@ -19,7 +19,6 @@ import { useAuthService } from '@/hooks/useAuth';
 import { statusApiService } from '@/api/taskAttributes/status/status.api.service';
 import alertService from '@/services/alerts/alertService';
 import logger from '@/utils/errorLogger';
-import Skeleton from 'antd/es/skeleton/Skeleton';
 import { checkTaskDependencyStatus } from '@/utils/check-task-dependency-status';
 import { useTaskSocketHandlers } from '@/hooks/useTaskSocketHandlers';
 
@@ -148,11 +147,11 @@ const EnhancedKanbanBoardNativeDnD: React.FC<{ projectId: string }> = ({ project
     const targetGroup = taskGroups.find(g => g.id === targetGroupId);
     if (!sourceGroup || !targetGroup) return;
 
-
     const taskIdx = sourceGroup.tasks.findIndex(t => t.id === draggedTaskId);
     if (taskIdx === -1) return;
 
     const movedTask = sourceGroup.tasks[taskIdx];
+    let didStatusChange = false;
     if (groupBy === 'status' && movedTask.id) {
       if (sourceGroup.id !== targetGroup.id) {
         const canContinue = await checkTaskDependencyStatus(movedTask.id, targetGroupId);
@@ -163,6 +162,7 @@ const EnhancedKanbanBoardNativeDnD: React.FC<{ projectId: string }> = ({ project
           );
           return;
         }
+        didStatusChange = true;
       }
     }
     let insertIdx = hoveredTaskIdx;
@@ -259,6 +259,18 @@ const EnhancedKanbanBoardNativeDnD: React.FC<{ projectId: string }> = ({ project
         team_id: teamId,
       });
 
+      // Emit progress update if status changed
+      if (didStatusChange) {
+        socket.emit(
+          SocketEvents.TASK_STATUS_CHANGE.toString(),
+          JSON.stringify({
+            task_id: movedTask.id,
+            status_id: targetGroupId,
+            parent_task: movedTask.parent_task_id || null,
+            team_id: teamId,
+          })
+        );
+      }
     }
 
     setDraggedTaskId(null);

worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoardNativeDnD/TaskCard.tsx

@@ -15,6 +15,7 @@ import { SocketEvents } from '@/shared/socket-events';
 import { getUserSession } from '@/utils/session-helper';
 import { themeWiseColor } from '@/utils/themeWiseColor';
 import { toggleTaskExpansion, fetchBoardSubTasks } from '@/features/enhanced-kanban/enhanced-kanban.slice';
+import TaskProgressCircle from './TaskProgressCircle';
 
 // Simple Portal component
 const Portal: React.FC<{ children: React.ReactNode }> = ({ children }) => {
@@ -69,7 +70,6 @@ const TaskCard: React.FC<TaskCardProps> = memo(({
         const d = selectedDate || new Date();
         return new Date(d.getFullYear(), d.getMonth(), 1);
     });
-    const [showSubtasks, setShowSubtasks] = useState(false);
 
     useEffect(() => {
         setSelectedDate(task.end_date ? new Date(task.end_date) : null);
@@ -202,7 +202,11 @@ const TaskCard: React.FC<TaskCardProps> = memo(({
 
     return (
         <>
-            <div className="enhanced-kanban-task-card" style={{ background, color, display: 'block' }} >
+            <div className="enhanced-kanban-task-card" style={{ background, color, display: 'block', position: 'relative' }} >
+                {/* Progress circle at top right */}
+                <div style={{ position: 'absolute', top: 6, right: 6, zIndex: 2 }}>
+                    <TaskProgressCircle task={task} size={20} />
+                </div>
                 <div
                     draggable
                     onDragStart={e => onTaskDragStart(e, task.id!, groupId)}
@@ -450,7 +454,7 @@ const TaskCard: React.FC<TaskCardProps> = memo(({
                                                 style={{ backgroundColor: themeMode === 'dark' ? (sub.priority_color_dark || sub.priority_color || '#d9d9d9') : (sub.priority_color || '#d9d9d9') }}
                                             ></span>
                                         ) : null}
-                                        <span className="flex-1 truncate text-xs text-gray-800 dark:text-gray-100">{sub.name}</span>
+                                        <span className="flex-1 truncate text-xs text-gray-800 dark:text-gray-100" title={sub.name}>{sub.name}</span>
                                         <span
                                             className="task-due-date ml-2 text-[10px] text-gray-500 dark:text-gray-400"
                                         >

worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoardNativeDnD/TaskProgressCircle.tsx

@@ -0,0 +1,52 @@
+import { IProjectTask } from "@/types/project/projectTasksViewModel.types";
+
+// Add a simple circular progress component
+const TaskProgressCircle: React.FC<{ task: IProjectTask; size?: number }> = ({ task, size = 28 }) => {
+    const progress = typeof task.complete_ratio === 'number'
+        ? task.complete_ratio
+        : (typeof task.progress === 'number' ? task.progress : 0);
+    const strokeWidth = 1.5;
+    const radius = (size - strokeWidth) / 2;
+    const circumference = 2 * Math.PI * radius;
+    const offset = circumference - (progress / 100) * circumference;
+    return (
+        <svg width={size} height={size} style={{ display: 'block' }}>
+            
+            <circle
+                cx={size / 2}
+                cy={size / 2}
+                r={radius}
+                stroke={progress === 100 ? "#22c55e" : "#3b82f6"}
+                strokeWidth={strokeWidth}
+                fill="none"
+                strokeDasharray={circumference}
+                strokeDashoffset={offset}
+                strokeLinecap="round"
+                style={{ transition: 'stroke-dashoffset 0.3s' }}
+            />
+            {progress === 100 ? (
+                // Green checkmark icon
+                <g>
+                    <circle cx={size / 2} cy={size / 2} r={radius} fill="#22c55e" opacity="0.15" />
+                    <svg x={(size/2)-(size*0.22)} y={(size/2)-(size*0.22)} width={size*0.44} height={size*0.44} viewBox="0 0 24 24">
+                        <path d="M5 13l4 4L19 7" stroke="#22c55e" strokeWidth="2.2" fill="none" strokeLinecap="round" strokeLinejoin="round"/>
+                    </svg>
+                </g>
+            ) : progress > 0 && (
+                <text
+                    x="50%"
+                    y="50%"
+                    textAnchor="middle"
+                    dominantBaseline="central"
+                    fontSize={size * 0.38}
+                    fill="#3b82f6"
+                    fontWeight="bold"
+                >
+                    {Math.round(progress)}
+                </text>
+            )}
+        </svg>
+    );
+};
+
+export default TaskProgressCircle;

worklenz-frontend/src/components/enhanced-kanban/PerformanceMonitor.css

@@ -1,101 +0,0 @@
-.performance-monitor {
-  position: fixed;
-  top: 80px;
-  right: 16px;
-  width: 280px;
-  z-index: 1000;
-  background: var(--ant-color-bg-elevated);
-  border: 1px solid var(--ant-color-border);
-  box-shadow: 0 4px 12px var(--ant-color-shadow);
-}
-
-.performance-monitor-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-weight: 600;
-  color: var(--ant-color-text);
-}
-
-.performance-status {
-  font-size: 10px;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-}
-
-.performance-metrics {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 12px;
-  margin-bottom: 12px;
-}
-
-.performance-metrics .ant-statistic {
-  text-align: center;
-}
-
-.performance-metrics .ant-statistic-title {
-  font-size: 12px;
-  color: var(--ant-color-text-secondary);
-  margin-bottom: 4px;
-}
-
-.performance-metrics .ant-statistic-content {
-  font-size: 14px;
-  color: var(--ant-color-text);
-}
-
-.virtualization-status {
-  grid-column: 1 / -1;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 8px 0;
-  border-top: 1px solid var(--ant-color-border);
-}
-
-.status-label {
-  font-size: 12px;
-  color: var(--ant-color-text-secondary);
-  font-weight: 500;
-}
-
-.performance-tips {
-  margin-top: 12px;
-  padding-top: 12px;
-  border-top: 1px solid var(--ant-color-border);
-}
-
-.performance-tips h4 {
-  font-size: 12px;
-  color: var(--ant-color-text);
-  margin-bottom: 8px;
-  font-weight: 600;
-}
-
-.performance-tips ul {
-  margin: 0;
-  padding-left: 16px;
-}
-
-.performance-tips li {
-  font-size: 11px;
-  color: var(--ant-color-text-secondary);
-  margin-bottom: 4px;
-  line-height: 1.4;
-}
-
-/* Responsive design */
-@media (max-width: 768px) {
-  .performance-monitor {
-    position: static;
-    width: 100%;
-    margin-bottom: 16px;
-  }
-
-  .performance-metrics {
-    grid-template-columns: 1fr;
-    gap: 8px;
-  }
-}

worklenz-frontend/src/components/enhanced-kanban/PerformanceMonitor.tsx

@@ -1,108 +0,0 @@
-import React from 'react';
-import { Card, Statistic, Tooltip, Badge } from 'antd';
-import { useSelector } from 'react-redux';
-import { RootState } from '@/app/store';
-import './PerformanceMonitor.css';
-
-const PerformanceMonitor: React.FC = () => {
-  const { performanceMetrics } = useSelector((state: RootState) => state.enhancedKanbanReducer);
-
-  // Only show if there are tasks loaded
-  if (performanceMetrics.totalTasks === 0) {
-    return null;
-  }
-
-  const getPerformanceStatus = () => {
-    if (performanceMetrics.totalTasks > 1000) return 'critical';
-    if (performanceMetrics.totalTasks > 500) return 'warning';
-    if (performanceMetrics.totalTasks > 100) return 'good';
-    return 'excellent';
-  };
-
-  const getStatusColor = (status: string) => {
-    switch (status) {
-      case 'critical':
-        return 'red';
-      case 'warning':
-        return 'orange';
-      case 'good':
-        return 'blue';
-      case 'excellent':
-        return 'green';
-      default:
-        return 'default';
-    }
-  };
-
-  const status = getPerformanceStatus();
-  const statusColor = getStatusColor(status);
-
-  return (
-    <Card
-      size="small"
-      className="performance-monitor"
-      title={
-        <div className="performance-monitor-header">
-          <span>Performance Monitor</span>
-          <Badge
-            status={statusColor as any}
-            text={status.toUpperCase()}
-            className="performance-status"
-          />
-        </div>
-      }
-    >
-      <div className="performance-metrics">
-        <Tooltip title="Total number of tasks across all groups">
-          <Statistic
-            title="Total Tasks"
-            value={performanceMetrics.totalTasks}
-            suffix="tasks"
-            valueStyle={{ fontSize: '16px' }}
-          />
-        </Tooltip>
-
-        <Tooltip title="Largest group by number of tasks">
-          <Statistic
-            title="Largest Group"
-            value={performanceMetrics.largestGroupSize}
-            suffix="tasks"
-            valueStyle={{ fontSize: '16px' }}
-          />
-        </Tooltip>
-
-        <Tooltip title="Average tasks per group">
-          <Statistic
-            title="Average Group"
-            value={Math.round(performanceMetrics.averageGroupSize)}
-            suffix="tasks"
-            valueStyle={{ fontSize: '16px' }}
-          />
-        </Tooltip>
-
-        <Tooltip title="Virtualization is enabled for groups with more than 50 tasks">
-          <div className="virtualization-status">
-            <span className="status-label">Virtualization:</span>
-            <Badge
-              status={performanceMetrics.virtualizationEnabled ? 'success' : 'default'}
-              text={performanceMetrics.virtualizationEnabled ? 'Enabled' : 'Disabled'}
-            />
-          </div>
-        </Tooltip>
-      </div>
-
-      {performanceMetrics.totalTasks > 500 && (
-        <div className="performance-tips">
-          <h4>Performance Tips:</h4>
-          <ul>
-            <li>Use filters to reduce the number of visible tasks</li>
-            <li>Consider grouping by different criteria</li>
-            <li>Virtualization is automatically enabled for large groups</li>
-          </ul>
-        </div>
-      )}
-    </Card>
-  );
-};
-
-export default React.memo(PerformanceMonitor);

worklenz-frontend/src/components/enhanced-kanban/VirtualizedTaskList.css

@@ -1,60 +0,0 @@
-.virtualized-task-list {
-  background: transparent;
-  border-radius: 6px;
-  overflow: hidden;
-}
-
-.virtualized-task-row {
-  padding: 4px 0;
-  display: flex;
-  align-items: stretch;
-}
-
-.virtualized-empty-state {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: var(--ant-color-bg-container);
-  border-radius: 6px;
-  border: 2px dashed var(--ant-color-border);
-}
-
-.empty-message {
-  color: var(--ant-color-text-secondary);
-  font-size: 14px;
-  font-weight: 500;
-}
-
-/* Ensure virtualized list works well with drag and drop */
-.virtualized-task-list .react-window__inner {
-  overflow: visible !important;
-}
-
-/* Performance optimizations */
-.virtualized-task-list * {
-  will-change: transform;
-}
-
-/* Smooth scrolling */
-.virtualized-task-list {
-  scroll-behavior: smooth;
-}
-
-/* Custom scrollbar for better UX */
-.virtualized-task-list::-webkit-scrollbar {
-  width: 6px;
-}
-
-.virtualized-task-list::-webkit-scrollbar-track {
-  background: var(--ant-color-bg-container);
-  border-radius: 3px;
-}
-
-.virtualized-task-list::-webkit-scrollbar-thumb {
-  background: var(--ant-color-border);
-  border-radius: 3px;
-}
-
-.virtualized-task-list::-webkit-scrollbar-thumb:hover {
-  background: var(--ant-color-text-tertiary);
-}

worklenz-frontend/src/components/enhanced-kanban/VirtualizedTaskList.tsx

@@ -1,94 +0,0 @@
-import React, { useMemo, useCallback } from 'react';
-import { FixedSizeList as List } from 'react-window';
-import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
-import EnhancedKanbanTaskCard from './EnhancedKanbanTaskCard';
-import './VirtualizedTaskList.css';
-
-interface VirtualizedTaskListProps {
-  tasks: IProjectTask[];
-  height: number;
-  itemHeight?: number;
-  activeTaskId?: string | null;
-  overId?: string | null;
-  onTaskRender?: (task: IProjectTask, index: number) => void;
-}
-
-const VirtualizedTaskList: React.FC<VirtualizedTaskListProps> = ({
-  tasks,
-  height,
-  itemHeight = 80,
-  activeTaskId,
-  overId,
-  onTaskRender,
-}) => {
-  // Memoize task data to prevent unnecessary re-renders
-  const taskData = useMemo(
-    () => ({
-      tasks,
-      activeTaskId,
-      overId,
-      onTaskRender,
-    }),
-    [tasks, activeTaskId, overId, onTaskRender]
-  );
-
-  // Row renderer for virtualized list
-  const Row = useCallback(
-    ({ index, style }: { index: number; style: React.CSSProperties }) => {
-      const task = tasks[index];
-      if (!task) return null;
-
-      // Call onTaskRender callback if provided
-      onTaskRender?.(task, index);
-
-      return (
-        <EnhancedKanbanTaskCard
-          task={task}
-          isActive={task.id === activeTaskId}
-          isDropTarget={overId === task.id}
-          sectionId={task.status || 'default'}
-        />
-      );
-    },
-    [tasks, activeTaskId, overId, onTaskRender]
-  );
-
-  // Memoize the list component to prevent unnecessary re-renders
-  const VirtualizedList = useMemo(
-    () => (
-      <List
-        height={height}
-        width="100%"
-        itemCount={tasks.length}
-        itemSize={itemHeight}
-        itemData={taskData}
-        overscanCount={10} // Increased overscan for smoother scrolling experience
-        className="virtualized-task-list"
-      >
-        {Row}
-      </List>
-    ),
-    [height, tasks.length, itemHeight, taskData, Row]
-  );
-
-  if (tasks.length === 0) {
-    return (
-      <div className="virtualized-empty-state" style={{ height, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-        <div className="empty-message" style={{ 
-          padding: '32px 24px', 
-          color: '#8c8c8c', 
-          fontSize: '14px',
-          backgroundColor: '#fafafa',
-          borderRadius: '8px',
-          border: '1px solid #f0f0f0'
-        }}>
-          No tasks in this group
-        </div>
-      </div>
-    );
-  }
-
-  return VirtualizedList;
-};
-
-export default React.memo(VirtualizedTaskList);

worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-phase-selector/task-drawer-phase-selector.tsx

@@ -1,6 +1,5 @@
 import { useSocket } from '@/socket/socketContext';
 import { ITaskPhase } from '@/types/tasks/taskPhase.types';
-import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { Select } from 'antd';
 
 import { Form } from 'antd';
@@ -27,12 +26,6 @@ const TaskDrawerPhaseSelector = ({ phases, task }: TaskDrawerPhaseSelectorProps)
       phase_id: value,
       parent_task: task.parent_task_id || null,
     });
-
-    // socket?.once(SocketEvents.TASK_PHASE_CHANGE.toString(), () => {
-    //   if(list.getCurrentGroup().value === this.list.GROUP_BY_PHASE_VALUE && this.list.isSubtasksIncluded) {
-    //     this.list.emitRefreshSubtasksIncluded();
-    //   }
-    // });
   };
 
   return (
@@ -41,8 +34,11 @@ const TaskDrawerPhaseSelector = ({ phases, task }: TaskDrawerPhaseSelectorProps)
         allowClear
         placeholder="Select Phase"
         options={phaseMenuItems}
-        style={{ width: 'fit-content' }}
-        dropdownStyle={{ width: 'fit-content' }}
+        styles={{
+          root: {
+            width: 'fit-content',
+          },
+        }}
         onChange={handlePhaseChange}
       />
     </Form.Item>

worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.css

@@ -7,3 +7,28 @@
   outline: 1px solid #d9d9d9;
   border-radius: 4px;
 }
+
+/* Task name display styles */
+.task-name-display {
+  margin: 0;
+  padding: 2px 8px;
+  font-size: 16px;
+  cursor: pointer;
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  min-height: 20px;
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+}
+
+.task-name-display:hover {
+  background-color: rgba(0, 0, 0, 0.02);
+  border-radius: 4px;
+}
+
+[data-theme='dark'] .task-name-display:hover {
+  background-color: rgba(255, 255, 255, 0.05);
+}

worklenz-frontend/src/components/task-drawer/task-drawer-header/task-drawer-header.tsx

@@ -1,4 +1,4 @@
-import { Button, Dropdown, Flex, Input, InputRef, MenuProps } from 'antd';
+import { Button, Dropdown, Flex, Input, InputRef, MenuProps, Tooltip } from 'antd';
 import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { EllipsisOutlined } from '@ant-design/icons';
 import { TFunction } from 'i18next';
@@ -21,12 +21,19 @@ import { deleteBoardTask } from '@/features/board/board-slice';
 import { deleteTask as deleteKanbanTask, updateEnhancedKanbanSubtask } from '@/features/enhanced-kanban/enhanced-kanban.slice';
 import useTabSearchParam from '@/hooks/useTabSearchParam';
 import { ITaskViewModel } from '@/types/tasks/task.types';
+import TaskHierarchyBreadcrumb from '../task-hierarchy-breadcrumb/task-hierarchy-breadcrumb';
 
 type TaskDrawerHeaderProps = {
   inputRef: React.RefObject<InputRef | null>;
   t: TFunction;
 };
 
+// Utility function to truncate text
+const truncateText = (text: string, maxLength: number = 50): string => {
+  if (!text || text.length <= maxLength) return text;
+  return `${text.substring(0, maxLength)}...`;
+};
+
 const TaskDrawerHeader = ({ inputRef, t }: TaskDrawerHeaderProps) => {
   const dispatch = useAppDispatch();
   const { socket, connected } = useSocket();
@@ -38,6 +45,9 @@ const TaskDrawerHeader = ({ inputRef, t }: TaskDrawerHeaderProps) => {
   const [taskName, setTaskName] = useState<string>(taskFormViewModel?.task?.name ?? '');
   const currentSession = useAuthService().getCurrentSession();
 
+  // Check if current task is a sub-task
+  const isSubTask = taskFormViewModel?.task?.is_sub_task || !!taskFormViewModel?.task?.parent_task_id;
+
   useEffect(() => {
     setTaskName(taskFormViewModel?.task?.name ?? '');
   }, [taskFormViewModel?.task?.name]);
@@ -126,54 +136,57 @@ const TaskDrawerHeader = ({ inputRef, t }: TaskDrawerHeaderProps) => {
     // No need for local socket listeners that could interfere with global handlers
   };
 
+  const displayTaskName = taskName || t('taskHeader.taskNamePlaceholder');
+  const truncatedTaskName = truncateText(displayTaskName, 50);
+  const shouldShowTooltip = displayTaskName.length > 50;
+
   return (
-    <Flex gap={12} align="center" style={{ marginBlockEnd: 6 }}>
-      <Flex style={{ position: 'relative', width: '100%' }}>
-        {isEditing ? (
-          <Input
-            ref={inputRef}
-            size="large"
-            value={taskName}
-            onChange={e => onTaskNameChange(e)}
-            onBlur={handleInputBlur}
-            placeholder={t('taskHeader.taskNamePlaceholder')}
-            className="task-name-input"
-            style={{
-              width: '100%',
-              border: 'none',
-            }}
-            showCount={true}
-            maxLength={250}
-            autoFocus
-          />
-        ) : (
-          <p
-            onClick={() => setIsEditing(true)}
-            style={{
-              margin: 0,
-              padding: '4px 11px',
-              fontSize: '16px',
-              cursor: 'pointer',
-              wordWrap: 'break-word',
-              overflowWrap: 'break-word',
-              width: '100%',
-            }}
-          >
-            {taskName || t('taskHeader.taskNamePlaceholder')}
-          </p>
-        )}
+    <div>
+      {/* Show breadcrumb for sub-tasks */}
+      {isSubTask && <TaskHierarchyBreadcrumb t={t} />}
+      
+      <Flex gap={8} align="center" style={{ marginBlockEnd: 2 }}>
+        <Flex style={{ position: 'relative', width: '100%', alignItems: 'center' }}>
+          {isEditing ? (
+            <Input
+              ref={inputRef}
+              size="large"
+              value={taskName}
+              onChange={e => onTaskNameChange(e)}
+              onBlur={handleInputBlur}
+              placeholder={t('taskHeader.taskNamePlaceholder')}
+              className="task-name-input"
+              style={{
+                width: '100%',
+                border: 'none',
+              }}
+              showCount={true}
+              maxLength={250}
+              autoFocus
+            />
+          ) : (
+            <Tooltip title={shouldShowTooltip ? displayTaskName : ''} trigger="hover">
+              <p
+                onClick={() => setIsEditing(true)}
+                className="task-name-display"
+              >
+                {truncatedTaskName}
+              </p>
+            </Tooltip>
+          )}
+        </Flex>
+
+        <TaskDrawerStatusDropdown
+          statuses={taskFormViewModel?.statuses ?? []}
+          task={taskFormViewModel?.task ?? ({} as ITaskViewModel)}
+          teamId={currentSession?.team_id ?? ''}
+        />
+
+        <Dropdown overlayClassName={'delete-task-dropdown'} menu={{ items: deletTaskDropdownItems }}>
+          <Button type="text" icon={<EllipsisOutlined />} />
+        </Dropdown>
       </Flex>
-
-      <TaskDrawerStatusDropdown
-        statuses={taskFormViewModel?.statuses ?? []}
-        task={taskFormViewModel?.task ?? ({} as ITaskViewModel)}
-        teamId={currentSession?.team_id ?? ''}
-      />
-
-      <Dropdown overlayClassName={'delete-task-dropdown'} menu={{ items: deletTaskDropdownItems }}>
-        <Button type="text" icon={<EllipsisOutlined />} />
-      </Dropdown>
-    </Flex>
+    </div>
   );
 };
 

worklenz-frontend/src/components/task-drawer/task-drawer.tsx

@@ -3,7 +3,7 @@ import Drawer from 'antd/es/drawer';
 import { InputRef } from 'antd/es/input';
 import { useTranslation } from 'react-i18next';
 import { useEffect, useRef, useState } from 'react';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined, CloseOutlined, ArrowLeftOutlined } from '@ant-design/icons';
 
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
@@ -13,6 +13,7 @@ import {
   setTaskFormViewModel,
   setTaskSubscribers,
   setTimeLogEditing,
+  fetchTask,
 } from '@/features/task-drawer/task-drawer.slice';
 
 import './task-drawer.css';
@@ -33,6 +34,7 @@ const TaskDrawer = () => {
 
   const { showTaskDrawer, timeLogEditing } = useAppSelector(state => state.taskDrawerReducer);
   const { taskFormViewModel, selectedTaskId } = useAppSelector(state => state.taskDrawerReducer);
+  const { projectId } = useAppSelector(state => state.projectReducer);
   const taskNameInputRef = useRef<InputRef>(null);
   const isClosingManually = useRef(false);
 
@@ -54,6 +56,17 @@ const TaskDrawer = () => {
     dispatch(setTaskSubscribers([]));
   };
 
+  const handleBackToParent = () => {
+    if (taskFormViewModel?.task?.parent_task_id && projectId) {
+      // Navigate to parent task
+      dispatch(setSelectedTaskId(taskFormViewModel.task.parent_task_id));
+      dispatch(fetchTask({ 
+        taskId: taskFormViewModel.task.parent_task_id, 
+        projectId 
+      }));
+    }
+  };
+
   const handleOnClose = (
     e?: React.MouseEvent<Element, MouseEvent> | React.KeyboardEvent<Element>
   ) => {
@@ -68,10 +81,8 @@ const TaskDrawer = () => {
     if (isClickOutsideDrawer || !taskFormViewModel?.task?.is_sub_task) {
       resetTaskState();
     } else {
-      dispatch(setSelectedTaskId(null));
-      dispatch(setTaskFormViewModel({}));
-      dispatch(setTaskSubscribers([]));
-      dispatch(setSelectedTaskId(taskFormViewModel?.task?.parent_task_id || null));
+      // For sub-tasks, navigate to parent instead of closing
+      handleBackToParent();
     }
     // Reset the flag after a short delay
     setTimeout(() => {
@@ -205,6 +216,17 @@ const TaskDrawer = () => {
     };
   };
 
+  // Check if current task is a sub-task
+  const isSubTask = taskFormViewModel?.task?.is_sub_task || !!taskFormViewModel?.task?.parent_task_id;
+
+  // Custom close icon based on whether it's a sub-task
+  const getCloseIcon = () => {
+    if (isSubTask) {
+      return <ArrowLeftOutlined />;
+    }
+    return <CloseOutlined />;
+  };
+
   const drawerProps = {
     open: showTaskDrawer,
     onClose: handleOnClose,
@@ -215,6 +237,7 @@ const TaskDrawer = () => {
     footer: renderFooter(),
     bodyStyle: getBodyStyle(),
     footerStyle: getFooterStyle(),
+    closeIcon: getCloseIcon(),
   };
 
   return (

worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.css

@@ -0,0 +1,88 @@
+.task-hierarchy-breadcrumb {
+  margin-bottom: 4px;
+}
+
+.task-hierarchy-breadcrumb .ant-breadcrumb {
+  font-size: 14px;
+  line-height: 1;
+}
+
+.task-hierarchy-breadcrumb .ant-breadcrumb-link {
+  color: inherit;
+}
+
+.task-hierarchy-breadcrumb .ant-breadcrumb-separator {
+  color: #8c8c8c;
+  margin: 0 4px;
+}
+
+/* Dark mode styles */
+[data-theme='dark'] .task-hierarchy-breadcrumb .ant-breadcrumb-separator {
+  color: #595959;
+}
+
+/* Back button styles */
+.task-hierarchy-breadcrumb .ant-btn-link {
+  padding: 0;
+  height: auto;
+  font-size: 14px;
+  line-height: 1.3;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+}
+
+.task-hierarchy-breadcrumb .ant-btn-link .anticon {
+  margin-right: 0; /* Remove default margin */
+}
+
+.task-hierarchy-breadcrumb .ant-btn-link:hover {
+  color: #40a9ff;
+}
+
+[data-theme='dark'] .task-hierarchy-breadcrumb .ant-btn-link:hover {
+  color: #40a9ff;
+}
+
+/* Current task name styles */
+.task-hierarchy-breadcrumb .current-task-name {
+  font-size: 14px;
+  color: #000000d9;
+  font-weight: 500;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
+  line-height: 1.3;
+}
+
+[data-theme='dark'] .task-hierarchy-breadcrumb .current-task-name {
+  color: #ffffffd9;
+}
+
+/* Breadcrumb item container */
+.task-hierarchy-breadcrumb .ant-breadcrumb-item {
+  max-width: 220px;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+/* Ensure breadcrumb items don't break the layout */
+.task-hierarchy-breadcrumb .ant-breadcrumb ol {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  margin: 0;
+  padding: 0;
+}
+
+/* Better alignment for breadcrumb items */
+.task-hierarchy-breadcrumb .ant-breadcrumb-item .ant-breadcrumb-link {
+  display: flex;
+  align-items: center;
+} 

worklenz-frontend/src/components/task-drawer/task-hierarchy-breadcrumb/task-hierarchy-breadcrumb.tsx

@@ -0,0 +1,189 @@
+import React, { useState, useEffect } from 'react';
+import { Breadcrumb, Button, Typography, Tooltip } from 'antd';
+import { HomeOutlined } from '@ant-design/icons';
+import { useAppSelector } from '@/hooks/useAppSelector';
+import { useAppDispatch } from '@/hooks/useAppDispatch';
+import { fetchTask, setSelectedTaskId } from '@/features/task-drawer/task-drawer.slice';
+import { tasksApiService } from '@/api/tasks/tasks.api.service';
+import { TFunction } from 'i18next';
+import './task-hierarchy-breadcrumb.css';
+
+interface TaskHierarchyBreadcrumbProps {
+  t: TFunction;
+  onBackClick?: () => void;
+}
+
+interface TaskHierarchyItem {
+  id: string;
+  name: string;
+  parent_task_id?: string;
+}
+
+// Utility function to truncate text
+const truncateText = (text: string, maxLength: number = 25): string => {
+  if (!text || text.length <= maxLength) return text;
+  return `${text.substring(0, maxLength)}...`;
+};
+
+const TaskHierarchyBreadcrumb: React.FC<TaskHierarchyBreadcrumbProps> = ({ t, onBackClick }) => {
+  const dispatch = useAppDispatch();
+  const { taskFormViewModel } = useAppSelector(state => state.taskDrawerReducer);
+  const { projectId } = useAppSelector(state => state.projectReducer);
+  const themeMode = useAppSelector(state => state.themeReducer.mode);
+  const [hierarchyPath, setHierarchyPath] = useState<TaskHierarchyItem[]>([]);
+  const [loading, setLoading] = useState(false);
+
+  const task = taskFormViewModel?.task;
+  const isSubTask = task?.is_sub_task || !!task?.parent_task_id;
+
+  // Recursively fetch the complete hierarchy path
+  const fetchHierarchyPath = async (currentTaskId: string): Promise<TaskHierarchyItem[]> => {
+    if (!projectId) return [];
+    
+    const path: TaskHierarchyItem[] = [];
+    let taskId = currentTaskId;
+    
+    // Traverse up the hierarchy until we reach the root
+    while (taskId) {
+      try {
+        const response = await tasksApiService.getFormViewModel(taskId, projectId);
+        if (response.done && response.body.task) {
+          const taskData = response.body.task;
+          path.unshift({
+            id: taskData.id,
+            name: taskData.name || '',
+            parent_task_id: taskData.parent_task_id || undefined
+          });
+          
+          // Move to parent task
+          taskId = taskData.parent_task_id || '';
+        } else {
+          break;
+        }
+      } catch (error) {
+        console.error('Error fetching task in hierarchy:', error);
+        break;
+      }
+    }
+    
+    return path;
+  };
+
+  // Fetch the complete hierarchy when component mounts or task changes
+  useEffect(() => {
+    const loadHierarchy = async () => {
+      if (!isSubTask || !task?.parent_task_id || !projectId) {
+        setHierarchyPath([]);
+        return;
+      }
+
+      setLoading(true);
+      try {
+        const path = await fetchHierarchyPath(task.parent_task_id);
+        setHierarchyPath(path);
+      } catch (error) {
+        console.error('Error loading task hierarchy:', error);
+        setHierarchyPath([]);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadHierarchy();
+  }, [task?.parent_task_id, projectId, isSubTask]);
+
+  const handleNavigateToTask = (taskId: string) => {
+    if (projectId) {
+      if (onBackClick) {
+        onBackClick();
+      }
+      
+      // Navigate to the selected task
+      dispatch(setSelectedTaskId(taskId));
+      dispatch(fetchTask({ taskId, projectId }));
+    }
+  };
+
+  if (!isSubTask || hierarchyPath.length === 0) {
+    return null;
+  }
+
+  // Create breadcrumb items from the hierarchy path
+  const breadcrumbItems = [
+    // Add all parent tasks in the hierarchy
+    ...hierarchyPath.map((hierarchyTask, index) => {
+      const truncatedName = truncateText(hierarchyTask.name, 25);
+      const shouldShowTooltip = hierarchyTask.name.length > 25;
+      
+      return {
+        title: (
+          <Tooltip title={shouldShowTooltip ? hierarchyTask.name : ''} trigger="hover">
+            <Button
+              type="link"
+              icon={index === 0 ? <HomeOutlined /> : undefined}
+              onClick={() => handleNavigateToTask(hierarchyTask.id)}
+              style={{
+                padding: 0,
+                height: 'auto',
+                color: themeMode === 'dark' ? '#1890ff' : '#1890ff',
+                fontSize: '14px',
+                marginRight: '0px',
+                maxWidth: '200px',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                whiteSpace: 'nowrap',
+                display: 'flex',
+                alignItems: 'center',
+                gap: index === 0 ? '6px' : '0px', // Add gap between icon and text for root task
+              }}
+            >
+              {truncatedName}
+            </Button>
+          </Tooltip>
+        ),
+      };
+    }),
+    // Add the current task as the last item (non-clickable)
+    {
+      title: (() => {
+        const currentTaskName = task?.name || t('taskHeader.currentTask', 'Current Task');
+        const truncatedCurrentName = truncateText(currentTaskName, 25);
+        const shouldShowCurrentTooltip = currentTaskName.length > 25;
+        
+        return (
+          <Tooltip title={shouldShowCurrentTooltip ? currentTaskName : ''} trigger="hover">
+            <Typography.Text
+              className="current-task-name"
+              style={{
+                color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9',
+                fontSize: '14px',
+                fontWeight: 500,
+                maxWidth: '200px',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                whiteSpace: 'nowrap',
+                display: 'inline-block',
+              }}
+            >
+              {truncatedCurrentName}
+            </Typography.Text>
+          </Tooltip>
+        );
+      })(),
+    },
+  ];
+
+  return (
+    <div className="task-hierarchy-breadcrumb">
+      {loading ? (
+        <Typography.Text style={{ color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9' }}>
+          {t('taskHeader.loadingHierarchy', 'Loading hierarchy...')}
+        </Typography.Text>
+      ) : (
+        <Breadcrumb items={breadcrumbItems} />
+      )}
+    </div>
+  );
+};
+
+export default TaskHierarchyBreadcrumb; 

worklenz-frontend/src/components/task-list-v2/TaskListV2Table.tsx

@@ -9,6 +9,7 @@ import {
   KeyboardSensor,
   TouchSensor,
   closestCenter,
+  useDroppable,
 } from '@dnd-kit/core';
 import {
   SortableContext,
@@ -67,6 +68,101 @@ import { AddCustomColumnButton, CustomColumnHeader } from './components/CustomCo
 import TaskListSkeleton from './components/TaskListSkeleton';
 import ConvertToSubtaskDrawer from '@/components/task-list-common/convert-to-subtask-drawer/convert-to-subtask-drawer';
 
+// Empty Group Drop Zone Component
+const EmptyGroupDropZone: React.FC<{
+  groupId: string;
+  visibleColumns: any[];
+  t: (key: string) => string;
+}> = ({ groupId, visibleColumns, t }) => {
+  const { setNodeRef, isOver, active } = useDroppable({
+    id: `empty-group-${groupId}`,
+    data: {
+      type: 'group',
+      groupId: groupId,
+      isEmpty: true,
+    },
+  });
+
+  return (
+    <div 
+      ref={setNodeRef}
+      className={`relative w-full transition-colors duration-200 ${
+        isOver && active ? 'bg-blue-50 dark:bg-blue-900/20' : ''
+      }`}
+    >
+      <div className="flex items-center min-w-max px-1 py-6">
+        {visibleColumns.map((column, index) => {
+          const emptyColumnStyle = {
+            width: column.width,
+            flexShrink: 0,
+          };
+          return (
+            <div
+              key={`empty-${column.id}`}
+              className="border-r border-gray-200 dark:border-gray-700"
+              style={emptyColumnStyle}
+            />
+          );
+        })}
+      </div>
+      <div className="absolute left-4 top-1/2 transform -translate-y-1/2 flex items-center">
+        <div 
+          className={`text-sm px-4 py-3 rounded-md border shadow-sm transition-colors duration-200 ${
+            isOver && active 
+              ? 'text-blue-600 dark:text-blue-400 bg-blue-50 dark:bg-blue-900/30 border-blue-300 dark:border-blue-600'
+              : 'text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-900 border-gray-200 dark:border-gray-700'
+          }`}
+        >
+          {isOver && active ? t('dropTaskHere') || 'Drop task here' : t('noTasksInGroup')}
+        </div>
+      </div>
+      {isOver && active && (
+        <div className="absolute inset-0 border-2 border-dashed border-blue-400 dark:border-blue-500 rounded-md pointer-events-none" />
+      )}
+    </div>
+  );
+};
+
+// Placeholder Drop Indicator Component
+const PlaceholderDropIndicator: React.FC<{
+  isVisible: boolean;
+  visibleColumns: any[];
+}> = ({ isVisible, visibleColumns }) => {
+  if (!isVisible) return null;
+  
+  return (
+    <div 
+      className="flex items-center min-w-max px-1 border-2 border-dashed border-blue-400 dark:border-blue-500 bg-blue-50 dark:bg-blue-900/20 rounded-md mx-1 my-1 transition-all duration-200 ease-in-out"
+      style={{ minWidth: 'max-content', height: '40px' }}
+    >
+      {visibleColumns.map((column, index) => {
+        const columnStyle = {
+          width: column.width,
+          flexShrink: 0,
+        };
+        return (
+          <div
+            key={`placeholder-${column.id}`}
+            className="flex items-center justify-center h-full"
+            style={columnStyle}
+          >
+            {/* Show "Drop task here" message in the title column */}
+            {column.id === 'title' && (
+              <div className="text-xs text-blue-600 dark:text-blue-400 font-medium opacity-75">
+                Drop task here
+              </div>
+            )}
+            {/* Show subtle placeholder content in other columns */}
+            {column.id !== 'title' && column.id !== 'dragHandle' && (
+              <div className="w-full h-4 mx-1 bg-white dark:bg-gray-700 rounded opacity-50" />
+            )}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
+
 // Hooks and utilities
 import { useTaskSocketHandlers } from '@/hooks/useTaskSocketHandlers';
 import { useSocket } from '@/socket/socketContext';
@@ -127,7 +223,7 @@ const TaskListV2Section: React.FC = () => {
   );
 
   // Custom hooks
-  const { activeId, handleDragStart, handleDragOver, handleDragEnd } = useDragAndDrop(
+  const { activeId, overId, handleDragStart, handleDragOver, handleDragEnd } = useDragAndDrop(
     allTasks,
     groups
   );
@@ -465,31 +561,11 @@ const TaskListV2Section: React.FC = () => {
             projectId={urlProjectId || ''}
           />
           {isGroupEmpty && !isGroupCollapsed && (
-            <div className="relative w-full">
-              <div className="flex items-center min-w-max px-1 py-6">
-                {visibleColumns.map((column, index) => {
-                  const emptyColumnStyle = {
-                    width: column.width,
-                    flexShrink: 0,
-                    ...(column.id === 'labels' && column.width === 'auto'
-                      ? { minWidth: '200px', flexGrow: 1 }
-                      : {}),
-                  };
-                  return (
-                    <div
-                      key={`empty-${column.id}`}
-                      className="border-r border-gray-200 dark:border-gray-700"
-                      style={emptyColumnStyle}
-                    />
-                  );
-                })}
-              </div>
-              <div className="absolute left-4 top-1/2 transform -translate-y-1/2 flex items-center">
-                <div className="text-sm text-gray-500 dark:text-gray-400 bg-white dark:bg-gray-900 px-4 py-3 rounded-md border border-gray-200 dark:border-gray-700 shadow-sm">
-                  {t('noTasksInGroup')}
-                </div>
-              </div>
-            </div>
+            <EmptyGroupDropZone 
+              groupId={group.id}
+              visibleColumns={visibleColumns}
+              t={t}
+            />
           )}
         </div>
       );
@@ -546,12 +622,6 @@ const TaskListV2Section: React.FC = () => {
             const columnStyle: ColumnStyle = {
               width: column.width,
               flexShrink: 0,
-              ...(column.id === 'labels' && column.width === 'auto'
-                ? {
-                    minWidth: '200px',
-                    flexGrow: 1,
-                  }
-                : {}),
               ...((column as any).minWidth && { minWidth: (column as any).minWidth }),
               ...((column as any).maxWidth && { maxWidth: (column as any).maxWidth }),
             };
@@ -687,8 +757,9 @@ const TaskListV2Section: React.FC = () => {
                     {renderGroup(groupIndex)}
 
                     {/* Group Tasks */}
-                    {!collapsedGroups.has(group.id) &&
-                      group.tasks.map((task, taskIndex) => {
+                    {!collapsedGroups.has(group.id) && (
+                      group.tasks.length > 0 ? (
+                        group.tasks.map((task, taskIndex) => {
                         const globalTaskIndex =
                           virtuosoGroups.slice(0, groupIndex).reduce((sum, g) => sum + g.count, 0) +
                           taskIndex;
@@ -696,12 +767,41 @@ const TaskListV2Section: React.FC = () => {
                         // Check if this is the first actual task in the group (not AddTaskRow)
                         const isFirstTaskInGroup = taskIndex === 0 && !('isAddTaskRow' in task);
 
+                        // Check if we should show drop indicators
+                        const isTaskBeingDraggedOver = overId === task.id;
+                        const isGroupBeingDraggedOver = overId === group.id;
+                        const isFirstTaskInGroupBeingDraggedOver = isFirstTaskInGroup && isTaskBeingDraggedOver;
+
                         return (
                           <div key={task.id || `add-task-${group.id}-${taskIndex}`}>
+                            {/* Placeholder drop indicator before first task in group */}
+                            {isFirstTaskInGroupBeingDraggedOver && (
+                              <PlaceholderDropIndicator isVisible={true} visibleColumns={visibleColumns} />
+                            )}
+                            
+                            {/* Placeholder drop indicator between tasks */}
+                            {isTaskBeingDraggedOver && !isFirstTaskInGroup && (
+                              <PlaceholderDropIndicator isVisible={true} visibleColumns={visibleColumns} />
+                            )}
+                            
                             {renderTask(globalTaskIndex, isFirstTaskInGroup)}
+                            
+                            {/* Placeholder drop indicator at end of group when dragging over group */}
+                            {isGroupBeingDraggedOver && taskIndex === group.tasks.length - 1 && (
+                              <PlaceholderDropIndicator isVisible={true} visibleColumns={visibleColumns} />
+                            )}
                           </div>
                         );
-                      })}
+                      })
+                      ) : (
+                        // Handle empty groups with placeholder drop indicator
+                        overId === group.id && (
+                          <div style={{ minWidth: 'max-content' }}>
+                            <PlaceholderDropIndicator isVisible={true} visibleColumns={visibleColumns} />
+                          </div>
+                        )
+                      )
+                    )}
                   </div>
                 ))}
               </div>
@@ -710,12 +810,12 @@ const TaskListV2Section: React.FC = () => {
         </div>
 
         {/* Drag Overlay */}
-        <DragOverlay dropAnimation={null}>
+        <DragOverlay dropAnimation={{ duration: 200, easing: 'ease-in-out' }}>
           {activeId ? (
-            <div className="bg-white dark:bg-gray-800 shadow-xl rounded-md border-2 border-blue-400 opacity-95">
+            <div className="bg-white dark:bg-gray-800 shadow-2xl rounded-lg border-2 border-blue-500 dark:border-blue-400 scale-105">
               <div className="px-4 py-3">
                 <div className="flex items-center gap-3">
-                  <HolderOutlined className="text-blue-500" />
+                  <HolderOutlined className="text-blue-500 dark:text-blue-400" />
                   <div>
                     <div className="text-sm font-medium text-gray-900 dark:text-white">
                       {allTasks.find(task => task.id === activeId)?.name ||

worklenz-frontend/src/components/task-list-v2/TaskRow.tsx

@@ -24,6 +24,7 @@ interface TaskRowProps {
   isSubtask?: boolean;
   isFirstInGroup?: boolean;
   updateTaskCustomColumnValue?: (taskId: string, columnKey: string, value: string) => void;
+  depth?: number;
 }
 
 const TaskRow: React.FC<TaskRowProps> = memo(({ 
@@ -32,7 +33,8 @@ const TaskRow: React.FC<TaskRowProps> = memo(({
   visibleColumns, 
   isSubtask = false, 
   isFirstInGroup = false, 
-  updateTaskCustomColumnValue 
+  updateTaskCustomColumnValue,
+  depth = 0
 }) => {
   // Get task data and selection state from Redux
   const task = useAppSelector(state => selectTaskById(state, taskId));
@@ -107,13 +109,14 @@ const TaskRow: React.FC<TaskRowProps> = memo(({
     handleTaskNameEdit,
     attributes,
     listeners,
+    depth,
   });
 
   // Memoize style object to prevent unnecessary re-renders
   const style = useMemo(() => ({
     transform: CSS.Transform.toString(transform),
     transition,
-    opacity: isDragging ? 0.5 : 1,
+    opacity: isDragging ? 0 : 1, // Completely hide the original task while dragging
   }), [transform, transition, isDragging]);
 
   return (

worklenz-frontend/src/components/task-list-v2/TaskRowWithSubtasks.tsx

@@ -22,6 +22,8 @@ interface TaskRowWithSubtasksProps {
   }>;
   isFirstInGroup?: boolean;
   updateTaskCustomColumnValue?: (taskId: string, columnKey: string, value: string) => void;
+  depth?: number; // Add depth prop to track nesting level
+  maxDepth?: number; // Add maxDepth prop to limit nesting
 }
 
 interface AddSubtaskRowProps {
@@ -32,14 +34,15 @@ interface AddSubtaskRowProps {
     width: string;
     isSticky?: boolean;
   }>;
-  onSubtaskAdded: () => void; // Simplified - no rowId needed
-  rowId: string; // Unique identifier for this add subtask row
-  autoFocus?: boolean; // Whether this row should auto-focus on mount
-  isActive?: boolean; // Whether this row should show the input/button
-  onActivate?: () => void; // Simplified - no rowId needed
+  onSubtaskAdded: () => void;
+  rowId: string;
+  autoFocus?: boolean;
+  isActive?: boolean;
+  onActivate?: () => void;
+  depth?: number; // Add depth prop for proper indentation
 }
 
-const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({ 
+const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({
   parentTaskId, 
   projectId, 
   visibleColumns, 
@@ -47,25 +50,20 @@ const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({
   rowId,
   autoFocus = false,
   isActive = true,
-  onActivate
+  onActivate,
+  depth = 0
 }) => {
-  const [isAdding, setIsAdding] = useState(autoFocus);
+  const { t } = useTranslation('task-list-table');
+  const [isAdding, setIsAdding] = useState(false);
   const [subtaskName, setSubtaskName] = useState('');
   const inputRef = useRef<any>(null);
-  const { socket, connected } = useSocket();
-  const { t } = useTranslation('task-list-table');
   const dispatch = useAppDispatch();
-  
-  // Get session data for reporter_id and team_id
+  const { socket, connected } = useSocket();
   const currentSession = useAuthService().getCurrentSession();
 
-  // Auto-focus when autoFocus prop is true
   useEffect(() => {
     if (autoFocus && inputRef.current) {
-      setIsAdding(true);
-      setTimeout(() => {
-        inputRef.current?.focus();
-      }, 100);
+      inputRef.current.focus();
     }
   }, [autoFocus]);
 
@@ -141,11 +139,15 @@ const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({
         return (
           <div className="flex items-center h-full" style={baseStyle}>
             <div className="flex items-center w-full h-full">
-              {/* Match subtask indentation pattern - tighter spacing */}
-              <div className="w-4" />
+              {/* Match subtask indentation pattern - reduced spacing for level 1 */}
               <div className="w-2" />
+              {/* Add additional indentation for deeper levels - increased spacing for level 2+ */}
+              {Array.from({ length: depth }).map((_, i) => (
+                <div key={i} className="w-6" />
+              ))}
+              <div className="w-1" />
               
-              {isActive ? (
+                            {isActive ? (
                 !isAdding ? (
                   <button
                     onClick={() => {
@@ -188,7 +190,7 @@ const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({
       default:
         return <div style={baseStyle} />;
     }
-  }, [isAdding, subtaskName, handleAddSubtask, handleCancel, handleBlur, handleKeyDown, t, isActive, onActivate]);
+  }, [isAdding, subtaskName, handleAddSubtask, handleCancel, handleBlur, handleKeyDown, t, isActive, onActivate, depth]);
 
   return (
     <div className="flex items-center min-w-max px-1 py-0.5 hover:bg-gray-50 dark:hover:bg-gray-800 min-h-[36px] border-b border-gray-200 dark:border-gray-700">
@@ -203,12 +205,42 @@ const AddSubtaskRow: React.FC<AddSubtaskRowProps> = memo(({
 
 AddSubtaskRow.displayName = 'AddSubtaskRow';
 
+// Helper function to get background color based on depth
+const getSubtaskBackgroundColor = (depth: number) => {
+  switch (depth) {
+    case 1:
+      return 'bg-gray-50 dark:bg-gray-800/50';
+    case 2:
+      return 'bg-blue-50 dark:bg-blue-900/20';
+    case 3:
+      return 'bg-green-50 dark:bg-green-900/20';
+    default:
+      return 'bg-gray-50 dark:bg-gray-800/50';
+  }
+};
+
+// Helper function to get border color based on depth
+const getBorderColor = (depth: number) => {
+  switch (depth) {
+    case 1:
+      return 'border-blue-200 dark:border-blue-700';
+    case 2:
+      return 'border-green-200 dark:border-green-700';
+    case 3:
+      return 'border-purple-200 dark:border-purple-700';
+    default:
+      return 'border-blue-200 dark:border-blue-700';
+  }
+};
+
 const TaskRowWithSubtasks: React.FC<TaskRowWithSubtasksProps> = memo(({ 
   taskId, 
   projectId, 
   visibleColumns,
   isFirstInGroup = false,
-  updateTaskCustomColumnValue
+  updateTaskCustomColumnValue,
+  depth = 0,
+  maxDepth = 3
 }) => {
   const task = useAppSelector(state => selectTaskById(state, taskId));
   const isLoadingSubtasks = useAppSelector(state => selectSubtaskLoading(state, taskId));
@@ -223,6 +255,9 @@ const TaskRowWithSubtasks: React.FC<TaskRowWithSubtasksProps> = memo(({
     return null;
   }
 
+  // Don't render subtasks if we've reached the maximum depth
+  const canHaveSubtasks = depth < maxDepth;
+
   return (
     <>
       {/* Main task row */}
@@ -232,10 +267,12 @@ const TaskRowWithSubtasks: React.FC<TaskRowWithSubtasksProps> = memo(({
         visibleColumns={visibleColumns}
         isFirstInGroup={isFirstInGroup}
         updateTaskCustomColumnValue={updateTaskCustomColumnValue}
+        isSubtask={depth > 0}
+        depth={depth}
       />
       
       {/* Subtasks and add subtask row when expanded */}
-      {task.show_sub_tasks && (
+      {canHaveSubtasks && task.show_sub_tasks && (
         <>
           {/* Show loading skeleton while fetching subtasks */}
           {isLoadingSubtasks && (
@@ -244,22 +281,23 @@ const TaskRowWithSubtasks: React.FC<TaskRowWithSubtasksProps> = memo(({
             </>
           )}
           
-          {/* Render existing subtasks when not loading */}
+          {/* Render existing subtasks when not loading - RECURSIVELY */}
           {!isLoadingSubtasks && task.sub_tasks?.map((subtask: Task) => (
-            <div key={subtask.id} className="bg-gray-50 dark:bg-gray-800/50 border-l-2 border-blue-200 dark:border-blue-700">
-              <TaskRow
+            <div key={subtask.id} className={`${getSubtaskBackgroundColor(depth + 1)} border-l-2 ${getBorderColor(depth + 1)}`}>
+              <TaskRowWithSubtasks
                 taskId={subtask.id}
                 projectId={projectId}
                 visibleColumns={visibleColumns}
-                isSubtask={true}
                 updateTaskCustomColumnValue={updateTaskCustomColumnValue}
+                depth={depth + 1}
+                maxDepth={maxDepth}
               />
             </div>
           ))}
           
           {/* Add subtask row - only show when not loading */}
           {!isLoadingSubtasks && (
-            <div className="bg-gray-50 dark:bg-gray-800/50 border-l-2 border-blue-200 dark:border-blue-700">
+            <div className={`${getSubtaskBackgroundColor(depth + 1)} border-l-2 ${getBorderColor(depth + 1)}`}>
               <AddSubtaskRow
                 parentTaskId={taskId}
                 projectId={projectId}
@@ -267,8 +305,9 @@ const TaskRowWithSubtasks: React.FC<TaskRowWithSubtasksProps> = memo(({
                 onSubtaskAdded={handleSubtaskAdded}
                 rowId={`add-subtask-${taskId}`}
                 autoFocus={false}
-                isActive={true} // Always show the add subtask row
-                onActivate={undefined} // Not needed anymore
+                isActive={true}
+                onActivate={undefined}
+                depth={depth + 1}
               />
             </div>
           )}

worklenz-frontend/src/components/task-list-v2/components/TaskRowColumns.tsx

@@ -252,10 +252,9 @@ interface LabelsColumnProps {
 }
 
 export const LabelsColumn: React.FC<LabelsColumnProps> = memo(({ width, task, labelsAdapter, isDarkMode, visibleColumns }) => {
-  const labelsColumn = visibleColumns.find(col => col.id === 'labels');
   const labelsStyle = {
     width,
-    ...(labelsColumn?.width === 'auto' ? { minWidth: '200px', flexGrow: 1 } : {})
+    flexShrink: 0
   };
 
   return (

worklenz-frontend/src/components/task-list-v2/components/TitleColumn.tsx

@@ -24,6 +24,7 @@ interface TitleColumnProps {
   onEditTaskName: (editing: boolean) => void;
   onTaskNameChange: (name: string) => void;
   onTaskNameSave: () => void;
+  depth?: number;
 }
 
 export const TitleColumn: React.FC<TitleColumnProps> = memo(({
@@ -36,7 +37,8 @@ export const TitleColumn: React.FC<TitleColumnProps> = memo(({
   taskName,
   onEditTaskName,
   onTaskNameChange,
-  onTaskNameSave
+  onTaskNameSave,
+  depth = 0
 }) => {
   const dispatch = useAppDispatch();
   const { socket, connected } = useSocket();
@@ -150,11 +152,16 @@ export const TitleColumn: React.FC<TitleColumnProps> = memo(({
         /* Normal layout when not editing */
         <>
           <div className="flex items-center flex-1 min-w-0">
-            {/* Indentation for subtasks - tighter spacing */}
-            {isSubtask && <div className="w-4 flex-shrink-0" />}
+            {/* Indentation for subtasks - reduced spacing for level 1 */}
+            {isSubtask && <div className="w-2 flex-shrink-0" />}
             
-            {/* Expand/Collapse button - only show for parent tasks */}
-            {!isSubtask && (
+            {/* Additional indentation for deeper levels - increased spacing for level 2+ */}
+            {Array.from({ length: depth }).map((_, i) => (
+              <div key={i} className="w-6 flex-shrink-0" />
+            ))}
+            
+            {/* Expand/Collapse button - show for any task that can have sub-tasks */}
+            {depth < 2 && ( // Only show if not at maximum depth (can still have children)
               <button
                 onClick={handleToggleExpansion}
                 className={`flex h-4 w-4 items-center justify-center rounded-sm text-xs mr-1 hover:border hover:border-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/20 hover:scale-110 transition-all duration-300 ease-out flex-shrink-0 ${
@@ -175,8 +182,8 @@ export const TitleColumn: React.FC<TitleColumnProps> = memo(({
               </button>
             )}
             
-            {/* Additional indentation for subtasks after the expand button space */}
-            {isSubtask && <div className="w-2 flex-shrink-0" />}
+            {/* Additional indentation for subtasks after the expand button space - reduced for level 1 */}
+            {isSubtask && <div className="w-1 flex-shrink-0" />}
             
             <div className="flex items-center gap-2 flex-1 min-w-0">
               {/* Task name with dynamic width */}
@@ -202,8 +209,8 @@ export const TitleColumn: React.FC<TitleColumnProps> = memo(({
               
               {/* Indicators container - flex-shrink-0 to prevent compression */}
               <div className="flex items-center gap-1 flex-shrink-0">
-                {/* Subtask count indicator - only show if count > 0 */}
-                {!isSubtask && task.sub_tasks_count != null && task.sub_tasks_count > 0 && (
+                {/* Subtask count indicator - show for any task that can have sub-tasks */}
+                {depth < 2 && task.sub_tasks_count != null && task.sub_tasks_count > 0 && (
                   <Tooltip title={t(`indicators.tooltips.subtasks${task.sub_tasks_count === 1 ? '' : '_plural'}`, { count: task.sub_tasks_count })}>
                     <div className="flex items-center gap-1 px-1.5 py-0.5 bg-blue-50 dark:bg-blue-900/20 rounded text-xs">
                       <span className="text-blue-600 dark:text-blue-400 font-medium">

worklenz-frontend/src/components/task-list-v2/constants/columns.ts

@@ -19,10 +19,10 @@ export const BASE_COLUMNS = [
   { id: 'title', label: 'taskColumn', width: '470px', isSticky: true, key: COLUMN_KEYS.NAME },
   { id: 'description', label: 'descriptionColumn', width: '260px', key: COLUMN_KEYS.DESCRIPTION },
   { id: 'progress', label: 'progressColumn', width: '120px', key: COLUMN_KEYS.PROGRESS },
-  { id: 'assignees', label: 'assigneesColumn', width: '150px', key: COLUMN_KEYS.ASSIGNEES },
-  { id: 'labels', label: 'labelsColumn', width: 'auto', key: COLUMN_KEYS.LABELS },
-  { id: 'phase', label: 'phaseColumn', width: '120px', key: COLUMN_KEYS.PHASE },
   { id: 'status', label: 'statusColumn', width: '120px', key: COLUMN_KEYS.STATUS },
+  { id: 'assignees', label: 'assigneesColumn', width: '150px', key: COLUMN_KEYS.ASSIGNEES },
+  { id: 'labels', label: 'labelsColumn', width: '250px', key: COLUMN_KEYS.LABELS },
+  { id: 'phase', label: 'phaseColumn', width: '120px', key: COLUMN_KEYS.PHASE },
   { id: 'priority', label: 'priorityColumn', width: '120px', key: COLUMN_KEYS.PRIORITY },
   { id: 'timeTracking', label: 'timeTrackingColumn', width: '120px', key: COLUMN_KEYS.TIME_TRACKING },
   { id: 'estimation', label: 'estimationColumn', width: '120px', key: COLUMN_KEYS.ESTIMATION },

worklenz-frontend/src/components/task-list-v2/hooks/useDragAndDrop.ts

@@ -1,12 +1,142 @@
 import { useState, useCallback } from 'react';
 import { DragEndEvent, DragOverEvent, DragStartEvent } from '@dnd-kit/core';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { reorderTasksInGroup, moveTaskBetweenGroups } from '@/features/task-management/task-management.slice';
-import { Task, TaskGroup } from '@/types/task-management.types';
+import { useAppSelector } from '@/hooks/useAppSelector';
+import { reorderTasksInGroup } from '@/features/task-management/task-management.slice';
+import { selectCurrentGrouping } from '@/features/task-management/grouping.slice';
+import { Task, TaskGroup, getSortOrderField } from '@/types/task-management.types';
+import { useSocket } from '@/socket/socketContext';
+import { SocketEvents } from '@/shared/socket-events';
+import { useParams } from 'react-router-dom';
+import { useAuthService } from '@/hooks/useAuth';
+import logger from '@/utils/errorLogger';
 
 export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
   const dispatch = useAppDispatch();
+  const { socket, connected } = useSocket();
+  const { projectId } = useParams();
+  const currentGrouping = useAppSelector(selectCurrentGrouping);
+  const currentSession = useAuthService().getCurrentSession();
   const [activeId, setActiveId] = useState<string | null>(null);
+  const [overId, setOverId] = useState<string | null>(null);
+
+  // Helper function to emit socket event for persistence
+  const emitTaskSortChange = useCallback(
+    (taskId: string, sourceGroup: TaskGroup, targetGroup: TaskGroup, insertIndex: number) => {
+      if (!socket || !connected || !projectId) {
+        logger.warning('Socket not connected or missing project ID');
+        return;
+      }
+
+      const task = allTasks.find(t => t.id === taskId);
+      if (!task) {
+        logger.error('Task not found for socket emission:', taskId);
+        return;
+      }
+
+      // Get team_id from current session
+      const teamId = currentSession?.team_id || '';
+
+      // Use new bulk update approach - recalculate ALL task orders to prevent duplicates
+      const taskUpdates: any[] = [];
+      
+      // Create a copy of all groups and perform the move operation
+      const updatedGroups = groups.map(group => ({
+        ...group,
+        taskIds: [...group.taskIds]
+      }));
+      
+      // Find the source and target groups in our copy
+      const sourceGroupCopy = updatedGroups.find(g => g.id === sourceGroup.id)!;
+      const targetGroupCopy = updatedGroups.find(g => g.id === targetGroup.id)!;
+      
+      if (sourceGroup.id === targetGroup.id) {
+        // Same group - reorder within the group
+        const sourceIndex = sourceGroupCopy.taskIds.indexOf(taskId);
+        // Remove task from old position
+        sourceGroupCopy.taskIds.splice(sourceIndex, 1);
+        // Insert at new position
+        sourceGroupCopy.taskIds.splice(insertIndex, 0, taskId);
+      } else {
+        // Different groups - move task between groups
+        // Remove from source group
+        const sourceIndex = sourceGroupCopy.taskIds.indexOf(taskId);
+        sourceGroupCopy.taskIds.splice(sourceIndex, 1);
+        
+        // Add to target group
+        targetGroupCopy.taskIds.splice(insertIndex, 0, taskId);
+      }
+      
+      // Now assign sequential sort orders to ALL tasks across ALL groups
+      let currentSortOrder = 0;
+      updatedGroups.forEach(group => {
+        group.taskIds.forEach(id => {
+          const update: any = {
+            task_id: id,
+            sort_order: currentSortOrder
+          };
+          
+          // Add group-specific fields for the moved task if it changed groups
+          if (id === taskId && sourceGroup.id !== targetGroup.id) {
+            if (currentGrouping === 'status') {
+              update.status_id = targetGroup.id;
+            } else if (currentGrouping === 'priority') {
+              update.priority_id = targetGroup.id;
+            } else if (currentGrouping === 'phase') {
+              update.phase_id = targetGroup.id;
+            }
+          }
+          
+          taskUpdates.push(update);
+          currentSortOrder++;
+        });
+      });
+
+      const socketData = {
+        project_id: projectId,
+        group_by: currentGrouping || 'status',
+        task_updates: taskUpdates,
+        from_group: sourceGroup.id,
+        to_group: targetGroup.id,
+        task: {
+          id: task.id,
+          project_id: projectId,
+          status: task.status || '',
+          priority: task.priority || '',
+        },
+        team_id: teamId,
+      };
+
+      socket.emit(SocketEvents.TASK_SORT_ORDER_CHANGE.toString(), socketData);
+
+      // Also emit the specific grouping field change event for the moved task
+      if (sourceGroup.id !== targetGroup.id) {
+        if (currentGrouping === 'phase') {
+          // Emit phase change event
+          socket.emit(SocketEvents.TASK_PHASE_CHANGE.toString(), {
+            task_id: taskId,
+            phase_id: targetGroup.id,
+            parent_task: task.parent_task_id || null,
+          });
+        } else if (currentGrouping === 'priority') {
+          // Emit priority change event
+          socket.emit(SocketEvents.TASK_PRIORITY_CHANGE.toString(), JSON.stringify({
+            task_id: taskId,
+            priority_id: targetGroup.id,
+            team_id: teamId,
+          }));
+        } else if (currentGrouping === 'status') {
+          // Emit status change event
+          socket.emit(SocketEvents.TASK_STATUS_CHANGE.toString(), JSON.stringify({
+            task_id: taskId,
+            status_id: targetGroup.id,
+            team_id: teamId,
+          }));
+        }
+      }
+    },
+    [socket, connected, projectId, allTasks, groups, currentGrouping, currentSession]
+  );
 
   const handleDragStart = useCallback((event: DragStartEvent) => {
     setActiveId(event.active.id as string);
@@ -16,11 +146,17 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
     (event: DragOverEvent) => {
       const { active, over } = event;
 
-      if (!over) return;
+      if (!over) {
+        setOverId(null);
+        return;
+      }
 
       const activeId = active.id;
       const overId = over.id;
 
+      // Set the overId for drop indicators
+      setOverId(overId as string);
+
       // Find the active task and the item being dragged over
       const activeTask = allTasks.find(task => task.id === activeId);
       if (!activeTask) return;
@@ -38,15 +174,6 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
       }
 
       if (!activeGroup || !targetGroup) return;
-
-      // If dragging to a different group, we need to handle cross-group movement
-      if (activeGroup.id !== targetGroup.id) {
-        console.log('Cross-group drag detected:', {
-          activeTask: activeTask.id,
-          fromGroup: activeGroup.id,
-          toGroup: targetGroup.id,
-        });
-      }
     },
     [allTasks, groups]
   );
@@ -55,6 +182,7 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
     (event: DragEndEvent) => {
       const { active, over } = event;
       setActiveId(null);
+      setOverId(null);
 
       if (!over || active.id === over.id) {
         return;
@@ -66,22 +194,27 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
       // Find the active task
       const activeTask = allTasks.find(task => task.id === activeId);
       if (!activeTask) {
-        console.error('Active task not found:', activeId);
+        logger.error('Active task not found:', activeId);
         return;
       }
 
       // Find the groups
       const activeGroup = groups.find(group => group.taskIds.includes(activeTask.id));
       if (!activeGroup) {
-        console.error('Could not find active group for task:', activeId);
+        logger.error('Could not find active group for task:', activeId);
         return;
       }
 
-      // Check if we're dropping on a task or a group
+      // Check if we're dropping on a task, group, or empty group
       const overTask = allTasks.find(task => task.id === overId);
       const overGroup = groups.find(group => group.id === overId);
+      
+      // Check if dropping on empty group drop zone
+      const isEmptyGroupDrop = typeof overId === 'string' && overId.startsWith('empty-group-');
+      const emptyGroupId = isEmptyGroupDrop ? overId.replace('empty-group-', '') : null;
+      const emptyGroup = emptyGroupId ? groups.find(group => group.id === emptyGroupId) : null;
 
-      let targetGroup = overGroup;
+      let targetGroup = overGroup || emptyGroup;
       let insertIndex = 0;
 
       if (overTask) {
@@ -94,27 +227,20 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
         // Dropping on a group (at the end)
         targetGroup = overGroup;
         insertIndex = targetGroup.taskIds.length;
+      } else if (emptyGroup) {
+        // Dropping on an empty group
+        targetGroup = emptyGroup;
+        insertIndex = 0; // First position in empty group
       }
 
       if (!targetGroup) {
-        console.error('Could not find target group');
+        logger.error('Could not find target group');
         return;
       }
 
       const isCrossGroup = activeGroup.id !== targetGroup.id;
       const activeIndex = activeGroup.taskIds.indexOf(activeTask.id);
 
-      console.log('Drag operation:', {
-        activeId,
-        overId,
-        activeTask: activeTask.name || activeTask.title,
-        activeGroup: activeGroup.id,
-        targetGroup: targetGroup.id,
-        activeIndex,
-        insertIndex,
-        isCrossGroup,
-      });
-
       if (isCrossGroup) {
         // Moving task between groups
         console.log('Moving task between groups:', {
@@ -124,16 +250,8 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
           newPosition: insertIndex,
         });
 
-        // Move task to the target group
-        dispatch(
-          moveTaskBetweenGroups({
-            taskId: activeId as string,
-            sourceGroupId: activeGroup.id,
-            targetGroupId: targetGroup.id,
-          })
-        );
-
-        // Reorder task within target group at drop position
+        // reorderTasksInGroup handles both same-group and cross-group moves
+        // No need for separate moveTaskBetweenGroups call
         dispatch(
           reorderTasksInGroup({
             sourceTaskId: activeId as string,
@@ -142,15 +260,10 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
             destinationGroupId: targetGroup.id,
           })
         );
-      } else {
-        // Reordering within the same group
-        console.log('Reordering task within same group:', {
-          task: activeTask.name || activeTask.title,
-          group: activeGroup.title,
-          from: activeIndex,
-          to: insertIndex,
-        });
 
+        // Emit socket event for persistence
+        emitTaskSortChange(activeId as string, activeGroup, targetGroup, insertIndex);
+      } else {
         if (activeIndex !== insertIndex) {
           // Reorder task within same group at drop position
           dispatch(
@@ -161,14 +274,18 @@ export const useDragAndDrop = (allTasks: Task[], groups: TaskGroup[]) => {
               destinationGroupId: activeGroup.id,
             })
           );
+
+          // Emit socket event for persistence
+          emitTaskSortChange(activeId as string, activeGroup, targetGroup, insertIndex);
         }
       }
     },
-    [allTasks, groups, dispatch]
+    [allTasks, groups, dispatch, emitTaskSortChange]
   );
 
   return {
     activeId,
+    overId,
     handleDragStart,
     handleDragOver,
     handleDragEnd,

worklenz-frontend/src/components/task-list-v2/hooks/useTaskRowColumns.tsx

@@ -58,6 +58,9 @@ interface UseTaskRowColumnsProps {
   // Drag and drop
   attributes: any;
   listeners: any;
+  
+  // Depth for nested subtasks
+  depth?: number;
 }
 
 export const useTaskRowColumns = ({
@@ -84,6 +87,7 @@ export const useTaskRowColumns = ({
   handleTaskNameEdit,
   attributes,
   listeners,
+  depth = 0,
 }: UseTaskRowColumnsProps) => {
   
   const renderColumn = useCallback((columnId: string, width: string, isSticky?: boolean, index?: number) => {
@@ -128,6 +132,7 @@ export const useTaskRowColumns = ({
             onEditTaskName={setEditTaskName}
             onTaskNameChange={setTaskName}
             onTaskNameSave={handleTaskNameSave}
+            depth={depth}
           />
         );
 

worklenz-frontend/src/features/task-management/task-management.slice.ts

@@ -7,7 +7,7 @@ import {
   EntityId,
   createSelector,
 } from '@reduxjs/toolkit';
-import { Task, TaskManagementState, TaskGroup, TaskGrouping } from '@/types/task-management.types';
+import { Task, TaskManagementState, TaskGroup, TaskGrouping, getSortOrderField } from '@/types/task-management.types';
 import { ITaskListColumn } from '@/types/tasks/taskList.types';
 import { RootState } from '@/app/store';
 import {
@@ -660,12 +660,12 @@ const taskManagementSlice = createSlice({
           const [removed] = newTasks.splice(newTasks.indexOf(sourceTaskId), 1);
           newTasks.splice(newTasks.indexOf(destinationTaskId), 0, removed);
           group.taskIds = newTasks;
-  
-          // Update order for affected tasks. Assuming simple reordering affects order.
-          // This might need more sophisticated logic based on how `order` is used.
+
+          // Update order for affected tasks using the appropriate sort field
+          const sortField = getSortOrderField(state.grouping?.id);
           newTasks.forEach((id, index) => {
             if (newEntities[id]) {
-              newEntities[id] = { ...newEntities[id], order: index };
+              newEntities[id] = { ...newEntities[id], [sortField]: index };
             }
           });
         }
@@ -673,11 +673,11 @@ const taskManagementSlice = createSlice({
         // Moving between different groups
         const sourceGroup = state.groups.find(g => g.id === sourceGroupId);
         const destinationGroup = state.groups.find(g => g.id === destinationGroupId);
-  
+
         if (sourceGroup && destinationGroup) {
           // Remove from source group
           sourceGroup.taskIds = sourceGroup.taskIds.filter(id => id !== sourceTaskId);
-  
+
           // Add to destination group at the correct position relative to destinationTask
           const destinationIndex = destinationGroup.taskIds.indexOf(destinationTaskId);
           if (destinationIndex !== -1) {
@@ -685,50 +685,17 @@ const taskManagementSlice = createSlice({
           } else {
             destinationGroup.taskIds.push(sourceTaskId); // Add to end if destination task not found
           }
-  
-          // Update task's grouping field to reflect new group (e.g., status, priority, phase)
-          // This assumes the group ID directly corresponds to the task's field value
-          if (sourceTask) {
-            let updatedTask = { ...sourceTask };
-            switch (state.grouping?.id) {
-              case IGroupBy.STATUS:
-                updatedTask.status = destinationGroup.id;
-                break;
-              case IGroupBy.PRIORITY:
-                updatedTask.priority = destinationGroup.id;
-                break;
-              case IGroupBy.PHASE:
-                // Handle unmapped group specially
-                if (destinationGroup.id === 'Unmapped' || destinationGroup.title === 'Unmapped') {
-                  updatedTask.phase = ''; // Clear phase for unmapped group
-                } else {
-                  updatedTask.phase = destinationGroup.id;
-                }
-                break;
-              case IGroupBy.MEMBERS:
-                // If moving to a member group, ensure task is assigned to that member
-                // This assumes the group ID is the member ID
-                if (!updatedTask.assignees) {
-                  updatedTask.assignees = [];
-                }
-                if (!updatedTask.assignees.includes(destinationGroup.id)) {
-                  updatedTask.assignees.push(destinationGroup.id);
-                }
-                // If moving from a member group, and the task is no longer in any member group,
-                // consider removing the assignment (more complex logic might be needed here)
-                break;
-              default:
-                break;
-            }
-            newEntities[sourceTaskId] = updatedTask;
-          }
-  
-          // Update order for affected tasks in both groups if necessary
+
+          // Do NOT update the task's grouping field (priority, phase, status) here.
+          // This will be handled by the socket event handler after backend confirmation.
+
+          // Update order for affected tasks in both groups using the appropriate sort field
+          const sortField = getSortOrderField(state.grouping?.id);
           sourceGroup.taskIds.forEach((id, index) => {
-            if (newEntities[id]) newEntities[id] = { ...newEntities[id], order: index };
+            if (newEntities[id]) newEntities[id] = { ...newEntities[id], [sortField]: index };
           });
           destinationGroup.taskIds.forEach((id, index) => {
-            if (newEntities[id]) newEntities[id] = { ...newEntities[id], order: index };
+            if (newEntities[id]) newEntities[id] = { ...newEntities[id], [sortField]: index };
           });
         }
       }
@@ -958,8 +925,26 @@ const taskManagementSlice = createSlice({
       .addCase(fetchTasksV3.fulfilled, (state, action) => {
         state.loading = false;
         const { allTasks, groups, grouping } = action.payload;
-        tasksAdapter.setAll(state as EntityState<Task, string>, allTasks || []); // Ensure allTasks is an array
-        state.ids = (allTasks || []).map(task => task.id); // Also update ids
+        
+        // Preserve existing timer state from old tasks before replacing
+        const oldTasks = state.entities;
+        const tasksWithTimers = (allTasks || []).map(task => {
+          const oldTask = oldTasks[task.id];
+          if (oldTask?.timeTracking?.activeTimer) {
+            // Preserve the timer state from the old task
+            return {
+              ...task,
+              timeTracking: {
+                ...task.timeTracking,
+                activeTimer: oldTask.timeTracking.activeTimer
+              }
+            };
+          }
+          return task;
+        });
+        
+        tasksAdapter.setAll(state as EntityState<Task, string>, tasksWithTimers); // Ensure allTasks is an array
+        state.ids = tasksWithTimers.map(task => task.id); // Also update ids
         state.groups = groups;
         state.grouping = grouping;
       })
@@ -1010,7 +995,7 @@ const taskManagementSlice = createSlice({
             order: subtask.sort_order || subtask.order || 0,
             parent_task_id: parentTaskId,
             is_sub_task: true,
-            sub_tasks_count: 0,
+            sub_tasks_count: subtask.sub_tasks_count || 0, // Use actual count from backend
             show_sub_tasks: false,
           }));
 

worklenz-frontend/src/features/task-management/taskListFields.slice.ts

@@ -14,10 +14,10 @@ const DEFAULT_FIELDS: TaskListField[] = [
   { key: 'KEY', label: 'Key', visible: false, order: 1 },
   { key: 'DESCRIPTION', label: 'Description', visible: false, order: 2 },
   { key: 'PROGRESS', label: 'Progress', visible: true, order: 3 },
-  { key: 'ASSIGNEES', label: 'Assignees', visible: true, order: 4 },
-  { key: 'LABELS', label: 'Labels', visible: true, order: 5 },
-  { key: 'PHASE', label: 'Phase', visible: true, order: 6 },
-  { key: 'STATUS', label: 'Status', visible: true, order: 7 },
+  { key: 'STATUS', label: 'Status', visible: true, order: 4 },
+  { key: 'ASSIGNEES', label: 'Assignees', visible: true, order: 5 },
+  { key: 'LABELS', label: 'Labels', visible: true, order: 6 },
+  { key: 'PHASE', label: 'Phase', visible: true, order: 7 },
   { key: 'PRIORITY', label: 'Priority', visible: true, order: 8 },
   { key: 'TIME_TRACKING', label: 'Time Tracking', visible: true, order: 9 },
   { key: 'ESTIMATION', label: 'Estimation', visible: false, order: 10 },

worklenz-frontend/src/hooks/useTaskSocketHandlers.ts

@@ -33,6 +33,7 @@ import {
   updateTaskDescription,
   updateSubTasks,
   updateTaskProgress,
+  updateTaskTimeTracking,
 } from '@/features/tasks/tasks.slice';
 import {
   addTask,
@@ -936,6 +937,8 @@ export const useTaskSocketHandlers = () => {
       const { task_id, start_time } = typeof data === 'string' ? JSON.parse(data) : data;
       if (!task_id) return;
 
+      const timerTimestamp = start_time ? (typeof start_time === 'number' ? start_time : parseInt(start_time)) : Date.now();
+
       // Update the task-management slice to include timer state
       const currentTask = store.getState().taskManagement.entities[task_id];
       if (currentTask) {
@@ -943,13 +946,16 @@ export const useTaskSocketHandlers = () => {
           ...currentTask,
           timeTracking: {
             ...currentTask.timeTracking,
-            activeTimer: start_time ? (typeof start_time === 'number' ? start_time : parseInt(start_time)) : Date.now(),
+            activeTimer: timerTimestamp,
           },
           updatedAt: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         };
         dispatch(updateTask(updatedTask));
       }
+
+      // Also update the tasks slice activeTimers to keep both slices in sync
+      dispatch(updateTaskTimeTracking({ taskId: task_id, timeTracking: timerTimestamp }));
     } catch (error) {
       logger.error('Error handling timer start event:', error);
     }
@@ -975,11 +981,79 @@ export const useTaskSocketHandlers = () => {
         };
         dispatch(updateTask(updatedTask));
       }
+
+      // Also update the tasks slice activeTimers to keep both slices in sync
+      dispatch(updateTaskTimeTracking({ taskId: task_id, timeTracking: null }));
     } catch (error) {
       logger.error('Error handling timer stop event:', error);
     }
   }, [dispatch]);
 
+  // Handler for task sort order change events
+  const handleTaskSortOrderChange = useCallback((data: any[]) => {
+    try {
+      if (!Array.isArray(data) || data.length === 0) return;
+
+      // DEBUG: Log the data received from the backend
+      console.log('[TASK_SORT_ORDER_CHANGE] Received data:', data);
+
+      // Get canonical lists from Redux
+      const state = store.getState();
+      const priorityList = state.priorityReducer?.priorities || [];
+      const phaseList = state.phaseReducer?.phaseList || [];
+      const statusList = state.taskStatusReducer?.status || [];
+
+      // The backend sends an array of tasks with updated sort orders and possibly grouping fields
+      data.forEach((taskData: any) => {
+        const currentTask = state.taskManagement.entities[taskData.id];
+        if (currentTask) {
+          let updatedTask: Task = {
+            ...currentTask,
+            order: taskData.sort_order || taskData.current_sort_order || currentTask.order,
+            updatedAt: new Date().toISOString(),
+            updated_at: new Date().toISOString(),
+          };
+
+          // Update grouping fields if present
+          if (typeof taskData.priority_id !== 'undefined') {
+            const found = priorityList.find(p => p.id === taskData.priority_id);
+            if (found) {
+              updatedTask.priority = found.name;
+              // updatedTask.priority_id = found.id; // Only if Task type has priority_id
+            } else {
+              updatedTask.priority = taskData.priority_id || '';
+              // updatedTask.priority_id = taskData.priority_id;
+            }
+          }
+          if (typeof taskData.phase_id !== 'undefined') {
+            const found = phaseList.find(p => p.id === taskData.phase_id);
+            if (found) {
+              updatedTask.phase = found.name;
+              // updatedTask.phase_id = found.id; // Only if Task type has phase_id
+            } else {
+              updatedTask.phase = taskData.phase_id || '';
+              // updatedTask.phase_id = taskData.phase_id;
+            }
+          }
+          if (typeof taskData.status_id !== 'undefined') {
+            const found = statusList.find(s => s.id === taskData.status_id);
+            if (found) {
+              updatedTask.status = found.name;
+              // updatedTask.status_id = found.id; // Only if Task type has status_id
+            } else {
+              updatedTask.status = taskData.status_id || '';
+              // updatedTask.status_id = taskData.status_id;
+            }
+          }
+
+          dispatch(updateTask(updatedTask));
+        }
+      });
+    } catch (error) {
+      logger.error('Error handling task sort order change event:', error);
+    }
+  }, [dispatch]);
+
   // Register socket event listeners
   useEffect(() => {
     if (!socket) return;
@@ -1013,6 +1087,7 @@ export const useTaskSocketHandlers = () => {
       { event: SocketEvents.TASK_CUSTOM_COLUMN_UPDATE.toString(), handler: handleCustomColumnUpdate },
       { event: SocketEvents.TASK_TIMER_START.toString(), handler: handleTimerStart },
       { event: SocketEvents.TASK_TIMER_STOP.toString(), handler: handleTimerStop },
+      { event: SocketEvents.TASK_SORT_ORDER_CHANGE.toString(), handler: handleTaskSortOrderChange },
 
     ];
 
@@ -1047,6 +1122,7 @@ export const useTaskSocketHandlers = () => {
     handleCustomColumnUpdate,
     handleTimerStart,
     handleTimerStop,
+    handleTaskSortOrderChange,
 
   ]);
 };

worklenz-frontend/src/hooks/useTaskTimer.ts

@@ -50,7 +50,11 @@ export const useTaskTimer = (taskId: string, initialStartTime: number | null) =>
 
   // Timer management effect
   useEffect(() => {
-    if (started && localStarted && reduxStartTime) {
+    if (started && reduxStartTime) {
+      // Sync local state with Redux state
+      if (!localStarted) {
+        setLocalStarted(true);
+      }
       clearTimerInterval();
       timerTick();
       intervalRef.current = setInterval(timerTick, 1000);

worklenz-frontend/src/hooks/useTimerInitialization.ts

@@ -0,0 +1,79 @@
+import { useEffect, useRef } from 'react';
+import { useAppDispatch } from '@/hooks/useAppDispatch';
+import { updateTaskTimeTracking } from '@/features/tasks/tasks.slice';
+import { updateTask } from '@/features/task-management/task-management.slice';
+import { taskTimeLogsApiService } from '@/api/tasks/task-time-logs.api.service';
+import { store } from '@/app/store';
+import { Task } from '@/types/task-management.types';
+import logger from '@/utils/errorLogger';
+import moment from 'moment';
+
+export const useTimerInitialization = () => {
+  const dispatch = useAppDispatch();
+  const hasInitialized = useRef(false);
+
+  useEffect(() => {
+    const initializeTimers = async () => {
+      // Prevent duplicate initialization
+      if (hasInitialized.current) {
+        return;
+      }
+
+      try {
+        hasInitialized.current = true;
+        
+        // Fetch running timers from backend
+        const response = await taskTimeLogsApiService.getRunningTimers();
+        
+        if (response && response.done && Array.isArray(response.body)) {
+          const runningTimers = response.body;
+          
+          // Update Redux state for each running timer
+          runningTimers.forEach(timer => {
+            if (timer.task_id && timer.start_time) {
+              try {
+                // Convert start_time to timestamp
+                const startTime = moment(timer.start_time);
+                if (startTime.isValid()) {
+                  const timestamp = startTime.valueOf();
+                  
+                  // Update the tasks slice activeTimers
+                  dispatch(updateTaskTimeTracking({ 
+                    taskId: timer.task_id, 
+                    timeTracking: timestamp 
+                  }));
+                  
+                  // Update the task-management slice if the task exists
+                  const currentTask = store.getState().taskManagement.entities[timer.task_id];
+                  if (currentTask) {
+                    const updatedTask: Task = {
+                      ...currentTask,
+                      timeTracking: {
+                        ...currentTask.timeTracking,
+                        activeTimer: timestamp,
+                      },
+                      updatedAt: new Date().toISOString(),
+                      updated_at: new Date().toISOString(),
+                    };
+                    dispatch(updateTask(updatedTask));
+                  }
+                }
+              } catch (error) {
+                logger.error(`Error initializing timer for task ${timer.task_id}:`, error);
+              }
+            }
+          });
+          
+          if (runningTimers.length > 0) {
+            logger.info(`Initialized ${runningTimers.length} running timers from backend`);
+          }
+        }
+      } catch (error) {
+        logger.error('Error initializing timers from backend:', error);
+      }
+    };
+
+    // Initialize timers when the hook mounts
+    initializeTimers();
+  }, [dispatch]);
+}; 

worklenz-frontend/src/pages/account-setup/account-setup.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Space, Steps, Button, Typography } from 'antd/es';
@@ -26,6 +26,7 @@ import { validateEmail } from '@/utils/validateEmail';
 import { sanitizeInput } from '@/utils/sanitizeInput';
 import logo from '@/assets/images/worklenz-light-mode.png';
 import logoDark from '@/assets/images/worklenz-dark-mode.png';
+import { useAppDispatch } from '@/hooks/useAppDispatch';
 
 import './account-setup.css';
 import { IAccountSetupRequest } from '@/types/project-templates/project-templates.types';
@@ -34,7 +35,7 @@ import { profileSettingsApiService } from '@/api/settings/profile/profile-settin
 const { Title } = Typography;
 
 const AccountSetup: React.FC = () => {
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
   const { t } = useTranslation('account-setup');
   useDocumentTitle(t('setupYourAccount', 'Account Setup'));
   const navigate = useNavigate();
@@ -52,8 +53,7 @@ const AccountSetup: React.FC = () => {
     trackMixpanelEvent(evt_account_setup_visit);
     const verifyAuthStatus = async () => {
       try {
-        const response = (await dispatch(verifyAuthentication()).unwrap())
-          .payload as IAuthorizeResponse;
+        const response = await dispatch(verifyAuthentication()).unwrap() as IAuthorizeResponse;
         if (response?.authenticated) {
           setSession(response.user);
           dispatch(setUser(response.user));
@@ -163,6 +163,18 @@ const AccountSetup: React.FC = () => {
       const res = await profileSettingsApiService.setupAccount(model);
       if (res.done && res.body.id) {
         trackMixpanelEvent(skip ? evt_account_setup_skip_invite : evt_account_setup_complete);
+        
+        // Refresh user session to update setup_completed status
+        try {
+          const authResponse = await dispatch(verifyAuthentication()).unwrap() as IAuthorizeResponse;
+          if (authResponse?.authenticated && authResponse?.user) {
+            setSession(authResponse.user);
+            dispatch(setUser(authResponse.user));
+          }
+        } catch (error) {
+          logger.error('Failed to refresh user session after setup completion', error);
+        }
+        
         navigate(`/worklenz/projects/${res.body.id}?tab=tasks-list&pinned_tab=tasks-list`);
       }
     } catch (error) {

worklenz-frontend/src/pages/auth/logging-out.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { useAuthService } from '@/hooks/useAuth';
 import { useMediaQuery } from 'react-responsive';
 import { authApiService } from '@/api/auth/auth.api.service';
+import CacheCleanup from '@/utils/cache-cleanup';
 
 const LoggingOutPage = () => {
   const navigate = useNavigate();
@@ -14,14 +15,30 @@ const LoggingOutPage = () => {
 
   useEffect(() => {
     const logout = async () => {
-      await auth.signOut();
-      await authApiService.logout();
-      setTimeout(() => {
-        window.location.href = '/';
-      }, 1500);
+      try {
+        // Clear local session
+        await auth.signOut();
+        
+        // Call backend logout
+        await authApiService.logout();
+        
+        // Clear all caches using the utility
+        await CacheCleanup.clearAllCaches();
+        
+        // Force a hard reload to ensure fresh state
+        setTimeout(() => {
+          CacheCleanup.forceReload('/auth/login');
+        }, 1000);
+        
+      } catch (error) {
+        console.error('Logout error:', error);
+        // Fallback: force reload to login page
+        CacheCleanup.forceReload('/auth/login');
+      }
     };
+    
     void logout();
-  }, [auth, navigate]);
+  }, [auth]);
 
   const cardStyles = {
     width: '100%',

worklenz-frontend/src/pages/projects/projectView/project-view.tsx

@@ -39,6 +39,7 @@ import { resetState as resetEnhancedKanbanState } from '@/features/enhanced-kanb
 import { setProjectId as setInsightsProjectId } from '@/features/projects/insights/project-insights.slice';
 import { SuspenseFallback } from '@/components/suspense-fallback/suspense-fallback';
 import { useTranslation } from 'react-i18next';
+import { useTimerInitialization } from '@/hooks/useTimerInitialization';
 
 
 // Import critical components synchronously to avoid suspense interruptions
@@ -89,6 +90,9 @@ const ProjectView = React.memo(() => {
   const [taskid, setTaskId] = useState<string>(urlParams.taskId);
   const [isInitialized, setIsInitialized] = useState(false);
 
+  // Initialize timer state from backend when project view loads
+  useTimerInitialization();
+
   // Update local state when URL params change
   useEffect(() => {
     setActiveTab(urlParams.tab);

worklenz-frontend/src/types/task-management.types.ts

@@ -41,6 +41,10 @@ export interface Task {
   has_subscribers?: boolean;
   schedule_id?: string | null;
   order?: number;
+  status_sort_order?: number; // Sort order when grouped by status
+  priority_sort_order?: number; // Sort order when grouped by priority
+  phase_sort_order?: number; // Sort order when grouped by phase
+  member_sort_order?: number; // Sort order when grouped by members
   reporter?: string; // Reporter field
   timeTracking?: { // Time tracking information
     logged?: number;
@@ -173,3 +177,21 @@ export interface BulkAction {
   value?: any;
   taskIds: string[];
 }
+
+// Helper function to get the appropriate sort order field based on grouping
+export function getSortOrderField(grouping: string | undefined): keyof Task {
+  switch (grouping) {
+    case 'status':
+      return 'status_sort_order';
+    case 'priority':
+      return 'priority_sort_order';
+    case 'phase':
+      return 'phase_sort_order';
+    case 'members':
+      return 'member_sort_order';
+    case 'general':
+      return 'order'; // explicit general sorting
+    default:
+      return 'status_sort_order'; // Default to status sorting to match backend
+  }
+}

worklenz-frontend/src/utils/cache-cleanup.ts

@@ -0,0 +1,163 @@
+/**
+ * Cache cleanup utilities for logout operations
+ * Handles clearing of various caches to prevent stale data issues
+ */
+
+export class CacheCleanup {
+  /**
+   * Clear all caches including service worker, browser cache, and storage
+   */
+  static async clearAllCaches(): Promise<void> {
+    try {
+      console.log('CacheCleanup: Starting cache clearing process...');
+      
+      // Clear browser caches
+      if ('caches' in window) {
+        const cacheNames = await caches.keys();
+        console.log('CacheCleanup: Found caches:', cacheNames);
+        
+        await Promise.all(
+          cacheNames.map(async cacheName => {
+            const deleted = await caches.delete(cacheName);
+            console.log(`CacheCleanup: Deleted cache "${cacheName}":`, deleted);
+            return deleted;
+          })
+        );
+        console.log('CacheCleanup: Browser caches cleared');
+      } else {
+        console.log('CacheCleanup: Cache API not supported');
+      }
+
+      // Clear service worker cache
+      if ('serviceWorker' in navigator) {
+        const registration = await navigator.serviceWorker.getRegistration();
+        if (registration) {
+          console.log('CacheCleanup: Found service worker registration');
+          
+          // Send logout message to service worker to clear its caches and unregister
+          if (registration.active) {
+            try {
+              console.log('CacheCleanup: Sending LOGOUT message to service worker...');
+              await this.sendMessageToServiceWorker('LOGOUT');
+              console.log('CacheCleanup: LOGOUT message sent successfully');
+            } catch (error) {
+              console.warn('CacheCleanup: Failed to send logout message to service worker:', error);
+              // Fallback: try to clear cache manually
+              try {
+                console.log('CacheCleanup: Trying fallback CLEAR_CACHE message...');
+                await this.sendMessageToServiceWorker('CLEAR_CACHE');
+                console.log('CacheCleanup: CLEAR_CACHE message sent successfully');
+              } catch (fallbackError) {
+                console.warn('CacheCleanup: Failed to clear service worker cache:', fallbackError);
+              }
+            }
+          }
+          
+          // If service worker is still registered, unregister it
+          if (registration.active) {
+            console.log('CacheCleanup: Unregistering service worker...');
+            await registration.unregister();
+            console.log('CacheCleanup: Service worker unregistered');
+          }
+        } else {
+          console.log('CacheCleanup: No service worker registration found');
+        }
+      } else {
+        console.log('CacheCleanup: Service Worker not supported');
+      }
+
+      // Clear localStorage and sessionStorage
+      const localStorageKeys = Object.keys(localStorage);
+      const sessionStorageKeys = Object.keys(sessionStorage);
+      
+      console.log('CacheCleanup: Clearing localStorage keys:', localStorageKeys);
+      console.log('CacheCleanup: Clearing sessionStorage keys:', sessionStorageKeys);
+      
+      localStorage.clear();
+      sessionStorage.clear();
+      console.log('CacheCleanup: Local storage cleared');
+
+      console.log('CacheCleanup: Cache clearing process completed successfully');
+
+    } catch (error) {
+      console.error('CacheCleanup: Error clearing caches:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Send message to service worker
+   */
+  private static async sendMessageToServiceWorker(type: string, payload?: any): Promise<any> {
+    if (!('serviceWorker' in navigator)) {
+      throw new Error('Service Worker not supported');
+    }
+
+    const registration = await navigator.serviceWorker.getRegistration();
+    if (!registration || !registration.active) {
+      throw new Error('Service Worker not active');
+    }
+
+    return new Promise((resolve, reject) => {
+      const messageChannel = new MessageChannel();
+      
+      messageChannel.port1.onmessage = (event) => {
+        if (event.data.error) {
+          reject(event.data.error);
+        } else {
+          resolve(event.data);
+        }
+      };
+
+      registration.active!.postMessage(
+        { type, payload },
+        [messageChannel.port2]
+      );
+
+      // Timeout after 5 seconds
+      setTimeout(() => {
+        reject(new Error('Service Worker message timeout'));
+      }, 5000);
+    });
+  }
+
+  /**
+   * Force reload the page to ensure fresh state
+   */
+  static forceReload(url: string = '/auth/login'): void {
+    // Use replace to prevent back button issues
+    window.location.replace(url);
+  }
+
+  /**
+   * Clear specific cache types
+   */
+  static async clearSpecificCaches(cacheTypes: string[]): Promise<void> {
+    if (!('caches' in window)) return;
+
+    const cacheNames = await caches.keys();
+    const cachesToDelete = cacheNames.filter(name => 
+      cacheTypes.some(type => name.includes(type))
+    );
+
+    await Promise.all(
+      cachesToDelete.map(cacheName => caches.delete(cacheName))
+    );
+  }
+
+  /**
+   * Clear API cache specifically
+   */
+  static async clearAPICache(): Promise<void> {
+    await this.clearSpecificCaches(['api', 'dynamic']);
+  }
+
+  /**
+   * Clear static asset cache
+   */
+  static async clearStaticCache(): Promise<void> {
+    await this.clearSpecificCaches(['static', 'images']);
+  }
+}
+
+export default CacheCleanup;