Merge pull request 'добавила кнопки "сбросить фильтр"' (#152) from add-btn-reset-filter into test

Reviewed-on: #152

web/src/components/RealtimeTable/Modals/CreateProgramProjectModal.jsx

@@ -50,7 +50,7 @@ const CreateProgramModalComponent = ({ isOpen, onClose, onCreate, title = '', is
 					<Divider sx={{ marginBottom: '0.75rem' }} />
 
 					{/* <Input */}
-					<StyledTextField label='Название программы' onChange={(e) => setName(e.target.value)} />
+					<StyledTextField label='Название' onChange={(e) => setName(e.target.value)} />
 					<Stack
 						direction='row'
 						spacing={0.75}

web/src/components/common/Buttons/ButtonsActions.jsx

@@ -27,7 +27,7 @@ export const ExportWithTextButton = (props) => {
 	return (
 		<PrimaryOutlinedButton {...props}>
 			<Stack sx={{ flexDirection: 'row', alignItems: 'center', gap: '.375rem' }}>
-				<ExportSvg size='1rem' color='#45881c' strokeWidth={'.33px'} />
+				<ExportSvg size='1rem' color='#45881c' strokeWidth='.33px' />
 				<span style={{ fontSize: '.88rem' }}>{props?.text || 'Экспорт'}</span>
 			</Stack>
 		</PrimaryOutlinedButton>
@@ -49,9 +49,17 @@ export const ExportDefaultButton = (props) => {
 	return (
 		<DefaultOutlinedButton {...props}>
 			<Stack sx={{ flexDirection: 'row', alignItems: 'center', gap: '.375rem' }}>
-				<ExportSvg color='#4a5565' strokeWidth={'.33'} size='1rem' />
+				<ExportSvg color='#4a5565' strokeWidth='.33' size='1rem' />
 				<span>{props?.text || 'Экспорт'}</span>
 			</Stack>
 		</DefaultOutlinedButton>
 	);
 };
+
+export const ResetFiltersButton = ({ sx, ...props }) => {
+	return (
+		<DefaultOutlinedButton type='button' {...props} sx={{ height: '2.5rem', flexShrink: 0, ...sx }}>
+			Сбросить фильтры
+		</DefaultOutlinedButton>
+	);
+};

web/src/pages/AdminPanel/AuditLogsPage/components/AuditLogsFilters.jsx

@@ -1,7 +1,7 @@
 import { Autocomplete, FormLabel, Paper, Stack, TextField } from '@mui/material';
 import { styled } from '@mui/material';
 import { DatePicker } from '@mui/x-date-pickers/DatePicker';
-import { DefaultOutlinedButton } from '../../../../components/common/Buttons/Buttons';
+import { ResetFiltersButton } from '../../../../components/common/Buttons/ButtonsActions';
 import FilterFieldWrapper from './FilterFieldWrapper';
 
 const FormLabelStyled = styled(FormLabel)`
@@ -158,9 +158,7 @@ const AuditLogsFilters = ({
 			</Stack>
 
 			<Stack direction={'row'} spacing={'1rem'} sx={{ width: '100%', alignItems: 'end' }}>
-				<DefaultOutlinedButton onClick={onResetFilters} sx={{ flex: '0 0 auto', height: '2.56rem' }}>
+				<ResetFiltersButton onClick={onResetFilters} sx={{ flex: '0 0 auto' }} />
-					Сбросить фильтры
-				</DefaultOutlinedButton>
 			</Stack>
 		</Paper>
 	);

web/src/pages/ProjectPages/components/TableFilters/TableFilters.jsx

@@ -4,6 +4,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { SspApi } from '../../../../api/ssp';
 import { useAuth } from '../../../../app/context/AuthProvider';
+import { ResetFiltersButton } from '../../../../components/common/Buttons/ButtonsActions';
 import { PROJECT_STATUSES, ROLES_NAME_ID } from '../../../../constants/constants';
 
 const FILTER_PROJECT_STATUSES = ['created', 'agreed', 'archived'];
@@ -169,27 +170,16 @@ const TableFilters = ({ onBranchChange, onSearchChange, onStatusChange, selected
 					))}
 				</TextField>
 
-				{(selectedBranches.length > 0 || searchQuery || selectedStatus) && (
+				<ResetFiltersButton
-					<Box sx={{ display: 'flex', gap: 1, ml: 'auto' }}>
-						<Chip
-							label='Сбросить фильтры'
-							size='small'
 					onClick={() => {
 						setBranchInputValue('');
 						onBranchChange([]);
 						onSearchChange('');
 						onStatusChange('');
 					}}
-							sx={{
+					sx={{ ml: 'auto' }}
-								cursor: 'pointer',
-								'&:hover': {
-									backgroundColor: 'action.hover',
-								},
-							}}
 				/>
 			</Box>
-				)}
-			</Box>
 		</Paper>
 	);
 };

web/src/pages/ProjectsPage/ProjectsPage.jsx

@@ -6,7 +6,8 @@ import { ProjectsApi } from '../../api/projects';
 import { SspApi } from '../../api/ssp';
 import { useAuth } from '../../app/context/AuthProvider';
 import { HeaderSwitch } from '../../components/HeaderMenu/HeaderSwitch';
-import { PrimaryButton, PrimaryOutlinedButton } from '../../components/common/Buttons/Buttons';
+import { PrimaryButton } from '../../components/common/Buttons/Buttons';
+import { ResetFiltersButton } from '../../components/common/Buttons/ButtonsActions';
 import { PaginatedList } from '../../components/common/PaginatedList';
 import { WhitePlus } from '../../components/common/icons/icons';
 import { ROLES_NAME_ID } from '../../constants/constants';
@@ -240,10 +241,7 @@ export default function ProjectsPage() {
 								sx={{ width: 200 }}
 								renderInput={(params) => <TextField {...params} placeholder='Все' size='small' />}
 							/>
-							<PrimaryOutlinedButton onClick={handleClearFilters} sx={{ height: '100%' }}>
+							<ResetFiltersButton onClick={handleClearFilters} />
-								{' '}
-								Сбросить
-							</PrimaryOutlinedButton>
 						</Box>
 					}
 				/>

web/src/pages/SvodPage/SvodFilters.jsx

@@ -5,6 +5,7 @@ import { toast } from 'react-toastify';
 
 import { SspApi } from '../../api/ssp';
 import { useAuth } from '../../app/context/AuthProvider';
+import { ResetFiltersButton } from '../../components/common/Buttons/ButtonsActions';
 import { ROLES_NAME_ID } from '../../constants/constants';
 
 const SELECT_ALL_OPTION = { id: '__all__', title: 'Все ССП/РФ' };
@@ -146,6 +147,12 @@ export function SvodFilters({
 					},
 				}}
 			/>
+			<ResetFiltersButton
+				onClick={() => {
+					setSearchInput('');
+					onChange({ year: new Date().getFullYear(), selectedOrganizations: [], search: '' });
+				}}
+			/>
 			{children}
 		</Box>
 	);

web/src/pages/SvodPage/SvodPage.jsx

@@ -8,6 +8,7 @@ import { blueColumn } from '../../components/RealtimeTable/constants/columnColor
 import { sectionCodeColor } from '../../components/RealtimeTable/constants/columnConfig';
 import { useSvod } from './SvodContext';
 import { SvodFilters } from './SvodFilters';
+import { PrimaryButton, PrimaryOutlinedButton } from '../../components/common/Buttons/Buttons';
 
 const SHEETS = [
 	{ value: 'MAIN', label: 'Общий свод' },
@@ -375,15 +376,15 @@ export default function SvodPage() {
 						</Typography>
 					)}
 					{sheet === 'FORM_3' ? (
-						<Button variant='contained' onClick={openFilteredProjects} sx={{ ml: 'auto', height: '2.5rem', flexShrink: 0 }}>
+						<PrimaryButton variant='contained' onClick={openFilteredProjects} sx={{ ml: 'auto', height: '2.5rem', flexShrink: 0 }}>
 							Перейти к проектам
-						</Button>
+						</PrimaryButton>
 					) : (
-						<Button variant='contained' onClick={openFilteredTasks} sx={{ ml: 'auto', height: '2.5rem', flexShrink: 0 }}>
+						<PrimaryButton variant='contained' onClick={openFilteredTasks} sx={{ ml: 'auto', height: '2.5rem', flexShrink: 0 }}>
 							Перейти к задачам
-						</Button>
+						</PrimaryButton>
 					)}
-					<Button
+					<PrimaryOutlinedButton
 						variant='outlined'
 						color='default'
 						startIcon={<RefreshRoundedIcon />}
@@ -391,7 +392,7 @@ export default function SvodPage() {
 						onClick={refreshSummary}
 						sx={{ height: '2.5rem', flexShrink: 0 }}>
 						Обновить
-					</Button>
+					</PrimaryOutlinedButton>
 				</SvodFilters>
 			</Paper>
 			{error ? (

web/src/pages/TasksPage/TasksPage.jsx

@@ -6,7 +6,8 @@ import { SspApi } from '../../api/ssp';
 import { TasksApi } from '../../api/tasks';
 import { useAuth } from '../../app/context/AuthProvider';
 import { HeaderSwitch } from '../../components/HeaderMenu/HeaderSwitch';
-import { PrimaryButton, PrimaryOutlinedButton } from '../../components/common/Buttons/Buttons';
+import { PrimaryButton } from '../../components/common/Buttons/Buttons';
+import { ResetFiltersButton } from '../../components/common/Buttons/ButtonsActions';
 import Modal from '../../components/common/Modal/Modal';
 import { OrgUnitsAutocompletePaper } from '../../components/common/OrgUnitsAutocompletePaper/OrgUnitsAutocompletePaper';
 import { renderOrgUnitValue } from '../../components/common/OrgUnitsAutocompletePaper/renderOrgUnitValue';
@@ -309,9 +310,7 @@ export default function TasksPage() {
 								sx={{ width: 480, maxWidth: '100%' }}
 							/>
 
-							<PrimaryOutlinedButton onClick={handleClearFilters} sx={{ height: '2.5rem' }}>
+							<ResetFiltersButton onClick={handleClearFilters} />
-								Сбросить
-							</PrimaryOutlinedButton>
 						</Box>
 					}
 				/>