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

Merge pull request #8258 from vvlladd28/improvemen/menu/ruleChains

Browse Source 
Move rule chains menu link in top level
This commit is contained in:
Igor Kulikov 2023-03-24 13:19:32 +02:00 committed by GitHub
commit b21c7ad1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/core/services/menu.service.ts
View File

@ -374,6 +374,13 @@ export class MenuService {
type: 'link',
path: '/customers',
icon: 'supervisor_account'
},
{
id: guid(),
name: 'rulechain.rulechains',
type: 'link',
path: '/ruleChains',
icon: 'settings_ethernet'
}
);
if (authState.edgesSupportEnabled) {
@ -411,13 +418,6 @@ export class MenuService {
path: '/features',
icon: 'construction',
pages: [
{
id: guid(),
name: 'rulechain.rulechains',
type: 'link',
path: '/features/ruleChains',
icon: 'settings_ethernet'
},
{
id: guid(),
name: 'ota-update.ota-updates',

4
ui-ngx/src/app/modules/home/pages/features/features-routing.module.ts
View File

@ -17,7 +17,6 @@
import { RouterModule, Routes } from '@angular/router';
import { Authority } from '@shared/models/authority.enum';
import { NgModule } from '@angular/core';
import { ruleChainsRoutes } from '@home/pages/rulechain/rulechain-routing.module';
import { otaUpdatesRoutes } from '@home/pages/ota-update/ota-update-routing.module';
import { vcRoutes } from '@home/pages/vc/vc-routing.module';
@ -37,10 +36,9 @@ const routes: Routes = [
children: [],
data: {
auth: [Authority.TENANT_ADMIN],
redirectTo: '/features/ruleChains'
redirectTo: '/features/otaUpdates'
}
},
...ruleChainsRoutes,
...otaUpdatesRoutes,
...vcRoutes
]

20
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
View File

@ -122,7 +122,7 @@ export const importRuleChainBreadcumbLabelFunction: BreadCrumbLabelFunction<Rule
return `${translate.instant('rulechain.import')}: ${component.ruleChain.name}`;
});
export const ruleChainsRoutes: Routes = [
const routes: Routes = [
{
path: 'ruleChains',
data: {
@ -189,24 +189,6 @@ export const ruleChainsRoutes: Routes = [
}
];
const routes: Routes = [
{
path: 'ruleChains',
pathMatch: 'full',
redirectTo: '/features/ruleChains'
},
{
path: 'ruleChains/:ruleChainId',
pathMatch: 'full',
redirectTo: '/features/ruleChains/:ruleChainId'
},
{
path: 'ruleChains/ruleChain/import',
pathMatch: 'full',
redirectTo: '/features/ruleChains/ruleChain/import'
}
];
// @dynamic
@NgModule({
imports: [RouterModule.forChild(routes)],

2
ui-ngx/src/app/shared/models/entity-type.models.ts
View File

@ -449,7 +449,7 @@ export const baseDetailsPageByEntityType = new Map<EntityType, string>([
[EntityType.DEVICE, '/entities/devices'],
[EntityType.DEVICE_PROFILE, '/profiles/deviceProfiles'],
[EntityType.ASSET_PROFILE, '/profiles/assetProfiles'],
[EntityType.RULE_CHAIN, '/features/ruleChains'],
[EntityType.RULE_CHAIN, '/ruleChains'],
[EntityType.EDGE, '/edgeManagement/instances'],
[EntityType.ENTITY_VIEW, '/entities/entityViews'],
[EntityType.TB_RESOURCE, '/resources/resources-library'],