count0/HabitGrid
1
0
Fork 0
mirror of https://github.com/nagaoo0/HabbitGrid.git synced 2026-01-11 23:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

EnsureLocalOnlyStorage Works correcly with new uuid system

Browse Source
This commit is contained in:
_count0
2025-10-17 23:18:14 +02:00
parent 863e932ec2
commit 0c5e75f726
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/datastore.js
View File

@@ -100,7 +100,11 @@ export async function saveHabit(habit) {
created_at: now, created_at: now,
updated_at: now, updated_at: now,
}; };
const { data, error } = await supabase.from('habits').insert(insert).select('*').single(); const { data, error } = await supabase
.from('habits')
.upsert(insert, { onConflict: 'id' })
.select('*')
.single();
if (error) { if (error) {
console.warn('Supabase saveHabit error, writing local:', error.message); console.warn('Supabase saveHabit error, writing local:', error.message);
return local.saveHabit({ ...habit, id }); return local.saveHabit({ ...habit, id });
@@ -210,6 +214,8 @@ export async function syncLocalToRemoteIfNeeded() {
let habits = local.getHabits(); let habits = local.getHabits();
if (habits.length === 0) return localStorage.setItem(SYNC_FLAG, new Date().toISOString()); if (habits.length === 0) return localStorage.setItem(SYNC_FLAG, new Date().toISOString());
habits = ensureUUIDs(habits); habits = ensureUUIDs(habits);
// Persist back to local so IDs match remote after upsert
localStorage.setItem('habitgrid_data', JSON.stringify(habits));
const rows = habits.map(h => ({ const rows = habits.map(h => ({
id: h.id, id: h.id,
user_id: user.id, user_id: user.id,

24
src/lib/storage.js
View File

@@ -2,6 +2,15 @@
import { supabase } from './supabase'; import { supabase } from './supabase';
const STORAGE_KEY = 'habitgrid_data'; const STORAGE_KEY = 'habitgrid_data';
// UUID v4 generator for local/offline usage
function generateUUID() {
if (typeof window !== 'undefined' && window.crypto?.randomUUID) return window.crypto.randomUUID();
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
const r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
}
export const getHabits = () => { export const getHabits = () => {
try { try {
const data = localStorage.getItem(STORAGE_KEY); const data = localStorage.getItem(STORAGE_KEY);
@@ -56,14 +65,21 @@ const remoteMirrorDelete = async (id) => {
export const saveHabit = (habit) => { export const saveHabit = (habit) => {
const habits = getHabits(); const habits = getHabits();
// Respect provided id (e.g., UUID from AddEdit or datastore). Generate only if missing.
const id = habit.id || generateUUID();
const existingIndex = habits.findIndex(h => h.id === id);
const newHabit = { const newHabit = {
...habit, ...habit,
id: Date.now().toString(), id,
sortOrder: habits.length, sortOrder: habit.sortOrder ?? habits.length,
createdAt: nowIso(), createdAt: habit.createdAt || nowIso(),
updatedAt: nowIso(), updatedAt: nowIso(),
}; };
habits.push(newHabit); if (existingIndex >= 0) {
habits[existingIndex] = newHabit;
} else {
habits.push(newHabit);
}
localStorage.setItem(STORAGE_KEY, JSON.stringify(habits)); localStorage.setItem(STORAGE_KEY, JSON.stringify(habits));
remoteMirrorUpsert(newHabit); remoteMirrorUpsert(newHabit);
return newHabit; return newHabit;