Skip to content

Feature/431 angular upgrade #436

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 5 commits into from
Sep 15, 2025
Merged

Feature/431 angular upgrade #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f418735
fix: update @angular/core and @angular/cli to 19.2.14
TerranceKhumalo-absa Aug 15, 2025
9bc5182
fix: update @angular/core
TerranceKhumalo-absa Aug 22, 2025
a70f8fa
chore: upgrade Angular and related dependencies to version 20.x
TerranceKhumalo-absa Aug 29, 2025
5124e8b
align toggle with old style
TerranceKhumalo-absa Sep 13, 2025
d2ac8b1
feat: add new icons and update paginator links in tree table component
TerranceKhumalo-absa Sep 14, 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
232 changes: 134 additions & 98 deletions api-generator/api-generator.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cypress/e2e/cps-table.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path = require('path');
import * as path from 'path';

describe('cps-table page', () => {
describe('export to xlsx', () => {
Expand Down
29,867 changes: 14,333 additions & 15,534 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,32 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^19.1.4",
"@angular/common": "^19.1.4",
"@angular/compiler": "^19.1.4",
"@angular/core": "^19.1.4",
"@angular/forms": "^19.1.4",
"@angular/platform-browser": "^19.1.4",
"@angular/platform-browser-dynamic": "^19.1.4",
"@angular/platform-server": "^19.1.4",
"@angular/router": "^19.1.4",
"@angular/animations": "^20.2.1",
"@angular/common": "^20.2.1",
"@angular/compiler": "^20.2.1",
"@angular/core": "^20.2.1",
"@angular/forms": "^20.2.1",
"@angular/platform-browser": "^20.2.1",
"@angular/platform-browser-dynamic": "^20.2.1",
"@angular/platform-server": "^20.2.1",
"@angular/router": "^20.2.1",
"@e965/xlsx": "^0.20.3",
"@primeuix/styled": "^0.7.2",
"@primeuix/utils": "^0.6.1",
"@types/lodash-es": "^4.17.12",
"eslint-plugin-cypress": "^3.6.0",
"lodash-es": "^4.17.21",
"primeng": "^19.0.5",
"primeicons": "^7.0.0",
"primeng": "^20.0.1",
"rxjs": "~7.8.1",
"tslib": "^2.8.1",
"zone.js": "^0.15.0"
},
"devDependencies": {
"@angular-builders/jest": "^19.0.0",
"@angular-devkit/build-angular": "^19.1.5",
"@angular/cli": "~19.1.5",
"@angular/compiler-cli": "^19.1.4",
"@angular-builders/jest": "^20.0.0",
"@angular-devkit/build-angular": "^20.2.0",
"@angular/cli": "~20.2.0",
"@angular/compiler-cli": "^20.2.1",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.10",
Expand All @@ -57,10 +60,10 @@
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-standard": "^5.0.0",
"jest": "^29.7.0",
"ng-packagr": "^19.1.2",
"ng-packagr": "^20.0.0",
"pa11y-ci": "^4.0.0",
"prettier": "^3.4.2",
"typedoc": "^0.26.11",
"typescript": "^5.5.4"
"typedoc": "^0.28.10",
"typescript": "~5.9.2"
}
}
8 changes: 4 additions & 4 deletions projects/composition/src/app/api-data/cps-dialog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
},
{
"name": "config",
"type": "CpsDialogConfig<any>",
"type": "CpsDialogConfig",
"description": "CpsDialogConfig object."
}
],
"returnType": "CpsDialogRef<any>",
"returnType": "CpsDialogRef",
"description": "Opens a dialog with a dynamically loaded component."
},
{
"name": "openConfirmationDialog",
"parameters": [
{
"name": "config",
"type": "CpsDialogConfig<any>",
"type": "CpsDialogConfig",
"description": "CpsDialogConfig object."
}
],
"returnType": "CpsDialogRef<any>",
"returnType": "CpsDialogRef",
"description": "Opens a confirmation dialog."
},
{
Expand Down
2 changes: 1 addition & 1 deletion projects/composition/src/app/api-data/cps-file-upload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"name": "fileProcessingCallback",
"optional": true,
"readonly": false,
"type": "Function",
"type": "(file: File) => Observable<boolean>",
"default": "undefined",
"description": "Callback for uploaded file processing."
},
Expand Down
2 changes: 1 addition & 1 deletion projects/composition/src/app/api-data/cps-menu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"values": [
{
"name": "CpsMenuItem",
"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}",
"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}",
"description": "CpsMenuItem is used to define the items of the CpsMenuComponent."
},
{
Expand Down
8 changes: 4 additions & 4 deletions projects/composition/src/app/api-data/cps-table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "columns",
"optional": false,
"readonly": false,
"type": "Object[]",
"type": "{ [key: string]: any }[]",
"default": "[]",
"description": "An array of objects to represent dynamic columns."
},
Expand Down Expand Up @@ -544,7 +544,7 @@
"name": "initialColumns",
"optional": false,
"readonly": false,
"type": "Object[]",
"type": "{ [key: string]: any }[]",
"default": "[]",
"description": "Array of initial columns to show in the table. If not provided, all columns are initially visible."
},
Expand Down Expand Up @@ -620,7 +620,7 @@
"parameters": [
{
"name": "value",
"type": "Object"
"type": "{ row: any; index: number }"
}
],
"description": "Callback to invoke when edit-row button is clicked."
Expand Down Expand Up @@ -690,7 +690,7 @@
"parameters": [
{
"name": "value",
"type": "Object[]"
"type": "{ [key: string]: any }[]"
}
],
"description": "Callback to invoke on columns selection."
Expand Down
6 changes: 3 additions & 3 deletions projects/composition/src/app/api-data/cps-tree-table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "columns",
"optional": false,
"readonly": false,
"type": "Object[]",
"type": "{ [key: string]: any }[]",
"default": "[]",
"description": "An array of objects to represent dynamic columns."
},
Expand Down Expand Up @@ -512,7 +512,7 @@
"name": "initialColumns",
"optional": false,
"readonly": false,
"type": "Object[]",
"type": "{ [key: string]: any }[]",
"default": "[]",
"description": "Array of initial columns to show in the treetable. If not provided, all columns are initially visible."
},
Expand Down Expand Up @@ -686,7 +686,7 @@
"parameters": [
{
"name": "value",
"type": "Object[]"
"type": "{ [key: string]: any }[]"
}
],
"description": "Callback to invoke on selected columns."
Expand Down
14 changes: 7 additions & 7 deletions projects/composition/src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../variables.scss';
@use '../variables.scss' as vars;

