christianV/Craze-Data-check
1
0
Fork 0
mirror of https://github.com/christianvidalwolf-prog/Craze-Data-check.git synced 2026-08-03 18:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use Dropbox values unless there's pending edit

Browse Source
This commit is contained in:
Christian Vidal Wolf
2026-04-23 15:57:33 +02:00
parent dbaf0e76fe
commit 5ad1bff842
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.tsx
+5 -4
View File
@@ -166,8 +166,9 @@ export default function App() {
// Start with Dropbox values (default) // Start with Dropbox values (default)
let finalRow = [...row]; let finalRow = [...row];
// Only preserve Supabase values if there's a PENDING or EDITED edit for this article // Only preserve Supabase values if there's a PENDING manual edit
if (synced && (synced.status === 'pending' || synced.status === 'edited' || synced.status === 'synced')) { // NOT for 'synced' status - we want fresh Dropbox data to overwrite
if (synced && synced.status === 'pending') {
// DETECT COLUMN SHIFT: If the saved data uses the old structure (where index 12 was a numeric date), // DETECT COLUMN SHIFT: If the saved data uses the old structure (where index 12 was a numeric date),
// we need to shift all indices from 12 onwards by +1 to match today's Excel structure. // we need to shift all indices from 12 onwards by +1 to match today's Excel structure.
const oldData = synced.data; const oldData = synced.data;
@@ -186,9 +187,9 @@ export default function App() {
finalRow[idx] = oldData[mergeIdx]; finalRow[idx] = oldData[mergeIdx];
} }
}); });
setRowStatuses(prev => ({ ...prev, [articleNo]: 'synced' })); setRowStatuses(prev => ({ ...prev, [articleNo]: synced.status }));
} }
// Otherwise use Dropbox values (don't merge, just process formatting) // Otherwise use Dropbox values (default - will show 4.5 not 4.95)
return finalRow.map((val: any, idx: number) => { return finalRow.map((val: any, idx: number) => {
if (val === undefined || val === null || val === '') return val; if (val === undefined || val === null || val === '') return val;