Merge pull request #1192 from Tria-plc/freight/nati-2

Freight/nati 2
This commit is contained in:
Nathnael Wondisha
2026-08-08 20:38:37 +03:00
committed by GitHub
31 changed files with 1395 additions and 3009 deletions

View File

@@ -582,9 +582,7 @@ const App = () => {
<Route
path="routes"
element={
<RequirePermission
permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.routes.view}>
<RoutesPage />
</RequirePermission>
}
@@ -592,12 +590,7 @@ const App = () => {
<Route
path="locomotives"
element={
<RequirePermission
permission={[
FREIGHT_PERMS.locomotives.view,
FREIGHT_PERMS.fleet.view,
]}
>
<RequirePermission permission={FREIGHT_PERMS.locomotives.view}>
<FleetResourcePage />
</RequirePermission>
}
@@ -605,9 +598,7 @@ const App = () => {
<Route
path="trains"
element={
<RequirePermission
permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.trains.view}>
<FleetResourcePage />
</RequirePermission>
}
@@ -615,9 +606,7 @@ const App = () => {
<Route
path="trains/:id"
element={
<RequirePermission
permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.trains.view}>
<TrainDetailPage />
</RequirePermission>
}
@@ -625,9 +614,7 @@ const App = () => {
<Route
path="train-builder"
element={
<RequirePermission
permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.trains.view}>
<TrainBuilderListPage />
</RequirePermission>
}
@@ -635,9 +622,7 @@ const App = () => {
<Route
path="train-builder/:id"
element={
<RequirePermission
permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.trains.view}>
<TrainBuilderDetailPage />
</RequirePermission>
}
@@ -645,9 +630,7 @@ const App = () => {
<Route
path="wagons"
element={
<RequirePermission
permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.wagons.view}>
<FleetResourcePage />
</RequirePermission>
}
@@ -668,12 +651,7 @@ const App = () => {
<Route
path="containers"
element={
<RequirePermission
permission={[
FREIGHT_PERMS.containers.view,
FREIGHT_PERMS.fleet.view,
]}
>
<RequirePermission permission={FREIGHT_PERMS.containers.view}>
<FleetResourcePage />
</RequirePermission>
}
@@ -681,12 +659,7 @@ const App = () => {
<Route
path="cargoes"
element={
<RequirePermission
permission={[
FREIGHT_PERMS.cargoes.view,
FREIGHT_PERMS.fleet.view,
]}
>
<RequirePermission permission={FREIGHT_PERMS.cargoes.view}>
<FleetResourcePage />
</RequirePermission>
}
@@ -774,9 +747,7 @@ const App = () => {
<Route
path="compliance"
element={
<RequirePermission
permission={[FREIGHT_PERMS.compliance.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.compliance.view}>
<CompliancePage />
</RequirePermission>
}
@@ -800,9 +771,7 @@ const App = () => {
<Route
path="procurement"
element={
<RequirePermission
permission={[FREIGHT_PERMS.procurement.view, FREIGHT_PERMS.fleet.view]}
>
<RequirePermission permission={FREIGHT_PERMS.procurement.view}>
<ProcurementPage />
</RequirePermission>
}
@@ -825,9 +794,7 @@ const App = () => {
<Route
path="file-settings"
element={
<RequirePermission
permission={[FREIGHT_PERMS.settings.fileUpload.view, FREIGHT_PERMS.admin]}
>
<RequirePermission permission={FREIGHT_PERMS.settings.fileUpload.view}>
<FileUploadSettingsPage />
</RequirePermission>
}
@@ -835,9 +802,7 @@ const App = () => {
<Route
path="dropdown-settings"
element={
<RequirePermission
permission={[FREIGHT_PERMS.settings.dropdown.view, FREIGHT_PERMS.admin]}
>
<RequirePermission permission={FREIGHT_PERMS.settings.dropdown.view}>
<DropdownSettingsPage />
</RequirePermission>
}
@@ -854,10 +819,7 @@ const App = () => {
path="contract-templates"
element={
<RequirePermission
permission={[
FREIGHT_PERMS.settings.contractTemplates.view,
FREIGHT_PERMS.admin,
]}
permission={FREIGHT_PERMS.settings.contractTemplates.view}
>
<ContractTemplatesPage />
</RequirePermission>
@@ -867,10 +829,7 @@ const App = () => {
path="contract-templates/:code"
element={
<RequirePermission
permission={[
FREIGHT_PERMS.settings.contractTemplates.view,
FREIGHT_PERMS.admin,
]}
permission={FREIGHT_PERMS.settings.contractTemplates.view}
>
<ContractTemplateEditorPage />
</RequirePermission>
@@ -883,7 +842,6 @@ const App = () => {
permission={[
FREIGHT_PERMS.settings.supportContent.view,
FREIGHT_PERMS.settings.supportContent.manage,
FREIGHT_PERMS.admin,
]}
>
<PortalContentPage />
@@ -908,9 +866,7 @@ const App = () => {
<Route
path="configuration/trade-access"
element={
<RequirePermission
permission={[FREIGHT_PERMS.tradeAccess.view, FREIGHT_PERMS.admin]}
>
<RequirePermission permission={FREIGHT_PERMS.tradeAccess.view}>
<TradeAccessPage />
</RequirePermission>
}
@@ -918,9 +874,7 @@ const App = () => {
<Route
path="configuration/exchange-rate"
element={
<RequirePermission
permission={[FREIGHT_PERMS.settings.exchangeRate.view, FREIGHT_PERMS.admin]}
>
<RequirePermission permission={FREIGHT_PERMS.settings.exchangeRate.view}>
<div className="p-4">
<ExchangeRateSettingsCard />
</div>