Skip to content

Commit a70f8fa

Browse files
TerranceKhumalo-absalukasmatta
authored andcommitted
chore: upgrade Angular and related dependencies to version 20.x
- Updated Angular packages to version 20.2.1 in package.json. - Updated PrimeNG to version 20.0.1 and added new PrimeUI dependencies. - Updated TypeScript to version 5.9.2 and tslib to version 2.8.1. - Removed outdated package-lock.json for cps-ui-kit. - Updated cps-ui-kit package.json to version 20.0.0 and aligned peer dependencies with Angular 20.x. - Refactored various JSON API data files to remove generic types and improve type definitions. - Updated SCSS files to use the new `@use` syntax for importing variables. - Made minor adjustments to component templates and styles for better compatibility with updated libraries. - Adjusted TypeScript configuration to use bundler module resolution.
1 parent 9bc5182 commit a70f8fa

File tree

23 files changed

+14544
-15828
lines changed

23 files changed

+14544
-15828
lines changed

api-generator/api-generator.js

Lines changed: 134 additions & 98 deletions
Large diffs are not rendered by default.

cypress/e2e/cps-table.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import path = require('path');
1+
import * as path from 'path';
22

33
describe('cps-table page', () => {
44
describe('export to xlsx', () => {

package-lock.json

Lines changed: 14312 additions & 15590 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,32 @@
1818
},
1919
"private": true,
2020
"dependencies": {
21-
"@angular/animations": "^19.1.4",
22-
"@angular/common": "^19.1.4",
23-
"@angular/compiler": "^19.1.4",
24-
"@angular/core": "^19.2.14",
25-
"@angular/forms": "^19.1.4",
26-
"@angular/platform-browser": "^19.1.4",
27-
"@angular/platform-browser-dynamic": "^19.1.4",
28-
"@angular/platform-server": "^19.1.4",
29-
"@angular/router": "^19.1.4",
21+
"@angular/animations": "^20.2.1",
22+
"@angular/common": "^20.2.1",
23+
"@angular/compiler": "^20.2.1",
24+
"@angular/core": "^20.2.1",
25+
"@angular/forms": "^20.2.1",
26+
"@angular/platform-browser": "^20.2.1",
27+
"@angular/platform-browser-dynamic": "^20.2.1",
28+
"@angular/platform-server": "^20.2.1",
29+
"@angular/router": "^20.2.1",
3030
"@e965/xlsx": "^0.20.3",
31+
"@primeuix/styled": "^0.7.2",
32+
"@primeuix/utils": "^0.6.1",
3133
"@types/lodash-es": "^4.17.12",
3234
"eslint-plugin-cypress": "^3.6.0",
3335
"lodash-es": "^4.17.21",
34-
"primeng": "^19.0.5",
36+
"primeicons": "^7.0.0",
37+
"primeng": "^20.0.1",
3538
"rxjs": "~7.8.1",
3639
"tslib": "^2.8.1",
3740
"zone.js": "^0.15.0"
3841
},
3942
"devDependencies": {
40-
"@angular-builders/jest": "^19.0.0",
41-
"@angular-devkit/build-angular": "^19.1.5",
42-
"@angular/cli": "~19.1.9",
43-
"@angular/compiler-cli": "^19.1.4",
43+
"@angular-builders/jest": "^20.0.0",
44+
"@angular-devkit/build-angular": "^20.2.0",
45+
"@angular/cli": "~20.2.0",
46+
"@angular/compiler-cli": "^20.2.1",
4447
"@types/express": "^4.17.21",
4548
"@types/jest": "^29.5.14",
4649
"@types/node": "^22.10.10",
@@ -57,10 +60,10 @@
5760
"eslint-plugin-promise": "^6.6.0",
5861
"eslint-plugin-standard": "^5.0.0",
5962
"jest": "^29.7.0",
60-
"ng-packagr": "^19.1.2",
63+
"ng-packagr": "^20.0.0",
6164
"pa11y-ci": "^4.0.0",
6265
"prettier": "^3.4.2",
63-
"typedoc": "^0.26.11",
64-
"typescript": "^5.5.4"
66+
"typedoc": "^0.28.10",
67+
"typescript": "~5.9.2"
6568
}
6669
}

projects/composition/src/app/api-data/cps-dialog.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
},
1616
{
1717
"name": "config",
18-
"type": "CpsDialogConfig<any>",
18+
"type": "CpsDialogConfig",
1919
"description": "CpsDialogConfig object."
2020
}
2121
],
22-
"returnType": "CpsDialogRef<any>",
22+
"returnType": "CpsDialogRef",
2323
"description": "Opens a dialog with a dynamically loaded component."
2424
},
2525
{
2626
"name": "openConfirmationDialog",
2727
"parameters": [
2828
{
2929
"name": "config",
30-
"type": "CpsDialogConfig<any>",
30+
"type": "CpsDialogConfig",
3131
"description": "CpsDialogConfig object."
3232
}
3333
],
34-
"returnType": "CpsDialogRef<any>",
34+
"returnType": "CpsDialogRef",
3535
"description": "Opens a confirmation dialog."
3636
},
3737
{

projects/composition/src/app/api-data/cps-file-upload.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"name": "fileProcessingCallback",
4242
"optional": true,
4343
"readonly": false,
44-
"type": "Function",
44+
"type": "(file: File) => Observable<boolean>",
4545
"default": "undefined",
4646
"description": "Callback for uploaded file processing."
4747
},

