Skip to content

Commit

Permalink
[REFACTORING]: moved useNavigationAdapter to shared-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
Olga Yasnopolskaya committed Feb 4, 2025
1 parent 0e786f0 commit 656be7b
Show file tree
Hide file tree
Showing 28 changed files with 129 additions and 94 deletions.
85 changes: 67 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions v6y-apps/front/environment.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ declare global {
interface ProcessEnv {
[key: string]: string | undefined;
NEXT_PUBLIC_V6Y_BFF_PATH: string;
NEXTAUTH_URL: string;
}
}
}
2 changes: 1 addition & 1 deletion v6y-apps/front/src/commons/components/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use client';

import { useNavigationAdapter } from '@v6y/shared-ui';
import { useEffect } from 'react';

import useNavigationAdapter from '../../infrastructure/adapters/navigation/useNavigationAdapter';
import { useLogin } from '../hooks/useAuth';

function ProtectedRoute({ children }) {
Expand Down
3 changes: 1 addition & 2 deletions v6y-apps/front/src/commons/components/VitalitySearchBar.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
'use client';

import { VitalityText } from '@v6y/shared-ui';
import { VitalityText, useNavigationAdapter } from '@v6y/shared-ui';
import { Col, Form, Input, Row } from 'antd';
import * as React from 'react';

import useNavigationAdapter from '../../infrastructure/adapters/navigation/useNavigationAdapter';
import VitalityNavigationPaths from '../config/VitalityNavigationPaths';
import { VitalitySearchBarProps } from '../types/VitalitySearchBarProps';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import '@testing-library/jest-dom/vitest';
import { render, screen } from '@testing-library/react';
import { useNavigationAdapter } from '@v6y/shared-ui';
import * as React from 'react';
import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';

import useNavigationAdapter from '../../../infrastructure/adapters/navigation/useNavigationAdapter';
import VitalityAppInfos from '../application-info/VitalityAppInfos';

// Mock useNavigationAdapter
vi.mock('../../../infrastructure/adapters/navigation/useNavigationAdapter');
vi.mock(import("@v6y/shared-ui"), async (importOriginal) => {
const actual = await importOriginal()
return {
...actual,
useNavigationAdapter: vi.fn(),
}
})

describe('VitalityAppInfos', () => {
const mockApp = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { VitalityLinks, VitalityText } from '@v6y/shared-ui';
import { VitalityLinks, VitalityText, useNavigationAdapter } from '@v6y/shared-ui';
import { Col, Divider, List, Row, Tag } from 'antd';
import Link from 'next/link';
import * as React from 'react';

import useNavigationAdapter from '../../../infrastructure/adapters/navigation/useNavigationAdapter';
import { QUALITY_METRIC_STATUS } from '../../config/VitalityCommonConfig';
import VitalityNavigationPaths from '../../config/VitalityNavigationPaths';
import VitalityTerms from '../../config/VitalityTerms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { KeywordType } from '@v6y/core-logic';
import { VitalityEmptyView, VitalityLoader } from '@v6y/shared-ui';
import { VitalityEmptyView, VitalityLoader, useNavigationAdapter } from '@v6y/shared-ui';
import { Card, Checkbox } from 'antd';
import { CheckboxOptionType } from 'antd/es/checkbox/Group';
import * as React from 'react';
Expand All @@ -9,7 +9,6 @@ import {
buildClientQuery,
useClientQuery,
} from '../../../infrastructure/adapters/api/useQueryAdapter';
import useNavigationAdapter from '../../../infrastructure/adapters/navigation/useNavigationAdapter';
import VitalityApiConfig from '../../config/VitalityApiConfig';
import GetIndicatorListByParams from './getIndicatorListByParams';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useNavigationAdapter } from '@v6y/shared-ui';
import { Breadcrumb } from 'antd';
import { ItemType } from 'antd/es/breadcrumb/Breadcrumb';
import * as React from 'react';

import useNavigationAdapter from '../../../infrastructure/adapters/navigation/useNavigationAdapter';
import { buildBreadCrumbItems } from '../../config/VitalityCommonConfig';

const VitalityBreadcrumb = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
'use client';

import { VitalityTitle } from '@v6y/shared-ui';
import { VitalityTitle, useNavigationAdapter } from '@v6y/shared-ui';
import { Col, FloatButton, Layout, Row } from 'antd';
import * as React from 'react';
import { ReactNode } from 'react';

import useNavigationAdapter from '../../../infrastructure/adapters/navigation/useNavigationAdapter';
import { buildPageTitle } from '../../config/VitalityCommonConfig';
import ProtectedRoute from '../ProtectedRoute';
import VitalityBot from '../chatbot/VitalityBot';
Expand Down
2 changes: 1 addition & 1 deletion v6y-apps/front/src/commons/hooks/useAuth.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useNavigationAdapter } from '@v6y/shared-ui';
import { useState } from 'react';
import { z } from 'zod';

import LoginAccount from '../../features/auth/api/loginAccount';
import { buildClientQuery } from '../../infrastructure/adapters/api/useQueryAdapter';
import useNavigationAdapter from '../../infrastructure/adapters/navigation/useNavigationAdapter';
import {
SessionType,
getSession,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
import '@testing-library/jest-dom/vitest';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { useNavigationAdapter } from '@v6y/shared-ui';
import * as React from 'react';
import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';

import { AUDIT_REPORT_TYPES } from '../../../../commons/config/VitalityCommonConfig';
import VitalityTerms from '../../../../commons/config/VitalityTerms';
import { exportAppAuditReportsToCSV } from '../../../../commons/utils/VitalityDataExportUtils';
import { useClientQuery } from '../../../../infrastructure/adapters/api/useQueryAdapter';
import useNavigationAdapter from '../../../../infrastructure/adapters/navigation/useNavigationAdapter';
import VitalityAuditReportsView from '../audit-reports/VitalityAuditReportsView';

// Mock useClientQuery
vi.mock('../../../../infrastructure/adapters/api/useQueryAdapter');

// Mock useNavigationAdapter
vi.mock('../../../../infrastructure/adapters/navigation/useNavigationAdapter');
vi.mock(import("@v6y/shared-ui"), async (importOriginal) => {
const actual = await importOriginal()
return {
...actual,
useNavigationAdapter: vi.fn(),
}
})

// Mock VitalityDataExportUtils
vi.mock('../../../../commons/utils/VitalityDataExportUtils');


describe('VitalityAuditReportsView', () => {
beforeEach(() => {
vi.clearAllMocks();
Expand Down
Loading

0 comments on commit 656be7b

Please sign in to comment.