establishment user listing view details routing done
This commit is contained in:
parent
a0105e59bd
commit
e79d6ea298
@ -64,7 +64,7 @@ function App() {
|
||||
<Route
|
||||
path="/admin/validations"
|
||||
element={(
|
||||
<RequireRole allowedRoles={['Admin']}>
|
||||
<RequireRole allowedRoles={['Admin','EstablishmentUser']}>
|
||||
<Validations />
|
||||
</RequireRole>
|
||||
)}
|
||||
@ -72,7 +72,7 @@ function App() {
|
||||
<Route
|
||||
path="/admin/validations/:id"
|
||||
element={(
|
||||
<RequireRole allowedRoles={['Admin']}>
|
||||
<RequireRole allowedRoles={['Admin','EstablishmentUser']}>
|
||||
<ValidationReview />
|
||||
</RequireRole>
|
||||
)}
|
||||
|
||||
@ -65,7 +65,7 @@ export const SubmissionHistory = ({ history = [], loading = false, error = '' })
|
||||
if (!Array.isArray(history)) return [];
|
||||
return history.map((entry, index) => ({
|
||||
id: entry?.id ?? index,
|
||||
survey_name: 'Industrial Producation Survey',
|
||||
survey_name: 'Industrial Production Survey',
|
||||
year: entry?.year || '—',
|
||||
quarter: entry?.quarter || '—',
|
||||
status: entry?.status || 'Pending',
|
||||
@ -84,7 +84,12 @@ export const SubmissionHistory = ({ history = [], loading = false, error = '' })
|
||||
);
|
||||
});
|
||||
|
||||
const navigateToView = (id) => navigate(`/history/${id}`);
|
||||
// ✅ Updated navigation to match SubmissionTable pattern
|
||||
const navigateToView = (id) => {
|
||||
navigate(`/admin/validations/${id}`, {
|
||||
state: { actionType: 'view' }
|
||||
});
|
||||
};
|
||||
|
||||
const rowsData = filteredRows.map((item) => {
|
||||
const productCount = Number(item.products) || 0;
|
||||
@ -95,10 +100,10 @@ export const SubmissionHistory = ({ history = [], loading = false, error = '' })
|
||||
item.year,
|
||||
item.quarter,
|
||||
<span className={getStatusClass(item.status)}>{item.status}</span>,
|
||||
<span className="whitespace-nowrap">{item.submission_on}</span>,
|
||||
<span className="whitespace-nowrap">{item.submission_on}</span>,
|
||||
productLabel,
|
||||
<button
|
||||
onClick={() => navigateToView(item.id)}
|
||||
onClick={() => navigateToView(item.id)} // ✅ Now routes to /admin/validations/:id
|
||||
className="text-[#9E792B] hover:text-[#7b5f22] font-medium"
|
||||
>
|
||||
View Details
|
||||
|
||||
Loading…
Reference in New Issue
Block a user