.top-toolbar {
height: $top-tbar-height;
height: vars.$top-tbar-height;
background-color: white;
display: flex;
padding-left: 20px;
Expand All @@ -14,22 +14,22 @@
span {
margin-left: 16px;
font-size: 18px;
color: $color-calm;
color: vars.$color-calm;
}
}
.composition-container {
display: flex;
height: calc(100vh - $top-tbar-height);
height: calc(100vh - vars.$top-tbar-height);

.composition-body {
display: flex;
flex-direction: column;
width: 100%;
overflow-x: auto;
background-color: $composition-background;
background-color: vars.$composition-background;
.composition-body-toolbar {
height: $inner-tbar-height;
background: $color-calm;
height: vars.$inner-tbar-height;
background: vars.$color-calm;
display: flex;
align-items: center;
justify-content: space-between;
Expand Down
12 changes: 6 additions & 6 deletions projects/composition/src/app/components/navigation-sidebar/navigation-sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../variables.scss';
@use '../../../variables.scss' as vars;

:host {
$item-hover-background: var(--cps-color-highlight-hover);
Expand All @@ -10,14 +10,14 @@
.sidebar {
transition: width 0.2s;
background-color: white;
width: $sidebar-width;
height: calc(100vh - $top-tbar-height - 20px);
width: vars.$sidebar-width;
height: calc(100vh - vars.$top-tbar-height - 20px);
overflow: auto;
.list {
&-title {
margin: 0;
padding: 12px 0 12px 12px;
color: $color-text;
color: vars.$color-text;
}
&-item {
border-bottom: 1px solid $item-border-color;
Expand All @@ -26,7 +26,7 @@
align-items: center;
padding-left: 30px;
text-decoration: none;
color: $color-text;
color: vars.$color-text;
&:hover {
background: $item-hover-background;
}
Expand All @@ -37,7 +37,7 @@
._active {
color: white;
font-weight: bold;
background: $color-calm;
background: vars.$color-calm;
}
}

Expand Down
6 changes: 3 additions & 3 deletions projects/composition/src/app/pages/colors-page/colors-page/colors-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../../../variables.scss';
@use '../../../../variables.scss' as vars;

:host {
padding: 24px;
padding: 24px;
}

.search-input {
Expand All @@ -16,7 +16,7 @@
padding-bottom: 8px;
margin-bottom: 12px;
font-size: 28px;
color: $color-calm;
color: vars.$color-calm;
}
&-body {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions projects/composition/src/app/pages/icons-page/icons-page/icons-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../variables.scss';
@use '../../../../variables.scss' as vars;

.search-input {
margin-bottom: 24px;
Expand All @@ -17,6 +17,6 @@
cursor: pointer;
span {
margin-left: 16px;
color: $color-calm;
color: vars.$color-calm;
}
}
2 changes: 1 addition & 1 deletion projects/composition/src/app/pages/sidebar-menu-page/sidebar-menu-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../variables.scss';
@use '../../../variables.scss';
:host {
app-component-docs-viewer {
height: 100%;
Expand Down
6 changes: 3 additions & 3 deletions projects/composition/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import './variables.scss';
@import '../../cps-ui-kit/styles/styles.scss';
@use './variables.scss' as vars;
@use '../../cps-ui-kit/styles/styles.scss';

*,
*::before,
Expand All @@ -18,7 +18,7 @@ body {
.composition-page {
padding: 0 24px 24px 24px;
width: 100%;
height: calc(100% - $inner-tbar-height);
height: calc(100% - vars.$inner-tbar-height);
overflow: auto;
display: flex;
flex-direction: column;
Expand Down
6 changes: 6 additions & 0 deletions projects/cps-ui-kit/assets/icons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 0 additions & 38 deletions projects/cps-ui-kit/package-lock.json
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions projects/cps-ui-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"name": "cps-ui-kit",
"version": "19.4.0",
"version": "20.0.0",
"peerDependencies": {
"@angular/common": "^19.1.0",
"@angular/core": "^19.1.0",
"@angular/forms": "^19.1.0",
"@angular/common": "^20.2.1",
"@angular/core": "^20.2.1",
"@angular/forms": "^20.2.1",
"rxjs": "^7.8.1",
"zone.js": "^0.15.0",
"@types/lodash-es": "^4.17.12",
"lodash-es": "^4.17.21",
"primeng": "^19.0.5",
"primeng": "^20.0.1",
"@primeuix/utils": "^0.6.1",
"@primeuix/styled": "^0.7.2",
"@e965/xlsx": "^0.20.3"
},
"repository": {
Expand All @@ -19,7 +21,7 @@
"homepage": "https://github.com/AbsaOSS/cps-shared-ui",
"license": "Apache License 2.0",
"dependencies": {
"tslib": "^2.6.2"
"tslib": "^2.8.1"
},
"sideEffects": false
}
Loading
Loading