Merge branch 'main' into MED-85

2025-08-27 08:31:26 +03:00
parent 94439432fd 8c6ce29c23
commit a547503887
55 changed files with 1356 additions and 547 deletions
--- a/app/home/(user)/(dashboard)/analysis-results/_components/analysis.tsx
+++ b/app/home/(user)/(dashboard)/analysis-results/_components/analysis.tsx
@@ -1,6 +1,6 @@
 'use client';

-import React, { useMemo, useState } from 'react';
+import React, { ReactElement, ReactNode, useMemo, useState } from 'react';

 import { UserAnalysisElement } from '@/packages/features/accounts/src/types/accounts';
 import { format } from 'date-fns';
@@ -37,11 +37,15 @@ export enum AnalysisStatus {
 const Analysis = ({
  analysisElement,
  results,
+  startIcon,
+  endIcon,
  isCancelled,
 }: {
-  analysisElement: AnalysisElement;
-  results?: UserAnalysisElement;
+  analysisElement: Pick<AnalysisElement, 'analysis_name_lab'>;
+  results?: AnalysisResultForDisplay;
  isCancelled?: boolean;
+  startIcon?: ReactElement | null;
+  endIcon?: ReactNode | null;
 }) => {
  const name = analysisElement.analysis_name_lab || '';
  const status = results?.norm_status || AnalysisStatus.NORMAL;
@@ -78,59 +82,66 @@ const Analysis = ({
  }, [results, value, normLower]);

  return (
-    <div className="border-border flex flex-col items-center justify-between gap-2 rounded-lg border px-5 px-12 py-3 sm:h-[65px] sm:flex-row sm:gap-0">
-      <div className="flex items-center gap-2 font-semibold">
-        {name}
-        {results?.response_time && (
-          <div
-            className="group/tooltip relative"
-            onClick={() => setShowTooltip(!showTooltip)}
-            onMouseLeave={() => setShowTooltip(false)}
-          >
-            <Info className="hover" />{' '}
+    <div className="border-border rounded-lg border px-5">
+      <div className="flex flex-col items-center justify-between gap-2 py-3 sm:h-[65px] sm:flex-row sm:gap-0">
+        <div className="flex items-center gap-2 font-semibold">
+          {startIcon || <div className="w-4" />}
+          {name}
+          {results?.response_time && (
            <div
-              className={cn(
-                'absolute bottom-full left-1/2 z-10 mb-2 hidden -translate-x-1/2 rounded border bg-white p-4 text-sm whitespace-nowrap group-hover/tooltip:block',
-                { block: showTooltip },
-              )}
+              className="group/tooltip relative"
+              onClick={(e) => {
+                e.stopPropagation();
+                setShowTooltip(!showTooltip);
+              }}
+              onMouseLeave={() => setShowTooltip(false)}
            >
-              <Trans i18nKey="analysis-results:analysisDate" />
-              {': '}
-              {format(new Date(results.response_time), 'dd.MM.yyyy HH:mm')}
+              <Info className="hover" />{' '}
+              <div
+                className={cn(
+                  'absolute bottom-full left-1/2 z-10 mb-2 hidden -translate-x-1/2 rounded border bg-white p-4 text-sm whitespace-nowrap group-hover/tooltip:block',
+                  { block: showTooltip },
+                )}
+              >
+                <Trans i18nKey="analysis-results:analysisDate" />
+                {': '}
+                {format(new Date(results.response_time), 'dd.MM.yyyy HH:mm')}
+              </div>
            </div>
-          </div>
-        )}
+          )}
+        </div>
+        {results ? (
+          <>
+            <div className="flex items-center gap-3 sm:ml-auto">
+              <div className="font-semibold">{value}</div>
+              <div className="text-muted-foreground text-sm">{unit}</div>
+            </div>
+            <div className="text-muted-foreground mx-8 flex flex-col-reverse gap-2 text-center text-sm sm:block sm:gap-0">
+              {normLower} - {normUpper}
+              <div>
+                <Trans i18nKey="analysis-results:results.range.normal" />
+              </div>
+            </div>
+            <AnalysisLevelBar
+              results={results}
+              normLowerIncluded={normLowerIncluded}
+              normUpperIncluded={normUpperIncluded}
+              level={analysisResultLevel!}
+            />
+            {endIcon || <div className="mx-2 w-4" />}
+          </>
+        ) : (isCancelled ? null : (
+          <>
+            <div className="flex items-center gap-3 sm:ml-auto">
+              <div className="font-semibold">
+                <Trans i18nKey="analysis-results:waitingForResults" />
+              </div>
+            </div>
+            <div className="mx-8 w-[60px]"></div>
+            <AnalysisLevelBarSkeleton />
+          </>
+        ))}
      </div>
-      {results ? (
-        <>
-          <div className="flex items-center gap-3 sm:ml-auto">
-            <div className="font-semibold">{value}</div>
-            <div className="text-muted-foreground text-sm">{unit}</div>
-          </div>
-          <div className="text-muted-foreground mx-8 flex flex-col-reverse gap-2 text-center text-sm sm:block sm:gap-0">
-            {normLower} - {normUpper} %
-            <div>
-              <Trans i18nKey="analysis-results:results.range.normal" />
-            </div>
-          </div>
-          <AnalysisLevelBar
-            results={results}
-            normLowerIncluded={normLowerIncluded}
-            normUpperIncluded={normUpperIncluded}
-            level={analysisResultLevel!}
-          />
-        </>
-      ) : (isCancelled ? null : (
-        <>
-          <div className="flex items-center gap-3 sm:ml-auto">
-            <div className="font-semibold">
-              <Trans i18nKey="analysis-results:waitingForResults" />
-            </div>
-          </div>
-          <div className="mx-8 w-[60px]"></div>
-          <AnalysisLevelBarSkeleton />
-        </>
-      ))}
    </div>
  );
 };
--- a/app/home/(user)/(dashboard)/analysis-results/page.tsx
+++ b/app/home/(user)/(dashboard)/analysis-results/page.tsx
@@ -13,7 +13,7 @@ import { pathsConfig } from '@kit/shared/config';

 import { getAnalysisElements } from '~/lib/services/analysis-element.service';
 import {
-  PAGE_VIEW_ACTION,
+  PageViewAction,
  createPageViewLog,
 } from '~/lib/services/audit/pageView.service';
 import { AnalysisOrder, getAnalysisOrders } from '~/lib/services/order.service';
@@ -50,7 +50,7 @@ async function AnalysisResultsPage() {

  await createPageViewLog({
    accountId: account.id,
-    action: PAGE_VIEW_ACTION.VIEW_ANALYSIS_RESULTS,
+    action: PageViewAction.VIEW_ANALYSIS_RESULTS,
  });

  const getAnalysisElementIds = (analysisOrders: AnalysisOrder[]) => [
--- a/app/home/(user)/(dashboard)/layout.tsx
+++ b/app/home/(user)/(dashboard)/layout.tsx
@@ -8,7 +8,10 @@ import { z } from 'zod';

 import { UserWorkspaceContextProvider } from '@kit/accounts/components';
 import { AppLogo } from '@kit/shared/components/app-logo';
-import { personalAccountNavigationConfig } from '@kit/shared/config';
+import {
+  pathsConfig,
+  personalAccountNavigationConfig,
+} from '@kit/shared/config';
 import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page';
 import { SidebarProvider } from '@kit/ui/shadcn-sidebar';

@@ -92,7 +95,7 @@ function MobileNavigation({
 }) {
  return (
    <>
-      <AppLogo />
+      <AppLogo href={pathsConfig.app.home} />

      <HomeMobileNavigation workspace={workspace} cart={cart} />
    </>
--- a/app/home/(user)/(dashboard)/order-analysis/page.tsx
+++ b/app/home/(user)/(dashboard)/order-analysis/page.tsx
@@ -6,7 +6,7 @@ import { Trans } from '@kit/ui/trans';
 import { HomeLayoutPageHeader } from '../../_components/home-page-header';
 import { loadAnalyses } from '../../_lib/server/load-analyses';
 import OrderAnalysesCards from '../../_components/order-analyses-cards';
-import { createPageViewLog, PAGE_VIEW_ACTION } from '~/lib/services/audit/pageView.service';
+import { createPageViewLog, PageViewAction } from '~/lib/services/audit/pageView.service';
 import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';

 export const generateMetadata = async () => {
@@ -27,7 +27,7 @@ async function OrderAnalysisPage() {
  
  await createPageViewLog({
    accountId: account.id,
-    action: PAGE_VIEW_ACTION.VIEW_ORDER_ANALYSIS,
+    action: PageViewAction.VIEW_ORDER_ANALYSIS,
  });

  return (
--- a/app/home/(user)/_components/home-menu-navigation.tsx
+++ b/app/home/(user)/_components/home-menu-navigation.tsx
@@ -1,27 +1,35 @@
 import Link from 'next/link';
+
+import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
+import { pathsConfig } from '@/packages/shared/src/config';
+import { formatCurrency } from '@/packages/shared/src/utils';
+import { SIDEBAR_WIDTH_PROPERTY } from '@/packages/ui/src/shadcn/constants';
+import { StoreCart } from '@medusajs/types';
 import { ShoppingCart } from 'lucide-react';

-import { Trans } from '@kit/ui/trans';
 import { AppLogo } from '@kit/shared/components/app-logo';
 import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
 import { Search } from '@kit/shared/components/ui/search';
-import { SIDEBAR_WIDTH_PROPERTY } from '@/packages/ui/src/shadcn/constants';
 import { Button } from '@kit/ui/button';
+import { Card } from '@kit/ui/shadcn/card';
+import { Trans } from '@kit/ui/trans';

 import { UserNotifications } from '../_components/user-notifications';
 import { type UserWorkspace } from '../_lib/server/load-user-workspace';
-import { StoreCart } from '@medusajs/types';
-import { formatCurrency } from '@/packages/shared/src/utils';
-import { createI18nServerInstance } from '@/lib/i18n/i18n.server';

-export async function HomeMenuNavigation(props: { workspace: UserWorkspace, cart: StoreCart | null }) {
+export async function HomeMenuNavigation(props: {
+  workspace: UserWorkspace;
+  cart: StoreCart | null;
+}) {
  const { language } = await createI18nServerInstance();
  const { workspace, user, accounts } = props.workspace;
-  const totalValue = props.cart?.total ? formatCurrency({
-    currencyCode: props.cart.currency_code,
-    locale: language,
-    value: props.cart.total,
-  }) : 0;
+  const totalValue = props.cart?.total
+    ? formatCurrency({
+        currencyCode: props.cart.currency_code,
+        locale: language,
+        value: props.cart.total,
+      })
+    : 0;

  const cartItemsCount = props.cart?.items?.length ?? 0;
  const hasCartItems = cartItemsCount > 0;
@@ -29,8 +37,7 @@ export async function HomeMenuNavigation(props: { workspace: UserWorkspace, cart
  return (
    <div className={'flex w-full flex-1 items-center justify-between gap-3'}>
      <div className={`flex items-center ${SIDEBAR_WIDTH_PROPERTY}`}>
-        <AppLogo />
-
+        <AppLogo href={pathsConfig.app.home} />
      </div>
      <Search
        className="flex grow"
@@ -38,15 +45,27 @@ export async function HomeMenuNavigation(props: { workspace: UserWorkspace, cart
      />

      <div className="flex items-center justify-end gap-3">
+        <Card className="px-6 py-2">
+          <span>€ {Number(0).toFixed(2).replace('.', ',')}</span>
+        </Card>
        {hasCartItems && (
-          <Button className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' variant='ghost'>
-            <span className='flex items-center text-nowrap'>{totalValue}</span>
+          <Button
+            className="relative mr-0 h-10 cursor-pointer border-1 px-4 py-2"
+            variant="ghost"
+          >
+            <span className="flex items-center text-nowrap">{totalValue}</span>
          </Button>
        )}
-        <Link href='/home/cart'>
-          <Button variant="ghost" className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' >
+        <Link href="/home/cart">
+          <Button
+            variant="ghost"
+            className="relative mr-0 h-10 cursor-pointer border-1 px-4 py-2"
+          >
            <ShoppingCart className="stroke-[1.5px]" />
-            <Trans i18nKey="common:shoppingCartCount" values={{ count: cartItemsCount }} />
+            <Trans
+              i18nKey="common:shoppingCartCount"
+              values={{ count: cartItemsCount }}
+            />
          </Button>
        </Link>
        <UserNotifications userId={user.id} />