mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-12 06:06:10 +00:00
Merge branch 'fix/v1437-review' into release/v1.43.7
# Conflicts: # src/app/api/analytics/route.ts
This commit is contained in:
commit
45c027aee2
217 files changed
+3636
-2127
No files matched your search
@@ -40,7 +40,7 @@ import {
|
||||
|
||||
export function GrantsGivenCard() {
|
||||
const { t } = useTranslations();
|
||||
const { data, isLoading, isError, refetch } = useAccountGrants();
|
||||
const { data, isLoading, isError, error, refetch } = useAccountGrants();
|
||||
const revoke = useRevokeGrant();
|
||||
|
||||
const given = data?.given ?? [];
|
||||
@@ -62,6 +62,7 @@ export function GrantsGivenCard() {
|
||||
)}
|
||||
{isError && (
|
||||
<QueryErrorCard
|
||||
error={error}
|
||||
title={t("recordSharing.given.loadError")}
|
||||
onRetry={() => void refetch()}
|
||||
/>
|
||||
|
||||
@@ -54,7 +54,7 @@ import {
|
||||
*/
|
||||
export function GrantsReceivedCard() {
|
||||
const { t } = useTranslations();
|
||||
const { data, isLoading, isError, refetch } = useAccountGrants();
|
||||
const { data, isLoading, isError, error, refetch } = useAccountGrants();
|
||||
const accept = useAcceptGrant();
|
||||
const renounce = useRenounceGrant();
|
||||
const switchAccount = useAccountSwitch();
|
||||
@@ -80,6 +80,7 @@ export function GrantsReceivedCard() {
|
||||
)}
|
||||
{isError && (
|
||||
<QueryErrorCard
|
||||
error={error}
|
||||
title={t("recordSharing.received.loadError")}
|
||||
onRetry={() => void refetch()}
|
||||
/>
|
||||
|
||||
@@ -229,6 +229,7 @@ function ManagedProfileRow({
|
||||
shows no destructive control for it. */}
|
||||
{guardians.isError && (
|
||||
<QueryErrorCard
|
||||
error={guardians.error}
|
||||
title={t("recordSharing.managed.rosterLoadError")}
|
||||
onRetry={() => void guardians.refetch()}
|
||||
/>
|
||||
|
||||
@@ -81,6 +81,7 @@ export function ManagedProfileEditForm({
|
||||
if (profile.isError) {
|
||||
return (
|
||||
<QueryErrorCard
|
||||
error={profile.error}
|
||||
title={t("recordSharing.managed.editLoadError")}
|
||||
onRetry={() => void profile.refetch()}
|
||||
/>
|
||||
|
||||
@@ -88,6 +88,7 @@ export function ManagedProfileHandover({
|
||||
if (status.isError) {
|
||||
return (
|
||||
<QueryErrorCard
|
||||
error={status.error}
|
||||
title={t("recordSharing.managed.handover.loadError")}
|
||||
onRetry={() => void status.refetch()}
|
||||
/>
|
||||
|
||||
@@ -39,7 +39,7 @@ import {
|
||||
*/
|
||||
export function RecordActivityCard() {
|
||||
const { t } = useTranslations();
|
||||
const { data, isLoading, isError, refetch } = useRecordActivity();
|
||||
const { data, isLoading, isError, error, refetch } = useRecordActivity();
|
||||
|
||||
const entries = data?.entries ?? [];
|
||||
|
||||
@@ -88,6 +88,7 @@ export function RecordActivityCard() {
|
||||
)}
|
||||
{isError && (
|
||||
<QueryErrorCard
|
||||
error={error}
|
||||
title={t("recordSharing.activity.loadError")}
|
||||
onRetry={() => void refetch()}
|
||||
/>
|
||||
|
||||
Reference in new issue
Block a user