merge upstream

src/app/pages/crud/crud.ts

@@ -162,7 +162,7 @@ interface ExportColumn {
 
                     <div>
                         <label for="inventoryStatus" class="block font-bold mb-3">Inventory Status</label>
-                        <p-select [(ngModel)]="product.inventoryStatus" inputId="inventoryStatus" [options]="statuses" optionLabel="label" placeholder="Select a Status" fluid />
+                        <p-select [(ngModel)]="product.inventoryStatus" inputId="inventoryStatus" [options]="statuses" optionLabel="label" optionValue="label" placeholder="Select a Status" fluid />
                     </div>
 
                     <div>

src/app/pages/uikit/chartdemo.ts

@@ -279,6 +279,9 @@ export class ChartDemo {
             },
             scales: {
                 r: {
+                    pointLabels: {
+                        color: textColor
+                    },
                     grid: {
                         color: surfaceBorder
                     }

src/app/pages/uikit/messagesdemo.ts

@@ -21,6 +21,7 @@ import { FormsModule } from '@angular/forms';
                         <p-button (click)="showInfoViaToast()" label="Info" severity="info" />
                         <p-button (click)="showWarnViaToast()" label="Warn" severity="warn" />
                         <p-button (click)="showErrorViaToast()" label="Error" severity="danger" />
+                        <p-toast />
                     </div>
 
                     <div class="font-semibold text-xl mt-4 mb-4">Inline</div>
@@ -61,38 +62,18 @@ export class MessagesDemo {
     constructor(private service: MessageService) {}
 
     showInfoViaToast() {
-        this.service.add({ key: 'tst', severity: 'info', summary: 'Info Message', detail: 'PrimeNG rocks' });
+        this.service.add({ severity: 'info', summary: 'Info Message', detail: 'PrimeNG rocks' });
     }
 
     showWarnViaToast() {
-        this.service.add({ key: 'tst', severity: 'warn', summary: 'Warn Message', detail: 'There are unsaved changes' });
+        this.service.add({ severity: 'warn', summary: 'Warn Message', detail: 'There are unsaved changes' });
     }
 
     showErrorViaToast() {
-        this.service.add({ key: 'tst', severity: 'error', summary: 'Error Message', detail: 'Validation failed' });
+        this.service.add({ severity: 'error', summary: 'Error Message', detail: 'Validation failed' });
     }
 
     showSuccessViaToast() {
-        this.service.add({ key: 'tst', severity: 'success', summary: 'Success Message', detail: 'Message sent' });
+        this.service.add({ severity: 'success', summary: 'Success Message', detail: 'Message sent' });
-    }
-
-    showInfoViaMessages() {
-        this.msgs = [];
-        this.msgs.push({ severity: 'info', summary: 'Info Message', detail: 'PrimeNG rocks' });
-    }
-
-    showWarnViaMessages() {
-        this.msgs = [];
-        this.msgs.push({ severity: 'warn', summary: 'Warn Message', detail: 'There are unsaved changes' });
-    }
-
-    showErrorViaMessages() {
-        this.msgs = [];
-        this.msgs.push({ severity: 'error', summary: 'Error Message', detail: 'Validation failed' });
-    }
-
-    showSuccessViaMessages() {
-        this.msgs = [];
-        this.msgs.push({ severity: 'success', summary: 'Success Message', detail: 'Message sent' });
     }
 }

src/app/pages/uikit/tabledemo.ts

@@ -95,9 +95,9 @@ interface expandedRows {
                                     <ng-template #filter let-value let-filter="filterCallback">
                                         <p-multiselect [ngModel]="value" [options]="representatives" placeholder="Any" (onChange)="filter($event.value)" optionLabel="name" styleClass="w-full">
                                             <ng-template let-option #item>
-                                                <div>
+                                                <div class="flex items-center gap-2 w-44">
-                                                    <img [alt]="option.label" src="https://primefaces.org/cdn/primeng/images/demo/avatar/{{ option.image }}" width="32" style="vertical-align: middle" />
+                                                    <img [alt]="option.label" src="https://primefaces.org/cdn/primeng/images/demo/avatar/{{ option.image }}" width="32" />
-                                                    <span class="ml-2">{{ option.name }}</span>
+                                                    <span>{{ option.name }}</span>
                                                 </div>
                                             </ng-template>
                                         </p-multiselect>