mirror of
https://github.com/pacnpal/thrilltrack-explorer.git
synced 2025-12-24 11:11:13 -05:00
Refactor log_request_metadata function
This commit is contained in:
@@ -640,14 +640,23 @@ export function SubmissionReviewManager({
|
||||
}}
|
||||
onResolve={async (strategy) => {
|
||||
if (strategy === 'keep-mine') {
|
||||
// Log conflict resolution
|
||||
// Log conflict resolution using relational tables
|
||||
const { supabase } = await import('@/integrations/supabase/client');
|
||||
await supabase.from('conflict_resolutions').insert([{
|
||||
submission_id: submissionId,
|
||||
resolved_by: user?.id || null,
|
||||
resolution_strategy: strategy,
|
||||
conflict_details: conflictData as any,
|
||||
}]);
|
||||
const { writeConflictDetailFields } = await import('@/lib/auditHelpers');
|
||||
|
||||
const { data: resolution, error } = await supabase
|
||||
.from('conflict_resolutions')
|
||||
.insert([{
|
||||
submission_id: submissionId,
|
||||
resolved_by: user?.id || null,
|
||||
resolution_strategy: strategy,
|
||||
}])
|
||||
.select('id')
|
||||
.single();
|
||||
|
||||
if (!error && resolution && conflictData) {
|
||||
await writeConflictDetailFields(resolution.id, conflictData as any);
|
||||
}
|
||||
|
||||
// Force override and proceed with approval
|
||||
await handleApprove();
|
||||
|
||||
Reference in New Issue
Block a user