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

UI: Fix cycle dependency

Browse Source
This commit is contained in:
Igor Kulikov 2022-01-12 19:28:42 +02:00
parent d0d6fbe0bd
commit 54114d3dd2
13 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/core/utils.ts
View File

@ -20,8 +20,6 @@ import { finalize, share } from 'rxjs/operators';
import { Datasource } from '@app/shared/models/widget.models';
import { EntityId } from '@shared/models/id/entity-id';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { BreadCrumbLabelFunction } from '@shared/components/breadcrumb';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { EntityType, baseDetailsPageByEntityType } from '@shared/models/entity-type.models';
const varsRegex = /\${([^}]*)}/g;
@ -464,12 +462,6 @@ export function randomAlphanumeric(length: number): string {
return result;
}
export const entityDetailsPageBreadcrumbLabelFunction: BreadCrumbLabelFunction<EntityDetailsPageComponent>
= ((route, translate, component) => {
return component.entity?.name || component.headerSubtitle;
});
export function getEntityDetailsPageURL(id: string, entityType: EntityType): string {
return `${baseDetailsPageByEntityType.get(entityType)}/${id}`;
}

2
ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
View File

@ -30,7 +30,7 @@ import { HomeSettingsComponent } from '@home/pages/admin/home-settings.component
import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
import { ResourcesLibraryTableConfigResolver } from '@home/pages/admin/resource/resources-library-table-config.resolve';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
@Injectable()

2
ui-ngx/src/app/modules/home/pages/asset/asset-routing.module.ts
View File

@ -23,7 +23,7 @@ import { AssetsTableConfigResolver } from './assets-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
const routes: Routes = [
{

2
ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts
View File

@ -30,7 +30,7 @@ import { dashboardBreadcumbLabelFunction, DashboardResolver } from '@home/pages/
import { EdgesTableConfigResolver } from '@home/pages/edge/edges-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
const routes: Routes = [
{

2
ui-ngx/src/app/modules/home/pages/device-profile/device-profile-routing.module.ts
View File

@ -22,7 +22,7 @@ import { Authority } from '@shared/models/authority.enum';
import { DeviceProfilesTableConfigResolver } from './device-profiles-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

2
ui-ngx/src/app/modules/home/pages/device/device-routing.module.ts
View File

@ -22,7 +22,7 @@ import { Authority } from '@shared/models/authority.enum';
import { DevicesTableConfigResolver } from '@modules/home/pages/device/devices-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

2
ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
View File

@ -40,7 +40,7 @@ import {
TooltipsterResolver
} from '@home/pages/rulechain/rulechain-routing.module';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
const routes: Routes = [
{

2
ui-ngx/src/app/modules/home/pages/entity-view/entity-view-routing.module.ts
View File

@ -22,7 +22,7 @@ import { Authority } from '@shared/models/authority.enum';
import { EntityViewsTableConfigResolver } from '@modules/home/pages/entity-view/entity-views-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

24
ui-ngx/src/app/modules/home/pages/home-pages.models.ts Normal file
View File

@ -0,0 +1,24 @@
///
/// Copyright © 2016-2021 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { BreadCrumbLabelFunction } from '@shared/components/breadcrumb';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
export const entityDetailsPageBreadcrumbLabelFunction: BreadCrumbLabelFunction<EntityDetailsPageComponent>
= ((route, translate, component) => {
return component.entity?.name || component.headerSubtitle;
});

2
ui-ngx/src/app/modules/home/pages/ota-update/ota-update-routing.module.ts
View File

@ -21,7 +21,7 @@ import { NgModule } from '@angular/core';
import { OtaUpdateTableConfigResolve } from '@home/pages/ota-update/ota-update-table-config.resolve';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

2
ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profile-routing.module.ts
View File

@ -22,7 +22,7 @@ import { Authority } from '@shared/models/authority.enum';
import { TenantProfilesTableConfigResolver } from './tenant-profiles-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

2
ui-ngx/src/app/modules/home/pages/tenant/tenant-routing.module.ts
View File

@ -23,7 +23,7 @@ import { TenantsTableConfigResolver } from '@modules/home/pages/tenant/tenants-t
import { UsersTableConfigResolver } from '../user/users-table-config.resolver';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [

2
ui-ngx/src/app/modules/home/pages/user/user-routing.module.ts
View File

@ -20,7 +20,7 @@ import { UsersTableConfigResolver } from '@modules/home/pages/user/users-table-c
import { Authority } from '@shared/models/authority.enum';
import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
import { entityDetailsPageBreadcrumbLabelFunction } from '@core/utils';
import { entityDetailsPageBreadcrumbLabelFunction } from '@home/pages/home-pages.models';
import { BreadCrumbConfig } from '@shared/components/breadcrumb';
const routes: Routes = [