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

Merge branch 'rc' of github.com:thingsboard/thingsboard into rc

Browse Source
This commit is contained in:
Igor Kulikov 2024-12-27 16:23:26 +02:00
commit b9a5fd0088
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts
View File

@ -20,15 +20,10 @@ import {
EntityTableColumn, EntityTableColumn,
EntityTableConfig EntityTableConfig
} from '@home/models/entity/entities-table-config.models'; } from '@home/models/entity/entities-table-config.models';
import { import { OAuth2Client, OAuth2ClientInfo, platformTypeTranslations } from '@shared/models/oauth2.models';
getProviderHelpLink,
OAuth2Client,
OAuth2ClientInfo,
platformTypeTranslations
} from '@shared/models/oauth2.models';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { EntityType, entityTypeTranslations } from '@shared/models/entity-type.models'; import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models';
import { OAuth2Service } from '@core/http/oauth2.service'; import { OAuth2Service } from '@core/http/oauth2.service';
import { ClientComponent } from '@home/pages/admin/oauth2/clients/client.component'; import { ClientComponent } from '@home/pages/admin/oauth2/clients/client.component';
import { ClientTableHeaderComponent } from '@home/pages/admin/oauth2/clients/client-table-header.component'; import { ClientTableHeaderComponent } from '@home/pages/admin/oauth2/clients/client-table-header.component';
@ -48,10 +43,7 @@ export class ClientsTableConfigResolver {
this.config.entityType = EntityType.OAUTH2_CLIENT; this.config.entityType = EntityType.OAUTH2_CLIENT;
this.config.rowPointer = true; this.config.rowPointer = true;
this.config.entityTranslations = entityTypeTranslations.get(EntityType.OAUTH2_CLIENT); this.config.entityTranslations = entityTypeTranslations.get(EntityType.OAUTH2_CLIENT);
this.config.entityResources = { this.config.entityResources = entityTypeResources.get(EntityType.OAUTH2_CLIENT);
helpLinkId: null,
helpLinkIdForEntity: (entity: OAuth2Client) => getProviderHelpLink(entity.additionalInfo.providerName)
};
this.config.entityComponent = ClientComponent; this.config.entityComponent = ClientComponent;
this.config.headerComponent = ClientTableHeaderComponent; this.config.headerComponent = ClientTableHeaderComponent;
this.config.addDialogStyle = {width: '850px', maxHeight: '100vh'}; this.config.addDialogStyle = {width: '850px', maxHeight: '100vh'};

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

@ -16,6 +16,7 @@
import { TenantId } from './id/tenant-id'; import { TenantId } from './id/tenant-id';
import { BaseData, HasId } from '@shared/models/base-data'; import { BaseData, HasId } from '@shared/models/base-data';
import { getProviderHelpLink, OAuth2Client } from '@shared/models/oauth2.models';
export enum EntityType { export enum EntityType {
TENANT = 'TENANT', TENANT = 'TENANT',
@ -588,7 +589,8 @@ export const entityTypeResources = new Map<EntityType, EntityTypeResource<BaseDa
[ [
EntityType.OAUTH2_CLIENT, EntityType.OAUTH2_CLIENT,
{ {
helpLinkId: 'oauth2Settings' helpLinkId: 'oauth2Settings',
helpLinkIdForEntity: (entity: OAuth2Client) => getProviderHelpLink(entity.additionalInfo.providerName)
} }
], ],
[ [