dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8740 from ArtemDzhereleiko/AD/bug-fix/oauth2-trackby

Browse Source 
Fixed OAuth2 deletion domains/mobile applications/providers settings
This commit is contained in:
Igor Kulikov 2023-06-28 13:04:27 +03:00 committed by GitHub
commit af1bc4f26d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
View File

@ -37,7 +37,7 @@
<ng-container formArrayName="oauth2ParamsInfos"> <ng-container formArrayName="oauth2ParamsInfos">
<div class="container"> <div class="container">
<mat-accordion multi> <mat-accordion multi>
<ng-container *ngFor="let oauth2ParamsInfo of oauth2ParamsInfos.controls; let i = index; trackBy: trackByParams"> <ng-container *ngFor="let oauth2ParamsInfo of oauth2ParamsInfos.controls; let i = index; trackBy: trackByItem">
<mat-expansion-panel [formGroupName]="i"> <mat-expansion-panel [formGroupName]="i">
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title fxLayoutAlign="start center"> <mat-panel-title fxLayoutAlign="start center">
@ -59,7 +59,7 @@
<mat-tab label="{{ 'admin.oauth2.domains' | translate }}"> <mat-tab label="{{ 'admin.oauth2.domains' | translate }}">
<ng-container formArrayName="domainInfos"> <ng-container formArrayName="domainInfos">
<div style="padding-top: 16px;"></div> <div style="padding-top: 16px;"></div>
<section *ngFor="let domainInfo of domainInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByParams" <section *ngFor="let domainInfo of domainInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByItem"
class="domains-list"> class="domains-list">
<div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px"> <div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px">
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px"> <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px">
@ -146,7 +146,7 @@
<span fxLayoutAlign="center center" <span fxLayoutAlign="center center"
class="tb-prompt" translate>admin.oauth2.no-mobile-apps</span> class="tb-prompt" translate>admin.oauth2.no-mobile-apps</span>
</div> </div>
<section *ngFor="let mobileInfo of mobileInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByParams" <section *ngFor="let mobileInfo of mobileInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByItem"
class="apps-list"> class="apps-list">
<div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px"> <div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px">
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px"> <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px">
@ -203,7 +203,7 @@
<div class="mat-h3" translate>admin.oauth2.providers</div> <div class="mat-h3" translate>admin.oauth2.providers</div>
<ng-container formArrayName="clientRegistrations"> <ng-container formArrayName="clientRegistrations">
<div class="container"> <div class="container">
<mat-expansion-panel *ngFor="let registration of clientRegistrations(oauth2ParamsInfo).controls; let j = index; trackBy: trackByParams" <mat-expansion-panel *ngFor="let registration of clientRegistrations(oauth2ParamsInfo).controls; let j = index; trackBy: trackByItem"
class="registration-card mat-elevation-z0"> class="registration-card mat-elevation-z0">
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title fxLayoutAlign="start center"> <mat-panel-title fxLayoutAlign="start center">

4
ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
View File

@ -570,4 +570,8 @@ export class OAuth2SettingsComponent extends PageComponent implements OnInit, Ha
trackByParams(index: number): number { trackByParams(index: number): number {
return index; return index;
} }
trackByItem(i, item) {
return item;
}
} }