Skip to content

Commit 3a824ff

Browse files
authored
chore: reduce eslint warnings (#553)
1 parent 030b120 commit 3a824ff

File tree

43 files changed

+180
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+180
-303
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"clear": "rm -rf ./.cache ./dist ./build",
9191
"convert": "convert-resources --path-generated src/resources/old",
9292
"storybook": "start-storybook -p 6006 -s public",
93-
"build-storybook": "build-storybook -s public"
93+
"build-storybook": "build-storybook -s public",
94+
"lint": "eslint src/"
9495
},
9596
"eslintConfig": {
9697
"extends": "react-app",

src/components/accessories/admission/admissionForm/AdmissionForm.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useFormik } from "formik";
22
import get from "lodash.get";
33
import has from "lodash.has";
4-
import isEmpty from "lodash.isempty";
54
import moment from "moment";
65
import React, { FC, useCallback, useEffect, useMemo, useState } from "react";
76
import { useTranslation } from "react-i18next";

src/components/accessories/autocompleteField/AutocompleteField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import React, {
1010
} from "react";
1111
import { DefaultOptionType, IProps } from "./types";
1212
import "./styles.scss";
13-
import { Trans, useTranslation } from "react-i18next";
13+
import { useTranslation } from "react-i18next";
1414
import {
1515
Autocomplete,
1616
createFilterOptions,

src/components/accessories/billTable/BillTable.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
import { Add, FilterList } from "@material-ui/icons";
3131
import PatientPicker from "../patientPicker/PatientPicker";
3232
import { useNavigate } from "react-router";
33-
import PatientAutocomplete from "../patientAutocomplete/PatientAutocomplete";
3433
import InfoBox from "../infoBox/InfoBox";
3534

3635
export const BillTable: FC<IBillTableProps> = ({ fields }) => {

src/components/accessories/billTable/types.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,14 @@ export type BillFilterFormFieldName =
3030
| "status"
3131
| "month"
3232
| "year";
33+
34+
export type TBillDisplayData = {
35+
id: string | number,
36+
date: string,
37+
patient: JSX.Element,
38+
amount: string,
39+
balance: string,
40+
status: string,
41+
patId: number | undefined,
42+
lastPayment: string,
43+
}

src/components/accessories/billTable/useFormatData.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { BillPaymentsDTO, FullBillDTO } from "../../../generated";
33
import { renderDate } from "../../../libraries/formatUtils/dataFormatting";
44
import { Link } from "react-router-dom";
55
import React from "react";
6-
import { IStatus } from "./types";
6+
import { IStatus, TBillDisplayData } from "./types";
77
import { currencyFormat } from "../../../libraries/formatUtils/currencyFormatting";
88

99
const useFormatData = (
@@ -33,7 +33,7 @@ const useFormatData = (
3333
});
3434
};
3535

36-
let results = new Array();
36+
let results: Array<TBillDisplayData> = [];
3737
if (data)
3838
results = data
3939
.filter(

src/components/accessories/dashboard/dashboardContent/filter/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { DateRange } from "@material-ui/pickers/DateRangePicker/RangeTypes";
2-
31
export type TViewType = "day" | "week" | "month" | "year" | "range";
42
export type TPeriodType = "current" | "previous" | "last2" | "last3" | "custom";
53
export interface IOwnProps {

src/components/accessories/dashboard/opds/opdsBySex/OpdBySex.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ import { IOwnProps } from "../types";
44
import { useTranslation } from "react-i18next";
55
import { useDispatch } from "react-redux";
66
import { searchOpds } from "../../../../../state/opds/actions";
7-
import { useData } from "../useData";
87
import { TDashboardCardOptionActions } from "../../card/types";
98
import React from "react";
109
import { DashboardCard } from "../../card/DashboardCard";
1110
import { Piechart } from "../../../charts/pie/Piechart";
1211
import { DataSummary } from "../../summary/DataSummary";
1312
import { Skeleton } from "@material-ui/lab";
14-
import { ListItemIcon } from "@material-ui/core";
15-
import { Description, PictureAsPdf, SaveAlt } from "@material-ui/icons";
1613

1714
import "../../card/styles.scss";
1815
import { useOpdBySexData } from "../../../../../libraries/dashboardUtils/opds/useOpdBySexData";

src/components/accessories/dateField/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { PopperProps } from "@material-ui/core";
21
import { DatePickerView } from "@material-ui/pickers";
32
import { MuiTextFieldProps } from "@material-ui/pickers/_shared/PureDateInput";
43
import { ComponentType } from "react";

src/components/accessories/dateRangeField/DateRangeField.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import React, { FunctionComponent, useEffect, useState } from "react";
1+
import React, { FunctionComponent } from "react";
22
import {
3-
DateRange,
43
DesktopDateRangePicker,
54
MobileDateRangePicker,
6-
RangeInput,
75
} from "@material-ui/pickers";
86
import { IProps } from "./types";
97
import "./styles.scss";

src/components/accessories/dateRangeField/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { DatePickerView, DateRange, RangeInput } from "@material-ui/pickers";
1+
import { DatePickerView, DateRange } from "@material-ui/pickers";
22
import { MuiTextFieldProps } from "@material-ui/pickers/_shared/PureDateInput";
3-
import { ComponentType, ReactNode } from "react";
3+
import { ComponentType } from "react";
44
import { FIELD_VALIDATION } from "../../../types";
55

66
export interface IProps {

src/components/accessories/discharge/PatientDischarge.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ const PatientDischarge: FC = () => {
4242
const patient = useSelector(
4343
(state: IState) => state.patients.selectedPatient.data
4444
);
45-
const username = useSelector(
46-
(state: IState) => state.main.authentication.data?.username
47-
);
4845

4946
const dischargeStatus = useSelector<IState>(
5047
(state) => state.admissions.dischargePatient.status

src/components/accessories/extendedConfirmationDialog/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { ReactNode } from "react";
2-
31
export interface IProps {
42
isOpen: boolean;
53
title: string;

src/components/accessories/hospitalInfo/HospitalInfo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useDispatch, useSelector } from "react-redux";
88
import { getHospital } from "../../../state/hospital/actions";
99
import { HospitalDTO } from "../../../generated";
1010

11-
export const HospitalInfo: FC<TProps> = ({}) => {
11+
export const HospitalInfo: FC<TProps> = () => {
1212
const dispatch = useDispatch();
1313
const { t } = useTranslation();
1414
useEffect(() => {

src/components/accessories/hospitalInfo/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import { TUserCredentials } from "../../../state/main/types";
2-
import { TAPIResponseStatus } from "../../../state/types";
3-
41
export type TBreadcrumbMap = Record<string, string>;
52

63
export interface IOwnProps {}

src/components/accessories/laboratory/Exams.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Button, CircularProgress } from "@material-ui/core";
2-
import { Add } from "@material-ui/icons";
1+
import { CircularProgress } from "@material-ui/core";
32
import React, { FC, Fragment, useMemo, useState, useRef } from "react";
43
import { useTranslation } from "react-i18next";
54
import { useDispatch, useSelector } from "react-redux";
@@ -28,8 +27,6 @@ import { getExams } from "../../../state/exams/actions";
2827
import { ILaboratoriesState } from "../../../state/laboratories/types";
2928
import { LaboratoryDTO, LaboratoryDTOStatusEnum } from "../../../generated";
3029
import ConfirmationDialog from "../confirmationDialog/ConfirmationDialog";
31-
import { getPatientThunk } from "../../../state/patients/actions";
32-
import isEmpty from "lodash.isempty";
3330
import { EditLaboratoryContent } from "./EditLaboratoryContent";
3431
import { PATHS } from "../../../consts";
3532
import { Permission } from "../../../libraries/permissionUtils/Permission";

src/components/accessories/laboratory/examForm/ExamForm.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ const ExamForm: FC<ExamProps> = ({
210210
};
211211

212212
const examList = useSelector((state: IState) => state.exams.examList.data);
213-
const materialsList = useSelector(
214-
(state: IState) => state.laboratories.materials.data
215-
);
216213

217214
const examRowOptionsSelector = (state: IState) => {
218215
if (state.exams.examRowsByExamCode.data) {
@@ -345,10 +342,6 @@ const ExamForm: FC<ExamProps> = ({
345342
(state: IState) => state.exams.examList.status === "LOADING"
346343
);
347344

348-
const materialsLoading = useSelector(
349-
(state: IState) => state.laboratories.materials.status === "LOADING"
350-
);
351-
352345
const isLoading =
353346
labStore.createLab.status === "LOADING" ||
354347
labStore.updateLab.status === "LOADING";

src/components/accessories/laboratory/filter/ExamFilterForm.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import has from "lodash.has";
1212
import React, { useCallback, useState } from "react";
1313
import { FC } from "react";
1414
import { useTranslation } from "react-i18next";
15-
import { number, object, string } from "yup";
15+
import { object, string } from "yup";
1616
import {
1717
ExamDTO,
1818
LaboratoryDTOStatusEnum,
@@ -29,7 +29,6 @@ import DateField from "../../dateField/DateField";
2929
import PatientPicker from "../../patientPicker/PatientPicker";
3030
import { IExamFilterProps, TFilterValues } from "./types";
3131
import "./styles.scss";
32-
import { isEmpty } from "lodash";
3332
import AutocompleteField from "../../autocompleteField/AutocompleteField";
3433
import { IState } from "../../../../types";
3534
import { useSelector } from "react-redux";

src/components/accessories/opds/table/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { number } from "yup";
21
import { OpdDTO } from "../../../../generated";
32

43
export interface IOpdTableProps {

src/components/accessories/patientNewBill/itemPayment/ItemPayment.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const ItemPayment: FC<IOwnProps> = ({
3737
<span>{currencyFormat(billTotal - paymentTotal)}</span>
3838
</div>
3939
<div className="payment__buttons">
40-
{(billTotal > 0 && billTotal - paymentTotal == 0 && (
40+
{(billTotal > 0 && billTotal - paymentTotal === 0 && (
4141
<div>
4242
<Button
4343
className={"paid"}

src/components/accessories/patientNewBill/itemPicker/BillItemPicker.tsx

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { FormControlLabel, Radio, RadioGroup } from "@material-ui/core";
2-
import { useFormik } from "formik";
2+
33
import React, { FC, useCallback, useEffect, useMemo, useState } from "react";
44
import { useTranslation } from "react-i18next";
5-
import { number, object, string } from "yup";
6-
import { BillItemsDTO } from "../../../../generated";
75
import { PriceDTO } from "../../../../generated/models/PriceDTO";
8-
import {
9-
formatAllFieldValues,
10-
getFromFields,
11-
} from "../../../../libraries/formDataHandling/functions";
6+
import { formatAllFieldValues } from "../../../../libraries/formDataHandling/functions";
127
import AutocompleteField from "../../autocompleteField/AutocompleteField";
138
import SmallButton from "../../smallButton/SmallButton";
14-
import TextButton from "../../textButton/TextButton";
159
import TextField from "../../textField/TextField";
1610
import { ItemGroups } from "../consts";
1711
import { useItemPrices } from "../hooks/price.hooks";
@@ -51,7 +45,7 @@ const BillItemPickerForm: FC<BillItemProps> = ({
5145
if (itemType == ItemGroups.other.id) {
5246
item.itemAmount = values?.itemAmount;
5347
item.itemDescription = values?.itemDescription;
54-
onSubmit(item, itemToEdit == undefined ? true : false);
48+
onSubmit(item, itemToEdit === undefined ? true : false);
5549
return;
5650
}
5751
let priceDTO: PriceDTO | undefined = prices.find(
@@ -64,7 +58,7 @@ const BillItemPickerForm: FC<BillItemProps> = ({
6458
item.itemId = priceDTO.item;
6559
item.price = true;
6660
item.priceId = priceDTO.id?.toString() ?? "";
67-
onSubmit(item, itemToEdit == undefined ? true : false);
61+
onSubmit(item, itemToEdit === undefined ? true : false);
6862
}
6963
},
7064
[itemType]
@@ -73,7 +67,6 @@ const BillItemPickerForm: FC<BillItemProps> = ({
7367
const {
7468
getErrorText,
7569
getFieldProps,
76-
handleResetConfirmation,
7770
onBlurCallback,
7871
handleBlur,
7972
isValid,

src/components/accessories/patientNewBill/itemsTable/BillItemsTable.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { FC } from "react";
22
import Table from "../../table/Table";
33
import { header, order } from "./consts";
4-
import { currencyFormat } from "../../../../libraries/formatUtils/currencyFormatting";
54
import { useTranslation } from "react-i18next";
65

76
interface IOwnProps {

src/components/activities/loginActivity/RedirectAfterLogin.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useMemo } from "react";
22
import { useSelector } from "react-redux";
33
import { Navigate, useLocation } from "react-router";
44
import { useLandingPageRoute } from "../../../libraries/hooks/useLandingPageRoute";
5-
import { TAPIResponseStatus } from "../../../state/types";
65
import { IState } from "../../../types";
76
import { IRedirectAfterLogin } from "./types";
87

src/components/activities/newPatientActivity/NewPatientActivity.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ const NewPatientActivity: FunctionComponent<TProps> = ({
5656
state.patients.createPatient.error?.message || t("common.somethingwrong")
5757
);
5858

59-
const selectedPatient = useSelector<IState, PatientDTO | undefined>(
60-
(state) => state.patients.selectedPatient.data
61-
);
62-
6359
const patient = useSelector<IState, PatientDTO | undefined>(
6460
(state) =>
6561
state.patients.createPatient.data || state.patients.updatePatient.data

src/generated/models/Patient.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ export interface Patient {
195195
* @type {string}
196196
* @memberof Patient
197197
*/
198-
searchString?: string;
198+
informations?: string;
199199
/**
200200
* @type {string}
201201
* @memberof Patient
202202
*/
203-
informations?: string;
203+
searchString?: string;
204204
}

src/generated/models/TherapyRow.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ export interface TherapyRow {
105105
* @memberof TherapyRow
106106
*/
107107
smsInt: number;
108-
/**
109-
* @type {number}
110-
* @memberof TherapyRow
111-
*/
112-
medical?: number;
113108
/**
114109
* @type {boolean}
115110
* @memberof TherapyRow
@@ -120,4 +115,9 @@ export interface TherapyRow {
120115
* @memberof TherapyRow
121116
*/
122117
sms?: boolean;
118+
/**
119+
* @type {number}
120+
* @memberof TherapyRow
121+
*/
122+
medical?: number;
123123
}

0 commit comments

Comments
 (0)