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

Revert "Solved issue of a re-init Widget-Component service and widgets-info Cache."

Browse Source 
This reverts commit 2b0fa4c4
This commit is contained in:
Igor Kulikov 2022-12-28 14:35:29 +02:00
parent 4c3154da4b
commit 2aec503830
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View File

@ -31,7 +31,6 @@ import {
Optional, Optional,
Renderer2, Renderer2,
StaticProvider, StaticProvider,
Type,
ViewChild, ViewChild,
ViewContainerRef, ViewContainerRef,
ViewEncapsulation ViewEncapsulation
@ -152,7 +151,6 @@ import { tap } from 'rxjs/operators';
import { LayoutFixedSize, LayoutWidthType } from '@home/components/dashboard-page/layout/layout.models'; import { LayoutFixedSize, LayoutWidthType } from '@home/components/dashboard-page/layout/layout.models';
import { TbPopoverComponent } from '@shared/components/popover.component'; import { TbPopoverComponent } from '@shared/components/popover.component';
import { ResizeObserver } from '@juggle/resize-observer'; import { ResizeObserver } from '@juggle/resize-observer';
import { HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
// @dynamic // @dynamic
@Component({ @Component({
@ -341,7 +339,6 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
@Inject(WINDOW) private window: Window, @Inject(WINDOW) private window: Window,
@Inject(DOCUMENT) private document: Document, @Inject(DOCUMENT) private document: Document,
@Inject(HOME_COMPONENTS_MODULE_TOKEN) private homeComponentsModule: Type<any>,
private breakpointObserver: BreakpointObserver, private breakpointObserver: BreakpointObserver,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router, private router: Router,
@ -1147,8 +1144,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
addWidgetFromType(widget: WidgetInfo) { addWidgetFromType(widget: WidgetInfo) {
this.onAddWidgetClosed(); this.onAddWidgetClosed();
this.searchBundle = ''; this.searchBundle = '';
this.widgetComponentService.getWidgetInfo(widget.bundleAlias, widget.typeAlias, widget.isSystemType, this.widgetComponentService.getWidgetInfo(widget.bundleAlias, widget.typeAlias, widget.isSystemType).subscribe(
[this.homeComponentsModule]).subscribe(
(widgetTypeInfo) => { (widgetTypeInfo) => {
const config: WidgetConfig = JSON.parse(widgetTypeInfo.defaultConfig); const config: WidgetConfig = JSON.parse(widgetTypeInfo.defaultConfig);
config.title = 'New ' + widgetTypeInfo.widgetName; config.title = 'New ' + widgetTypeInfo.widgetName;

2
ui-ngx/src/app/modules/home/components/home-components.module.ts
View File

@ -35,6 +35,7 @@ import { AddAttributeDialogComponent } from '@home/components/attribute/add-attr
import { EditAttributeValuePanelComponent } from '@home/components/attribute/edit-attribute-value-panel.component'; import { EditAttributeValuePanelComponent } from '@home/components/attribute/edit-attribute-value-panel.component';
import { DashboardComponent } from '@home/components/dashboard/dashboard.component'; import { DashboardComponent } from '@home/components/dashboard/dashboard.component';
import { WidgetComponent } from '@home/components/widget/widget.component'; import { WidgetComponent } from '@home/components/widget/widget.component';
import { WidgetComponentService } from '@home/components/widget/widget-component.service';
import { LegendComponent } from '@home/components/widget/legend.component'; import { LegendComponent } from '@home/components/widget/legend.component';
import { AliasesEntitySelectPanelComponent } from '@home/components/alias/aliases-entity-select-panel.component'; import { AliasesEntitySelectPanelComponent } from '@home/components/alias/aliases-entity-select-panel.component';
import { AliasesEntitySelectComponent } from '@home/components/alias/aliases-entity-select.component'; import { AliasesEntitySelectComponent } from '@home/components/alias/aliases-entity-select.component';
@ -455,6 +456,7 @@ import { AssetProfileAutocompleteComponent } from '@home/components/profile/asse
RateLimitsDetailsDialogComponent RateLimitsDetailsDialogComponent
], ],
providers: [ providers: [
WidgetComponentService,
CustomDialogService, CustomDialogService,
ImportExportService, ImportExportService,
{provide: EMBED_DASHBOARD_DIALOG_TOKEN, useValue: EmbedDashboardDialogComponent}, {provide: EMBED_DASHBOARD_DIALOG_TOKEN, useValue: EmbedDashboardDialogComponent},

31
ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
View File

@ -45,13 +45,13 @@ import { MODULES_MAP } from '@shared/public-api';
import * as tinycolor_ from 'tinycolor2'; import * as tinycolor_ from 'tinycolor2';
import moment from 'moment'; import moment from 'moment';
import { IModulesMap } from '@modules/common/modules-map.models'; import { IModulesMap } from '@modules/common/modules-map.models';
import { HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
import { widgetSettingsComponentsMap } from '@home/components/widget/lib/settings/widget-settings.module'; import { widgetSettingsComponentsMap } from '@home/components/widget/lib/settings/widget-settings.module';
const tinycolor = tinycolor_; const tinycolor = tinycolor_;
@Injectable({ // @dynamic
providedIn: 'root' @Injectable()
})
export class WidgetComponentService { export class WidgetComponentService {
private cssParser = new cssjs(); private cssParser = new cssjs();
@ -68,6 +68,7 @@ export class WidgetComponentService {
constructor(@Inject(WINDOW) private window: Window, constructor(@Inject(WINDOW) private window: Window,
@Optional() @Inject(MODULES_MAP) private modulesMap: IModulesMap, @Optional() @Inject(MODULES_MAP) private modulesMap: IModulesMap,
@Inject(HOME_COMPONENTS_MODULE_TOKEN) private homeComponentsModule: Type<any>,
private dynamicComponentFactoryService: DynamicComponentFactoryService, private dynamicComponentFactoryService: DynamicComponentFactoryService,
private widgetService: WidgetService, private widgetService: WidgetService,
private utils: UtilsService, private utils: UtilsService,
@ -184,9 +185,9 @@ export class WidgetComponentService {
() => { () => {
const loadDefaultWidgetInfoTasks = [ const loadDefaultWidgetInfoTasks = [
this.loadWidgetResources(this.missingWidgetType, 'global-widget-missing-type', this.loadWidgetResources(this.missingWidgetType, 'global-widget-missing-type',
[SharedModule, WidgetComponentsModule]), [SharedModule, WidgetComponentsModule, this.homeComponentsModule]),
this.loadWidgetResources(this.errorWidgetType, 'global-widget-error-type', this.loadWidgetResources(this.errorWidgetType, 'global-widget-error-type',
[SharedModule, WidgetComponentsModule]), [SharedModule, WidgetComponentsModule, this.homeComponentsModule]),
]; ];
forkJoin(loadDefaultWidgetInfoTasks).subscribe( forkJoin(loadDefaultWidgetInfoTasks).subscribe(
() => { () => {
@ -230,14 +231,13 @@ export class WidgetComponentService {
} }
} }
public getWidgetInfo(bundleAlias: string, widgetTypeAlias: string, isSystem: boolean, modules?: Type<any>[]): Observable<WidgetInfo> { public getWidgetInfo(bundleAlias: string, widgetTypeAlias: string, isSystem: boolean): Observable<WidgetInfo> {
return this.init().pipe( return this.init().pipe(
mergeMap(() => this.getWidgetInfoInternal(bundleAlias, widgetTypeAlias, isSystem, modules)) mergeMap(() => this.getWidgetInfoInternal(bundleAlias, widgetTypeAlias, isSystem))
); );
} }
private getWidgetInfoInternal(bundleAlias: string, widgetTypeAlias: string, isSystem: boolean, private getWidgetInfoInternal(bundleAlias: string, widgetTypeAlias: string, isSystem: boolean): Observable<WidgetInfo> {
modules?: Type<any>[]): Observable<WidgetInfo> {
const widgetInfoSubject = new ReplaySubject<WidgetInfo>(); const widgetInfoSubject = new ReplaySubject<WidgetInfo>();
const widgetInfo = this.getWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem); const widgetInfo = this.getWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem);
if (widgetInfo) { if (widgetInfo) {
@ -245,7 +245,7 @@ export class WidgetComponentService {
widgetInfoSubject.complete(); widgetInfoSubject.complete();
} else { } else {
if (this.utils.widgetEditMode) { if (this.utils.widgetEditMode) {
this.loadWidget(this.editingWidgetType, bundleAlias, isSystem, widgetInfoSubject, modules); this.loadWidget(this.editingWidgetType, bundleAlias, isSystem, widgetInfoSubject);
} else { } else {
const key = this.createWidgetInfoCacheKey(bundleAlias, widgetTypeAlias, isSystem); const key = this.createWidgetInfoCacheKey(bundleAlias, widgetTypeAlias, isSystem);
let fetchQueue = this.widgetsInfoFetchQueue.get(key); let fetchQueue = this.widgetsInfoFetchQueue.get(key);
@ -256,7 +256,7 @@ export class WidgetComponentService {
this.widgetsInfoFetchQueue.set(key, fetchQueue); this.widgetsInfoFetchQueue.set(key, fetchQueue);
this.widgetService.getWidgetType(bundleAlias, widgetTypeAlias, isSystem, {ignoreErrors: true}).subscribe( this.widgetService.getWidgetType(bundleAlias, widgetTypeAlias, isSystem, {ignoreErrors: true}).subscribe(
(widgetType) => { (widgetType) => {
this.loadWidget(widgetType, bundleAlias, isSystem, widgetInfoSubject, modules); this.loadWidget(widgetType, bundleAlias, isSystem, widgetInfoSubject);
}, },
() => { () => {
widgetInfoSubject.next(this.missingWidgetType); widgetInfoSubject.next(this.missingWidgetType);
@ -270,8 +270,7 @@ export class WidgetComponentService {
return widgetInfoSubject.asObservable(); return widgetInfoSubject.asObservable();
} }
private loadWidget(widgetType: WidgetType, bundleAlias: string, isSystem: boolean, widgetInfoSubject: Subject<WidgetInfo>, private loadWidget(widgetType: WidgetType, bundleAlias: string, isSystem: boolean, widgetInfoSubject: Subject<WidgetInfo>) {
modules?: Type<any>[]) {
const widgetInfo = toWidgetInfo(widgetType); const widgetInfo = toWidgetInfo(widgetType);
const key = this.createWidgetInfoCacheKey(bundleAlias, widgetInfo.alias, isSystem); const key = this.createWidgetInfoCacheKey(bundleAlias, widgetInfo.alias, isSystem);
let widgetControllerDescriptor: WidgetControllerDescriptor = null; let widgetControllerDescriptor: WidgetControllerDescriptor = null;
@ -284,11 +283,7 @@ export class WidgetComponentService {
} }
if (widgetControllerDescriptor) { if (widgetControllerDescriptor) {
const widgetNamespace = `widget-type-${(isSystem ? 'sys-' : '')}${bundleAlias}-${widgetInfo.alias}`; const widgetNamespace = `widget-type-${(isSystem ? 'sys-' : '')}${bundleAlias}-${widgetInfo.alias}`;
const widgetModules = [SharedModule, WidgetComponentsModule]; this.loadWidgetResources(widgetInfo, widgetNamespace, [SharedModule, WidgetComponentsModule, this.homeComponentsModule]).subscribe(
if (modules) {
widgetModules.push(...modules);
}
this.loadWidgetResources(widgetInfo, widgetNamespace, widgetModules).subscribe(
() => { () => {
if (widgetControllerDescriptor.settingsSchema) { if (widgetControllerDescriptor.settingsSchema) {
widgetInfo.typeSettingsSchema = widgetControllerDescriptor.settingsSchema; widgetInfo.typeSettingsSchema = widgetControllerDescriptor.settingsSchema;

7
ui-ngx/src/app/modules/home/components/widget/widget.component.ts
View File

@ -31,7 +31,6 @@ import {
OnInit, OnInit,
Renderer2, Renderer2,
SimpleChanges, SimpleChanges,
Type,
ViewChild, ViewChild,
ViewContainerRef, ViewContainerRef,
ViewEncapsulation ViewEncapsulation
@ -115,7 +114,7 @@ import { MobileService } from '@core/services/mobile.service';
import { DialogService } from '@core/services/dialog.service'; import { DialogService } from '@core/services/dialog.service';
import { PopoverPlacement } from '@shared/components/popover.models'; import { PopoverPlacement } from '@shared/components/popover.models';
import { TbPopoverService } from '@shared/components/popover.service'; import { TbPopoverService } from '@shared/components/popover.service';
import { DASHBOARD_PAGE_COMPONENT_TOKEN, HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens'; import { DASHBOARD_PAGE_COMPONENT_TOKEN } from '@home/components/tokens';
@Component({ @Component({
selector: 'tb-widget', selector: 'tb-widget',
@ -191,7 +190,6 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
private popoverService: TbPopoverService, private popoverService: TbPopoverService,
@Inject(EMBED_DASHBOARD_DIALOG_TOKEN) private embedDashboardDialogComponent: ComponentType<any>, @Inject(EMBED_DASHBOARD_DIALOG_TOKEN) private embedDashboardDialogComponent: ComponentType<any>,
@Inject(DASHBOARD_PAGE_COMPONENT_TOKEN) private dashboardPageComponent: ComponentType<any>, @Inject(DASHBOARD_PAGE_COMPONENT_TOKEN) private dashboardPageComponent: ComponentType<any>,
@Inject(HOME_COMPONENTS_MODULE_TOKEN) private homeComponentsModule: Type<any>,
private widgetService: WidgetService, private widgetService: WidgetService,
private resources: ResourcesService, private resources: ResourcesService,
private timeService: TimeService, private timeService: TimeService,
@ -356,8 +354,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
this.subscriptionContext.widgetUtils = this.widgetContext.utils; this.subscriptionContext.widgetUtils = this.widgetContext.utils;
this.subscriptionContext.getServerTimeDiff = this.dashboardService.getServerTimeDiff.bind(this.dashboardService); this.subscriptionContext.getServerTimeDiff = this.dashboardService.getServerTimeDiff.bind(this.dashboardService);
this.widgetComponentService.getWidgetInfo(this.widget.bundleAlias, this.widget.typeAlias, this.widget.isSystemType, this.widgetComponentService.getWidgetInfo(this.widget.bundleAlias, this.widget.typeAlias, this.widget.isSystemType).subscribe(
[this.homeComponentsModule]).subscribe(
(widgetInfo) => { (widgetInfo) => {
this.widgetInfo = widgetInfo; this.widgetInfo = widgetInfo;
this.loadFromWidgetInfo(); this.loadFromWidgetInfo();