Skip to content

Refactor report-table Actions columns to use menu dropdown pattern #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 7, 2025
Merged

Refactor report-table Actions columns to use menu dropdown pattern #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c8b869
Initial plan
Copilot Nov 7, 2025
347b6c2
Refactor report-table Actions column to use menu dropdown pattern
Copilot Nov 7, 2025
4c2d692
Fix: Remove invalid color attribute from mat-menu-item
Copilot Nov 7, 2025
4271700
Apply same refactoring to components/reports/report-table
Copilot Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions ...ules/backend-configuration-pn/components/reports/report-table/report-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
<mtx-grid
[data]="items"
[columns]="mergedTableHeaders"
[cellTemplate]="{
actions: actionsTpl
}"
[showPaginator]="false"
[pageOnFront]="false"
[rowStriped]="true"
[showToolbar]="false"
[showColumnMenuButton]="false"
>
</mtx-grid>

<ng-template #actionsTpl let-row let-i="index">
<div class="report-actions" id="action-items-{{i}}">
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
<mat-icon>more_vert</mat-icon>
</button>

<mat-menu #menu="matMenu">
<button
mat-menu-item
*ngIf="row.imagesCount !== 0"
id="viewImagesBtn-{{i}}"
(click)="onClickViewPicture(row.microtingSdkCaseId)"
>
<mat-icon>image</mat-icon>
<span>{{ 'View images' | translate }}</span>
</button>
<button
mat-menu-item
id="editCaseBtn-{{i}}"
(click)="onClickEditCase(row.microtingSdkCaseId, row.eFormId, row.id)"
>
<mat-icon>edit</mat-icon>
<span>{{ 'Edit' | translate }}</span>
</button>
<button
mat-menu-item
id="deleteCaseBtn-{{i}}"
(click)="onShowDeletePlanningCaseModal(row)"
>
<mat-icon color="warn">delete</mat-icon>
<span>{{ 'Delete' | translate }}</span>
</button>
</mat-menu>
</div>
</ng-template>
54 changes: 4 additions & 50 deletions ...odules/backend-configuration-pn/components/reports/report-table/report-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,8 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
{
header: this.translateService.stream('Actions'),
field: 'actions',
type: 'button',
buttons: [
{
tooltip: this.translateService.stream('View images'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickViewPicture(record.microtingSdkCaseId),
icon: 'image',
iif: (record: ReportEformItemModel) => record.imagesCount !== 0,
},
{
tooltip: this.translateService.stream('Edit'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickEditCase(record.microtingSdkCaseId, record.eFormId, record.id),
icon: 'edit',
},
{
tooltip: this.translateService.stream('Delete'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onShowDeletePlanningCaseModal(record),
color: 'warn',
icon: 'delete',
}
]
width: '160px',
pinned: 'right',
},
];
adminTableHeaders: MtxGridColumn[] = [
Expand All @@ -96,29 +75,8 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
{
header: this.translateService.stream('Actions'),
field: 'actions',
type: 'button',
buttons: [
{
tooltip: this.translateService.stream('View images'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickViewPicture(record.microtingSdkCaseId),
icon: 'image',
iif: (record: ReportEformItemModel) => record.imagesCount !== 0,
},
{
tooltip: this.translateService.stream('Edit'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickEditCase(record.microtingSdkCaseId, record.eFormId, record.id),
icon: 'edit',
},
{
tooltip: this.translateService.stream('Delete'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onShowDeletePlanningCaseModal(record),
color: 'warn',
icon: 'delete',
}
]
width: '160px',
pinned: 'right',
},
];
mergedTableHeaders: MtxGridColumn[] = [];
Expand Down Expand Up @@ -169,12 +127,8 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
};
});
if (this.isAdmin) {
this.adminTableHeaders.find(x => x.field === 'actions').class = ((record: ReportEformItemModel, _) =>
record ? `id-${record.id}` : '');//microtingSdkCaseId${record.microtingSdkCaseId}-eFormId${record.eFormId}-
this.mergedTableHeaders = [...this.adminTableHeaders, ...itemHeaders];
} else {
this.tableHeaders.find(x => x.field === 'actions').class = ((record: ReportEformItemModel, _) =>
record ? `id-${record.id}` : '');//microtingSdkCaseId${record.microtingSdkCaseId}-eFormId${record.eFormId}-
this.mergedTableHeaders = [...this.tableHeaders, ...itemHeaders];
}
}
Expand Down
39 changes: 39 additions & 0 deletions ...kend-configuration-pn/modules/reports/components/report-table/report-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
<mtx-grid
[data]="items"
[columns]="mergedTableHeaders"
[cellTemplate]="{
actions: actionsTpl
}"
[showPaginator]="false"
[pageOnFront]="false"
[rowStriped]="true"
[showToolbar]="false"
[showColumnMenuButton]="false"
>
</mtx-grid>

