|
|
@ -14,7 +14,7 @@ |
|
|
/// limitations under the License.
|
|
|
/// limitations under the License.
|
|
|
///
|
|
|
///
|
|
|
|
|
|
|
|
|
import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; |
|
|
import { ChangeDetectorRef, Component, EventEmitter, Input, Output, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; |
|
|
import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; |
|
|
import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; |
|
|
import { IAliasController } from '@core/api/widget-api.models'; |
|
|
import { IAliasController } from '@core/api/widget-api.models'; |
|
|
import { NULL_UUID } from '@shared/models/id/has-uuid'; |
|
|
import { NULL_UUID } from '@shared/models/id/has-uuid'; |
|
|
@ -37,7 +37,7 @@ import { coerceBoolean } from '@shared/decorators/coercion'; |
|
|
import { MatDialog } from '@angular/material/dialog'; |
|
|
import { MatDialog } from '@angular/material/dialog'; |
|
|
import { TranslateService } from '@ngx-translate/core'; |
|
|
import { TranslateService } from '@ngx-translate/core'; |
|
|
import { MpItemVersionQuery, MpItemVersionView, widgetTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; |
|
|
import { MpItemVersionQuery, MpItemVersionView, widgetTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; |
|
|
import { ItemType, FilterParamInfo } from '@shared/models/iot-hub/iot-hub-item.models'; |
|
|
import { ItemType, FilterParamInfo, WidgetCategory } from '@shared/models/iot-hub/iot-hub-item.models'; |
|
|
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; |
|
|
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; |
|
|
import { IotHubApiService } from '@core/http/iot-hub-api.service'; |
|
|
import { IotHubApiService } from '@core/http/iot-hub-api.service'; |
|
|
import { |
|
|
import { |
|
|
@ -45,7 +45,22 @@ import { |
|
|
IotHubItemDetailDialogData |
|
|
IotHubItemDetailDialogData |
|
|
} from '@home/components/iot-hub/iot-hub-item-detail-dialog.component'; |
|
|
} from '@home/components/iot-hub/iot-hub-item-detail-dialog.component'; |
|
|
|
|
|
|
|
|
type selectWidgetMode = 'bundles' | 'allWidgets' | 'iotHub'; |
|
|
type selectWidgetMode = 'installed' | 'iotHub'; |
|
|
|
|
|
type installedSubMode = 'default' | 'allWidgets'; |
|
|
|
|
|
type iotHubSubMode = 'default' | 'allWidgets' | 'installed' | 'category'; |
|
|
|
|
|
|
|
|
|
|
|
interface WidgetSelectSortOption { |
|
|
|
|
|
value: string; |
|
|
|
|
|
label: string; |
|
|
|
|
|
direction: Direction; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const LOGICAL_ALL_WIDGETS = '__logical_all_widgets__'; |
|
|
|
|
|
const LOGICAL_INSTALLED_FROM_IOT_HUB = '__logical_installed_from_iot_hub__'; |
|
|
|
|
|
|
|
|
|
|
|
interface LogicalCard { |
|
|
|
|
|
__logical: typeof LOGICAL_ALL_WIDGETS | typeof LOGICAL_INSTALLED_FROM_IOT_HUB; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
interface WidgetsFilter { |
|
|
interface WidgetsFilter { |
|
|
search: string; |
|
|
search: string; |
|
|
@ -64,7 +79,7 @@ interface BundleWidgetsFilter extends WidgetsFilter { |
|
|
encapsulation: ViewEncapsulation.None, |
|
|
encapsulation: ViewEncapsulation.None, |
|
|
standalone: false |
|
|
standalone: false |
|
|
}) |
|
|
}) |
|
|
export class DashboardWidgetSelectComponent implements OnInit { |
|
|
export class DashboardWidgetSelectComponent { |
|
|
|
|
|
|
|
|
private searchSubject = new BehaviorSubject<string>(''); |
|
|
private searchSubject = new BehaviorSubject<string>(''); |
|
|
private search$ = this.searchSubject.asObservable().pipe( |
|
|
private search$ = this.searchSubject.asObservable().pipe( |
|
|
@ -72,12 +87,25 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
|
|
|
|
|
|
private filterWidgetTypes$ = new BehaviorSubject<Array<widgetType>>(null); |
|
|
private filterWidgetTypes$ = new BehaviorSubject<Array<widgetType>>(null); |
|
|
private deprecatedFilter$ = new BehaviorSubject<DeprecatedFilter>(DeprecatedFilter.ACTUAL); |
|
|
private deprecatedFilter$ = new BehaviorSubject<DeprecatedFilter>(DeprecatedFilter.ACTUAL); |
|
|
private selectWidgetMode$ = new BehaviorSubject<selectWidgetMode>('bundles'); |
|
|
private selectWidgetMode$ = new BehaviorSubject<selectWidgetMode>('installed'); |
|
|
|
|
|
private installedSubMode$ = new BehaviorSubject<installedSubMode>('default'); |
|
|
|
|
|
private iotHubSubMode$ = new BehaviorSubject<iotHubSubMode>('default'); |
|
|
private widgetsBundle$ = new BehaviorSubject<WidgetsBundle>(null); |
|
|
private widgetsBundle$ = new BehaviorSubject<WidgetsBundle>(null); |
|
|
|
|
|
|
|
|
widgetTypes = new Set<widgetType>(); |
|
|
widgetTypes = new Set<widgetType>(); |
|
|
hasDeprecated = false; |
|
|
hasDeprecated = false; |
|
|
|
|
|
|
|
|
|
|
|
iotHubSelectedCategory: string = null; |
|
|
|
|
|
includeDeprecated = false; |
|
|
|
|
|
searchFocused = false; |
|
|
|
|
|
|
|
|
|
|
|
iotHubSortOptions: WidgetSelectSortOption[] = [ |
|
|
|
|
|
{ value: 'totalInstallCount', label: 'iot-hub.sort-most-installed', direction: Direction.DESC }, |
|
|
|
|
|
{ value: 'publishedTime', label: 'iot-hub.sort-newest', direction: Direction.DESC }, |
|
|
|
|
|
{ value: 'name', label: 'iot-hub.sort-name', direction: Direction.ASC } |
|
|
|
|
|
]; |
|
|
|
|
|
iotHubSelectedSortIndex = 0; |
|
|
|
|
|
|
|
|
@Input() |
|
|
@Input() |
|
|
aliasController: IAliasController; |
|
|
aliasController: IAliasController; |
|
|
|
|
|
|
|
|
@ -94,7 +122,6 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
return this.searchSubject.value; |
|
|
return this.searchSubject.value; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Input() |
|
|
|
|
|
set filterWidgetTypes(widgetTypes: Array<widgetType>) { |
|
|
set filterWidgetTypes(widgetTypes: Array<widgetType>) { |
|
|
this.filterWidgetTypes$.next(widgetTypes); |
|
|
this.filterWidgetTypes$.next(widgetTypes); |
|
|
} |
|
|
} |
|
|
@ -106,25 +133,21 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
@Input() |
|
|
@Input() |
|
|
set selectWidgetMode(mode: selectWidgetMode) { |
|
|
set selectWidgetMode(mode: selectWidgetMode) { |
|
|
if (this.selectWidgetMode$.value !== mode) { |
|
|
if (this.selectWidgetMode$.value !== mode) { |
|
|
if (mode === 'bundles' && this.widgetsBundle$.value === null) { |
|
|
this.resetSubModes(); |
|
|
this.widgetTypes.clear(); |
|
|
|
|
|
this.hasDeprecated = false; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.widgetTypes = new Set<widgetType>(Object.keys(widgetType).map(t => t as widgetType)); |
|
|
|
|
|
this.hasDeprecated = true; |
|
|
|
|
|
} |
|
|
|
|
|
this.filterWidgetTypes$.next(null); |
|
|
this.filterWidgetTypes$.next(null); |
|
|
this.deprecatedFilter$.next(DeprecatedFilter.ACTUAL); |
|
|
this.deprecatedFilter$.next(DeprecatedFilter.ACTUAL); |
|
|
|
|
|
this.includeDeprecated = false; |
|
|
this.selectWidgetMode$.next(mode); |
|
|
this.selectWidgetMode$.next(mode); |
|
|
|
|
|
this.updateWidgetTypesForCurrentState(); |
|
|
if (mode === 'iotHub') { |
|
|
if (mode === 'iotHub') { |
|
|
this.loadInstalledWidgets(); |
|
|
this.loadInstalledWidgets(); |
|
|
this.loadIotHubFilterInfo(); |
|
|
this.loadIotHubFilterInfo(); |
|
|
|
|
|
this.loadWidgetCategories(); |
|
|
} else { |
|
|
} else { |
|
|
this.iotHubInstalledMode = 'all'; |
|
|
|
|
|
this.installedWidgetVersions = null; |
|
|
this.installedWidgetVersions = null; |
|
|
this.appliedWidgetTypes.clear(); |
|
|
this.iotHubAppliedWidgetTypes.clear(); |
|
|
this.appliedCategories.clear(); |
|
|
this.iotHubAppliedCategories.clear(); |
|
|
this.appliedUseCases.clear(); |
|
|
this.iotHubAppliedUseCases.clear(); |
|
|
this.iotHubFilterCount = 0; |
|
|
this.iotHubFilterCount = 0; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -134,6 +157,40 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
return this.selectWidgetMode$.value; |
|
|
return this.selectWidgetMode$.value; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
set installedSubMode(sub: installedSubMode) { |
|
|
|
|
|
if (this.installedSubMode$.value !== sub) { |
|
|
|
|
|
this.installedSubMode$.next(sub); |
|
|
|
|
|
this.filterWidgetTypes$.next(null); |
|
|
|
|
|
this.deprecatedFilter$.next(DeprecatedFilter.ACTUAL); |
|
|
|
|
|
this.includeDeprecated = false; |
|
|
|
|
|
this.updateWidgetTypesForCurrentState(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
get installedSubMode(): installedSubMode { |
|
|
|
|
|
return this.installedSubMode$.value; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
set iotHubSubMode(sub: iotHubSubMode) { |
|
|
|
|
|
if (this.iotHubSubMode$.value !== sub) { |
|
|
|
|
|
this.iotHubSubMode$.next(sub); |
|
|
|
|
|
if (sub !== 'category') { |
|
|
|
|
|
this.iotHubSelectedCategory = null; |
|
|
|
|
|
} |
|
|
|
|
|
this.installedWidgetVersions = null; |
|
|
|
|
|
if (sub === 'default') { |
|
|
|
|
|
this.widgetCategoriesFilter = (this.searchSubject.value || '') + '|' + Date.now(); |
|
|
|
|
|
this.cd.markForCheck(); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.reloadIotHubWidgets(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
get iotHubSubMode(): iotHubSubMode { |
|
|
|
|
|
return this.iotHubSubMode$.value; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Input() |
|
|
@Input() |
|
|
set deprecatedFilter(filter: DeprecatedFilter) { |
|
|
set deprecatedFilter(filter: DeprecatedFilter) { |
|
|
this.deprecatedFilter$.next(filter); |
|
|
this.deprecatedFilter$.next(filter); |
|
|
@ -145,7 +202,7 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
|
|
|
|
|
|
set widgetsBundle(widgetBundle: WidgetsBundle) { |
|
|
set widgetsBundle(widgetBundle: WidgetsBundle) { |
|
|
if (this.widgetsBundle$.value !== widgetBundle) { |
|
|
if (this.widgetsBundle$.value !== widgetBundle) { |
|
|
if (widgetBundle === null && this.selectWidgetMode$.value !== 'allWidgets') { |
|
|
if (widgetBundle === null) { |
|
|
this.widgetTypes.clear(); |
|
|
this.widgetTypes.clear(); |
|
|
this.hasDeprecated = false; |
|
|
this.hasDeprecated = false; |
|
|
} else { |
|
|
} else { |
|
|
@ -167,6 +224,12 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
@Output() |
|
|
@Output() |
|
|
widgetSelected: EventEmitter<WidgetInfo> = new EventEmitter<WidgetInfo>(); |
|
|
widgetSelected: EventEmitter<WidgetInfo> = new EventEmitter<WidgetInfo>(); |
|
|
|
|
|
|
|
|
|
|
|
@Output() |
|
|
|
|
|
closeClick: EventEmitter<void> = new EventEmitter<void>(); |
|
|
|
|
|
|
|
|
|
|
|
@Output() |
|
|
|
|
|
importClick: EventEmitter<Event> = new EventEmitter<Event>(); |
|
|
|
|
|
|
|
|
columns: ScrollGridColumns = { |
|
|
columns: ScrollGridColumns = { |
|
|
columns: 2, |
|
|
columns: 2, |
|
|
breakpoints: { |
|
|
breakpoints: { |
|
|
@ -184,36 +247,37 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
widgetBundlesFetchFunction: GridEntitiesFetchFunction<WidgetsBundle, string>; |
|
|
widgetBundlesFetchFunction: GridEntitiesFetchFunction<WidgetsBundle, string>; |
|
|
|
|
|
installedDefaultFetchFunction: GridEntitiesFetchFunction<any, string>; |
|
|
allWidgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, WidgetsFilter>; |
|
|
allWidgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, WidgetsFilter>; |
|
|
widgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, BundleWidgetsFilter>; |
|
|
widgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, BundleWidgetsFilter>; |
|
|
iotHubWidgetsFetchFunction: GridEntitiesFetchFunction<MpItemVersionView, string>; |
|
|
iotHubWidgetsFetchFunction: GridEntitiesFetchFunction<MpItemVersionView, string>; |
|
|
|
|
|
iotHubInstalledWidgetsFetchFunction: GridEntitiesFetchFunction<MpItemVersionView, string>; |
|
|
|
|
|
iotHubDefaultFetchFunction: GridEntitiesFetchFunction<any, string>; |
|
|
|
|
|
|
|
|
|
|
|
readonly LOGICAL_ALL_WIDGETS = LOGICAL_ALL_WIDGETS; |
|
|
|
|
|
readonly LOGICAL_INSTALLED_FROM_IOT_HUB = LOGICAL_INSTALLED_FROM_IOT_HUB; |
|
|
|
|
|
|
|
|
widgetsBundleFilter = ''; |
|
|
widgetsBundleFilter = ''; |
|
|
allWidgetsFilter: WidgetsFilter = {search: '', filter: null, deprecatedFilter: DeprecatedFilter.ACTUAL}; |
|
|
allWidgetsFilter: WidgetsFilter = {search: '', filter: null, deprecatedFilter: DeprecatedFilter.ACTUAL}; |
|
|
widgetsFilter: BundleWidgetsFilter = {search: '', filter: null, deprecatedFilter: DeprecatedFilter.ACTUAL, widgetsBundleId: null}; |
|
|
widgetsFilter: BundleWidgetsFilter = {search: '', filter: null, deprecatedFilter: DeprecatedFilter.ACTUAL, widgetsBundleId: null}; |
|
|
iotHubWidgetsFilter = ''; |
|
|
iotHubWidgetsFilter = ''; |
|
|
iotHubInstalledMode: 'all' | 'installed' = 'all'; |
|
|
|
|
|
iotHubInstalledWidgetsFetchFunction: GridEntitiesFetchFunction<MpItemVersionView, string>; |
|
|
|
|
|
private installedWidgets: IotHubInstalledItem[] = null; |
|
|
|
|
|
private installedWidgetVersions: MpItemVersionView[] = null; |
|
|
|
|
|
iotHubInstalledWidgetsFilter = ''; |
|
|
iotHubInstalledWidgetsFilter = ''; |
|
|
|
|
|
widgetCategoriesFilter = ''; |
|
|
|
|
|
|
|
|
// IoT Hub filter model — applied state (used by fetch functions)
|
|
|
private installedWidgets: IotHubInstalledItem[] = null; |
|
|
private appliedWidgetTypes = new Set<string>(); |
|
|
private installedWidgetVersions: MpItemVersionView[] = null; |
|
|
private appliedCategories = new Set<string>(); |
|
|
|
|
|
private appliedUseCases = new Set<string>(); |
|
|
|
|
|
|
|
|
|
|
|
// IoT Hub filter model — pending state (used by filter panel UI)
|
|
|
// IoT Hub filter model — applied state (used by fetch functions + panel UI)
|
|
|
iotHubPendingWidgetTypes = new Set<string>(); |
|
|
iotHubAppliedWidgetTypes = new Set<string>(); |
|
|
iotHubPendingCategories = new Set<string>(); |
|
|
iotHubAppliedCategories = new Set<string>(); |
|
|
iotHubPendingUseCases = new Set<string>(); |
|
|
iotHubAppliedUseCases = new Set<string>(); |
|
|
iotHubFilterDirty = false; |
|
|
|
|
|
|
|
|
|
|
|
iotHubWidgetTypeOptions: FilterParamInfo[] = []; |
|
|
iotHubWidgetTypeOptions: FilterParamInfo[] = []; |
|
|
iotHubCategoryOptions: FilterParamInfo[] = []; |
|
|
iotHubCategoryOptions: FilterParamInfo[] = []; |
|
|
iotHubUseCaseOptions: FilterParamInfo[] = []; |
|
|
iotHubUseCaseOptions: FilterParamInfo[] = []; |
|
|
iotHubFilterCount = 0; |
|
|
iotHubFilterCount = 0; |
|
|
iotHubFilterSearch: Record<string, string> = {}; |
|
|
iotHubFilterSearch: Record<string, string> = {}; |
|
|
|
|
|
iotHubFilterItemsHovered = false; |
|
|
|
|
|
|
|
|
constructor(private widgetsService: WidgetService, |
|
|
constructor(private widgetsService: WidgetService, |
|
|
private iotHubApiService: IotHubApiService, |
|
|
private iotHubApiService: IotHubApiService, |
|
|
@ -249,14 +313,24 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
|
|
|
|
|
|
this.iotHubWidgetsFetchFunction = (pageSize, page, filter) => { |
|
|
this.iotHubWidgetsFetchFunction = (pageSize, page, filter) => { |
|
|
const search = typeof filter === 'string' ? filter.split('|')[0] : filter; |
|
|
const search = typeof filter === 'string' ? filter.split('|')[0] : filter; |
|
|
const sortOrder: SortOrder = { property: 'totalInstallCount', direction: Direction.DESC }; |
|
|
const sort = this.iotHubSortOptions[this.iotHubSelectedSortIndex]; |
|
|
|
|
|
const sortOrder: SortOrder = { property: sort.value, direction: sort.direction }; |
|
|
const pageLink = new PageLink(pageSize, page, search || null, sortOrder); |
|
|
const pageLink = new PageLink(pageSize, page, search || null, sortOrder); |
|
|
|
|
|
const effectiveCategories = this.iotHubSelectedCategory |
|
|
|
|
|
? [this.iotHubSelectedCategory] |
|
|
|
|
|
: (this.iotHubAppliedCategories.size > 0 ? Array.from(this.iotHubAppliedCategories) : undefined); |
|
|
const query = new MpItemVersionQuery(pageLink, ItemType.WIDGET, |
|
|
const query = new MpItemVersionQuery(pageLink, ItemType.WIDGET, |
|
|
undefined, undefined, |
|
|
undefined, undefined, |
|
|
this.appliedCategories.size > 0 ? Array.from(this.appliedCategories) : undefined, |
|
|
effectiveCategories, |
|
|
this.appliedUseCases.size > 0 ? Array.from(this.appliedUseCases) : undefined, |
|
|
this.iotHubAppliedUseCases.size > 0 ? Array.from(this.iotHubAppliedUseCases) : undefined, |
|
|
|
|
|
undefined, |
|
|
|
|
|
this.iotHubAppliedWidgetTypes.size > 0 ? Array.from(this.iotHubAppliedWidgetTypes) : undefined, |
|
|
|
|
|
undefined, |
|
|
|
|
|
undefined, |
|
|
|
|
|
undefined, |
|
|
undefined, |
|
|
undefined, |
|
|
this.appliedWidgetTypes.size > 0 ? Array.from(this.appliedWidgetTypes) : undefined |
|
|
undefined, |
|
|
|
|
|
this.scadaFirst ? true : undefined |
|
|
); |
|
|
); |
|
|
return this.iotHubApiService.getPublishedVersions(query, { ignoreLoading: true }); |
|
|
return this.iotHubApiService.getPublishedVersions(query, { ignoreLoading: true }); |
|
|
}; |
|
|
}; |
|
|
@ -270,6 +344,29 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
return of(this.filterAndPaginateInstalledVersions(this.installedWidgetVersions, pageSize, page, filter)); |
|
|
return of(this.filterAndPaginateInstalledVersions(this.installedWidgetVersions, pageSize, page, filter)); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
this.installedDefaultFetchFunction = (pageSize, page, filter) => { |
|
|
|
|
|
return this.widgetBundlesFetchFunction(pageSize, page, filter).pipe( |
|
|
|
|
|
map(pd => this.prependLogicalCards(pd, page, [{ __logical: LOGICAL_ALL_WIDGETS }])) |
|
|
|
|
|
); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
this.iotHubDefaultFetchFunction = (pageSize, page, filter) => { |
|
|
|
|
|
const search = typeof filter === 'string' ? filter.split('|')[0] : filter; |
|
|
|
|
|
return this.iotHubApiService.getWidgetCategories(search || undefined, |
|
|
|
|
|
this.scadaFirst ? true : undefined, { ignoreLoading: true }).pipe( |
|
|
|
|
|
map(categories => ({ |
|
|
|
|
|
data: categories.slice(page * pageSize, page * pageSize + pageSize), |
|
|
|
|
|
totalPages: Math.ceil(categories.length / pageSize), |
|
|
|
|
|
totalElements: categories.length, |
|
|
|
|
|
hasNext: (page + 1) * pageSize < categories.length |
|
|
|
|
|
})), |
|
|
|
|
|
map(pd => this.prependLogicalCards(pd, page, [ |
|
|
|
|
|
{ __logical: LOGICAL_ALL_WIDGETS }, |
|
|
|
|
|
{ __logical: LOGICAL_INSTALLED_FROM_IOT_HUB } |
|
|
|
|
|
])) |
|
|
|
|
|
); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
this.search$.pipe( |
|
|
this.search$.pipe( |
|
|
distinctUntilChanged(), |
|
|
distinctUntilChanged(), |
|
|
skip(1) |
|
|
skip(1) |
|
|
@ -277,8 +374,10 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
(search) => { |
|
|
(search) => { |
|
|
this.widgetsBundleFilter = search; |
|
|
this.widgetsBundleFilter = search; |
|
|
if (this.selectWidgetMode$.value === 'iotHub') { |
|
|
if (this.selectWidgetMode$.value === 'iotHub') { |
|
|
if (this.iotHubInstalledMode === 'installed') { |
|
|
if (this.iotHubSubMode$.value === 'installed') { |
|
|
this.iotHubInstalledWidgetsFilter = search; |
|
|
this.iotHubInstalledWidgetsFilter = search; |
|
|
|
|
|
} else if (this.iotHubSubMode$.value === 'default') { |
|
|
|
|
|
this.widgetCategoriesFilter = search; |
|
|
} else { |
|
|
} else { |
|
|
this.iotHubWidgetsFilter = search; |
|
|
this.iotHubWidgetsFilter = search; |
|
|
} |
|
|
} |
|
|
@ -312,7 +411,36 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
private prependLogicalCards(pageData: any, page: number, cards: LogicalCard[]): any { |
|
|
|
|
|
if (page === 0 && cards.length) { |
|
|
|
|
|
return { |
|
|
|
|
|
...pageData, |
|
|
|
|
|
data: [...cards, ...(pageData.data || [])], |
|
|
|
|
|
totalElements: (pageData.totalElements || 0) + cards.length |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
|
|
|
return pageData; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private resetSubModes(): void { |
|
|
|
|
|
this.widgetsBundle$.next(null); |
|
|
|
|
|
this.installedSubMode$.next('default'); |
|
|
|
|
|
this.iotHubSubMode$.next('default'); |
|
|
|
|
|
this.iotHubSelectedCategory = null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private updateWidgetTypesForCurrentState(): void { |
|
|
|
|
|
const mode = this.selectWidgetMode$.value; |
|
|
|
|
|
const showTypeFilter = |
|
|
|
|
|
(mode === 'installed' && (this.installedSubMode$.value === 'allWidgets' || this.widgetsBundle$.value !== null)) || |
|
|
|
|
|
(mode === 'iotHub' && this.iotHubSubMode$.value !== 'default'); |
|
|
|
|
|
if (showTypeFilter) { |
|
|
|
|
|
this.widgetTypes = new Set<widgetType>(Object.keys(widgetType).map(t => t as widgetType)); |
|
|
|
|
|
this.hasDeprecated = mode === 'installed'; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.widgetTypes.clear(); |
|
|
|
|
|
this.hasDeprecated = false; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
onWidgetClicked($event: Event, widget: WidgetTypeInfo): void { |
|
|
onWidgetClicked($event: Event, widget: WidgetTypeInfo): void { |
|
|
@ -326,10 +454,33 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
selectBundle($event: Event, bundle: WidgetsBundle) { |
|
|
selectBundle($event: Event, bundle: WidgetsBundle) { |
|
|
$event.preventDefault(); |
|
|
$event.preventDefault(); |
|
|
this.widgetsBundle = bundle; |
|
|
this.widgetsBundle = bundle; |
|
|
if (bundle.title?.toLowerCase().includes(this.search.toLowerCase()) || |
|
|
} |
|
|
bundle.description?.toLowerCase().includes(this.search.toLowerCase())) { |
|
|
|
|
|
this.searchSubject.next(''); |
|
|
onAllWidgetsCardClicked($event: Event): void { |
|
|
|
|
|
$event.preventDefault(); |
|
|
|
|
|
if (this.selectWidgetMode$.value === 'installed') { |
|
|
|
|
|
this.installedSubMode = 'allWidgets'; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.iotHubSubMode = 'allWidgets'; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onInstalledFromIotHubCardClicked($event: Event): void { |
|
|
|
|
|
$event.preventDefault(); |
|
|
|
|
|
this.iotHubSubMode = 'installed'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onCategoryCardClicked($event: Event, category: WidgetCategory): void { |
|
|
|
|
|
$event.preventDefault(); |
|
|
|
|
|
this.iotHubSelectedCategory = category.name; |
|
|
|
|
|
this.iotHubSubMode = 'category'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
getCategoryImageUrl(category: WidgetCategory): string | null { |
|
|
|
|
|
if (!category?.image) { |
|
|
|
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
return this.iotHubApiService.resolveResourceUrl(category.image); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
onIotHubWidgetClicked($event: Event, item: MpItemVersionView): void { |
|
|
onIotHubWidgetClicked($event: Event, item: MpItemVersionView): void { |
|
|
@ -383,27 +534,6 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
onIotHubInstalledModeChange(mode: 'all' | 'installed'): void { |
|
|
|
|
|
this.iotHubInstalledMode = mode; |
|
|
|
|
|
const search = this.searchSubject.value; |
|
|
|
|
|
if (mode === 'installed') { |
|
|
|
|
|
this.installedWidgetVersions = null; |
|
|
|
|
|
this.iotHubInstalledWidgetsFilter = search; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.iotHubWidgetsFilter = search; |
|
|
|
|
|
} |
|
|
|
|
|
this.cd.markForCheck(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
openIotHubFilterPanel(): void { |
|
|
|
|
|
this.iotHubPendingWidgetTypes = new Set(this.appliedWidgetTypes); |
|
|
|
|
|
this.iotHubPendingCategories = new Set(this.appliedCategories); |
|
|
|
|
|
this.iotHubPendingUseCases = new Set(this.appliedUseCases); |
|
|
|
|
|
this.iotHubFilterDirty = false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
iotHubFilterItemsHovered = false; |
|
|
|
|
|
|
|
|
|
|
|
getIotHubWidgetTypeLabel(key: string): string { |
|
|
getIotHubWidgetTypeLabel(key: string): string { |
|
|
const translationKey = widgetTypeTranslations.get(key); |
|
|
const translationKey = widgetTypeTranslations.get(key); |
|
|
return translationKey ? this.translate.instant(translationKey) : key; |
|
|
return translationKey ? this.translate.instant(translationKey) : key; |
|
|
@ -436,66 +566,196 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
toggleIotHubWidgetType(key: string): void { |
|
|
toggleIotHubWidgetType(key: string): void { |
|
|
if (this.iotHubPendingWidgetTypes.has(key)) { |
|
|
if (this.iotHubAppliedWidgetTypes.has(key)) { |
|
|
this.iotHubPendingWidgetTypes.delete(key); |
|
|
this.iotHubAppliedWidgetTypes.delete(key); |
|
|
} else { |
|
|
} else { |
|
|
this.iotHubPendingWidgetTypes.add(key); |
|
|
this.iotHubAppliedWidgetTypes.add(key); |
|
|
} |
|
|
} |
|
|
this.updateFilterDirty(); |
|
|
this.onIotHubFiltersChanged(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
toggleIotHubCategory(key: string): void { |
|
|
toggleIotHubCategory(key: string): void { |
|
|
if (this.iotHubPendingCategories.has(key)) { |
|
|
if (this.iotHubAppliedCategories.has(key)) { |
|
|
this.iotHubPendingCategories.delete(key); |
|
|
this.iotHubAppliedCategories.delete(key); |
|
|
} else { |
|
|
} else { |
|
|
this.iotHubPendingCategories.add(key); |
|
|
this.iotHubAppliedCategories.add(key); |
|
|
} |
|
|
} |
|
|
this.updateFilterDirty(); |
|
|
this.onIotHubFiltersChanged(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
toggleIotHubUseCase(key: string): void { |
|
|
toggleIotHubUseCase(key: string): void { |
|
|
if (this.iotHubPendingUseCases.has(key)) { |
|
|
if (this.iotHubAppliedUseCases.has(key)) { |
|
|
this.iotHubPendingUseCases.delete(key); |
|
|
this.iotHubAppliedUseCases.delete(key); |
|
|
} else { |
|
|
} else { |
|
|
this.iotHubPendingUseCases.add(key); |
|
|
this.iotHubAppliedUseCases.add(key); |
|
|
} |
|
|
} |
|
|
this.updateFilterDirty(); |
|
|
this.onIotHubFiltersChanged(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
clearIotHubFilters(): void { |
|
|
clearIotHubFilters(): void { |
|
|
this.iotHubPendingWidgetTypes.clear(); |
|
|
this.iotHubAppliedWidgetTypes.clear(); |
|
|
this.iotHubPendingCategories.clear(); |
|
|
this.iotHubAppliedCategories.clear(); |
|
|
this.iotHubPendingUseCases.clear(); |
|
|
this.iotHubAppliedUseCases.clear(); |
|
|
this.iotHubFilterSearch = {}; |
|
|
this.iotHubFilterSearch = {}; |
|
|
this.updateFilterDirty(); |
|
|
this.onIotHubFiltersChanged(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
applyIotHubFilters(): void { |
|
|
private onIotHubFiltersChanged(): void { |
|
|
this.appliedWidgetTypes = new Set(this.iotHubPendingWidgetTypes); |
|
|
this.iotHubFilterCount = |
|
|
this.appliedCategories = new Set(this.iotHubPendingCategories); |
|
|
this.iotHubAppliedWidgetTypes.size + |
|
|
this.appliedUseCases = new Set(this.iotHubPendingUseCases); |
|
|
(this.iotHubSelectedCategory ? 0 : this.iotHubAppliedCategories.size) + |
|
|
this.iotHubFilterCount = this.appliedWidgetTypes.size + this.appliedCategories.size + this.appliedUseCases.size; |
|
|
this.iotHubAppliedUseCases.size; |
|
|
this.iotHubFilterDirty = false; |
|
|
|
|
|
this.reloadIotHubWidgets(); |
|
|
this.reloadIotHubWidgets(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateFilterDirty(): void { |
|
|
onIotHubSortChange(index: number): void { |
|
|
this.iotHubFilterDirty = |
|
|
if (this.iotHubSelectedSortIndex !== index) { |
|
|
!this.setsEqual(this.iotHubPendingWidgetTypes, this.appliedWidgetTypes) || |
|
|
this.iotHubSelectedSortIndex = index; |
|
|
!this.setsEqual(this.iotHubPendingCategories, this.appliedCategories) || |
|
|
this.installedWidgetVersions = null; |
|
|
!this.setsEqual(this.iotHubPendingUseCases, this.appliedUseCases); |
|
|
this.reloadIotHubWidgets(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
get totalFilterCount(): number { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
return (this.filterWidgetTypes?.length ?? 0) + (this.includeDeprecated ? 1 : 0); |
|
|
|
|
|
} |
|
|
|
|
|
return this.iotHubFilterCount; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
hasActiveFilters(): boolean { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
return (this.filterWidgetTypes?.length ?? 0) > 0 || this.includeDeprecated; |
|
|
|
|
|
} |
|
|
|
|
|
return this.iotHubAppliedWidgetTypes.size > 0 |
|
|
|
|
|
|| this.iotHubAppliedCategories.size > 0 |
|
|
|
|
|
|| this.iotHubAppliedUseCases.size > 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
clearAllFilters(): void { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
this.filterWidgetTypes = null; |
|
|
|
|
|
this.onIncludeDeprecatedChange(false); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.clearIotHubFilters(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
get hideCategoriesFilterSection(): boolean { |
|
|
|
|
|
return this.selectWidgetMode === 'iotHub' && this.iotHubSubMode === 'category'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onIncludeDeprecatedChange(value: boolean): void { |
|
|
|
|
|
this.includeDeprecated = value; |
|
|
|
|
|
this.deprecatedFilter = value ? DeprecatedFilter.ALL : DeprecatedFilter.ACTUAL; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
isFilterVisible(): boolean { |
|
|
|
|
|
if (this.selectWidgetMode === 'iotHub') { |
|
|
|
|
|
return this.iotHubSubMode !== 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
return this.installedSubMode === 'allWidgets' || this.widgetsBundle !== null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
showTopLevelWidgetModeToggle(): boolean { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
return !this.widgetsBundle && this.installedSubMode === 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
return this.iotHubSubMode === 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
showBackButton(): boolean { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
return !!this.widgetsBundle || this.installedSubMode === 'allWidgets'; |
|
|
|
|
|
} |
|
|
|
|
|
return this.iotHubSubMode !== 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
getHeaderTitle(): string { |
|
|
|
|
|
if (this.selectWidgetMode === 'iotHub') { |
|
|
|
|
|
if (this.iotHubSubMode === 'category' && this.iotHubSelectedCategory) { |
|
|
|
|
|
return this.iotHubSelectedCategory; |
|
|
|
|
|
} |
|
|
|
|
|
if (this.iotHubSubMode === 'installed') { |
|
|
|
|
|
return this.translate.instant('iot-hub.installed-from-iot-hub'); |
|
|
|
|
|
} |
|
|
|
|
|
if (this.iotHubSubMode === 'allWidgets') { |
|
|
|
|
|
return this.translate.instant('widget.all-widgets'); |
|
|
|
|
|
} |
|
|
|
|
|
return ''; |
|
|
|
|
|
} |
|
|
|
|
|
if (this.widgetsBundle) { |
|
|
|
|
|
return this.widgetsBundle.title; |
|
|
|
|
|
} |
|
|
|
|
|
if (this.installedSubMode === 'allWidgets') { |
|
|
|
|
|
return this.translate.instant('widget.all-widgets'); |
|
|
|
|
|
} |
|
|
|
|
|
return ''; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private setsEqual(a: Set<string>, b: Set<string>): boolean { |
|
|
getSearchPlaceholder(): string { |
|
|
if (a.size !== b.size) { return false; } |
|
|
if (this.selectWidgetMode === 'iotHub') { |
|
|
for (const v of a) { |
|
|
if (this.iotHubSubMode === 'default') { |
|
|
if (!b.has(v)) { return false; } |
|
|
return this.translate.instant('iot-hub.search-categories'); |
|
|
|
|
|
} |
|
|
|
|
|
return this.translate.instant('iot-hub.search-widgets'); |
|
|
} |
|
|
} |
|
|
return true; |
|
|
if (this.installedSubMode === 'default' && !this.widgetsBundle) { |
|
|
|
|
|
return this.translate.instant('iot-hub.search-bundles'); |
|
|
|
|
|
} |
|
|
|
|
|
return this.translate.instant('iot-hub.search-widgets'); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onBackClick(): void { |
|
|
|
|
|
if (this.selectWidgetMode === 'installed') { |
|
|
|
|
|
if (this.widgetsBundle) { |
|
|
|
|
|
this.widgetsBundle = null; |
|
|
|
|
|
} else if (this.installedSubMode === 'allWidgets') { |
|
|
|
|
|
this.installedSubMode = 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
} else if (this.selectWidgetMode === 'iotHub') { |
|
|
|
|
|
if (this.iotHubSubMode !== 'default') { |
|
|
|
|
|
this.iotHubSubMode = 'default'; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onClose(): void { |
|
|
|
|
|
this.closeClick.emit(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
clearSearch($event: Event): void { |
|
|
|
|
|
$event.preventDefault(); |
|
|
|
|
|
$event.stopPropagation(); |
|
|
|
|
|
this.search = ''; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onImport($event: Event): void { |
|
|
|
|
|
this.importClick.emit($event); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
get widgetTypesList(): widgetType[] { |
|
|
|
|
|
return Array.from(this.widgetTypes.values()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
getWidgetTypeLabel(type: widgetType): string { |
|
|
|
|
|
return this.translate.instant('widget.type-' + type); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
isWidgetTypeChecked(type: widgetType): boolean { |
|
|
|
|
|
return !!this.filterWidgetTypes && this.filterWidgetTypes.includes(type); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
toggleWidgetTypeFilter(type: widgetType): void { |
|
|
|
|
|
const current = this.filterWidgetTypes ?? []; |
|
|
|
|
|
const next = current.includes(type) |
|
|
|
|
|
? current.filter(t => t !== type) |
|
|
|
|
|
: [...current, type]; |
|
|
|
|
|
this.filterWidgetTypes = next.length ? next : null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private reloadIotHubWidgets(): void { |
|
|
private reloadIotHubWidgets(): void { |
|
|
if (this.iotHubInstalledMode === 'installed') { |
|
|
if (this.iotHubSubMode === 'installed') { |
|
|
this.installedWidgetVersions = null; |
|
|
this.installedWidgetVersions = null; |
|
|
this.iotHubInstalledWidgetsFilter = this.searchSubject.value + '|' + Date.now(); |
|
|
this.iotHubInstalledWidgetsFilter = this.searchSubject.value + '|' + Date.now(); |
|
|
} else { |
|
|
} else { |
|
|
@ -536,6 +796,10 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private loadWidgetCategories(): void { |
|
|
|
|
|
this.widgetCategoriesFilter = this.searchSubject.value + '|' + Date.now(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private loadInstalledWidgets(): void { |
|
|
private loadInstalledWidgets(): void { |
|
|
if (this.installedWidgets === null) { |
|
|
if (this.installedWidgets === null) { |
|
|
this.installedWidgets = []; |
|
|
this.installedWidgets = []; |
|
|
@ -575,20 +839,46 @@ export class DashboardWidgetSelectComponent implements OnInit { |
|
|
if (search) { |
|
|
if (search) { |
|
|
filtered = filtered.filter(v => v.name.toLowerCase().includes(search.toLowerCase())); |
|
|
filtered = filtered.filter(v => v.name.toLowerCase().includes(search.toLowerCase())); |
|
|
} |
|
|
} |
|
|
if (this.appliedWidgetTypes.size > 0) { |
|
|
if (this.iotHubAppliedWidgetTypes.size > 0) { |
|
|
filtered = filtered.filter(v => this.appliedWidgetTypes.has(v.dataDescriptor?.widgetType)); |
|
|
filtered = filtered.filter(v => this.iotHubAppliedWidgetTypes.has(v.dataDescriptor?.widgetType)); |
|
|
} |
|
|
} |
|
|
if (this.appliedCategories.size > 0) { |
|
|
if (this.iotHubAppliedCategories.size > 0) { |
|
|
filtered = filtered.filter(v => v.categories?.some(c => this.appliedCategories.has(c))); |
|
|
filtered = filtered.filter(v => v.categories?.some(c => this.iotHubAppliedCategories.has(c))); |
|
|
} |
|
|
} |
|
|
if (this.appliedUseCases.size > 0) { |
|
|
if (this.iotHubAppliedUseCases.size > 0) { |
|
|
filtered = filtered.filter(v => v.useCases?.some(u => this.appliedUseCases.has(u))); |
|
|
filtered = filtered.filter(v => v.useCases?.some(u => this.iotHubAppliedUseCases.has(u))); |
|
|
} |
|
|
} |
|
|
|
|
|
filtered = this.sortInstalledVersions(filtered); |
|
|
const start = page * pageSize; |
|
|
const start = page * pageSize; |
|
|
const data = filtered.slice(start, start + pageSize); |
|
|
const data = filtered.slice(start, start + pageSize); |
|
|
return { data, totalPages: Math.ceil(filtered.length / pageSize), totalElements: filtered.length, hasNext: start + pageSize < filtered.length }; |
|
|
return { data, totalPages: Math.ceil(filtered.length / pageSize), totalElements: filtered.length, hasNext: start + pageSize < filtered.length }; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private sortInstalledVersions(versions: MpItemVersionView[]): MpItemVersionView[] { |
|
|
|
|
|
const sort = this.iotHubSortOptions[this.iotHubSelectedSortIndex]; |
|
|
|
|
|
const sign = sort.direction === Direction.ASC ? 1 : -1; |
|
|
|
|
|
const copy = [...versions]; |
|
|
|
|
|
copy.sort((a, b) => { |
|
|
|
|
|
if (this.scadaFirst) { |
|
|
|
|
|
const aScada = !!a.dataDescriptor?.scada; |
|
|
|
|
|
const bScada = !!b.dataDescriptor?.scada; |
|
|
|
|
|
if (aScada !== bScada) { |
|
|
|
|
|
return aScada ? -1 : 1; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
const av = (a as any)[sort.value]; |
|
|
|
|
|
const bv = (b as any)[sort.value]; |
|
|
|
|
|
if (av == null && bv == null) { return 0; } |
|
|
|
|
|
if (av == null) { return 1; } |
|
|
|
|
|
if (bv == null) { return -1; } |
|
|
|
|
|
if (typeof av === 'string' && typeof bv === 'string') { |
|
|
|
|
|
return sign * av.localeCompare(bv); |
|
|
|
|
|
} |
|
|
|
|
|
return sign * (av < bv ? -1 : av > bv ? 1 : 0); |
|
|
|
|
|
}); |
|
|
|
|
|
return copy; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private toWidgetInfo(widgetTypeInfo: WidgetTypeInfo): WidgetInfo { |
|
|
private toWidgetInfo(widgetTypeInfo: WidgetTypeInfo): WidgetInfo { |
|
|
return { |
|
|
return { |
|
|
typeFullFqn: fullWidgetTypeFqn(widgetTypeInfo), |
|
|
typeFullFqn: fullWidgetTypeFqn(widgetTypeInfo), |
|
|
|
Igor Kulikov
5 months ago
