Skip to content

Angular Upgrade v20 #7601

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 5 commits into
base: main
Choose a base branch
from
Open

Angular Upgrade v20 #7601

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
b9d41a1
Initial Commit
KhizerRehan Nov 11, 2025
27f5ee1
fix buffer issue
KhizerRehan Nov 11, 2025
0de8b78
changing the prefix from --mdc-* to --mat-*
KhizerRehan Nov 12, 2025
d4e7363
changed component names and word order in variable names
KhizerRehan Nov 12, 2025
4536d29
update lock file
KhizerRehan Nov 20, 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
6,771 changes: 4,220 additions & 2,551 deletions modules/web/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 25 additions & 23 deletions modules/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "kubermatic-dashboard",
"description": "Kubermatic Dashboard",
"version": "2.29.0",
"version": "2.28.0",
Copy link
Contributor Author

@KhizerRehan KhizerRehan Nov 24, 2025

Choose a reason for hiding this comment

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

Needs to be fixed (caused by auto merge conflicts)

"type": "module",
"license": "proprietary",
"repository": "https://github.com/kubermatic/dashboard",
Expand Down Expand Up @@ -57,31 +57,31 @@
]
},
"dependencies": {
"@angular/animations": "19.2.11",
"@angular/cdk": "19.2.16",
"@angular/common": "19.2.11",
"@angular/compiler": "19.2.11",
"@angular/core": "19.2.11",
"@angular/animations": "20.3.1",
"@angular/cdk": "20.2.12",
"@angular/common": "20.3.1",
"@angular/compiler": "20.3.1",
"@angular/core": "20.3.1",
"@angular/flex-layout": "15.0.0-beta.42",
"@angular/forms": "19.2.11",
"@angular/localize": "19.2.11",
"@angular/material": "19.2.16",
"@angular/platform-browser": "19.2.11",
"@angular/platform-browser-dynamic": "19.2.11",
"@angular/router": "19.2.11",
"@angular/forms": "20.3.1",
"@angular/localize": "20.3.1",
"@angular/material": "20.2.12",
"@angular/platform-browser": "20.3.1",
"@angular/platform-browser-dynamic": "20.3.1",
"@angular/router": "20.3.1",
"@aws-sdk/client-s3": "^3.808.0",
"@fontsource/inconsolata": "5.2.8",
"@fontsource/inconsolata": "5.2.5",
"@fontsource/roboto": "5.1.1",
"@fontsource/roboto-mono": "5.2.5",
"@fontsource/ubuntu": "5.1.1",
"@swimlane/ngx-charts": "21.1.3",
"@swimlane/ngx-charts": "^23.0.1",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"browserslist": "^4.24.4",
"buffer": "6.0.3",
"core-js": "3.41.0",
"country-code-lookup": "0.1.3",
"cron-validator": "1.4.0",
"cron-validator": "1.3.1",
"flag-icons": "7.3.2",
"git-describe": "4.1.1",
"jquery": "3.7.1",
Expand All @@ -92,7 +92,7 @@
"moment": "2.30.1",
"monaco-editor": "0.52.2",
"ngx-clipboard": "16.0.0",
"ngx-cookie-service": "19.1.0",
"ngx-cookie-service": "20.1.0",
"ngx-monaco-editor-v2": "^20.3.0",
"react": "^19.1.0",
"react-dom": "^18.3.1",
Expand All @@ -103,21 +103,21 @@
"zone.js": "0.15.0"
},
"devDependencies": {
"@angular/build": "^19.2.13",
"@angular/cli": "19.2.13",
"@angular/compiler-cli": "19.2.11",
"@angular/build": "^20.3.2",
"@angular/cli": "20.3.2",
"@angular/compiler-cli": "20.3.1",
"@jest/globals": "29.7.0",
"@types/jest": "29.5.14",
"@types/js-yaml": "4.0.9",
"@types/lodash": "4.17.20",
"@types/lodash": "4.17.16",
"@types/node": "22.13.4",
"@types/react": "^19.1.8",
"@types/react-dom": "^18.3.5",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "8.32.1",
"browserlist": "1.0.1",
"btoa": "1.2.1",
"concurrently": "9.2.1",
"concurrently": "9.1.2",
"cypress": "14.3.3",
"cypress-fail-fast": "7.1.0",
"del": "8.0.0",
Expand All @@ -129,7 +129,8 @@
"husky": "9.1.7",
"jest": "29.7.0",
"jest-canvas-mock": "^2.5.2",
"jest-preset-angular": "14.5.3",
"jest-environment-jsdom": "^30.1.2",
"jest-preset-angular": "^15.0.1",
"js-beautify": "1.15.4",
"json-server": "0.17.4",
"license-check-and-add": "4.0.5",
Expand All @@ -148,4 +149,5 @@
"tslib": "2.8.1",
"typescript": "5.8.2"
}
}
}

