copilot feedback

Author: dkhalife

android/app/src/main/java/com/dkhalife/tasks/ui/screen/TaskListScreen.kt

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -107,7 +108,7 @@ fun TaskListScreen(
                             tint = MaterialTheme.colorScheme.onErrorContainer,
                             modifier = Modifier.size(18.dp)
                         )
-                        Spacer(modifier = Modifier.height(8.dp))
+                        Spacer(modifier = Modifier.width(8.dp))
                         Text(
                             text = stringResource(R.string.settings_section_account_deletion),
                             style = MaterialTheme.typography.bodySmall,

apiserver/internal/repos/user/user.go

@@ -12,7 +12,6 @@ import (
 )
 
 var ErrDisabledUser = errors.New("account is disabled")
-var ErrPendingDeletion = errors.New("account is pending deletion")
 
 type IUserRepo interface {
 	CreateUser(c context.Context, user *models.User) error

apiserver/internal/repos/user/user_test.go

@@ -404,7 +404,11 @@ func (s *UserTestSuite) TestDeleteUser_CascadesAllUserData() {
 
 func (s *UserTestSuite) assertRowCount(table string, userID int, expected int) {
 	var count int64
-	s.DB.Table(table).Where("id = ?", userID).Count(&count)
+	column := "id"
+	if table == "labels" {
+		column = "created_by"
+	}
+	s.DB.Table(table).Where(column+" = ?", userID).Count(&count)
 	s.Equal(int64(expected), count, "expected %d row(s) in %s for user %d", expected, table, userID)
 }
 

apiserver/internal/services/users/user.go

@@ -2,6 +2,7 @@ package users
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -67,6 +68,7 @@ func (s *UserService) RequestDeletion(ctx context.Context, userID int) (int, int
 		}
 	}
 
+	s.ws.SetPendingDeletionForUser(userID, true)
 	s.ws.BroadcastToUser(userID, ws.WSResponse{
 		Action: "account_deletion_requested",
 		Data:   gin.H{},
@@ -85,6 +87,7 @@ func (s *UserService) CancelDeletion(ctx context.Context, userID int) (int, inte
 		}
 	}
 
+	s.ws.SetPendingDeletionForUser(userID, false)
 	s.ws.BroadcastToUser(userID, ws.WSResponse{
 		Action: "account_deletion_cancelled",
 		Data:   gin.H{},
@@ -102,11 +105,11 @@ func (s *UserService) ProcessDeletions(ctx context.Context) error {
 	}
 
 	for _, user := range users {
-		log.Infof("deleting account for user %d (requested at %s)", user.ID, user.DeletionRequestedAt)
+		log.Infof("deleting account for user %d (requested at %v)", user.ID, user.DeletionRequestedAt)
 		if err := s.r.DeleteUser(ctx, user.ID); err != nil {
 			log.Errorf("failed to delete user %d: %s", user.ID, err.Error())
 			telemetry.TrackError(ctx, "account_deletion_failed", "user-service", err, map[string]string{
-				"user_id": string(rune(user.ID)),
+				"user_id": fmt.Sprint(user.ID),
 			})
 		}
 	}

apiserver/internal/ws/server.go

@@ -296,3 +296,16 @@ func (s *WSServer) BroadcastToUser(userID int, resp WSResponse) {
 		}
 	}()
 }
+
+// SetPendingDeletionForUser updates the PendingDeletion flag on all active
+// connections for a user so the WS write-guard reflects current deletion state
+// without requiring a reconnect.
+func (s *WSServer) SetPendingDeletionForUser(userID int, pending bool) {
+	s.mu.RLock()
+	conns := s.userConnections[userID]
+	s.mu.RUnlock()
+
+	for _, c := range conns {
+		c.identity.PendingDeletion = pending
+	}
+}

frontend/src/App.tsx

@@ -11,7 +11,7 @@ import { AppDispatch, store } from './store/store'
 import { connect } from 'react-redux'
 import { fetchUser } from './store/userSlice'
 import { StatusList } from './components/StatusList'
-import { DeletionBannerWrapper } from './components/DeletionBanner'
+import { DeletionBanner } from './components/DeletionBanner'
 import { fetchTasks, initGroups } from './store/tasksSlice'
 import { FIVE_MINUTES_MS } from '@/constants/time'
 
@@ -126,7 +126,7 @@ class AppImpl extends React.Component<AppProps> {
           <NavBar
             pathname={pathname}
           />
-          <DeletionBannerWrapper />
+          <DeletionBanner />
           <Outlet />
           <StatusList />
         </CssVarsProvider>

frontend/src/components/DeletionBanner.tsx

@@ -2,10 +2,10 @@ import React from 'react'
 import { Alert, Button, Typography } from '@mui/joy'
 import { WarningAmberRounded } from '@mui/icons-material'
 import { connect } from 'react-redux'
+import { Link } from 'react-router-dom'
 import { AppDispatch, RootState } from '@/store/store'
 import { cancelAccountDeletion } from '@/store/userSlice'
 import { NavigationPaths } from '@/utils/navigation'
-import { useNavigate } from 'react-router-dom'
 
 type DeletionBannerProps = {
   deletionRequestedAt: string | null
@@ -46,9 +46,9 @@ class DeletionBannerImpl extends React.Component<DeletionBannerProps> {
           Your account is scheduled for deletion on{' '}
           <strong>{this.formatDeletionTime(deletionRequestedAt)}</strong>.
           Writes are disabled. Visit{' '}
-          <a href={NavigationPaths.Settings} style={{ color: 'inherit' }}>
+          <Link to={NavigationPaths.Settings} style={{ color: 'inherit' }}>
             Settings
-          </a>{' '}
+          </Link>{' '}
           to manage this.
         </Typography>
       </Alert>
@@ -69,10 +69,3 @@ export const DeletionBanner = connect(
   mapStateToProps,
   mapDispatchToProps,
 )(DeletionBannerImpl)
-
-// Functional wrapper needed to access useNavigate hook
-export const DeletionBannerWrapper: React.FC = () => {
-  const navigate = useNavigate()
-  void navigate // referenced to avoid unused warning
-  return <DeletionBanner />
-}