Skip to content

Commit

Permalink
[REFACTOR]: Frontend: using share ui lib instead of unique components
Browse files Browse the repository at this point in the history
  • Loading branch information
helabenkhalfallah committed Feb 25, 2025
1 parent de5b9ab commit a9fccf9
Show file tree
Hide file tree
Showing 110 changed files with 420 additions and 243 deletions.
50 changes: 4 additions & 46 deletions pnpm-lock.yaml

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

2 changes: 0 additions & 2 deletions v6y-apps/front-bo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
},
"dependencies": {
"@refinedev/cli": "=2.16.42",
"@refinedev/core": "=4.57.5",
"@urql/core": "=5.1.0",
"@v6y/core-logic": "workspace:^",
"@v6y/shared-ui": "workspace:^",
"cross-env": "=7.0.3",
"@refinedev/graphql": "=7.1.1",
"graphql": "=16.10.0",
"graphql-request": "=7.1.2",
"graphql-ws": "=6.0.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useTheme } from '@v6y/shared-ui';
import { useThemeConfigProvider } from '@v6y/shared-ui';
import * as React from 'react';

const VitalityPageFooter = () => {
const { themeToken } = useTheme();
const { currentConfig } = useThemeConfigProvider();

return (
<div
style={{
backgroundColor: themeToken.colorBgElevated,
backgroundColor: currentConfig?.token?.colorBgElevated,
display: 'flex',
justifyContent: 'flex-end',
alignItems: 'center',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
VitalityLanguageSettings,
VitalityText,
useAdminGetIdentity,
useTheme,
useThemeConfigProvider,
} from '@v6y/shared-ui';
import * as React from 'react';

Expand All @@ -19,13 +19,13 @@ interface UserType {
}

export const VitalityPageHeader = () => {
const { themeToken } = useTheme();
const { currentConfig } = useThemeConfigProvider();
const { data: user } = useAdminGetIdentity() as UserType;

return (
<Layout.Header
style={{
backgroundColor: themeToken.colorBgElevated,
backgroundColor: currentConfig?.token?.colorBgElevated,
display: 'flex',
justifyContent: 'flex-end',
alignItems: 'center',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AccountType } from '@v6y/core-logic';
import Matcher from '@v6y/core-logic/src/core/Matcher';
import Matcher from '@v6y/core-logic/src/utils/Matcher';
import {
AdminHttpError,
AdminShowWrapper,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationType } from '@v6y/core-logic';
import Matcher from '@v6y/core-logic/src/core/Matcher';
import Matcher from '@v6y/core-logic/src/utils/Matcher';
import {
AdminHttpError,
AdminShowWrapper,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Client, fetchExchange } from '@urql/core';
import { AdminAuthProviderType, createDataProvider, createLiveProvider } from '@v6y/shared-ui';
import { createClient } from 'graphql-ws';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
import Cookie from 'js-cookie';

const wsClient = createClient({
Expand Down
3 changes: 0 additions & 3 deletions v6y-apps/front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
"@tanstack/react-query-next-experimental": "=5.66.9",
"@v6y/core-logic": "workspace:^",
"@v6y/shared-ui": "workspace:^",
"ag-charts-react": "=11.0.3",
"antd": "=5.23.1",
"crypto-hash": "=3.1.0",
"graphql": "=16.10.0",
"graphql-request": "=7.1.2",
Expand All @@ -40,7 +38,6 @@
"react": "=19.0.0",
"react-chatbotify": "2.0.0-beta.26",
"react-dom": "=19.0.0",
"react-hook-form": "=7.54.2",
"react-virtualized-auto-sizer": "=1.0.25",
"react-window": "=1.8.11",
"vite": "=6.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { SyncOutlined } from '@v6y/shared-ui';
import { Button, Flex, List } from 'antd';
import { Button, Flex, List, SyncOutlined } from '@v6y/shared-ui';

import VitalityTerms from '../config/VitalityTerms';
import { VitalityListProps } from '../types/VitalityListProps';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { VitalityText } from '@v6y/shared-ui';
import { List } from 'antd';
import { List, VitalityText } from '@v6y/shared-ui';
import * as React from 'react';

import { VitalityListProps } from '../types/VitalityListProps';
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,7 +1,6 @@
'use client';

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

import VitalityNavigationPaths from '../config/VitalityNavigationPaths';
Expand Down
19 changes: 15 additions & 4 deletions v6y-apps/front/src/commons/components/VitalitySectionView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import { ExportOutlined, VitalityEmptyView, VitalityLoader, VitalityTitle } from '@v6y/shared-ui';
import { Avatar, Button, Card, Col, Row, Space, Typography } from 'antd';
import {
Avatar,
Button,
Card,
Col,
ExportOutlined,
Paragraph,
Row,
Space,
VitalityEmptyView,
VitalityLoader,
VitalityTitle,
} from '@v6y/shared-ui';
import * as React from 'react';

import { VitalitySectionViewProps } from '../types/VitalitySectionViewProps';
Expand Down Expand Up @@ -49,9 +60,9 @@ const VitalitySectionView = ({
{(description?.length || 0) > 0 && (
<Card.Meta
description={
<Typography.Paragraph>
<Paragraph>
<p>{description || ''}</p>
</Typography.Paragraph>
</Paragraph>
}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { VitalityEmptyView, VitalityText } from '@v6y/shared-ui';
import { Col, Form, Row, Select } from 'antd';
import { Col, Form, Row, Select, VitalityEmptyView, VitalityText } from '@v6y/shared-ui';
import * as React from 'react';
import { useEffect } from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { VitalityEmptyView } from '@v6y/shared-ui';
import { Col, Row, Tabs } from 'antd';
import { Col, Row, Tabs, VitalityEmptyView } from '@v6y/shared-ui';
import * as React from 'react';

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

import VitalityAppInfos from '../application-info/VitalityAppInfos';

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

Expand All @@ -38,6 +39,9 @@ describe('VitalityAppInfos', () => {
(useNavigationAdapter as Mock).mockReturnValue({
createUrlQueryParam: vi.fn((key, value) => `${key}=${value}`),
});
(useThemeConfigProvider as Mock).mockReturnValue({
currentConfig: {},
});
});

it('should render the component with app details', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import { VitalityLinks, VitalityText, useNavigationAdapter } from '@v6y/shared-ui';
import { Col, Divider, List, Row, Tag } from 'antd';
import {
Col,
Divider,
List,
Row,
Tag,
VitalityLinks,
VitalityText,
useNavigationAdapter,
useThemeConfigProvider,
} from '@v6y/shared-ui';
import Link from 'next/link';
import * as React from 'react';

import { QUALITY_METRIC_STATUS } from '../../config/VitalityCommonConfig';
import VitalityNavigationPaths from '../../config/VitalityNavigationPaths';
import VitalityTerms from '../../config/VitalityTerms';
import { VitalityAppInfosProps } from '../../types/VitalityAppInfosProps';

const VitalityAppInfos = ({ app, source, canOpenDetails = true, style }: VitalityAppInfosProps) => {
const { currentConfig } = useThemeConfigProvider();
const { createUrlQueryParam } = useNavigationAdapter();
const queryParams = createUrlQueryParam('_id', `${app._id}`);
const appDetailsLink = source
Expand All @@ -19,6 +28,8 @@ const VitalityAppInfos = ({ app, source, canOpenDetails = true, style }: Vitalit
const appRepository = app.repo;
const appOpenedBranches = app.repo?.allBranches?.length || 0;

const qualityMetricStatus = currentConfig?.status || {};

return (
<List.Item style={{ marginTop: '1rem', ...(style || {}) }}>
<List.Item.Meta
Expand All @@ -32,8 +43,8 @@ const VitalityAppInfos = ({ app, source, canOpenDetails = true, style }: Vitalit
<Tag
color={
appOpenedBranches >= 4
? QUALITY_METRIC_STATUS['error']
: QUALITY_METRIC_STATUS['success']
? qualityMetricStatus['error']
: qualityMetricStatus['success']
}
>
{`${VitalityTerms.VITALITY_APP_LIST_NB_BRANCHES}${appOpenedBranches}`}
Expand Down
4 changes: 2 additions & 2 deletions v6y-apps/front/src/commons/components/chatbot/VitalityBot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { VitalityLoader } from '@v6y/shared-ui';
import { Suspense, lazy, useEffect, useState } from 'react';
import * as React from 'react';
import { Settings } from 'react-chatbotify';
import { Flow, Settings } from 'react-chatbotify';

import { VitalityBotFlow } from './VitalityBotFlow';
import VitalityBotSettings from './VitalityBotSettings';
Expand All @@ -21,7 +21,7 @@ export default function VitalityBot() {
{isLoaded && (
<Suspense fallback={<VitalityLoader />}>
<ChatBot
flow={VitalityBotFlow}
flow={VitalityBotFlow as unknown as Flow}
themes={VitalityBotSettings.themes}
styles={VitalityBotSettings.styles}
settings={VitalityBotSettings.settings as unknown as Settings}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Descriptions } from 'antd';
import { Descriptions } from '@v6y/shared-ui';
import * as React from 'react';

import VitalityTerms from '../../config/VitalityTerms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { KeywordType } from '@v6y/core-logic';
import { VitalityEmptyView, VitalityLoader, useNavigationAdapter } from '@v6y/shared-ui';
import { Card, Checkbox } from 'antd';
import { CheckboxOptionType } from 'antd/es/checkbox/Group';
import { KeywordType } from '@v6y/core-logic/src/types';
import {
Card,
Checkbox,
CheckboxOptionType,
VitalityEmptyView,
VitalityLoader,
useNavigationAdapter,
} from '@v6y/shared-ui';
import * as React from 'react';
import { useEffect, useState } from 'react';

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

import { buildBreadCrumbItems } from '../../config/VitalityCommonConfig';
Expand All @@ -16,7 +14,7 @@ const VitalityBreadcrumb = () => {
currentPage: pathname,
lastPage: source || '',
urlParams,
}).filter((item) => item) as ItemType[]
}).filter((item) => item) as BreadcrumbItemType[]
}
/>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { VitalityTitle } from '@v6y/shared-ui';
import { Col, Row } from 'antd';
import { Col, Row, VitalityTitle } from '@v6y/shared-ui';
import Image from 'next/image';
import Link from 'next/link';
import * as React from 'react';
Expand Down
Loading

0 comments on commit a9fccf9

Please sign in to comment.