Skip to content

Commit b5e4d16

Browse files
committed
Angular 20 upgrade
1 parent 154d6bb commit b5e4d16

32 files changed

Lines changed: 3637 additions & 3950 deletions

File tree

web-app/admin/src/app/admin/admin-dashboard/admin-dashboard.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,14 @@ $top-panel-list-height: 236px;
367367
opacity: 1;
368368
cursor: pointer;
369369

370-
--mdc-text-button-label-text-color: #1e88e5;
371-
--mat-text-button-state-layer-color: #1e88e5;
370+
--mat-button-text-label-text-color: #1e88e5;
371+
--mat-button-text-state-layer-color: #1e88e5;
372372

373373
&:hover {
374374
background: rgba(30, 136, 229, 0.08);
375375
color: #1565c0 !important;
376376

377-
--mdc-text-button-label-text-color: #1565c0;
377+
--mat-button-text-label-text-color: #1565c0;
378378
}
379379

380380
&:focus-visible {
@@ -394,8 +394,8 @@ $top-panel-list-height: 236px;
394394
cursor: not-allowed;
395395
pointer-events: none;
396396

397-
--mdc-text-button-disabled-label-text-color: #b8b8b8;
398-
--mdc-text-button-label-text-color: #b8b8b8;
397+
--mat-button-text-disabled-label-text-color: #b8b8b8;
398+
--mat-button-text-label-text-color: #b8b8b8;
399399
}
400400

401401
@media (max-width: 480px),

