fix variable to props on sucos

This commit is contained in:
Wikzyy
2025-04-16 17:51:37 +07:00
parent 585cd326b7
commit 858941b3b7
3 changed files with 21 additions and 17 deletions

View File

@ -27,8 +27,8 @@ import {
import { doSaveLogActivity } from '@/actions/GlobalActions'; import { doSaveLogActivity } from '@/actions/GlobalActions';
interface SucosProps { interface SucosProps {
sucos_id: number; id: number;
sucos_name: string; name: string;
} }
const API_URL = apiConfig.service_master_data; const API_URL = apiConfig.service_master_data;
@ -97,8 +97,8 @@ const EditDialog = () => {
order_direction: sorting[0].desc == false ? 'ASC' : 'DESC' order_direction: sorting[0].desc == false ? 'ASC' : 'DESC'
}); });
// console.log('SUCOS', response?.data);
setSucos(response?.data.list); setSucos(response?.data.list);
console.log(sucos);
} catch (error) { } catch (error) {
console.error('Error fetching Sucos', error); console.error('Error fetching Sucos', error);
setAlert({ show: true, message: 'Failed to get Sucos. Please try again.' }); setAlert({ show: true, message: 'Failed to get Sucos. Please try again.' });
@ -221,8 +221,8 @@ const EditDialog = () => {
className="input col-span-5 text-left" className="input col-span-5 text-left"
style={{ color: 'inherit' }} style={{ color: 'inherit' }}
> >
{sucos.find((suco) => suco.sucos_id === formField.sucosId) {sucos.find((suco) => suco.id === formField.sucosId)
?.sucos_name || 'Select Sucos'} ?.name || 'Select Sucos'}
</button> </button>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent className="w-[400px] p-0"> <PopoverContent className="w-[400px] p-0">
@ -233,17 +233,17 @@ const EditDialog = () => {
<CommandGroup> <CommandGroup>
{sucos.map((suco) => ( {sucos.map((suco) => (
<CommandItem <CommandItem
key={suco.sucos_id} key={suco.id}
value={suco.sucos_name} value={suco.name}
onSelect={() => { onSelect={() => {
setFormField({ setFormField({
...formField, ...formField,
sucosId: suco.sucos_id sucosId: suco.id
}); });
setOpen(false); setOpen(false);
}} }}
> >
{suco.sucos_name} {suco.name}
</CommandItem> </CommandItem>
))} ))}
</CommandGroup> </CommandGroup>

View File

@ -34,7 +34,6 @@ interface PostoAdmsProps {
const API_URL = apiConfig.service_master_data; const API_URL = apiConfig.service_master_data;
const EditDialog = () => { const EditDialog = () => {
const parentRef = useRef<any | null>(null);
const { showEditDialog, handleEditDialog, selectedSucos, sucos } = useManageSucosContext(); const { showEditDialog, handleEditDialog, selectedSucos, sucos } = useManageSucosContext();
const { reload } = useDataGrid(); const { reload } = useDataGrid();
const { PutData, GetData } = useCallApi(); const { PutData, GetData } = useCallApi();

View File

@ -9,9 +9,12 @@ import { useNavigate } from 'react-router';
import axios from 'axios'; import axios from 'axios';
interface SucosProps { interface SucosProps {
sucos_id: number; id: string;
sucos_name: string; name: string;
posto_name: string; posto: {
id: string;
name: string;
};
} }
interface ContextProps { interface ContextProps {
@ -106,7 +109,9 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
const value = row.getValue<string>(columnId); const value = row.getValue<string>(columnId);
return String(value).includes(String(filterValue)); return String(value).includes(String(filterValue));
}, },
header: ({ column }) => <DataGridColumnHeader title="Postu Administrativo Name" column={column} />, header: ({ column }) => (
<DataGridColumnHeader title="Postu Administrativo Name" column={column} />
),
enableSorting: true, enableSorting: true,
enableHiding: false, enableHiding: false,
meta: { meta: {
@ -124,13 +129,13 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
<> <>
<button <button
className="btn btn-sm btn-icon btn-clear btn-light" className="btn btn-sm btn-icon btn-clear btn-light"
onClick={() => handleEditDialog(true, row.sucos_id)} onClick={() => handleEditDialog(true, row.id)}
> >
<KeenIcon icon="notepad-edit" /> <KeenIcon icon="notepad-edit" />
</button> </button>
<button <button
className="btn btn-sm btn-icon btn-clear btn-light" className="btn btn-sm btn-icon btn-clear btn-light"
onClick={() => handleDeleteDialog(true, row.sucos_id)} onClick={() => handleDeleteDialog(true, row.id)}
> >
<KeenIcon icon="trash" /> <KeenIcon icon="trash" />
</button> </button>
@ -158,7 +163,7 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
order_direction: sorting[0].desc == false ? 'ASC' : 'DESC', order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
filter: JSON.stringify(filter) filter: JSON.stringify(filter)
}); });
// console.log('Sucos List Response:', response?.data); console.log('Sucos List Response:', response?.data);
setSucos(response?.data.list || []); setSucos(response?.data.list || []);
return { data: response?.data.list, totalCount: response?.data.total_count }; return { data: response?.data.list, totalCount: response?.data.total_count };
} catch (error) { } catch (error) {