Skip to content
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

portalicious: payment and registration page review #6330

Merged
merged 1 commit into from
Jan 3, 2025
Merged

portalicious: payment and registration page review #6330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
"source.removeUnusedImports": "explicit"
},
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
"typescript.enablePromptUseWorkspaceTsdk": true,
// The following setting is necessary to avoid false negatives in the VSCode Angular Language
// Service because of discrepancies between the angular versions used in Portal and Portalicious.
// It can be removed when the Portal is removed.
"angular.suppressAngularDiagnosticCodes": "-992010,-998001,-998002"
}
8 changes: 2 additions & 6 deletions e2e/portalicious/pages/RegistrationsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ interface ExportExcelFspData {
class RegistrationsPage extends BasePage {
readonly page: Page;
readonly table: TableComponent;
readonly goToProfileOption: Locator;
readonly sendMessageDialogPreview: Locator;
readonly exportButton: Locator;
readonly proceedButton: Locator;
Expand All @@ -110,7 +109,6 @@ class RegistrationsPage extends BasePage {
super(page);
this.page = page;
this.table = new TableComponent(page);
this.goToProfileOption = this.page.getByText('Go to profile');
this.sendMessageDialogPreview = this.page.getByTestId(
'send-message-dialog-preview',
);
Expand Down Expand Up @@ -194,8 +192,7 @@ class RegistrationsPage extends BasePage {
(registrationName && isRequestedFullName) ||
(!registrationName && !isRequestedFullName)
) {
await fullName.click({ button: 'right' });
await this.goToProfileOption.click();
await fullName.getByRole('link').click();
return;
}
}
Expand Down Expand Up @@ -252,8 +249,7 @@ class RegistrationsPage extends BasePage {
const randomIndex = Math.floor(Math.random() * rowCount);
const fullName = await this.table.getCell(randomIndex, 2);

await fullName.click({ button: 'right' });
await this.goToProfileOption.click();
await fullName.getByRole('link').click();
return randomIndex;
}

Expand Down
2 changes: 1 addition & 1 deletion interfaces/Portalicious/src/app/components/colored-chip/colored-chip.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export function getChipDataByTwilioMessageStatus(status: string): ChipData {
switch (messageStatus) {
case MessageStatus.delivered:
case MessageStatus.read:
case MessageStatus.sent:
return {
chipLabel,
chipVariant: 'green',
Expand All @@ -80,6 +79,7 @@ export function getChipDataByTwilioMessageStatus(status: string): ChipData {
chipLabel,
chipVariant: 'red',
};
case MessageStatus.sent:
default:
return {
chipLabel,
Expand Down
4 changes: 2 additions & 2 deletions interfaces/Portalicious/src/app/components/page-layout/page-layout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
@if (projectId()) {
<app-project-menu [projectId]="projectId()!" />
}
<div class="flex-1 px-6 py-8 lg:px-24">
<div class="flex-1 px-6 py-6 lg:px-24">
@if (pageTitle()) {
@let parentTitle = parentPageTitle();
@let parentLink = parentPageLink();

<div class="flex items-start justify-between pb-9 pt-1">
<div class="flex items-center justify-between pb-6 pt-1">
<h1 class="min-w-48">
@if (isPending()) {
<p-skeleton
Expand Down
170 changes: 91 additions & 79 deletions interfaces/Portalicious/src/app/components/query-table/query-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,70 +89,65 @@
</th>
}
@for (column of visibleColumns(); track $index) {
@if (column.field) {
<th
[pSortableColumn]="getColumnSortField(column)"
style="min-width: 14rem"
>
<div class="flex items-center">
<ng-container>{{ column.header }}</ng-container>
@let columnSortField = getColumnSortField(column);
@let columnFilterField = getColumnFilterField(column);
@let columnMatchMode = getColumnMatchMode(column);

@let columnSortField = getColumnSortField(column);
<th
[pSortableColumn]="columnSortField"
style="min-width: 14rem"
>
<div class="flex items-center">
<ng-container>{{ column.header }}</ng-container>

@if (columnSortField) {
<p-sortIcon
[field]="columnSortField"
class="me-0 ms-2 mt-1"
/>
}

@let columnFilterField = getColumnFilterField(column);
@let columnMatchMode = getColumnMatchMode(column);
@if (columnSortField) {
<p-sortIcon
[field]="columnSortField"
class="me-0 ms-2 mt-1"
/>
}

@if (columnFilterField) {
@if (column.type === 'multiselect') {
<p-columnFilter
[field]="columnFilterField"
[matchMode]="columnMatchMode"
display="menu"
[showMatchModes]="false"
[showOperator]="false"
[showAddButton]="false"
@if (columnFilterField) {
@if (column.type === 'multiselect') {
<p-columnFilter
[field]="columnFilterField"
[matchMode]="columnMatchMode"
display="menu"
[showMatchModes]="false"
[showOperator]="false"
[showAddButton]="false"
>
<ng-template
pTemplate="filter"
let-value
let-filter="filterCallback"
>
<ng-template
pTemplate="filter"
let-value
let-filter="filterCallback"
<p-multiSelect
[ngModel]="value"
[options]="column.options"
(onChange)="filter($event.value)"
[optionLabel]="'label'"
[optionValue]="'value'"
placeholder="Choose option(s)"
i18n-placeholder
>
<p-multiSelect
[ngModel]="value"
[options]="column.options"
(onChange)="filter($event.value)"
[optionLabel]="'label'"
[optionValue]="'value'"
placeholder="Choose option(s)"
i18n-placeholder
>
</p-multiSelect>
</ng-template>
</p-columnFilter>
} @else {
<p-columnFilter
[type]="getColumnType(column)"
[field]="columnFilterField"
display="menu"
[matchMode]="columnMatchMode"
[showMatchModes]="false"
[showOperator]="false"
[showAddButton]="false"
/>
}
</p-multiSelect>
</ng-template>
</p-columnFilter>
} @else {
<p-columnFilter
[type]="getColumnType(column)"
[field]="columnFilterField"
display="menu"
[matchMode]="columnMatchMode"
[showMatchModes]="false"
[showOperator]="false"
[showAddButton]="false"
/>
}
</div>
</th>
} @else {
<th style="min-width: 14rem">{{ column.header }}</th>
}
}
</div>
</th>
}
@if (contextMenuItems()) {
<!-- Extra column for the ellipsis button -->
Expand Down Expand Up @@ -282,29 +277,46 @@
<tr data-testid="query-table-empty">
<td [attr.colspan]="totalColumnCount()">
<div class="w-full py-6 text-center">
<i class="pi pi-filter mb-5 inline text-xl"></i>

<p
i18n
class="mb-2 font-bold"
>
No results found
</p>
@if (isFiltered()) {
<i class="pi pi-filter mb-5 inline text-xl"></i>

<p
i18n
class="mb-8"
>
There are no records that match the selected filters, clear some or
all filters to continue.
</p>
<p
i18n
class="mb-2 font-bold"
>
No results found
</p>
<p
i18n
class="mb-8"
>
There are no records that match the selected filters, clear some
or all filters to continue.
</p>

<p-button
label="Clear all filters"
i18n-label="@@table-clear-filters"
link
(click)="clearAllFilters()"
/>
<p-button
label="Clear all filters"
i18n-label="@@table-clear-filters"
link
(click)="clearAllFilters()"
/>
} @else {
@let emptyMessageTemplate = emptyMessage();
@if (emptyMessageTemplate) {
<ng-container
[ngTemplateOutlet]="emptyMessageTemplate"
></ng-container>
} @else {
<i class="pi pi-exclamation-circle mb-3 inline text-xl"></i>
<p
i18n
class="mb-2 font-bold"
>
No results
</p>
<p i18n>There are no records to display.</p>
}
}
</div>
</td>
</tr>
Expand Down
17 changes: 11 additions & 6 deletions interfaces/Portalicious/src/app/components/query-table/query-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { DatePipe, NgComponentOutlet } from '@angular/common';
import { DatePipe, NgComponentOutlet, NgTemplateOutlet } from '@angular/common';
import {
ChangeDetectionStrategy,
Component,
computed,
contentChild,
effect,
inject,
input,
LOCALE_ID,
model,
output,
signal,
TemplateRef,
Type,
viewChild,
} from '@angular/core';
Expand Down Expand Up @@ -109,6 +111,7 @@ export type QueryTableSelectionEvent<TData> = { selectAll: true } | TData[];
CheckboxModule,
QueryTableGlobalSearchComponent,
QueryTableColumnManagementComponent,
NgTemplateOutlet,
],
providers: [ToastService],
templateUrl: './query-table.component.html',
Expand Down Expand Up @@ -137,6 +140,8 @@ export class QueryTableComponent<TData extends { id: PropertyKey }, TContext> {
readonly updateContextMenuItem = output<TData>();
readonly updatePaginateQuery = output<PaginateQuery>();

readonly emptyMessage =
contentChild<TemplateRef<unknown>>('tableEmptyMessage');
readonly table = viewChild.required<Table>('table');
readonly contextMenu = viewChild<Menu>('contextMenu');
readonly extraOptionsMenu = viewChild<Menu>('extraOptionsMenu');
Expand Down Expand Up @@ -399,12 +404,12 @@ export class QueryTableComponent<TData extends { id: PropertyKey }, TContext> {
if ('selectAll' in selection && !this.serverSideFiltering()) {
const filteredValue = this.table().filteredValue;

if (!filteredValue) {
this.toastService.showGenericError();
return;
if (this.table().filteredValue) {
selection = [...(filteredValue as TData[])];
} else {
// no filters are applied, so we can select all items
selection = [...this.items()];
}

selection = [...(filteredValue as TData[])];
}

if (Array.isArray(selection) && selection.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion ...components/registration-page-layout/components/add-note-form/add-note-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
i18n
class="font-semibold"
>
You are about to add a note to {{ registrationName() }}'s profile.
You are about to add a note to {{ registration.data()?.name }}'s profile.
</p>
<p
i18n
Expand Down
Loading
Loading