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

Merge pull request #14120 from ArtemDzhereleiko/AD/bug-fix/resources-general

Browse Source 
General resources show resources type on add dialog
This commit is contained in:
Vladyslav Prykhodko 2025-10-08 15:41:58 +03:00 committed by GitHub
commit 395f262573
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
View File

@ -30,7 +30,7 @@
</button> </button>
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'delete')" (click)="onEntityAction($event, 'deleteResource')"
[class.!hidden]="hideDelete() || isEdit"> [class.!hidden]="hideDelete() || isEdit">
{{ 'resource.delete' | translate }} {{ 'resource.delete' | translate }}
</button> </button>
@ -48,16 +48,14 @@
<div class="mat-padding flex flex-col"> <div class="mat-padding flex flex-col">
<form [formGroup]="entityForm"> <form [formGroup]="entityForm">
<fieldset [disabled]="(isLoading$ | async) || !isEdit"> <fieldset [disabled]="(isLoading$ | async) || !isEdit">
@if (resourceTypes.length > 1) { <mat-form-field class="mat-block">
<mat-form-field class="mat-block"> <mat-label translate>resource.resource-type</mat-label>
<mat-label translate>resource.resource-type</mat-label> <mat-select formControlName="resourceType" required>
<mat-select formControlName="resourceType" required> <mat-option *ngFor="let resourceType of resourceTypes" [value]="resourceType">
<mat-option *ngFor="let resourceType of resourceTypes" [value]="resourceType"> {{ resourceTypesTranslationMap.get(resourceType) | translate }}
{{ resourceTypesTranslationMap.get(resourceType) | translate }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
}
<mat-form-field class="mat-block" *ngIf="entityForm.get('resourceType').value !== resourceType.LWM2M_MODEL || !isAdd"> <mat-form-field class="mat-block" *ngIf="entityForm.get('resourceType').value !== resourceType.LWM2M_MODEL || !isAdd">
<mat-label translate>resource.title</mat-label> <mat-label translate>resource.title</mat-label>
<input matInput formControlName="title" required> <input matInput formControlName="title" required>

4
ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
View File

@ -112,6 +112,10 @@ export class ResourcesLibraryComponent extends EntityComponent<Resource> impleme
if (this.isEdit && this.entityForm && !this.isAdd) { if (this.isEdit && this.entityForm && !this.isAdd) {
this.entityForm.get('resourceType').disable({ emitEvent: false }); this.entityForm.get('resourceType').disable({ emitEvent: false });
this.entityForm.get('fileName').disable({ emitEvent: false }); this.entityForm.get('fileName').disable({ emitEvent: false });
this.entityForm.get('data').disable({ emitEvent: false });
}
if (this.isAdd && this.resourceTypes.length === 1) {
this.entityForm.get('resourceType').disable({ emitEvent: false });
} }
} }

2
ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
View File

@ -173,7 +173,7 @@ export class ResourcesLibraryTableConfigResolver {
case 'downloadResource': case 'downloadResource':
this.downloadResource(action.event, action.entity); this.downloadResource(action.event, action.entity);
return true; return true;
case 'deleteLibrary': case 'deleteResource':
this.deleteResource(action.event, action.entity); this.deleteResource(action.event, action.entity);
} }
return false; return false;