web-app/admin/src/app/admin/admin-devices/dashboard/devices-dashboard.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ $font-xs: 12px;
162162
.button-group .mat-mdc-raised-button,
163163
.button-group .btn-primary,
164164
.button-group [mat-flat-button] {
165-
--mdc-filled-button-container-color: #1e88e5;
166-
--mdc-filled-button-label-text-color: #ffffff;
167-
--mat-filled-button-state-layer-color: #1e88e5;
165+
--mat-button-filled-container-color: #1e88e5;
166+
--mat-button-filled-label-text-color: #ffffff;
167+
--mat-button-filled-state-layer-color: #1e88e5;
168168
background-color: #1e88e5 !important;
169169
color: #ffffff !important;
170170
border: 1px solid #1e88e5 !important;

web-app/admin/src/app/admin/admin-event/admin-event-form/form-details/field-dialog/field-dialog.component.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ $font-xs: 12px;
88

99
::ng-deep .add-field-dialog {
1010
.mat-mdc-dialog-container {
11-
--mdc-dialog-container-color: #ffffff;
12-
--mdc-dialog-subhead-color: #1976d2;
13-
--mdc-text-button-label-text-color: #333333;
14-
--mat-text-button-state-layer-color: transparent;
11+
--mat-dialog-container-color: #ffffff;
12+
--mat-dialog-subhead-color: #1976d2;
13+
--mat-button-text-label-text-color: #333333;
14+
--mat-button-text-state-layer-color: transparent;
1515
padding: 0;
1616
}
1717

web-app/admin/src/app/admin/admin-event/admin-event-form/form-details/symbology-dialog/symbology-dialog.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $font-xs: 12px;
99
}
1010

1111
:host ::ng-deep .mat-mdc-dialog-container {
12-
--mdc-dialog-container-color: #ffffff;
12+
--mat-dialog-container-color: #ffffff;
1313
}
1414

1515
:host ::ng-deep .mdc-dialog__surface {

web-app/admin/src/app/admin/admin-event/dashboard/event-dashboard.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ $font-xs: 12px;
162162
.button-group .mat-mdc-raised-button,
163163
.button-group .btn-primary,
164164
.button-group [mat-flat-button] {
165-
--mdc-filled-button-container-color: #1e88e5;
166-
--mdc-filled-button-label-text-color: #ffffff;
167-
--mat-filled-button-state-layer-color: #1e88e5;
165+
--mat-button-filled-container-color: #1e88e5;
166+
--mat-button-filled-label-text-color: #ffffff;
167+
--mat-button-filled-state-layer-color: #1e88e5;
168168
background-color: #1e88e5 !important;
169169
color: #ffffff !important;
170170
border: 1px solid #1e88e5 !important;

web-app/admin/src/app/admin/admin-feeds/admin-feed/admin-feed-edit/admin-feed-edit-item-properties/admin-feed-edit-item-properties.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ export type SchemaFormValue = KeyedPropertySchemaFormValue[]
4444
})
4545
export class AdminFeedEditItemPropertiesComponent implements OnInit, OnChanges {
4646

47-
@Input() expanded: boolean;
47+
@Input() expanded: boolean = false;
4848
@Input() topicSchema: any = null;
4949
@Input() feedSchema: any = null;
5050
@Output() feedSchemaChanged = new EventEmitter<SimpleJsonSchema>();
51-
@Output() feedSchemaAccepted = new EventEmitter<SimpleJsonSchema>();
51+
@Output() feedSchemaAccepted = new EventEmitter<SimpleJsonSchema | null>();
5252
@Output() cancelled = new EventEmitter<void>();
5353
@Output() opened = new EventEmitter<void>();
5454

@@ -123,9 +123,9 @@ function syncPropertiesFormToSchemaProperties(form: UntypedFormArray, schema: Si
123123
const key = currentPropertyFormValue.key
124124
if (properties.hasOwnProperty(key)) {
125125
retainedFormKeys[key] = true
126-
const incomingPropertySchema = schema.properties[key]
126+
const incomingPropertySchema = properties[key]
127127
const incomingPropertyFormValue = formValueForPopertySchema(key, incomingPropertySchema)
128-
form.get([ pos, 'schema' ]).setValue(incomingPropertyFormValue.schema, { emitEvent: false })
128+
form.get([ pos, 'schema' ])?.setValue(incomingPropertyFormValue.schema, { emitEvent: false })
129129
}
130130
else {
131131
form.removeAt(pos)
@@ -161,7 +161,7 @@ function applyFormValueToSchema(schemaFormValue: SchemaFormValue, schema: Simple
161161
return null
162162
}
163163
schema = { ...schema }
164-
const properties = schema.properties = { ...schema.properties } || {}
164+
const properties = schema.properties = { ...schema.properties }
165165
for (const propertyFormValue of schemaFormValue) {
166166
const key = propertyFormValue.key
167167
const formPropertySchema = propertySchemaForFormValue(propertyFormValue)

web-app/admin/src/app/admin/admin-feeds/admin-feed/admin-feed.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,11 @@ mat-form-field {
333333
:host ::ng-deep .content__events .mat-mdc-list-item-meta.mat-mdc-icon-button,
334334
:host ::ng-deep .content__events .mat-mdc-icon-button {
335335
background: transparent !important;
336-
--mdc-icon-button-state-layer-size: 0px;
336+
--mat-icon-button-state-layer-size: 0px;
337+
--mat-icon-button-state-layer-color: transparent;
338+
--mat-icon-button-ripple-color: transparent;
337339
--mat-icon-button-state-layer-color: transparent;
338340
--mat-icon-button-ripple-color: transparent;
339-
--mdc-icon-button-state-layer-color: transparent;
340-
--mdc-icon-button-ripple-color: transparent;
341341
}
342342

343343
:host

web-app/admin/src/app/admin/admin-layers/dashboard/layer-dashboard.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ $font-xs: 12px;
162162
.button-group .mat-mdc-raised-button,
163163
.button-group .btn-primary,
164164
.button-group [mat-flat-button] {
165-
--mdc-filled-button-container-color: #1e88e5;
166-
--mdc-filled-button-label-text-color: #ffffff;
167-
--mat-filled-button-state-layer-color: #1e88e5;
165+
--mat-button-filled-container-color: #1e88e5;
166+
--mat-button-filled-label-text-color: #ffffff;
167+
--mat-button-filled-state-layer-color: #1e88e5;
168168
background-color: #1e88e5 !important;
169169
color: #ffffff !important;
170170
border: 1px solid #1e88e5 !important;

web-app/admin/src/app/admin/admin-teams/dashboard/team-dashboard.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ $font-xs: 12px;
161161
.button-group .btn-primary,
162162
.button-group .btn-primary.mat-mdc-unelevated-button,
163163
.button-group .btn-primary.mat-mdc-raised-button {
164-
--mdc-filled-button-container-color: #1e88e5;
165-
--mdc-filled-button-label-text-color: #ffffff;
166-
--mat-filled-button-state-layer-color: #1e88e5;
164+
--mat-button-filled-container-color: #1e88e5;
165+
--mat-button-filled-label-text-color: #ffffff;
166+
--mat-button-filled-state-layer-color: #1e88e5;
167167
background-color: #1e88e5 !important;
168168
color: #ffffff !important;
169169
border: 1px solid #1e88e5 !important;

web-app/admin/src/app/admin/admin-users/dashboard/user-dashboard.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ $font-xs: 12px;
161161
.button-group .btn-primary,
162162
.button-group .btn-primary.mat-mdc-unelevated-button,
163163
.button-group .btn-primary.mat-mdc-raised-button {
164-
--mdc-filled-button-container-color: #1e88e5;
165-
--mdc-filled-button-label-text-color: #ffffff;
166-
--mat-filled-button-state-layer-color: #1e88e5;
164+
--mat-button-filled-container-color: #1e88e5;
165+
--mat-button-filled-label-text-color: #ffffff;
166+
--mat-button-filled-state-layer-color: #1e88e5;
167167
background-color: #1e88e5 !important;
168168
color: #ffffff !important;
169169
border: 1px solid #1e88e5 !important;

0 commit comments

Comments
 (0)