Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion backend/routes/sheets.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ def delete_sheet(user_sheet_id):
try:
delete_user_sheet(user_sheet_id, request.user_id)
return jsonify({'success': True, 'message': 'Sheet deleted successfully'})
except LookupError:
return jsonify({'error': 'Sheet not found'}), 404
except PermissionError:
return jsonify({'error': 'Access denied'}), 403
except Exception as e:
current_app.logger.error("Error deleting sheet %s: %s", user_sheet_id, e)
return jsonify({'error': f'Failed to delete sheet: {str(e)}'}), 500
return jsonify({'error': 'Failed to delete sheet'}), 500
6 changes: 4 additions & 2 deletions backend/services/sheet_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,11 @@ def delete_user_sheet(user_sheet_id, user_id):

sheet_response = supabase_admin.table('user_sheets').select('user_id').eq(
'id', user_sheet_id
).single().execute()
).maybe_single().execute()

if not sheet_response.data or sheet_response.data['user_id'] != user_id:
if not sheet_response.data:
raise LookupError('Sheet not found')
if sheet_response.data['user_id'] != user_id:
raise PermissionError('Access denied')

files_response = supabase_admin.table('sheet_files').select(
Expand Down
10 changes: 5 additions & 5 deletions frontend-vite/react-ts/src/components/Inventory.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect, useRef } from 'react';
import React, { useState, useEffect, useRef } from 'react';
import axios from 'axios';
import {
Download, Trash2, RefreshCw, FileSpreadsheet,
Expand Down Expand Up @@ -153,7 +153,7 @@ function Inventory() {
setSheetStates(prev => ({ ...prev, [_userSheetId]: { ...prev[_userSheetId], deleteStatus: 'deleting' } }));
try {
await axios.delete(`${API_URL}/delete-sheet/${_userSheetId}`, { withCredentials: true });
setUserSheets(userSheets.filter(s => s.id !== _userSheetId));
setUserSheets(prev => prev.filter(s => s.id !== _userSheetId));
setSheetStates(prev => { const n = { ...prev }; delete n[_userSheetId]; return n; });
if (expandedSheetId === _userSheetId) setExpandedSheetId(null);
} catch {
Expand Down Expand Up @@ -413,8 +413,8 @@ function Inventory() {
const numSelected = selectedSheets[sheet.id]?.size ?? 0;

return (
<>
<tr key={sheet.id} className="hover:bg-secondary/30 transition-colors">
<React.Fragment key={sheet.id}>
<tr className="hover:bg-secondary/30 transition-colors">
<td className="px-4 py-3.5">
<button
onClick={() => toggleExpand(sheet.id)}
Expand Down Expand Up @@ -514,7 +514,7 @@ function Inventory() {
</td>
</tr>
)}
</>
</React.Fragment>
);
})}
</tbody>
Expand Down
Loading