Browse Source
* Added Validation for Resource Usage Across Entities * Fixed table name in native queries * resolved issues from PR review * UI: Feature show JS resources usage message warning on delete. Refactored images-in-use-dialog. * UI: JS lib table fix display delete icon. * UI: Resources in use minor improvements. * Fixed tests, license format * Fix issues causing test failures * Removed unused method * UI: Fix js-library table cell actions. * UI: Fix js-library table cell actions. --------- Co-authored-by: deaflynx <artemio.babak@gmail.com>pull/12788/head
artem-barysh-dev
1 year ago
committed by
GitHub
GitHub
29 changed files with 1012 additions and 203 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,32 @@ |
|||
/** |
|||
* Copyright © 2016-2025 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. |
|||
*/ |
|||
package org.thingsboard.server.common.data; |
|||
|
|||
import lombok.Builder; |
|||
import lombok.Data; |
|||
import org.thingsboard.server.common.data.id.HasId; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
@Data |
|||
@Builder |
|||
public class TbResourceDeleteResult { |
|||
|
|||
private boolean success; |
|||
private Map<String, List<? extends HasId<?>>> references; |
|||
|
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
/** |
|||
* Copyright © 2016-2025 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. |
|||
*/ |
|||
package org.thingsboard.server.dao; |
|||
|
|||
import org.thingsboard.server.common.data.id.HasId; |
|||
import org.thingsboard.server.common.data.id.TenantId; |
|||
|
|||
import java.util.List; |
|||
|
|||
public interface ResourceContainerDao<T extends HasId<?>> { |
|||
|
|||
List<T> findByTenantIdAndResourceLink(TenantId tenantId, String link, int limit); |
|||
|
|||
List<T> findByResourceLink(String link, int limit); |
|||
|
|||
} |
|||
@ -0,0 +1,130 @@ |
|||
///
|
|||
/// Copyright © 2016-2025 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 { CollectionViewer, DataSource, SelectionModel } from '@angular/cdk/collections'; |
|||
import { ResourceInfo, ResourceSubType, ResourceType } from '@shared/models/resource.models'; |
|||
import { BehaviorSubject, Observable, of, ReplaySubject, Subject } from 'rxjs'; |
|||
import { emptyPageData, PageData } from '@shared/models/page/page-data'; |
|||
import { EntityBooleanFunction } from '@home/models/entity/entities-table-config.models'; |
|||
import { PageLink } from '@shared/models/page/page-link'; |
|||
import { catchError, map, take, tap } from 'rxjs/operators'; |
|||
import { ResourceService } from "@core/http/resource.service"; |
|||
|
|||
export class ResourcesDatasource implements DataSource<ResourceInfo> { |
|||
private entitiesSubject: Subject<ResourceInfo[]>; |
|||
private readonly pageDataSubject: Subject<PageData<ResourceInfo>>; |
|||
|
|||
public pageData$: Observable<PageData<ResourceInfo>>; |
|||
|
|||
public selection = new SelectionModel<ResourceInfo>(true, []); |
|||
|
|||
public dataLoading = true; |
|||
|
|||
constructor(private resourceService: ResourceService, |
|||
private resources: ResourceInfo[], |
|||
private selectionEnabledFunction: EntityBooleanFunction<ResourceInfo>) { |
|||
if (this.resources && this.resources.length) { |
|||
this.entitiesSubject = new BehaviorSubject<ResourceInfo[]>(this.resources); |
|||
} else { |
|||
this.entitiesSubject = new BehaviorSubject<ResourceInfo[]>([]); |
|||
this.pageDataSubject = new BehaviorSubject<PageData<ResourceInfo>>(emptyPageData<ResourceInfo>()); |
|||
this.pageData$ = this.pageDataSubject.asObservable(); |
|||
} |
|||
} |
|||
|
|||
connect(collectionViewer: CollectionViewer): |
|||
Observable<ResourceInfo[] | ReadonlyArray<ResourceInfo>> { |
|||
return this.entitiesSubject.asObservable(); |
|||
} |
|||
|
|||
disconnect(collectionViewer: CollectionViewer): void { |
|||
this.entitiesSubject.complete(); |
|||
if (this.pageDataSubject) { |
|||
this.pageDataSubject.complete(); |
|||
} |
|||
} |
|||
|
|||
reset() { |
|||
this.entitiesSubject.next([]); |
|||
if (this.pageDataSubject) { |
|||
this.pageDataSubject.next(emptyPageData<ResourceInfo>()); |
|||
} |
|||
} |
|||
|
|||
loadEntities(pageLink: PageLink, resourceType: ResourceType, subType: ResourceSubType): Observable<PageData<ResourceInfo>> { |
|||
this.dataLoading = true; |
|||
const result = new ReplaySubject<PageData<ResourceInfo>>(); |
|||
this.fetchEntities(pageLink, resourceType, subType).pipe( |
|||
tap(() => { |
|||
this.selection.clear(); |
|||
}), |
|||
catchError(() => of(emptyPageData<ResourceInfo>())), |
|||
).subscribe( |
|||
(pageData) => { |
|||
this.entitiesSubject.next(pageData.data); |
|||
this.pageDataSubject.next(pageData); |
|||
result.next(pageData); |
|||
this.dataLoading = false; |
|||
} |
|||
); |
|||
return result; |
|||
} |
|||
|
|||
fetchEntities(pageLink: PageLink, resourceType: ResourceType, subType: ResourceSubType): Observable<PageData<ResourceInfo>> { |
|||
return this.resourceService.getResources(pageLink, resourceType, subType); |
|||
} |
|||
|
|||
isAllSelected(): Observable<boolean> { |
|||
const numSelected = this.selection.selected.length; |
|||
return this.entitiesSubject.pipe( |
|||
map((entities) => numSelected === entities.length) |
|||
); |
|||
} |
|||
|
|||
isEmpty(): Observable<boolean> { |
|||
return this.entitiesSubject.pipe( |
|||
map((entities) => !entities.length) |
|||
); |
|||
} |
|||
|
|||
total(): Observable<number> { |
|||
return this.pageDataSubject.pipe( |
|||
map((pageData) => pageData.totalElements) |
|||
); |
|||
} |
|||
|
|||
masterToggle() { |
|||
this.entitiesSubject.pipe( |
|||
tap((entities) => { |
|||
const numSelected = this.selection.selected.length; |
|||
if (numSelected === this.selectableEntitiesCount(entities)) { |
|||
this.selection.clear(); |
|||
} else { |
|||
entities.forEach(row => { |
|||
if (this.selectionEnabledFunction(row)) { |
|||
this.selection.select(row); |
|||
} |
|||
}); |
|||
} |
|||
}), |
|||
take(1) |
|||
).subscribe(); |
|||
} |
|||
|
|||
private selectableEntitiesCount(entities: Array<ResourceInfo>): number { |
|||
return entities.filter((entity) => this.selectionEnabledFunction(entity)).length; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue