k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #96 from MR-medreport/analysis-xml-fix-1109

Browse Source 
small fixes for dev
This commit is contained in:
Karli
2025-09-16 11:32:54 +00:00
committed by GitHub
parent 14252c3efd 16b4589330
commit eda21b8a99
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/home/(user)/_components/orders/order-block.tsx
View File

@@ -14,6 +14,7 @@ export default function OrderBlock({ analysisOrder, itemsAnalysisPackage, itemsO
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
<h4> <h4>
<Trans i18nKey="analysis-results:orderTitle" values={{ orderNumber: analysisOrder.medusa_order_id }} /> <Trans i18nKey="analysis-results:orderTitle" values={{ orderNumber: analysisOrder.medusa_order_id }} />
{` (${analysisOrder.id})`}
</h4> </h4>
<div className="flex gap-2"> <div className="flex gap-2">
<h5> <h5>

6
packages/shared/src/components/select-analysis-package.tsx
View File

@@ -87,7 +87,7 @@ export default function SelectAnalysisPackage({
}; };
return ( return (
<Card key={title}> <Card key={title} className="flex flex-col">
<CardHeader className="relative"> <CardHeader className="relative">
{description && ( {description && (
<ButtonTooltip <ButtonTooltip
@@ -103,7 +103,7 @@ export default function SelectAnalysisPackage({
className="max-h-48 w-full opacity-10" className="max-h-48 w-full opacity-10"
/> />
</CardHeader> </CardHeader>
<CardContent className="space-y-1 text-center"> <CardContent className="space-y-2 text-center">
<PackageHeader <PackageHeader
title={title} title={title}
tagColor="bg-cyan" tagColor="bg-cyan"
@@ -113,7 +113,7 @@ export default function SelectAnalysisPackage({
/> />
<CardDescription>{subtitle}</CardDescription> <CardDescription>{subtitle}</CardDescription>
</CardContent> </CardContent>
<CardFooter> <CardFooter className="mt-auto">
<Button <Button
className="w-full text-[10px] sm:text-sm" className="w-full text-[10px] sm:text-sm"
onClick={handleSelect} onClick={handleSelect}

13
packages/supabase/src/auth-callback.service.ts
View File

@@ -206,14 +206,7 @@ class AuthCallbackService {
return; return;
} }
// If user already has Medusa account, we're done
if (accountData?.medusa_account_id) {
console.log('Keycloak user already has Medusa account:', accountData.medusa_account_id);
return;
}
const { medusaLoginOrRegister } = await import('../../features/medusa-storefront/src/lib/data/customer'); const { medusaLoginOrRegister } = await import('../../features/medusa-storefront/src/lib/data/customer');
const medusaAccountId = await medusaLoginOrRegister({ const medusaAccountId = await medusaLoginOrRegister({
email: user.email, email: user.email,
supabaseUserId: user.id, supabaseUserId: user.id,
@@ -221,7 +214,8 @@ class AuthCallbackService {
lastName: accountData?.last_name ?? '-', lastName: accountData?.last_name ?? '-',
}); });
// Update the account with the Medusa account ID const currentMedusaAccountId = accountData?.medusa_account_id;
if (!currentMedusaAccountId || currentMedusaAccountId !== medusaAccountId) {
const { error: updateError } = await this.client const { error: updateError } = await this.client
.schema('medreport') .schema('medreport')
.from('accounts') .from('accounts')
@@ -235,6 +229,9 @@ class AuthCallbackService {
} }
console.log('Successfully set up Medusa account for Keycloak user:', medusaAccountId); console.log('Successfully set up Medusa account for Keycloak user:', medusaAccountId);
} else {
console.log('Keycloak user already has Medusa account:', accountData.medusa_account_id);
}
} catch (error) { } catch (error) {
console.error('Error setting up Medusa account for Keycloak user:', error); console.error('Error setting up Medusa account for Keycloak user:', error);
} }