Skip to content

Commit a842265

Browse files
AdJezAdJez
authored andcommitted
Fix according to review
1 parent 253fa4d commit a842265

File tree

13 files changed

+6
-1301
lines changed

13 files changed

+6
-1301
lines changed

src/frontend/css/components/checkbox.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
.dsfr-checkbox {
17-
@apply flex items-center justify-center w-4 h-4 bg-dsfr-grey-500;
17+
@apply flex items-center justify-center w-4 h-4 border border-dsfr-primary-500 rounded-xs bg-white;
1818
svg {
1919
display: none;
2020
}

src/frontend/js/components/ReferralAppendices/Appendix.tsx

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ import { getErrorMessage } from '../../utils/errors';
3030
import { FileLoadingState } from '../FileUploader/FileLoadingState';
3131
import { GenericModalContext } from '../../data/providers/GenericModalProvider';
3232
import { AppendixDocument } from './AppendixDocument';
33-
import { ValidateAppendixModal } from '../modals/ValidateAppendixModal';
34-
import { RequestChangeAppendixModal } from '../modals/RequestChangeAppendixModal';
35-
import { ValidationAppendixModal } from '../modals/ValidationAppendixModal';
3633
import { AppendixContext } from '../../data/providers/AppendixProvider';
3734
import { AppendixUpdateButton } from '../FileUploader/AppendixUpdateButton';
3835
import { BaseSideModalContext } from '../../data/providers/BaseSideModalProvider';
@@ -119,10 +116,6 @@ export const Appendix: React.FC<AppendixProps> = ({
119116
const intl = useIntl();
120117
const [options, setOptions] = useState<Array<SelectOption>>([]);
121118
const { openBaseSideModal } = useContext(BaseSideModalContext);
122-
123-
const [isValidationModalOpen, setValidationModalOpen] = useState(false);
124-
const [isValidateModalOpen, setValidateModalOpen] = useState(false);
125-
const [isRequestChangeModalOpen, setRequestChangeModalOpen] = useState(false);
126119
const [isLoading, setIsLoading] = useState(false);
127120
const appendixNumber = appendix?.appendix_number ?? appendicesLength - index;
128121

@@ -404,20 +397,6 @@ export const Appendix: React.FC<AppendixProps> = ({
404397
!referralIsClosed(referral) && (
405398
<>
406399
<ValidationSelect options={options} />
407-
<ValidateAppendixModal
408-
appendixNumber={appendixNumber}
409-
setModalOpen={setValidateModalOpen}
410-
isModalOpen={isValidateModalOpen}
411-
/>
412-
<RequestChangeAppendixModal
413-
appendixNumber={appendixNumber}
414-
setModalOpen={setRequestChangeModalOpen}
415-
isModalOpen={isRequestChangeModalOpen}
416-
/>
417-
<ValidationAppendixModal
418-
setValidationModalOpen={setValidationModalOpen}
419-
isValidationModalOpen={isValidationModalOpen}
420-
/>
421400
</>
422401
)}
423402
</div>

src/frontend/js/components/ReferralReport/Version.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ import { IconTextButton } from '../buttons/IconTextButton';
2525
import { VersionDocument } from './VersionDocument';
2626
import { VersionEventIndicator } from './VersionEventIndicator';
2727
import { VersionContext } from '../../data/providers/VersionProvider';
28-
import { ValidationModal } from '../modals/ValidationModal';
2928
import { ValidationSelect } from '../select/ValidationSelect';
30-
import { ValidateModal } from '../modals/ValidateModal';
31-
import { RequestChangeModal } from '../modals/RequestChangeModal';
3229
import * as Sentry from '@sentry/react';
3330
import { isGranted, isSuperAdmin } from '../../utils/user';
3431
import { Nullable } from '../../types/utils';
@@ -38,11 +35,9 @@ import { ScanVerified } from '../Attachment/ScanVerified';
3835
import { getErrorMessage } from '../../utils/errors';
3936
import { FileLoadingState } from '../FileUploader/FileLoadingState';
4037
import { GenericModalContext } from '../../data/providers/GenericModalProvider';
41-
import { RequestChangeAppendixContent } from '../modals/RequestChangeAppendixContent';
4238
import { BaseSideModalContext } from '../../data/providers/BaseSideModalProvider';
4339
import { RequestChangeContent } from '../modals/RequestChangeContent';
4440
import { ValidateContent } from '../modals/ValidateContent';
45-
import { ValidationAppendixContent } from '../modals/ValidationAppendixContent';
4641
import { ValidationContent } from '../modals/ValidationContent';
4742

4843
interface VersionProps {
@@ -126,9 +121,6 @@ export const Version: React.FC<VersionProps> = ({
126121
const [options, setOptions] = useState<Array<SelectOption>>([]);
127122
const [isModalOpen, setModalOpen] = useState(false);
128123
const [isWarningModalOpen, setWarningModalOpen] = useState(false);
129-
const [isValidationModalOpen, setValidationModalOpen] = useState(false);
130-
const [isValidateModalOpen, setValidateModalOpen] = useState(false);
131-
const [isRequestChangeModalOpen, setRequestChangeModalOpen] = useState(false);
132124
const [isLoading, setIsLoading] = useState(false);
133125
const [activeVersion, setActiveVersion] = useState(0);
134126
const versionNumber = version?.version_number ?? versionsLength - index;
@@ -414,20 +406,6 @@ export const Version: React.FC<VersionProps> = ({
414406
referral.validation_state === 1 && (
415407
<>
416408
<ValidationSelect options={options} />
417-
<ValidateModal
418-
versionNumber={versionNumber}
419-
setModalOpen={setValidateModalOpen}
420-
isModalOpen={isValidateModalOpen}
421-
/>
422-
<RequestChangeModal
423-
versionNumber={versionNumber}
424-
setModalOpen={setRequestChangeModalOpen}
425-
isModalOpen={isRequestChangeModalOpen}
426-
/>
427-
<ValidationModal
428-
setValidationModalOpen={setValidationModalOpen}
429-
isValidationModalOpen={isValidationModalOpen}
430-
/>
431409
</>
432410
)}
433411
<IconTextButton

src/frontend/js/components/modals/RequestChangeAppendixModal.tsx

Lines changed: 0 additions & 135 deletions
This file was deleted.

src/frontend/js/components/modals/RequestChangeModal.tsx

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)