<ng-template #actionsTpl let-row let-i="index">
<div class="report-actions" id="action-items-{{i}}">
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
<mat-icon>more_vert</mat-icon>
</button>

<mat-menu #menu="matMenu">
<button
mat-menu-item
*ngIf="row.imagesCount !== 0"
id="viewImagesBtn-{{i}}"
(click)="onClickViewPicture(row.microtingSdkCaseId)"
>
<mat-icon>image</mat-icon>
<span>{{ 'View images' | translate }}</span>
</button>
<button
mat-menu-item
id="editCaseBtn-{{i}}"
(click)="onClickEditCase(row.microtingSdkCaseId, row.eFormId, row.id)"
>
<mat-icon>edit</mat-icon>
<span>{{ 'Edit' | translate }}</span>
</button>
<button
mat-menu-item
id="deleteCaseBtn-{{i}}"
(click)="onShowDeletePlanningCaseModal(row)"
>
<mat-icon color="warn">delete</mat-icon>
<span>{{ 'Delete' | translate }}</span>
</button>
</mat-menu>
</div>
</ng-template>
53 changes: 4 additions & 49 deletions ...ackend-configuration-pn/modules/reports/components/report-table/report-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,8 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
{
header: this.translateService.stream('Actions'),
field: 'actions',
type: 'button',
buttons: [
{
tooltip: this.translateService.stream('View images'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickViewPicture(record.microtingSdkCaseId),
icon: 'image',
iif: (record: ReportEformItemModel) => record.imagesCount !== 0,
},
{
tooltip: this.translateService.stream('Edit'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickEditCase(record.microtingSdkCaseId, record.eFormId, record.id),
icon: 'edit',
},
{
tooltip: this.translateService.stream('Delete'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onShowDeletePlanningCaseModal(record),
color: 'warn',
icon: 'delete',
}
]
width: '160px',
pinned: 'right',
},
{header: this.translateService.stream('Employee no'), field: 'employeeNo'},
];
Expand All @@ -87,29 +66,8 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
{
header: this.translateService.stream('Actions'),
field: 'actions',
type: 'button',
buttons: [
{
tooltip: this.translateService.stream('View images'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickViewPicture(record.microtingSdkCaseId),
icon: 'image',
iif: (record: ReportEformItemModel) => record.imagesCount !== 0,
},
{
tooltip: this.translateService.stream('Edit'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onClickEditCase(record.microtingSdkCaseId, record.eFormId, record.id),
icon: 'edit',
},
{
tooltip: this.translateService.stream('Delete'),
type: 'icon',
click: (record: ReportEformItemModel) => this.onShowDeletePlanningCaseModal(record),
color: 'warn',
icon: 'delete',
}
]
width: '160px',
pinned: 'right',
},
{header: this.translateService.stream('Employee no'), field: 'employeeNo'},
];
Expand Down Expand Up @@ -161,9 +119,6 @@ export class ReportTableComponent implements OnInit, OnChanges, OnDestroy {
let isAdmin = false;
this.selectAuthIsAdmin$.subscribe((selectAuthIsAdmin$) => isAdmin = selectAuthIsAdmin$);
const tableHeaders = [...(isAdmin ? [...this.adminTableHeaders] : [...this.tableHeaders])];
const index = tableHeaders
.findIndex(x => x.field === 'actions');
tableHeaders[index].width = this.items.filter(x => x.imagesCount > 0).length > 0 ? '160px' : '110px';

this.mergedTableHeaders = [
...tableHeaders,
Expand Down
Loading