2 changes: 1 addition & 1 deletion modules/web/src/app/cluster/details/cluster/cni-version/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.cni-version-container {
.cni-version {
.mdc-notched-outline {
--mdc-outlined-text-field-disabled-outline-color: #{map.get($colors, divider)};
--mat-form-field-outlined-disabled-outline-color: #{map.get($colors, divider)};
}

.cni-version-type {
Expand Down
2 changes: 1 addition & 1 deletion modules/web/src/app/cluster/details/shared/version-picker/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.version-picker-container {
.km-version-picker {
.mat-form-field-outline {
--mdc-outlined-text-field-disabled-outline-color: #{map.get($colors, divider)};
--mat-form-field-outlined-disabled-outline-color: #{map.get($colors, divider)};
}

.version-picker-type {
Expand Down
8 changes: 4 additions & 4 deletions modules/web/src/app/dynamic/enterprise/quotas/quota-widget/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
padding-top: 9px;

.property-usage-bar {
--mdc-linear-progress-track-height: 5px;
--mdc-linear-progress-active-indicator-height: 5px;
--mat-progress-bar-track-height: 5px;
--mat-progress-bar-active-indicator-height: 5px;

border-radius: variables.$border-radius;
height: 5px;
Expand Down Expand Up @@ -134,8 +134,8 @@
width: 100%;

.property-usage-bar {
--mdc-linear-progress-track-height: 6px;
--mdc-linear-progress-active-indicator-height: 6px;
--mat-progress-bar-track-height: 6px;
--mat-progress-bar-active-indicator-height: 6px;

border-radius: variables.$border-radius;
height: 6px;
Expand Down
2 changes: 1 addition & 1 deletion modules/web/src/app/shared/components/property-usage/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.property-usage-bar {
@include mixins.size(280px, 6px, true);

--mdc-linear-progress-track-height: 6px;
--mat-progress-bar-track-height: 6px;

border-radius: variables.$border-radius;
margin: 6px 0;
Expand Down
14 changes: 7 additions & 7 deletions modules/web/src/assets/css/material/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ button {
&.mat-mdc-raised-button,
&.mat-mdc-icon-button {
--mat-icon-button-state-layer-color: none;
--mdc-icon-button-state-layer-size: none;
--mat-icon-button-state-layer-size: none;

font-size: variables.$font-size-subhead;
height: 45px;
Expand Down Expand Up @@ -564,7 +564,7 @@ button {

&.mat-mdc-icon-button {
--mat-icon-button-state-layer-color: none;
--mdc-icon-button-state-layer-size: 45px !important;
--mat-icon-button-state-layer-size: 45px !important;

bottom: 2px;
}
Expand Down Expand Up @@ -645,9 +645,9 @@ button {

/* stylelint-disable selector-class-pattern */
.mat-mdc-slide-toggle {
--mdc-switch-track-width: 50px;
--mdc-switch-track-height: 24px;
--mdc-switch-track-shape: 50px;
--mat-slide-toggle-track-width: 50px;
--mat-slide-toggle-track-height: 24px;
--mat-slide-toggle-track-shape: 50px;

.mdc-switch {
.mdc-switch__handle-track {
Expand All @@ -671,8 +671,8 @@ button {
.mat-mdc-chip {
border-radius: variables.$border-radius;

--mdc-chip-container-height: 24px !important;
--mdc-chip-container-shape-radius: 3px !important;
--mat-chip-container-height: 24px !important;
--mat-chip-container-shape-radius: 3px !important;

.mdc-evolution-chip__action {
box-shadow: none !important;
Expand Down
93 changes: 46 additions & 47 deletions modules/web/src/assets/css/material/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

// Dialogs.
.mat-mdc-dialog-container {
--mdc-dialog-supporting-text-color: #{map.get($colors, text)};
--mat-dialog-supporting-text-color: #{map.get($colors, text)};

color: map.get($colors, text);
}
Expand Down Expand Up @@ -131,9 +131,9 @@
&.mat-mdc-form-field {
color: map.get($colors, hint-color);

--mdc-outlined-text-field-outline-color: #{map.get($colors, divider)};
--mdc-outlined-text-field-disabled-outline-color: #{map.get($colors, divider-disabled)};
--mdc-outlined-text-field-hover-outline-color: #{map.get($colors, secondary-dark)};
--mat-form-field-outlined-outline-color: #{map.get($colors, divider)};
--mat-form-field-outlined-disabled-outline-color: #{map.get($colors, divider-disabled)};
--mat-form-field-outlined-hover-outline-color: #{map.get($colors, secondary-dark)};
}

}
Expand All @@ -155,8 +155,8 @@
.mat-mdc-button,
.mat-mdc-unelevated-button,
.mat-mdc-raised-button {
--mdc-filled-button-container-color: #{map.get($colors, primary)};
--mdc-filled-button-label-text-color: #fff;
--mat-button-filled-container-color: #{map.get($colors, primary)};
--mat-button-filled-label-text-color: #fff;

&:hover:not([disabled]) {
background-color: map.get($colors, primary-hover);
Expand Down Expand Up @@ -265,43 +265,42 @@

.mat-mdc-radio-button {
&.mat-accent {
--mdc-radio-selected-icon-color: #{map.get($colors, primary)};
--mat-radio-checked-ripple-color: none;
--mdc-radio-selected-pressed-icon-color: var(--mdc-radio-selected-icon-color);
--mdc-radio-selected-hover-icon-color: var(--mdc-radio-selected-icon-color);
--mdc-radio-selected-focus-icon-color: var(--mdc-radio-selected-icon-color);
--mdc-radio-unselected-icon-color: #{map.get($colors, text-secondary)};
--mat-radio-selected-icon-color: #{map.get($colors, primary)};
--mat-radio-selected-pressed-icon-color: var(--mat-radio-selected-icon-color);
--mat-radio-selected-hover-icon-color: var(--mat-radio-selected-icon-color);
--mat-radio-selected-focus-icon-color: var(--mat-radio-selected-icon-color);
--mat-radio-unselected-icon-color: #{map.get($colors, text-secondary)};
}
}

.mat-mdc-slide-toggle {
&.mat-accent,
button {
// track color
--mdc-switch-selected-track-color: #{map.get($colors, primary)};
--mdc-switch-selected-focus-track-color: var(--mdc-switch-selected-track-color);
--mdc-switch-selected-hover-track-color: var(--mdc-switch-selected-track-color);
--mdc-switch-selected-pressed-track-color: var(--mdc-switch-selected-track-color);
--mdc-switch-unselected-track-color: #{map.get($colors, divider)};
--mdc-switch-unselected-focus-track-color: var(--mdc-switch-unselected-track-color);
--mdc-switch-unselected-hover-track-color: var(--mdc-switch-unselected-track-color);
--mdc-switch-unselected-pressed-track-color: var(--mdc-switch-unselected-track-color);
--mat-slide-toggle-selected-track-color: #{map.get($colors, primary)};
--mat-slide-toggle-selected-focus-track-color: var(--mat-slide-toggle-selected-track-color);
--mat-slide-toggle-selected-hover-track-color: var(--mat-slide-toggle-selected-track-color);
--mat-slide-toggle-selected-pressed-track-color: var(--mat-slide-toggle-selected-track-color);
--mat-slide-toggle-unselected-track-color: #{map.get($colors, divider)};
--mat-slide-toggle-unselected-focus-track-color: var(--mat-slide-toggle-unselected-track-color);
--mat-slide-toggle-unselected-hover-track-color: var(--mat-slide-toggle-unselected-track-color);
--mat-slide-toggle-unselected-pressed-track-color: var(--mat-slide-toggle-unselected-track-color);

// handle color
--mdc-switch-handle-surface-color: #{map.get($colors, slide-toggle-handle-color)};
--mdc-switch-selected-handle-color: #fafafa;
--mdc-switch-selected-focus-handle-color: var(--mdc-switch-selected-handle-color);
--mdc-switch-selected-hover-handle-color: var(--mdc-switch-selected-handle-color);
--mdc-switch-selected-pressed-handle-color: var(--mdc-switch-selected-handle-color);
--mdc-switch-unselected-handle-color: #{map.get($colors, slide-toggle-handle-color)};
--mdc-switch-unselected-focus-handle-color: var(--mdc-switch-unselected-handle-color);
--mdc-switch-unselected-hover-handle-color: var(--mdc-switch-unselected-handle-color);
--mdc-switch-unselected-pressed-handle-color: var(--mdc-switch-unselected-handle-color);
--mat-slide-toggle-handle-surface-color: #{map.get($colors, slide-toggle-handle-color)};
--mat-slide-toggle-selected-handle-color: #fafafa;
--mat-slide-toggle-selected-focus-handle-color: var(--mat-slide-toggle-selected-handle-color);
--mat-slide-toggle-selected-hover-handle-color: var(--mat-slide-toggle-selected-handle-color);
--mat-slide-toggle-selected-pressed-handle-color: var(--mat-slide-toggle-selected-handle-color);
--mat-slide-toggle-unselected-handle-color: #{map.get($colors, slide-toggle-handle-color)};
--mat-slide-toggle-unselected-focus-handle-color: var(--mat-slide-toggle-unselected-handle-color);
--mat-slide-toggle-unselected-hover-handle-color: var(--mat-slide-toggle-unselected-handle-color);
--mat-slide-toggle-unselected-pressed-handle-color: var(--mat-slide-toggle-unselected-handle-color);

// ripple color
--mdc-switch-selected-focus-state-layer-color: var(--mdc-switch-selected-track-color);
--mdc-switch-selected-hover-state-layer-color: var(--mdc-switch-selected-track-color);
--mdc-switch-selected-pressed-state-layer-color: var(--mdc-switch-selected-track-color);
--mat-slide-toggle-selected-focus-state-layer-color: var(--mat-slide-toggle-selected-track-color);
--mat-slide-toggle-selected-hover-state-layer-color: var(--mat-slide-toggle-selected-track-color);
--mat-slide-toggle-selected-pressed-state-layer-color: var(--mat-slide-toggle-selected-track-color);
}
}

Expand All @@ -321,22 +320,22 @@
}

.mdc-checkbox {
--mdc-checkbox-selected-icon-color: #{map.get($colors, primary)};
--mdc-checkbox-selected-hover-icon-color: var(--mdc-checkbox-selected-icon-color);
--mdc-checkbox-selected-focus-icon-color: var(--mdc-checkbox-selected-icon-color);
--mdc-checkbox-selected-pressed-icon-color: var(--mdc-checkbox-selected-icon-color);
--mdc-checkbox-selected-focus-state-layer-color: var(--mdc-checkbox-selected-icon-color);
--mdc-checkbox-selected-pressed-state-layer-color: var(--mdc-checkbox-selected-icon-color);
--mdc-checkbox-selected-focus-state-layer-opacity: 0;
--mdc-checkbox-unselected-focus-state-layer-opacity: 0;
--mat-checkbox-selected-icon-color: #{map.get($colors, primary)};
--mat-checkbox-selected-hover-icon-color: var(--mat-checkbox-selected-icon-color);
--mat-checkbox-selected-focus-icon-color: var(--mat-checkbox-selected-icon-color);
--mat-checkbox-selected-pressed-icon-color: var(--mat-checkbox-selected-icon-color);
--mat-checkbox-selected-focus-state-layer-color: var(--mat-checkbox-selected-icon-color);
--mat-checkbox-selected-pressed-state-layer-color: var(--mat-checkbox-selected-icon-color);
--mat-checkbox-selected-focus-state-layer-opacity: 0;
--mat-checkbox-unselected-focus-state-layer-opacity: 0;
}

// Chips.
.mat-mdc-chip {
--mdc-chip-elevated-container-color: transparent;
--mdc-chip-label-text-color: #{map.get($colors, text)};
--mdc-chip-focus-state-layer-color: none;
--mdc-chip-hover-state-layer-color: none;
--mat-chip-elevated-container-color: transparent;
--mat-chip-label-text-color: #{map.get($colors, text)};
--mat-chip-focus-state-layer-color: none;
--mat-chip-hover-state-layer-color: none;

.mat-mdc-chip-remove {
background-color: map.get($colors, text);
Expand Down Expand Up @@ -365,7 +364,7 @@

// Tooltips.
.mat-mdc-tooltip {
--mdc-plain-tooltip-container-color: #{map.get($colors, tooltip-background)};
--mat-plain-tooltip-container-color: #{map.get($colors, tooltip-background)};
}

// Spinners.
Expand All @@ -383,7 +382,7 @@

// Snackbar
.mat-mdc-snack-bar-container {
--mdc-snackbar-container-color: #{map.get($colors, option-background)};
--mat-snackbar-container-color: #{map.get($colors, option-background)};
}

// Progress bar
Expand All @@ -407,6 +406,6 @@
}

.mat-mdc-progress-bar.mat-accent {
--mdc-linear-progress-active-indicator-color: #{map.get($colors, indicator-orange)};
--mat-progress-bar-active-indicator-color: #{map.get($colors, indicator-orange)};
}
}
12 changes: 7 additions & 5 deletions modules/web/src/assets/themes/dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,13 @@ $colors-dark-palette: map.merge(
500: #0072b0,
)
);
$theme-dark: mat.m2-define-dark-theme(
mat.m2-define-palette($colors-dark-palette),
mat.m2-define-palette(mat.$m2-light-blue-palette),
mat.m2-define-palette(mat.$m2-pink-palette)
);
$theme-dark: mat.m2-define-dark-theme((
color: (
primary: mat.m2-define-palette($colors-dark-palette),
accent: mat.m2-define-palette(mat.$m2-light-blue-palette),
warn: mat.m2-define-palette(mat.$m2-pink-palette)
)
));
$background: map.get($theme-dark, background);
$background: map.merge(
$background,
Expand Down
Loading