diff --git a/web/src/components/RealtimeTable/Modals/CreateProgramProjectModal.jsx b/web/src/components/RealtimeTable/Modals/CreateProgramProjectModal.jsx
index fa96cd6..fee94e7 100644
--- a/web/src/components/RealtimeTable/Modals/CreateProgramProjectModal.jsx
+++ b/web/src/components/RealtimeTable/Modals/CreateProgramProjectModal.jsx
@@ -50,7 +50,7 @@ const CreateProgramModalComponent = ({ isOpen, onClose, onCreate, title = '', is
{/* setName(e.target.value)} />
+ setName(e.target.value)} />
{
return (
-
+
{props?.text || 'Экспорт'}
@@ -49,9 +49,17 @@ export const ExportDefaultButton = (props) => {
return (
-
+
{props?.text || 'Экспорт'}
);
};
+
+export const ResetFiltersButton = ({ sx, ...props }) => {
+ return (
+
+ Сбросить фильтры
+
+ );
+};
diff --git a/web/src/pages/AdminPanel/AuditLogsPage/components/AuditLogsFilters.jsx b/web/src/pages/AdminPanel/AuditLogsPage/components/AuditLogsFilters.jsx
index a22e60d..9f71845 100644
--- a/web/src/pages/AdminPanel/AuditLogsPage/components/AuditLogsFilters.jsx
+++ b/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 = ({
-
- Сбросить фильтры
-
+
);
diff --git a/web/src/pages/ProjectPages/components/TableFilters/TableFilters.jsx b/web/src/pages/ProjectPages/components/TableFilters/TableFilters.jsx
index b1a1cd0..1631714 100644
--- a/web/src/pages/ProjectPages/components/TableFilters/TableFilters.jsx
+++ b/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,26 +170,15 @@ const TableFilters = ({ onBranchChange, onSearchChange, onStatusChange, selected
))}
- {(selectedBranches.length > 0 || searchQuery || selectedStatus) && (
-
- {
- setBranchInputValue('');
- onBranchChange([]);
- onSearchChange('');
- onStatusChange('');
- }}
- sx={{
- cursor: 'pointer',
- '&:hover': {
- backgroundColor: 'action.hover',
- },
- }}
- />
-
- )}
+ {
+ setBranchInputValue('');
+ onBranchChange([]);
+ onSearchChange('');
+ onStatusChange('');
+ }}
+ sx={{ ml: 'auto' }}
+ />
);
diff --git a/web/src/pages/ProjectsPage/ProjectsPage.jsx b/web/src/pages/ProjectsPage/ProjectsPage.jsx
index 5f6097c..392ff6d 100644
--- a/web/src/pages/ProjectsPage/ProjectsPage.jsx
+++ b/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) => }
/>
-
- {' '}
- Сбросить
-
+
}
/>
diff --git a/web/src/pages/SvodPage/SvodFilters.jsx b/web/src/pages/SvodPage/SvodFilters.jsx
index 6886e27..3a149c2 100644
--- a/web/src/pages/SvodPage/SvodFilters.jsx
+++ b/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({
},
}}
/>
+ {
+ setSearchInput('');
+ onChange({ year: new Date().getFullYear(), selectedOrganizations: [], search: '' });
+ }}
+ />
{children}
);
diff --git a/web/src/pages/SvodPage/SvodPage.jsx b/web/src/pages/SvodPage/SvodPage.jsx
index fbb9fa5..f88df85 100644
--- a/web/src/pages/SvodPage/SvodPage.jsx
+++ b/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() {
)}
{sheet === 'FORM_3' ? (
-
+
) : (
-
+
)}
- }
@@ -391,7 +392,7 @@ export default function SvodPage() {
onClick={refreshSummary}
sx={{ height: '2.5rem', flexShrink: 0 }}>
Обновить
-
+
{error ? (
diff --git a/web/src/pages/TasksPage/TasksPage.jsx b/web/src/pages/TasksPage/TasksPage.jsx
index 67f73bb..1dc2c01 100644
--- a/web/src/pages/TasksPage/TasksPage.jsx
+++ b/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%' }}
/>
-
- Сбросить
-
+
}
/>