Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: suppression de l'ancien reporting #1870

Merged
merged 1 commit into from
Feb 19, 2024
Merged

fix: suppression de l'ancien reporting #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dashboard/src/components/drawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const Drawer = () => {
</NavLink>
</li>
)}
{['admin', 'normal', 'restricted-access'].includes(role) && (
{process.env.REACT_APP_TEST_PLAYWRIGHT === 'true' && ['admin', 'normal', 'restricted-access'].includes(role) && (
<>
<li>
<NavLink to="/report" activeClassName="active">
Expand All @@ -89,7 +89,7 @@ const Drawer = () => {
<>
<li>
<NavLink to="/report-new" activeClassName="active">
Comptes rendus <span className="tw-ml-1 tw-rounded-full tw-bg-main tw-px-2 tw-py-1 tw-text-xs tw-text-white">BETA</span>
Comptes rendus
</NavLink>
</li>
</>
Expand Down
22 changes: 0 additions & 22 deletions dashboard/src/scenes/report/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { useEffect, useMemo } from 'react';
import { useParams } from 'react-router-dom';
import { addOneDay, dateForDatePicker, formatDateWithNameOfDay } from '../../services/date';
import { HeaderStyled, Title as HeaderTitle } from '../../components/header';
import { ModalBody, ModalContainer, ModalFooter, ModalHeader } from '../../components/tailwind/Modal';

import dayjs from 'dayjs';
import { TODO } from '../../recoil/actions';
Expand Down Expand Up @@ -211,7 +210,6 @@ const View = () => {
const teams = useRecoilValue(teamsState);
const [viewAllOrganisationData, setViewAllOrganisationData] = useLocalStorage('reports-allOrg', teams.length === 1);
const [selectedTeamIds, setSelectedTeamIds] = useLocalStorage('reports-teams', [currentTeam._id]);
const [showWarning, setShowWarning] = useLocalStorage('reports-beta-warnign', true);

const [preset, setPreset, removePreset] = useLocalStorage('reports-date-preset', null);
let [period, setPeriod] = useLocalStorage('reports-period', {
Expand Down Expand Up @@ -400,26 +398,6 @@ const View = () => {
</div>
</>
)}
<ModalContainer open={showWarning} size="prose" onClose={() => setShowWarning(false)}>
<ModalHeader title="Comptes-rendus - Version Beta" onClose={() => setShowWarning(false)} />
<ModalBody className="tw-p-4">
<p>
Ce module est en cours de développement.
<br />
Il est possible que vous rencontriez des bugs.
<br />
N'hésitez pas à nous faire remonter les problèmes rencontrés.
<br />
<br />
Merci beaucoup !
</p>
</ModalBody>
<ModalFooter>
<button type="button" onClick={() => setShowWarning(false)} className="button-submit">
🧐 Bien compris
</button>
</ModalFooter>
</ModalContainer>
</>
);
};
Expand Down
Loading