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

Merge pull request #12206 from ArtemDzhereleiko/AD/hot-fix/js-module-no-text

Browse Source 
Add no text for resources autocomplete
This commit is contained in:
Igor Kulikov 2024-12-09 18:25:32 +02:00 committed by GitHub
commit 69f42d0d45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui-ngx/src/app/shared/components/resource/resource-autocomplete.component.html
View File

@ -41,8 +41,24 @@
<mat-option *ngFor="let resource of filteredResources$ | async" [value]="resource"> <mat-option *ngFor="let resource of filteredResources$ | async" [value]="resource">
<span [innerHTML]="resource.title | highlight:searchText"></span> <span [innerHTML]="resource.title | highlight:searchText"></span>
</mat-option> </mat-option>
<ng-container *ngIf="subType !== ResourceSubType.EXTENSION; else extensionNoText">
<mat-option *ngIf="!(filteredResources$ | async)?.length" [value]="null">
<div (click)="$event.stopPropagation()">
<div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">
<span>{{ 'js-func.no-js-module-text' | translate }}</span>
</div>
<ng-template #searchNotEmpty>
<span>
{{ 'js-func.no-js-module-matching' | translate: {module: searchText | truncate: true: 6: &apos;...&apos;} }}
</span>
</ng-template>
</div>
</mat-option>
</ng-container>
<ng-template #extensionNoText>
<mat-option *ngIf="!(filteredResources$ | async)?.length" [value]="searchText"> <mat-option *ngIf="!(filteredResources$ | async)?.length" [value]="searchText">
{{ searchText }} {{ searchText }}
</mat-option> </mat-option>
</ng-template>
</mat-autocomplete> </mat-autocomplete>
</mat-form-field> </mat-form-field>

6
ui-ngx/src/app/shared/components/resource/resource-autocomplete.component.ts
View File

@ -78,6 +78,8 @@ export class ResourceAutocompleteComponent implements ControlValueAccessor, OnIn
@Input() @Input()
subType = ResourceSubType.EXTENSION; subType = ResourceSubType.EXTENSION;
ResourceSubType = ResourceSubType;
resourceFormGroup = this.fb.group({ resourceFormGroup = this.fb.group({
resource: this.fb.control<string|ResourceInfo>(null) resource: this.fb.control<string|ResourceInfo>(null)
}); });
@ -210,6 +212,10 @@ export class ResourceAutocompleteComponent implements ControlValueAccessor, OnIn
} }
} }
textIsNotEmpty(text: string): boolean {
return (text && text.length > 0);
}
private fetchResources(searchText?: string): Observable<Array<ResourceInfo>> { private fetchResources(searchText?: string): Observable<Array<ResourceInfo>> {
this.searchText = searchText; this.searchText = searchText;
return this.resourceService.getResources(new PageLink(50, 0, searchText), ResourceType.JS_MODULE, this.subType, {ignoreLoading: true}).pipe( return this.resourceService.getResources(new PageLink(50, 0, searchText), ResourceType.JS_MODULE, this.subType, {ignoreLoading: true}).pipe(

4
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -3332,7 +3332,9 @@
"module-no-members": "Module has no exported members", "module-no-members": "Module has no exported members",
"module-load-error": "Module load error", "module-load-error": "Module load error",
"source-code": "Source code", "source-code": "Source code",
"source-code-load-error": "Source code load error" "source-code-load-error": "Source code load error",
"no-js-module-text": "No JS modules found",
"no-js-module-matching": "No JS modules matching '{{module}}' were found."
}, },
"key-val": { "key-val": {
"key": "Key", "key": "Key",