Skip to content

feat: theme upgrade to primeng_18 #1399

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

Open
wants to merge 1 commit into
base: prime-ng-theme
Choose a base branch
from
Open

feat: theme upgrade to primeng_18 #1399

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
16 changes: 4 additions & 12 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
],
"styles": [
"src/styles.scss",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeicons/primeicons.css"
],
"scripts": []
},
Expand Down Expand Up @@ -128,9 +126,7 @@
],
"styles": [
"src/styles.scss",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeicons/primeicons.css"
],
"scripts": [],
"codeCoverage": true
Expand All @@ -153,9 +149,7 @@
"compodoc": true,
"styles": [
"src/styles.scss",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeicons/primeicons.css"
],
"assets": [
"src/assets"
Expand All @@ -174,9 +168,7 @@
"options": {
"styles": [
"src/styles.scss",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeicons/primeicons.css"
],
"assets": [
"src/assets"
Expand Down
103 changes: 89 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"@babel/runtime": "^7.27.0",
"@jsverse/transloco": "^7.6.1",
"@jsverse/transloco-messageformat": "^7.0.1",
"@primeng/themes": "^18.0.2",
"@primeuix/styled": "^0.7.0",
"@primeuix/themes": "^1.2.1",
"@primeuix/utils": "^0.6.0",
Expand All @@ -50,7 +51,7 @@
"n": "^9.2.3",
"ng-svg-icon-sprite": "^1.14.0",
"primeicons": "^7.0.0",
"primeng": "^17.17.0",
"primeng": "^18.0.2",
"rxjs": "^7.8.1",
"tailwindcss": "~3.2.1",
"ts-cacheable": "^1.0.8",
Expand Down
7 changes: 4 additions & 3 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { MessageService, PrimeNGConfig } from 'primeng/api';
import { MessageService } from 'primeng/api';
import { PrimeNG } from 'primeng/config';
import { EventsService } from './core/services/common/events.service';
import { QboAuthService } from './core/services/qbo/qbo-core/qbo-auth.service';
import { Token } from 'src/app/core/models/misc/token.model';
Expand All @@ -25,7 +26,7 @@ export class AppComponent implements OnInit {
constructor(
private eventsService: EventsService,
private messageService: MessageService,
private primengConfig: PrimeNGConfig,
private primengConfig: PrimeNG,
private router: Router,
private iframeOriginStorageService: IframeOriginStorageService
) { }
Expand All @@ -41,6 +42,6 @@ export class AppComponent implements OnInit {
}
});
this.eventsService.receiveEvent();
this.primengConfig.ripple = true;
this.primengConfig.ripple.set(true);
}
}
15 changes: 13 additions & 2 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import { firstValueFrom } from 'rxjs';
import { TranslocoHttpLoader } from './transloco-http-loader';
import { provideTranslocoMessageformat } from '@jsverse/transloco-messageformat';
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
import { providePrimeNG } from 'primeng/config';
import Lara from '@primeng/themes/lara';

// PrimeNG Theming - configured via ThemeService

@NgModule({ declarations: [
AppComponent
Expand All @@ -43,7 +45,16 @@
MessageService,

// PrimeNG theming handled by ThemeService initialization

provideAnimationsAsync(),
providePrimeNG({
theme: {
preset: Lara,
options: {
darkModeSelector: false,
cssLayer: false,

Check failure on line 54 in src/app/app.module.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected trailing comma
},

Check failure on line 55 in src/app/app.module.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected trailing comma
}
}),
Comment on lines +48 to +57
Copy link
Contributor

@coderabbitai coderabbitai bot Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix trailing comma ESLint violations.

The PrimeNG configuration is functionally correct, but there are trailing comma issues that need to be resolved.

Apply this diff to fix the linting errors:

         providePrimeNG({
             theme: {
                 preset: Lara,
                 options: {
                     darkModeSelector: false,
-                    cssLayer: false,
-                    },
-                }
+                    cssLayer: false
+                    }
+                }
         }),
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
provideAnimationsAsync(),
providePrimeNG({
theme: {
preset: Lara,
options: {
darkModeSelector: false,
cssLayer: false,
},
}
}),
provideAnimationsAsync(),
providePrimeNG({
theme: {
preset: Lara,
options: {
darkModeSelector: false,
cssLayer: false
}
}
}),
🧰 Tools
🪛 GitHub Check: lint

[failure] 55-55:
Unexpected trailing comma

[failure] 54-54:
Unexpected trailing comma

🪛 GitHub Actions: TypeScript Lint Check

[error] 54-54: ESLint: Unexpected trailing comma (comma-dangle)

🤖 Prompt for AI Agents 
In src/app/app.module.ts between lines 48 and 57, remove the trailing commas
after the last properties in the PrimeNG configuration object to fix ESLint
trailing comma violations. Ensure that no comma follows the last item in each
nested object or array within the providePrimeNG call.

provideTransloco({
config: {
availableLangs: ['en'],
Expand Down
8 changes: 4 additions & 4 deletions src/app/integrations/bamboo-hr/bamboo-hr.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { DialogModule } from 'primeng/dialog';
import { PasswordModule } from 'primeng/password';
import { InputTextModule } from 'primeng/inputtext';
import { ButtonModule } from 'primeng/button';
import { InputSwitchModule } from 'primeng/inputswitch';
import { DropdownModule } from 'primeng/dropdown';
import { ToggleSwitchModule } from 'primeng/toggleswitch';
import { SelectModule } from 'primeng/select';
import { MultiSelectModule } from 'primeng/multiselect';
import { SkeletonModule } from 'primeng/skeleton';
import { ProgressSpinnerModule } from 'primeng/progressspinner';
Expand All @@ -37,8 +37,8 @@ import { MessageService } from 'primeng/api';
ButtonModule,
FormsModule,
ReactiveFormsModule,
InputSwitchModule,
DropdownModule,
ToggleSwitchModule,
SelectModule,
MultiSelectModule,
SkeletonModule,
ProgressSpinnerModule,
Expand Down
4 changes: 2 additions & 2 deletions src/app/integrations/bamboo-hr/configuration/configuration.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DropdownFilterOptions } from 'primeng/dropdown';
import { SelectFilterOptions } from 'primeng/select';
import { brandingConfig } from 'src/app/branding/branding-config';
import { BambooHRConfiguration, BambooHRConfigurationPost, BambooHrModel, EmailOption } from 'src/app/core/models/bamboo-hr/bamboo-hr.model';
import { AppName, ClickEvent, TrackingApp } from 'src/app/core/models/enum/enum.model';
Expand Down Expand Up @@ -48,7 +48,7 @@ export class ConfigurationComponent implements OnInit {
private trackingService: TrackingService
) { }

clearSearch(options: DropdownFilterOptions): void {
clearSearch(options: SelectFilterOptions): void {
if (options.reset) {
options.reset();
}
Expand Down
Loading
Loading