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

Merge branch 'main' into MED-57

Browse Source
This commit is contained in:
Danel Kungla
2025-08-25 15:24:30 +03:00
parent a088da28d8 d57c691a71
commit 2ac2e517f2
8 changed files with 85 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/(marketing)/_components/site-footer.tsx
View File

@@ -1,6 +1,5 @@
import { appConfig } from '@/packages/shared/src/config';
import { AppLogo } from '@kit/shared/components/app-logo';
import { appConfig } from '@kit/shared/config';
import { Footer } from '@kit/ui/marketing';
import { Trans } from '@kit/ui/trans';

2
app/home/[account]/_components/team-account-benefit-statistics.tsx
View File

@@ -1,4 +1,4 @@
import React, { use } from 'react';
import React from 'react';
import { redirect } from 'next/navigation';

5
app/home/[account]/_components/team-account-layout-sidebar.tsx
View File

@@ -1,9 +1,8 @@
import type { User } from '@supabase/supabase-js';
import { getTeamAccountSidebarConfig } from '@/packages/shared/src/config';
import { ApplicationRole } from '@kit/accounts/types/accounts';
import { ProfileAccountDropdownContainer } from '@kit/shared/components//personal-account-dropdown-container';
import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
import { getTeamAccountSidebarConfig } from '@kit/shared/config';
import {
Sidebar,
SidebarContent,

3
app/home/[account]/billing/_lib/server/team-billing.service.ts
View File

@@ -8,8 +8,7 @@ import { z } from 'zod';
import { LineItemSchema } from '@kit/billing';
import { getBillingGatewayProvider } from '@kit/billing-gateway';
import { appConfig, billingConfig } from '@kit/shared/config';
import { pathsConfig } from '@kit/shared/config';
import { appConfig, billingConfig, pathsConfig } from '@kit/shared/config';
import { getLogger } from '@kit/shared/logger';
import { requireUser } from '@kit/supabase/require-user';
import { getSupabaseServerClient } from '@kit/supabase/server-client';

2
app/robots.ts
View File

@@ -1,6 +1,6 @@
import { MetadataRoute } from 'next';
import appConfig from '@kit/shared/config/app.config';
import { appConfig } from '@kit/shared/config';
export default function robots(): MetadataRoute.Robots {
return {

4
app/select-package/page.tsx
View File

@@ -3,15 +3,15 @@ import Link from 'next/link';
import { CaretRightIcon } from '@radix-ui/react-icons';
import { Scale } from 'lucide-react';
import { MedReportLogo } from '@kit/shared/components/med-report-logo';
import SelectAnalysisPackages from '@kit/shared/components/select-analysis-packages';
import { pathsConfig } from '@kit/shared/config';
import { Button } from '@kit/ui/button';
import { Trans } from '@kit/ui/trans';
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n';
import { MedReportLogo } from '../../components/med-report-logo';
import pathsConfig from '../../config/paths.config';
import ComparePackagesModal from '../home/(user)/_components/compare-packages-modal';
import { loadAnalysisPackages } from '../home/(user)/_lib/server/load-analysis-packages';

3
app/sitemap.xml/route.ts
View File

@@ -1,8 +1,7 @@
import { getServerSideSitemap } from 'next-sitemap';
import { createCmsClient } from '@kit/cms';
import appConfig from '@kit/shared/config/app.config';
import { appConfig } from '@kit/shared/config';
/**
* @description The maximum age of the sitemap in seconds.

130
pnpm-lock.yaml generated
View File

@@ -82,13 +82,13 @@ importers:
version: 1.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
'@medusajs/icons':
specifier: ^2.8.6
version: 2.8.7(react@19.1.0)
version: 2.8.6(react@19.1.0)
'@medusajs/js-sdk':
specifier: latest
version: 2.9.0(awilix@8.0.1)
version: 2.8.7(awilix@8.0.1)
'@medusajs/ui':
specifier: latest
version: 4.0.19(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
version: 4.0.17(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
'@nosecone/next':
specifier: 1.0.0-beta.7
version: 1.0.0-beta.7(next@15.3.2(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))
@@ -182,10 +182,10 @@ importers:
version: link:tooling/typescript
'@medusajs/types':
specifier: latest
version: 2.9.0(awilix@8.0.1)
version: 2.8.7(awilix@8.0.1)
'@medusajs/ui-preset':
specifier: latest
version: 2.9.0(tailwindcss@4.1.7)
version: 2.8.7(tailwindcss@4.1.7)
'@next/bundle-analyzer':
specifier: 15.3.2
version: 15.3.2
@@ -251,7 +251,7 @@ importers:
version: link:../../tooling/typescript
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
packages/billing/core:
devDependencies:
@@ -275,7 +275,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/billing':
specifier: workspace:*
version: link:../core
@@ -469,7 +469,7 @@ importers:
version: link:../wordpress
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
packages/cms/keystatic:
dependencies:
@@ -500,7 +500,7 @@ importers:
version: link:../../ui
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
'@types/react':
specifier: 19.1.4
version: 19.1.4
@@ -539,7 +539,7 @@ importers:
version: link:../../ui
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
'@types/react':
specifier: 19.1.4
version: 19.1.4
@@ -610,7 +610,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/billing-gateway':
specifier: workspace:*
version: link:../../billing/gateway
@@ -685,7 +685,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/eslint-config':
specifier: workspace:*
version: link:../../../tooling/eslint
@@ -742,7 +742,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/eslint-config':
specifier: workspace:*
version: link:../../../tooling/eslint
@@ -850,10 +850,10 @@ importers:
version: 2.2.4(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)
'@medusajs/js-sdk':
specifier: latest
version: 2.9.0(awilix@8.0.1)
version: 2.8.7(awilix@8.0.1)
'@medusajs/ui':
specifier: latest
version: 4.0.19(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)(typescript@5.8.3)
version: 4.0.17(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)(typescript@5.8.3)
'@radix-ui/react-accordion':
specifier: ^1.2.1
version: 1.2.10(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)
@@ -899,10 +899,10 @@ importers:
version: 7.27.4
'@medusajs/types':
specifier: latest
version: 2.9.0(awilix@8.0.1)
version: 2.8.7(awilix@8.0.1)
'@medusajs/ui-preset':
specifier: latest
version: 2.9.0(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))
version: 2.8.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))
'@types/lodash':
specifier: ^4.14.195
version: 4.17.17
@@ -993,7 +993,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/accounts':
specifier: workspace:*
version: link:../accounts
@@ -1135,7 +1135,7 @@ importers:
version: link:../../../tooling/typescript
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
packages/mailers/nodemailer:
dependencies:
@@ -1175,7 +1175,7 @@ importers:
version: link:../../../tooling/typescript
'@types/node':
specifier: ^22.15.18
version: 22.15.32
version: 22.15.30
packages/mailers/shared:
devDependencies:
@@ -1324,7 +1324,7 @@ importers:
devDependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@kit/email-templates':
specifier: workspace:*
version: link:../email-templates
@@ -1429,7 +1429,7 @@ importers:
dependencies:
'@hookform/resolvers':
specifier: ^5.0.1
version: 5.1.1(react-hook-form@7.58.0(react@19.1.0))
version: 5.0.1(react-hook-form@7.58.0(react@19.1.0))
'@radix-ui/react-accordion':
specifier: 1.2.10
version: 1.2.10(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -1476,7 +1476,7 @@ importers:
specifier: ^1.1.6
version: 1.1.7(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
'@radix-ui/react-slot':
specifier: ^1.2.3
specifier: ^1.2.2
version: 1.2.3(@types/react@19.1.4)(react@19.1.0)
'@radix-ui/react-switch':
specifier: ^1.2.4
@@ -1510,7 +1510,7 @@ importers:
version: 2.15.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
tailwind-merge:
specifier: ^3.3.0
version: 3.3.1
version: 3.3.0
devDependencies:
'@kit/eslint-config':
specifier: workspace:*
@@ -2037,6 +2037,11 @@ packages:
react: ^18 || ^19 || ^19.0.0-rc
react-dom: ^18 || ^19 || ^19.0.0-rc
'@hookform/resolvers@5.0.1':
resolution: {integrity: sha512-u/+Jp83luQNx9AdyW2fIPGY6Y7NG68eN2ZW8FOJYL+M0i4s49+refdJdOp/A9n9HFQtQs3HIDHQvX3ZET2o7YA==}
peerDependencies:
react-hook-form: ^7.55.0
'@hookform/resolvers@5.1.1':
resolution: {integrity: sha512-J/NVING3LMAEvexJkyTLjruSm7aOFx7QX21pzkiJfMoNG0wl5aFEjLTl7ay7IQb9EWY6AkrBy7tHL2Alijpdcg==}
peerDependencies:
@@ -2383,22 +2388,22 @@ packages:
react: ^17.0.2 || ^18.0.0 || ^19.0
react-dom: ^17.0.2 || ^18.0.0 || ^19.0
'@medusajs/icons@2.8.6':
resolution: {integrity: sha512-k3X1nA1L0eoR30tfAzCxTtpaE1h28K2qmuNyangOoBJObHkaD+gNIi3AG+2iLlmIrByzfCgzP0JvhzrtFFha4Q==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
'@medusajs/icons@2.8.7':
resolution: {integrity: sha512-zGkAokqWBNJ1PcTktCPSMT5spIIjv8Pba88BXvfcbblG5cUbMSvvJ2v/BRODMFejQ9NqlboIeP0fo/9RzLpPHg==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
'@medusajs/icons@2.9.0':
resolution: {integrity: sha512-qzFyX8f87WjLBFr23aly5F8hmN/camZ2oVcqmP1XBK4HqOWWxrPPjABePomQixwm7XGkfQHZf+B2rnyIyjwfKA==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
'@medusajs/js-sdk@2.9.0':
resolution: {integrity: sha512-5L5dN235k/EyNelAYrUZevjxULfhyswAtRH5oy6PETbb4ExBdFi//vFXSnOuWjj2YnZtrTwymJkeZSOMYuMxSg==}
'@medusajs/js-sdk@2.8.7':
resolution: {integrity: sha512-ZGYMQOM7GHuKtxOvJ+wgKyC/fzLlyMu5nij4hIWIf2osZy7d6dpvEglcV6w9B0UgSEADJh1SZ7a22HOJdjjJ9A==}
engines: {node: '>=20'}
'@medusajs/types@2.9.0':
resolution: {integrity: sha512-7YGHq7OuvmHfKCz9sXus7aMHIwZXt1B3QYOoH+7gziEA0JXB0WNhx2kbWt4qSjQxsrFtCkdQgqBiWHkgvkq2iA==}
'@medusajs/types@2.8.7':
resolution: {integrity: sha512-8m/H9KkDUQz4YD+XkD/C63RfE/2elcdWf5G/KOK2QViTK0Jsd/Iw8Yy+T60pm0Lq/QQ925AfGH/Ji8UYNXjT8g==}
engines: {node: '>=20'}
peerDependencies:
awilix: ^8.0.1
@@ -2410,13 +2415,13 @@ packages:
vite:
optional: true
'@medusajs/ui-preset@2.9.0':
resolution: {integrity: sha512-ykoM2UY2wKGZbVhiAW0bOvizqa5wxYk0C7aCyUu0DpoFS8KKSas8V4IfIBiav++0LUJjKZunJWzDu1qMyqQWTw==}
'@medusajs/ui-preset@2.8.7':
resolution: {integrity: sha512-ro8BrYlqHh7iZvYKrxmJtLweJYYet+wYQQv0R3pyfxkkP0aQ09KDPo8yTwls11iuMC4cQHljekdaOyXtSR6ZiQ==}
peerDependencies:
tailwindcss: '>=3.0.0'
'@medusajs/ui@4.0.19':
resolution: {integrity: sha512-iDy41IXHpYOLaM8aizZmuQjiQuFf0sKYK1CVwx1nsPvzXuuyJWGiTnoMiAhZ3NWgnf3dNDHFgnHlsU1k4zV2pQ==}
'@medusajs/ui@4.0.17':
resolution: {integrity: sha512-N5KtZXvns13jDiCE3ZgZLINQnlECYLf4Q4GFdbRhCjAFKFBRGyyeNKX+Zo2wBUZA2Oi4kockdxFfsZfBHh/ZhA==}
peerDependencies:
react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
@@ -5735,6 +5740,9 @@ packages:
'@types/node@17.0.21':
resolution: {integrity: sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==}
'@types/node@22.15.30':
resolution: {integrity: sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==}
'@types/node@22.15.32':
resolution: {integrity: sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==}
@@ -9627,6 +9635,9 @@ packages:
tailwind-merge@2.6.0:
resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
tailwind-merge@3.3.0:
resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==}
tailwind-merge@3.3.1:
resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
@@ -10691,6 +10702,11 @@ snapshots:
react-dom: 19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106)
use-sync-external-store: 1.5.0(react@19.0.0-rc-66855b96-20241106)
'@hookform/resolvers@5.0.1(react-hook-form@7.58.0(react@19.1.0))':
dependencies:
'@standard-schema/utils': 0.3.0
react-hook-form: 7.58.0(react@19.1.0)
'@hookform/resolvers@5.1.1(react-hook-form@7.58.0(react@19.1.0))':
dependencies:
'@standard-schema/utils': 0.3.0
@@ -11255,21 +11271,21 @@ snapshots:
react: 19.1.0
react-dom: 19.1.0(react@19.1.0)
'@medusajs/icons@2.8.6(react@19.1.0)':
dependencies:
react: 19.1.0
'@medusajs/icons@2.8.7(react@19.0.0-rc-66855b96-20241106)':
dependencies:
react: 19.0.0-rc-66855b96-20241106
'@medusajs/icons@2.8.7(react@19.1.0)':
dependencies:
react: 19.1.0
'@medusajs/icons@2.9.0(react@19.0.0-rc-66855b96-20241106)':
'@medusajs/js-sdk@2.8.7(awilix@8.0.1)':
dependencies:
react: 19.0.0-rc-66855b96-20241106
'@medusajs/icons@2.9.0(react@19.1.0)':
dependencies:
react: 19.1.0
'@medusajs/js-sdk@2.9.0(awilix@8.0.1)':
dependencies:
'@medusajs/types': 2.9.0(awilix@8.0.1)
'@medusajs/types': 2.8.7(awilix@8.0.1)
fetch-event-stream: 0.1.5
qs: 6.14.0
transitivePeerDependencies:
@@ -11277,26 +11293,26 @@ snapshots:
- ioredis
- vite
'@medusajs/types@2.9.0(awilix@8.0.1)':
'@medusajs/types@2.8.7(awilix@8.0.1)':
dependencies:
awilix: 8.0.1
bignumber.js: 9.3.0
'@medusajs/ui-preset@2.9.0(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))':
'@medusajs/ui-preset@2.8.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))':
dependencies:
'@tailwindcss/forms': 0.5.10(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))
tailwindcss: 3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3))
tailwindcss-animate: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3)))
'@medusajs/ui-preset@2.9.0(tailwindcss@4.1.7)':
'@medusajs/ui-preset@2.8.7(tailwindcss@4.1.7)':
dependencies:
'@tailwindcss/forms': 0.5.10(tailwindcss@4.1.7)
tailwindcss: 4.1.7
tailwindcss-animate: 1.0.7(tailwindcss@4.1.7)
'@medusajs/ui@4.0.19(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)(typescript@5.8.3)':
'@medusajs/ui@4.0.17(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)(typescript@5.8.3)':
dependencies:
'@medusajs/icons': 2.9.0(react@19.0.0-rc-66855b96-20241106)
'@medusajs/icons': 2.8.7(react@19.0.0-rc-66855b96-20241106)
'@tanstack/react-table': 8.20.5(react-dom@19.0.0-rc-66855b96-20241106(react@19.0.0-rc-66855b96-20241106))(react@19.0.0-rc-66855b96-20241106)
clsx: 1.2.1
copy-to-clipboard: 3.3.3
@@ -11316,9 +11332,9 @@ snapshots:
- '@types/react-dom'
- typescript
'@medusajs/ui@4.0.19(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)':
'@medusajs/ui@4.0.17(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)':
dependencies:
'@medusajs/icons': 2.9.0(react@19.1.0)
'@medusajs/icons': 2.8.7(react@19.1.0)
'@tanstack/react-table': 8.20.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
clsx: 1.2.1
copy-to-clipboard: 3.3.3
@@ -17286,6 +17302,10 @@ snapshots:
'@types/node@17.0.21': {}
'@types/node@22.15.30':
dependencies:
undici-types: 6.21.0
'@types/node@22.15.32':
dependencies:
undici-types: 6.21.0
@@ -22385,6 +22405,8 @@ snapshots:
tailwind-merge@2.6.0: {}
tailwind-merge@3.3.0: {}
tailwind-merge@3.3.1: {}
tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@17.0.21)(typescript@5.8.3))):