Only the mutawalli (agent) or head of family can access this dashboard.
+ {:else} +This is your own trigger. You cannot fire it for yourself — another agent/owner or the head of family must.
+ {/if} + {#if trigger?.triggered} + + + {#if notifyStatus}{notifyStatus}
{/if} + {:else} + +{error}
{/if} + + {/if} +This relation ("{form.relation}") matches an existing Quranic heir. You cannot bequeath to an existing heir via wassiyah — the fixed Faraid shares already govern their portion. This entry is blocked.
{:else} diff --git a/src/lib/db.js b/src/lib/db.js index 476ef7d..56f4305 100644 --- a/src/lib/db.js +++ b/src/lib/db.js @@ -66,18 +66,18 @@ export async function removeHibahGift(id) { } // ── Waqf ── -export async function getWaqfDesignation(familyId) { - const { data, error } = await supabase.from('nf_waqf_designations').select('*').eq('family_id', familyId).order('created_at', { ascending: false }).limit(1).maybeSingle(); +export async function getWaqfDesignation(familyId, authorId) { + const { data, error } = await supabase.from('nf_waqf_designations').select('*').eq('family_id', familyId).eq('author_id', authorId).order('created_at', { ascending: false }).limit(1).maybeSingle(); if (error) throw error; if (!data) return null; const { data: beneficiaries } = await supabase.from('nf_waqf_beneficiaries').select('*').eq('waqf_id', data.id); return { id: data.id, corpusAssetId: data.corpus_asset_id, mutawalli: data.mutawalli, successorMutawalli: data.successor_mutawalli, equalSplit: data.equal_split, jurisdiction: data.jurisdiction, - beneficiaries: (beneficiaries || []).map(b => ({ id: b.id, name: b.name, relation: b.relation, sharePercent: b.share_percent })) + beneficiaries: (beneficiaries || []).map(b => ({ id: b.id, name: b.name, relation: b.relation, sharePercent: b.share_percent, email: b.beneficiary_email })) }; } -export async function upsertWaqfDesignation(familyId, existingId, fields) { +export async function upsertWaqfDesignation(familyId, authorId, existingId, fields) { if (existingId) { const { error } = await supabase.from('nf_waqf_designations').update({ corpus_asset_id: fields.corpusAssetId || null, mutawalli: fields.mutawalli, successor_mutawalli: fields.successorMutawalli, @@ -87,16 +87,23 @@ export async function upsertWaqfDesignation(familyId, existingId, fields) { return existingId; } const { data, error } = await supabase.from('nf_waqf_designations').insert({ - family_id: familyId, corpus_asset_id: fields.corpusAssetId || null, mutawalli: fields.mutawalli, + family_id: familyId, author_id: authorId, corpus_asset_id: fields.corpusAssetId || null, mutawalli: fields.mutawalli, successor_mutawalli: fields.successorMutawalli, equal_split: fields.equalSplit, jurisdiction: fields.jurisdiction }).select().single(); if (error) throw error; return data.id; } export async function addWaqfBeneficiary(waqfId, b) { - const { error } = await supabase.from('nf_waqf_beneficiaries').insert({ waqf_id: waqfId, name: b.name, relation: b.relation, share_percent: b.sharePercent || null }); + const { error } = await supabase.from('nf_waqf_beneficiaries').insert({ waqf_id: waqfId, name: b.name, relation: b.relation, share_percent: b.sharePercent || null, beneficiary_email: b.email || null }); if (error) throw error; } + +/** For the mutawalli dashboard: every family member's Waqf designations. */ +export async function listAllWaqfForFamily(familyId) { + const { data, error } = await supabase.from('nf_waqf_designations').select('*, nf_waqf_beneficiaries(*)').eq('family_id', familyId).order('created_at'); + if (error) throw error; + return data || []; +} export async function removeWaqfBeneficiary(id) { const { error } = await supabase.from('nf_waqf_beneficiaries').delete().eq('id', id); if (error) throw error; @@ -187,15 +194,16 @@ export function estateTotal(assets) { return (assets || []).reduce((sum, a) => sum + (Number(a.value) || 0) * (Number(a.ownershipShare ?? 100) / 100), 0); } -// ── Wassiyah ── -export async function listWassiyahBequests(familyId) { - const { data, error } = await supabase.from('nf_wassiyah_bequests').select('*').eq('family_id', familyId).order('created_at'); +// ── Wassiyah — per-author: each signed-in family member has their own ── +export async function listWassiyahBequests(familyId, authorId) { + const { data, error } = await supabase.from('nf_wassiyah_bequests').select('*').eq('family_id', familyId).eq('author_id', authorId).order('created_at'); if (error) throw error; - return (data || []).map(b => ({ id: b.id, recipient: b.recipient, relation: b.relation, description: b.description, value: b.value })); + return (data || []).map(b => ({ id: b.id, recipient: b.recipient, relation: b.relation, description: b.description, value: b.value, recipientEmail: b.recipient_email })); } -export async function addWassiyahBequest(familyId, b) { +export async function addWassiyahBequest(familyId, authorId, b) { const { error } = await supabase.from('nf_wassiyah_bequests').insert({ - family_id: familyId, recipient: b.recipient, relation: b.relation, description: b.description, value: Number(b.value) + family_id: familyId, author_id: authorId, recipient: b.recipient, relation: b.relation, + description: b.description, value: Number(b.value), recipient_email: b.recipientEmail || null }); if (error) throw error; } @@ -203,15 +211,70 @@ export async function removeWassiyahBequest(id) { const { error } = await supabase.from('nf_wassiyah_bequests').delete().eq('id', id); if (error) throw error; } -export async function getWassiyahSettings(familyId) { - const { data, error } = await supabase.from('nf_wassiyah_settings').select('*').eq('family_id', familyId).maybeSingle(); +export async function getWassiyahSettings(familyId, authorId) { + const { data, error } = await supabase.from('nf_wassiyah_settings').select('*').eq('family_id', familyId).eq('author_id', authorId).maybeSingle(); if (error) throw error; return data; } -export async function upsertWassiyahSettings(familyId, fields) { +export async function upsertWassiyahSettings(familyId, authorId, fields) { const { error } = await supabase.from('nf_wassiyah_settings').upsert({ - family_id: familyId, jurisdiction: fields.jurisdiction, witness1: fields.witness1, witness2: fields.witness2, + family_id: familyId, author_id: authorId, jurisdiction: fields.jurisdiction, witness1: fields.witness1, witness2: fields.witness2, updated_at: new Date().toISOString() - }, { onConflict: 'family_id' }); + }, { onConflict: 'family_id,author_id' }); if (error) throw error; } + +/** For the mutawalli dashboard: every family member's Wassiyah bequests, grouped by author. */ +export async function listAllWassiyahForFamily(familyId) { + const { data, error } = await supabase.from('nf_wassiyah_bequests').select('*').eq('family_id', familyId).order('created_at'); + if (error) throw error; + return data || []; +} + +// ── Per-member death trigger — the mutawalli/owner fires it for a specific +// member, never the member themselves (enforced by RLS, not just the UI). ── +export async function getMemberTrigger(memberId, familyId) { + const { data, error } = await supabase.from('nf_member_triggers').select('*').eq('member_id', memberId).eq('family_id', familyId).maybeSingle(); + if (error) throw error; + return data; +} +export async function upsertMemberTriggerSetup(memberId, familyId, fields) { + const { error } = await supabase.from('nf_member_triggers').upsert({ + member_id: memberId, family_id: familyId, executor_name: fields.executorName, + date_of_death: fields.dateOfDeath || null, death_cert_ref: fields.deathCertRef, updated_at: new Date().toISOString() + }, { onConflict: 'family_id,member_id' }); + if (error) throw error; +} +/** Only succeeds (per RLS) if the caller is an agent/owner on this family and is NOT the member themselves. */ +export async function fireMemberTrigger(memberId, familyId, firedBy) { + const { error } = await supabase.from('nf_member_triggers').upsert({ + member_id: memberId, family_id: familyId, triggered: true, triggered_at: new Date().toISOString(), + fired_by: firedBy, updated_at: new Date().toISOString() + }, { onConflict: 'family_id,member_id' }); + if (error) throw error; +} +export async function listMemberAttestors(memberId, familyId) { + const { data, error } = await supabase.from('nf_member_attestors').select('*').eq('member_id', memberId).eq('family_id', familyId).order('created_at'); + if (error) throw error; + return data || []; +} +export async function addMemberAttestor(memberId, familyId, name) { + const { data, error } = await supabase.from('nf_member_attestors').insert({ member_id: memberId, family_id: familyId, name }).select().single(); + if (error) throw error; + return data; +} +export async function updateMemberAttestorName(id, name) { + const { error } = await supabase.from('nf_member_attestors').update({ name }).eq('id', id); + if (error) throw error; +} +export async function setMemberAttestorConfirmed(id, confirmed) { + const { error } = await supabase.from('nf_member_attestors').update({ confirmed, confirmed_at: confirmed ? new Date().toISOString() : null }).eq('id', id); + if (error) throw error; +} + +/** Sends the heir notification email via the notify-heirs Edge Function. */ +export async function notifyHeirs(memberId) { + const { data, error } = await supabase.functions.invoke('notify-heirs', { body: { memberId } }); + if (error) throw error; + return data; +} diff --git a/src/lib/family.js b/src/lib/family.js index 34f9bac..bab9301 100644 --- a/src/lib/family.js +++ b/src/lib/family.js @@ -79,10 +79,21 @@ export async function inviteAgent(familyId, email) { if (error) throw error; } +/** Invite an ordinary family member — authors their own Wassiyah/Waqf, doesn't manage the family. */ +export async function inviteMember(familyId, email) { + const { error } = await supabase.from('nf_family_members').insert({ + family_id: familyId, + invited_email: email, + role: 'member', + status: 'invited' + }); + if (error) throw error; +} + export async function listFamilyMembers(familyId) { const { data, error } = await supabase .from('nf_family_members') - .select('id, invited_email, role, status') + .select('id, user_id, invited_email, role, status') .eq('family_id', familyId); if (error) throw error; return data || []; diff --git a/src/lib/nonprobate.js b/src/lib/nonprobate.js index 12a306e..c5431ba 100644 --- a/src/lib/nonprobate.js +++ b/src/lib/nonprobate.js @@ -23,12 +23,17 @@ // Takes already-fetched data rather than loading it itself — the caller (now // Supabase-backed via db.js instead of localStorage) owns the fetch. -export function computeCoverage({ assets = [], gifts = [], nominations = [], waqfCorpusId = null } = {}) { +export function computeCoverage({ assets = [], gifts = [], nominations = [], waqfCorpusId = null, waqfCorpusIds = null } = {}) { + // waqfCorpusIds covers the per-member model: ANY family member's waqf + // designation counts for coverage, not just one author's. waqfCorpusId + // (singular) is kept for backward compatibility with any caller still + // passing a single id. + const corpusIdSet = new Set(waqfCorpusIds || (waqfCorpusId ? [waqfCorpusId] : [])); const rows = assets.map(a => { const ownedValue = (Number(a.value) || 0) * (Number(a.ownershipShare ?? 100) / 100); const hibahMatch = gifts.find(g => g.linkedAssetId === a.id); const nominationMatch = nominations.find(n => n.linkedAssetId === a.id); - const isWaqfCorpus = waqfCorpusId === a.id; + const isWaqfCorpus = corpusIdSet.has(a.id); let channel = 'none'; let fast = false;