knee-cola/evidencija-rezija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring: changing param list of a fn

Browse Source
This commit is contained in:
Nikola Derežić
2024-02-01 15:07:30 +01:00
parent a1abc450bf
commit 2261e83715
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/ui/BillDeleteForm.tsx
View File

@@ -2,7 +2,6 @@
import { FC } from "react";
import { Bill, BillingLocation } from "../lib/db-types";
import { deleteLocationById } from "../lib/actions/locationActions";
import { useFormState } from "react-dom";
import { Main } from "./Main";
import { gotoHome } from "../lib/actions/navigationActions";
@@ -15,11 +14,11 @@ export interface BillDeleteFormProps {
export const BillDeleteForm:FC<BillDeleteFormProps> = ({ bill, location }) =>
{
const handleAction = deleteBillById.bind(null, location._id, bill._id, location.yearMonth.year);
const handleAction = deleteBillById.bind(null, location._id, bill._id, location.yearMonth.year, location.yearMonth.month);
const [ state, dispatch ] = useFormState(handleAction, null);
const handleCancel = () => {
gotoHome(`/?year=${location.yearMonth.year}&month=${location.yearMonth.month}`);
gotoHome(location.yearMonth);
};
return(

10
app/ui/BillEditForm.tsx
View File

@@ -11,11 +11,11 @@ import { formatYearMonth } from "../lib/format";
// Next.js does not encode an utf-8 file name correctly when sending a form with a file attachment
// This is a workaround for that
const updateOrAddBillMiddleware = (locationId: string, billId:string|undefined, billYear:number|undefined, prevState:any, formData: FormData) => {
const updateOrAddBillMiddleware = (locationId: string, billId:string|undefined, billYear:number|undefined, billMonth:number|undefined, prevState:any, formData: FormData) => {
// URL encode the file name of the attachment so it is correctly sent to the server
const billAttachment = formData.get('billAttachment') as File;
formData.set('billAttachment', billAttachment, encodeURIComponent(billAttachment.name));
return updateOrAddBill(locationId, billId, billYear, prevState, formData);
return updateOrAddBill(locationId, billId, billYear, billMonth, prevState, formData);
}
export interface BillEditFormProps {
@@ -27,17 +27,17 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
const { _id: billID, name, paid, attachment, notes, payedAmount } = bill ?? { _id:undefined, name:"", paid:false, notes:"" };
const { yearMonth:{year: billYear}, _id: locationID } = location;
const { yearMonth:{year: billYear, month: billMonth}, _id: locationID } = location;
const initialState = { message: null, errors: {} };
const handleAction = updateOrAddBillMiddleware.bind(null, locationID, billID, billYear);
const handleAction = updateOrAddBillMiddleware.bind(null, locationID, billID, billYear, billMonth);
const [ state, dispatch ] = useFormState(handleAction, initialState);
const [ isPaid, setIsPaid ] = React.useState<boolean>(paid);
// redirect to the main page
const handleCancel = () => {
gotoHome(billYear ? `/?year=${billYear}&month=${location.yearMonth.month}` : undefined);
gotoHome(location.yearMonth);
};
const billPaid_handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {

4
app/ui/LocationDeleteForm.tsx
View File

@@ -5,7 +5,7 @@ import { BillingLocation } from "../lib/db-types";
import { deleteLocationById } from "../lib/actions/locationActions";
import { useFormState } from "react-dom";
import { Main } from "./Main";
import { gotoHome } from "../lib/actions/navigationActions";
import { gotoUrl } from "../lib/actions/navigationActions";
export interface LocationDeleteFormProps {
/** location which should be deleted */
@@ -18,7 +18,7 @@ export const LocationDeleteForm:FC<LocationDeleteFormProps> = ({ location }) =>
const [ state, dispatch ] = useFormState(handleAction, null);
const handleCancel = () => {
gotoHome(`/location/${location._id}/edit/`);
gotoUrl(`/location/${location._id}/edit/`);
};
return(

2
app/ui/LocationEditForm.tsx
View File

@@ -24,7 +24,7 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
// redirect to the main page
const handleCancel = () => {
gotoHome(location ? `/?year=${location?.yearMonth?.year}&month=${location?.yearMonth?.month}` : undefined);
if(location) gotoHome(location?.yearMonth);
};
return(