Use translations for swal

hack4impact-uiuc · Jan 15, 2024 · 967b56b · 967b56b
1 parent fe6e62f
commit 967b56b
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 17 deletions.
diff --git a/apps/frontend/src/components/AudioRecorder/AudioRecorder.tsx b/apps/frontend/src/components/AudioRecorder/AudioRecorder.tsx
@@ -285,7 +285,7 @@ class AudioRecorder extends React.Component<AudioRecorderProps, AudioRecorderSta
             title: this.state.lang.components.audio.deleteTitle,
             text: this.state.lang.components.audio.deleteWarning,
             icon: 'warning',
-            buttons: [true],
+            buttons: [true, true],
             dangerMode: true,
         }).then((willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/EditFieldModal/EditFieldModal.tsx b/apps/frontend/src/components/EditFieldModal/EditFieldModal.tsx
@@ -324,7 +324,10 @@ const EditFieldModal = ({
             title: translations.components.modal.deleteTitle,
             text: translations.components.modal.deleteFieldConfirmation,
             icon: 'warning',
-            buttons: [true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then((willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/EditRoleModal/EditRoleModal.tsx b/apps/frontend/src/components/EditRoleModal/EditRoleModal.tsx
@@ -117,7 +117,10 @@ const EditRoleModal = ({
             title: translations.components.modal.deleteTitle,
             text: translations.components.modal.deleteUserConfirmation,
             icon: 'warning',
-            buttons: [true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then(async (willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/EditStepModal/EditStepModal.tsx b/apps/frontend/src/components/EditStepModal/EditStepModal.tsx
@@ -132,7 +132,10 @@ const EditStepModal = ({
             title: translations.components.modal.deleteTitle,
             text: translations.components.modal.deleteStepConfirmation,
             icon: 'warning',
-            buttons: [true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then((willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/Fields/DateField.tsx b/apps/frontend/src/components/Fields/DateField.tsx
@@ -2,12 +2,15 @@ import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import './Fields.scss';
 import { useTranslations } from '../../hooks/useTranslations';
+import { formToJSON } from 'axios';
+import { Nullish } from '@3dp4me/types';
+import { useMemo } from 'react';
 
 export interface DateFieldProps {
     displayName: string
     isDisabled: boolean
     fieldId: string
-    value: string,
+    value: Nullish<string>,
     onChange: (field: string, value: string) => void
 }
 
@@ -22,11 +25,12 @@ const DateField = ({ displayName, isDisabled, fieldId, value, onChange }: DateFi
         ? 'input-field datepicker'
         : 'active-input datepicker';
 
+
     return (
         <div>
             <h3>{displayName}</h3>
             <DatePicker
-                selected={new Date(Date.parse(value))}
+                selected={value ? new Date(Date.parse(value)): null}
                 disabled={isDisabled}
                 locale={selectedLang}
                 className={className}

diff --git a/apps/frontend/src/components/Fields/MapField.tsx b/apps/frontend/src/components/Fields/MapField.tsx
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import PropTypes from 'prop-types';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import ReactMapGL, { MapRef, Marker } from 'react-map-gl';
 import Geocoder from 'react-map-gl-geocoder';
@@ -13,11 +12,11 @@ import {
     PIN_URL,
 } from '../../utils/constants';
 import './MapField.scss';
-import { MapPoint } from '@3dp4me/types';
+import { MapPoint, Nullish } from '@3dp4me/types';
 
 export interface MapFieldProps {
-    value: MapPoint
-    initValue: MapPoint,
+    value: Nullish<MapPoint>
+    initValue: Nullish<MapPoint>,
     displayName: string
     isDisabled: boolean
     onChange: (field: string, value: MapPoint) => void
@@ -131,8 +130,8 @@ const MapField = ({
                 >
                     <img
                         src={PIN_URL}
-                        width={viewport?.zoom * 5}
-                        height={viewport?.zoom * 5}
+                        width={viewport?.zoom * 2}
+                        height={viewport?.zoom * 2.5}
                         alt="Location marker"
                     />
                 </Marker>

diff --git a/apps/frontend/src/components/Files/Files.tsx b/apps/frontend/src/components/Files/Files.tsx
@@ -37,7 +37,10 @@ const Files = <T extends string>({
             title: translations.components.file.deleteTitle,
             text: translations.components.file.deleteWarning,
             icon: 'warning',
-            buttons: [true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then((willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/ManagePatientModal/ManagePatientModal.tsx b/apps/frontend/src/components/ManagePatientModal/ManagePatientModal.tsx
@@ -81,7 +81,10 @@ const ManagePatientModal = ({
             title: translations.components.modal.deleteTitle,
             text: translations.components.modal.deletePatientConfirmation,
             icon: 'warning',
-            buttons: [true, true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then(async (willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/ManageRoleModal/ManageRoleModal.tsx b/apps/frontend/src/components/ManageRoleModal/ManageRoleModal.tsx
@@ -44,7 +44,10 @@ const ManageRoleModal = ({
             title: translations.components.modal.deleteTitle,
             text: translations.roleManagement.warning,
             icon: 'warning',
-            buttons: [true],
+            buttons: [
+                translations.components.button.discard.cancelButton,
+                translations.components.button.discard.confirmButton,
+            ],
             dangerMode: true,
         }).then(async (willDelete) => {
             if (willDelete) {

diff --git a/apps/frontend/src/components/PatientTable/PatientTable.tsx b/apps/frontend/src/components/PatientTable/PatientTable.tsx
@@ -64,6 +64,7 @@ const PatientTable = ({
             swal({
                 title: translations.components.swal.createPatient.successMsg,
                 icon: 'success',
+                buttons: [translations.components.button.discard.confirmButton],
             });
 
             onAddPatient(patient);

diff --git a/apps/frontend/src/components/StepContent/StepContent.tsx b/apps/frontend/src/components/StepContent/StepContent.tsx
@@ -149,8 +149,7 @@ const StepContent = ({
                 swal({
                     title: translations.components.button.discard.success,
                     icon: 'success',
-                    buttons:
-                        [translations.components.button.discard.confirmButton],
+                    buttons: [translations.components.button.discard.confirmButton],
                 });
                 // TODO: Nonexistent values don't get reset.
                 setUpdatedData(_.cloneDeep(stepData));