mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-10 21:32:18 +00:00
Merge branch 'fix/v14311-settings' into release/v1.43.11
# Conflicts: # messages/de.json # messages/en.json # messages/es.json # messages/fr.json # messages/it.json # messages/ko.json # messages/nl.json # messages/pl.json
This commit is contained in:
commit
eabfeaef08
74 files changed
+2545
-436
No files matched your search
@@ -391,6 +391,10 @@ export const GET = apiHandler(async () => {
|
||||
// resolved `ai.capabilities.coach` and `modules.coach` below, which fold
|
||||
// in the record's own opt-out, the operator's switches and the grant.
|
||||
disableCoach: user.disableCoach ?? false,
|
||||
// The name the app addresses the account by (dashboard greeting,
|
||||
// reports). Set in the setup flow and edited on the profile card, which
|
||||
// seeds its field from here.
|
||||
displayName: user.displayName ?? null,
|
||||
// v1.7.0 — health-record export identity fields. All optional.
|
||||
fullName: user.fullName ?? null,
|
||||
insurerName: user.insurerName ?? null,
|
||||
|
||||
@@ -12,6 +12,7 @@ import { notificationPreferenceSchema } from "@/lib/validations/notifications";
|
||||
import { EVENT_TYPES, CHANNEL_TYPE_LABELS } from "@/lib/notifications/types";
|
||||
import type { ChannelType } from "@/lib/notifications/types";
|
||||
import { decrypt, encrypt } from "@/lib/crypto";
|
||||
import { resolveEventDefaults } from "@/lib/notifications/event-defaults";
|
||||
|
||||
export const GET = apiHandler(async () => {
|
||||
const { user } = await requireAuth();
|
||||
@@ -92,6 +93,12 @@ export const GET = apiHandler(async () => {
|
||||
channels: channelData,
|
||||
preferences,
|
||||
eventTypes: EVENT_TYPES as unknown as string[],
|
||||
// What an event does on a channel with no stored row, resolved for this
|
||||
// account by the same function the dispatcher asks. A client renders a
|
||||
// switch without a row from this map, never from its own copy of the
|
||||
// defaults: the mood reminder's follows the reminder card, which a
|
||||
// constant table cannot know.
|
||||
eventDefaults: await resolveEventDefaults(user.id),
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user