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

Merge pull request #5881 from vvlladd28/bug/enity-table-persistent-page-link/reset

Browse Source 
[3.3.3] UI: Entity table fixed persistent page link in reset value and filter
This commit is contained in:
Igor Kulikov 2022-01-14 13:06:43 +02:00 committed by GitHub
commit b0a44f0daa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
View File

@ -59,7 +59,7 @@ import { AddEntityDialogData, EntityAction } from '@home/models/entity/entity-co
import { calculateIntervalStartEndTime, HistoryWindowType, Timewindow } from '@shared/models/time/time.models'; import { calculateIntervalStartEndTime, HistoryWindowType, Timewindow } from '@shared/models/time/time.models';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { TbAnchorComponent } from '@shared/components/tb-anchor.component'; import { TbAnchorComponent } from '@shared/components/tb-anchor.component';
import { isDefined, isEmptyStr, isUndefined } from '@core/utils'; import { isDefined, isEmptyStr, isEqual, isUndefined } from '@core/utils';
import { HasUUID } from '@shared/models/id/has-uuid'; import { HasUUID } from '@shared/models/id/has-uuid';
import { ResizeObserver } from '@juggle/resize-observer'; import { ResizeObserver } from '@juggle/resize-observer';
import { hidePageSizePixelValue } from '@shared/models/constants'; import { hidePageSizePixelValue } from '@shared/models/constants';
@ -541,7 +541,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
this.sort.active = sortable.id; this.sort.active = sortable.id;
this.sort.direction = this.entitiesTableConfig.defaultSortOrder.direction === Direction.ASC ? 'asc' : 'desc'; this.sort.direction = this.entitiesTableConfig.defaultSortOrder.direction === Direction.ASC ? 'asc' : 'desc';
if (update) { if (update) {
this.updatedRouterParamsAndData({}, 'preserve'); this.updatedRouterParamsAndData({}, '');
} }
} }
@ -666,6 +666,9 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
queryParams, queryParams,
queryParamsHandling queryParamsHandling
}); });
if (queryParamsHandling === '' && isEqual(this.route.snapshot.queryParams, queryParams)) {
this.updateData();
}
} else { } else {
this.updateData(); this.updateData();
} }