Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-30 09:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Freight feature/usermanagement
This commit is contained in:
marshal
2026-07-27 09:00:59 +03:00
committed by GitHub
parent fe407d8d40 15d78e1d67
commit 89a0bc6948
12 changed files with 434 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
View File

@@ -112,6 +112,13 @@ const SORT_OPTIONS = [
{ value: "contractValidUntil:DESC", label: "Expiring latest" },
];
/** Every column is 120px wide and wraps its content instead of truncating. */
const COLUMN_WIDTH = 120;
const COLUMN_META = {
headerClassName: "whitespace-normal break-words",
cellClassName: "whitespace-normal break-words align-top",
};
/** Local start-of-day → ISO, for inclusive "from" date filters. */
function startOfDayIso(d: Date): string {
const x = new Date(d);
@@ -260,6 +267,8 @@ export default function ContractRequestsPage() {
const columns: ColumnDef<ContractListRow>[] = [
{
id: "contract",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Customer</span>,
cell: ({ row }) => {
const c = row.original;
@@ -269,10 +278,8 @@ export default function ContractRequestsPage() {
<User className="size-4" strokeWidth={1.75} />
</div>
<div className="min-w-0">
<p className="truncate font-medium text-foreground">
{c.customerLabel}
</p>
<p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
<p className="font-medium text-foreground">{c.customerLabel}</p>
<p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
<FileText className="size-3 shrink-0 opacity-70" />
{c.reference}
</p>
@@ -283,17 +290,17 @@ export default function ContractRequestsPage() {
},
{
id: "route",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Route</span>,
cell: ({ row }) => {
const c = row.original;
return (
<div className="space-y-1 py-1">
<div className="flex items-center gap-1.5 text-sm font-medium text-foreground">
<span className="max-w-[8rem] truncate">{c.originLabel}</span>
<span>{c.originLabel}</span>
<ArrowRight className="size-3.5 shrink-0 text-muted-foreground" />
<span className="max-w-[8rem] truncate">
{c.destinationLabel}
</span>
<span>{c.destinationLabel}</span>
</div>
<div className="flex gap-1.5">
<Badge
@@ -315,8 +322,8 @@ export default function ContractRequestsPage() {
},
{
id: "status",
size: 200,
minSize: 180,
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Status</span>,
cell: ({ row }) => (
<div className="py-1">
@@ -326,18 +333,18 @@ export default function ContractRequestsPage() {
/>
</div>
),
meta: {
headerClassName: "min-w-[11rem]",
cellClassName: "min-w-[11rem]",
},
},
{
id: "approval",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Approval</span>,
cell: ({ row }) => <ContractApprovalProgressCell row={row.original} />,
},
{
id: "validity",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Validity</span>,
cell: ({ row }) => {
const c = row.original;
@@ -362,6 +369,8 @@ export default function ContractRequestsPage() {
},
{
id: "kind",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Kind</span>,
cell: ({ row }) => {
const isGeneral = row.original.contractKind === "GENERAL";
@@ -383,6 +392,8 @@ export default function ContractRequestsPage() {
},
{
id: "actions",
size: COLUMN_WIDTH,
meta: COLUMN_META,
header: () => <span className={bookingTable.headerCell}>Action</span>,
cell: ({ row }) => {
const action = getStaffRowAction(row.original);
@@ -653,7 +664,9 @@ export default function ContractRequestsPage() {
manualPagination: true,
pageCount,
}}
containerClassName="border-0 shadow-none bg-transparent"
// table-fixed makes the per-column 120px widths stick; without
// it auto-layout re-widens columns once cells wrap.
containerClassName="border-0 shadow-none bg-transparent [&_table]:table-fixed [&_table]:min-w-[840px]"
footer={DataTableFooter}
/>
</Box>