projects/composition/src/app/api-data/cps-menu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"values": [
132132
{
133133
"name": "CpsMenuItem",
134-
"value": "{\n \"title\": \"string\",\n \"action\": \"Function\",\n \"icon\": \"string\",\n \"desc\": \"string\",\n \"url\": \"string\",\n \"target\": \"string\",\n \"disabled\": \"boolean\",\n \"loading\": \"boolean\"\n}",
134+
"value": "{\n \"title\": \"string\",\n \"action\": \"(event?: any) => void\",\n \"icon\": \"string\",\n \"desc\": \"string\",\n \"url\": \"string\",\n \"target\": \"string\",\n \"disabled\": \"boolean\",\n \"loading\": \"boolean\"\n}",
135135
"description": "CpsMenuItem is used to define the items of the CpsMenuComponent."
136136
},
137137
{

projects/composition/src/app/api-data/cps-table.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"name": "columns",
1010
"optional": false,
1111
"readonly": false,
12-
"type": "Object[]",
12+
"type": "{ [key: string]: any }[]",
1313
"default": "[]",
1414
"description": "An array of objects to represent dynamic columns."
1515
},
@@ -544,7 +544,7 @@
544544
"name": "initialColumns",
545545
"optional": false,
546546
"readonly": false,
547-
"type": "Object[]",
547+
"type": "{ [key: string]: any }[]",
548548
"default": "[]",
549549
"description": "Array of initial columns to show in the table. If not provided, all columns are initially visible."
550550
},
@@ -620,7 +620,7 @@
620620
"parameters": [
621621
{
622622
"name": "value",
623-
"type": "Object"
623+
"type": "{ row: any; index: number }"
624624
}
625625
],
626626
"description": "Callback to invoke when edit-row button is clicked."
@@ -690,7 +690,7 @@
690690
"parameters": [
691691
{
692692
"name": "value",
693-
"type": "Object[]"
693+
"type": "{ [key: string]: any }[]"
694694
}
695695
],
696696
"description": "Callback to invoke on columns selection."

projects/composition/src/app/api-data/cps-tree-table.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"name": "columns",
1010
"optional": false,
1111
"readonly": false,
12-
"type": "Object[]",
12+
"type": "{ [key: string]: any }[]",
1313
"default": "[]",
1414
"description": "An array of objects to represent dynamic columns."
1515
},
@@ -512,7 +512,7 @@
512512
"name": "initialColumns",
513513
"optional": false,
514514
"readonly": false,
515-
"type": "Object[]",
515+
"type": "{ [key: string]: any }[]",
516516
"default": "[]",
517517
"description": "Array of initial columns to show in the treetable. If not provided, all columns are initially visible."
518518
},
@@ -686,7 +686,7 @@
686686
"parameters": [
687687
{
688688
"name": "value",
689-
"type": "Object[]"
689+
"type": "{ [key: string]: any }[]"
690690
}
691691
],
692692
"description": "Callback to invoke on selected columns."

projects/composition/src/app/app.component.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@import '../variables.scss';
1+
@use '../variables.scss' as vars;
22

33
.top-toolbar {
4-
height: $top-tbar-height;
4+
height: vars.$top-tbar-height;
55
background-color: white;
66
display: flex;
77
padding-left: 20px;
@@ -14,22 +14,22 @@
1414
span {
1515
margin-left: 16px;
1616
font-size: 18px;
17-
color: $color-calm;
17+
color: vars.$color-calm;
1818
}
1919
}
2020
.composition-container {
2121
display: flex;
22-
height: calc(100vh - $top-tbar-height);
22+
height: calc(100vh - vars.$top-tbar-height);
2323

2424
.composition-body {
2525
display: flex;
2626
flex-direction: column;
2727
width: 100%;
2828
overflow-x: auto;
29-
background-color: $composition-background;
29+
background-color: vars.$composition-background;
3030
.composition-body-toolbar {
31-
height: $inner-tbar-height;
32-
background: $color-calm;
31+
height: vars.$inner-tbar-height;
32+
background: vars.$color-calm;
3333
display: flex;
3434
align-items: center;
3535
justify-content: space-between;

0 commit comments

Comments
 (0)