Merge pull request #1172 from Tria-plc/freight_feature/usermanagement

Freight feature/usermanagement
This commit is contained in:
marshal
2026-08-08 02:00:59 +03:00
committed by GitHub
8 changed files with 76 additions and 49 deletions

View File

@@ -543,10 +543,14 @@ const RuleEngineResourcePage = () => {
config={config}
layout="row"
readOnly={!canUpdateControls}
onEdit={(record) => {
setEditing(record);
setFormOpen(true);
}}
onEdit={
config.slug === "container-types"
? undefined
: (record) => {
setEditing(record);
setFormOpen(true);
}
}
onDelete={setDeleteTarget}
onViewChain={
config.slug === "approval-rules"
@@ -881,7 +885,9 @@ const RuleEngineResourcePage = () => {
totalCount={totalCount}
onPaginationChange={setPagination}
readOnly={!canUpdate && !canDelete}
onEdit={canUpdate ? openEdit : undefined}
onEdit={
canUpdate && config.slug !== "container-types" ? openEdit : undefined
}
onDelete={canDelete ? setDeleteTarget : undefined}
onViewChain={
config.slug === "approval-rules"

View File

@@ -18,7 +18,6 @@ import {
History,
Inbox,
PackageCheck,
Plus,
RefreshCw,
Search,
Send,
@@ -311,19 +310,6 @@ export default function WagonTransfersPage() {
>
Refresh
</Button>
{canRequest ? (
<Button
color="edr-green"
radius="md"
leftSection={<Plus size={15} />}
onClick={() => {
setCarryOver(null);
setFormOpen(true);
}}
>
New request
</Button>
) : null}
</Group>
}
/>