From d8308be53aae5b882485571198faefefe0adb475 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 9 Mar 2026 18:49:29 +0200 Subject: [PATCH 001/219] Add IoT Hub browse page integration Propagate IoT Hub marketplace browse page to ThingsBoard, allowing TENANT_ADMIN users to discover and install community widgets, dashboards, rule chains, calculated fields, and device profiles. Backend: - Add iot-hub.base-url config (default: https://iot-hub.thingsboard.io) - Add IotHubController with POST /api/iot-hub/versions/{id}/install - Add IotHubService with per-type install logic (widget, dashboard, etc.) - Add IotHubRestClient for IoT Hub public API communication - Expose iotHubBaseUrl via SystemParams Frontend: - Add IoT Hub browse page with search, filtering, sorting, pagination - Add item detail dialog with readme rendering - Add install dialog calling backend install endpoint - Add creator profile page - Add IotHubApiService with dynamic base URL from NgRx auth state - Add IoT Hub menu entry for TENANT_ADMIN users - Add i18n translations for iot-hub, item, item-data sections --- .../server/controller/IotHubController.java | 48 ++ .../controller/SystemInfoController.java | 4 + .../service/iot_hub/DefaultIotHubService.java | 128 ++++++ .../service/iot_hub/IotHubRestClient.java | 54 +++ .../server/service/iot_hub/IotHubService.java | 24 + .../src/main/resources/thingsboard.yml | 2 + .../server/common/data/SystemParams.java | 1 + ui-ngx/src/app/core/auth/auth.models.ts | 1 + ui-ngx/src/app/core/auth/auth.reducer.ts | 3 +- .../src/app/core/http/iot-hub-api.service.ts | 126 ++++++ ui-ngx/src/app/core/services/menu.models.ts | 14 +- .../modules/home/pages/home-pages.module.ts | 2 + .../iot-hub/iot-hub-browse.component.html | 215 +++++++++ .../iot-hub/iot-hub-browse.component.scss | 400 +++++++++++++++++ .../pages/iot-hub/iot-hub-browse.component.ts | 388 ++++++++++++++++ .../iot-hub-creator-profile.component.html | 82 ++++ .../iot-hub-creator-profile.component.scss | 119 +++++ .../iot-hub-creator-profile.component.ts | 70 +++ .../iot-hub-install-dialog.component.ts | 123 +++++ .../iot-hub/iot-hub-item-card.component.html | 107 +++++ .../iot-hub/iot-hub-item-card.component.scss | 351 +++++++++++++++ .../iot-hub/iot-hub-item-card.component.ts | 204 +++++++++ .../iot-hub-item-detail-dialog.component.html | 188 ++++++++ .../iot-hub-item-detail-dialog.component.scss | 419 ++++++++++++++++++ .../iot-hub-item-detail-dialog.component.ts | 246 ++++++++++ .../pages/iot-hub/iot-hub-routing.module.ts | 63 +++ .../home/pages/iot-hub/iot-hub.module.ts | 41 ++ .../models/iot-hub/iot-hub-creator.models.ts | 29 ++ .../models/iot-hub/iot-hub-item.models.ts | 174 ++++++++ .../models/iot-hub/iot-hub-version.models.ts | 153 +++++++ .../assets/locale/locale.constant-en_US.json | 126 +++++- 31 files changed, 3902 insertions(+), 3 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/controller/IotHubController.java create mode 100644 application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubRestClient.java create mode 100644 application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java create mode 100644 ui-ngx/src/app/core/http/iot-hub-api.service.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts create mode 100644 ui-ngx/src/app/shared/models/iot-hub/iot-hub-creator.models.ts create mode 100644 ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts create mode 100644 ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts diff --git a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java new file mode 100644 index 0000000000..eef17d8c96 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java @@ -0,0 +1,48 @@ +/** + * Copyright © 2016-2026 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.controller; + +import com.fasterxml.jackson.databind.JsonNode; +import io.swagger.v3.oas.annotations.Hidden; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.server.queue.util.TbCoreComponent; +import org.thingsboard.server.service.iot_hub.IotHubService; + +@Hidden +@RestController +@TbCoreComponent +@RequestMapping("/api/iot-hub") +@RequiredArgsConstructor +@Slf4j +public class IotHubController extends BaseController { + + private final IotHubService iotHubService; + + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @PostMapping("/versions/{versionId}/install") + @ResponseBody + public JsonNode installItemVersion(@PathVariable String versionId) throws Exception { + return iotHubService.installItemVersion(getCurrentUser(), versionId); + } +} diff --git a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java index 61240d304e..40e88a4c6e 100644 --- a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java +++ b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java @@ -76,6 +76,9 @@ public class SystemInfoController extends BaseController { @Value("${debug.settings.default_duration:15}") private int defaultDebugDurationMinutes; + @Value("${iot-hub.base-url:https://iot-hub.thingsboard.io}") + private String iotHubBaseUrl; + @Autowired(required = false) private BuildProperties buildProperties; @@ -164,6 +167,7 @@ public class SystemInfoController extends BaseController { systemParams.setMaxDataPointsPerRollingArg(tenantProfileConfiguration.getMaxDataPointsPerRollingArg()); systemParams.setTrendzSettings(trendzSettingsService.findTrendzSettings(currentUser.getTenantId())); } + systemParams.setIotHubBaseUrl(iotHubBaseUrl); systemParams.setMobileQrEnabled(Optional.ofNullable(qrCodeSettingService.findQrCodeSettings(TenantId.SYS_TENANT_ID)) .map(QrCodeSettings::getQrCodeConfig).map(QRCodeConfig::isShowOnHomePage) .orElse(false)); diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java new file mode 100644 index 0000000000..173ae79020 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java @@ -0,0 +1,128 @@ +/** + * Copyright © 2016-2026 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.service.iot_hub; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.DeviceProfile; +import org.thingsboard.server.common.data.cf.CalculatedField; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rule.RuleChainData; +import org.thingsboard.server.common.data.widget.WidgetTypeDetails; +import org.thingsboard.server.queue.util.TbCoreComponent; +import org.thingsboard.server.service.entitiy.cf.TbCalculatedFieldService; +import org.thingsboard.server.service.entitiy.dashboard.TbDashboardService; +import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService; +import org.thingsboard.server.service.entitiy.widgets.type.TbWidgetTypeService; +import org.thingsboard.server.service.rule.TbRuleChainService; +import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.dao.rule.RuleChainService; + +@Service +@TbCoreComponent +@RequiredArgsConstructor +@Slf4j +public class DefaultIotHubService implements IotHubService { + + private final IotHubRestClient iotHubRestClient; + private final TbWidgetTypeService tbWidgetTypeService; + private final TbDashboardService tbDashboardService; + private final TbCalculatedFieldService tbCalculatedFieldService; + private final RuleChainService ruleChainService; + private final TbRuleChainService tbRuleChainService; + private final TbDeviceProfileService tbDeviceProfileService; + + @Override + public JsonNode installItemVersion(SecurityUser user, String versionId) throws Exception { + TenantId tenantId = user.getTenantId(); + log.info("[{}] Installing IoT Hub item version: {}", tenantId, versionId); + + JsonNode versionInfo = iotHubRestClient.getVersionInfo(versionId); + String itemType = versionInfo.get("type").asText(); + String itemName = versionInfo.get("name").asText(); + log.debug("[{}] Fetched version info: {} (type: {})", tenantId, itemName, itemType); + + byte[] fileData = iotHubRestClient.getVersionFileData(versionId); + log.debug("[{}] Fetched file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); + + switch (itemType) { + case "WIDGET": + installWidget(user, tenantId, fileData); + break; + case "DASHBOARD": + installDashboard(user, tenantId, fileData); + break; + case "CALCULATED_FIELD": + installCalculatedField(user, tenantId, fileData); + break; + case "RULE_CHAIN": + installRuleChain(tenantId, fileData); + break; + case "DEVICE": + installDeviceProfile(user, tenantId, fileData); + break; + default: + throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); + } + + iotHubRestClient.reportVersionInstalled(versionId); + log.info("[{}] Successfully installed IoT Hub item version: {} (type: {})", tenantId, itemName, itemType); + + return versionInfo; + } + + private void installWidget(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + WidgetTypeDetails widgetTypeDetails = JacksonUtil.fromBytes(fileData, WidgetTypeDetails.class); + widgetTypeDetails.setId(null); + widgetTypeDetails.setTenantId(tenantId); + tbWidgetTypeService.save(widgetTypeDetails, true, user); + log.debug("[{}] Widget installed: {}", tenantId, widgetTypeDetails.getName()); + } + + private void installDashboard(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + Dashboard dashboard = JacksonUtil.fromBytes(fileData, Dashboard.class); + dashboard.setId(null); + dashboard.setTenantId(tenantId); + tbDashboardService.save(dashboard, user); + log.debug("[{}] Dashboard installed: {}", tenantId, dashboard.getTitle()); + } + + private void installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + CalculatedField calculatedField = JacksonUtil.fromBytes(fileData, CalculatedField.class); + calculatedField.setId(null); + calculatedField.setTenantId(tenantId); + tbCalculatedFieldService.save(calculatedField, user); + log.debug("[{}] Calculated field installed: {}", tenantId, calculatedField.getName()); + } + + private void installRuleChain(TenantId tenantId, byte[] fileData) { + RuleChainData ruleChainData = JacksonUtil.fromBytes(fileData, RuleChainData.class); + ruleChainService.importTenantRuleChains(tenantId, ruleChainData, false, tbRuleChainService::updateRuleNodeConfiguration); + log.debug("[{}] Rule chain(s) installed", tenantId); + } + + private void installDeviceProfile(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + DeviceProfile deviceProfile = JacksonUtil.fromBytes(fileData, DeviceProfile.class); + deviceProfile.setId(null); + deviceProfile.setTenantId(tenantId); + tbDeviceProfileService.save(deviceProfile, user); + log.debug("[{}] Device profile installed: {}", tenantId, deviceProfile.getName()); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubRestClient.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubRestClient.java new file mode 100644 index 0000000000..1155bcf0ad --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubRestClient.java @@ -0,0 +1,54 @@ +/** + * Copyright © 2016-2026 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.service.iot_hub; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; +import org.thingsboard.server.queue.util.TbCoreComponent; + +@Component +@TbCoreComponent +@Slf4j +public class IotHubRestClient { + + private final RestTemplate restTemplate = new RestTemplate(); + + @Value("${iot-hub.base-url:https://iot-hub.thingsboard.io}") + private String baseUrl; + + public JsonNode getVersionInfo(String versionId) { + String url = baseUrl + "/api/versions/" + versionId; + log.debug("Fetching IoT Hub version info: {}", url); + return restTemplate.getForObject(url, JsonNode.class); + } + + public byte[] getVersionFileData(String versionId) { + String url = baseUrl + "/api/versions/" + versionId + "/fileData"; + log.debug("Fetching IoT Hub version file data: {}", url); + ResponseEntity response = restTemplate.getForEntity(url, byte[].class); + return response.getBody(); + } + + public void reportVersionInstalled(String versionId) { + String url = baseUrl + "/api/versions/" + versionId + "/install"; + log.debug("Reporting IoT Hub version installed: {}", url); + restTemplate.postForObject(url, null, Void.class); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java new file mode 100644 index 0000000000..9a92825d82 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2026 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.service.iot_hub; + +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.service.security.model.SecurityUser; + +public interface IotHubService { + + JsonNode installItemVersion(SecurityUser user, String versionId) throws Exception; +} diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 751d1c0e0b..42fd314563 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -2061,3 +2061,5 @@ mqtt: # The actual delay is randomized within a range defined by multiplying the base delay by a factor between (1 - jitter_factor) and (1 + jitter_factor). # For example, a jitter_factor of 0.15 means the actual delay may vary by up to ±15% of the base delay. jitter_factor: "${TB_MQTT_CLIENT_RETRANSMISSION_JITTER_FACTOR:0.15}" +iot-hub: + base-url: "${IOT_HUB_BASE_URL:https://iot-hub.thingsboard.io}" # IoT Hub base URL for fetching published items, resources, etc. diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SystemParams.java b/common/data/src/main/java/org/thingsboard/server/common/data/SystemParams.java index c31b49325e..1da7cfef68 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/SystemParams.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/SystemParams.java @@ -39,4 +39,5 @@ public class SystemParams { long maxArgumentsPerCF; long maxDataPointsPerRollingArg; TrendzSettings trendzSettings; + String iotHubBaseUrl; } diff --git a/ui-ngx/src/app/core/auth/auth.models.ts b/ui-ngx/src/app/core/auth/auth.models.ts index 344c44f6c7..b092f7dc5f 100644 --- a/ui-ngx/src/app/core/auth/auth.models.ts +++ b/ui-ngx/src/app/core/auth/auth.models.ts @@ -34,6 +34,7 @@ export interface SysParamsState { ruleChainDebugPerTenantLimitsConfiguration?: string; calculatedFieldDebugPerTenantLimitsConfiguration?: string; trendzSettings: TrendzSettings; + iotHubBaseUrl: string; } export interface SysParams extends SysParamsState { diff --git a/ui-ngx/src/app/core/auth/auth.reducer.ts b/ui-ngx/src/app/core/auth/auth.reducer.ts index ca46344bbb..5838bee5c6 100644 --- a/ui-ngx/src/app/core/auth/auth.reducer.ts +++ b/ui-ngx/src/app/core/auth/auth.reducer.ts @@ -36,7 +36,8 @@ const emptyUserAuthState: AuthPayload = { maxDataPointsPerRollingArg: 0, maxDebugModeDurationMinutes: 0, userSettings: initialUserSettings, - trendzSettings: initialTrendzSettings + trendzSettings: initialTrendzSettings, + iotHubBaseUrl: '' }; export const initialState: AuthState = { diff --git a/ui-ngx/src/app/core/http/iot-hub-api.service.ts b/ui-ngx/src/app/core/http/iot-hub-api.service.ts new file mode 100644 index 0000000000..eac2492012 --- /dev/null +++ b/ui-ngx/src/app/core/http/iot-hub-api.service.ts @@ -0,0 +1,126 @@ +/// +/// Copyright © 2016-2026 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 { Injectable } from '@angular/core'; +import { HttpClient, HttpParams } from '@angular/common/http'; +import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs'; +import { PageData } from '@shared/models/page/page-data'; +import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; +import { CreatorView } from '@shared/models/iot-hub/iot-hub-creator.models'; +import { InterceptorHttpParams } from '@core/interceptors/interceptor-http-params'; +import { InterceptorConfig } from '@core/interceptors/interceptor-config'; +import { AppState } from '@core/core.state'; +import { getCurrentAuthState } from '@core/auth/auth.selectors'; +import { environment as env } from '@env/environment'; + +export function tbVersionToInt(version: string): number { + const parts = version.replace(/[^0-9.]/g, '').split('.'); + const major = parseInt(parts[0], 10) || 0; + const minor = parseInt(parts[1], 10) || 0; + const patch = parseInt(parts[2], 10) || 0; + return major * 100 + minor * 10 + patch; +} + +export function iotHubResourceUrl(baseUrl: string, path: string): string { + if (!path) { + return path; + } + if (path.startsWith('http://') || path.startsWith('https://')) { + return path; + } + return `${baseUrl}${path.startsWith('/') ? '' : '/'}${path}`; +} + +export interface IotHubRequestConfig { + ignoreLoading?: boolean; + ignoreErrors?: boolean; +} + +@Injectable({ + providedIn: 'root' +}) +export class IotHubApiService { + + constructor( + private http: HttpClient, + private store: Store + ) {} + + get baseUrl(): string { + return getCurrentAuthState(this.store)?.iotHubBaseUrl || ''; + } + + public resolveResourceUrl(path: string): string { + return iotHubResourceUrl(this.baseUrl, path); + } + + public getPublishedVersions(query: MpItemVersionQuery, config?: IotHubRequestConfig): Observable> { + if (query.tbVersion == null) { + query.tbVersion = tbVersionToInt(env.tbVersion); + } + if (query.peOnly == null) { + query.peOnly = false; + } + return this.http.get>( + `${this.baseUrl}/api/versions/published${query.toQuery()}`, + { params: this.buildParams(config) } + ); + } + + public getVersionReadme(versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.get(`${this.baseUrl}/api/versions/${versionId}/readme`, { + params: this.buildParams(config), + responseType: 'text' + }); + } + + public getVersionFileData(versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.get(`${this.baseUrl}/api/versions/${versionId}/fileData`, { + params: this.buildParams(config), + responseType: 'blob' + }); + } + + public reportVersionInstalled(versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.post( + `${this.baseUrl}/api/versions/${versionId}/install`, + null, + { params: this.buildParams(config) } + ); + } + + public installItemVersion(versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.post( + `/api/iot-hub/versions/${versionId}/install`, + null, + { params: this.buildParams(config) } + ); + } + + public getCreatorProfile(creatorId: string, config?: IotHubRequestConfig): Observable { + return this.http.get( + `${this.baseUrl}/api/creators/${creatorId}/profile`, + { params: this.buildParams(config) } + ); + } + + private buildParams(config?: IotHubRequestConfig): HttpParams { + return new InterceptorHttpParams( + new InterceptorConfig(config?.ignoreLoading ?? false, config?.ignoreErrors ?? false) + ); + } +} diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts index a3863f8b5e..6517e606b3 100644 --- a/ui-ngx/src/app/core/services/menu.models.ts +++ b/ui-ngx/src/app/core/services/menu.models.ts @@ -106,7 +106,8 @@ export enum MenuId { version_control = 'version_control', api_usage = 'api_usage', trendz_settings = 'trendz_settings', - ai_models = 'ai_models' + ai_models = 'ai_models', + iot_hub = 'iot_hub' } declare type MenuFilter = (authState: AuthState) => boolean; @@ -707,6 +708,16 @@ export const menuSectionMap = new Map([ path: '/settings/trendz', icon: 'trendz-settings' } + ], + [ + MenuId.iot_hub, + { + id: MenuId.iot_hub, + name: 'iot-hub.iot-hub', + type: 'link', + path: '/iot-hub', + icon: 'store' + } ] ]); @@ -860,6 +871,7 @@ const defaultUserMenuMap = new Map([ ] }, {id: MenuId.api_usage}, + {id: MenuId.iot_hub}, { id: MenuId.settings, pages: [ diff --git a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts index 84412fabf4..fcc8298904 100644 --- a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts +++ b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts @@ -47,6 +47,7 @@ import { ScadaSymbolModule } from '@home/pages/scada-symbol/scada-symbol.module' import { GatewaysModule } from '@home/pages/gateways/gateways.module'; import { MobileModule } from '@home/pages/mobile/mobile.module'; import { AiModelModule } from '@home/pages/ai-model/ai-model.module'; +import { IotHubModule } from '@home/pages/iot-hub/iot-hub.module'; @NgModule({ exports: [ @@ -81,6 +82,7 @@ import { AiModelModule } from '@home/pages/ai-model/ai-model.module'; AccountModule, ScadaSymbolModule, AiModelModule, + IotHubModule, ] }) export class HomePagesModule { } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html new file mode 100644 index 0000000000..b9f4bf4d75 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -0,0 +1,215 @@ + +
+ + @if (!embedded) { +
+

{{ getTitle() | translate }}

+

{{ getSubtitle() | translate }}

+
+ } + + + + + + +
+ + search + + @if (textSearch) { + + } + + + + @for (option of sortOptions; track option.value; let i = $index) { + {{ option.label | translate }} + } + + +
+ + +
+ @if (getSubtypeMap(); as subtypeMap) { + + + @for (entry of subtypeMap | keyvalue; track entry.key) { + {{ entry.value | translate }} + } + + + } + @if (categories.size > 0) { + + + @for (entry of categories | keyvalue; track entry.key) { + {{ entry.value | translate }} + } + + + } + + + @for (entry of useCases | keyvalue; track entry.key) { + {{ entry.value | translate }} + } + + +
+ + + @if (hasActiveDropdownFilters()) { +
+ @for (key of getActiveSubtypesArray(); track key) { + + {{ getSubtypeLabel(key) }} + close + + } + @for (key of getActiveCategoriesArray(); track key) { + + {{ getCategoryLabel(key) }} + close + + } + @for (key of getActiveUseCasesArray(); track key) { + + {{ getUseCaseLabel(key) }} + close + + } + +
+ } + + + @if (!isLoading && !hasError) { +
+ {{ 'iot-hub.results-count' | translate:{ count: totalElements } }} +
+ } + + + @if (isLoading) { +
+ +
+ } + + + @if (hasError && !isLoading) { +
+ error_outline +

{{ 'iot-hub.unable-to-load' | translate }}

+

{{ 'iot-hub.unable-to-load-text' | translate }}

+ +
+ } + + + @if (!isLoading && !hasError && items.length === 0) { +
+ search_off +

{{ 'iot-hub.no-items-found' | translate }}

+

{{ 'iot-hub.no-items-found-text' | translate }}

+ @if (hasActiveFilters()) { + + } +
+ } + + + @if (!isLoading && !hasError && items.length > 0) { +
+ @for (item of items; track item.id) { + + + } +
+ + + + + } + + + @if (!creatorId) { +
+ + {{ 'iot-hub.become-a-creator' | translate }} + +
+ } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss new file mode 100644 index 0000000000..110133e5ff --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss @@ -0,0 +1,400 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host { + display: flex; + flex-direction: column; + height: 100%; + padding: 16px 24px; + overflow: auto; + + &.embedded { + padding: 0; + overflow: visible; + height: auto; + } +} + +.tb-iot-hub-browse-container { + max-width: 1400px; + margin: 0 auto; + width: 100%; + background: white; + padding: 24px; + border-radius: 4px; + box-shadow: 0 0 1px rgba(0, 0, 0, 0.14), 0 1px 1px rgba(0, 0, 0, 0.12); + + &.embedded { + max-width: none; + padding: 0; + border-radius: 0; + box-shadow: none; + background: transparent; + } +} + +.tb-iot-hub-browse-header { + margin-bottom: 24px; + + h1 { + font-size: 28px; + font-weight: 700; + margin: 0 0 4px; + color: rgba(0, 0, 0, 0.87); + } + + p { + font-size: 14px; + color: rgba(0, 0, 0, 0.54); + margin: 0; + } +} + +.tb-iot-hub-type-tabs { + margin-bottom: 16px; + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + + ::ng-deep { + .mat-mdc-tab-link-container { + flex-grow: 0; + } + + .mat-mdc-tab-link { + text-transform: none; + font-weight: 400; + min-width: auto; + padding: 0 16px; + letter-spacing: normal; + height: 40px; + flex: 0 0 auto; + } + + --mat-tab-active-indicator-color: #1976d2; + + .mdc-tab__text-label { + color: rgba(0, 0, 0, 0.6); + } + + .mdc-tab--active .mdc-tab__text-label { + font-weight: 500; + } + + --mat-tab-active-label-text-color: #1976d2; + --mat-tab-active-focus-label-text-color: #1976d2; + --mat-tab-active-hover-label-text-color: #1976d2; + --mat-tab-active-ripple-color: #1976d2; + --mat-tab-inactive-ripple-color: #1976d2; + --mat-tab-active-focus-indicator-color: #1976d2; + } +} + +// Shared field styles for search/filter/sort dropdowns +%tb-iot-hub-field-base { + ::ng-deep { + .mat-mdc-text-field-wrapper { + height: 42px; + padding: 0 12px; + } + + .mat-mdc-form-field-flex { + height: 42px; + align-items: center; + } + + .mdc-notched-outline__leading, + .mdc-notched-outline__notch, + .mdc-notched-outline__trailing { + border-color: #d5dbe3; + } + + .mdc-notched-outline__leading { + border-radius: 8px 0 0 8px; + } + + .mdc-notched-outline__trailing { + border-radius: 0 8px 8px 0; + } + + .mat-mdc-form-field-infix { + padding-top: 0; + padding-bottom: 0; + min-height: unset; + } + + .mdc-notched-outline__notch { + display: none; + } + + .mat-mdc-floating-label { + display: none; + } + + .mat-mdc-form-field-subscript-wrapper { + display: none; + } + + input.mat-mdc-input-element { + font-size: 14px; + color: #3e4a59; + + &::placeholder { + color: #8b95a2; + opacity: 1; + } + } + + .mat-mdc-select-value-text { + font-size: 14px; + color: #3e4a59; + } + + .mat-mdc-select-arrow-wrapper { + padding-left: 4px; + } + + .mat-icon { + color: #8b95a2; + font-size: 20px; + width: 20px; + height: 20px; + } + } + + &.mat-focused ::ng-deep { + .mdc-notched-outline__leading, + .mdc-notched-outline__notch, + .mdc-notched-outline__trailing { + border-color: #8b95a2; + border-width: 1px; + } + } +} + +.tb-iot-hub-search-row { + display: flex; + gap: 12px; + margin-bottom: 12px; + align-items: center; + + .tb-iot-hub-search-field, + .tb-iot-hub-sort-field { + @extend %tb-iot-hub-field-base; + } + + .tb-iot-hub-search-field { + flex: 1; + + ::ng-deep { + .mat-mdc-form-field-icon-prefix { + padding: 0 8px 0 0; + + > .mat-icon { + padding: 0; + } + } + + .mat-mdc-form-field-icon-suffix { + padding: 0; + + .mat-mdc-icon-button { + width: 32px; + height: 32px; + padding: 4px; + } + } + } + } + + .tb-iot-hub-sort-field { + width: 140px; + flex-shrink: 0; + } +} + +.tb-iot-hub-filter-row { + display: flex; + gap: 12px; + margin-bottom: 16px; + padding-right: 152px; + + .tb-iot-hub-filter-select { + @extend %tb-iot-hub-field-base; + flex: 1; + min-width: 0; + } +} + +.tb-iot-hub-active-filters { + display: flex; + align-items: center; + gap: 6px; + flex-wrap: wrap; + margin-bottom: 12px; +} + +.tb-iot-hub-active-chip { + display: inline-flex; + align-items: center; + gap: 4px; + padding: 4px 8px 4px 12px; + border-radius: 16px; + font-size: 12px; + font-weight: 500; + background: #eef4ff; + color: #305ECA; + cursor: pointer; + white-space: nowrap; + transition: background-color 0.15s; + + mat-icon { + font-size: 14px; + width: 14px; + height: 14px; + } + + &:hover { + background: #dde8fc; + } +} + +.tb-iot-hub-clear-filters { + border: none; + background: none; + font-size: 12px; + color: #8b95a2; + cursor: pointer; + padding: 4px 8px; + white-space: nowrap; + + &:hover { + color: #3e4a59; + text-decoration: underline; + } +} + +.tb-iot-hub-results-count { + font-size: 14px; + color: rgba(0, 0, 0, 0.54); + margin-bottom: 16px; +} + +.tb-iot-hub-loading { + display: flex; + justify-content: center; + align-items: center; + min-height: 200px; +} + +.tb-iot-hub-empty-state { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-height: 300px; + text-align: center; + color: rgba(0, 0, 0, 0.54); + + .tb-iot-hub-empty-icon { + font-size: 64px; + width: 64px; + height: 64px; + margin-bottom: 16px; + opacity: 0.4; + } + + h3 { + margin: 0 0 8px 0; + color: rgba(0, 0, 0, 0.87); + } + + p { + margin: 0 0 16px 0; + } +} + +.tb-iot-hub-card-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); + gap: 16px; + margin-bottom: 16px; +} + +::ng-deep mat-paginator { + .mat-mdc-form-field { + .mat-mdc-text-field-wrapper { + height: 42px; + padding: 0 12px; + border: 1px solid #d5dbe3; + border-radius: 8px; + background: white; + } + + .mat-mdc-form-field-flex { + height: 42px; + align-items: center; + } + + .mdc-notched-outline { + display: none; + } + + .mat-mdc-form-field-infix { + padding-top: 0; + padding-bottom: 0; + min-height: unset; + border-top: none; + } + + .mat-mdc-floating-label { + display: none; + } + + .mat-mdc-form-field-subscript-wrapper { + display: none; + } + + .mat-mdc-select-value-text { + font-size: 14px; + color: #3e4a59; + } + + .mat-mdc-select-arrow-wrapper { + padding-left: 4px; + } + + &.mat-focused .mat-mdc-text-field-wrapper { + border-color: #8b95a2; + } + } +} + +.tb-iot-hub-browse-footer { + text-align: center; + padding: 24px 0; + border-top: 1px solid rgba(0, 0, 0, 0.08); + margin-top: 16px; + + .tb-iot-hub-become-creator { + color: rgba(0, 0, 0, 0.38); + font-size: 13px; + text-decoration: none; + + &:hover { + color: rgba(0, 0, 0, 0.54); + text-decoration: underline; + } + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts new file mode 100644 index 0000000000..517e91ef8c --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -0,0 +1,388 @@ +/// +/// Copyright © 2016-2026 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 { Component, OnInit, OnDestroy, Input } from '@angular/core'; +import { Subject } from 'rxjs'; +import { debounceTime, takeUntil } from 'rxjs/operators'; +import { PageLink } from '@shared/models/page/page-link'; +import { Direction, SortOrder } from '@shared/models/page/sort-order'; +import { PageData } from '@shared/models/page/page-data'; +import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; +import { + ItemType, + getCategoriesForType, useCaseTranslations +} from '@shared/models/iot-hub/iot-hub-item.models'; +import { cfTypeTranslations, widgetTypeTranslations, ruleChainTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { MatDialog } from '@angular/material/dialog'; +import { TranslateService } from '@ngx-translate/core'; +import { Router } from '@angular/router'; +import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; +import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; + +interface SortOption { + value: string; + label: string; + direction: Direction; +} + +const TYPE_TABS: ItemType[] = [ + ItemType.WIDGET, + ItemType.DASHBOARD, + ItemType.CALCULATED_FIELD, + ItemType.RULE_CHAIN, + ItemType.DEVICE +]; + +@Component({ + selector: 'tb-iot-hub-browse', + standalone: false, + templateUrl: './iot-hub-browse.component.html', + styleUrls: ['./iot-hub-browse.component.scss'], + host: { '[class.embedded]': 'embedded' } +}) +export class TbIotHubBrowseComponent implements OnInit, OnDestroy { + + readonly ItemType = ItemType; + + @Input() creatorId: string; + @Input() embedded = false; + + items: MpItemVersionView[] = []; + totalElements = 0; + pageSize = 12; + pageIndex = 0; + isLoading = false; + hasError = false; + + textSearch = ''; + activeType: ItemType = ItemType.WIDGET; + activeCategories = new Set(); + activeUseCases = new Set(); + activeCfTypes = new Set(); + activeWidgetTypes = new Set(); + activeRuleChainTypes = new Set(); + + sortOptions: SortOption[] = [ + { value: 'totalInstallCount', label: 'iot-hub.sort-most-installed', direction: Direction.DESC }, + { value: 'publishedTime', label: 'iot-hub.sort-newest', direction: Direction.DESC }, + { value: 'name', label: 'iot-hub.sort-name', direction: Direction.ASC } + ]; + selectedSortIndex = 0; + + categories = new Map(); + useCases: Map = useCaseTranslations as Map; + cfTypes: Map = cfTypeTranslations; + widgetTypes: Map = widgetTypeTranslations; + ruleChainTypes: Map = ruleChainTypeTranslations; + + private searchSubject = new Subject(); + private destroy$ = new Subject(); + + constructor( + private iotHubApiService: IotHubApiService, + private dialog: MatDialog, + private translate: TranslateService, + private router: Router + ) {} + + ngOnInit(): void { + this.searchSubject.pipe( + debounceTime(300), + takeUntil(this.destroy$) + ).subscribe(() => { + this.pageIndex = 0; + this.loadItems(); + }); + this.updateCategories(); + this.loadItems(); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onSearchChange(value: string): void { + this.textSearch = value; + this.searchSubject.next(value); + } + + getTypeTabIndex(): number { + return TYPE_TABS.indexOf(this.activeType); + } + + onTypeTabIndexChange(index: number): void { + this.onTypeTabChange(TYPE_TABS[index]); + } + + onTypeTabChange(type: ItemType): void { + this.activeType = type; + this.activeCategories.clear(); + this.activeUseCases.clear(); + this.activeCfTypes.clear(); + this.activeWidgetTypes.clear(); + this.activeRuleChainTypes.clear(); + this.updateCategories(); + this.pageIndex = 0; + this.loadItems(); + } + + onCategoryToggle(category: string): void { + if (this.activeCategories.has(category)) { + this.activeCategories.delete(category); + } else { + this.activeCategories.add(category); + } + this.pageIndex = 0; + this.loadItems(); + } + + onSortChange(index: number): void { + this.selectedSortIndex = index; + this.pageIndex = 0; + this.loadItems(); + } + + onPageChange(event: { pageIndex: number; pageSize: number }): void { + this.pageIndex = event.pageIndex; + this.pageSize = event.pageSize; + this.loadItems(); + } + + clearCategories(): void { + this.activeCategories.clear(); + this.pageIndex = 0; + this.loadItems(); + } + + onUseCaseToggle(useCase: string): void { + if (this.activeUseCases.has(useCase)) { + this.activeUseCases.delete(useCase); + } else { + this.activeUseCases.add(useCase); + } + this.pageIndex = 0; + this.loadItems(); + } + + clearUseCases(): void { + this.activeUseCases.clear(); + this.pageIndex = 0; + this.loadItems(); + } + + getSubtypeMap(): Map | null { + switch (this.activeType) { + case ItemType.WIDGET: return this.widgetTypes; + case ItemType.CALCULATED_FIELD: return this.cfTypes; + case ItemType.RULE_CHAIN: return this.ruleChainTypes; + default: return null; + } + } + + getActiveSubtypes(): Set { + switch (this.activeType) { + case ItemType.WIDGET: return this.activeWidgetTypes; + case ItemType.CALCULATED_FIELD: return this.activeCfTypes; + case ItemType.RULE_CHAIN: return this.activeRuleChainTypes; + default: return new Set(); + } + } + + onSubtypeToggle(subtype: string): void { + const active = this.getActiveSubtypes(); + if (active.has(subtype)) { + active.delete(subtype); + } else { + active.add(subtype); + } + this.pageIndex = 0; + this.loadItems(); + } + + clearSubtypes(): void { + this.getActiveSubtypes().clear(); + this.pageIndex = 0; + this.loadItems(); + } + + getActiveSubtypesArray(): string[] { + return Array.from(this.getActiveSubtypes()); + } + + getActiveCategoriesArray(): string[] { + return Array.from(this.activeCategories); + } + + getActiveUseCasesArray(): string[] { + return Array.from(this.activeUseCases); + } + + onSubtypesChange(values: string[]): void { + const active = this.getActiveSubtypes(); + active.clear(); + values.forEach(v => active.add(v)); + this.pageIndex = 0; + this.loadItems(); + } + + onCategoriesChange(values: string[]): void { + this.activeCategories.clear(); + values.forEach(v => this.activeCategories.add(v)); + this.pageIndex = 0; + this.loadItems(); + } + + onUseCasesChange(values: string[]): void { + this.activeUseCases.clear(); + values.forEach(v => this.activeUseCases.add(v)); + this.pageIndex = 0; + this.loadItems(); + } + + getSubtypeLabel(key: string): string { + const map = this.getSubtypeMap(); + const translationKey = map?.get(key); + return translationKey ? this.translate.instant(translationKey) : key; + } + + getCategoryLabel(key: string): string { + const translationKey = this.categories.get(key); + return translationKey ? this.translate.instant(translationKey) : key; + } + + getUseCaseLabel(key: string): string { + const translationKey = this.useCases.get(key); + return translationKey ? this.translate.instant(translationKey) : key; + } + + clearAllFilters(): void { + this.activeCategories.clear(); + this.activeUseCases.clear(); + this.activeCfTypes.clear(); + this.activeWidgetTypes.clear(); + this.activeRuleChainTypes.clear(); + this.textSearch = ''; + this.updateCategories(); + this.pageIndex = 0; + this.loadItems(); + } + + hasActiveDropdownFilters(): boolean { + return this.activeCategories.size > 0 || + this.activeUseCases.size > 0 || this.activeCfTypes.size > 0 || + this.activeWidgetTypes.size > 0 || this.activeRuleChainTypes.size > 0; + } + + hasActiveFilters(): boolean { + return this.hasActiveDropdownFilters() || this.textSearch.length > 0; + } + + getTitle(): string { + switch (this.activeType) { + case ItemType.WIDGET: return 'iot-hub.title-widgets'; + case ItemType.DASHBOARD: return 'iot-hub.title-dashboards'; + case ItemType.CALCULATED_FIELD: return 'iot-hub.title-calculated-fields'; + case ItemType.RULE_CHAIN: return 'iot-hub.title-rule-chains'; + case ItemType.DEVICE: return 'iot-hub.title-devices'; + } + } + + getSubtitle(): string { + switch (this.activeType) { + case ItemType.WIDGET: return 'iot-hub.subtitle-widgets'; + case ItemType.DASHBOARD: return 'iot-hub.subtitle-dashboards'; + case ItemType.CALCULATED_FIELD: return 'iot-hub.subtitle-calculated-fields'; + case ItemType.RULE_CHAIN: return 'iot-hub.subtitle-rule-chains'; + case ItemType.DEVICE: return 'iot-hub.subtitle-devices'; + } + } + + getSearchPlaceholder(): string { + switch (this.activeType) { + case ItemType.WIDGET: return 'iot-hub.search-widgets'; + case ItemType.DASHBOARD: return 'iot-hub.search-dashboards'; + case ItemType.CALCULATED_FIELD: return 'iot-hub.search-calculated-fields'; + case ItemType.RULE_CHAIN: return 'iot-hub.search-rule-chains'; + case ItemType.DEVICE: return 'iot-hub.search-devices'; + } + } + + openItemDetail(item: MpItemVersionView): void { + this.dialog.open(TbIotHubItemDetailDialogComponent, { + panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], + autoFocus: false, + data: { + item, + iotHubApiService: this.iotHubApiService + } as IotHubItemDetailDialogData + }); + } + + installItem(item: MpItemVersionView): void { + this.dialog.open(TbIotHubInstallDialogComponent, { + panelClass: ['tb-dialog'], + data: { + item, + iotHubApiService: this.iotHubApiService + } as IotHubInstallDialogData + }); + } + + navigateToCreator(creatorId: string): void { + this.router.navigate(['/iot-hub/creator', creatorId]); + } + + private updateCategories(): void { + this.categories = getCategoriesForType(this.activeType); + } + + loadItems(): void { + this.isLoading = true; + this.hasError = false; + const sort = this.sortOptions[this.selectedSortIndex]; + const sortOrder: SortOrder = { property: sort.value, direction: sort.direction }; + const pageLink = new PageLink(this.pageSize, this.pageIndex, this.textSearch || null, sortOrder); + const query = new MpItemVersionQuery( + pageLink, + this.activeType, + undefined, + this.creatorId || undefined, + this.activeCategories.size > 0 ? Array.from(this.activeCategories) : undefined, + this.activeUseCases.size > 0 ? Array.from(this.activeUseCases) : undefined, + this.activeCfTypes.size > 0 ? Array.from(this.activeCfTypes) : undefined, + this.activeWidgetTypes.size > 0 ? Array.from(this.activeWidgetTypes) : undefined, + this.activeRuleChainTypes.size > 0 ? Array.from(this.activeRuleChainTypes) : undefined + ); + this.iotHubApiService.getPublishedVersions( + query, + { ignoreLoading: true, ignoreErrors: true } + ).subscribe({ + next: (data: PageData) => { + this.items = data.data; + this.totalElements = data.totalElements; + this.isLoading = false; + }, + error: () => { + this.isLoading = false; + this.hasError = true; + this.items = []; + this.totalElements = 0; + } + }); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html new file mode 100644 index 0000000000..16a31f5bc4 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html @@ -0,0 +1,82 @@ + +
+ + + @if (creator) { + + + +
+
+ @if (getAvatarUrl(); as avatarUrl) { + + } @else { + account_circle + } +
+
+

{{ creator.displayName }}

+ @if (creator.description) { +

{{ creator.description }}

+ } + @if (creator.website) { + + {{ creator.website }} + + } + @if (creator.contactEmail) { +
{{ creator.contactEmail }}
+ } +
+ @if (creator.githubUrl) { + + code + + } + @if (creator.linkedinUrl) { + + work + + } + @if (creator.twitterUrl) { + + chat + + } +
+
+
+ + + + +
+

{{ 'iot-hub.published-items' | translate }} ({{ creator.publishedCount }})

+
+ + + + } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss new file mode 100644 index 0000000000..55b9a48577 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss @@ -0,0 +1,119 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host { + display: flex; + flex-direction: column; + height: 100%; + padding: 16px 24px; + overflow: auto; +} + +.tb-iot-hub-creator-profile-container { + max-width: 1200px; + margin: 0 auto; + width: 100%; + background: white; + padding: 24px; + border-radius: 4px; + box-shadow: 0 0 1px rgba(0, 0, 0, 0.14), 0 1px 1px rgba(0, 0, 0, 0.12); +} + +.tb-iot-hub-back-btn { + margin-bottom: 16px; +} + +.tb-iot-hub-creator-header { + margin-bottom: 24px; +} + +.tb-iot-hub-creator-info { + display: flex; + gap: 24px; + align-items: flex-start; +} + +.tb-iot-hub-creator-avatar { + width: 80px; + height: 80px; + min-width: 80px; + border-radius: 50%; + overflow: hidden; + display: flex; + align-items: center; + justify-content: center; + background: rgba(0, 0, 0, 0.06); + + img { + width: 100%; + height: 100%; + object-fit: cover; + } + + mat-icon { + font-size: 64px; + width: 64px; + height: 64px; + color: rgba(0, 0, 0, 0.3); + } +} + +.tb-iot-hub-creator-details { + flex: 1; + + h2 { + margin: 0 0 4px 0; + font-size: 22px; + } + + .tb-iot-hub-creator-desc { + margin: 0 0 8px 0; + color: rgba(0, 0, 0, 0.6); + } + + .tb-iot-hub-creator-link { + color: #1976d2; + text-decoration: none; + font-size: 14px; + display: block; + margin-bottom: 4px; + + &:hover { + text-decoration: underline; + } + } + + .tb-iot-hub-creator-email { + font-size: 14px; + color: rgba(0, 0, 0, 0.54); + margin-bottom: 8px; + } + + .tb-iot-hub-social-links { + display: flex; + gap: 4px; + } +} + +.tb-iot-hub-creator-items-header { + margin-bottom: 16px; + + h3 { + margin: 0; + font-size: 18px; + font-weight: 600; + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts new file mode 100644 index 0000000000..5af791adbb --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts @@ -0,0 +1,70 @@ +/// +/// Copyright © 2016-2026 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 { Component, OnInit, OnDestroy } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; +import { CreatorView } from '@shared/models/iot-hub/iot-hub-creator.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; + +@Component({ + selector: 'tb-iot-hub-creator-profile', + standalone: false, + templateUrl: './iot-hub-creator-profile.component.html', + styleUrls: ['./iot-hub-creator-profile.component.scss'] +}) +export class TbIotHubCreatorProfileComponent implements OnInit, OnDestroy { + + creator: CreatorView; + creatorId: string; + + private destroy$ = new Subject(); + + constructor( + private route: ActivatedRoute, + private router: Router, + private iotHubApiService: IotHubApiService + ) {} + + ngOnInit(): void { + this.route.params.pipe(takeUntil(this.destroy$)).subscribe(params => { + this.creatorId = params['creatorId']; + this.loadCreator(); + }); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + getAvatarUrl(): string | null { + return this.creator?.avatarUrl ? this.iotHubApiService.resolveResourceUrl(this.creator.avatarUrl) : null; + } + + goBack(): void { + this.router.navigate(['/iot-hub']); + } + + private loadCreator(): void { + this.iotHubApiService.getCreatorProfile(this.creatorId, { ignoreLoading: true }).subscribe({ + next: creator => this.creator = creator, + error: () => this.router.navigate(['/iot-hub']) + }); + } + +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts new file mode 100644 index 0000000000..f8132ec5c5 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -0,0 +1,123 @@ +/// +/// Copyright © 2016-2026 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 { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ActionNotificationShow } from '@core/notification/notification.actions'; +import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; +import { itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { TranslateService } from '@ngx-translate/core'; + +export interface IotHubInstallDialogData { + item: MpItemVersionView; + iotHubApiService: IotHubApiService; +} + +export type InstallState = 'confirm' | 'installing' | 'success' | 'error'; + +@Component({ + selector: 'tb-iot-hub-install-dialog', + standalone: false, + template: ` +

{{ 'iot-hub.install-item-title' | translate }}

+ +

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

+

{{ 'iot-hub.install-type' | translate:{ type: (typeTranslations.get(item.type) | translate) } }}

+

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

+ + + + @switch (state) { + @case ('confirm') { + + } + @case ('installing') { + + } + @case ('success') { + + } + } + + `, + styles: [` + .tb-iot-hub-install-meta { + margin: 4px 0; + color: rgba(0, 0, 0, 0.54); + font-size: 14px; + } + .tb-iot-hub-inline-spinner { + display: inline-block; + margin-right: 8px; + } + `] +}) +export class TbIotHubInstallDialogComponent { + + item: MpItemVersionView; + typeTranslations = itemTypeTranslations; + state: InstallState = 'confirm'; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: IotHubInstallDialogData, + private dialogRef: MatDialogRef, + private store: Store, + private translate: TranslateService + ) { + this.item = data.item; + } + + install(): void { + this.state = 'installing'; + const versionId = this.item.id as string; + this.data.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }).subscribe({ + next: () => { + this.state = 'success'; + this.store.dispatch(new ActionNotificationShow({ + message: this.translate.instant('iot-hub.install-success', { name: this.item.name }), + type: 'success', + duration: 3000 + })); + setTimeout(() => this.dialogRef.close(true), 1500); + }, + error: () => { + this.state = 'confirm'; + this.store.dispatch(new ActionNotificationShow({ + message: this.translate.instant('iot-hub.install-error', { name: this.item.name }), + type: 'error', + duration: 5000 + })); + } + }); + } + + cancel(): void { + this.dialogRef.close(false); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html new file mode 100644 index 0000000000..8b99b4cbe0 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -0,0 +1,107 @@ + +
+ @if (!isCompactLayout()) { +
+ @if (getPreviewUrl(); as previewUrl) { + + } @else { +
+ {{ getPlaceholderIcon() }} +
+ } + @if (item.peOnly) { + PE + } +
+ } +
+ @if (isCompactLayout()) { +
+
+ {{ getPlaceholderIcon() }} +
+
+
+

{{ item.name }}

+ v{{ item.version }} +
+ @if (getSubtypeLabel(); as subtypeLabel) { + {{ subtypeLabel }} + } +
+ @if (item.peOnly) { + PE + } +
+ } @else { +
+

{{ item.name }}

+ v{{ item.version }} +
+ @if (item.type === ItemType.WIDGET && getSubtypeLabel(); as subtypeLabel) { + {{ subtypeLabel }} + } + } + @if (item.description) { +

{{ item.description }}

+ } + @if (getNodes(); as nodes) { + @if (nodes.length) { +
+ @for (node of nodes | slice:0:maxVisibleNodes; track node.name) { + {{ node.name }} + } + @if (getNodeCount() > maxVisibleNodes) { + +{{ getNodeCount() - maxVisibleNodes }} + } +
+ } + } + @if (getCategoryLabels().length || getFirstUseCaseLabel()) { +
+ @if (getCategoryLabels(); as labels) { + @if (labels.length) { + {{ labels[0] }} + } + } + @if (getFirstUseCaseLabel(); as useCaseLabel) { + {{ useCaseLabel }} + } +
+ } +
+ @if (showCreator) { + person{{ item.creatorDisplayName }} + @if (item.publishedTime) { + · + } + } + @if (item.publishedTime) { + {{ formatPublishedTime(item.publishedTime) }} + } + + + download + {{ item.totalInstallCount | shortNumber }} + + + +
+
+
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss new file mode 100644 index 0000000000..0f16dd4fae --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -0,0 +1,351 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host { + display: block; + height: 100%; +} + +.tb-iot-hub-item-card { + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 12px; + overflow: hidden; + cursor: pointer; + transition: box-shadow 0.2s, transform 0.2s; + background: white; + height: 100%; + display: flex; + flex-direction: column; + + &:hover { + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); + transform: translateY(-2px); + } + + &.tb-iot-hub-card-compact { + border-color: #e5e7eb; + + .tb-iot-hub-card-content { + padding: 16px 18px; + } + } +} + +// Preview area +.tb-iot-hub-card-preview { + height: 160px; + display: flex; + align-items: center; + justify-content: center; + position: relative; + overflow: hidden; + + &.preview-widget, &.preview-dashboard { background: #f5f7fa; border-bottom: 1px solid #e5e7eb; } + &.preview-calculated-field { background: linear-gradient(135deg, #e3f2fd, #bbdefb); } + &.preview-rule-chain { background: linear-gradient(135deg, #f3e5f5, #e1bee7); } + &.preview-device { background: linear-gradient(135deg, #eceff1, #cfd8dc); } +} + +.tb-iot-hub-preview-image { + max-width: 100%; + max-height: 100%; + object-fit: contain; + padding: 8px; +} + +.tb-iot-hub-preview-placeholder { + width: 62px; + height: 62px; + border-radius: 16px; + display: flex; + align-items: center; + justify-content: center; + + tb-icon { + font-size: 36px; + width: 36px; + height: 36px; + } + + .preview-widget &, .preview-dashboard & { background: rgba(107, 114, 128, 0.1); tb-icon { color: #6b7280; } } + .preview-calculated-field & { background: rgba(25, 118, 210, 0.15); tb-icon { color: #1565c0; } } + .preview-rule-chain & { background: rgba(123, 31, 162, 0.15); tb-icon { color: #7b1fa2; } } + .preview-device & { background: rgba(69, 90, 100, 0.15); tb-icon { color: #455a64; } } +} + +.tb-iot-hub-pe-badge { + position: absolute; + top: 8px; + right: 8px; + background: rgba(0, 0, 0, 0.6); + color: white; + padding: 2px 6px; + border-radius: 4px; + font-size: 11px; + font-weight: 600; +} + +// Content area +.tb-iot-hub-card-content { + padding: 12px 16px 12px; + flex: 1; + display: flex; + flex-direction: column; +} + +// Compact header (CF / RC) +.tb-iot-hub-card-cf-header { + display: flex; + align-items: flex-start; + gap: 12px; + margin-bottom: 10px; +} + +.tb-iot-hub-card-cf-icon { + width: 40px; + height: 40px; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + + tb-icon { + font-size: 22px; + width: 22px; + height: 22px; + color: #fff; + } +} + +.tb-iot-hub-card-cf-title-area { + flex: 1; + min-width: 0; + + .tb-iot-hub-card-name-row { + margin-bottom: 2px; + } +} + +.tb-iot-hub-card-cf-type { + font-size: 11px; + font-weight: 500; + color: #6b7280; +} + +.tb-iot-hub-pe-badge-inline { + position: static; + flex-shrink: 0; + align-self: flex-start; +} + +// Name row +.tb-iot-hub-card-name-row { + display: flex; + align-items: baseline; + gap: 8px; + margin-bottom: 4px; +} + +.tb-iot-hub-card-name { + font-size: 16px; + font-weight: 700; + margin: 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: rgba(0, 0, 0, 0.87); +} + +.tb-iot-hub-card-version { + font-size: 13px; + color: rgba(0, 0, 0, 0.4); + flex-shrink: 0; +} + +.tb-iot-hub-card-widget-type-label { + font-size: 11px; + font-weight: 500; + color: #6b7280; + margin-bottom: 4px; +} + +// Description +.tb-iot-hub-card-description { + font-size: 13px; + line-height: 1.4; + color: rgba(0, 0, 0, 0.55); + margin: 0 0 10px; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +// Node chips (Rule Chain) +.tb-iot-hub-card-nodes { + display: flex; + gap: 6px; + flex-wrap: nowrap; + overflow: hidden; + margin-bottom: 8px; +} + +.tb-iot-hub-card-node-chip { + display: inline-block; + padding: 2px 8px; + border-radius: 6px; + font-size: 11px; + line-height: 16px; + height: 20px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + min-width: 0; + max-width: 120px; + + &.node-enrichment { background: #f5fcd5; color: #4a7a00; } + &.node-filter { background: #fcfadb; color: #7a7200; } + &.node-transformation { background: #ddf2fc; color: #1a6d9e; } + &.node-action { background: #fde3e2; color: #9e2a27; } + &.node-analytics { background: #d5f6f4; color: #0e7a74; } + &.node-external { background: #fef1d8; color: #8a5d00; } + &.node-flow { background: #f3edfc; color: #5b3a9e; } + &.node-unknown { background: #f5f5f5; color: rgba(0, 0, 0, 0.54); } +} + +.tb-iot-hub-card-node-more { + font-size: 12px; + font-weight: 500; + color: rgba(0, 0, 0, 0.45); + padding: 3px 4px; + flex-shrink: 0; +} + +// Category / use case tags +.tb-iot-hub-card-categories { + display: flex; + gap: 4px; + flex-wrap: wrap; + margin-bottom: 12px; +} + +.tb-iot-hub-card-category-chip { + display: inline-block; + padding: 2px 8px; + border-radius: 4px; + font-size: 11px; + font-weight: 500; + background: #eff6ff; + color: #1e6bb8; + white-space: nowrap; +} + +.tb-iot-hub-card-use-case-chip { + display: inline-block; + padding: 2px 8px; + border-radius: 4px; + font-size: 11px; + font-weight: 500; + background: #f0fdf4; + color: #16a34a; + white-space: nowrap; +} + +// Footer +.tb-iot-hub-card-footer { + display: flex; + align-items: center; + font-size: 12px; + color: rgba(0, 0, 0, 0.45); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin-top: auto; + margin-left: -16px; + margin-right: -16px; + margin-bottom: -12px; + padding: 12px 16px; + border-top: 1px solid rgba(0, 0, 0, 0.08); + + .tb-iot-hub-card-author-icon { + font-size: 14px; + width: 14px; + height: 14px; + flex-shrink: 0; + margin-right: 4px; + } + + .tb-iot-hub-card-creator { + color: #1976d2; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + + &:hover { + text-decoration: underline; + } + } + + .tb-iot-hub-card-dot { + margin: 0 6px; + flex-shrink: 0; + } + + .tb-iot-hub-card-published { + flex-shrink: 0; + } + + .tb-iot-hub-card-stats { + display: flex; + align-items: center; + gap: 10px; + margin-left: auto; + flex-shrink: 0; + } + + .tb-iot-hub-card-stat { + display: flex; + align-items: center; + gap: 3px; + font-size: 11px; + color: #9ca3af; + + tb-icon { + font-size: 14px; + width: 14px; + height: 14px; + } + } + + .tb-iot-hub-card-install-btn { + padding: 5px 14px; + border-radius: 6px; + border: 1px solid #305680; + background: transparent; + color: #305680; + font-size: 12px; + font-weight: 600; + cursor: pointer; + white-space: nowrap; + transition: all 0.15s; + + &:hover { + background: #305680; + color: #fff; + } + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts new file mode 100644 index 0000000000..87f5502696 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -0,0 +1,204 @@ +/// +/// Copyright © 2016-2026 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 { Component, EventEmitter, Input, Output } from '@angular/core'; +import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, NodeInfo, nodeComponentTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; +import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { TranslateService } from '@ngx-translate/core'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; + +@Component({ + selector: 'tb-iot-hub-item-card', + standalone: false, + templateUrl: './iot-hub-item-card.component.html', + styleUrls: ['./iot-hub-item-card.component.scss'] +}) +export class TbIotHubItemCardComponent { + + readonly ItemType = ItemType; + readonly maxVisibleCategories = 3; + readonly maxVisibleNodes = 2; + + @Input() item: MpItemVersionView; + @Input() showCreator = true; + @Input() showTypeChip = true; + @Output() cardClick = new EventEmitter(); + @Output() creatorClick = new EventEmitter(); + @Output() installClick = new EventEmitter(); + + typeTranslations = itemTypeTranslations; + + constructor( + private translate: TranslateService, + private iotHubApiService: IotHubApiService + ) {} + + isCompactLayout(): boolean { + return this.item.type === ItemType.CALCULATED_FIELD || this.item.type === ItemType.RULE_CHAIN; + } + + getPreviewUrl(): string | null { + if (!this.item.image) { + return null; + } + const url = this.item.image.split('?')[0]; + const resolved = url.endsWith('/preview') ? this.item.image : `${url}/preview`; + return this.iotHubApiService.resolveResourceUrl(resolved); + } + + getPreviewClass(): string { + switch (this.item.type) { + case ItemType.WIDGET: return 'preview-widget'; + case ItemType.DASHBOARD: return 'preview-dashboard'; + case ItemType.CALCULATED_FIELD: return 'preview-calculated-field'; + case ItemType.RULE_CHAIN: return 'preview-rule-chain'; + case ItemType.DEVICE: return 'preview-device'; + default: return ''; + } + } + + getPlaceholderIcon(): string { + switch (this.item.type) { + case ItemType.WIDGET: return 'widgets'; + case ItemType.DASHBOARD: return 'dashboard'; + case ItemType.CALCULATED_FIELD: + return this.item.icon || cfTypeIcons.get(this.item.dataDescriptor?.cfType) || 'functions'; + case ItemType.RULE_CHAIN: + return this.item.icon || (this.item.dataDescriptor?.ruleChainType === 'EDGE' ? 'router' : 'device_hub'); + case ItemType.DEVICE: return 'memory'; + default: return 'extension'; + } + } + + getCustomIconColor(): string | null { + if ((this.item.type === ItemType.CALCULATED_FIELD || this.item.type === ItemType.RULE_CHAIN) && this.item.color) { + return this.item.color; + } + return null; + } + + getSubtypeLabel(): string { + switch (this.item.type) { + case ItemType.WIDGET: { + const wt = this.item.dataDescriptor?.widgetType; + const key = wt ? widgetTypeTranslations.get(wt) : null; + return key ? this.translate.instant(key) : wt || ''; + } + case ItemType.CALCULATED_FIELD: { + const cfType = this.item.dataDescriptor?.cfType; + const key = cfType ? cfTypeTranslations.get(cfType) : null; + return key ? this.translate.instant(key) : cfType || ''; + } + case ItemType.RULE_CHAIN: { + const rcType = this.item.dataDescriptor?.ruleChainType; + const key = rcType ? ruleChainTypeTranslations.get(rcType) : null; + return key ? this.translate.instant(key) : rcType || ''; + } + default: + return ''; + } + } + + getSubtypeColorClass(): string { + switch (this.item.type) { + case ItemType.WIDGET: + return 'wt-' + (this.item.dataDescriptor?.widgetType || 'static'); + case ItemType.CALCULATED_FIELD: + switch (this.item.dataDescriptor?.cfType) { + case 'SIMPLE': return 'cf-simple'; + case 'SCRIPT': return 'cf-script'; + case 'GEOFENCING': return 'cf-geofencing'; + case 'ALARM': return 'cf-alarm'; + case 'PROPAGATION': return 'cf-propagation'; + case 'RELATED_ENTITIES_AGGREGATION': return 'cf-related-agg'; + case 'ENTITY_AGGREGATION': return 'cf-entity-agg'; + default: return 'cf-simple'; + } + case ItemType.RULE_CHAIN: + return this.item.dataDescriptor?.ruleChainType === 'EDGE' ? 'rc-edge' : 'rc-core'; + default: + return ''; + } + } + + getCategoryLabels(): string[] { + if (!this.item.categories?.length) { + return []; + } + const categoryMap = getCategoriesForType(this.item.type); + return this.item.categories.map(c => { + const key = categoryMap.get(c); + return key ? this.translate.instant(key) : c; + }); + } + + getFirstUseCaseLabel(): string | null { + if (!this.item.useCases?.length) { + return null; + } + const key = useCaseTranslations.get(this.item.useCases[0] as any); + return key ? this.translate.instant(key) : this.item.useCases[0]; + } + + getNodes(): NodeInfo[] { + if (this.item.type !== ItemType.RULE_CHAIN) { + return []; + } + return this.item.dataDescriptor?.nodes || []; + } + + getNodeCount(): number { + return this.item.dataDescriptor?.nodeCount || 0; + } + + getNodeLabel(node: NodeInfo): string { + const key = nodeComponentTypeTranslations.get(node.type); + return key ? this.translate.instant(key) : node.type; + } + + getNodeColorClass(node: NodeInfo): string { + switch (node.type) { + case 'ENRICHMENT': return 'node-enrichment'; + case 'FILTER': return 'node-filter'; + case 'TRANSFORMATION': return 'node-transformation'; + case 'ACTION': return 'node-action'; + case 'ANALYTICS': return 'node-analytics'; + case 'EXTERNAL': return 'node-external'; + case 'FLOW': return 'node-flow'; + default: return 'node-unknown'; + } + } + + onCardClick(): void { + this.cardClick.emit(this.item); + } + + onInstallClick(event: MouseEvent): void { + event.stopPropagation(); + this.installClick.emit(this.item); + } + + onCreatorClick(event: MouseEvent): void { + event.stopPropagation(); + this.creatorClick.emit(this.item.creatorId); + } + + formatPublishedTime(timestamp: number): string { + const date = new Date(timestamp); + return date.toLocaleDateString('en-US', { month: 'short', year: 'numeric' }); + } + +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html new file mode 100644 index 0000000000..6d30c3c920 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -0,0 +1,188 @@ + +
+ +
+
+ @if (item.type === ItemType.CALCULATED_FIELD || item.type === ItemType.RULE_CHAIN) { +
+ {{ getCompactIcon() }} +
+ } +
+
+ {{ item.name }} + v{{ item.version }} + @if (getSubtypeLabel(); as subtypeLabel) { + {{ subtypeLabel }} + } +
+
+ {{ typeTranslations.get(item.type) | translate }} + · + {{ 'iot-hub.by-creator' | translate:{ name: '' } }} + {{ item.creatorDisplayName }} + @if (item.publishedTime) { + · + {{ item.publishedTime | date:'mediumDate' }} + } +
+
+ +
+
+ + +
+ + @if (item.type === ItemType.WIDGET) { +
+
+ @if (getPreviewUrl(); as url) { + + } @else { +
+ widgets +
+ } +
+ @if (item.description) { +
{{ item.description }}
+ } +
+ } + + + @if (item.type === ItemType.DASHBOARD) { +
+
+ @if (getPreviewUrl(); as url) { + + } @else { +
+ dashboard +
+ } +
+ @if (item.description) { +
{{ item.description }}
+ } +
+ } + + +
+ + download + {{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }} + + + {{ getTypeIcon() }} + {{ typeTranslations.get(item.type) | translate }} + + @if (item.peOnly) { + PE + } +
+ + + @if (item.type === ItemType.DEVICE) { +
+ @if (getPreviewUrl(); as url) { + + } @else { +
+ memory +
+ } +
+ } + + + @if (item.description && item.type !== ItemType.WIDGET && item.type !== ItemType.DASHBOARD) { +
{{ item.description }}
+ } + + + @if (item.type === ItemType.RULE_CHAIN && getNodes().length) { +
+ @for (node of getNodes(); track node.name) { + {{ node.name }} + } + @if (getNodeCount() > getNodes().length) { + +{{ getNodeCount() - getNodes().length }} {{ 'iot-hub.more' | translate }} + } +
+ } + + + @if (item.categories?.length || item.useCases?.length) { +
+ @if (item.categories?.length) { +
+ {{ 'iot-hub.categories' | translate }} +
+ @for (cat of item.categories; track cat) { + {{ getCategoryLabel(cat) }} + } +
+
+ } + @if (item.useCases?.length) { +
+ {{ 'iot-hub.use-cases' | translate }} +
+ @for (uc of item.useCases; track uc) { + {{ getUseCaseLabel(uc) }} + } +
+
+ } +
+ } + + + @if (readmeContent || item.changelog) { +
+ @if (readmeContent) { + + } + @if (item.changelog) { +

{{ 'iot-hub.changelog' | translate }}

+ + } +
+ } +
+ + +
+ +
+ {{ 'iot-hub.created-by' | translate:{ name: item.creatorDisplayName } }} + · + + {{ 'iot-hub.become-a-creator' | translate }} + +
+
+
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss new file mode 100644 index 0000000000..23fd2d2c98 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss @@ -0,0 +1,419 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host-context(.tb-default .tb-dialog .mat-mdc-dialog-component-host) { + @media (min-width: 600px) { + .mat-mdc-dialog-content { + width: 800px; + max-height: 80vh; + } + } +} + +.tb-iot-hub-detail-dialog { + display: flex; + flex-direction: column; + padding: 0 !important; + --mat-dialog-supporting-text-line-height: 1.5; +} + +// Header +.dlg-header { + padding: 20px 24px 16px; + border-bottom: 1px solid #e5e7eb; + flex-shrink: 0; +} + +.dlg-header-top { + display: flex; + align-items: flex-start; + gap: 14px; +} + +.dlg-icon { + width: 48px; + height: 48px; + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + + tb-icon { + font-size: 26px; + width: 26px; + height: 26px; + color: #fff; + } +} + +.dlg-header-info { + flex: 1; + min-width: 0; +} + +.dlg-title-row { + display: flex; + align-items: baseline; + gap: 8px; + flex-wrap: wrap; +} + +.dlg-title { + font-size: 18px; + font-weight: 700; + color: #1a1a2e; +} + +.dlg-version { + font-size: 12px; + font-weight: 500; + color: #9ca3af; +} + +.dlg-type-badge { + padding: 2px 10px; + border-radius: 12px; + font-size: 12px; + font-weight: 500; + white-space: nowrap; + + &.wt-timeseries { background: #e3f2fd; color: #1565c0; } + &.wt-latest { background: #e8f5e9; color: #2e7d32; } + &.wt-rpc { background: #f3e5f5; color: #7b1fa2; } + &.wt-alarm { background: #ffebee; color: #c62828; } + &.wt-static { background: #eceff1; color: #455a64; } + &.cf-simple { background: #e3f2fd; color: #1565c0; } + &.cf-script { background: #f3e5f5; color: #6a1b9a; } + &.cf-geofencing { background: #e8f5e9; color: #2e7d32; } + &.cf-alarm { background: #ffebee; color: #c62828; } + &.cf-propagation { background: #e0f2f1; color: #00695c; } + &.cf-related-agg { background: #e8eaf6; color: #283593; } + &.cf-entity-agg { background: #fff3e0; color: #e65100; } + &.rc-core { background: #f3e5f5; color: #7b1fa2; } + &.rc-edge { background: #e0f2f1; color: #00695c; } +} + +.dlg-subtitle { + font-size: 12px; + color: #6b7280; + margin-top: 2px; +} + +.dlg-creator-link { + color: #1976d2; + text-decoration: none; + cursor: pointer; + + &:hover { + text-decoration: underline; + } +} + +.dlg-close { + flex-shrink: 0; + margin: -8px -8px 0 0; +} + +.dlg-sep { + color: #9ca3af; + padding: 0 2px; +} + +// Hero split (widget: image + description side by side) +.dlg-hero-split { + display: flex; + gap: 20px; + padding: 20px 24px; + border-bottom: 1px solid #f3f4f6; +} + +.dlg-hero-image { + flex: 0 0 48%; + background: #f5f7fa; + border-radius: 8px; + overflow: hidden; + display: flex; + align-items: center; + justify-content: center; + min-height: 140px; + + img { + width: 100%; + height: 100%; + object-fit: contain; + padding: 8px; + } + + .tb-iot-hub-preview-placeholder tb-icon { + font-size: 64px; + width: 64px; + height: 64px; + opacity: 0.3; + } +} + +.dlg-hero-desc { + flex: 1; + font-size: 13px; + color: #4b5563; + line-height: 1.6; + + p { + margin: 0; + } +} + +// Dashboard: full-width image + description below +.dlg-hero-full { + padding: 20px 24px; + border-bottom: 1px solid #f3f4f6; +} + +.dlg-hero-full-image { + background: #f5f7fa; + border-radius: 8px; + overflow: hidden; + display: flex; + align-items: center; + justify-content: center; + min-height: 200px; + max-height: 300px; + + img { + width: 100%; + height: 100%; + object-fit: contain; + padding: 8px; + } + + .tb-iot-hub-preview-placeholder tb-icon { + font-size: 64px; + width: 64px; + height: 64px; + opacity: 0.3; + } +} + +.dlg-hero-full-desc { + margin-top: 12px; + font-size: 13px; + color: #4b5563; + line-height: 1.6; +} + +// Stats bar +.dlg-stats-bar { + display: flex; + align-items: center; + gap: 16px; + padding: 10px 24px; + background: #f9fafb; + font-size: 12px; + color: #6b7280; + border-bottom: 1px solid #f3f4f6; +} + +.dlg-stat { + display: flex; + align-items: center; + gap: 4px; + + tb-icon { + font-size: 16px; + width: 16px; + height: 16px; + } + + strong { + color: #1a1a2e; + } +} + +.dlg-pe-label { + display: inline-block; + background: rgba(0, 0, 0, 0.6); + color: white; + padding: 2px 8px; + border-radius: 4px; + font-size: 11px; + font-weight: 600; +} + +// Device preview +.dlg-device-preview { + display: flex; + align-items: center; + justify-content: center; + min-height: 160px; + background: #f5f7fa; + border-bottom: 1px solid #f3f4f6; + + img { + max-width: 100%; + max-height: 160px; + object-fit: contain; + padding: 8px; + } + + .tb-iot-hub-preview-placeholder tb-icon { + font-size: 64px; + width: 64px; + height: 64px; + opacity: 0.3; + } +} + +// Description block (CF/RC) +.dlg-desc-block { + padding: 16px 24px; + font-size: 13px; + color: #4b5563; + line-height: 1.6; + border-bottom: 1px solid #f3f4f6; +} + +// Node chips (Rule Chain) +.dlg-node-chips { + display: flex; + flex-wrap: wrap; + gap: 6px; + padding: 12px 24px; + border-bottom: 1px solid #f3f4f6; +} + +.dlg-node-chip { + padding: 4px 12px; + border-radius: 14px; + font-size: 12px; + font-weight: 500; + border: 1px solid; + + &.dlg-node-enrichment { background: #f5fcd5; color: #4a7a00; border-color: #d4e6a0; } + &.dlg-node-filter { background: #fcfadb; color: #7a7200; border-color: #e8e4a0; } + &.dlg-node-transformation { background: #ddf2fc; color: #1a6d9e; border-color: #a8d8f0; } + &.dlg-node-action { background: #fde3e2; color: #9e2a27; border-color: #f0b8b6; } + &.dlg-node-analytics { background: #d5f6f4; color: #0e7a74; border-color: #a0e0dc; } + &.dlg-node-external { background: #fef1d8; color: #8a5d00; border-color: #f0d8a0; } + &.dlg-node-flow { background: #f3edfc; color: #5b3a9e; border-color: #d0c4f0; } + &.dlg-node-unknown { background: #f5f5f5; color: rgba(0, 0, 0, 0.54); border-color: #e0e0e0; } +} + +.dlg-node-more { + font-size: 11px; + font-weight: 500; + color: rgba(0, 0, 0, 0.54); + align-self: center; +} + +// Categories & Use Cases +.dlg-meta-section { + display: flex; + gap: 40px; + padding: 14px 24px; + border-bottom: 1px solid #e5e7eb; +} + +.dlg-meta-group { + display: flex; + flex-direction: column; + gap: 6px; +} + +.dlg-meta-label { + font-size: 10px; + font-weight: 600; + color: #9ca3af; + text-transform: uppercase; + letter-spacing: 0.5px; +} + +.dlg-meta-chips { + display: flex; + flex-wrap: wrap; + gap: 5px; +} + +.dlg-meta-chip { + padding: 3px 10px; + border-radius: 4px; + font-size: 11px; + font-weight: 500; + border: 1px solid #e5e7eb; + color: #4b5563; + background: #fff; +} + +// Scrollable body +.dlg-body { + overflow-y: auto; + flex: 1; + min-height: 0; +} + +.dlg-content { + padding: 0; + + h3 { + font-size: 16px; + font-weight: 600; + color: #1a1a2e; + margin: 20px 0 8px; + } +} + +// Footer +.dlg-footer { + padding: 16px 24px; + border-top: 1px solid #e5e7eb; + display: flex; + flex-direction: column; + align-items: center; + gap: 10px; + flex-shrink: 0; +} + +.dlg-install-btn { + width: 100%; + max-width: 400px; + padding: 12px 24px; + border: none; + border-radius: 8px; + background: #305680; + color: #fff; + font-size: 14px; + font-weight: 500; + cursor: pointer; + transition: background 0.15s; + + &:hover { + background: #264466; + } +} + +.dlg-creator-info { + font-size: 12px; + color: #9ca3af; +} + +.dlg-become-creator { + color: #305680; + cursor: pointer; + + &:hover { + text-decoration: underline; + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts new file mode 100644 index 0000000000..c262d32656 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts @@ -0,0 +1,246 @@ +/// +/// Copyright © 2016-2026 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 { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, nodeComponentTypeTranslations, NodeInfo } from '@shared/models/iot-hub/iot-hub-version.models'; +import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { TranslateService } from '@ngx-translate/core'; +import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; + +export interface IotHubItemDetailDialogData { + item: MpItemVersionView; + iotHubApiService: IotHubApiService; +} + +@Component({ + selector: 'tb-iot-hub-item-detail-dialog', + standalone: false, + templateUrl: './iot-hub-item-detail-dialog.component.html', + styleUrls: ['./iot-hub-item-detail-dialog.component.scss'] +}) +export class TbIotHubItemDetailDialogComponent { + + readonly ItemType = ItemType; + item: MpItemVersionView; + typeTranslations = itemTypeTranslations; + readmeContent: string = ''; + + private categoryMap: Map; + private useCaseMap = useCaseTranslations; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: IotHubItemDetailDialogData, + private dialogRef: MatDialogRef, + private dialog: MatDialog, + private router: Router, + private translate: TranslateService + ) { + this.item = data.item; + this.categoryMap = getCategoriesForType(this.item.type); + this.loadReadme(); + } + + getCategoryLabel(key: string): string { + const translationKey = this.categoryMap.get(key); + return translationKey ? this.translate.instant(translationKey) : key; + } + + getUseCaseLabel(key: string): string { + const translationKey = this.useCaseMap.get(key as any); + return translationKey ? this.translate.instant(translationKey) : key; + } + + getPreviewUrl(): string | null { + return this.item.image ? this.data.iotHubApiService.resolveResourceUrl(this.item.image) : null; + } + + getTypeChipClass(): string { + switch (this.item.type) { + case ItemType.WIDGET: return 'type-widget'; + case ItemType.DASHBOARD: return 'type-dashboard'; + case ItemType.CALCULATED_FIELD: return 'type-calc-field'; + case ItemType.RULE_CHAIN: return 'type-rule-chain'; + case ItemType.DEVICE: return 'type-device'; + default: return ''; + } + } + + getTypeLabel(): string { + const key = this.typeTranslations.get(this.item.type); + return key ? this.translate.instant(key) : ''; + } + + getTypeIcon(): string { + switch (this.item.type) { + case ItemType.WIDGET: return 'widgets'; + case ItemType.DASHBOARD: return 'dashboard'; + case ItemType.CALCULATED_FIELD: return 'functions'; + case ItemType.RULE_CHAIN: return 'account_tree'; + case ItemType.DEVICE: return 'memory'; + default: return 'category'; + } + } + + getCompactIcon(): string { + if (this.item.icon) { + return this.item.icon; + } + if (this.item.type === ItemType.CALCULATED_FIELD) { + const cfType = this.item.dataDescriptor?.cfType; + return cfTypeIcons.get(cfType) || 'functions'; + } + switch (this.item.dataDescriptor?.ruleChainType) { + case 'CORE': return 'device_hub'; + case 'EDGE': return 'router'; + default: return 'account_tree'; + } + } + + getCustomColor(): string | null { + return this.item.color || null; + } + + getCompactIconColorClass(): string { + if (this.item.color) { + return ''; + } + if (this.item.type === ItemType.CALCULATED_FIELD) { + switch (this.item.dataDescriptor?.cfType) { + case 'SIMPLE': return 'cf-simple'; + case 'SCRIPT': return 'cf-script'; + case 'GEOFENCING': return 'cf-geofencing'; + case 'ALARM': return 'cf-alarm'; + case 'PROPAGATION': return 'cf-propagation'; + case 'RELATED_ENTITIES_AGGREGATION': return 'cf-related-agg'; + case 'ENTITY_AGGREGATION': return 'cf-entity-agg'; + default: return 'cf-entity-agg'; + } + } + switch (this.item.dataDescriptor?.ruleChainType) { + case 'CORE': return 'rc-core'; + case 'EDGE': return 'rc-edge'; + default: return 'rc-core'; + } + } + + getCompactSubtypeLabel(): string { + if (this.item.type === ItemType.CALCULATED_FIELD) { + const cfType = this.item.dataDescriptor?.cfType; + const key = cfType ? cfTypeTranslations.get(cfType) : null; + return key ? this.translate.instant(key) : cfType || ''; + } + const rcType = this.item.dataDescriptor?.ruleChainType; + const key = rcType ? ruleChainTypeTranslations.get(rcType) : null; + return key ? this.translate.instant(key) : rcType || ''; + } + + getSubtypeLabel(): string { + switch (this.item.type) { + case ItemType.CALCULATED_FIELD: + return this.getCompactSubtypeLabel(); + case ItemType.RULE_CHAIN: + return this.getCompactSubtypeLabel(); + case ItemType.WIDGET: { + const wt = this.item.dataDescriptor?.widgetType; + const key = wt ? widgetTypeTranslations.get(wt) : null; + return key ? this.translate.instant(key) : ''; + } + default: + return ''; + } + } + + getSubtypeColorClass(): string { + switch (this.item.type) { + case ItemType.CALCULATED_FIELD: + switch (this.item.dataDescriptor?.cfType) { + case 'SIMPLE': return 'cf-simple'; + case 'SCRIPT': return 'cf-script'; + case 'GEOFENCING': return 'cf-geofencing'; + case 'ALARM': return 'cf-alarm'; + case 'PROPAGATION': return 'cf-propagation'; + case 'RELATED_ENTITIES_AGGREGATION': return 'cf-related-agg'; + case 'ENTITY_AGGREGATION': return 'cf-entity-agg'; + default: return 'cf-simple'; + } + case ItemType.RULE_CHAIN: + return this.item.dataDescriptor?.ruleChainType === 'EDGE' ? 'rc-edge' : 'rc-core'; + case ItemType.WIDGET: + switch (this.item.dataDescriptor?.widgetType) { + case 'timeseries': return 'wt-timeseries'; + case 'latest': return 'wt-latest'; + case 'rpc': return 'wt-rpc'; + case 'alarm': return 'wt-alarm'; + case 'static': return 'wt-static'; + default: return 'wt-static'; + } + default: + return ''; + } + } + + getNodeLabel(node: NodeInfo): string { + const key = nodeComponentTypeTranslations.get(node.type); + const typeLabel = key ? this.translate.instant(key) : node.type; + return `${node.name} (${typeLabel})`; + } + + getNodes(): NodeInfo[] { + return this.item.dataDescriptor?.nodes || []; + } + + getNodeCount(): number { + return this.item.dataDescriptor?.nodeCount || 0; + } + + install(): void { + this.dialog.open(TbIotHubInstallDialogComponent, { + panelClass: ['tb-dialog'], + data: { + item: this.item, + iotHubApiService: this.data.iotHubApiService + } as IotHubInstallDialogData + }); + } + + openSignup(): void { + window.open('https://iothub.thingsboard.io/signup', '_blank'); + } + + navigateToCreator(): void { + this.dialogRef.close(); + this.router.navigate(['/iot-hub/creator', this.item.creatorId]); + } + + close(): void { + this.dialogRef.close(); + } + + private loadReadme(): void { + const versionId = this.item.id as string; + this.data.iotHubApiService.getVersionReadme(versionId, { ignoreLoading: true }).subscribe( + content => this.readmeContent = this.prefixResourceUrls(content || '') + ); + } + + private prefixResourceUrls(markdown: string): string { + const baseUrl = this.data.iotHubApiService.baseUrl; + return markdown.replace(/(\(|")(\/api\/resources\/[^)"]*)/g, `$1${baseUrl}$2`); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts new file mode 100644 index 0000000000..93a8724d77 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts @@ -0,0 +1,63 @@ +/// +/// Copyright © 2016-2026 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 { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +import { Authority } from '@shared/models/authority.enum'; +import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; +import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; + +const routes: Routes = [ + { + path: 'iot-hub', + data: { + auth: [Authority.TENANT_ADMIN], + breadcrumb: { + label: 'iot-hub.iot-hub', + icon: 'store' + } + }, + children: [ + { + path: '', + component: TbIotHubBrowseComponent, + data: { + auth: [Authority.TENANT_ADMIN], + title: 'iot-hub.browse' + } + }, + { + path: 'creator/:creatorId', + component: TbIotHubCreatorProfileComponent, + data: { + auth: [Authority.TENANT_ADMIN], + title: 'iot-hub.creator-profile', + breadcrumb: { + label: 'iot-hub.creator-profile', + icon: 'person' + } + } + } + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class IotHubRoutingModule { } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts new file mode 100644 index 0000000000..be58e93f2c --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts @@ -0,0 +1,41 @@ +/// +/// Copyright © 2016-2026 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 { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '@shared/shared.module'; +import { IotHubRoutingModule } from './iot-hub-routing.module'; +import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; +import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; +import { TbIotHubItemDetailDialogComponent } from './iot-hub-item-detail-dialog.component'; +import { TbIotHubInstallDialogComponent } from './iot-hub-install-dialog.component'; +import { TbIotHubItemCardComponent } from './iot-hub-item-card.component'; + +@NgModule({ + declarations: [ + TbIotHubBrowseComponent, + TbIotHubCreatorProfileComponent, + TbIotHubItemDetailDialogComponent, + TbIotHubInstallDialogComponent, + TbIotHubItemCardComponent + ], + imports: [ + CommonModule, + SharedModule, + IotHubRoutingModule + ] +}) +export class IotHubModule { } diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-creator.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-creator.models.ts new file mode 100644 index 0000000000..16c6a2c409 --- /dev/null +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-creator.models.ts @@ -0,0 +1,29 @@ +/// +/// Copyright © 2016-2026 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. +/// + +export interface CreatorView { + id: string; + createdTime: number; + displayName: string; + contactEmail: string; + website: string; + description: string; + avatarUrl: string; + githubUrl: string; + linkedinUrl: string; + twitterUrl: string; + publishedCount: number; +} diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts new file mode 100644 index 0000000000..d67736f9ae --- /dev/null +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts @@ -0,0 +1,174 @@ +/// +/// Copyright © 2016-2026 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. +/// + +export enum ItemType { + WIDGET = 'WIDGET', + DASHBOARD = 'DASHBOARD', + CALCULATED_FIELD = 'CALCULATED_FIELD', + RULE_CHAIN = 'RULE_CHAIN', + DEVICE = 'DEVICE' +} + +export const itemTypeTranslations = new Map( + [ + [ItemType.WIDGET, 'item.type-widget'], + [ItemType.DASHBOARD, 'item.type-dashboard'], + [ItemType.CALCULATED_FIELD, 'item.type-calculated-field'], + [ItemType.RULE_CHAIN, 'item.type-rule-chain'], + [ItemType.DEVICE, 'item.type-device'] + ] +); + +export enum WidgetCategory { + CHARTS_GRAPHS = 'CHARTS_GRAPHS', + GAUGES_INDICATORS = 'GAUGES_INDICATORS', + CONTROLS = 'CONTROLS', + MAPS_LOCATION = 'MAPS_LOCATION', + TABLES_LISTS = 'TABLES_LISTS', + CARDS_INFO = 'CARDS_INFO', + SCADA = 'SCADA', + INPUT_FORMS = 'INPUT_FORMS' +} + +export const widgetCategoryTranslations = new Map([ + [WidgetCategory.CHARTS_GRAPHS, 'iot-hub.category.charts-graphs'], + [WidgetCategory.GAUGES_INDICATORS, 'iot-hub.category.gauges-indicators'], + [WidgetCategory.CONTROLS, 'iot-hub.category.controls'], + [WidgetCategory.MAPS_LOCATION, 'iot-hub.category.maps-location'], + [WidgetCategory.TABLES_LISTS, 'iot-hub.category.tables-lists'], + [WidgetCategory.CARDS_INFO, 'iot-hub.category.cards-info'], + [WidgetCategory.SCADA, 'iot-hub.category.scada'], + [WidgetCategory.INPUT_FORMS, 'iot-hub.category.input-forms'] +]); + +export enum DashboardCategory { + MONITORING = 'MONITORING', + ANALYTICS = 'ANALYTICS', + DEVICE_MANAGEMENT = 'DEVICE_MANAGEMENT', + USER_MANAGEMENT = 'USER_MANAGEMENT', + ASSET_MANAGEMENT = 'ASSET_MANAGEMENT', + SCADA = 'SCADA', + REPORTING = 'REPORTING', + OVERVIEW = 'OVERVIEW', + OPERATIONS = 'OPERATIONS' +} + +export const dashboardCategoryTranslations = new Map([ + [DashboardCategory.MONITORING, 'iot-hub.category.monitoring'], + [DashboardCategory.ANALYTICS, 'iot-hub.category.analytics'], + [DashboardCategory.DEVICE_MANAGEMENT, 'iot-hub.category.device-management'], + [DashboardCategory.USER_MANAGEMENT, 'iot-hub.category.user-management'], + [DashboardCategory.ASSET_MANAGEMENT, 'iot-hub.category.asset-management'], + [DashboardCategory.SCADA, 'iot-hub.category.scada'], + [DashboardCategory.REPORTING, 'iot-hub.category.reporting'], + [DashboardCategory.OVERVIEW, 'iot-hub.category.overview'], + [DashboardCategory.OPERATIONS, 'iot-hub.category.operations'] +]); + +export enum CalcFieldCategory { + AGGREGATION = 'AGGREGATION', + GEOSPATIAL = 'GEOSPATIAL', + STATISTICAL = 'STATISTICAL', + ENERGY = 'ENERGY', + ENVIRONMENTAL = 'ENVIRONMENTAL', + PREDICTIVE = 'PREDICTIVE', + CUSTOM_FORMULA = 'CUSTOM_FORMULA' +} + +export const calcFieldCategoryTranslations = new Map([ + [CalcFieldCategory.AGGREGATION, 'iot-hub.category.aggregation'], + [CalcFieldCategory.GEOSPATIAL, 'iot-hub.category.geospatial'], + [CalcFieldCategory.STATISTICAL, 'iot-hub.category.statistical'], + [CalcFieldCategory.ENERGY, 'iot-hub.category.energy'], + [CalcFieldCategory.ENVIRONMENTAL, 'iot-hub.category.environmental'], + [CalcFieldCategory.PREDICTIVE, 'iot-hub.category.predictive'], + [CalcFieldCategory.CUSTOM_FORMULA, 'iot-hub.category.custom-formula'] +]); + +export enum RuleChainCategory { + DATA_PROCESSING = 'DATA_PROCESSING', + ALERTING = 'ALERTING', + DEVICE_CONNECTIVITY = 'DEVICE_CONNECTIVITY', + INTEGRATION = 'INTEGRATION', + ANALYTICS = 'ANALYTICS' +} + +export const ruleChainCategoryTranslations = new Map([ + [RuleChainCategory.DATA_PROCESSING, 'iot-hub.category.data-processing'], + [RuleChainCategory.ALERTING, 'iot-hub.category.alerting'], + [RuleChainCategory.DEVICE_CONNECTIVITY, 'iot-hub.category.device-connectivity'], + [RuleChainCategory.INTEGRATION, 'iot-hub.category.integration'], + [RuleChainCategory.ANALYTICS, 'iot-hub.category.analytics'] +]); + +export enum DeviceCategory { + SENSORS = 'SENSORS', + GATEWAYS = 'GATEWAYS', + CONTROLLERS = 'CONTROLLERS', + ACTUATORS = 'ACTUATORS', + TRACKERS = 'TRACKERS', + METERS = 'METERS' +} + +export const deviceCategoryTranslations = new Map([ + [DeviceCategory.SENSORS, 'iot-hub.category.sensors'], + [DeviceCategory.GATEWAYS, 'iot-hub.category.gateways'], + [DeviceCategory.CONTROLLERS, 'iot-hub.category.controllers'], + [DeviceCategory.ACTUATORS, 'iot-hub.category.actuators'], + [DeviceCategory.TRACKERS, 'iot-hub.category.trackers'], + [DeviceCategory.METERS, 'iot-hub.category.meters'] +]); + +export enum UseCase { + SMART_HOME = 'SMART_HOME', + INDUSTRIAL_IOT = 'INDUSTRIAL_IOT', + ENERGY_MANAGEMENT = 'ENERGY_MANAGEMENT', + FLEET_MANAGEMENT = 'FLEET_MANAGEMENT', + AGRICULTURE = 'AGRICULTURE', + SMART_CITY = 'SMART_CITY', + HEALTHCARE = 'HEALTHCARE', + RETAIL = 'RETAIL', + WATER_UTILITIES = 'WATER_UTILITIES' +} + +export const useCaseTranslations = new Map([ + [UseCase.SMART_HOME, 'iot-hub.use-case.smart-home'], + [UseCase.INDUSTRIAL_IOT, 'iot-hub.use-case.industrial-iot'], + [UseCase.ENERGY_MANAGEMENT, 'iot-hub.use-case.energy-management'], + [UseCase.FLEET_MANAGEMENT, 'iot-hub.use-case.fleet-management'], + [UseCase.AGRICULTURE, 'iot-hub.use-case.agriculture'], + [UseCase.SMART_CITY, 'iot-hub.use-case.smart-city'], + [UseCase.HEALTHCARE, 'iot-hub.use-case.healthcare'], + [UseCase.RETAIL, 'iot-hub.use-case.retail'], + [UseCase.WATER_UTILITIES, 'iot-hub.use-case.water-utilities'] +]); + +export function getCategoriesForType(type: ItemType): Map { + switch (type) { + case ItemType.WIDGET: + return widgetCategoryTranslations as Map; + case ItemType.DASHBOARD: + return dashboardCategoryTranslations as Map; + case ItemType.CALCULATED_FIELD: + return calcFieldCategoryTranslations as Map; + case ItemType.RULE_CHAIN: + return ruleChainCategoryTranslations as Map; + case ItemType.DEVICE: + return deviceCategoryTranslations as Map; + default: + return new Map(); + } +} diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts new file mode 100644 index 0000000000..7ff055fc61 --- /dev/null +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts @@ -0,0 +1,153 @@ +/// +/// Copyright © 2016-2026 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 { ItemType } from './iot-hub-item.models'; +import { PageLink } from '@shared/models/page/page-link'; + +export const widgetTypeTranslations = new Map([ + ['timeseries', 'item-data.widget-type-timeseries'], + ['latest', 'item-data.widget-type-latest'], + ['rpc', 'item-data.widget-type-rpc'], + ['alarm', 'item-data.widget-type-alarm'], + ['static', 'item-data.widget-type-static'], +]); + +export const cfTypeTranslations = new Map([ + ['SIMPLE', 'item-data.cf-type-simple'], + ['SCRIPT', 'item-data.cf-type-script'], + ['GEOFENCING', 'item-data.cf-type-geofencing'], + ['ALARM', 'item-data.cf-type-alarm'], + ['PROPAGATION', 'item-data.cf-type-propagation'], + ['RELATED_ENTITIES_AGGREGATION', 'item-data.cf-type-related-entities-aggregation'], + ['ENTITY_AGGREGATION', 'item-data.cf-type-entity-aggregation'], +]); + +export const cfTypeIcons = new Map([ + ['SIMPLE', 'calculate'], + ['SCRIPT', 'code'], + ['GEOFENCING', 'share_location'], + ['ALARM', 'notification_important'], + ['PROPAGATION', 'account_tree'], + ['RELATED_ENTITIES_AGGREGATION', 'hub'], + ['ENTITY_AGGREGATION', 'functions'], +]); + +export enum NodeComponentType { + ENRICHMENT = 'ENRICHMENT', + FILTER = 'FILTER', + TRANSFORMATION = 'TRANSFORMATION', + ACTION = 'ACTION', + ANALYTICS = 'ANALYTICS', + EXTERNAL = 'EXTERNAL', + FLOW = 'FLOW', + UNKNOWN = 'UNKNOWN' +} + +export const nodeComponentTypeTranslations = new Map([ + [NodeComponentType.ENRICHMENT, 'item-data.node-type-enrichment'], + [NodeComponentType.FILTER, 'item-data.node-type-filter'], + [NodeComponentType.TRANSFORMATION, 'item-data.node-type-transformation'], + [NodeComponentType.ACTION, 'item-data.node-type-action'], + [NodeComponentType.ANALYTICS, 'item-data.node-type-analytics'], + [NodeComponentType.EXTERNAL, 'item-data.node-type-external'], + [NodeComponentType.FLOW, 'item-data.node-type-flow'], + [NodeComponentType.UNKNOWN, 'item-data.node-type-unknown'], +]); + +export interface NodeInfo { + name: string; + type: NodeComponentType; +} + +export const ruleChainTypeTranslations = new Map([ + ['CORE', 'item-data.rule-chain-type-core'], + ['EDGE', 'item-data.rule-chain-type-edge'], +]); + +export interface MpItemVersionView { + id: string; + createdTime: number; + version: string; + publishedTime: number; + changelog: string; + dataDescriptor: any; + image: string; + icon: string; + color: string; + description: string; + categories: string[]; + useCases: string[]; + itemId: string; + creatorId: string; + name: string; + type: ItemType; + peOnly: boolean; + tags: string[]; + creatorDisplayName: string; + creatorWebsite: string; + creatorContactEmail: string; + creatorDescription: string; + creatorAvatarUrl: string; + installCount: number; + totalInstallCount: number; +} + +export class MpItemVersionQuery { + constructor( + public pageLink: PageLink, + public type?: string, + public peOnly?: boolean, + public creatorId?: string, + public categories?: string[], + public useCases?: string[], + public cfTypes?: string[], + public widgetTypes?: string[], + public ruleChainTypes?: string[], + public tbVersion?: number + ) {} + + public toQuery(): string { + let query = this.pageLink.toQuery(); + if (this.type) { + query += `&type=${this.type}`; + } + if (this.peOnly != null) { + query += `&peOnly=${this.peOnly}`; + } + if (this.creatorId) { + query += `&creatorId=${this.creatorId}`; + } + if (this.categories?.length) { + query += this.categories.map(c => `&categories=${encodeURIComponent(c)}`).join(''); + } + if (this.useCases?.length) { + query += this.useCases.map(u => `&useCases=${encodeURIComponent(u)}`).join(''); + } + if (this.cfTypes?.length) { + query += this.cfTypes.map(t => `&cfTypes=${encodeURIComponent(t)}`).join(''); + } + if (this.widgetTypes?.length) { + query += this.widgetTypes.map(t => `&widgetTypes=${encodeURIComponent(t)}`).join(''); + } + if (this.ruleChainTypes?.length) { + query += this.ruleChainTypes.map(t => `&ruleChainTypes=${encodeURIComponent(t)}`).join(''); + } + if (this.tbVersion != null) { + query += `&tbVersion=${this.tbVersion}`; + } + return query; + } +} diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index ea11fff5a0..11f1c403dc 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3682,7 +3682,131 @@ } }, "item": { - "selected": "Selected" + "selected": "Selected", + "type-widget": "Widget", + "type-dashboard": "Dashboard", + "type-calculated-field": "Calculated Field", + "type-rule-chain": "Rule Chain", + "type-device": "Device" + }, + "iot-hub": { + "iot-hub": "IoT Hub", + "browse": "Browse IoT Hub", + "creator-profile": "Creator Profile", + "title-widgets": "Widgets", + "title-dashboards": "Dashboards", + "title-calculated-fields": "Calculated Fields", + "title-rule-chains": "Rule Chains", + "title-devices": "Devices", + "subtitle-widgets": "Browse community widgets for your dashboards", + "subtitle-dashboards": "Browse ready-to-use dashboards", + "subtitle-calculated-fields": "Browse calculated field templates", + "subtitle-rule-chains": "Browse rule chain templates", + "subtitle-devices": "Browse device configurations", + "search-widgets": "Search widgets...", + "search-dashboards": "Search dashboards...", + "search-calculated-fields": "Search calculated fields...", + "search-rule-chains": "Search rule chains...", + "search-devices": "Search devices...", + "sort-most-installed": "Most installed", + "sort-newest": "Newest", + "sort-name": "Name (A-Z)", + "type-filter-label": "Type", + "category": "Category", + "use-case": "Use case", + "clear-all-filters": "Clear all filters", + "results-count": "{{count}} results", + "unable-to-load": "Unable to load", + "unable-to-load-text": "There was a problem loading items. Please try again.", + "retry": "Retry", + "no-items-found": "No items found", + "no-items-found-text": "Try adjusting your search or filters.", + "become-a-creator": "Become a creator", + "back-to-iot-hub": "Back to IoT Hub", + "published-items": "Published items", + "by-creator": "by {{name}}", + "installs": "installs", + "more": "more", + "categories": "Categories", + "use-cases": "Use Cases", + "changelog": "Changelog", + "install-item-type": "Install {{type}}", + "created-by": "Created by {{name}}", + "install-item-title": "Install Item", + "install-confirm": "Install {{name}} v{{version}}?", + "install-type": "Type: {{type}}", + "install-creator": "Creator: {{creator}}", + "install": "Install", + "installing": "Installing...", + "installed": "Installed", + "install-success": "{{name}} installed successfully", + "install-error": "Failed to install {{name}}", + "category.charts-graphs": "Charts & Graphs", + "category.gauges-indicators": "Gauges & Indicators", + "category.controls": "Controls", + "category.maps-location": "Maps & Location", + "category.tables-lists": "Tables & Lists", + "category.cards-info": "Cards & Info", + "category.scada": "SCADA", + "category.input-forms": "Input Forms", + "category.monitoring": "Monitoring", + "category.analytics": "Analytics", + "category.device-management": "Device Management", + "category.user-management": "User Management", + "category.asset-management": "Asset Management", + "category.reporting": "Reporting", + "category.overview": "Overview", + "category.operations": "Operations", + "category.aggregation": "Aggregation", + "category.geospatial": "Geospatial", + "category.statistical": "Statistical", + "category.energy": "Energy", + "category.environmental": "Environmental", + "category.predictive": "Predictive", + "category.custom-formula": "Custom Formula", + "category.data-processing": "Data Processing", + "category.alerting": "Alerting", + "category.device-connectivity": "Device Connectivity", + "category.integration": "Integration", + "category.sensors": "Sensors", + "category.gateways": "Gateways", + "category.controllers": "Controllers", + "category.actuators": "Actuators", + "category.trackers": "Trackers", + "category.meters": "Meters", + "use-case.smart-home": "Smart Home", + "use-case.industrial-iot": "Industrial IoT", + "use-case.energy-management": "Energy Management", + "use-case.fleet-management": "Fleet Management", + "use-case.agriculture": "Agriculture", + "use-case.smart-city": "Smart City", + "use-case.healthcare": "Healthcare", + "use-case.retail": "Retail", + "use-case.water-utilities": "Water & Utilities" + }, + "item-data": { + "widget-type-timeseries": "Timeseries", + "widget-type-latest": "Latest", + "widget-type-rpc": "RPC", + "widget-type-alarm": "Alarm", + "widget-type-static": "Static", + "cf-type-simple": "Simple", + "cf-type-script": "Script", + "cf-type-geofencing": "Geofencing", + "cf-type-alarm": "Alarm", + "cf-type-propagation": "Propagation", + "cf-type-related-entities-aggregation": "Related Entities Aggregation", + "cf-type-entity-aggregation": "Entity Aggregation", + "rule-chain-type-core": "Core", + "rule-chain-type-edge": "Edge", + "node-type-enrichment": "Enrichment", + "node-type-filter": "Filter", + "node-type-transformation": "Transformation", + "node-type-action": "Action", + "node-type-analytics": "Analytics", + "node-type-external": "External", + "node-type-flow": "Flow", + "node-type-unknown": "Unknown" }, "js-func": { "no-return-error": "Function must return value!", From 285c8625536113c93458b7c6a98db8dfcadbc545 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 10 Mar 2026 12:20:45 +0200 Subject: [PATCH 002/219] Add IoT Hub installed items management - Full entity stack: IotHubInstalledItem with ID, descriptors, JPA entity, DAO (extends JpaAbstractDao), service - Controller endpoints: install, list (paginated), list infos, get by itemId, delete - Install flow saves descriptor with entity IDs, delete cascades to installed entities - Frontend installed items page with search, pagination, type chips, action buttons - Browse page shows "Installed" label on cards, detail dialog shows "Open details" for installed items - Installed item infos fetched on browse page init to track installation state --- .../main/data/upgrade/basic/schema_update.sql | 19 +- .../server/controller/IotHubController.java | 49 +++- .../service/iot_hub/DefaultIotHubService.java | 172 ++++++++++---- .../iot_hub/InstallItemVersionResult.java | 40 ++++ .../server/service/iot_hub/IotHubService.java | 7 +- .../common/data/id/IotHubInstalledItemId.java | 34 +++ ...alculatedFieldInstalledItemDescriptor.java | 26 +++ .../DashboardInstalledItemDescriptor.java | 26 +++ .../DeviceInstalledItemDescriptor.java | 23 ++ .../data/iot_hub/IotHubInstalledItem.java | 47 ++++ .../IotHubInstalledItemDescriptor.java | 38 ++++ .../data/iot_hub/IotHubInstalledItemInfo.java | 32 +++ .../RuleChainInstalledItemDescriptor.java | 26 +++ .../WidgetInstalledItemDescriptor.java | 26 +++ .../dao/iot_hub/IotHubInstalledItemDao.java | 41 ++++ .../iot_hub/IotHubInstalledItemService.java | 42 ++++ .../IotHubInstalledItemServiceImpl.java | 69 ++++++ .../server/dao/model/ModelConstants.java | 12 + .../model/sql/IotHubInstalledItemEntity.java | 110 +++++++++ .../IotHubInstalledItemRepository.java | 60 +++++ .../iot_hub/JpaIotHubInstalledItemDao.java | 100 +++++++++ .../server/dao/tenant/TenantServiceImpl.java | 3 + .../main/resources/sql/schema-entities.sql | 13 ++ .../src/app/core/http/iot-hub-api.service.ts | 37 +++ .../iot-hub/iot-hub-browse.component.html | 11 +- .../iot-hub/iot-hub-browse.component.scss | 3 + .../pages/iot-hub/iot-hub-browse.component.ts | 37 ++- .../iot-hub-install-dialog.component.ts | 25 ++- .../iot-hub-installed-items.component.html | 116 ++++++++++ .../iot-hub-installed-items.component.scss | 202 +++++++++++++++++ .../iot-hub-installed-items.component.ts | 210 ++++++++++++++++++ .../iot-hub/iot-hub-item-card.component.html | 6 +- .../iot-hub/iot-hub-item-card.component.scss | 10 + .../iot-hub/iot-hub-item-card.component.ts | 1 + .../iot-hub-item-detail-dialog.component.html | 12 +- .../iot-hub-item-detail-dialog.component.ts | 49 +++- .../pages/iot-hub/iot-hub-routing.module.ts | 13 ++ .../home/pages/iot-hub/iot-hub.module.ts | 4 +- .../iot-hub/iot-hub-installed-item.models.ts | 63 ++++++ .../assets/locale/locale.constant-en_US.json | 18 +- 40 files changed, 1763 insertions(+), 69 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/service/iot_hub/InstallItemVersionResult.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/id/IotHubInstalledItemId.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DashboardInstalledItemDescriptor.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DeviceInstalledItemDescriptor.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItem.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/RuleChainInstalledItemDescriptor.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/WidgetInstalledItemDescriptor.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/IotHubInstalledItemEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts create mode 100644 ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql index 98c7a93c52..3df3837944 100644 --- a/application/src/main/data/upgrade/basic/schema_update.sql +++ b/application/src/main/data/upgrade/basic/schema_update.sql @@ -43,4 +43,21 @@ DROP INDEX IF EXISTS idx_widgets_bundle_external_id; -- DROP INDEXES THAT DUPLICATE UNIQUE CONSTRAINT END -ALTER TABLE mobile_app ADD COLUMN IF NOT EXISTS title varchar(255); \ No newline at end of file +ALTER TABLE mobile_app ADD COLUMN IF NOT EXISTS title varchar(255); + +-- IOT HUB INSTALLED ITEM START + +CREATE TABLE IF NOT EXISTS iot_hub_installed_item ( + id UUID NOT NULL PRIMARY KEY, + created_time BIGINT NOT NULL, + tenant_id UUID NOT NULL, + item_id UUID NOT NULL, + item_version_id UUID NOT NULL, + item_name VARCHAR NOT NULL, + item_type VARCHAR NOT NULL, + version VARCHAR NOT NULL, + descriptor JSONB NOT NULL, + CONSTRAINT iot_hub_installed_item_item_id_unq_key UNIQUE (tenant_id, item_id) +); + +-- IOT HUB INSTALLED ITEM END \ No newline at end of file diff --git a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java index eef17d8c96..e2b6b297ab 100644 --- a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java +++ b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java @@ -15,18 +15,29 @@ */ package org.thingsboard.server.controller; -import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.oas.annotations.Hidden; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.common.data.page.PageData; +import org.thingsboard.server.common.data.page.PageLink; + +import java.util.List; +import java.util.UUID; +import org.thingsboard.server.dao.iot_hub.IotHubInstalledItemService; import org.thingsboard.server.queue.util.TbCoreComponent; +import org.thingsboard.server.service.iot_hub.InstallItemVersionResult; import org.thingsboard.server.service.iot_hub.IotHubService; @Hidden @@ -38,11 +49,45 @@ import org.thingsboard.server.service.iot_hub.IotHubService; public class IotHubController extends BaseController { private final IotHubService iotHubService; + private final IotHubInstalledItemService iotHubInstalledItemService; @PreAuthorize("hasAuthority('TENANT_ADMIN')") @PostMapping("/versions/{versionId}/install") @ResponseBody - public JsonNode installItemVersion(@PathVariable String versionId) throws Exception { + public InstallItemVersionResult installItemVersion(@PathVariable String versionId) throws ThingsboardException { return iotHubService.installItemVersion(getCurrentUser(), versionId); } + + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @GetMapping("/installedItems") + @ResponseBody + public PageData getInstalledItems(@RequestParam int pageSize, + @RequestParam int page, + @RequestParam(required = false) String textSearch, + @RequestParam(required = false) String sortProperty, + @RequestParam(required = false) String sortOrder) throws ThingsboardException { + PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder); + return iotHubInstalledItemService.findByTenantId(getTenantId(), pageLink); + } + + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @GetMapping("/installedItems/byItemId/{itemId}") + @ResponseBody + public IotHubInstalledItem getInstalledItemByItemId(@PathVariable UUID itemId) throws ThingsboardException { + return iotHubInstalledItemService.findByTenantIdAndItemId(getTenantId(), itemId).orElse(null); + } + + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @GetMapping("/installedItems/info") + @ResponseBody + public List getInstalledItemInfos() throws ThingsboardException { + return iotHubInstalledItemService.findInstalledItemInfosByTenantId(getTenantId()); + } + + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @DeleteMapping("/installedItems/{itemId}") + @ResponseBody + public void deleteInstalledItem(@PathVariable UUID itemId) throws ThingsboardException { + iotHubService.deleteInstalledItem(getCurrentUser(), itemId); + } } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java index 173ae79020..bef8cfdd10 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java @@ -24,8 +24,23 @@ import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.cf.CalculatedField; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.CalculatedFieldInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.DashboardInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.DeviceInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.RuleChainInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.WidgetInstalledItemDescriptor; +import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainData; +import org.thingsboard.server.common.data.rule.RuleChainImportResult; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; +import org.thingsboard.server.dao.cf.CalculatedFieldService; +import org.thingsboard.server.dao.dashboard.DashboardService; +import org.thingsboard.server.dao.device.DeviceProfileService; +import org.thingsboard.server.dao.iot_hub.IotHubInstalledItemService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.dao.widget.WidgetTypeService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.entitiy.cf.TbCalculatedFieldService; import org.thingsboard.server.service.entitiy.dashboard.TbDashboardService; @@ -33,7 +48,9 @@ import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileServ import org.thingsboard.server.service.entitiy.widgets.type.TbWidgetTypeService; import org.thingsboard.server.service.rule.TbRuleChainService; import org.thingsboard.server.service.security.model.SecurityUser; -import org.thingsboard.server.dao.rule.RuleChainService; + +import java.util.List; +import java.util.UUID; @Service @TbCoreComponent @@ -48,81 +65,148 @@ public class DefaultIotHubService implements IotHubService { private final RuleChainService ruleChainService; private final TbRuleChainService tbRuleChainService; private final TbDeviceProfileService tbDeviceProfileService; + private final IotHubInstalledItemService iotHubInstalledItemService; + private final WidgetTypeService widgetTypeService; + private final DashboardService dashboardService; + private final CalculatedFieldService calculatedFieldService; + private final DeviceProfileService deviceProfileService; @Override - public JsonNode installItemVersion(SecurityUser user, String versionId) throws Exception { + public InstallItemVersionResult installItemVersion(SecurityUser user, String versionId) { TenantId tenantId = user.getTenantId(); log.info("[{}] Installing IoT Hub item version: {}", tenantId, versionId); - JsonNode versionInfo = iotHubRestClient.getVersionInfo(versionId); - String itemType = versionInfo.get("type").asText(); - String itemName = versionInfo.get("name").asText(); - log.debug("[{}] Fetched version info: {} (type: {})", tenantId, itemName, itemType); - - byte[] fileData = iotHubRestClient.getVersionFileData(versionId); - log.debug("[{}] Fetched file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); - - switch (itemType) { - case "WIDGET": - installWidget(user, tenantId, fileData); - break; - case "DASHBOARD": - installDashboard(user, tenantId, fileData); - break; - case "CALCULATED_FIELD": - installCalculatedField(user, tenantId, fileData); - break; - case "RULE_CHAIN": - installRuleChain(tenantId, fileData); - break; - case "DEVICE": - installDeviceProfile(user, tenantId, fileData); - break; - default: - throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); - } + try { + JsonNode versionInfo = iotHubRestClient.getVersionInfo(versionId); + String itemType = versionInfo.get("type").asText(); + String itemName = versionInfo.get("name").asText(); + UUID itemId = UUID.fromString(versionInfo.get("itemId").asText()); + String version = versionInfo.get("version").asText(); + log.debug("[{}] Fetched version info: {} (type: {})", tenantId, itemName, itemType); + + if (iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId).isPresent()) { + return InstallItemVersionResult.error("Item '" + itemName + "' is already installed"); + } - iotHubRestClient.reportVersionInstalled(versionId); - log.info("[{}] Successfully installed IoT Hub item version: {} (type: {})", tenantId, itemName, itemType); + byte[] fileData = iotHubRestClient.getVersionFileData(versionId); + log.debug("[{}] Fetched file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); - return versionInfo; + IotHubInstalledItemDescriptor descriptor = switch (itemType) { + case "WIDGET" -> installWidget(user, tenantId, fileData); + case "DASHBOARD" -> installDashboard(user, tenantId, fileData); + case "CALCULATED_FIELD" -> installCalculatedField(user, tenantId, fileData); + case "RULE_CHAIN" -> installRuleChain(tenantId, fileData); + case "DEVICE" -> installDeviceProfile(user, tenantId, fileData); + default -> throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); + }; + + IotHubInstalledItem installedItem = new IotHubInstalledItem(); + installedItem.setTenantId(tenantId); + installedItem.setItemId(itemId); + installedItem.setItemVersionId(UUID.fromString(versionId)); + installedItem.setItemName(itemName); + installedItem.setItemType(itemType); + installedItem.setVersion(version); + installedItem.setDescriptor(descriptor); + iotHubInstalledItemService.save(tenantId, installedItem); + + iotHubRestClient.reportVersionInstalled(versionId); + log.info("[{}] Successfully installed IoT Hub item version: {} (type: {})", tenantId, itemName, itemType); + + return InstallItemVersionResult.success(descriptor); + } catch (Exception e) { + log.error("[{}] Failed to install IoT Hub item version: {}", tenantId, versionId, e); + return InstallItemVersionResult.error(e.getMessage()); + } } - private void installWidget(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + private WidgetInstalledItemDescriptor installWidget(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { WidgetTypeDetails widgetTypeDetails = JacksonUtil.fromBytes(fileData, WidgetTypeDetails.class); widgetTypeDetails.setId(null); widgetTypeDetails.setTenantId(tenantId); - tbWidgetTypeService.save(widgetTypeDetails, true, user); - log.debug("[{}] Widget installed: {}", tenantId, widgetTypeDetails.getName()); + WidgetTypeDetails saved = tbWidgetTypeService.save(widgetTypeDetails, true, user); + log.debug("[{}] Widget installed: {}", tenantId, saved.getName()); + WidgetInstalledItemDescriptor descriptor = new WidgetInstalledItemDescriptor(); + descriptor.setWidgetTypeId(saved.getId()); + return descriptor; } - private void installDashboard(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + private DashboardInstalledItemDescriptor installDashboard(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { Dashboard dashboard = JacksonUtil.fromBytes(fileData, Dashboard.class); dashboard.setId(null); dashboard.setTenantId(tenantId); - tbDashboardService.save(dashboard, user); - log.debug("[{}] Dashboard installed: {}", tenantId, dashboard.getTitle()); + Dashboard saved = tbDashboardService.save(dashboard, user); + log.debug("[{}] Dashboard installed: {}", tenantId, saved.getTitle()); + DashboardInstalledItemDescriptor descriptor = new DashboardInstalledItemDescriptor(); + descriptor.setDashboardId(saved.getId()); + return descriptor; } - private void installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + private CalculatedFieldInstalledItemDescriptor installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { CalculatedField calculatedField = JacksonUtil.fromBytes(fileData, CalculatedField.class); calculatedField.setId(null); calculatedField.setTenantId(tenantId); - tbCalculatedFieldService.save(calculatedField, user); - log.debug("[{}] Calculated field installed: {}", tenantId, calculatedField.getName()); + CalculatedField saved = tbCalculatedFieldService.save(calculatedField, user); + log.debug("[{}] Calculated field installed: {}", tenantId, saved.getName()); + CalculatedFieldInstalledItemDescriptor descriptor = new CalculatedFieldInstalledItemDescriptor(); + descriptor.setCalculatedFieldId(saved.getId()); + return descriptor; } - private void installRuleChain(TenantId tenantId, byte[] fileData) { + private RuleChainInstalledItemDescriptor installRuleChain(TenantId tenantId, byte[] fileData) { RuleChainData ruleChainData = JacksonUtil.fromBytes(fileData, RuleChainData.class); - ruleChainService.importTenantRuleChains(tenantId, ruleChainData, false, tbRuleChainService::updateRuleNodeConfiguration); + List results = ruleChainService.importTenantRuleChains(tenantId, ruleChainData, false, tbRuleChainService::updateRuleNodeConfiguration); log.debug("[{}] Rule chain(s) installed", tenantId); + RuleChainInstalledItemDescriptor descriptor = new RuleChainInstalledItemDescriptor(); + if (!results.isEmpty()) { + descriptor.setRuleChainId(results.get(0).getRuleChainId()); + } + return descriptor; } - private void installDeviceProfile(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + private DeviceInstalledItemDescriptor installDeviceProfile(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { DeviceProfile deviceProfile = JacksonUtil.fromBytes(fileData, DeviceProfile.class); deviceProfile.setId(null); deviceProfile.setTenantId(tenantId); tbDeviceProfileService.save(deviceProfile, user); log.debug("[{}] Device profile installed: {}", tenantId, deviceProfile.getName()); + return new DeviceInstalledItemDescriptor(); + } + + @Override + public void deleteInstalledItem(SecurityUser user, UUID itemId) { + TenantId tenantId = user.getTenantId(); + IotHubInstalledItem installedItem = iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId) + .orElseThrow(() -> new IllegalArgumentException("Installed item not found")); + + IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); + if (descriptor instanceof WidgetInstalledItemDescriptor wd) { + WidgetTypeDetails widgetType = widgetTypeService.findWidgetTypeDetailsById(tenantId, wd.getWidgetTypeId()); + if (widgetType != null) { + tbWidgetTypeService.delete(widgetType, user); + } + } else if (descriptor instanceof DashboardInstalledItemDescriptor dd) { + Dashboard dashboard = dashboardService.findDashboardById(tenantId, dd.getDashboardId()); + if (dashboard != null) { + tbDashboardService.delete(dashboard, user); + } + } else if (descriptor instanceof CalculatedFieldInstalledItemDescriptor cd) { + CalculatedField calculatedField = calculatedFieldService.findById(tenantId, cd.getCalculatedFieldId()); + if (calculatedField != null) { + tbCalculatedFieldService.delete(calculatedField, user); + } + } else if (descriptor instanceof RuleChainInstalledItemDescriptor rd) { + if (rd.getRuleChainId() != null) { + RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, rd.getRuleChainId()); + if (ruleChain != null) { + tbRuleChainService.delete(ruleChain, user); + } + } + } else if (descriptor instanceof DeviceInstalledItemDescriptor) { + // no entity to delete for now + } + + iotHubInstalledItemService.deleteByTenantIdAndItemId(tenantId, itemId); + log.info("[{}] Deleted installed IoT Hub item: {}", tenantId, installedItem.getItemName()); } } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/InstallItemVersionResult.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/InstallItemVersionResult.java new file mode 100644 index 0000000000..f91085cfd6 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/InstallItemVersionResult.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2026 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.service.iot_hub; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class InstallItemVersionResult { + + private boolean success; + private String errorMessage; + private IotHubInstalledItemDescriptor descriptor; + + public static InstallItemVersionResult success(IotHubInstalledItemDescriptor descriptor) { + return new InstallItemVersionResult(true, null, descriptor); + } + + public static InstallItemVersionResult error(String errorMessage) { + return new InstallItemVersionResult(false, errorMessage, null); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java index 9a92825d82..f0cfc6c49d 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java @@ -15,10 +15,13 @@ */ package org.thingsboard.server.service.iot_hub; -import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.service.security.model.SecurityUser; +import java.util.UUID; + public interface IotHubService { - JsonNode installItemVersion(SecurityUser user, String versionId) throws Exception; + InstallItemVersionResult installItemVersion(SecurityUser user, String versionId); + + void deleteInstalledItem(SecurityUser user, UUID itemId); } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/IotHubInstalledItemId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/IotHubInstalledItemId.java new file mode 100644 index 0000000000..f9ea6c4443 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/IotHubInstalledItemId.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.id; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.UUID; + +public class IotHubInstalledItemId extends UUIDBased { + + @JsonCreator + public IotHubInstalledItemId(@JsonProperty("id") UUID id) { + super(id); + } + + public static IotHubInstalledItemId fromString(String id) { + return new IotHubInstalledItemId(UUID.fromString(id)); + } + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java new file mode 100644 index 0000000000..b47b9f8cc8 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import org.thingsboard.server.common.data.id.CalculatedFieldId; + +@Data +public class CalculatedFieldInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + + private CalculatedFieldId calculatedFieldId; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DashboardInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DashboardInstalledItemDescriptor.java new file mode 100644 index 0000000000..260665b82f --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DashboardInstalledItemDescriptor.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import org.thingsboard.server.common.data.id.DashboardId; + +@Data +public class DashboardInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + + private DashboardId dashboardId; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DeviceInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DeviceInstalledItemDescriptor.java new file mode 100644 index 0000000000..b558058db5 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/DeviceInstalledItemDescriptor.java @@ -0,0 +1,23 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; + +@Data +public class DeviceInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItem.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItem.java new file mode 100644 index 0000000000..8152ec1b0d --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItem.java @@ -0,0 +1,47 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.thingsboard.server.common.data.BaseData; +import org.thingsboard.server.common.data.HasTenantId; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.UUID; + +@Data +@EqualsAndHashCode(callSuper = true) +public class IotHubInstalledItem extends BaseData implements HasTenantId { + + private TenantId tenantId; + private UUID itemId; + private UUID itemVersionId; + private String itemName; + private String itemType; + private String version; + private IotHubInstalledItemDescriptor descriptor; + + public IotHubInstalledItem() { + super(); + } + + public IotHubInstalledItem(IotHubInstalledItemId id) { + super(id); + } + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java new file mode 100644 index 0000000000..e08b686515 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java @@ -0,0 +1,38 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +import java.io.Serializable; + +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + property = "type") +@JsonSubTypes({ + @Type(name = "WIDGET", value = WidgetInstalledItemDescriptor.class), + @Type(name = "DASHBOARD", value = DashboardInstalledItemDescriptor.class), + @Type(name = "CALCULATED_FIELD", value = CalculatedFieldInstalledItemDescriptor.class), + @Type(name = "RULE_CHAIN", value = RuleChainInstalledItemDescriptor.class), + @Type(name = "DEVICE", value = DeviceInstalledItemDescriptor.class) +}) +public interface IotHubInstalledItemDescriptor extends Serializable { + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java new file mode 100644 index 0000000000..19eb74dccb --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class IotHubInstalledItemInfo { + + private UUID itemId; + private UUID itemVersionId; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/RuleChainInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/RuleChainInstalledItemDescriptor.java new file mode 100644 index 0000000000..f684607759 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/RuleChainInstalledItemDescriptor.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import org.thingsboard.server.common.data.id.RuleChainId; + +@Data +public class RuleChainInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + + private RuleChainId ruleChainId; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/WidgetInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/WidgetInstalledItemDescriptor.java new file mode 100644 index 0000000000..5c4195cb51 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/WidgetInstalledItemDescriptor.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import org.thingsboard.server.common.data.id.WidgetTypeId; + +@Data +public class WidgetInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + + private WidgetTypeId widgetTypeId; + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java new file mode 100644 index 0000000000..300b1cd620 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java @@ -0,0 +1,41 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.common.data.page.PageData; +import org.thingsboard.server.common.data.page.PageLink; +import org.thingsboard.server.dao.Dao; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface IotHubInstalledItemDao extends Dao { + + Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId); + + PageData findByTenantId(TenantId tenantId, PageLink pageLink); + + List findInstalledItemInfosByTenantId(TenantId tenantId); + + boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId); + + void deleteByTenantId(TenantId tenantId); + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java new file mode 100644 index 0000000000..1cee8f10a2 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.common.data.page.PageData; +import org.thingsboard.server.common.data.page.PageLink; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface IotHubInstalledItemService { + + IotHubInstalledItem save(TenantId tenantId, IotHubInstalledItem item); + + Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId); + + PageData findByTenantId(TenantId tenantId, PageLink pageLink); + + List findInstalledItemInfosByTenantId(TenantId tenantId); + + boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId); + + void deleteByTenantId(TenantId tenantId); + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java new file mode 100644 index 0000000000..37593df30b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java @@ -0,0 +1,69 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.common.data.page.PageData; +import org.thingsboard.server.common.data.page.PageLink; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Slf4j +class IotHubInstalledItemServiceImpl implements IotHubInstalledItemService { + + private final IotHubInstalledItemDao iotHubInstalledItemDao; + + @Override + public IotHubInstalledItem save(TenantId tenantId, IotHubInstalledItem item) { + log.debug("[{}] Saving IoT Hub installed item: {}", tenantId, item); + return iotHubInstalledItemDao.save(tenantId, item); + } + + @Override + public Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId) { + return iotHubInstalledItemDao.findByTenantIdAndItemId(tenantId, itemId); + } + + @Override + public PageData findByTenantId(TenantId tenantId, PageLink pageLink) { + return iotHubInstalledItemDao.findByTenantId(tenantId, pageLink); + } + + @Override + public List findInstalledItemInfosByTenantId(TenantId tenantId) { + return iotHubInstalledItemDao.findInstalledItemInfosByTenantId(tenantId); + } + + @Override + public boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId) { + return iotHubInstalledItemDao.deleteByTenantIdAndItemId(tenantId, itemId); + } + + @Override + public void deleteByTenantId(TenantId tenantId) { + iotHubInstalledItemDao.deleteByTenantId(tenantId); + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index de1a04e81e..d0573d0b69 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -760,6 +760,18 @@ public class ModelConstants { public static final String AI_MODEL_NAME_COLUMN_NAME = NAME_PROPERTY; public static final String AI_MODEL_CONFIGURATION_COLUMN_NAME = "configuration"; + /** + * IoT Hub installed item constants. + */ + public static final String IOT_HUB_INSTALLED_ITEM_TABLE_NAME = "iot_hub_installed_item"; + public static final String IOT_HUB_INSTALLED_ITEM_TENANT_ID_COLUMN = TENANT_ID_COLUMN; + public static final String IOT_HUB_INSTALLED_ITEM_ITEM_ID_COLUMN = "item_id"; + public static final String IOT_HUB_INSTALLED_ITEM_ITEM_VERSION_ID_COLUMN = "item_version_id"; + public static final String IOT_HUB_INSTALLED_ITEM_ITEM_NAME_COLUMN = "item_name"; + public static final String IOT_HUB_INSTALLED_ITEM_ITEM_TYPE_COLUMN = "item_type"; + public static final String IOT_HUB_INSTALLED_ITEM_VERSION_COLUMN = "version"; + public static final String IOT_HUB_INSTALLED_ITEM_DESCRIPTOR_COLUMN = "descriptor"; + protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN}; protected static final String[] COUNT_AGGREGATION_COLUMNS = new String[]{count(LONG_VALUE_COLUMN), count(DOUBLE_VALUE_COLUMN), count(BOOLEAN_VALUE_COLUMN), count(STRING_VALUE_COLUMN), count(JSON_VALUE_COLUMN), max(TS_COLUMN)}; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/IotHubInstalledItemEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/IotHubInstalledItemEntity.java new file mode 100644 index 0000000000..e0cd2f1c17 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/IotHubInstalledItemEntity.java @@ -0,0 +1,110 @@ +/** + * Copyright © 2016-2026 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.model.sql; + +import io.hypersistence.utils.hibernate.type.json.JsonBinaryType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.Type; +import org.hibernate.proxy.HibernateProxy; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; +import org.thingsboard.server.dao.model.BaseSqlEntity; +import org.thingsboard.server.dao.model.ModelConstants; + +import java.util.Objects; +import java.util.UUID; + +@Getter +@Setter +@ToString +@Entity +@Table(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_TABLE_NAME) +public class IotHubInstalledItemEntity extends BaseSqlEntity { + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_TENANT_ID_COLUMN, nullable = false, columnDefinition = "UUID") + private UUID tenantId; + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_ITEM_ID_COLUMN, nullable = false, columnDefinition = "UUID") + private UUID itemId; + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_ITEM_VERSION_ID_COLUMN, nullable = false, columnDefinition = "UUID") + private UUID itemVersionId; + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_ITEM_NAME_COLUMN, nullable = false) + private String itemName; + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_ITEM_TYPE_COLUMN, nullable = false) + private String itemType; + + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_VERSION_COLUMN, nullable = false) + private String version; + + @Type(JsonBinaryType.class) + @Column(name = ModelConstants.IOT_HUB_INSTALLED_ITEM_DESCRIPTOR_COLUMN, nullable = false, columnDefinition = "JSONB") + private IotHubInstalledItemDescriptor descriptor; + + public IotHubInstalledItemEntity() { + } + + public IotHubInstalledItemEntity(IotHubInstalledItem item) { + super(item); + tenantId = getTenantUuid(item.getTenantId()); + itemId = item.getItemId(); + itemVersionId = item.getItemVersionId(); + itemName = item.getItemName(); + itemType = item.getItemType(); + version = item.getVersion(); + descriptor = item.getDescriptor(); + } + + @Override + public IotHubInstalledItem toData() { + var item = new IotHubInstalledItem(new IotHubInstalledItemId(id)); + item.setCreatedTime(createdTime); + item.setTenantId(TenantId.fromUUID(tenantId)); + item.setItemId(itemId); + item.setItemVersionId(itemVersionId); + item.setItemName(itemName); + item.setItemType(itemType); + item.setVersion(version); + item.setDescriptor(descriptor); + return item; + } + + @Override + public final boolean equals(Object o) { + if (this == o) return true; + if (o == null) return false; + Class oEffectiveClass = o instanceof HibernateProxy ? ((HibernateProxy) o).getHibernateLazyInitializer().getPersistentClass() : o.getClass(); + Class thisEffectiveClass = this instanceof HibernateProxy ? ((HibernateProxy) this).getHibernateLazyInitializer().getPersistentClass() : this.getClass(); + if (thisEffectiveClass != oEffectiveClass) return false; + IotHubInstalledItemEntity that = (IotHubInstalledItemEntity) o; + return getId() != null && Objects.equals(getId(), that.getId()); + } + + @Override + public final int hashCode() { + return this instanceof HibernateProxy ? ((HibernateProxy) this).getHibernateLazyInitializer().getPersistentClass().hashCode() : getClass().hashCode(); + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java new file mode 100644 index 0000000000..fa4b98da6d --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java @@ -0,0 +1,60 @@ +/** + * Copyright © 2016-2026 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.sql.iot_hub; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.dao.model.sql.IotHubInstalledItemEntity; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +interface IotHubInstalledItemRepository extends JpaRepository { + + Optional findByTenantIdAndItemId(UUID tenantId, UUID itemId); + + @Query("SELECT new org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo(item.itemId, item.itemVersionId) " + + "FROM IotHubInstalledItemEntity item WHERE item.tenantId = :tenantId") + List findInstalledItemInfosByTenantId(@Param("tenantId") UUID tenantId); + + @Query(""" + SELECT item FROM IotHubInstalledItemEntity item + WHERE item.tenantId = :tenantId + AND (:textSearch IS NULL + OR ilike(item.itemName, CONCAT('%', :textSearch, '%')) = true + OR ilike(item.itemType, CONCAT('%', :textSearch, '%')) = true + OR ilike(item.version, CONCAT('%', :textSearch, '%')) = true) + """) + Page findByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, Pageable pageable); + + @Transactional + @Modifying + @Query("DELETE FROM IotHubInstalledItemEntity item WHERE item.tenantId = :tenantId AND item.itemId = :itemId") + int deleteByTenantIdAndItemId(@Param("tenantId") UUID tenantId, @Param("itemId") UUID itemId); + + @Transactional + @Modifying + @Query(value = "DELETE FROM iot_hub_installed_item WHERE tenant_id = :tenantId", nativeQuery = true) + void deleteByTenantId(@Param("tenantId") UUID tenantId); + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java new file mode 100644 index 0000000000..265026d710 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java @@ -0,0 +1,100 @@ +/** + * Copyright © 2016-2026 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.sql.iot_hub; + +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; +import org.thingsboard.server.common.data.page.PageData; +import org.thingsboard.server.common.data.page.PageLink; +import org.thingsboard.server.common.data.page.SortOrder; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.iot_hub.IotHubInstalledItemDao; +import org.thingsboard.server.dao.model.sql.IotHubInstalledItemEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@SqlDao +@Component +@RequiredArgsConstructor +class JpaIotHubInstalledItemDao extends JpaAbstractDao implements IotHubInstalledItemDao { + + private final IotHubInstalledItemRepository repository; + + @Override + public Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId) { + return repository.findByTenantIdAndItemId(tenantId.getId(), itemId).map(DaoUtil::getData); + } + + @Override + public PageData findByTenantId(TenantId tenantId, PageLink pageLink) { + return DaoUtil.toPageData(repository.findByTenantId( + tenantId.getId(), + StringUtils.defaultIfEmpty(pageLink.getTextSearch(), null), + toPageRequest(pageLink)) + ); + } + + @Override + public boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId) { + return repository.deleteByTenantIdAndItemId(tenantId.getId(), itemId) > 0; + } + + @Override + public List findInstalledItemInfosByTenantId(TenantId tenantId) { + return repository.findInstalledItemInfosByTenantId(tenantId.getId()); + } + + @Override + public void deleteByTenantId(TenantId tenantId) { + repository.deleteByTenantId(tenantId.getId()); + } + + private static PageRequest toPageRequest(PageLink pageLink) { + Sort sort; + SortOrder sortOrder = pageLink.getSortOrder(); + if (sortOrder == null) { + sort = Sort.by(Sort.Direction.DESC, "createdTime"); + } else { + sort = Sort.by( + Sort.Direction.fromString(sortOrder.getDirection().name()), + sortOrder.getProperty() + ).and(Sort.by(Sort.Direction.ASC, "id")); + } + return PageRequest.of(pageLink.getPage(), pageLink.getPageSize(), sort); + } + + @Override + protected Class getEntityClass() { + return IotHubInstalledItemEntity.class; + } + + @Override + protected JpaRepository getRepository() { + return repository; + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java index 3674804493..e7939ea32e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java @@ -83,6 +83,8 @@ public class TenantServiceImpl extends AbstractCachedEntityService existsTenantCache; @@ -168,6 +170,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService { + return this.http.get( + `${this.baseUrl}/api/versions/${versionId}`, + { params: this.buildParams(config) } + ); + } + public getVersionReadme(versionId: string, config?: IotHubRequestConfig): Observable { return this.http.get(`${this.baseUrl}/api/versions/${versionId}/readme`, { params: this.buildParams(config), @@ -111,6 +120,34 @@ export class IotHubApiService { ); } + public getInstalledItemByItemId(itemId: string, config?: IotHubRequestConfig): Observable { + return this.http.get( + `/api/iot-hub/installedItems/byItemId/${itemId}`, + { params: this.buildParams(config) } + ); + } + + public getInstalledItemInfos(config?: IotHubRequestConfig): Observable { + return this.http.get( + `/api/iot-hub/installedItems/info`, + { params: this.buildParams(config) } + ); + } + + public getInstalledItems(pageLink: PageLink, config?: IotHubRequestConfig): Observable> { + return this.http.get>( + `/api/iot-hub/installedItems${pageLink.toQuery()}`, + { params: this.buildParams(config) } + ); + } + + public deleteInstalledItem(itemId: string, config?: IotHubRequestConfig): Observable { + return this.http.delete( + `/api/iot-hub/installedItems/${itemId}`, + { params: this.buildParams(config) } + ); + } + public getCreatorProfile(creatorId: string, config?: IotHubRequestConfig): Observable { return this.http.get( `${this.baseUrl}/api/creators/${creatorId}/profile`, diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index b9f4bf4d75..83cf44e087 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -19,8 +19,14 @@ @if (!embedded) {
-

{{ getTitle() | translate }}

-

{{ getSubtitle() | translate }}

+
+

{{ getTitle() | translate }}

+

{{ getSubtitle() | translate }}

+
+
} @@ -187,6 +193,7 @@ [item]="item" [showTypeChip]="false" [showCreator]="!creatorId" + [installed]="isInstalled(item)" (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" (installClick)="installItem($event)"> diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss index 110133e5ff..deef2d98bc 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss @@ -47,6 +47,9 @@ } .tb-iot-hub-browse-header { + display: flex; + justify-content: space-between; + align-items: flex-start; margin-bottom: 24px; h1 { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 517e91ef8c..004dac5fde 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -27,6 +27,7 @@ import { } from '@shared/models/iot-hub/iot-hub-item.models'; import { cfTypeTranslations, widgetTypeTranslations, ruleChainTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Router } from '@angular/router'; @@ -89,6 +90,8 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { widgetTypes: Map = widgetTypeTranslations; ruleChainTypes: Map = ruleChainTypeTranslations; + installedItemsMap = new Map(); + private searchSubject = new Subject(); private destroy$ = new Subject(); @@ -108,6 +111,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.loadItems(); }); this.updateCategories(); + this.loadInstalledItemInfos(); this.loadItems(); } @@ -322,31 +326,58 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } } + isInstalled(item: MpItemVersionView): boolean { + return this.installedItemsMap.has(item.itemId); + } + openItemDetail(item: MpItemVersionView): void { - this.dialog.open(TbIotHubItemDetailDialogComponent, { + const installedInfo = this.installedItemsMap.get(item.itemId); + const dialogRef = this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], autoFocus: false, data: { item, - iotHubApiService: this.iotHubApiService + iotHubApiService: this.iotHubApiService, + installedItemInfo: installedInfo } as IotHubItemDetailDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed') { + this.loadInstalledItemInfos(); + } + }); } installItem(item: MpItemVersionView): void { - this.dialog.open(TbIotHubInstallDialogComponent, { + const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], data: { item, iotHubApiService: this.iotHubApiService } as IotHubInstallDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed') { + this.loadInstalledItemInfos(); + } + }); } navigateToCreator(creatorId: string): void { this.router.navigate(['/iot-hub/creator', creatorId]); } + navigateToInstalledItems(): void { + this.router.navigate(['/iot-hub/installed']); + } + + private loadInstalledItemInfos(): void { + this.iotHubApiService.getInstalledItemInfos({ignoreLoading: true}).subscribe(infos => { + this.installedItemsMap.clear(); + infos.forEach(info => this.installedItemsMap.set(info.itemId, info)); + }); + } + private updateCategories(): void { this.categories = getCategoriesForType(this.activeType); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts index f8132ec5c5..0fe5dd867b 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -97,14 +97,23 @@ export class TbIotHubInstallDialogComponent { this.state = 'installing'; const versionId = this.item.id as string; this.data.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }).subscribe({ - next: () => { - this.state = 'success'; - this.store.dispatch(new ActionNotificationShow({ - message: this.translate.instant('iot-hub.install-success', { name: this.item.name }), - type: 'success', - duration: 3000 - })); - setTimeout(() => this.dialogRef.close(true), 1500); + next: (result) => { + if (result.success) { + this.state = 'success'; + this.store.dispatch(new ActionNotificationShow({ + message: this.translate.instant('iot-hub.install-success', { name: this.item.name }), + type: 'success', + duration: 3000 + })); + setTimeout(() => this.dialogRef.close('installed'), 1500); + } else { + this.state = 'confirm'; + this.store.dispatch(new ActionNotificationShow({ + message: result.errorMessage || this.translate.instant('iot-hub.install-error', { name: this.item.name }), + type: 'error', + duration: 5000 + })); + } }, error: () => { this.state = 'confirm'; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html new file mode 100644 index 0000000000..b76b8301a8 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html @@ -0,0 +1,116 @@ + +
+ + arrow_back + {{ 'iot-hub.back-to-marketplace' | translate }} + +
+

{{ 'iot-hub.installed-items' | translate }}

+
+ +
+ + search + + @if (textSearch) { + + } + +
+ +
+ @if (isLoading) { + + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'iot-hub.item-name' | translate }}{{ item.itemName }}{{ 'iot-hub.item-type' | translate }} + {{ getItemTypeLabel(item.itemType) }} + {{ 'iot-hub.item-version' | translate }}{{ item.version }}{{ 'iot-hub.installed-date' | translate }}{{ item.createdTime | date:'medium' }} + + @if (getEntityId(item)) { + + } + +
+
+ {{ 'iot-hub.no-installed-items' | translate }} +
+
+ + + +
+
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss new file mode 100644 index 0000000000..b8d0596781 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss @@ -0,0 +1,202 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host { + display: flex; + flex-direction: column; + height: 100%; + padding: 16px 24px; + overflow: auto; +} + +.tb-iot-hub-installed-items-container { + max-width: 1400px; + margin: 0 auto; + width: 100%; + background: white; + padding: 24px; + border-radius: 4px; + box-shadow: 0 0 1px rgba(0, 0, 0, 0.14), 0 1px 1px rgba(0, 0, 0, 0.12); +} + +.tb-iot-hub-back-link { + display: inline-flex; + align-items: center; + gap: 4px; + font-size: 13px; + color: rgba(0, 0, 0, 0.54); + cursor: pointer; + text-decoration: none; + border-bottom: none; + margin-bottom: 12px; + + mat-icon { + font-size: 18px; + width: 18px; + height: 18px; + } + + &:hover { + color: rgba(0, 0, 0, 0.87); + text-decoration: none; + border-bottom: none; + } +} + +.tb-iot-hub-installed-items-header { + margin-bottom: 24px; + + h2 { + font-size: 28px; + font-weight: 700; + margin: 0; + color: rgba(0, 0, 0, 0.87); + } +} + +.tb-iot-hub-installed-search-row { + display: flex; + gap: 12px; + margin-bottom: 16px; + align-items: center; +} + +.tb-iot-hub-installed-search-field { + flex: 1; + + ::ng-deep { + .mat-mdc-text-field-wrapper { + height: 42px; + padding: 0 12px; + } + + .mat-mdc-form-field-flex { + height: 42px; + align-items: center; + } + + .mdc-notched-outline__leading, + .mdc-notched-outline__notch, + .mdc-notched-outline__trailing { + border-color: #d5dbe3; + } + + .mdc-notched-outline__leading { + border-radius: 8px 0 0 8px; + } + + .mdc-notched-outline__trailing { + border-radius: 0 8px 8px 0; + } + + .mat-mdc-form-field-infix { + padding-top: 0; + padding-bottom: 0; + min-height: unset; + } + + .mdc-notched-outline__notch { + display: none; + } + + .mat-mdc-floating-label { + display: none; + } + + .mat-mdc-form-field-subscript-wrapper { + display: none; + } + + input.mat-mdc-input-element { + font-size: 14px; + color: #3e4a59; + + &::placeholder { + color: #8b95a2; + opacity: 1; + } + } + + .mat-icon { + color: #8b95a2; + font-size: 20px; + width: 20px; + height: 20px; + } + + .mat-mdc-form-field-icon-prefix { + padding: 0 8px 0 0; + + > .mat-icon { + padding: 0; + } + } + + .mat-mdc-form-field-icon-suffix { + padding: 0; + + .mat-mdc-icon-button { + width: 32px; + height: 32px; + padding: 4px; + } + } + } + + &.mat-focused ::ng-deep { + .mdc-notched-outline__leading, + .mdc-notched-outline__notch, + .mdc-notched-outline__trailing { + border-color: #8b95a2; + border-width: 1px; + } + } +} + +.tb-iot-hub-installed-table-container { + border-radius: 4px; + overflow: hidden; + + table { + width: 100%; + } + + .mat-column-actions { + text-align: right; + white-space: nowrap; + } +} + +.tb-iot-hub-type-chip { + padding: 2px 10px; + border-radius: 12px; + font-size: 12px; + font-weight: 500; + white-space: nowrap; + + &.tb-type-widget { background: #e3f2fd; color: #1565c0; } + &.tb-type-dashboard { background: #e8f5e9; color: #2e7d32; } + &.tb-type-calc-field { background: #fff3e0; color: #e65100; } + &.tb-type-rule-chain { background: #f3e5f5; color: #7b1fa2; } + &.tb-type-device { background: #eceff1; color: #455a64; } +} + +.tb-iot-hub-installed-empty { + padding: 48px 24px; + text-align: center; + color: rgba(0, 0, 0, 0.54); + font-size: 14px; +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts new file mode 100644 index 0000000000..0c2902856f --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts @@ -0,0 +1,210 @@ +/// +/// Copyright © 2016-2026 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 { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSort } from '@angular/material/sort'; +import { MatPaginator } from '@angular/material/paginator'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { DialogService } from '@core/services/dialog.service'; +import { TranslateService } from '@ngx-translate/core'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ActionNotificationShow } from '@core/notification/notification.actions'; +import { Subject } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import { PageLink } from '@shared/models/page/page-link'; +import { Direction, SortOrder } from '@shared/models/page/sort-order'; +import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { EntityType } from '@shared/models/entity-type.models'; +import { getEntityDetailsPageURL } from '@core/utils'; +import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; + +@Component({ + selector: 'tb-iot-hub-installed-items', + standalone: false, + templateUrl: './iot-hub-installed-items.component.html', + styleUrls: ['./iot-hub-installed-items.component.scss'] +}) +export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { + + displayedColumns: string[] = ['itemName', 'itemType', 'version', 'createdTime', 'actions']; + dataSource: IotHubInstalledItem[] = []; + totalElements = 0; + pageSize = 10; + pageIndex = 0; + isLoading = false; + textSearch = ''; + + private searchSubject = new Subject(); + + @ViewChild(MatSort, {static: true}) sort: MatSort; + @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; + + private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { + 'WIDGET': EntityType.WIDGET_TYPE, + 'DASHBOARD': EntityType.DASHBOARD, + 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, + 'RULE_CHAIN': EntityType.RULE_CHAIN, + 'DEVICE': EntityType.DEVICE_PROFILE + }; + + constructor( + private iotHubApiService: IotHubApiService, + private dialogService: DialogService, + private translate: TranslateService, + private store: Store, + private router: Router, + private dialog: MatDialog + ) {} + + ngOnInit(): void { + this.searchSubject.pipe( + debounceTime(300) + ).subscribe(() => { + this.pageIndex = 0; + this.paginator.pageIndex = 0; + this.loadData(); + }); + this.loadData(); + } + + ngAfterViewInit(): void { + this.sort.sortChange.subscribe(() => { + this.pageIndex = 0; + this.paginator.pageIndex = 0; + this.loadData(); + }); + } + + navigateToMarketplace(): void { + this.router.navigate(['/iot-hub']); + } + + onSearchChange(value: string): void { + this.textSearch = value; + this.searchSubject.next(value); + } + + onPageChange(event: any): void { + this.pageIndex = event.pageIndex; + this.pageSize = event.pageSize; + this.loadData(); + } + + deleteItem(item: IotHubInstalledItem): void { + this.dialogService.confirm( + this.translate.instant('iot-hub.delete-installed-item-title'), + this.translate.instant('iot-hub.delete-installed-item-text', {name: item.itemName}), + this.translate.instant('action.no'), + this.translate.instant('action.yes') + ).subscribe(result => { + if (result) { + this.iotHubApiService.deleteInstalledItem(item.itemId).subscribe({ + next: () => { + this.store.dispatch(new ActionNotificationShow({ + message: this.translate.instant('iot-hub.installed-item-deleted', {name: item.itemName}), + type: 'success', + duration: 3000 + })); + this.loadData(); + }, + error: () => { + this.store.dispatch(new ActionNotificationShow({ + message: this.translate.instant('iot-hub.installed-item-delete-error', {name: item.itemName}), + type: 'error', + duration: 5000 + })); + } + }); + } + }); + } + + getItemTypeLabel(itemType: string): string { + const key = itemTypeTranslations.get(itemType as ItemType); + return key ? this.translate.instant(key) : itemType; + } + + getItemTypeChipClass(itemType: string): string { + switch (itemType) { + case 'WIDGET': return 'tb-type-widget'; + case 'DASHBOARD': return 'tb-type-dashboard'; + case 'CALCULATED_FIELD': return 'tb-type-calc-field'; + case 'RULE_CHAIN': return 'tb-type-rule-chain'; + case 'DEVICE': return 'tb-type-device'; + default: return ''; + } + } + + viewItemDetails(item: IotHubInstalledItem): void { + this.iotHubApiService.getVersionInfo(item.itemVersionId, {ignoreLoading: true}).subscribe(versionView => { + this.dialog.open(TbIotHubItemDetailDialogComponent, { + panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], + data: { + item: versionView, + iotHubApiService: this.iotHubApiService, + installedDescriptor: item.descriptor + } as IotHubItemDetailDialogData + }); + }); + } + + getEntityId(item: IotHubInstalledItem): string | null { + const descriptor = item.descriptor; + switch (descriptor.type) { + case 'WIDGET': return descriptor.widgetTypeId?.id; + case 'DASHBOARD': return descriptor.dashboardId?.id; + case 'CALCULATED_FIELD': return descriptor.calculatedFieldId?.id; + case 'RULE_CHAIN': return descriptor.ruleChainId?.id; + default: return null; + } + } + + openEntity(item: IotHubInstalledItem): void { + const entityType = TbIotHubInstalledItemsComponent.ITEM_TYPE_TO_ENTITY_TYPE[item.itemType]; + const entityId = this.getEntityId(item); + if (entityType && entityId) { + const url = getEntityDetailsPageURL(entityId, entityType); + if (url) { + this.router.navigateByUrl(url); + } + } + } + + private loadData(): void { + this.isLoading = true; + const sortOrder: SortOrder = { + property: this.sort?.active || 'createdTime', + direction: this.sort?.direction === 'asc' ? Direction.ASC : Direction.DESC + }; + const pageLink = new PageLink(this.pageSize, this.pageIndex, this.textSearch || null, sortOrder); + this.iotHubApiService.getInstalledItems(pageLink, {ignoreLoading: true}).subscribe({ + next: (data) => { + this.dataSource = data.data; + this.totalElements = data.totalElements; + this.isLoading = false; + }, + error: () => { + this.dataSource = []; + this.totalElements = 0; + this.isLoading = false; + } + }); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 8b99b4cbe0..3eb8620633 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -100,7 +100,11 @@ download {{ item.totalInstallCount | shortNumber }} - + @if (installed) { + {{ 'iot-hub.installed' | translate }} + } @else { + + } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 0f16dd4fae..20f1d873b9 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -348,4 +348,14 @@ color: #fff; } } + + .tb-iot-hub-card-installed-label { + padding: 5px 14px; + border-radius: 6px; + background: #e8f5e9; + color: #2e7d32; + font-size: 12px; + font-weight: 600; + white-space: nowrap; + } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 87f5502696..709559e534 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -35,6 +35,7 @@ export class TbIotHubItemCardComponent { @Input() item: MpItemVersionView; @Input() showCreator = true; @Input() showTypeChip = true; + @Input() installed = false; @Output() cardClick = new EventEmitter(); @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index 6d30c3c920..f4746d4b63 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -174,9 +174,15 @@
- + @if (installedDescriptor) { + + } @else { + + }
{{ 'iot-hub.created-by' | translate:{ name: item.creatorDisplayName } }} · diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts index c262d32656..de3f2e78bf 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts @@ -19,13 +19,18 @@ import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dial import { Router } from '@angular/router'; import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, nodeComponentTypeTranslations, NodeInfo } from '@shared/models/iot-hub/iot-hub-version.models'; import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubInstalledItemDescriptor, IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TranslateService } from '@ngx-translate/core'; +import { EntityType } from '@shared/models/entity-type.models'; +import { getEntityDetailsPageURL } from '@core/utils'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; export interface IotHubItemDetailDialogData { item: MpItemVersionView; iotHubApiService: IotHubApiService; + installedDescriptor?: IotHubInstalledItemDescriptor; + installedItemInfo?: IotHubInstalledItemInfo; } @Component({ @@ -40,6 +45,15 @@ export class TbIotHubItemDetailDialogComponent { item: MpItemVersionView; typeTranslations = itemTypeTranslations; readmeContent: string = ''; + installedDescriptor?: IotHubInstalledItemDescriptor; + + private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { + 'WIDGET': EntityType.WIDGET_TYPE, + 'DASHBOARD': EntityType.DASHBOARD, + 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, + 'RULE_CHAIN': EntityType.RULE_CHAIN, + 'DEVICE': EntityType.DEVICE_PROFILE + }; private categoryMap: Map; private useCaseMap = useCaseTranslations; @@ -52,6 +66,12 @@ export class TbIotHubItemDetailDialogComponent { private translate: TranslateService ) { this.item = data.item; + this.installedDescriptor = data.installedDescriptor; + if (!this.installedDescriptor && data.installedItemInfo) { + this.data.iotHubApiService.getInstalledItemByItemId(data.installedItemInfo.itemId, {ignoreLoading: true}).subscribe( + installedItem => this.installedDescriptor = installedItem?.descriptor + ); + } this.categoryMap = getCategoriesForType(this.item.type); this.loadReadme(); } @@ -210,13 +230,18 @@ export class TbIotHubItemDetailDialogComponent { } install(): void { - this.dialog.open(TbIotHubInstallDialogComponent, { + const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], data: { item: this.item, iotHubApiService: this.data.iotHubApiService } as IotHubInstallDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed') { + this.dialogRef.close('installed'); + } + }); } openSignup(): void { @@ -228,6 +253,28 @@ export class TbIotHubItemDetailDialogComponent { this.router.navigate(['/iot-hub/creator', this.item.creatorId]); } + openEntityDetails(): void { + const descriptor = this.installedDescriptor; + if (!descriptor) { + return; + } + let entityId: string | null = null; + switch (descriptor.type) { + case 'WIDGET': entityId = descriptor.widgetTypeId?.id; break; + case 'DASHBOARD': entityId = descriptor.dashboardId?.id; break; + case 'CALCULATED_FIELD': entityId = descriptor.calculatedFieldId?.id; break; + case 'RULE_CHAIN': entityId = descriptor.ruleChainId?.id; break; + } + const entityType = TbIotHubItemDetailDialogComponent.ITEM_TYPE_TO_ENTITY_TYPE[this.item.type]; + if (entityType && entityId) { + const url = getEntityDetailsPageURL(entityId, entityType); + if (url) { + this.dialogRef.close(); + this.router.navigateByUrl(url); + } + } + } + close(): void { this.dialogRef.close(); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts index 93a8724d77..33580a26bd 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts @@ -20,6 +20,7 @@ import { RouterModule, Routes } from '@angular/router'; import { Authority } from '@shared/models/authority.enum'; import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; +import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; const routes: Routes = [ { @@ -40,6 +41,18 @@ const routes: Routes = [ title: 'iot-hub.browse' } }, + { + path: 'installed', + component: TbIotHubInstalledItemsComponent, + data: { + auth: [Authority.TENANT_ADMIN], + title: 'iot-hub.installed-items', + breadcrumb: { + label: 'iot-hub.installed-items', + icon: 'inventory_2' + } + } + }, { path: 'creator/:creatorId', component: TbIotHubCreatorProfileComponent, diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts index be58e93f2c..f08f15eb8f 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts @@ -23,6 +23,7 @@ import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.compo import { TbIotHubItemDetailDialogComponent } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent } from './iot-hub-install-dialog.component'; import { TbIotHubItemCardComponent } from './iot-hub-item-card.component'; +import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; @NgModule({ declarations: [ @@ -30,7 +31,8 @@ import { TbIotHubItemCardComponent } from './iot-hub-item-card.component'; TbIotHubCreatorProfileComponent, TbIotHubItemDetailDialogComponent, TbIotHubInstallDialogComponent, - TbIotHubItemCardComponent + TbIotHubItemCardComponent, + TbIotHubInstalledItemsComponent ], imports: [ CommonModule, diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts new file mode 100644 index 0000000000..3d39f5eb22 --- /dev/null +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts @@ -0,0 +1,63 @@ +/// +/// Copyright © 2016-2026 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 { BaseData } from '@shared/models/base-data'; + +export interface WidgetInstalledItemDescriptor { + type: 'WIDGET'; + widgetTypeId: { id: string }; +} + +export interface DashboardInstalledItemDescriptor { + type: 'DASHBOARD'; + dashboardId: { id: string }; +} + +export interface CalculatedFieldInstalledItemDescriptor { + type: 'CALCULATED_FIELD'; + calculatedFieldId: { id: string }; +} + +export interface RuleChainInstalledItemDescriptor { + type: 'RULE_CHAIN'; + ruleChainId: { id: string }; +} + +export interface DeviceInstalledItemDescriptor { + type: 'DEVICE'; +} + +export type IotHubInstalledItemDescriptor = + | WidgetInstalledItemDescriptor + | DashboardInstalledItemDescriptor + | CalculatedFieldInstalledItemDescriptor + | RuleChainInstalledItemDescriptor + | DeviceInstalledItemDescriptor; + +export interface IotHubInstalledItemInfo { + itemId: string; + itemVersionId: string; +} + +export interface IotHubInstalledItem extends BaseData<{id: string}> { + tenantId: { id: string }; + itemId: string; + itemVersionId: string; + itemName: string; + itemType: string; + version: string; + descriptor: IotHubInstalledItemDescriptor; +} diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 11f1c403dc..7e48766a90 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3782,7 +3782,23 @@ "use-case.smart-city": "Smart City", "use-case.healthcare": "Healthcare", "use-case.retail": "Retail", - "use-case.water-utilities": "Water & Utilities" + "use-case.water-utilities": "Water & Utilities", + "installed-items": "Installed Items", + "search-installed-items": "Search installed items...", + "item-name": "Name", + "item-type": "Type", + "item-version": "Version", + "installed-date": "Installed", + "actions": "Actions", + "no-installed-items": "No installed items", + "delete-installed-item-title": "Delete Installed Item", + "delete-installed-item-text": "Are you sure you want to delete '{{name}}'? The installed entity will also be removed.", + "installed-item-deleted": "'{{name}}' has been deleted", + "installed-item-delete-error": "Failed to delete '{{name}}'", + "open-installed-entity": "Open installed entity", + "view-item-details": "View item details", + "open-item-type-details": "Open {{type}} details", + "back-to-marketplace": "Back to Marketplace" }, "item-data": { "widget-type-timeseries": "Timeseries", From f49e1b6b4f3caa95e4f4343db24cc419096e345e Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 10 Mar 2026 16:43:56 +0200 Subject: [PATCH 003/219] Add IoT Hub update flow and improve install error handling - Add update item version endpoint and service method (backend) - Add update dialog component with confirm/updating/success/error states - Add check for updates feature in installed items table - Show update button on browse cards and detail dialog when update available - Add route resolver for installed item infos shared across pages - Improve deserialization: use ignoreUnknownFields, root cause error messages - Refactor rule chain install to parse ruleChain and metadata separately --- .../server/controller/IotHubController.java | 9 + .../service/iot_hub/DefaultIotHubService.java | 93 +++++++-- .../server/service/iot_hub/IotHubService.java | 2 + .../iot_hub/UpdateItemVersionResult.java | 40 ++++ .../src/app/core/http/iot-hub-api.service.ts | 22 ++- .../iot-hub/iot-hub-browse.component.html | 4 +- .../pages/iot-hub/iot-hub-browse.component.ts | 39 +++- .../iot-hub-install-dialog.component.ts | 185 +++++++++++++----- .../iot-hub-installed-item-infos.resolver.ts | 25 +++ .../iot-hub-installed-items.component.html | 41 +++- .../iot-hub-installed-items.component.scss | 51 +++++ .../iot-hub-installed-items.component.ts | 68 ++++++- .../iot-hub/iot-hub-item-card.component.html | 6 +- .../iot-hub/iot-hub-item-card.component.scss | 18 ++ .../iot-hub/iot-hub-item-card.component.ts | 13 ++ .../iot-hub-item-detail-dialog.component.html | 25 ++- .../iot-hub-item-detail-dialog.component.scss | 26 ++- .../iot-hub-item-detail-dialog.component.ts | 27 +++ .../pages/iot-hub/iot-hub-routing.module.ts | 7 + .../home/pages/iot-hub/iot-hub.module.ts | 4 +- .../iot-hub/iot-hub-installed-item.models.ts | 19 ++ .../assets/locale/locale.constant-en_US.json | 18 +- 22 files changed, 655 insertions(+), 87 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts diff --git a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java index e2b6b297ab..4e4b2a86e2 100644 --- a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java +++ b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java @@ -38,6 +38,7 @@ import java.util.UUID; import org.thingsboard.server.dao.iot_hub.IotHubInstalledItemService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.iot_hub.InstallItemVersionResult; +import org.thingsboard.server.service.iot_hub.UpdateItemVersionResult; import org.thingsboard.server.service.iot_hub.IotHubService; @Hidden @@ -58,6 +59,14 @@ public class IotHubController extends BaseController { return iotHubService.installItemVersion(getCurrentUser(), versionId); } + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @PostMapping("/installedItems/{itemId}/update/{versionId}") + @ResponseBody + public UpdateItemVersionResult updateItemVersion(@PathVariable UUID itemId, + @PathVariable String versionId) throws ThingsboardException { + return iotHubService.updateItemVersion(getCurrentUser(), itemId, versionId); + } + @PreAuthorize("hasAuthority('TENANT_ADMIN')") @GetMapping("/installedItems") @ResponseBody diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java index bef8cfdd10..6a80412a99 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java @@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.iot_hub.WidgetInstalledItemDescriptor; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainData; import org.thingsboard.server.common.data.rule.RuleChainImportResult; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; import org.thingsboard.server.dao.cf.CalculatedFieldService; import org.thingsboard.server.dao.dashboard.DashboardService; @@ -121,7 +122,12 @@ public class DefaultIotHubService implements IotHubService { } private WidgetInstalledItemDescriptor installWidget(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { - WidgetTypeDetails widgetTypeDetails = JacksonUtil.fromBytes(fileData, WidgetTypeDetails.class); + WidgetTypeDetails widgetTypeDetails; + try { + widgetTypeDetails = JacksonUtil.fromString(new String(fileData), WidgetTypeDetails.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse widget data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } widgetTypeDetails.setId(null); widgetTypeDetails.setTenantId(tenantId); WidgetTypeDetails saved = tbWidgetTypeService.save(widgetTypeDetails, true, user); @@ -132,7 +138,12 @@ public class DefaultIotHubService implements IotHubService { } private DashboardInstalledItemDescriptor installDashboard(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { - Dashboard dashboard = JacksonUtil.fromBytes(fileData, Dashboard.class); + Dashboard dashboard; + try { + dashboard = JacksonUtil.fromString(new String(fileData), Dashboard.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse dashboard data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } dashboard.setId(null); dashboard.setTenantId(tenantId); Dashboard saved = tbDashboardService.save(dashboard, user); @@ -143,7 +154,12 @@ public class DefaultIotHubService implements IotHubService { } private CalculatedFieldInstalledItemDescriptor installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { - CalculatedField calculatedField = JacksonUtil.fromBytes(fileData, CalculatedField.class); + CalculatedField calculatedField; + try { + calculatedField = JacksonUtil.fromString(new String(fileData), CalculatedField.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse calculated field data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } calculatedField.setId(null); calculatedField.setTenantId(tenantId); CalculatedField saved = tbCalculatedFieldService.save(calculatedField, user); @@ -153,19 +169,43 @@ public class DefaultIotHubService implements IotHubService { return descriptor; } - private RuleChainInstalledItemDescriptor installRuleChain(TenantId tenantId, byte[] fileData) { - RuleChainData ruleChainData = JacksonUtil.fromBytes(fileData, RuleChainData.class); - List results = ruleChainService.importTenantRuleChains(tenantId, ruleChainData, false, tbRuleChainService::updateRuleNodeConfiguration); - log.debug("[{}] Rule chain(s) installed", tenantId); - RuleChainInstalledItemDescriptor descriptor = new RuleChainInstalledItemDescriptor(); - if (!results.isEmpty()) { - descriptor.setRuleChainId(results.get(0).getRuleChainId()); + private RuleChainInstalledItemDescriptor installRuleChain(TenantId tenantId, byte[] fileData) throws Exception { + JsonNode json = JacksonUtil.toJsonNode(new String(fileData)); + + RuleChain ruleChain; + try { + ruleChain = JacksonUtil.fromString(json.get("ruleChain").toString(), RuleChain.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse rule chain: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + + RuleChainMetaData metadata; + try { + metadata = JacksonUtil.fromString(json.get("metadata").toString(), RuleChainMetaData.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse rule chain metadata: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); } + + ruleChain.setId(null); + ruleChain.setTenantId(tenantId); + RuleChain savedRuleChain = ruleChainService.saveRuleChain(ruleChain); + + metadata.setRuleChainId(savedRuleChain.getId()); + ruleChainService.saveRuleChainMetaData(tenantId, metadata, tbRuleChainService::updateRuleNodeConfiguration); + + log.debug("[{}] Rule chain installed: {}", tenantId, savedRuleChain.getName()); + RuleChainInstalledItemDescriptor descriptor = new RuleChainInstalledItemDescriptor(); + descriptor.setRuleChainId(savedRuleChain.getId()); return descriptor; } private DeviceInstalledItemDescriptor installDeviceProfile(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { - DeviceProfile deviceProfile = JacksonUtil.fromBytes(fileData, DeviceProfile.class); + DeviceProfile deviceProfile; + try { + deviceProfile = JacksonUtil.fromString(new String(fileData), DeviceProfile.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse device profile data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } deviceProfile.setId(null); deviceProfile.setTenantId(tenantId); tbDeviceProfileService.save(deviceProfile, user); @@ -173,6 +213,37 @@ public class DefaultIotHubService implements IotHubService { return new DeviceInstalledItemDescriptor(); } + @Override + public UpdateItemVersionResult updateItemVersion(SecurityUser user, UUID itemId, String versionId) { + TenantId tenantId = user.getTenantId(); + log.info("[{}] Updating IoT Hub item {} to version: {}", tenantId, itemId, versionId); + + try { + IotHubInstalledItem installedItem = iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId) + .orElseThrow(() -> new IllegalArgumentException("Installed item not found")); + + JsonNode installedVersionInfo = iotHubRestClient.getVersionInfo(installedItem.getItemVersionId().toString()); + String installedChecksum = installedVersionInfo.has("checksum") ? installedVersionInfo.get("checksum").asText() : null; + log.info("[{}] Installed version info: name={}, version={}, checksum={}", tenantId, installedItem.getItemName(), installedItem.getVersion(), installedChecksum); + + JsonNode versionInfo = iotHubRestClient.getVersionInfo(versionId); + String itemName = versionInfo.get("name").asText(); + String version = versionInfo.get("version").asText(); + + byte[] fileData = iotHubRestClient.getVersionFileData(versionId); + log.info("[{}] Fetched update file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); + + // TODO: apply update per item type + + log.info("[{}] Successfully updated IoT Hub item {} to version: {}", tenantId, itemName, version); + + return UpdateItemVersionResult.success(installedItem.getDescriptor()); + } catch (Exception e) { + log.error("[{}] Failed to update IoT Hub item {} to version: {}", tenantId, itemId, versionId, e); + return UpdateItemVersionResult.error(e.getMessage()); + } + } + @Override public void deleteInstalledItem(SecurityUser user, UUID itemId) { TenantId tenantId = user.getTenantId(); diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java index f0cfc6c49d..e17ca5d4f2 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java @@ -23,5 +23,7 @@ public interface IotHubService { InstallItemVersionResult installItemVersion(SecurityUser user, String versionId); + UpdateItemVersionResult updateItemVersion(SecurityUser user, UUID itemId, String versionId); + void deleteInstalledItem(SecurityUser user, UUID itemId); } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java new file mode 100644 index 0000000000..b056b29e6a --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2026 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.service.iot_hub; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UpdateItemVersionResult { + + private boolean success; + private String errorMessage; + private IotHubInstalledItemDescriptor descriptor; + + public static UpdateItemVersionResult success(IotHubInstalledItemDescriptor descriptor) { + return new UpdateItemVersionResult(true, null, descriptor); + } + + public static UpdateItemVersionResult error(String errorMessage) { + return new UpdateItemVersionResult(false, errorMessage, null); + } + +} diff --git a/ui-ngx/src/app/core/http/iot-hub-api.service.ts b/ui-ngx/src/app/core/http/iot-hub-api.service.ts index 5f50a27597..587e37a155 100644 --- a/ui-ngx/src/app/core/http/iot-hub-api.service.ts +++ b/ui-ngx/src/app/core/http/iot-hub-api.service.ts @@ -22,7 +22,7 @@ import { PageData } from '@shared/models/page/page-data'; import { PageLink } from '@shared/models/page/page-link'; import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { CreatorView } from '@shared/models/iot-hub/iot-hub-creator.models'; -import { IotHubInstalledItem, IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubInstalledItem, IotHubInstalledItemInfo, InstallItemVersionResult, UpdateItemVersionResult, ItemUpdateInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { InterceptorHttpParams } from '@core/interceptors/interceptor-http-params'; import { InterceptorConfig } from '@core/interceptors/interceptor-config'; import { AppState } from '@core/core.state'; @@ -112,14 +112,22 @@ export class IotHubApiService { ); } - public installItemVersion(versionId: string, config?: IotHubRequestConfig): Observable { - return this.http.post( + public installItemVersion(versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.post( `/api/iot-hub/versions/${versionId}/install`, null, { params: this.buildParams(config) } ); } + public updateItemVersion(itemId: string, versionId: string, config?: IotHubRequestConfig): Observable { + return this.http.post( + `/api/iot-hub/installedItems/${itemId}/update/${versionId}`, + null, + { params: this.buildParams(config) } + ); + } + public getInstalledItemByItemId(itemId: string, config?: IotHubRequestConfig): Observable { return this.http.get( `/api/iot-hub/installedItems/byItemId/${itemId}`, @@ -148,6 +156,14 @@ export class IotHubApiService { ); } + public checkForUpdates(infos: IotHubInstalledItemInfo[], config?: IotHubRequestConfig): Observable { + return this.http.post( + `${this.baseUrl}/api/versions/checkForUpdates`, + infos, + { params: this.buildParams(config) } + ); + } + public getCreatorProfile(creatorId: string, config?: IotHubRequestConfig): Observable { return this.http.get( `${this.baseUrl}/api/creators/${creatorId}/profile`, diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index 83cf44e087..5b350ec9ee 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -194,9 +194,11 @@ [showTypeChip]="false" [showCreator]="!creatorId" [installed]="isInstalled(item)" + [installedItemInfo]="installedItemsMap.get(item.itemId) || null" (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" - (installClick)="installItem($event)"> + (installClick)="installItem($event)" + (updateClick)="updateItem($event)"> }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 004dac5fde..27f370856d 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -30,9 +30,10 @@ import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; +import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; interface SortOption { value: string; @@ -99,7 +100,8 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { private iotHubApiService: IotHubApiService, private dialog: MatDialog, private translate: TranslateService, - private router: Router + private router: Router, + private route: ActivatedRoute ) {} ngOnInit(): void { @@ -111,7 +113,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.loadItems(); }); this.updateCategories(); - this.loadInstalledItemInfos(); + this.initInstalledItemInfos(); this.loadItems(); } @@ -342,7 +344,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } as IotHubItemDetailDialogData }); dialogRef.afterClosed().subscribe(result => { - if (result === 'installed') { + if (result === 'installed' || result === 'updated') { this.loadInstalledItemInfos(); } }); @@ -363,6 +365,29 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { }); } + updateItem(item: MpItemVersionView): void { + const installedInfo = this.installedItemsMap.get(item.itemId); + if (!installedInfo) { + return; + } + const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { + panelClass: ['tb-dialog'], + data: { + itemId: item.itemId, + itemName: item.name, + itemType: item.type, + version: item.version, + versionId: item.id, + iotHubApiService: this.iotHubApiService + } as IotHubUpdateDialogData + }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'updated') { + this.loadInstalledItemInfos(); + } + }); + } + navigateToCreator(creatorId: string): void { this.router.navigate(['/iot-hub/creator', creatorId]); } @@ -371,6 +396,12 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.router.navigate(['/iot-hub/installed']); } + private initInstalledItemInfos(): void { + const infos: IotHubInstalledItemInfo[] = this.route.snapshot.data['installedItemInfos'] || []; + this.installedItemsMap.clear(); + infos.forEach(info => this.installedItemsMap.set(info.itemId, info)); + } + private loadInstalledItemInfos(): void { this.iotHubApiService.getInstalledItemInfos({ignoreLoading: true}).subscribe(infos => { this.installedItemsMap.clear(); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts index 0fe5dd867b..4c7edea820 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -16,13 +16,14 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Store } from '@ngrx/store'; -import { AppState } from '@core/core.state'; -import { ActionNotificationShow } from '@core/notification/notification.actions'; +import { Router } from '@angular/router'; import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; -import { itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TranslateService } from '@ngx-translate/core'; +import { EntityType } from '@shared/models/entity-type.models'; +import { getEntityDetailsPageURL } from '@core/utils'; export interface IotHubInstallDialogData { item: MpItemVersionView; @@ -35,36 +36,65 @@ export type InstallState = 'confirm' | 'installing' | 'success' | 'error'; selector: 'tb-iot-hub-install-dialog', standalone: false, template: ` -

{{ 'iot-hub.install-item-title' | translate }}

- -

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

-

{{ 'iot-hub.install-type' | translate:{ type: (typeTranslations.get(item.type) | translate) } }}

-

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

- - - - @switch (state) { - @case ('confirm') { - - } - @case ('installing') { + @switch (state) { + @case ('confirm') { +

{{ 'iot-hub.install-item-title' | translate }}

+ +

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

+

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

+

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

+ + + + + + } + @case ('installing') { +

{{ 'iot-hub.install-item-title' | translate }}

+ +

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

+

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

+

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

+ + + - } - @case ('success') { - - } + + } + @case ('success') { +

+ check_circle + {{ 'iot-hub.install-success-title' | translate }} +

+ +

{{ 'iot-hub.install-success-message' | translate:{ name: item.name, version: item.version } }}

+ + + + @if (entityDetailsUrl) { + + } + } - + @case ('error') { +

+ error + {{ 'iot-hub.install-error-title' | translate }} +

+ +

{{ 'iot-hub.install-error-message' | translate:{ name: item.name } }}

+
{{ errorMessage }}
+ + + + + } + } `, styles: [` .tb-iot-hub-install-meta { @@ -76,23 +106,61 @@ export type InstallState = 'confirm' | 'installing' | 'success' | 'error'; display: inline-block; margin-right: 8px; } + .tb-iot-hub-result-icon { + vertical-align: middle; + margin-right: 8px; + } + .tb-iot-hub-success-icon { + color: #2e7d32; + } + .tb-iot-hub-error-icon { + color: #c62828; + } + .tb-iot-hub-error-details { + max-height: 200px; + overflow-y: auto; + padding: 12px; + background: #f5f5f5; + border-radius: 4px; + font-family: monospace; + font-size: 12px; + color: rgba(0, 0, 0, 0.7); + white-space: pre-wrap; + word-break: break-word; + margin-top: 8px; + } `] }) export class TbIotHubInstallDialogComponent { + private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { + 'WIDGET': EntityType.WIDGET_TYPE, + 'DASHBOARD': EntityType.DASHBOARD, + 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, + 'RULE_CHAIN': EntityType.RULE_CHAIN, + 'DEVICE': EntityType.DEVICE_PROFILE + }; + item: MpItemVersionView; typeTranslations = itemTypeTranslations; state: InstallState = 'confirm'; + errorMessage = ''; + entityDetailsUrl: string | null = null; constructor( @Inject(MAT_DIALOG_DATA) public data: IotHubInstallDialogData, private dialogRef: MatDialogRef, - private store: Store, + private router: Router, private translate: TranslateService ) { this.item = data.item; } + getTypeLabel(): string { + const key = this.typeTranslations.get(this.item.type); + return key ? this.translate.instant(key) : ''; + } + install(): void { this.state = 'installing'; const versionId = this.item.id as string; @@ -100,33 +168,52 @@ export class TbIotHubInstallDialogComponent { next: (result) => { if (result.success) { this.state = 'success'; - this.store.dispatch(new ActionNotificationShow({ - message: this.translate.instant('iot-hub.install-success', { name: this.item.name }), - type: 'success', - duration: 3000 - })); - setTimeout(() => this.dialogRef.close('installed'), 1500); + this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); } else { - this.state = 'confirm'; - this.store.dispatch(new ActionNotificationShow({ - message: result.errorMessage || this.translate.instant('iot-hub.install-error', { name: this.item.name }), - type: 'error', - duration: 5000 - })); + this.state = 'error'; + this.errorMessage = result.errorMessage || this.translate.instant('iot-hub.install-error', { name: this.item.name }); } }, - error: () => { - this.state = 'confirm'; - this.store.dispatch(new ActionNotificationShow({ - message: this.translate.instant('iot-hub.install-error', { name: this.item.name }), - type: 'error', - duration: 5000 - })); + error: (err) => { + this.state = 'error'; + this.errorMessage = err?.error?.message || err?.message || this.translate.instant('iot-hub.install-error', { name: this.item.name }); } }); } + openEntityDetails(): void { + if (this.entityDetailsUrl) { + this.dialogRef.close('installed'); + this.router.navigateByUrl(this.entityDetailsUrl); + } + } + + close(): void { + this.dialogRef.close(this.state === 'success' ? 'installed' : false); + } + cancel(): void { this.dialogRef.close(false); } + + private resolveEntityDetailsUrl(descriptor: IotHubInstalledItemDescriptor): string | null { + if (!descriptor) { + return null; + } + const entityType = TbIotHubInstallDialogComponent.ITEM_TYPE_TO_ENTITY_TYPE[this.item.type]; + if (!entityType) { + return null; + } + let entityId: string | null = null; + switch (descriptor.type) { + case 'WIDGET': entityId = descriptor.widgetTypeId?.id; break; + case 'DASHBOARD': entityId = descriptor.dashboardId?.id; break; + case 'CALCULATED_FIELD': entityId = descriptor.calculatedFieldId?.id; break; + case 'RULE_CHAIN': entityId = descriptor.ruleChainId?.id; break; + } + if (!entityId) { + return null; + } + return getEntityDetailsPageURL(entityId, entityType) || null; + } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts new file mode 100644 index 0000000000..f54eaebf0a --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts @@ -0,0 +1,25 @@ +/// +/// Copyright © 2016-2026 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 { inject } from '@angular/core'; +import { ResolveFn } from '@angular/router'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; + +export const iotHubInstalledItemInfosResolver: ResolveFn = () => { + const iotHubApiService = inject(IotHubApiService); + return iotHubApiService.getInstalledItemInfos({ ignoreLoading: true }); +}; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html index b76b8301a8..24f2e9f9e0 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html @@ -22,6 +22,18 @@

{{ 'iot-hub.installed-items' | translate }}

+ @if (!updatesChecked) { + + }
@@ -64,7 +76,34 @@ {{ 'iot-hub.installed-date' | translate }} - {{ item.createdTime | date:'medium' }} + {{ item.createdTime | date:'mediumDate' }} + + + + {{ updatesChecked ? ('iot-hub.updates' | translate) : '' }} + + @if (updatesChecked) { + @if (getUpdateInfo(item); as updateInfo) { + @if (updateInfo.hasUpdate) { + + + } @else { + {{ 'iot-hub.up-to-date' | translate }} + } + } @else { + {{ 'iot-hub.up-to-date' | translate }} + } + } + diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss index b8d0596781..7e8f080553 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss @@ -57,6 +57,9 @@ } .tb-iot-hub-installed-items-header { + display: flex; + align-items: center; + justify-content: space-between; margin-bottom: 24px; h2 { @@ -67,6 +70,11 @@ } } +.tb-iot-hub-inline-spinner { + display: inline-block; + margin-right: 8px; +} + .tb-iot-hub-installed-search-row { display: flex; gap: 12px; @@ -174,7 +182,33 @@ width: 100%; } + .mat-column-itemName { + width: 100%; + } + + .mat-column-itemType, + .mat-column-version { + width: 100px; + min-width: 100px; + max-width: 100px; + } + + .mat-column-createdTime { + width: 100px; + min-width: 100px; + max-width: 100px; + } + + .mat-column-updates { + width: 200px; + min-width: 200px; + max-width: 200px; + } + .mat-column-actions { + width: 144px; + min-width: 144px; + max-width: 144px; text-align: right; white-space: nowrap; } @@ -194,6 +228,23 @@ &.tb-type-device { background: #eceff1; color: #455a64; } } +.tb-iot-hub-up-to-date { + color: #2e7d32; + font-size: 13px; + font-weight: 500; +} + +.tb-iot-hub-update-button { + font-size: 12px; + line-height: 28px; + height: 28px; + padding: 0 12px; + + & + .tb-iot-hub-update-button { + margin-left: 8px; + } +} + .tb-iot-hub-installed-empty { padding: 48px 24px; text-align: center; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts index 0c2902856f..4dc173637e 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts @@ -15,7 +15,7 @@ /// import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatPaginator } from '@angular/material/paginator'; @@ -29,11 +29,12 @@ import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; import { PageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder } from '@shared/models/page/sort-order'; -import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubInstalledItem, IotHubInstalledItemInfo, ItemUpdateInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { EntityType } from '@shared/models/entity-type.models'; import { getEntityDetailsPageURL } from '@core/utils'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; +import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; @Component({ selector: 'tb-iot-hub-installed-items', @@ -43,7 +44,7 @@ import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from '. }) export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { - displayedColumns: string[] = ['itemName', 'itemType', 'version', 'createdTime', 'actions']; + displayedColumns: string[] = ['itemName', 'itemType', 'version', 'createdTime', 'updates', 'actions']; dataSource: IotHubInstalledItem[] = []; totalElements = 0; pageSize = 10; @@ -51,6 +52,11 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { isLoading = false; textSearch = ''; + installedItemInfos: IotHubInstalledItemInfo[] = []; + updateInfoMap = new Map(); + updatesChecked = false; + isCheckingUpdates = false; + private searchSubject = new Subject(); @ViewChild(MatSort, {static: true}) sort: MatSort; @@ -70,10 +76,12 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { private translate: TranslateService, private store: Store, private router: Router, - private dialog: MatDialog + private dialog: MatDialog, + private route: ActivatedRoute ) {} ngOnInit(): void { + this.installedItemInfos = this.route.snapshot.data['installedItemInfos'] || []; this.searchSubject.pipe( debounceTime(300) ).subscribe(() => { @@ -187,6 +195,58 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { } } + checkForUpdates(): void { + this.isCheckingUpdates = true; + this.iotHubApiService.checkForUpdates(this.installedItemInfos, { ignoreLoading: true }).subscribe({ + next: (updates) => { + this.updateInfoMap.clear(); + updates.forEach(info => this.updateInfoMap.set(info.itemId, info)); + this.updatesChecked = true; + this.isCheckingUpdates = false; + }, + error: () => { + this.isCheckingUpdates = false; + } + }); + } + + viewUpdateDetails(updateInfo: ItemUpdateInfo, installedItem: IotHubInstalledItem): void { + this.iotHubApiService.getVersionInfo(updateInfo.latestItemVersionId, {ignoreLoading: true}).subscribe(versionView => { + this.dialog.open(TbIotHubItemDetailDialogComponent, { + panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], + data: { + item: versionView, + iotHubApiService: this.iotHubApiService, + installedDescriptor: installedItem.descriptor, + installedItemInfo: { itemId: installedItem.itemId, itemVersionId: installedItem.itemVersionId } + } as IotHubItemDetailDialogData + }); + }); + } + + updateItem(item: IotHubInstalledItem, updateInfo: ItemUpdateInfo): void { + const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { + panelClass: ['tb-dialog'], + data: { + itemId: item.itemId, + itemName: item.itemName, + itemType: item.itemType as ItemType, + version: updateInfo.latestVersion, + versionId: updateInfo.latestItemVersionId, + iotHubApiService: this.iotHubApiService + } as IotHubUpdateDialogData + }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'updated') { + this.loadData(); + } + }); + } + + getUpdateInfo(item: IotHubInstalledItem): ItemUpdateInfo | undefined { + return this.updateInfoMap.get(item.itemId); + } + private loadData(): void { this.isLoading = true; const sortOrder: SortOrder = { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 3eb8620633..510d626afd 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -101,7 +101,11 @@ {{ item.totalInstallCount | shortNumber }} @if (installed) { - {{ 'iot-hub.installed' | translate }} + @if (hasUpdate()) { + + } @else { + {{ 'iot-hub.installed' | translate }} + } } @else { } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 20f1d873b9..8eed3e6980 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -358,4 +358,22 @@ font-weight: 600; white-space: nowrap; } + + .tb-iot-hub-card-update-btn { + padding: 5px 14px; + border-radius: 6px; + border: 1px solid #e65100; + background: transparent; + color: #e65100; + font-size: 12px; + font-weight: 600; + cursor: pointer; + white-space: nowrap; + transition: all 0.15s; + + &:hover { + background: #e65100; + color: #fff; + } + } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 709559e534..41a664b49c 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -19,6 +19,7 @@ import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTransl import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { TranslateService } from '@ngx-translate/core'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; @Component({ selector: 'tb-iot-hub-item-card', @@ -36,9 +37,11 @@ export class TbIotHubItemCardComponent { @Input() showCreator = true; @Input() showTypeChip = true; @Input() installed = false; + @Input() installedItemInfo: IotHubInstalledItemInfo | null = null; @Output() cardClick = new EventEmitter(); @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); + @Output() updateClick = new EventEmitter(); typeTranslations = itemTypeTranslations; @@ -187,11 +190,21 @@ export class TbIotHubItemCardComponent { this.cardClick.emit(this.item); } + hasUpdate(): boolean { + return this.installed && this.installedItemInfo != null + && this.installedItemInfo.itemVersionId !== this.item.id; + } + onInstallClick(event: MouseEvent): void { event.stopPropagation(); this.installClick.emit(this.item); } + onUpdateClick(event: MouseEvent): void { + event.stopPropagation(); + this.updateClick.emit(this.item); + } + onCreatorClick(event: MouseEvent): void { event.stopPropagation(); this.creatorClick.emit(this.item.creatorId); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index f4746d4b63..c4400af2cc 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -174,15 +174,22 @@
- @if (installedDescriptor) { - - } @else { - - } +
+ @if (installedDescriptor) { + + } @else { + + } + @if (hasUpdate()) { + + } +
{{ 'iot-hub.created-by' | translate:{ name: item.creatorDisplayName } }} · diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss index 23fd2d2c98..fdd05b2282 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss @@ -386,9 +386,14 @@ flex-shrink: 0; } -.dlg-install-btn { +.dlg-footer-actions { + display: flex; + justify-content: flex-end; + gap: 12px; width: 100%; - max-width: 400px; +} + +.dlg-install-btn { padding: 12px 24px; border: none; border-radius: 8px; @@ -404,6 +409,23 @@ } } +.dlg-update-btn { + padding: 12px 24px; + border: 1px solid #e65100; + border-radius: 8px; + background: transparent; + color: #e65100; + font-size: 14px; + font-weight: 500; + cursor: pointer; + transition: all 0.15s; + + &:hover { + background: #e65100; + color: #fff; + } +} + .dlg-creator-info { font-size: 12px; color: #9ca3af; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts index de3f2e78bf..aaab223443 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts @@ -25,6 +25,7 @@ import { TranslateService } from '@ngx-translate/core'; import { EntityType } from '@shared/models/entity-type.models'; import { getEntityDetailsPageURL } from '@core/utils'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; +import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; export interface IotHubItemDetailDialogData { item: MpItemVersionView; @@ -46,6 +47,7 @@ export class TbIotHubItemDetailDialogComponent { typeTranslations = itemTypeTranslations; readmeContent: string = ''; installedDescriptor?: IotHubInstalledItemDescriptor; + installedItemInfo?: IotHubInstalledItemInfo; private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { 'WIDGET': EntityType.WIDGET_TYPE, @@ -67,6 +69,7 @@ export class TbIotHubItemDetailDialogComponent { ) { this.item = data.item; this.installedDescriptor = data.installedDescriptor; + this.installedItemInfo = data.installedItemInfo; if (!this.installedDescriptor && data.installedItemInfo) { this.data.iotHubApiService.getInstalledItemByItemId(data.installedItemInfo.itemId, {ignoreLoading: true}).subscribe( installedItem => this.installedDescriptor = installedItem?.descriptor @@ -229,6 +232,11 @@ export class TbIotHubItemDetailDialogComponent { return this.item.dataDescriptor?.nodeCount || 0; } + hasUpdate(): boolean { + return this.installedItemInfo != null + && this.installedItemInfo.itemVersionId !== this.item.id; + } + install(): void { const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], @@ -244,6 +252,25 @@ export class TbIotHubItemDetailDialogComponent { }); } + updateItem(): void { + const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { + panelClass: ['tb-dialog'], + data: { + itemId: this.item.itemId, + itemName: this.item.name, + itemType: this.item.type, + version: this.item.version, + versionId: this.item.id, + iotHubApiService: this.data.iotHubApiService + } as IotHubUpdateDialogData + }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'updated') { + this.dialogRef.close('updated'); + } + }); + } + openSignup(): void { window.open('https://iothub.thingsboard.io/signup', '_blank'); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts index 33580a26bd..f407be68cb 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts @@ -21,6 +21,7 @@ import { Authority } from '@shared/models/authority.enum'; import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; +import { iotHubInstalledItemInfosResolver } from './iot-hub-installed-item-infos.resolver'; const routes: Routes = [ { @@ -39,6 +40,9 @@ const routes: Routes = [ data: { auth: [Authority.TENANT_ADMIN], title: 'iot-hub.browse' + }, + resolve: { + installedItemInfos: iotHubInstalledItemInfosResolver } }, { @@ -51,6 +55,9 @@ const routes: Routes = [ label: 'iot-hub.installed-items', icon: 'inventory_2' } + }, + resolve: { + installedItemInfos: iotHubInstalledItemInfosResolver } }, { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts index f08f15eb8f..94110fb092 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts @@ -24,6 +24,7 @@ import { TbIotHubItemDetailDialogComponent } from './iot-hub-item-detail-dialog. import { TbIotHubInstallDialogComponent } from './iot-hub-install-dialog.component'; import { TbIotHubItemCardComponent } from './iot-hub-item-card.component'; import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; +import { TbIotHubUpdateDialogComponent } from './iot-hub-update-dialog.component'; @NgModule({ declarations: [ @@ -32,7 +33,8 @@ import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.compo TbIotHubItemDetailDialogComponent, TbIotHubInstallDialogComponent, TbIotHubItemCardComponent, - TbIotHubInstalledItemsComponent + TbIotHubInstalledItemsComponent, + TbIotHubUpdateDialogComponent ], imports: [ CommonModule, diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts index 3d39f5eb22..204b857055 100644 --- a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts @@ -47,11 +47,30 @@ export type IotHubInstalledItemDescriptor = | RuleChainInstalledItemDescriptor | DeviceInstalledItemDescriptor; +export interface InstallItemVersionResult { + success: boolean; + errorMessage: string; + descriptor: IotHubInstalledItemDescriptor; +} + +export interface UpdateItemVersionResult { + success: boolean; + errorMessage: string; + descriptor: IotHubInstalledItemDescriptor; +} + export interface IotHubInstalledItemInfo { itemId: string; itemVersionId: string; } +export interface ItemUpdateInfo { + itemId: string; + hasUpdate: boolean; + latestVersion: string; + latestItemVersionId: string; +} + export interface IotHubInstalledItem extends BaseData<{id: string}> { tenantId: { id: string }; itemId: string; diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 7e48766a90..00eceb16cd 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3740,7 +3740,23 @@ "installing": "Installing...", "installed": "Installed", "install-success": "{{name}} installed successfully", + "install-success-title": "Installation Successful", + "install-success-message": "'{{name}}' v{{version}} has been installed successfully.", "install-error": "Failed to install {{name}}", + "install-error-title": "Installation Failed", + "install-error-message": "Failed to install '{{name}}'.", + "check-for-updates": "Check for updates", + "updates": "Updates", + "up-to-date": "Up to date", + "update": "Update", + "update-item-title": "Update Item", + "update-confirm": "Update '{{name}}' to version {{version}}?", + "updating": "Updating...", + "update-success-title": "Update Successful", + "update-success-message": "'{{name}}' has been updated to version {{version}}.", + "update-error-title": "Update Failed", + "update-error-message": "Failed to update '{{name}}'.", + "update-error": "Failed to update {{name}}", "category.charts-graphs": "Charts & Graphs", "category.gauges-indicators": "Gauges & Indicators", "category.controls": "Controls", @@ -3790,7 +3806,7 @@ "item-version": "Version", "installed-date": "Installed", "actions": "Actions", - "no-installed-items": "No installed items", + "no-installed-items": "No installed items found", "delete-installed-item-title": "Delete Installed Item", "delete-installed-item-text": "Are you sure you want to delete '{{name}}'? The installed entity will also be removed.", "installed-item-deleted": "'{{name}}' has been deleted", From 09438ca9317611c02f75bcc2b2d76ae3347f46da Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 11 Mar 2026 17:10:48 +0200 Subject: [PATCH 004/219] Refactor IoT Hub update flow with checksum-based modification detection - Refactor update/delete endpoints to use installed item's own ID instead of marketplace itemId - Add SHA-256 checksum comparison to detect local entity modifications before update - Support force update to skip checksum check when user confirms overwrite - Add per-type update methods (widget, dashboard, calculated field, rule chain) - Add entityId field to CalculatedFieldInstalledItemDescriptor - Replace checkForUpdates with getItemsPublishedVersions API - Replace getInstalledItemInfos with getInstalledItemIds returning List - Remove unused IotHubInstalledItemInfo class and resolver - Set metadata version from saved rule chain in install/update flows - Add entity-modified confirmation dialog in update UI --- .../main/data/upgrade/basic/schema_update.sql | 3 +- .../server/controller/IotHubController.java | 37 ++- .../service/iot_hub/DefaultIotHubService.java | 235 ++++++++++++++++-- .../server/service/iot_hub/IotHubService.java | 10 +- .../iot_hub/UpdateItemVersionResult.java | 9 +- ...alculatedFieldInstalledItemDescriptor.java | 2 + .../data/iot_hub/IotHubInstalledItemInfo.java | 32 --- .../dao/iot_hub/IotHubInstalledItemDao.java | 8 +- .../iot_hub/IotHubInstalledItemService.java | 9 +- .../IotHubInstalledItemServiceImpl.java | 15 +- .../IotHubInstalledItemRepository.java | 14 +- .../iot_hub/JpaIotHubInstalledItemDao.java | 16 +- .../main/resources/sql/schema-entities.sql | 3 +- .../src/app/core/http/iot-hub-api.service.ts | 41 ++- .../iot-hub/iot-hub-browse.component.html | 5 +- .../pages/iot-hub/iot-hub-browse.component.ts | 67 +---- .../iot-hub-install-dialog.component.ts | 36 ++- .../iot-hub-installed-item-infos.resolver.ts | 25 -- .../iot-hub-installed-items.component.html | 10 +- .../iot-hub-installed-items.component.scss | 7 +- .../iot-hub-installed-items.component.ts | 69 ++--- .../iot-hub/iot-hub-item-card.component.html | 10 +- .../iot-hub/iot-hub-item-card.component.scss | 27 -- .../iot-hub/iot-hub-item-card.component.ts | 14 -- .../iot-hub-item-detail-dialog.component.html | 11 +- .../iot-hub-item-detail-dialog.component.ts | 54 ++-- .../pages/iot-hub/iot-hub-routing.module.ts | 7 - .../iot-hub-update-dialog.component.ts | 230 +++++++++++++++++ .../entity/entity-autocomplete.component.ts | 12 + .../entity/entity-select.component.html | 1 + .../entity/entity-select.component.ts | 27 +- .../iot-hub/iot-hub-installed-item.models.ts | 14 +- .../assets/locale/locale.constant-en_US.json | 3 + 33 files changed, 674 insertions(+), 389 deletions(-) delete mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java delete mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql index 3df3837944..0e00ba0833 100644 --- a/application/src/main/data/upgrade/basic/schema_update.sql +++ b/application/src/main/data/upgrade/basic/schema_update.sql @@ -56,8 +56,7 @@ CREATE TABLE IF NOT EXISTS iot_hub_installed_item ( item_name VARCHAR NOT NULL, item_type VARCHAR NOT NULL, version VARCHAR NOT NULL, - descriptor JSONB NOT NULL, - CONSTRAINT iot_hub_installed_item_item_id_unq_key UNIQUE (tenant_id, item_id) + descriptor JSONB NOT NULL ); -- IOT HUB INSTALLED ITEM END \ No newline at end of file diff --git a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java index 4e4b2a86e2..2568911c90 100644 --- a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java +++ b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java @@ -19,22 +19,24 @@ import io.swagger.v3.oas.annotations.Hidden; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; +import com.fasterxml.jackson.databind.JsonNode; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import java.util.List; import java.util.UUID; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.dao.iot_hub.IotHubInstalledItemService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.iot_hub.InstallItemVersionResult; @@ -55,16 +57,18 @@ public class IotHubController extends BaseController { @PreAuthorize("hasAuthority('TENANT_ADMIN')") @PostMapping("/versions/{versionId}/install") @ResponseBody - public InstallItemVersionResult installItemVersion(@PathVariable String versionId) throws ThingsboardException { - return iotHubService.installItemVersion(getCurrentUser(), versionId); + public InstallItemVersionResult installItemVersion(@PathVariable String versionId, + @RequestBody(required = false) JsonNode data) throws ThingsboardException { + return iotHubService.installItemVersion(getCurrentUser(), versionId, data); } @PreAuthorize("hasAuthority('TENANT_ADMIN')") - @PostMapping("/installedItems/{itemId}/update/{versionId}") + @PostMapping("/installedItems/{installedItemId}/update/{versionId}") @ResponseBody - public UpdateItemVersionResult updateItemVersion(@PathVariable UUID itemId, - @PathVariable String versionId) throws ThingsboardException { - return iotHubService.updateItemVersion(getCurrentUser(), itemId, versionId); + public UpdateItemVersionResult updateItemVersion(@PathVariable UUID installedItemId, + @PathVariable String versionId, + @RequestParam(required = false, defaultValue = "false") boolean force) throws ThingsboardException { + return iotHubService.updateItemVersion(getCurrentUser(), new IotHubInstalledItemId(installedItemId), versionId, force); } @PreAuthorize("hasAuthority('TENANT_ADMIN')") @@ -80,23 +84,16 @@ public class IotHubController extends BaseController { } @PreAuthorize("hasAuthority('TENANT_ADMIN')") - @GetMapping("/installedItems/byItemId/{itemId}") + @GetMapping("/installedItems/itemIds") @ResponseBody - public IotHubInstalledItem getInstalledItemByItemId(@PathVariable UUID itemId) throws ThingsboardException { - return iotHubInstalledItemService.findByTenantIdAndItemId(getTenantId(), itemId).orElse(null); + public List getInstalledItemIds() throws ThingsboardException { + return iotHubInstalledItemService.findInstalledItemIdsByTenantId(getTenantId()); } @PreAuthorize("hasAuthority('TENANT_ADMIN')") - @GetMapping("/installedItems/info") + @DeleteMapping("/installedItems/{installedItemId}") @ResponseBody - public List getInstalledItemInfos() throws ThingsboardException { - return iotHubInstalledItemService.findInstalledItemInfosByTenantId(getTenantId()); - } - - @PreAuthorize("hasAuthority('TENANT_ADMIN')") - @DeleteMapping("/installedItems/{itemId}") - @ResponseBody - public void deleteInstalledItem(@PathVariable UUID itemId) throws ThingsboardException { - iotHubService.deleteInstalledItem(getCurrentUser(), itemId); + public void deleteInstalledItem(@PathVariable UUID installedItemId) throws ThingsboardException { + iotHubService.deleteInstalledItem(getCurrentUser(), new IotHubInstalledItemId(installedItemId)); } } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java index 6a80412a99..af5e966c13 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java @@ -23,6 +23,8 @@ import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.cf.CalculatedField; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.iot_hub.CalculatedFieldInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.DashboardInstalledItemDescriptor; @@ -32,9 +34,9 @@ import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.RuleChainInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.WidgetInstalledItemDescriptor; import org.thingsboard.server.common.data.rule.RuleChain; -import org.thingsboard.server.common.data.rule.RuleChainData; -import org.thingsboard.server.common.data.rule.RuleChainImportResult; +import org.thingsboard.server.common.data.rule.NodeConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; import org.thingsboard.server.dao.cf.CalculatedFieldService; import org.thingsboard.server.dao.dashboard.DashboardService; @@ -50,6 +52,9 @@ import org.thingsboard.server.service.entitiy.widgets.type.TbWidgetTypeService; import org.thingsboard.server.service.rule.TbRuleChainService; import org.thingsboard.server.service.security.model.SecurityUser; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.HexFormat; import java.util.List; import java.util.UUID; @@ -73,7 +78,7 @@ public class DefaultIotHubService implements IotHubService { private final DeviceProfileService deviceProfileService; @Override - public InstallItemVersionResult installItemVersion(SecurityUser user, String versionId) { + public InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data) { TenantId tenantId = user.getTenantId(); log.info("[{}] Installing IoT Hub item version: {}", tenantId, versionId); @@ -85,17 +90,13 @@ public class DefaultIotHubService implements IotHubService { String version = versionInfo.get("version").asText(); log.debug("[{}] Fetched version info: {} (type: {})", tenantId, itemName, itemType); - if (iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId).isPresent()) { - return InstallItemVersionResult.error("Item '" + itemName + "' is already installed"); - } - byte[] fileData = iotHubRestClient.getVersionFileData(versionId); log.debug("[{}] Fetched file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); IotHubInstalledItemDescriptor descriptor = switch (itemType) { case "WIDGET" -> installWidget(user, tenantId, fileData); case "DASHBOARD" -> installDashboard(user, tenantId, fileData); - case "CALCULATED_FIELD" -> installCalculatedField(user, tenantId, fileData); + case "CALCULATED_FIELD" -> installCalculatedField(user, tenantId, fileData, data); case "RULE_CHAIN" -> installRuleChain(tenantId, fileData); case "DEVICE" -> installDeviceProfile(user, tenantId, fileData); default -> throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); @@ -130,7 +131,7 @@ public class DefaultIotHubService implements IotHubService { } widgetTypeDetails.setId(null); widgetTypeDetails.setTenantId(tenantId); - WidgetTypeDetails saved = tbWidgetTypeService.save(widgetTypeDetails, true, user); + WidgetTypeDetails saved = tbWidgetTypeService.save(widgetTypeDetails, false, user); log.debug("[{}] Widget installed: {}", tenantId, saved.getName()); WidgetInstalledItemDescriptor descriptor = new WidgetInstalledItemDescriptor(); descriptor.setWidgetTypeId(saved.getId()); @@ -153,7 +154,7 @@ public class DefaultIotHubService implements IotHubService { return descriptor; } - private CalculatedFieldInstalledItemDescriptor installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + private CalculatedFieldInstalledItemDescriptor installCalculatedField(SecurityUser user, TenantId tenantId, byte[] fileData, JsonNode data) throws Exception { CalculatedField calculatedField; try { calculatedField = JacksonUtil.fromString(new String(fileData), CalculatedField.class, true); @@ -162,10 +163,15 @@ public class DefaultIotHubService implements IotHubService { } calculatedField.setId(null); calculatedField.setTenantId(tenantId); + if (data != null && data.has("entityId")) { + EntityId entityId = JacksonUtil.treeToValue(data.get("entityId"), EntityId.class); + calculatedField.setEntityId(entityId); + } CalculatedField saved = tbCalculatedFieldService.save(calculatedField, user); log.debug("[{}] Calculated field installed: {}", tenantId, saved.getName()); CalculatedFieldInstalledItemDescriptor descriptor = new CalculatedFieldInstalledItemDescriptor(); descriptor.setCalculatedFieldId(saved.getId()); + descriptor.setEntityId(saved.getEntityId()); return descriptor; } @@ -191,6 +197,7 @@ public class DefaultIotHubService implements IotHubService { RuleChain savedRuleChain = ruleChainService.saveRuleChain(ruleChain); metadata.setRuleChainId(savedRuleChain.getId()); + metadata.setVersion(savedRuleChain.getVersion()); ruleChainService.saveRuleChainMetaData(tenantId, metadata, tbRuleChainService::updateRuleNodeConfiguration); log.debug("[{}] Rule chain installed: {}", tenantId, savedRuleChain.getName()); @@ -214,18 +221,30 @@ public class DefaultIotHubService implements IotHubService { } @Override - public UpdateItemVersionResult updateItemVersion(SecurityUser user, UUID itemId, String versionId) { + public UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force) { TenantId tenantId = user.getTenantId(); - log.info("[{}] Updating IoT Hub item {} to version: {}", tenantId, itemId, versionId); + log.info("[{}] Updating IoT Hub installed item {} to version: {}", tenantId, installedItemId, versionId); try { - IotHubInstalledItem installedItem = iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId) - .orElseThrow(() -> new IllegalArgumentException("Installed item not found")); + IotHubInstalledItem installedItem = iotHubInstalledItemService.findById(tenantId, installedItemId); + if (installedItem == null) { + throw new IllegalArgumentException("Installed item not found"); + } JsonNode installedVersionInfo = iotHubRestClient.getVersionInfo(installedItem.getItemVersionId().toString()); String installedChecksum = installedVersionInfo.has("checksum") ? installedVersionInfo.get("checksum").asText() : null; log.info("[{}] Installed version info: name={}, version={}, checksum={}", tenantId, installedItem.getItemName(), installedItem.getVersion(), installedChecksum); + if (!force) { + String entityChecksum = calculateEntityChecksum(tenantId, installedItem); + boolean entityModified = installedChecksum != null && !installedChecksum.equals(entityChecksum); + log.info("[{}] Entity checksum: {}, modified: {}", tenantId, entityChecksum, entityModified); + + if (entityModified) { + return UpdateItemVersionResult.entityModified(); + } + } + JsonNode versionInfo = iotHubRestClient.getVersionInfo(versionId); String itemName = versionInfo.get("name").asText(); String version = versionInfo.get("version").asText(); @@ -233,22 +252,198 @@ public class DefaultIotHubService implements IotHubService { byte[] fileData = iotHubRestClient.getVersionFileData(versionId); log.info("[{}] Fetched update file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); - // TODO: apply update per item type + IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); + String itemType = installedItem.getItemType(); + switch (itemType) { + case "WIDGET" -> updateWidget(user, tenantId, (WidgetInstalledItemDescriptor) descriptor, fileData); + case "DASHBOARD" -> updateDashboard(user, tenantId, (DashboardInstalledItemDescriptor) descriptor, fileData); + case "CALCULATED_FIELD" -> updateCalculatedField(user, tenantId, (CalculatedFieldInstalledItemDescriptor) descriptor, fileData); + case "RULE_CHAIN" -> updateRuleChain(tenantId, (RuleChainInstalledItemDescriptor) descriptor, fileData); + case "DEVICE" -> updateDeviceProfile(user, tenantId, fileData); + default -> throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); + } + + installedItem.setItemVersionId(UUID.fromString(versionId)); + installedItem.setItemName(itemName); + installedItem.setVersion(version); + iotHubInstalledItemService.save(tenantId, installedItem); log.info("[{}] Successfully updated IoT Hub item {} to version: {}", tenantId, itemName, version); return UpdateItemVersionResult.success(installedItem.getDescriptor()); } catch (Exception e) { - log.error("[{}] Failed to update IoT Hub item {} to version: {}", tenantId, itemId, versionId, e); + log.error("[{}] Failed to update IoT Hub installed item {} to version: {}", tenantId, installedItemId, versionId, e); return UpdateItemVersionResult.error(e.getMessage()); } } + private void updateWidget(SecurityUser user, TenantId tenantId, WidgetInstalledItemDescriptor descriptor, byte[] fileData) throws Exception { + WidgetTypeDetails newWidgetType; + try { + newWidgetType = JacksonUtil.fromString(new String(fileData), WidgetTypeDetails.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse widget data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + WidgetTypeDetails existing = widgetTypeService.findWidgetTypeDetailsById(tenantId, descriptor.getWidgetTypeId()); + if (existing == null) { + throw new Exception("Widget not found for update"); + } + existing.setName(newWidgetType.getName()); + existing.setDescriptor(newWidgetType.getDescriptor()); + tbWidgetTypeService.save(existing, false, user); + } + + private void updateDashboard(SecurityUser user, TenantId tenantId, DashboardInstalledItemDescriptor descriptor, byte[] fileData) throws Exception { + Dashboard newDashboard; + try { + newDashboard = JacksonUtil.fromString(new String(fileData), Dashboard.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse dashboard data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + Dashboard existing = dashboardService.findDashboardById(tenantId, descriptor.getDashboardId()); + if (existing == null) { + throw new Exception("Dashboard not found for update"); + } + existing.setTitle(newDashboard.getTitle()); + existing.setConfiguration(newDashboard.getConfiguration()); + tbDashboardService.save(existing, user); + } + + private void updateCalculatedField(SecurityUser user, TenantId tenantId, CalculatedFieldInstalledItemDescriptor descriptor, byte[] fileData) throws Exception { + CalculatedField newCf; + try { + newCf = JacksonUtil.fromString(new String(fileData), CalculatedField.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse calculated field data: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + CalculatedField existing = calculatedFieldService.findById(tenantId, descriptor.getCalculatedFieldId()); + if (existing == null) { + throw new Exception("Calculated field not found for update"); + } + existing.setName(newCf.getName()); + existing.setType(newCf.getType()); + existing.setConfiguration(newCf.getConfiguration()); + tbCalculatedFieldService.save(existing, user); + } + + private void updateRuleChain(TenantId tenantId, RuleChainInstalledItemDescriptor descriptor, byte[] fileData) throws Exception { + JsonNode json = JacksonUtil.toJsonNode(new String(fileData)); + RuleChainMetaData metadata; + try { + metadata = JacksonUtil.fromString(json.get("metadata").toString(), RuleChainMetaData.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse rule chain metadata: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + RuleChain existing = ruleChainService.findRuleChainById(tenantId, descriptor.getRuleChainId()); + if (existing == null) { + throw new Exception("Rule chain not found for update"); + } + RuleChain newRuleChain; + try { + newRuleChain = JacksonUtil.fromString(json.get("ruleChain").toString(), RuleChain.class, true); + } catch (Exception e) { + throw new Exception("Failed to parse rule chain: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()), e); + } + existing.setName(newRuleChain.getName()); + RuleChain savedRuleChain = ruleChainService.saveRuleChain(existing); + metadata.setRuleChainId(savedRuleChain.getId()); + metadata.setVersion(savedRuleChain.getVersion()); + ruleChainService.saveRuleChainMetaData(tenantId, metadata, tbRuleChainService::updateRuleNodeConfiguration); + } + + private void updateDeviceProfile(SecurityUser user, TenantId tenantId, byte[] fileData) throws Exception { + // TODO: implement device profile update + } + + private String calculateEntityChecksum(TenantId tenantId, IotHubInstalledItem installedItem) { + IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); + if (descriptor instanceof WidgetInstalledItemDescriptor wd) { + return calculateWidgetChecksum(tenantId, wd); + } else if (descriptor instanceof DashboardInstalledItemDescriptor dd) { + return calculateDashboardChecksum(tenantId, dd); + } else if (descriptor instanceof CalculatedFieldInstalledItemDescriptor cd) { + return calculateCalculatedFieldChecksum(tenantId, cd); + } else if (descriptor instanceof RuleChainInstalledItemDescriptor rd) { + return calculateRuleChainChecksum(tenantId, rd); + } + return null; + } + + private String calculateCalculatedFieldChecksum(TenantId tenantId, CalculatedFieldInstalledItemDescriptor descriptor) { + CalculatedField cf = calculatedFieldService.findById(tenantId, descriptor.getCalculatedFieldId()); + if (cf == null) { + return null; + } + String content = (cf.getName() != null ? cf.getName() : "") + + (cf.getType() != null ? cf.getType().name() : "") + + (cf.getConfiguration() != null ? JacksonUtil.valueToTree(cf.getConfiguration()).toString() : ""); + return sha256(content); + } + + private String calculateDashboardChecksum(TenantId tenantId, DashboardInstalledItemDescriptor descriptor) { + Dashboard dashboard = dashboardService.findDashboardById(tenantId, descriptor.getDashboardId()); + if (dashboard == null) { + return null; + } + String content = (dashboard.getTitle() != null ? dashboard.getTitle() : "") + + (dashboard.getConfiguration() != null ? dashboard.getConfiguration().toString() : ""); + return sha256(content); + } + + private String calculateWidgetChecksum(TenantId tenantId, WidgetInstalledItemDescriptor descriptor) { + WidgetTypeDetails widgetType = widgetTypeService.findWidgetTypeDetailsById(tenantId, descriptor.getWidgetTypeId()); + if (widgetType == null) { + return null; + } + String content = (widgetType.getFqn() != null ? widgetType.getFqn() : "") + + (widgetType.getName() != null ? widgetType.getName() : "") + + (widgetType.getDescriptor() != null ? widgetType.getDescriptor().toString() : ""); + return sha256(content); + } + + private String calculateRuleChainChecksum(TenantId tenantId, RuleChainInstalledItemDescriptor descriptor) { + RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, descriptor.getRuleChainId()); + if (ruleChain == null) { + return null; + } + RuleChainMetaData metadata = ruleChainService.loadRuleChainMetaData(tenantId, descriptor.getRuleChainId()); + StringBuilder content = new StringBuilder(); + content.append(ruleChain.getName() != null ? ruleChain.getName() : ""); + content.append(ruleChain.getType() != null ? ruleChain.getType().name() : ""); + if (metadata.getNodes() != null) { + for (RuleNode node : metadata.getNodes()) { + content.append(node.getType() != null ? node.getType() : ""); + content.append(node.getName() != null ? node.getName() : ""); + content.append(node.getConfiguration() != null ? node.getConfiguration().toString() : ""); + } + } + if (metadata.getConnections() != null) { + for (NodeConnectionInfo conn : metadata.getConnections()) { + content.append(conn.getFromIndex()); + content.append(conn.getToIndex()); + content.append(conn.getType() != null ? conn.getType() : ""); + } + } + return sha256(content.toString()); + } + + private static String sha256(String input) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(hash); + } catch (Exception e) { + throw new RuntimeException("Failed to calculate SHA-256", e); + } + } + @Override - public void deleteInstalledItem(SecurityUser user, UUID itemId) { + public void deleteInstalledItem(SecurityUser user, IotHubInstalledItemId installedItemId) { TenantId tenantId = user.getTenantId(); - IotHubInstalledItem installedItem = iotHubInstalledItemService.findByTenantIdAndItemId(tenantId, itemId) - .orElseThrow(() -> new IllegalArgumentException("Installed item not found")); + IotHubInstalledItem installedItem = iotHubInstalledItemService.findById(tenantId, installedItemId); + if (installedItem == null) { + throw new IllegalArgumentException("Installed item not found"); + } IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); if (descriptor instanceof WidgetInstalledItemDescriptor wd) { @@ -277,7 +472,7 @@ public class DefaultIotHubService implements IotHubService { // no entity to delete for now } - iotHubInstalledItemService.deleteByTenantIdAndItemId(tenantId, itemId); + iotHubInstalledItemService.deleteById(tenantId, installedItemId); log.info("[{}] Deleted installed IoT Hub item: {}", tenantId, installedItem.getItemName()); } } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java index e17ca5d4f2..c7faf14bae 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java @@ -15,15 +15,15 @@ */ package org.thingsboard.server.service.iot_hub; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.service.security.model.SecurityUser; -import java.util.UUID; - public interface IotHubService { - InstallItemVersionResult installItemVersion(SecurityUser user, String versionId); + InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data); - UpdateItemVersionResult updateItemVersion(SecurityUser user, UUID itemId, String versionId); + UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force); - void deleteInstalledItem(SecurityUser user, UUID itemId); + void deleteInstalledItem(SecurityUser user, IotHubInstalledItemId installedItemId); } diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java index b056b29e6a..1ba7b0a7b5 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/UpdateItemVersionResult.java @@ -26,15 +26,20 @@ import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; public class UpdateItemVersionResult { private boolean success; + private boolean entityModified; private String errorMessage; private IotHubInstalledItemDescriptor descriptor; public static UpdateItemVersionResult success(IotHubInstalledItemDescriptor descriptor) { - return new UpdateItemVersionResult(true, null, descriptor); + return new UpdateItemVersionResult(true, false, null, descriptor); + } + + public static UpdateItemVersionResult entityModified() { + return new UpdateItemVersionResult(false, true, null, null); } public static UpdateItemVersionResult error(String errorMessage) { - return new UpdateItemVersionResult(false, errorMessage, null); + return new UpdateItemVersionResult(false, false, errorMessage, null); } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java index b47b9f8cc8..ceedbe2dea 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/CalculatedFieldInstalledItemDescriptor.java @@ -17,10 +17,12 @@ package org.thingsboard.server.common.data.iot_hub; import lombok.Data; import org.thingsboard.server.common.data.id.CalculatedFieldId; +import org.thingsboard.server.common.data.id.EntityId; @Data public class CalculatedFieldInstalledItemDescriptor implements IotHubInstalledItemDescriptor { private CalculatedFieldId calculatedFieldId; + private EntityId entityId; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java deleted file mode 100644 index 19eb74dccb..0000000000 --- a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemInfo.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright © 2016-2026 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.iot_hub; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.UUID; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class IotHubInstalledItemInfo { - - private UUID itemId; - private UUID itemVersionId; - -} diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java index 300b1cd620..82abff4bf1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemDao.java @@ -17,24 +17,18 @@ package org.thingsboard.server.dao.iot_hub; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.Dao; import java.util.List; -import java.util.Optional; import java.util.UUID; public interface IotHubInstalledItemDao extends Dao { - Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId); - PageData findByTenantId(TenantId tenantId, PageLink pageLink); - List findInstalledItemInfosByTenantId(TenantId tenantId); - - boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId); + List findInstalledItemIdsByTenantId(TenantId tenantId); void deleteByTenantId(TenantId tenantId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java index 1cee8f10a2..ccc1de3bc1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemService.java @@ -15,27 +15,26 @@ */ package org.thingsboard.server.dao.iot_hub; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import java.util.List; -import java.util.Optional; import java.util.UUID; public interface IotHubInstalledItemService { IotHubInstalledItem save(TenantId tenantId, IotHubInstalledItem item); - Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId); + IotHubInstalledItem findById(TenantId tenantId, IotHubInstalledItemId id); PageData findByTenantId(TenantId tenantId, PageLink pageLink); - List findInstalledItemInfosByTenantId(TenantId tenantId); + List findInstalledItemIdsByTenantId(TenantId tenantId); - boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId); + void deleteById(TenantId tenantId, IotHubInstalledItemId id); void deleteByTenantId(TenantId tenantId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java index 37593df30b..1642ba3870 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/iot_hub/IotHubInstalledItemServiceImpl.java @@ -18,14 +18,13 @@ package org.thingsboard.server.dao.iot_hub; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import java.util.List; -import java.util.Optional; import java.util.UUID; @Service @@ -42,8 +41,8 @@ class IotHubInstalledItemServiceImpl implements IotHubInstalledItemService { } @Override - public Optional findByTenantIdAndItemId(TenantId tenantId, UUID itemId) { - return iotHubInstalledItemDao.findByTenantIdAndItemId(tenantId, itemId); + public IotHubInstalledItem findById(TenantId tenantId, IotHubInstalledItemId id) { + return iotHubInstalledItemDao.findById(tenantId, id.getId()); } @Override @@ -52,13 +51,13 @@ class IotHubInstalledItemServiceImpl implements IotHubInstalledItemService { } @Override - public List findInstalledItemInfosByTenantId(TenantId tenantId) { - return iotHubInstalledItemDao.findInstalledItemInfosByTenantId(tenantId); + public List findInstalledItemIdsByTenantId(TenantId tenantId) { + return iotHubInstalledItemDao.findInstalledItemIdsByTenantId(tenantId); } @Override - public boolean deleteByTenantIdAndItemId(TenantId tenantId, UUID itemId) { - return iotHubInstalledItemDao.deleteByTenantIdAndItemId(tenantId, itemId); + public void deleteById(TenantId tenantId, IotHubInstalledItemId id) { + iotHubInstalledItemDao.removeById(tenantId, id.getId()); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java index fa4b98da6d..bb245133b5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/IotHubInstalledItemRepository.java @@ -22,20 +22,15 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.dao.model.sql.IotHubInstalledItemEntity; import java.util.List; -import java.util.Optional; import java.util.UUID; interface IotHubInstalledItemRepository extends JpaRepository { - Optional findByTenantIdAndItemId(UUID tenantId, UUID itemId); - - @Query("SELECT new org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo(item.itemId, item.itemVersionId) " + - "FROM IotHubInstalledItemEntity item WHERE item.tenantId = :tenantId") - List findInstalledItemInfosByTenantId(@Param("tenantId") UUID tenantId); + @Query("SELECT DISTINCT item.itemId FROM IotHubInstalledItemEntity item WHERE item.tenantId = :tenantId") + List findInstalledItemIdsByTenantId(@Param("tenantId") UUID tenantId); @Query(""" SELECT item FROM IotHubInstalledItemEntity item @@ -47,11 +42,6 @@ interface IotHubInstalledItemRepository extends JpaRepository findByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, Pageable pageable); - @Transactional - @Modifying - @Query("DELETE FROM IotHubInstalledItemEntity item WHERE item.tenantId = :tenantId AND item.itemId = :itemId") - int deleteByTenantIdAndItemId(@Param("tenantId") UUID tenantId, @Param("itemId") UUID itemId); - @Transactional @Modifying @Query(value = "DELETE FROM iot_hub_installed_item WHERE tenant_id = :tenantId", nativeQuery = true) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java index 265026d710..ee837f6363 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/iot_hub/JpaIotHubInstalledItemDao.java @@ -23,7 +23,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; -import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.SortOrder; @@ -34,7 +33,6 @@ import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.util.SqlDao; import java.util.List; -import java.util.Optional; import java.util.UUID; @SqlDao @@ -44,11 +42,6 @@ class JpaIotHubInstalledItemDao extends JpaAbstractDao findByTenantIdAndItemId(TenantId tenantId, UUID itemId) { - return repository.findByTenantIdAndItemId(tenantId.getId(), itemId).map(DaoUtil::getData); - } - @Override public PageData findByTenantId(TenantId tenantId, PageLink pageLink) { return DaoUtil.toPageData(repository.findByTenantId( @@ -59,13 +52,8 @@ class JpaIotHubInstalledItemDao extends JpaAbstractDao 0; - } - - @Override - public List findInstalledItemInfosByTenantId(TenantId tenantId) { - return repository.findInstalledItemInfosByTenantId(tenantId.getId()); + public List findInstalledItemIdsByTenantId(TenantId tenantId) { + return repository.findInstalledItemIdsByTenantId(tenantId.getId()); } @Override diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql index bd2a1c1c7b..67aa39fd8e 100644 --- a/dao/src/main/resources/sql/schema-entities.sql +++ b/dao/src/main/resources/sql/schema-entities.sql @@ -986,6 +986,5 @@ CREATE TABLE IF NOT EXISTS iot_hub_installed_item ( item_name VARCHAR NOT NULL, item_type VARCHAR NOT NULL, version VARCHAR NOT NULL, - descriptor JSONB NOT NULL, - CONSTRAINT iot_hub_installed_item_item_id_unq_key UNIQUE (tenant_id, item_id) + descriptor JSONB NOT NULL ); diff --git a/ui-ngx/src/app/core/http/iot-hub-api.service.ts b/ui-ngx/src/app/core/http/iot-hub-api.service.ts index 587e37a155..4d4d375e5f 100644 --- a/ui-ngx/src/app/core/http/iot-hub-api.service.ts +++ b/ui-ngx/src/app/core/http/iot-hub-api.service.ts @@ -22,7 +22,7 @@ import { PageData } from '@shared/models/page/page-data'; import { PageLink } from '@shared/models/page/page-link'; import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { CreatorView } from '@shared/models/iot-hub/iot-hub-creator.models'; -import { IotHubInstalledItem, IotHubInstalledItemInfo, InstallItemVersionResult, UpdateItemVersionResult, ItemUpdateInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubInstalledItem, InstallItemVersionResult, UpdateItemVersionResult, ItemPublishedVersionInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { InterceptorHttpParams } from '@core/interceptors/interceptor-http-params'; import { InterceptorConfig } from '@core/interceptors/interceptor-config'; import { AppState } from '@core/core.state'; @@ -112,32 +112,29 @@ export class IotHubApiService { ); } - public installItemVersion(versionId: string, config?: IotHubRequestConfig): Observable { + public installItemVersion(versionId: string, config?: IotHubRequestConfig, data?: any): Observable { return this.http.post( `/api/iot-hub/versions/${versionId}/install`, - null, + data || null, { params: this.buildParams(config) } ); } - public updateItemVersion(itemId: string, versionId: string, config?: IotHubRequestConfig): Observable { + public updateItemVersion(installedItemId: string, versionId: string, config?: IotHubRequestConfig, force?: boolean): Observable { + let params = this.buildParams(config); + if (force) { + params = params.set('force', 'true'); + } return this.http.post( - `/api/iot-hub/installedItems/${itemId}/update/${versionId}`, + `/api/iot-hub/installedItems/${installedItemId}/update/${versionId}`, null, - { params: this.buildParams(config) } - ); - } - - public getInstalledItemByItemId(itemId: string, config?: IotHubRequestConfig): Observable { - return this.http.get( - `/api/iot-hub/installedItems/byItemId/${itemId}`, - { params: this.buildParams(config) } + { params } ); } - public getInstalledItemInfos(config?: IotHubRequestConfig): Observable { - return this.http.get( - `/api/iot-hub/installedItems/info`, + public getInstalledItemIds(config?: IotHubRequestConfig): Observable { + return this.http.get( + `/api/iot-hub/installedItems/itemIds`, { params: this.buildParams(config) } ); } @@ -149,17 +146,17 @@ export class IotHubApiService { ); } - public deleteInstalledItem(itemId: string, config?: IotHubRequestConfig): Observable { + public deleteInstalledItem(installedItemId: string, config?: IotHubRequestConfig): Observable { return this.http.delete( - `/api/iot-hub/installedItems/${itemId}`, + `/api/iot-hub/installedItems/${installedItemId}`, { params: this.buildParams(config) } ); } - public checkForUpdates(infos: IotHubInstalledItemInfo[], config?: IotHubRequestConfig): Observable { - return this.http.post( - `${this.baseUrl}/api/versions/checkForUpdates`, - infos, + public getItemsPublishedVersions(itemIds: string[], config?: IotHubRequestConfig): Observable { + return this.http.post( + `${this.baseUrl}/api/versions/publishedVersions`, + itemIds, { params: this.buildParams(config) } ); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index 5b350ec9ee..3894da7685 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -193,12 +193,9 @@ [item]="item" [showTypeChip]="false" [showCreator]="!creatorId" - [installed]="isInstalled(item)" - [installedItemInfo]="installedItemsMap.get(item.itemId) || null" (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" - (installClick)="installItem($event)" - (updateClick)="updateItem($event)"> + (installClick)="installItem($event)"> }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 27f370856d..a9b7243898 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -27,13 +27,11 @@ import { } from '@shared/models/iot-hub/iot-hub-item.models'; import { cfTypeTranslations, widgetTypeTranslations, ruleChainTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; -import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; -import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; interface SortOption { value: string; @@ -91,8 +89,6 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { widgetTypes: Map = widgetTypeTranslations; ruleChainTypes: Map = ruleChainTypeTranslations; - installedItemsMap = new Map(); - private searchSubject = new Subject(); private destroy$ = new Subject(); @@ -100,8 +96,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { private iotHubApiService: IotHubApiService, private dialog: MatDialog, private translate: TranslateService, - private router: Router, - private route: ActivatedRoute + private router: Router ) {} ngOnInit(): void { @@ -113,7 +108,6 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.loadItems(); }); this.updateCategories(); - this.initInstalledItemInfos(); this.loadItems(); } @@ -328,65 +322,27 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } } - isInstalled(item: MpItemVersionView): boolean { - return this.installedItemsMap.has(item.itemId); - } - openItemDetail(item: MpItemVersionView): void { - const installedInfo = this.installedItemsMap.get(item.itemId); - const dialogRef = this.dialog.open(TbIotHubItemDetailDialogComponent, { + this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], autoFocus: false, data: { item, - iotHubApiService: this.iotHubApiService, - installedItemInfo: installedInfo + iotHubApiService: this.iotHubApiService } as IotHubItemDetailDialogData }); - dialogRef.afterClosed().subscribe(result => { - if (result === 'installed' || result === 'updated') { - this.loadInstalledItemInfos(); - } - }); } installItem(item: MpItemVersionView): void { - const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { + this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], data: { item, iotHubApiService: this.iotHubApiService } as IotHubInstallDialogData }); - dialogRef.afterClosed().subscribe(result => { - if (result === 'installed') { - this.loadInstalledItemInfos(); - } - }); } - updateItem(item: MpItemVersionView): void { - const installedInfo = this.installedItemsMap.get(item.itemId); - if (!installedInfo) { - return; - } - const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { - panelClass: ['tb-dialog'], - data: { - itemId: item.itemId, - itemName: item.name, - itemType: item.type, - version: item.version, - versionId: item.id, - iotHubApiService: this.iotHubApiService - } as IotHubUpdateDialogData - }); - dialogRef.afterClosed().subscribe(result => { - if (result === 'updated') { - this.loadInstalledItemInfos(); - } - }); - } navigateToCreator(creatorId: string): void { this.router.navigate(['/iot-hub/creator', creatorId]); @@ -396,19 +352,6 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.router.navigate(['/iot-hub/installed']); } - private initInstalledItemInfos(): void { - const infos: IotHubInstalledItemInfo[] = this.route.snapshot.data['installedItemInfos'] || []; - this.installedItemsMap.clear(); - infos.forEach(info => this.installedItemsMap.set(info.itemId, info)); - } - - private loadInstalledItemInfos(): void { - this.iotHubApiService.getInstalledItemInfos({ignoreLoading: true}).subscribe(infos => { - this.installedItemsMap.clear(); - infos.forEach(info => this.installedItemsMap.set(info.itemId, info)); - }); - } - private updateCategories(): void { this.categories = getCategoriesForType(this.activeType); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts index 4c7edea820..fd48b0f999 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -23,6 +23,7 @@ import { IotHubInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-in import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TranslateService } from '@ngx-translate/core'; import { EntityType } from '@shared/models/entity-type.models'; +import { EntityId } from '@shared/models/id/entity-id'; import { getEntityDetailsPageURL } from '@core/utils'; export interface IotHubInstallDialogData { @@ -30,7 +31,7 @@ export interface IotHubInstallDialogData { iotHubApiService: IotHubApiService; } -export type InstallState = 'confirm' | 'installing' | 'success' | 'error'; +export type InstallState = 'select-entity' | 'confirm' | 'installing' | 'success' | 'error'; @Component({ selector: 'tb-iot-hub-install-dialog', @@ -49,6 +50,24 @@ export type InstallState = 'confirm' | 'installing' | 'success' | 'error'; } + @case ('select-entity') { +

{{ 'iot-hub.install-item-title' | translate }}

+ +

{{ 'iot-hub.select-entity-for-cf' | translate:{ name: item.name } }}

+ + + + + + + + } @case ('installing') {

{{ 'iot-hub.install-item-title' | translate }}

@@ -147,6 +166,10 @@ export class TbIotHubInstallDialogComponent { errorMessage = ''; entityDetailsUrl: string | null = null; + selectedEntityId: EntityId | null = null; + cfEntityTypes: EntityType[] = [EntityType.DEVICE, EntityType.ASSET, EntityType.DEVICE_PROFILE, EntityType.ASSET_PROFILE]; + defaultCfEntityType = EntityType.DEVICE_PROFILE; + constructor( @Inject(MAT_DIALOG_DATA) public data: IotHubInstallDialogData, private dialogRef: MatDialogRef, @@ -162,9 +185,18 @@ export class TbIotHubInstallDialogComponent { } install(): void { + if (this.item.type === ItemType.CALCULATED_FIELD) { + this.state = 'select-entity'; + return; + } + this.doInstall(); + } + + doInstall(): void { this.state = 'installing'; const versionId = this.item.id as string; - this.data.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }).subscribe({ + const data = this.selectedEntityId ? { entityId: this.selectedEntityId } : undefined; + this.data.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }, data).subscribe({ next: (result) => { if (result.success) { this.state = 'success'; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts deleted file mode 100644 index f54eaebf0a..0000000000 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-item-infos.resolver.ts +++ /dev/null @@ -1,25 +0,0 @@ -/// -/// Copyright © 2016-2026 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 { inject } from '@angular/core'; -import { ResolveFn } from '@angular/router'; -import { IotHubApiService } from '@core/http/iot-hub-api.service'; -import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; - -export const iotHubInstalledItemInfosResolver: ResolveFn = () => { - const iotHubApiService = inject(IotHubApiService); - return iotHubApiService.getInstalledItemInfos({ ignoreLoading: true }); -}; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html index 24f2e9f9e0..193a9f8d63 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.html @@ -83,17 +83,17 @@ {{ updatesChecked ? ('iot-hub.updates' | translate) : '' }} @if (updatesChecked) { - @if (getUpdateInfo(item); as updateInfo) { - @if (updateInfo.hasUpdate) { + @if (getPublishedVersionInfo(item); as publishedInfo) { + @if (publishedInfo.publishedVersionId !== item.itemVersionId) { } @else { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss index 7e8f080553..d066356922 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss @@ -186,7 +186,12 @@ width: 100%; } - .mat-column-itemType, + .mat-column-itemType { + width: 150px; + min-width: 150px; + max-width: 150px; + } + .mat-column-version { width: 100px; min-width: 100px; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts index 4dc173637e..317ba59816 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts @@ -15,7 +15,7 @@ /// import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatPaginator } from '@angular/material/paginator'; @@ -26,10 +26,10 @@ import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { ActionNotificationShow } from '@core/notification/notification.actions'; import { Subject } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; +import { debounceTime, switchMap } from 'rxjs/operators'; import { PageLink } from '@shared/models/page/page-link'; import { Direction, SortOrder } from '@shared/models/page/sort-order'; -import { IotHubInstalledItem, IotHubInstalledItemInfo, ItemUpdateInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubInstalledItem, ItemPublishedVersionInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { EntityType } from '@shared/models/entity-type.models'; import { getEntityDetailsPageURL } from '@core/utils'; @@ -52,8 +52,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { isLoading = false; textSearch = ''; - installedItemInfos: IotHubInstalledItemInfo[] = []; - updateInfoMap = new Map(); + publishedVersionMap = new Map(); updatesChecked = false; isCheckingUpdates = false; @@ -62,26 +61,16 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { @ViewChild(MatSort, {static: true}) sort: MatSort; @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; - private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { - 'WIDGET': EntityType.WIDGET_TYPE, - 'DASHBOARD': EntityType.DASHBOARD, - 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, - 'RULE_CHAIN': EntityType.RULE_CHAIN, - 'DEVICE': EntityType.DEVICE_PROFILE - }; - constructor( private iotHubApiService: IotHubApiService, private dialogService: DialogService, private translate: TranslateService, private store: Store, private router: Router, - private dialog: MatDialog, - private route: ActivatedRoute + private dialog: MatDialog ) {} ngOnInit(): void { - this.installedItemInfos = this.route.snapshot.data['installedItemInfos'] || []; this.searchSubject.pipe( debounceTime(300) ).subscribe(() => { @@ -123,7 +112,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { this.translate.instant('action.yes') ).subscribe(result => { if (result) { - this.iotHubApiService.deleteInstalledItem(item.itemId).subscribe({ + this.iotHubApiService.deleteInstalledItem(item.id.id).subscribe({ next: () => { this.store.dispatch(new ActionNotificationShow({ message: this.translate.instant('iot-hub.installed-item-deleted', {name: item.itemName}), @@ -167,7 +156,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { data: { item: versionView, iotHubApiService: this.iotHubApiService, - installedDescriptor: item.descriptor + installedItem: item } as IotHubItemDetailDialogData }); }); @@ -178,14 +167,25 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { switch (descriptor.type) { case 'WIDGET': return descriptor.widgetTypeId?.id; case 'DASHBOARD': return descriptor.dashboardId?.id; - case 'CALCULATED_FIELD': return descriptor.calculatedFieldId?.id; + case 'CALCULATED_FIELD': return descriptor.entityId?.id; case 'RULE_CHAIN': return descriptor.ruleChainId?.id; default: return null; } } + getEntityType(item: IotHubInstalledItem): EntityType | null { + const descriptor = item.descriptor; + switch (descriptor.type) { + case 'WIDGET': return EntityType.WIDGET_TYPE; + case 'DASHBOARD': return EntityType.DASHBOARD; + case 'CALCULATED_FIELD': return descriptor.entityId?.entityType as EntityType; + case 'RULE_CHAIN': return EntityType.RULE_CHAIN; + default: return null; + } + } + openEntity(item: IotHubInstalledItem): void { - const entityType = TbIotHubInstalledItemsComponent.ITEM_TYPE_TO_ENTITY_TYPE[item.itemType]; + const entityType = this.getEntityType(item); const entityId = this.getEntityId(item); if (entityType && entityId) { const url = getEntityDetailsPageURL(entityId, entityType); @@ -197,10 +197,12 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { checkForUpdates(): void { this.isCheckingUpdates = true; - this.iotHubApiService.checkForUpdates(this.installedItemInfos, { ignoreLoading: true }).subscribe({ - next: (updates) => { - this.updateInfoMap.clear(); - updates.forEach(info => this.updateInfoMap.set(info.itemId, info)); + this.iotHubApiService.getInstalledItemIds({ ignoreLoading: true }).pipe( + switchMap(itemIds => this.iotHubApiService.getItemsPublishedVersions(itemIds, { ignoreLoading: true })) + ).subscribe({ + next: (infos) => { + this.publishedVersionMap.clear(); + infos.forEach(info => this.publishedVersionMap.set(info.itemId, info)); this.updatesChecked = true; this.isCheckingUpdates = false; }, @@ -210,29 +212,28 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { }); } - viewUpdateDetails(updateInfo: ItemUpdateInfo, installedItem: IotHubInstalledItem): void { - this.iotHubApiService.getVersionInfo(updateInfo.latestItemVersionId, {ignoreLoading: true}).subscribe(versionView => { + viewUpdateDetails(publishedInfo: ItemPublishedVersionInfo, installedItem: IotHubInstalledItem): void { + this.iotHubApiService.getVersionInfo(publishedInfo.publishedVersionId, {ignoreLoading: true}).subscribe(versionView => { this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], data: { item: versionView, iotHubApiService: this.iotHubApiService, - installedDescriptor: installedItem.descriptor, - installedItemInfo: { itemId: installedItem.itemId, itemVersionId: installedItem.itemVersionId } + installedItem } as IotHubItemDetailDialogData }); }); } - updateItem(item: IotHubInstalledItem, updateInfo: ItemUpdateInfo): void { + updateItem(item: IotHubInstalledItem, publishedInfo: ItemPublishedVersionInfo): void { const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { panelClass: ['tb-dialog'], data: { - itemId: item.itemId, + installedItemId: item.id.id, itemName: item.itemName, itemType: item.itemType as ItemType, - version: updateInfo.latestVersion, - versionId: updateInfo.latestItemVersionId, + version: publishedInfo.publishedVersion, + versionId: publishedInfo.publishedVersionId, iotHubApiService: this.iotHubApiService } as IotHubUpdateDialogData }); @@ -243,8 +244,8 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { }); } - getUpdateInfo(item: IotHubInstalledItem): ItemUpdateInfo | undefined { - return this.updateInfoMap.get(item.itemId); + getPublishedVersionInfo(item: IotHubInstalledItem): ItemPublishedVersionInfo | undefined { + return this.publishedVersionMap.get(item.itemId); } private loadData(): void { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 510d626afd..1750548a2a 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -100,15 +100,7 @@ download {{ item.totalInstallCount | shortNumber }} - @if (installed) { - @if (hasUpdate()) { - - } @else { - {{ 'iot-hub.installed' | translate }} - } - } @else { - - } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 8eed3e6980..afe2357bb3 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -349,31 +349,4 @@ } } - .tb-iot-hub-card-installed-label { - padding: 5px 14px; - border-radius: 6px; - background: #e8f5e9; - color: #2e7d32; - font-size: 12px; - font-weight: 600; - white-space: nowrap; - } - - .tb-iot-hub-card-update-btn { - padding: 5px 14px; - border-radius: 6px; - border: 1px solid #e65100; - background: transparent; - color: #e65100; - font-size: 12px; - font-weight: 600; - cursor: pointer; - white-space: nowrap; - transition: all 0.15s; - - &:hover { - background: #e65100; - color: #fff; - } - } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 41a664b49c..87f5502696 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -19,7 +19,6 @@ import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTransl import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { TranslateService } from '@ngx-translate/core'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; -import { IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; @Component({ selector: 'tb-iot-hub-item-card', @@ -36,12 +35,9 @@ export class TbIotHubItemCardComponent { @Input() item: MpItemVersionView; @Input() showCreator = true; @Input() showTypeChip = true; - @Input() installed = false; - @Input() installedItemInfo: IotHubInstalledItemInfo | null = null; @Output() cardClick = new EventEmitter(); @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); - @Output() updateClick = new EventEmitter(); typeTranslations = itemTypeTranslations; @@ -190,21 +186,11 @@ export class TbIotHubItemCardComponent { this.cardClick.emit(this.item); } - hasUpdate(): boolean { - return this.installed && this.installedItemInfo != null - && this.installedItemInfo.itemVersionId !== this.item.id; - } - onInstallClick(event: MouseEvent): void { event.stopPropagation(); this.installClick.emit(this.item); } - onUpdateClick(event: MouseEvent): void { - event.stopPropagation(); - this.updateClick.emit(this.item); - } - onCreatorClick(event: MouseEvent): void { event.stopPropagation(); this.creatorClick.emit(this.item.creatorId); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index c4400af2cc..770a6bdf15 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -175,20 +175,19 @@
- @if (installedDescriptor) { + @if (isSameVersion()) { + } @else if (hasUpdate()) { + } @else { } - @if (hasUpdate()) { - - }
{{ 'iot-hub.created-by' | translate:{ name: item.creatorDisplayName } }} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts index aaab223443..1c0732d74d 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts @@ -19,7 +19,7 @@ import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dial import { Router } from '@angular/router'; import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, nodeComponentTypeTranslations, NodeInfo } from '@shared/models/iot-hub/iot-hub-version.models'; import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; -import { IotHubInstalledItemDescriptor, IotHubInstalledItemInfo } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TranslateService } from '@ngx-translate/core'; import { EntityType } from '@shared/models/entity-type.models'; @@ -30,8 +30,7 @@ import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub export interface IotHubItemDetailDialogData { item: MpItemVersionView; iotHubApiService: IotHubApiService; - installedDescriptor?: IotHubInstalledItemDescriptor; - installedItemInfo?: IotHubInstalledItemInfo; + installedItem?: IotHubInstalledItem; } @Component({ @@ -46,16 +45,7 @@ export class TbIotHubItemDetailDialogComponent { item: MpItemVersionView; typeTranslations = itemTypeTranslations; readmeContent: string = ''; - installedDescriptor?: IotHubInstalledItemDescriptor; - installedItemInfo?: IotHubInstalledItemInfo; - - private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { - 'WIDGET': EntityType.WIDGET_TYPE, - 'DASHBOARD': EntityType.DASHBOARD, - 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, - 'RULE_CHAIN': EntityType.RULE_CHAIN, - 'DEVICE': EntityType.DEVICE_PROFILE - }; + installedItem?: IotHubInstalledItem; private categoryMap: Map; private useCaseMap = useCaseTranslations; @@ -68,13 +58,7 @@ export class TbIotHubItemDetailDialogComponent { private translate: TranslateService ) { this.item = data.item; - this.installedDescriptor = data.installedDescriptor; - this.installedItemInfo = data.installedItemInfo; - if (!this.installedDescriptor && data.installedItemInfo) { - this.data.iotHubApiService.getInstalledItemByItemId(data.installedItemInfo.itemId, {ignoreLoading: true}).subscribe( - installedItem => this.installedDescriptor = installedItem?.descriptor - ); - } + this.installedItem = data.installedItem; this.categoryMap = getCategoriesForType(this.item.type); this.loadReadme(); } @@ -232,9 +216,18 @@ export class TbIotHubItemDetailDialogComponent { return this.item.dataDescriptor?.nodeCount || 0; } + isInstalled(): boolean { + return this.installedItem != null; + } + + isSameVersion(): boolean { + return this.installedItem != null + && this.installedItem.itemVersionId === this.item.id; + } + hasUpdate(): boolean { - return this.installedItemInfo != null - && this.installedItemInfo.itemVersionId !== this.item.id; + return this.installedItem != null + && this.installedItem.itemVersionId !== this.item.id; } install(): void { @@ -256,7 +249,7 @@ export class TbIotHubItemDetailDialogComponent { const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { panelClass: ['tb-dialog'], data: { - itemId: this.item.itemId, + installedItemId: this.installedItem.id.id, itemName: this.item.name, itemType: this.item.type, version: this.item.version, @@ -281,18 +274,21 @@ export class TbIotHubItemDetailDialogComponent { } openEntityDetails(): void { - const descriptor = this.installedDescriptor; + const descriptor = this.installedItem?.descriptor; if (!descriptor) { return; } let entityId: string | null = null; + let entityType: EntityType | null = null; switch (descriptor.type) { - case 'WIDGET': entityId = descriptor.widgetTypeId?.id; break; - case 'DASHBOARD': entityId = descriptor.dashboardId?.id; break; - case 'CALCULATED_FIELD': entityId = descriptor.calculatedFieldId?.id; break; - case 'RULE_CHAIN': entityId = descriptor.ruleChainId?.id; break; + case 'WIDGET': entityId = descriptor.widgetTypeId?.id; entityType = EntityType.WIDGET_TYPE; break; + case 'DASHBOARD': entityId = descriptor.dashboardId?.id; entityType = EntityType.DASHBOARD; break; + case 'CALCULATED_FIELD': + entityId = descriptor.entityId?.id; + entityType = descriptor.entityId?.entityType as EntityType; + break; + case 'RULE_CHAIN': entityId = descriptor.ruleChainId?.id; entityType = EntityType.RULE_CHAIN; break; } - const entityType = TbIotHubItemDetailDialogComponent.ITEM_TYPE_TO_ENTITY_TYPE[this.item.type]; if (entityType && entityId) { const url = getEntityDetailsPageURL(entityId, entityType); if (url) { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts index f407be68cb..33580a26bd 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts @@ -21,7 +21,6 @@ import { Authority } from '@shared/models/authority.enum'; import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; -import { iotHubInstalledItemInfosResolver } from './iot-hub-installed-item-infos.resolver'; const routes: Routes = [ { @@ -40,9 +39,6 @@ const routes: Routes = [ data: { auth: [Authority.TENANT_ADMIN], title: 'iot-hub.browse' - }, - resolve: { - installedItemInfos: iotHubInstalledItemInfosResolver } }, { @@ -55,9 +51,6 @@ const routes: Routes = [ label: 'iot-hub.installed-items', icon: 'inventory_2' } - }, - resolve: { - installedItemInfos: iotHubInstalledItemInfosResolver } }, { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts new file mode 100644 index 0000000000..7c646de3c4 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts @@ -0,0 +1,230 @@ +/// +/// Copyright © 2016-2026 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 { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { DialogService } from '@core/services/dialog.service'; +import { TranslateService } from '@ngx-translate/core'; +import { EntityType } from '@shared/models/entity-type.models'; +import { getEntityDetailsPageURL } from '@core/utils'; + +export interface IotHubUpdateDialogData { + installedItemId: string; + itemName: string; + itemType: ItemType; + version: string; + versionId: string; + iotHubApiService: IotHubApiService; +} + +export type UpdateState = 'confirm' | 'updating' | 'success' | 'error'; + +@Component({ + selector: 'tb-iot-hub-update-dialog', + standalone: false, + template: ` + @switch (state) { + @case ('confirm') { +

{{ 'iot-hub.update-item-title' | translate }}

+ +

{{ 'iot-hub.update-confirm' | translate:{ name: data.itemName, version: data.version } }}

+

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

+ + + + + + } + @case ('updating') { +

{{ 'iot-hub.update-item-title' | translate }}

+ +

{{ 'iot-hub.update-confirm' | translate:{ name: data.itemName, version: data.version } }}

+

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

+ + + + + + } + @case ('success') { +

+ check_circle + {{ 'iot-hub.update-success-title' | translate }} +

+ +

{{ 'iot-hub.update-success-message' | translate:{ name: data.itemName, version: data.version } }}

+ + + + @if (entityDetailsUrl) { + + } + + } + @case ('error') { +

+ error + {{ 'iot-hub.update-error-title' | translate }} +

+ +

{{ 'iot-hub.update-error-message' | translate:{ name: data.itemName } }}

+
{{ errorMessage }}
+ + + + + } + } + `, + styles: [` + .tb-iot-hub-install-meta { + margin: 4px 0; + color: rgba(0, 0, 0, 0.54); + font-size: 14px; + } + .tb-iot-hub-inline-spinner { + display: inline-block; + margin-right: 8px; + } + .tb-iot-hub-result-icon { + vertical-align: middle; + margin-right: 8px; + } + .tb-iot-hub-success-icon { + color: #2e7d32; + } + .tb-iot-hub-error-icon { + color: #c62828; + } + .tb-iot-hub-error-details { + max-height: 200px; + overflow-y: auto; + padding: 12px; + background: #f5f5f5; + border-radius: 4px; + font-family: monospace; + font-size: 12px; + color: rgba(0, 0, 0, 0.7); + white-space: pre-wrap; + word-break: break-word; + margin-top: 8px; + } + `] +}) +export class TbIotHubUpdateDialogComponent { + + private static readonly ITEM_TYPE_TO_ENTITY_TYPE: Record = { + 'WIDGET': EntityType.WIDGET_TYPE, + 'DASHBOARD': EntityType.DASHBOARD, + 'CALCULATED_FIELD': EntityType.CALCULATED_FIELD, + 'RULE_CHAIN': EntityType.RULE_CHAIN, + 'DEVICE': EntityType.DEVICE_PROFILE + }; + + typeTranslations = itemTypeTranslations; + state: UpdateState = 'confirm'; + errorMessage = ''; + entityDetailsUrl: string | null = null; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: IotHubUpdateDialogData, + private dialogRef: MatDialogRef, + private dialogService: DialogService, + private router: Router, + private translate: TranslateService + ) {} + + getTypeLabel(): string { + const key = this.typeTranslations.get(this.data.itemType); + return key ? this.translate.instant(key) : ''; + } + + update(force = false): void { + this.state = 'updating'; + this.data.iotHubApiService.updateItemVersion(this.data.installedItemId, this.data.versionId, { ignoreLoading: true }, force).subscribe({ + next: (result) => { + if (result.success) { + this.state = 'success'; + this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); + } else if (result.entityModified) { + this.state = 'confirm'; + this.dialogService.confirm( + this.translate.instant('iot-hub.entity-modified-title'), + this.translate.instant('iot-hub.entity-modified-text', { type: this.getTypeLabel() }), + this.translate.instant('action.no'), + this.translate.instant('action.yes') + ).subscribe(confirmed => { + if (confirmed) { + this.update(true); + } + }); + } else { + this.state = 'error'; + this.errorMessage = result.errorMessage || this.translate.instant('iot-hub.update-error', { name: this.data.itemName }); + } + }, + error: (err) => { + this.state = 'error'; + this.errorMessage = err?.error?.message || err?.message || this.translate.instant('iot-hub.update-error', { name: this.data.itemName }); + } + }); + } + + openEntityDetails(): void { + if (this.entityDetailsUrl) { + this.dialogRef.close('updated'); + this.router.navigateByUrl(this.entityDetailsUrl); + } + } + + close(): void { + this.dialogRef.close(this.state === 'success' ? 'updated' : false); + } + + cancel(): void { + this.dialogRef.close(false); + } + + private resolveEntityDetailsUrl(descriptor: IotHubInstalledItemDescriptor): string | null { + if (!descriptor) { + return null; + } + const entityType = TbIotHubUpdateDialogComponent.ITEM_TYPE_TO_ENTITY_TYPE[this.data.itemType]; + if (!entityType) { + return null; + } + let entityId: string | null = null; + switch (descriptor.type) { + case 'WIDGET': entityId = descriptor.widgetTypeId?.id; break; + case 'DASHBOARD': entityId = descriptor.dashboardId?.id; break; + case 'CALCULATED_FIELD': entityId = descriptor.calculatedFieldId?.id; break; + case 'RULE_CHAIN': entityId = descriptor.ruleChainId?.id; break; + } + if (!entityId) { + return null; + } + return getEntityDetailsPageURL(entityId, entityType) || null; + } +} diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts index e045768712..fcc9fc9f83 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts @@ -298,6 +298,18 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit this.entityRequiredText = 'ai-models.model-required'; this.notFoundEntities = 'ai-models.no-model-text'; break; + case EntityType.DEVICE_PROFILE: + this.entityText = 'device-profile.device-profile'; + this.noEntitiesMatchingText = 'device-profile.no-device-profiles-matching'; + this.entityRequiredText = 'device-profile.device-profile-required'; + this.notFoundEntities = 'device-profile.no-device-profiles-text'; + break; + case EntityType.ASSET_PROFILE: + this.entityText = 'asset-profile.asset-profile'; + this.noEntitiesMatchingText = 'asset-profile.no-asset-profiles-matching'; + this.entityRequiredText = 'asset-profile.asset-profile-required'; + this.notFoundEntities = 'asset-profile.no-asset-profiles-text'; + break; case AliasEntityType.CURRENT_CUSTOMER: this.entityText = 'customer.default-customer'; this.noEntitiesMatchingText = 'customer.no-customers-matching'; diff --git a/ui-ngx/src/app/shared/components/entity/entity-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-select.component.html index 7d57e575ef..c88366e75e 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-select.component.html +++ b/ui-ngx/src/app/shared/components/entity/entity-select.component.html @@ -25,6 +25,7 @@ [useAliasEntityTypes]="useAliasEntityTypes" [allowedEntityTypes]="allowedEntityTypes" [additionEntityTypes]="additionEntityTypes" + [filterAllowedEntityTypes]="filterAllowedEntityTypes" formControlName="entityType"> { }; constructor(private store: Store, @@ -83,15 +87,17 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte const entityTypes = this.entityService.prepareAllowedEntityTypesList(this.allowedEntityTypes, this.useAliasEntityTypes); + + let defaultEntityType: EntityType | AliasEntityType = null; if (entityTypes.length === 1) { this.displayEntityTypeSelect = false; - this.defaultEntityType = entityTypes[0]; + defaultEntityType = entityTypes[0]; } else { this.displayEntityTypeSelect = true; } this.entitySelectFormGroup = this.fb.group({ - entityType: [this.defaultEntityType], + entityType: [defaultEntityType], entityId: [null] }); } @@ -123,6 +129,19 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte if (additionNullUIIDEntityTypes.length > 0) { additionNullUIIDEntityTypes.forEach((entityType) => this.entityTypeNullUUID.add(entityType)); } + + if (this.filterAllowedEntityTypes === false) { + if (this.allowedEntityTypes?.length === 1) { + this.displayEntityTypeSelect = false; + this.entitySelectFormGroup.get('entityType').setValue(this.allowedEntityTypes[0]); + } else { + this.displayEntityTypeSelect = true; + } + } + + if (this.defaultEntityType) { + this.entitySelectFormGroup.get('entityType').setValue(this.defaultEntityType); + } } ngAfterViewInit(): void { diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts index 204b857055..9288e3452c 100644 --- a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-installed-item.models.ts @@ -29,6 +29,7 @@ export interface DashboardInstalledItemDescriptor { export interface CalculatedFieldInstalledItemDescriptor { type: 'CALCULATED_FIELD'; calculatedFieldId: { id: string }; + entityId: { entityType: string; id: string }; } export interface RuleChainInstalledItemDescriptor { @@ -55,20 +56,15 @@ export interface InstallItemVersionResult { export interface UpdateItemVersionResult { success: boolean; + entityModified: boolean; errorMessage: string; descriptor: IotHubInstalledItemDescriptor; } -export interface IotHubInstalledItemInfo { +export interface ItemPublishedVersionInfo { itemId: string; - itemVersionId: string; -} - -export interface ItemUpdateInfo { - itemId: string; - hasUpdate: boolean; - latestVersion: string; - latestItemVersionId: string; + publishedVersionId: string; + publishedVersion: string; } export interface IotHubInstalledItem extends BaseData<{id: string}> { diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 00eceb16cd..6b37194f81 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3734,6 +3734,7 @@ "created-by": "Created by {{name}}", "install-item-title": "Install Item", "install-confirm": "Install {{name}} v{{version}}?", + "select-entity-for-cf": "Select entity for calculated field '{{name}}'", "install-type": "Type: {{type}}", "install-creator": "Creator: {{creator}}", "install": "Install", @@ -3754,6 +3755,8 @@ "updating": "Updating...", "update-success-title": "Update Successful", "update-success-message": "'{{name}}' has been updated to version {{version}}.", + "entity-modified-title": "Entity Modified", + "entity-modified-text": "The {{type}} has been modified locally. Do you still want to update it?", "update-error-title": "Update Failed", "update-error-message": "Failed to update '{{name}}'.", "update-error": "Failed to update {{name}}", From ce5625a332389d12f37451c54dee75671a7d24fd Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 30 Mar 2026 20:06:47 +0300 Subject: [PATCH 005/219] Add solution template install support to IoT Hub integration - Add SolutionService with install/delete/rollback flow, entity provisioning (customers, assets, devices, dashboards, edges, rule chains, CFs, users), telemetry emulators, instructions templating, and public customer support - Add SolutionInstallDialogComponent in home/components/solution with markdown details display and "Go to main dashboard" navigation - Update IoT Hub install dialog to open solution dialog on template success - Add SOLUTION_TEMPLATE type support across frontend (item cards, detail dialog, installed items table with dashboard entity mapping) - Add solution instructions button to item detail dialog for installed templates - Update edge detail URLs and dashboard links for correct CE routing --- .../server/controller/IotHubController.java | 11 +- .../service/iot_hub/DefaultIotHubService.java | 65 +- .../server/service/iot_hub/IotHubService.java | 5 +- .../solutions/DefaultSolutionService.java | 1462 +++++++++++++++++ .../service/solutions/SolutionService.java | 32 + .../solutions/data/CreatedAlarmRuleInfo.java | 39 + .../data/CreatedCalculatedFieldInfo.java | 39 + .../solutions/data/CreatedEntityInfo.java | 49 + .../solutions/data/DashboardLinkInfo.java | 28 + .../solutions/data/DeviceCredentialsInfo.java | 30 + .../service/solutions/data/EdgeLinkInfo.java | 28 + .../data/SolutionInstallContext.java | 208 +++ .../solutions/data/UserCredentialsInfo.java | 28 + .../data/definition/AssetDefinition.java | 39 + .../definition/AssetProfileDefinition.java | 28 + .../data/definition/BaseEntityDefinition.java | 48 + .../definition/CalculatedFieldDefinition.java | 28 + .../data/definition/CustomerDefinition.java | 55 + .../definition/CustomerEntityDefinition.java | 28 + .../data/definition/DashboardDefinition.java | 38 + .../DashboardUserDetailsDefinition.java | 26 + .../data/definition/DeviceDefinition.java | 41 + .../definition/DeviceProfileDefinition.java | 28 + .../data/definition/EdgeDefinition.java | 45 + .../data/definition/EmulatorDefinition.java | 64 + .../data/definition/EntityDefinition.java | 26 + .../data/definition/EntitySearchKey.java | 31 + .../ReferenceableEntityDefinition.java | 32 + .../data/definition/RelationDefinition.java | 34 + .../data/definition/TelemetryProfile.java | 29 + .../data/definition/TenantDefinition.java | 29 + .../data/definition/UserDefinition.java | 40 + .../emulator/AbstractEmulatorLauncher.java | 195 +++ .../data/emulator/AssetEmulatorLauncher.java | 42 + .../data/emulator/BasicEmulator.java | 42 + .../data/emulator/CustomEmulator.java | 25 + .../data/emulator/DeviceEmulatorLauncher.java | 98 ++ .../solutions/data/emulator/Emulator.java | 24 + .../FieldIrrigationStateEmulator.java | 108 ++ .../data/emulator/SimpleEmulator.java | 24 + .../solutions/data/names/RandomNameData.java | 26 + .../solutions/data/names/RandomNameUtil.java | 100 ++ .../solution/SolutionInstallResponse.java | 42 + .../TenantSolutionTemplateInstructions.java | 46 + .../CompositeValueStrategyDefinition.java | 34 + .../CompositeValueStrategyGenerator.java | 55 + .../values/ConstantTelemetryGenerator.java | 51 + .../ConstantValueStrategyDefinition.java | 31 + .../values/CounterTelemetryGenerator.java | 69 + .../CounterValueStrategyDefinition.java | 42 + .../values/DecrementTelemetryGenerator.java | 37 + .../DecrementValueStrategyDefinition.java | 34 + .../data/values/EventTelemetryGenerator.java | 54 + .../values/EventValueStrategyDefinition.java | 33 + .../solutions/data/values/GeneratorTools.java | 96 ++ .../data/values/IncDecTelemetryGenerator.java | 64 + .../values/IncDecValueStrategyDefinition.java | 32 + .../values/IncrementTelemetryGenerator.java | 36 + .../IncrementValueStrategyDefinition.java | 34 + .../values/NaturalTelemetryGenerator.java | 94 ++ .../NaturalValueStrategyDefinition.java | 45 + .../ScheduleValueStrategyDefinition.java | 35 + .../ScheduleValueStrategyGenerator.java | 70 + .../SequenceValueStrategyDefinition.java | 34 + .../SequenceValueStrategyGenerator.java | 48 + .../data/values/TelemetryGenerator.java | 41 + .../values/TelemetryGeneratorFactory.java | 48 + .../data/values/ValueStrategyDefinition.java | 39 + .../values/ValueStrategyDefinitionType.java | 22 + .../data/values/ValueStrategySchedule.java | 31 + .../server/common/data/DeviceProfile.java | 3 + .../IotHubInstalledItemDescriptor.java | 3 +- ...lutionTemplateInstalledItemDescriptor.java | 34 + .../home/components/home-components.module.ts | 3 + .../solution-install-dialog.component.html | 44 + .../solution-install-dialog.component.scss | 50 + .../solution-install-dialog.component.ts | 59 + .../iot-hub/iot-hub-browse.component.html | 5 + .../pages/iot-hub/iot-hub-browse.component.ts | 4 + .../iot-hub-install-dialog.component.ts | 22 +- .../iot-hub-installed-items.component.scss | 7 +- .../iot-hub-installed-items.component.ts | 3 + .../iot-hub/iot-hub-item-card.component.ts | 2 + .../iot-hub-item-detail-dialog.component.html | 25 +- .../iot-hub-item-detail-dialog.component.scss | 18 + .../iot-hub-item-detail-dialog.component.ts | 19 + .../iot-hub/iot-hub-installed-item.models.ts | 12 +- .../models/iot-hub/iot-hub-item.models.ts | 26 + .../assets/locale/locale.constant-en_US.json | 10 + 89 files changed, 5008 insertions(+), 35 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/DefaultSolutionService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/SolutionService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedAlarmRuleInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedCalculatedFieldInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedEntityInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/DashboardLinkInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/DeviceCredentialsInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/EdgeLinkInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/UserCredentialsInfo.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetProfileDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/BaseEntityDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CalculatedFieldDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerEntityDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardUserDetailsDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceProfileDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EdgeDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EmulatorDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntityDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntitySearchKey.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/ReferenceableEntityDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/RelationDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TelemetryProfile.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TenantDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/definition/UserDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AbstractEmulatorLauncher.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AssetEmulatorLauncher.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/BasicEmulator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/CustomEmulator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/DeviceEmulatorLauncher.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/Emulator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/FieldIrrigationStateEmulator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/SimpleEmulator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameData.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameUtil.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/solution/SolutionInstallResponse.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/solution/TenantSolutionTemplateInstructions.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/GeneratorTools.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalTelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGenerator.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGeneratorFactory.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinition.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinitionType.java create mode 100644 application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategySchedule.java create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/SolutionTemplateInstalledItemDescriptor.java create mode 100644 ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.html create mode 100644 ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss create mode 100644 ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.ts diff --git a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java index 2568911c90..92e1a6f2de 100644 --- a/application/src/main/java/org/thingsboard/server/controller/IotHubController.java +++ b/application/src/main/java/org/thingsboard/server/controller/IotHubController.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletRequest; import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; import org.thingsboard.server.common.data.page.PageData; @@ -58,8 +59,9 @@ public class IotHubController extends BaseController { @PostMapping("/versions/{versionId}/install") @ResponseBody public InstallItemVersionResult installItemVersion(@PathVariable String versionId, - @RequestBody(required = false) JsonNode data) throws ThingsboardException { - return iotHubService.installItemVersion(getCurrentUser(), versionId, data); + @RequestBody(required = false) JsonNode data, + HttpServletRequest request) throws ThingsboardException { + return iotHubService.installItemVersion(getCurrentUser(), versionId, data, request); } @PreAuthorize("hasAuthority('TENANT_ADMIN')") @@ -67,8 +69,9 @@ public class IotHubController extends BaseController { @ResponseBody public UpdateItemVersionResult updateItemVersion(@PathVariable UUID installedItemId, @PathVariable String versionId, - @RequestParam(required = false, defaultValue = "false") boolean force) throws ThingsboardException { - return iotHubService.updateItemVersion(getCurrentUser(), new IotHubInstalledItemId(installedItemId), versionId, force); + @RequestParam(required = false, defaultValue = "false") boolean force, + HttpServletRequest request) throws ThingsboardException { + return iotHubService.updateItemVersion(getCurrentUser(), new IotHubInstalledItemId(installedItemId), versionId, force, request); } @PreAuthorize("hasAuthority('TENANT_ADMIN')") diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java index af5e966c13..5c2dfd937a 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/DefaultIotHubService.java @@ -16,6 +16,7 @@ package org.thingsboard.server.service.iot_hub; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -32,7 +33,10 @@ import org.thingsboard.server.common.data.iot_hub.DeviceInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItem; import org.thingsboard.server.common.data.iot_hub.IotHubInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.RuleChainInstalledItemDescriptor; +import org.thingsboard.server.common.data.iot_hub.SolutionTemplateInstalledItemDescriptor; import org.thingsboard.server.common.data.iot_hub.WidgetInstalledItemDescriptor; +import org.thingsboard.server.service.solutions.SolutionService; +import org.thingsboard.server.service.solutions.data.solution.SolutionInstallResponse; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.NodeConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChainMetaData; @@ -76,9 +80,10 @@ public class DefaultIotHubService implements IotHubService { private final DashboardService dashboardService; private final CalculatedFieldService calculatedFieldService; private final DeviceProfileService deviceProfileService; + private final SolutionService solutionService; @Override - public InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data) { + public InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data, HttpServletRequest request) { TenantId tenantId = user.getTenantId(); log.info("[{}] Installing IoT Hub item version: {}", tenantId, versionId); @@ -99,6 +104,7 @@ public class DefaultIotHubService implements IotHubService { case "CALCULATED_FIELD" -> installCalculatedField(user, tenantId, fileData, data); case "RULE_CHAIN" -> installRuleChain(tenantId, fileData); case "DEVICE" -> installDeviceProfile(user, tenantId, fileData); + case "SOLUTION_TEMPLATE" -> installSolution(user, tenantId, fileData, request); default -> throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); }; @@ -220,8 +226,22 @@ public class DefaultIotHubService implements IotHubService { return new DeviceInstalledItemDescriptor(); } + private SolutionTemplateInstalledItemDescriptor installSolution(SecurityUser user, TenantId tenantId, byte[] fileData, HttpServletRequest request) throws Exception { + SolutionInstallResponse response = solutionService.installSolution(user, tenantId, fileData, request); + if (!response.isSuccess()) { + throw new RuntimeException(response.getDetails()); + } + SolutionTemplateInstalledItemDescriptor descriptor = new SolutionTemplateInstalledItemDescriptor(); + descriptor.setCreatedEntityIds(response.getCreatedEntityIds()); + descriptor.setDashboardId(response.getDashboardId()); + descriptor.setPublicId(response.getPublicId()); + descriptor.setMainDashboardPublic(response.isMainDashboardPublic()); + descriptor.setDetails(response.getDetails()); + return descriptor; + } + @Override - public UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force) { + public UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force, HttpServletRequest request) { TenantId tenantId = user.getTenantId(); log.info("[{}] Updating IoT Hub installed item {} to version: {}", tenantId, installedItemId, versionId); @@ -231,17 +251,23 @@ public class DefaultIotHubService implements IotHubService { throw new IllegalArgumentException("Installed item not found"); } - JsonNode installedVersionInfo = iotHubRestClient.getVersionInfo(installedItem.getItemVersionId().toString()); - String installedChecksum = installedVersionInfo.has("checksum") ? installedVersionInfo.get("checksum").asText() : null; - log.info("[{}] Installed version info: name={}, version={}, checksum={}", tenantId, installedItem.getItemName(), installedItem.getVersion(), installedChecksum); + String itemType = installedItem.getItemType(); + IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); + + // Skip checksum validation for solution templates + if (!"SOLUTION_TEMPLATE".equals(itemType)) { + JsonNode installedVersionInfo = iotHubRestClient.getVersionInfo(installedItem.getItemVersionId().toString()); + String installedChecksum = installedVersionInfo.has("checksum") ? installedVersionInfo.get("checksum").asText() : null; + log.info("[{}] Installed version info: name={}, version={}, checksum={}", tenantId, installedItem.getItemName(), installedItem.getVersion(), installedChecksum); - if (!force) { - String entityChecksum = calculateEntityChecksum(tenantId, installedItem); - boolean entityModified = installedChecksum != null && !installedChecksum.equals(entityChecksum); - log.info("[{}] Entity checksum: {}, modified: {}", tenantId, entityChecksum, entityModified); + if (!force) { + String entityChecksum = calculateEntityChecksum(tenantId, installedItem); + boolean entityModified = installedChecksum != null && !installedChecksum.equals(entityChecksum); + log.info("[{}] Entity checksum: {}, modified: {}", tenantId, entityChecksum, entityModified); - if (entityModified) { - return UpdateItemVersionResult.entityModified(); + if (entityModified) { + return UpdateItemVersionResult.entityModified(); + } } } @@ -252,14 +278,25 @@ public class DefaultIotHubService implements IotHubService { byte[] fileData = iotHubRestClient.getVersionFileData(versionId); log.info("[{}] Fetched update file data, size: {} bytes", tenantId, fileData != null ? fileData.length : 0); - IotHubInstalledItemDescriptor descriptor = installedItem.getDescriptor(); - String itemType = installedItem.getItemType(); switch (itemType) { case "WIDGET" -> updateWidget(user, tenantId, (WidgetInstalledItemDescriptor) descriptor, fileData); case "DASHBOARD" -> updateDashboard(user, tenantId, (DashboardInstalledItemDescriptor) descriptor, fileData); case "CALCULATED_FIELD" -> updateCalculatedField(user, tenantId, (CalculatedFieldInstalledItemDescriptor) descriptor, fileData); case "RULE_CHAIN" -> updateRuleChain(tenantId, (RuleChainInstalledItemDescriptor) descriptor, fileData); case "DEVICE" -> updateDeviceProfile(user, tenantId, fileData); + case "SOLUTION_TEMPLATE" -> { + SolutionTemplateInstalledItemDescriptor stDescriptor = (SolutionTemplateInstalledItemDescriptor) descriptor; + solutionService.deleteSolution(tenantId, stDescriptor.getCreatedEntityIds(), user); + SolutionInstallResponse response = solutionService.installSolution(user, tenantId, fileData, request); + if (!response.isSuccess()) { + throw new RuntimeException(response.getDetails()); + } + stDescriptor.setCreatedEntityIds(response.getCreatedEntityIds()); + stDescriptor.setDashboardId(response.getDashboardId()); + stDescriptor.setPublicId(response.getPublicId()); + stDescriptor.setMainDashboardPublic(response.isMainDashboardPublic()); + stDescriptor.setDetails(response.getDetails()); + } default -> throw new IllegalArgumentException("Unsupported IoT Hub item type: " + itemType); } @@ -470,6 +507,8 @@ public class DefaultIotHubService implements IotHubService { } } else if (descriptor instanceof DeviceInstalledItemDescriptor) { // no entity to delete for now + } else if (descriptor instanceof SolutionTemplateInstalledItemDescriptor st) { + solutionService.deleteSolution(tenantId, st.getCreatedEntityIds(), user); } iotHubInstalledItemService.deleteById(tenantId, installedItemId); diff --git a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java index c7faf14bae..0abc8f7756 100644 --- a/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java +++ b/application/src/main/java/org/thingsboard/server/service/iot_hub/IotHubService.java @@ -16,14 +16,15 @@ package org.thingsboard.server.service.iot_hub; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.servlet.http.HttpServletRequest; import org.thingsboard.server.common.data.id.IotHubInstalledItemId; import org.thingsboard.server.service.security.model.SecurityUser; public interface IotHubService { - InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data); + InstallItemVersionResult installItemVersion(SecurityUser user, String versionId, JsonNode data, HttpServletRequest request); - UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force); + UpdateItemVersionResult updateItemVersion(SecurityUser user, IotHubInstalledItemId installedItemId, String versionId, boolean force, HttpServletRequest request); void deleteInstalledItem(SecurityUser user, IotHubInstalledItemId installedItemId); } diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/DefaultSolutionService.java b/application/src/main/java/org/thingsboard/server/service/solutions/DefaultSolutionService.java new file mode 100644 index 0000000000..b340702385 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/DefaultSolutionService.java @@ -0,0 +1,1462 @@ +/** + * Copyright © 2016-2026 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.service.solutions; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.gson.JsonParser; +import jakarta.annotation.PreDestroy; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.common.util.ThingsBoardExecutors; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.adaptor.JsonConverter; +import org.thingsboard.server.common.data.AttributeScope; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.DeviceProfile; +import org.thingsboard.server.common.data.alarm.AlarmInfo; +import org.thingsboard.server.common.data.alarm.AlarmQuery; +import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.StringUtils; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.asset.AssetProfile; +import org.thingsboard.server.common.data.audit.ActionType; +import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.common.data.security.UserCredentials; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.cf.CalculatedField; +import org.thingsboard.server.common.data.cf.configuration.BaseCalculatedFieldConfiguration; +import org.thingsboard.server.common.data.debug.DebugSettings; +import org.thingsboard.server.common.data.edge.Edge; +import org.thingsboard.server.common.data.id.AlarmId; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.EntityIdFactory; +import org.thingsboard.server.common.data.id.AssetProfileId; +import org.thingsboard.server.common.data.id.CalculatedFieldId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DashboardId; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.DeviceProfileId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.relation.EntityRelation; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; +import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.dao.alarm.AlarmService; +import org.thingsboard.server.dao.asset.AssetProfileService; +import org.thingsboard.server.dao.asset.AssetService; +import org.thingsboard.server.dao.cf.CalculatedFieldService; +import org.thingsboard.server.dao.attributes.AttributesService; +import org.thingsboard.server.dao.customer.CustomerService; +import org.thingsboard.server.dao.dashboard.DashboardService; +import org.thingsboard.server.dao.relation.RelationService; +import org.thingsboard.server.dao.device.DeviceCredentialsService; +import org.thingsboard.server.dao.device.DeviceProfileService; +import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.edge.EdgeService; +import org.thingsboard.server.dao.user.UserService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; +import org.thingsboard.server.queue.provider.TbQueueProducerProvider; +import org.thingsboard.server.queue.util.TbCoreComponent; +import org.thingsboard.server.service.action.EntityActionService; +import org.thingsboard.server.service.entitiy.asset.TbAssetService; +import org.thingsboard.server.service.entitiy.cf.TbCalculatedFieldService; +import org.thingsboard.server.service.entitiy.device.TbDeviceService; +import org.thingsboard.server.service.entitiy.edge.TbEdgeService; +import org.thingsboard.server.service.rule.TbRuleChainService; +import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.service.security.system.SystemSecurityService; +import org.thingsboard.server.service.solutions.data.CreatedAlarmRuleInfo; +import org.thingsboard.server.service.solutions.data.CreatedCalculatedFieldInfo; +import org.thingsboard.server.service.solutions.data.CreatedEntityInfo; +import org.thingsboard.server.service.solutions.data.DashboardLinkInfo; +import org.thingsboard.server.service.solutions.data.DeviceCredentialsInfo; +import org.thingsboard.server.service.solutions.data.EdgeLinkInfo; +import org.thingsboard.server.service.solutions.data.SolutionInstallContext; +import org.thingsboard.server.service.solutions.data.UserCredentialsInfo; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.thingsboard.server.service.solutions.data.definition.AssetDefinition; +import org.thingsboard.server.service.solutions.data.definition.AssetProfileDefinition; +import org.thingsboard.server.service.solutions.data.definition.DeviceDefinition; +import org.thingsboard.server.service.solutions.data.definition.CustomerDefinition; +import org.thingsboard.server.service.solutions.data.definition.DashboardUserDetailsDefinition; +import org.thingsboard.server.service.solutions.data.definition.CalculatedFieldDefinition; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.solutions.data.definition.UserDefinition; +import org.thingsboard.server.service.solutions.data.definition.DashboardDefinition; +import org.thingsboard.server.service.solutions.data.definition.DeviceProfileDefinition; +import org.thingsboard.server.service.solutions.data.definition.EdgeDefinition; +import org.thingsboard.server.service.solutions.data.definition.RelationDefinition; +import org.thingsboard.server.service.solutions.data.definition.ReferenceableEntityDefinition; +import org.thingsboard.server.service.solutions.data.definition.TenantDefinition; +import org.thingsboard.server.service.solutions.data.emulator.AssetEmulatorLauncher; +import org.thingsboard.server.service.solutions.data.emulator.DeviceEmulatorLauncher; +import org.thingsboard.server.service.solutions.data.names.RandomNameData; +import org.thingsboard.server.service.solutions.data.names.RandomNameUtil; +import org.thingsboard.server.service.solutions.data.solution.SolutionInstallResponse; +import org.thingsboard.server.service.solutions.data.solution.TenantSolutionTemplateInstructions; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.ExecutorService; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +@Service +@TbCoreComponent +@RequiredArgsConstructor +@Slf4j +public class DefaultSolutionService implements SolutionService { + + @Value("${ui.solution_templates.docs_base_url:https://thingsboard.io/docs}") + private String docsBaseUrl; + + private final RuleChainService ruleChainService; + private final TbRuleChainService tbRuleChainService; + private final DeviceProfileService deviceProfileService; + private final DeviceService deviceService; + private final TbDeviceService tbDeviceService; + private final DeviceCredentialsService deviceCredentialsService; + private final AssetProfileService assetProfileService; + private final AssetService assetService; + private final TbAssetService tbAssetService; + private final CustomerService customerService; + private final UserService userService; + private final DashboardService dashboardService; + private final EdgeService edgeService; + private final TbEdgeService tbEdgeService; + private final RelationService relationService; + private final AlarmService alarmService; + private final CalculatedFieldService calculatedFieldService; + private final TbCalculatedFieldService tbCalculatedFieldService; + private final AttributesService attributesService; + private final EntityActionService entityActionService; + private final SystemSecurityService systemSecurityService; + private final TbClusterService tbClusterService; + private final PartitionService partitionService; + private final TbQueueProducerProvider tbQueueProducerProvider; + private final TbServiceInfoProvider serviceInfoProvider; + private final TelemetrySubscriptionService tsSubService; + private final BCryptPasswordEncoder passwordEncoder; + + private final ExecutorService emulatorExecutor = ThingsBoardExecutors.newWorkStealingPool(10, "solution-emulators-executor"); + + @PreDestroy + private void destroy() { + emulatorExecutor.shutdownNow(); + } + + @Override + public SolutionInstallResponse installSolution(SecurityUser user, TenantId tenantId, byte[] zipData, HttpServletRequest request) throws Exception { + Path tempDir = Files.createTempDirectory("iot-hub-solution-"); + SolutionInstallContext ctx = new SolutionInstallContext(tenantId, tempDir, user); + try { + extractZip(zipData, tempDir); + + registerEmulatorsAndComputeOldestTelemetryTs(ctx); + + provisionTenantDetails(ctx); + + provisionRuleChains(ctx); + provisionDeviceProfiles(ctx); + provisionAssetProfiles(ctx); + + List customers = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "customers.json", new TypeReference<>() {}); + provisionCustomers(ctx, customers); + + var assets = provisionAssets(ctx); + var devices = provisionDevices(ctx); + + provisionDashboards(ctx); + + provisionCustomerUsers(ctx, customers); + + provisionRelations(ctx); + updateRuleChains(ctx); + provisionEdges(ctx); + + provisionAlarmRules(ctx); + + Set> telemetryLoading = launchEmulators(ctx, devices, assets); + + waitForTelemetryCompletion(telemetryLoading); + + provisionCalculatedFields(ctx); + + ctx.getSolutionInstructions().setDetails(prepareInstructions(ctx, request)); + + List ruleChainDefs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "rule_chains.json", new TypeReference<>() {}); + if (ruleChainDefs.stream().anyMatch(r -> StringUtils.isNotEmpty(r.getUpdate()))) { + long timeout = loadInstallTimeoutMs(ctx.getTempDir()); + Thread.sleep(timeout); + finalUpdateRuleChains(ctx); + } + + log.info("[{}] Solution template installed, created {} entities", tenantId, ctx.getCreatedEntitiesList().size()); + + return new SolutionInstallResponse( + new TenantSolutionTemplateInstructions(ctx.getSolutionInstructions()), + true, + ctx.getCreatedEntitiesList() + ); + } catch (Throwable e) { + log.error("[{}] Failed to install solution template", tenantId, e); + rollback(tenantId, ctx, e); + return new SolutionInstallResponse( + new TenantSolutionTemplateInstructions(ctx.getSolutionInstructions()), + false, + ctx.getCreatedEntitiesList() + ); + } finally { + deleteDirectory(tempDir); + } + } + + @Override + public void deleteSolution(TenantId tenantId, List createdEntityIds, SecurityUser user) { + if (createdEntityIds == null || createdEntityIds.isEmpty()) { + return; + } + List reversed = new ArrayList<>(createdEntityIds); + Collections.reverse(reversed); + for (EntityId entityId : reversed) { + try { + deleteEntity(tenantId, entityId, user); + } catch (Exception e) { + log.error("[{}] Failed to delete entity: {}", tenantId, entityId, e); + } + } + } + + private void provisionRuleChains(SolutionInstallContext ctx) { + List ruleChainDefs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "rule_chains.json", new TypeReference<>() {}); + for (ReferenceableEntityDefinition entityDef : ruleChainDefs) { + Path ruleChainPath = ctx.getTempDir().resolve("rule_chains").resolve(entityDef.getFile()); + if (!Files.exists(ruleChainPath)) { + log.warn("[{}] Rule chain file not found: {}", ctx.getTenantId(), entityDef.getFile()); + continue; + } + JsonNode ruleChainJson = replaceIds(ctx, JacksonUtil.toJsonNode(ruleChainPath)); + + RuleChain ruleChain = JacksonUtil.treeToValue(ruleChainJson.get("ruleChain"), RuleChain.class); + ruleChain.setId(null); + ruleChain.setTenantId(ctx.getTenantId()); + String metadataStr = JacksonUtil.toString(ruleChainJson.get("metadata")); + RuleChainMetaData metadata = JacksonUtil.treeToValue(JacksonUtil.toJsonNode(metadataStr), RuleChainMetaData.class); + + RuleChain savedRuleChain = ruleChainService.saveRuleChain(ruleChain); + metadata.setRuleChainId(savedRuleChain.getId()); + metadata.setVersion(savedRuleChain.getVersion()); + ruleChainService.saveRuleChainMetaData(ctx.getTenantId(), metadata, tbRuleChainService::updateRuleNodeConfiguration); + if (ruleChain.isRoot()) { + ruleChainService.setRootRuleChain(ctx.getTenantId(), savedRuleChain.getId()); + } + + ctx.register(entityDef.getJsonId(), savedRuleChain); + log.debug("[{}] Rule chain provisioned: {}", ctx.getTenantId(), savedRuleChain.getName()); + } + } + + private void updateRuleChains(SolutionInstallContext ctx) { + List ruleChainDefs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "rule_chains.json", new TypeReference<>() {}); + for (ReferenceableEntityDefinition entityDef : ruleChainDefs) { + Path ruleChainPath = ctx.getTempDir().resolve("rule_chains").resolve(entityDef.getFile()); + if (!Files.exists(ruleChainPath)) { + continue; + } + String realId = ctx.getRealIds().get(entityDef.getJsonId()); + if (realId == null) { + continue; + } + RuleChainId ruleChainId = new RuleChainId(UUID.fromString(realId)); + RuleChain savedRuleChain = ruleChainService.findRuleChainById(ctx.getTenantId(), ruleChainId); + if (savedRuleChain == null) { + continue; + } + JsonNode ruleChainJson = JacksonUtil.toJsonNode(ruleChainPath); + String metadataStr = JacksonUtil.toString(ruleChainJson.get("metadata")); + String oldMetadataStr = metadataStr; + for (var entry : ctx.getRealIds().entrySet()) { + metadataStr = metadataStr.replace(entry.getKey(), entry.getValue()); + } + if (metadataStr.equals(oldMetadataStr)) { + continue; + } + RuleChainMetaData metadata = JacksonUtil.treeToValue(JacksonUtil.toJsonNode(metadataStr), RuleChainMetaData.class); + metadata.setRuleChainId(ruleChainId); + metadata.setVersion(savedRuleChain.getVersion()); + ruleChainService.saveRuleChainMetaData(ctx.getTenantId(), metadata, tbRuleChainService::updateRuleNodeConfiguration); + } + } + + private void finalUpdateRuleChains(SolutionInstallContext ctx) { + List ruleChains = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "rule_chains.json", new TypeReference<>() {}); + for (ReferenceableEntityDefinition entityDefinition : ruleChains) { + if (StringUtils.isEmpty(entityDefinition.getUpdate())) { + continue; + } + Path ruleChainPath = ctx.getTempDir().resolve("rule_chains").resolve(entityDefinition.getUpdate()); + JsonNode ruleChainJson = JacksonUtil.toJsonNode(ruleChainPath); + RuleChain ruleChain = JacksonUtil.treeToValue(ruleChainJson.get("ruleChain"), RuleChain.class); + ruleChain.setTenantId(ctx.getTenantId()); + String metadataStr = JacksonUtil.toString(ruleChainJson.get("metadata")); + for (var entry : ctx.getRealIds().entrySet()) { + metadataStr = metadataStr.replace(entry.getKey(), entry.getValue()); + } + RuleChainMetaData ruleChainMetaData = JacksonUtil.treeToValue(JacksonUtil.toJsonNode(metadataStr), RuleChainMetaData.class); + + String realRuleChainId = ctx.getRealIds().get(entityDefinition.getJsonId()); + if (StringUtils.isEmpty(realRuleChainId)) { + continue; + } + RuleChainId ruleChainId = new RuleChainId(UUID.fromString(realRuleChainId)); + RuleChain savedRuleChain = ruleChainService.findRuleChainById(ctx.getTenantId(), ruleChainId); + ruleChainMetaData.setRuleChainId(savedRuleChain.getId()); + ruleChainMetaData.setVersion(savedRuleChain.getVersion()); + ruleChainService.saveRuleChainMetaData(ctx.getTenantId(), ruleChainMetaData, tbRuleChainService::updateRuleNodeConfiguration); + } + } + + private long loadInstallTimeoutMs(Path tempDir) { + Path solutionJson = tempDir.resolve("solution.json"); + if (Files.exists(solutionJson)) { + JsonNode node = JacksonUtil.toJsonNode(solutionJson); + if (node != null && node.has("installTimeoutMs")) { + return node.get("installTimeoutMs").asLong(0L); + } + } + return 0L; + } + + private void provisionDeviceProfiles(SolutionInstallContext ctx) { + List deviceProfiles = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "device_profiles.json", new TypeReference<>() {}); + deviceProfiles.addAll(loadListOfEntitiesFromDirectory(ctx.getTempDir(), "device_profiles", DeviceProfileDefinition.class)); + deviceProfiles.forEach(deviceProfile -> { + deviceProfile.setId(null); + deviceProfile.setCreatedTime(0L); + deviceProfile.setTenantId(ctx.getTenantId()); + if (deviceProfile.getDefaultRuleChainId() != null) { + String newId = ctx.getRealIds().get(deviceProfile.getDefaultRuleChainId().getId().toString()); + if (newId != null) { + deviceProfile.setDefaultRuleChainId(new RuleChainId(UUID.fromString(newId))); + } else { + log.error("[{}] Device profile: {} references non existing rule chain.", ctx.getTenantId(), deviceProfile.getName()); + throw new RuntimeException("Device profile: " + deviceProfile.getName() + " references non existing rule chain."); + } + } + if (deviceProfile.getDefaultEdgeRuleChainId() != null) { + String newId = ctx.getRealIds().get(deviceProfile.getDefaultEdgeRuleChainId().getId().toString()); + if (StringUtils.isEmpty(newId)) { + deviceProfile.setDefaultEdgeRuleChainId(null); + } else { + deviceProfile.setDefaultEdgeRuleChainId(new RuleChainId(UUID.fromString(newId))); + } + } + if (deviceProfile.getDefaultDashboardId() != null) { + String newId = ctx.getRealIds().get(deviceProfile.getDefaultDashboardId().getId().toString()); + if (newId != null) { + deviceProfile.setDefaultDashboardId(new DashboardId(UUID.fromString(newId))); + } + } + }); + + deviceProfiles.forEach(deviceProfileDefinition -> { + DeviceProfile deviceProfile = new DeviceProfile(deviceProfileDefinition); + deviceProfile = deviceProfileService.saveDeviceProfile(deviceProfile); + ctx.register(deviceProfileDefinition, deviceProfile); + }); + } + + private void provisionAssetProfiles(SolutionInstallContext ctx) { + List assetProfiles = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "asset_profiles.json", new TypeReference<>() {}); + assetProfiles.addAll(loadListOfEntitiesFromDirectory(ctx.getTempDir(), "asset_profiles", AssetProfileDefinition.class)); + assetProfiles.forEach(assetProfile -> { + assetProfile.setId(null); + assetProfile.setCreatedTime(0L); + assetProfile.setTenantId(ctx.getTenantId()); + if (assetProfile.getDefaultRuleChainId() != null) { + String newId = ctx.getRealIds().get(assetProfile.getDefaultRuleChainId().getId().toString()); + if (newId != null) { + assetProfile.setDefaultRuleChainId(new RuleChainId(UUID.fromString(newId))); + } else { + log.error("[{}] Asset profile: {} references non existing rule chain.", ctx.getTenantId(), assetProfile.getName()); + throw new RuntimeException("Asset profile: " + assetProfile.getName() + " references non existing rule chain."); + } + } + if (assetProfile.getDefaultEdgeRuleChainId() != null) { + String newId = ctx.getRealIds().get(assetProfile.getDefaultEdgeRuleChainId().getId().toString()); + if (StringUtils.isEmpty(newId)) { + assetProfile.setDefaultEdgeRuleChainId(null); + } else { + assetProfile.setDefaultEdgeRuleChainId(new RuleChainId(UUID.fromString(newId))); + } + } + }); + + assetProfiles.forEach(assetProfileDefinition -> { + AssetProfile assetProfile = new AssetProfile(assetProfileDefinition); + assetProfile = assetProfileService.saveAssetProfile(assetProfile); + ctx.register(assetProfileDefinition, assetProfile); + }); + } + + private Map provisionAssets(SolutionInstallContext ctx) { + Map result = new HashMap<>(); + Set assetTypeSet = new HashSet<>(); + List assets = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "assets.json", new TypeReference<>() {}); + for (AssetDefinition entityDef : assets) { + Asset entity = new Asset(); + entity.setTenantId(ctx.getTenantId()); + entity.setName(entityDef.getName()); + entity.setLabel(entityDef.getLabel()); + entity.setType(entityDef.getType()); + if (entityDef.isMakePublic()) { + entity.setCustomerId(getPublicCustomerId(ctx)); + } else { + entity.setCustomerId(ctx.getIdFromMap(EntityType.CUSTOMER, entityDef.getCustomer())); + } + ensureAssetProfileExists(ctx, assetTypeSet, entityDef); + entity = assetService.saveAsset(entity); + ctx.register(entityDef, entity); + log.info("[{}] Saved asset: {}", entity.getId(), entity); + AssetId entityId = entity.getId(); + ctx.putIdToMap(entityDef, entityId); + saveServerSideAttributes(ctx, entityId, entityDef.getAttributes()); + ctx.put(entityId, entityDef.getRelations()); + result.put(entity, entityDef); + } + return result; + } + + private void ensureAssetProfileExists(SolutionInstallContext ctx, Set assetTypeSet, AssetDefinition entityDef) { + if (!assetTypeSet.contains(entityDef.getType())) { + AssetProfile assetProfile = assetProfileService.findAssetProfileByName(ctx.getTenantId(), entityDef.getType()); + if (assetProfile == null) { + AssetProfile created = assetProfileService.findOrCreateAssetProfile(ctx.getTenantId(), entityDef.getType()); + ctx.register(created.getId()); + log.info("Saved asset profile: {}", created.getId()); + } + assetTypeSet.add(entityDef.getType()); + } + } + + private CustomerId getPublicCustomerId(SolutionInstallContext ctx) { + CustomerId publicId = ctx.getSolutionInstructions().getPublicId(); + if (publicId != null) { + return publicId; + } + Customer publicCustomer = customerService.findOrCreatePublicCustomer(ctx.getTenantId()); + ctx.getSolutionInstructions().setPublicId(publicCustomer.getId()); + return publicCustomer.getId(); + } + + private Map provisionDevices(SolutionInstallContext ctx) { + Map result = new HashMap<>(); + Set deviceTypeSet = new HashSet<>(); + List devices = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "devices.json", new TypeReference<>() {}); + for (DeviceDefinition entityDef : devices) { + CustomerId customerId = entityDef.isMakePublic() ? getPublicCustomerId(ctx) : ctx.getIdFromMap(EntityType.CUSTOMER, entityDef.getCustomer()); + Device entity = new Device(); + entity.setTenantId(ctx.getTenantId()); + entity.setName(entityDef.getName()); + entity.setLabel(entityDef.getLabel()); + ensureDeviceProfileExists(ctx, deviceTypeSet, entityDef); + entity.setType(entityDef.getType()); + entity.setCustomerId(customerId); + entity.setAdditionalInfo(entityDef.getAdditionalInfo()); + entity = deviceService.saveDevice(entity); + entityActionService.logEntityAction(ctx.getUser(), entity.getId(), entity, customerId, ActionType.ADDED, null); + ctx.register(entityDef, entity); + log.info("[{}] Saved device: {}", entity.getId(), entity); + DeviceId entityId = entity.getId(); + ctx.putIdToMap(entityDef, entityId); + saveServerSideAttributes(ctx, entityId, entityDef.getAttributes()); + saveSharedAttributes(ctx, entityId, entityDef.getSharedAttributes()); + ctx.put(entityId, entityDef.getRelations()); + + DeviceCredentialsInfo deviceCredentialsInfo = new DeviceCredentialsInfo(); + deviceCredentialsInfo.setName(entity.getName()); + deviceCredentialsInfo.setType(entity.getType()); + deviceCredentialsInfo.setCustomerName(entityDef.getCustomer()); + deviceCredentialsInfo.setCredentials(deviceCredentialsService.findDeviceCredentialsByDeviceId(ctx.getTenantId(), entityId)); + JsonNode additionalInfo = entity.getAdditionalInfo(); + boolean isGateway = additionalInfo != null && additionalInfo.hasNonNull("gateway") && additionalInfo.get("gateway").asBoolean(); + deviceCredentialsInfo.setGateway(isGateway); + ctx.addDeviceCredentials(deviceCredentialsInfo); + + result.put(entity, entityDef); + } + return result; + } + + private void ensureDeviceProfileExists(SolutionInstallContext ctx, Set deviceTypeSet, DeviceDefinition entityDef) { + if (!deviceTypeSet.contains(entityDef.getType())) { + DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileByName(ctx.getTenantId(), entityDef.getType()); + if (deviceProfile == null) { + DeviceProfile created = deviceProfileService.findOrCreateDeviceProfile(ctx.getTenantId(), entityDef.getType()); + ctx.register(created.getId()); + log.info("Saved device profile: {}", created.getId()); + } + deviceTypeSet.add(entityDef.getType()); + } + } + + private void provisionCustomers(SolutionInstallContext ctx, List customers) { + for (CustomerDefinition entityDef : customers) { + entityDef.setRandomNameData(generateRandomName(ctx)); + Customer customer = new Customer(); + customer.setTenantId(ctx.getTenantId()); + customer.setTitle(randomize(entityDef.getName(), entityDef.getRandomNameData())); + customer.setEmail(randomize(entityDef.getEmail(), entityDef.getRandomNameData())); + customer.setCountry(entityDef.getCountry()); + customer.setCity(entityDef.getCity()); + customer.setState(entityDef.getState()); + customer.setZip(entityDef.getZip()); + customer.setAddress(entityDef.getAddress()); + customer = customerService.saveCustomer(customer); + log.info("[{}] Saved customer: {}", customer.getId(), customer); + ctx.register(entityDef, customer); + CustomerId entityId = customer.getId(); + ctx.putIdToMap(entityDef, entityId); + saveServerSideAttributes(ctx, entityId, entityDef.getAttributes(), entityDef.getRandomNameData()); + ctx.put(entityId, entityDef.getRelations()); + entityDef.setName(customer.getName()); + } + } + + private void provisionCustomerUsers(SolutionInstallContext ctx, List customers) { + for (CustomerDefinition entityDef : customers) { + Customer customer = customerService.findCustomerByTenantIdAndTitle(ctx.getTenantId(), entityDef.getName()).get(); + for (UserDefinition uDef : entityDef.getUsers()) { + String originalName = uDef.getName(); + User user = createUser(ctx, customer, uDef, entityDef); + + UserCredentials credentials = userService.findUserCredentialsByUserId(ctx.getTenantId(), user.getId()); + credentials.setEnabled(true); + credentials.setActivateToken(null); + credentials.setPassword(passwordEncoder.encode(uDef.getPassword())); + userService.saveUserCredentials(ctx.getTenantId(), credentials); + + DashboardUserDetailsDefinition dd = uDef.getDashboard(); + if (dd != null) { + DashboardId dashboardId = ctx.getIdFromMap(EntityType.DASHBOARD, dd.getName()); + ObjectNode additionalInfo = JacksonUtil.newObjectNode(); + additionalInfo.put("defaultDashboardId", dashboardId.getId().toString()); + additionalInfo.put("defaultDashboardFullscreen", dd.isFullScreen()); + user.setAdditionalInfo(additionalInfo); + userService.saveUser(ctx.getTenantId(), user); + log.info("[{}] Added default dashboard for user {}", customer.getId(), user.getEmail()); + } + + UserCredentialsInfo credentialsInfo = new UserCredentialsInfo(); + credentialsInfo.setName(user.getFirstName() + " " + user.getLastName()); + credentialsInfo.setLogin(uDef.getName()); + credentialsInfo.setPassword(uDef.getPassword()); + credentialsInfo.setCustomerName(entityDef.getName()); + ctx.addUserCredentials(credentialsInfo); + ctx.register(entityDef, user); + ctx.put(user.getId(), uDef.getRelations()); + ctx.putIdToMap(EntityType.USER, originalName, user.getId()); + ctx.putIdToMap(EntityType.USER, uDef.getName(), user.getId()); + saveServerSideAttributes(ctx, user.getId(), uDef.getAttributes()); + } + } + } + + private User createUser(SolutionInstallContext ctx, Customer customer, UserDefinition uDef, CustomerDefinition cDef) { + int maxAttempts = 10; + int attempts = 0; + Exception finalE = null; + while (attempts < maxAttempts) { + try { + boolean lastAttempt = maxAttempts == (attempts + 1); + var randomName = lastAttempt ? RandomNameUtil.nextSuperRandom() : RandomNameUtil.next(); + User user = new User(); + if (!StringUtils.isEmpty(uDef.getFirstname())) { + user.setFirstName(randomize(uDef.getFirstname(), randomName, cDef.getRandomNameData())); + } else { + user.setFirstName(randomName.getFirstName()); + } + if (!StringUtils.isEmpty(uDef.getLastname())) { + user.setLastName(randomize(uDef.getLastname(), randomName, cDef.getRandomNameData())); + } else { + user.setLastName(randomName.getLastName()); + } + user.setAuthority(Authority.CUSTOMER_USER); + user.setEmail(randomize(uDef.getName(), randomName, cDef.getRandomNameData())); + user.setCustomerId(customer.getId()); + user.setTenantId(ctx.getTenantId()); + log.info("[{}] Saving user: {}", customer.getId(), user); + user = userService.saveUser(ctx.getTenantId(), user); + uDef.setName(user.getEmail()); + return user; + } catch (Exception e) { + finalE = e; + attempts++; + } + } + throw new RuntimeException(finalE); + } + + private void provisionEdges(SolutionInstallContext ctx) throws Exception { + List edges = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "edges.json", new TypeReference<>() {}); + RuleChain edgeTemplateRootRuleChain = ruleChainService.getEdgeTemplateRootRuleChain(ctx.getTenantId()); + for (EdgeDefinition entityDef : edges) { + CustomerId customerId = entityDef.isMakePublic() ? getPublicCustomerId(ctx) : ctx.getIdFromMap(EntityType.CUSTOMER, entityDef.getCustomer()); + Edge entity = new Edge(); + entity.setTenantId(ctx.getTenantId()); + entity.setName(entityDef.getName()); + entity.setLabel(entityDef.getLabel()); + entity.setType(entityDef.getType()); + entity.setCustomerId(customerId); + entity.setRoutingKey(UUID.randomUUID().toString()); + entity.setSecret(StringUtils.randomAlphanumeric(20)); + RuleChainId rootRuleChainId = edgeTemplateRootRuleChain.getId(); + if (StringUtils.isNotBlank(entityDef.getRootRuleChainId())) { + String newId = ctx.getRealIds().get(entityDef.getRootRuleChainId()); + if (newId != null) { + rootRuleChainId = new RuleChainId(UUID.fromString(newId)); + } else { + log.error("[{}] Edge: {} references non existing rule chain.", ctx.getTenantId(), entity.getName()); + throw new RuntimeException("Edge: " + entity.getName() + " references non existing rule chain."); + } + } + entity.setRootRuleChainId(rootRuleChainId); + RuleChain rootRuleChain = ruleChainService.findRuleChainById(ctx.getTenantId(), rootRuleChainId); + entity = tbEdgeService.save(entity, rootRuleChain, ctx.getUser()); + ctx.register(entityDef, entity); + assignRuleChainsToEdge(ctx, entityDef.getRuleChainIds(), entity); + assignAssetsToEdge(ctx, entityDef.getAssetIds(), entity); + assignDevicesToEdge(ctx, entityDef.getDeviceIds(), entity); + log.info("[{}] Saved edge: {}", entity.getId(), entity); + EdgeId entityId = entity.getId(); + ctx.putIdToMap(entityDef, entityId); + saveServerSideAttributes(ctx, entityId, entityDef.getAttributes()); + ctx.put(entityId, entityDef.getRelations()); + ctx.addEdgeLinkInfo(entity.getName(), new EdgeLinkInfo(entity.getId(), customerId != null ? customerId : ctx.getTenantId())); + } + } + + private void assignRuleChainsToEdge(SolutionInstallContext ctx, List ruleChainIds, Edge entity) { + if (ruleChainIds == null || ruleChainIds.isEmpty()) { + return; + } + for (String strRuleChainId : ruleChainIds) { + String newId = ctx.getRealIds().get(strRuleChainId); + if (newId != null) { + RuleChainId ruleChainId = new RuleChainId(UUID.fromString(newId)); + ruleChainService.assignRuleChainToEdge(ctx.getTenantId(), ruleChainId, entity.getId()); + } else { + log.error("[{}] Edge: {} references non existing edge rule chain.", ctx.getTenantId(), entity.getName()); + throw new RuntimeException("Edge: " + entity.getName() + " references non existing edge rule chain."); + } + } + } + + private void assignAssetsToEdge(SolutionInstallContext ctx, List assetIds, Edge entity) { + if (assetIds == null || assetIds.isEmpty()) { + return; + } + for (String strAssetId : assetIds) { + String newId = ctx.getRealIds().get(strAssetId); + if (newId != null) { + AssetId assetId = new AssetId(UUID.fromString(newId)); + assetService.assignAssetToEdge(ctx.getTenantId(), assetId, entity.getId()); + } else { + log.error("[{}] Edge: {} references non existing asset.", ctx.getTenantId(), entity.getName()); + throw new RuntimeException("Edge: " + entity.getName() + " references non existing asset."); + } + } + } + + private void assignDevicesToEdge(SolutionInstallContext ctx, List deviceIds, Edge entity) { + if (deviceIds == null || deviceIds.isEmpty()) { + return; + } + for (String strDeviceId : deviceIds) { + String newId = ctx.getRealIds().get(strDeviceId); + if (newId != null) { + DeviceId deviceId = new DeviceId(UUID.fromString(newId)); + deviceService.assignDeviceToEdge(ctx.getTenantId(), deviceId, entity.getId()); + } else { + log.error("[{}] Edge: {} references non existing device.", ctx.getTenantId(), entity.getName()); + throw new RuntimeException("Edge: " + entity.getName() + " references non existing device."); + } + } + } + + private void provisionAlarmRules(SolutionInstallContext ctx) { + List cfs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "alarm_rules.json", new TypeReference<>() {}); + cfs.addAll(loadListOfEntitiesFromDirectory(ctx.getTempDir(), "alarm_rules", CalculatedField.class)); + cfs.forEach(cf -> ctx.register(createCalculatedField(cf, ctx))); + } + + private void provisionCalculatedFields(SolutionInstallContext ctx) { + List cfs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "calculated_fields.json", new TypeReference<>() { + }); + cfs.addAll(loadListOfEntitiesFromDirectory(ctx.getTempDir(), "calculated_fields", CalculatedFieldDefinition.class)); + + List createOnly = new ArrayList<>(); + TreeMap> ordered = new TreeMap<>(); + + for (CalculatedFieldDefinition cf : cfs) { + if (cf.getReprocessingOrder() == null || cf.getReprocessingOrder() < 0) { + createOnly.add(cf); + } else { + ordered.computeIfAbsent(cf.getReprocessingOrder(), integer -> new ArrayList<>()).add(cf); + } + } + + createOnly.forEach(cf -> ctx.register(createCalculatedField(cf, ctx))); + + for (Map.Entry> entry : ordered.entrySet()) { + List cfDefs = entry.getValue(); + for (CalculatedFieldDefinition cfDef : cfDefs) { + CalculatedField calculatedField = createCalculatedField(cfDef, ctx); + ctx.register(calculatedField); + } + } + } + + private CalculatedField createCalculatedField(CalculatedField cf, SolutionInstallContext ctx) { + cf.setId(null); + cf.setCreatedTime(0L); + cf.setTenantId(ctx.getTenantId()); + cf.setDebugSettings(new DebugSettings(true, System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(15))); + + Map realIds = ctx.getRealIds(); + + EntityId entityId = cf.getEntityId(); + if (entityId != null) { + String newEntityId = realIds.get(entityId.getId().toString()); + if (newEntityId != null) { + cf.setEntityId(EntityIdFactory.getByTypeAndUuid(entityId.getEntityType(), newEntityId)); + } else { + log.error("[{}] Calculated field: {} references non existing entity.", ctx.getTenantId(), cf.getName()); + throw new RuntimeException("Calculated field: " + cf.getName() + " references non existing entity."); + } + } + if (cf.getConfiguration() instanceof BaseCalculatedFieldConfiguration baseCfg) { + baseCfg.getArguments().forEach((key, argument) -> { + EntityId refEntityId = argument.getRefEntityId(); + if (refEntityId != null) { + if (refEntityId.getEntityType() == EntityType.TENANT) { + argument.setRefEntityId(ctx.getTenantId()); + } else { + String newId = realIds.get(refEntityId.getId().toString()); + if (newId != null) { + argument.setRefEntityId(EntityIdFactory.getByTypeAndUuid(refEntityId.getEntityType(), newId)); + } else { + log.error("[{}] Calculated field: {} references non existing entity.", ctx.getTenantId(), cf.getName()); + throw new RuntimeException("Calculated field: " + cf.getName() + " references non existing entity."); + } + } + } + }); + } + + CalculatedField calculatedField = new CalculatedField(cf); + return calculatedFieldService.save(calculatedField); + } + + private void provisionTenantDetails(SolutionInstallContext ctx) { + TenantDefinition tenant = loadEntityIfFileExists(ctx.getTempDir(), "tenant.json", TenantDefinition.class); + if (tenant != null) { + saveServerSideAttributes(ctx, ctx.getTenantId(), tenant.getAttributes()); + ctx.put(ctx.getTenantId(), tenant.getRelations()); + } + } + + private void registerEmulatorsAndComputeOldestTelemetryTs(SolutionInstallContext ctx) { + List emulatorDefinitions = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "device_emulators.json", new TypeReference<>() { + }); + Map deviceEmulators = emulatorDefinitions.stream().collect(Collectors.toMap(EmulatorDefinition::getName, Function.identity())); + emulatorDefinitions.stream().filter(ed -> StringUtils.isNotEmpty(ed.getExtendz())) + .forEach(ed -> { + EmulatorDefinition parent = deviceEmulators.get(ed.getExtendz()); + if (parent != null) { + ed.enrich(parent); + } + }); + Map assetEmulators = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "asset_emulators.json", new TypeReference>() { + }).stream().collect(Collectors.toMap(EmulatorDefinition::getName, Function.identity())); + + ctx.setDeviceEmulators(deviceEmulators); + ctx.setAssetEmulators(assetEmulators); + + long solutionInstallTs = ctx.getInstallTs(); + long oldestDeviceEmulatorsTs = deviceEmulators.values().stream() + .mapToLong(value -> value.getOldestTs(solutionInstallTs)) + .min().orElse(solutionInstallTs); + long oldestAssetEmulatorsTs = assetEmulators.values().stream() + .mapToLong(value -> value.getOldestTs(solutionInstallTs)) + .min().orElse(solutionInstallTs); + long solutionOldestTs = Math.min(oldestDeviceEmulatorsTs, oldestAssetEmulatorsTs); + + ctx.setOldestTelemetryTs(solutionOldestTs); + } + + private Set> launchEmulators(SolutionInstallContext ctx, Map devicesMap, Map assets) throws Exception { + Set> results = new HashSet<>(); + + for (var entry : devicesMap.entrySet().stream().filter(e -> StringUtils.isNotBlank(e.getValue().getEmulator())).collect(Collectors.toSet())) { + results.add(DeviceEmulatorLauncher.builder() + .entity(entry.getKey()) + .emulatorDefinition(ctx.getDeviceEmulators().get(entry.getValue().getEmulator())) + .oldTelemetryExecutor(emulatorExecutor) + .tbClusterService(tbClusterService) + .partitionService(partitionService) + .tbQueueProducerProvider(tbQueueProducerProvider) + .serviceInfoProvider(serviceInfoProvider) + .tsSubService(tsSubService) + .build().launch()); + } + + for (var entry : assets.entrySet().stream().filter(e -> StringUtils.isNotBlank(e.getValue().getEmulator())).collect(Collectors.toSet())) { + results.add(AssetEmulatorLauncher.builder() + .entity(entry.getKey()) + .emulatorDefinition(ctx.getAssetEmulators().get(entry.getValue().getEmulator())) + .oldTelemetryExecutor(emulatorExecutor) + .tbClusterService(tbClusterService) + .partitionService(partitionService) + .tbQueueProducerProvider(tbQueueProducerProvider) + .serviceInfoProvider(serviceInfoProvider) + .tsSubService(tsSubService) + .build().launch()); + } + + return results; + } + + private void waitForTelemetryCompletion(Set> futures) throws InterruptedException { + CompletableFuture all = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])); + try { + all.get(); + Thread.sleep(futures.size() * 100L); + } catch (ExecutionException e) { + throw new RuntimeException("Telemetry processing failed", e.getCause()); + } + } + + private void provisionDashboards(SolutionInstallContext ctx) { + List dashboardDefs = loadListOfEntitiesIfFileExists(ctx.getTempDir(), "dashboards.json", new TypeReference<>() {}); + for (DashboardDefinition entityDef : dashboardDefs) { + CustomerId customerId = entityDef.isMakePublic() ? getPublicCustomerId(ctx) : ctx.getIdFromMap(EntityType.CUSTOMER, entityDef.getCustomer()); + Path dashboardPath = ctx.getTempDir().resolve("dashboards").resolve(entityDef.getFile()); + if (!Files.exists(dashboardPath)) { + log.warn("[{}] Dashboard file not found: {}", ctx.getTenantId(), entityDef.getFile()); + continue; + } + JsonNode dashboardJson = replaceIds(ctx, JacksonUtil.toJsonNode(dashboardPath)); + Dashboard dashboardTemplate = JacksonUtil.treeToValue(dashboardJson, Dashboard.class); + + Dashboard dashboard = new Dashboard(); + dashboard.setTenantId(ctx.getTenantId()); + dashboard.setTitle(entityDef.getName()); + dashboard.setConfiguration(dashboardTemplate.getConfiguration()); + dashboard.setImage(dashboardTemplate.getImage()); + dashboard.setResources(dashboardTemplate.getResources()); + if (dashboardJson.has("mobileHide") && dashboardJson.get("mobileHide").isBoolean()) { + dashboard.setMobileHide(dashboardJson.get("mobileHide").asBoolean()); + } + if (dashboardJson.has("mobileOrder") && dashboardJson.get("mobileOrder").isInt()) { + dashboard.setMobileOrder(dashboardJson.get("mobileOrder").asInt()); + } + + dashboard = dashboardService.saveDashboard(dashboard); + if (customerId != null) { + dashboardService.assignDashboardToCustomer(ctx.getTenantId(), dashboard.getId(), customerId); + } + ctx.register(entityDef, dashboard); + ctx.putIdToMap(EntityType.DASHBOARD, entityDef.getName(), dashboard.getId()); + + if (entityDef.isMain()) { + ctx.getSolutionInstructions().setDashboardId(dashboard.getId()); + ctx.getSolutionInstructions().setMainDashboardPublic(entityDef.isMakePublic()); + } + ctx.getDashboardLinks().add(new DashboardLinkInfo(dashboard.getTitle(), dashboard.getId(), entityDef.isMakePublic())); + + log.debug("[{}] Dashboard provisioned: {}", ctx.getTenantId(), dashboard.getTitle()); + } + } + + private void provisionRelations(SolutionInstallContext ctx) { + for (var entry : ctx.getRelationDefinitions().entrySet()) { + EntityId entityId = entry.getKey(); + for (RelationDefinition relationDef : entry.getValue()) { + EntityId targetId = resolveRelatedEntityId(ctx, relationDef); + if (targetId == null) { + log.warn("[{}] Relation target not found: {} '{}'", ctx.getTenantId(), relationDef.getEntityType(), relationDef.getEntityName()); + continue; + } + EntityRelation relation = new EntityRelation(); + if (relationDef.getDirection() == EntitySearchDirection.FROM) { + relation.setFrom(entityId); + relation.setTo(targetId); + } else { + relation.setFrom(targetId); + relation.setTo(entityId); + } + relation.setType(relationDef.getType()); + relation.setTypeGroup(RelationTypeGroup.COMMON); + relationService.saveRelation(ctx.getTenantId(), relation); + } + } + } + + private EntityId resolveRelatedEntityId(SolutionInstallContext ctx, RelationDefinition relationDef) { + if (relationDef.getEntityType() == EntityType.TENANT) { + return ctx.getTenantId(); + } + return ctx.getIdFromMap(relationDef.getEntityType(), relationDef.getEntityName()); + } + + private String prepareInstructions(SolutionInstallContext ctx, HttpServletRequest request) { + Path instructionsFile = ctx.getTempDir().resolve("instructions.md"); + if (!Files.exists(instructionsFile)) { + return null; + } + String template; + try { + template = Files.readString(instructionsFile); + } catch (IOException e) { + log.warn("[{}] Failed to read instructions.md", ctx.getTenantId(), e); + return null; + } + + String baseUrl = systemSecurityService.getBaseUrl(ctx.getTenantId(), null, request); + + // Inject edge instructions first, then run the full replacement logic on the combined string + if (template.contains("${edge_instructions}")) { + if (ctx.getCreatedEdges().isEmpty()) { + template = template.replace("${edge_instructions}", ""); + } else { + Path edgeFile = ctx.getTempDir().resolve("edge_instructions.md"); + String edgeTemplate = Files.exists(edgeFile) ? readFileContent(edgeFile) : ""; + template = template.replace("${edge_instructions}", edgeTemplate); + } + } + + template = template.replace("${DOCS_BASE_URL}", docsBaseUrl); + template = template.replace("${BASE_URL}", baseUrl); + + TenantSolutionTemplateInstructions solutionInstructions = ctx.getSolutionInstructions(); + + if (solutionInstructions.getDashboardId() != null) { + template = template.replace("${MAIN_DASHBOARD_URL}", + getDashboardLink(solutionInstructions, solutionInstructions.getDashboardId(), false)); + if (solutionInstructions.isMainDashboardPublic()) { + template = template.replace("${MAIN_DASHBOARD_PUBLIC_URL}", + getDashboardLink(solutionInstructions, solutionInstructions.getDashboardId(), true)); + } + } + + for (DashboardLinkInfo dashboardLinkInfo : ctx.getDashboardLinks()) { + template = template.replace("${" + dashboardLinkInfo.getName() + "DASHBOARD_URL}", + getDashboardLink(solutionInstructions, dashboardLinkInfo.getDashboardId(), false)); + if (dashboardLinkInfo.isPublic()) { + template = template.replace("${" + dashboardLinkInfo.getName() + "DASHBOARD_PUBLIC_URL}", + getDashboardLink(solutionInstructions, dashboardLinkInfo.getDashboardId(), true)); + } + } + + if (template.contains("${GATEWAYS_URL}")) { + template = template.replace("${GATEWAYS_URL}", "/gateways"); + } + + // Device list and credentials + StringBuilder devList = new StringBuilder(); + devList.append("| Device name | Access token | Owner |"); + devList.append(System.lineSeparator()); + devList.append("| :--- | :--- | :--- |"); + devList.append(System.lineSeparator()); + + for (DeviceCredentialsInfo credentialsInfo : ctx.getCreatedDevices().values()) { + devList.append("|").append(credentialsInfo.getName()) + .append("|").append(credentialsInfo.getCredentials().getCredentialsId()).append("{:copy-code}") + .append("|").append(credentialsInfo.getCustomerName() != null ? credentialsInfo.getCustomerName() : "Tenant"); + devList.append(System.lineSeparator()); + + template = template.replace("${" + credentialsInfo.getName() + "ACCESS_TOKEN}", credentialsInfo.getCredentials().getCredentialsId()); + } + + template = template.replace("${device_list_and_credentials}", devList.toString()); + + // User list (without user group column) + StringBuilder userList = new StringBuilder(); + userList.append("| Name | Login | Password | Customer name |"); + userList.append(System.lineSeparator()); + userList.append("| :--- | :--- | :--- | :--- |"); + userList.append(System.lineSeparator()); + + for (UserCredentialsInfo credentialsInfo : ctx.getCreatedUsers().values()) { + userList.append("|").append(credentialsInfo.getName()) + .append("|").append(credentialsInfo.getLogin()).append("{:copy-code}") + .append("|").append(credentialsInfo.getPassword()).append("{:copy-code}") + .append("|").append(credentialsInfo.getCustomerName() != null ? credentialsInfo.getCustomerName() : ""); + userList.append(System.lineSeparator()); + } + + template = template.replace("${user_list}", userList.toString()); + + // Edge detail URLs + for (Map.Entry edgeLinkInfoEntry : ctx.getCreatedEdges().entrySet()) { + EdgeLinkInfo edgeLinkInfo = edgeLinkInfoEntry.getValue(); + StringBuilder edgeDetailsUrl = new StringBuilder(); + if (EntityType.CUSTOMER.equals(edgeLinkInfo.getOwnerId().getEntityType())) { + edgeDetailsUrl.append("/customers/").append(edgeLinkInfo.getOwnerId().getId()); + edgeDetailsUrl.append("/edgeInstances/").append(edgeLinkInfo.getEdgeId().getId()); + } else { + edgeDetailsUrl.append("/edgeManagement/instances/").append(edgeLinkInfo.getEdgeId().getId()); + } + String edgeName = edgeLinkInfoEntry.getKey(); + String edgeDetailsPlaceholder = "${" + edgeName + "EDGE_DETAILS_URL}"; + template = template.replace(edgeDetailsPlaceholder, edgeDetailsUrl.toString()); + } + + template = replaceAlarmRules(ctx, template); + template = replaceCalculatedFields(ctx, template); + template = replaceCreatedEntities(ctx, template); + + return template; + } + + private static String replaceAlarmRules(SolutionInstallContext ctx, String template) { + StringBuilder alarmRules = new StringBuilder(); + + alarmRules.append("| Entity Profile Name | Alarm Type | Severities |").append(System.lineSeparator()); + alarmRules.append("| :--- | :--- | :--- |").append(System.lineSeparator()); + + ctx.getCreatedAlarmRules().entrySet().stream() + .sorted(Map.Entry.comparingByValue(Comparator.comparing(CreatedAlarmRuleInfo::entityName, String.CASE_INSENSITIVE_ORDER) + .thenComparing(CreatedAlarmRuleInfo::alarmType, String.CASE_INSENSITIVE_ORDER))) + .forEach(entry -> { + UUID key = entry.getKey(); + var alarmRuleInfo = entry.getValue(); + + String alarmType = alarmRuleInfo.alarmType(); + String link = alarmRuleInfo.getCfPageLink(key); + + String alarmTypeWithLink = "" + alarmType + ""; + + String profileName = alarmRuleInfo.entityId() != null ? + "" + alarmRuleInfo.entityName() + "" + : alarmRuleInfo.entityName(); + + alarmRules.append("|") + .append(profileName).append("|") + .append(alarmTypeWithLink).append("|") + .append(alarmRuleInfo.severities()).append("|") + .append(System.lineSeparator()); + }); + + return template.replace("${alarm_rules}", alarmRules.toString()); + } + + private static String replaceCalculatedFields(SolutionInstallContext ctx, String template) { + StringBuilder calculatedFields = new StringBuilder(); + + calculatedFields.append("| Entity Profile Name | Field Name | Field Type |").append(System.lineSeparator()); + calculatedFields.append("| :--- | :--- | :--- |").append(System.lineSeparator()); + + ctx.getCreatedCalculatedFields().entrySet().stream() + .sorted(Map.Entry.comparingByValue( + Comparator.comparing(CreatedCalculatedFieldInfo::entityName, String.CASE_INSENSITIVE_ORDER) + .thenComparing(CreatedCalculatedFieldInfo::name, String.CASE_INSENSITIVE_ORDER) + )) + .forEach(entry -> { + UUID key = entry.getKey(); + var cfInfo = entry.getValue(); + + String cfTitle = cfInfo.name(); + String link = cfInfo.getCfPageLink(key); + + String cfTitleWithLink = "" + cfTitle + ""; + + String profileName = cfInfo.entityId() != null ? + "" + cfInfo.entityName() + "" + : cfInfo.entityName(); + + calculatedFields.append("|") + .append(profileName).append("|") + .append(cfTitleWithLink).append("|") + .append(cfInfo.type()).append("|") + .append(System.lineSeparator()); + }); + + return template.replace("${calculated_fields}", calculatedFields.toString()); + } + + private static String replaceCreatedEntities(SolutionInstallContext ctx, String template) { + StringBuilder entityList = new StringBuilder(); + + entityList.append("| Name | Type | Owner |").append(System.lineSeparator()); + entityList.append("| :--- | :--- | :--- |").append(System.lineSeparator()); + + for (Map.Entry entry : ctx.getCreatedEntities().entrySet()) { + UUID key = entry.getKey(); + var entityInfo = entry.getValue(); + String link = entityInfo.getEntityPageLink(key); + String entityName = entityInfo.getName(); + + String name = link != null ? + "" + entityName + "" + : entityName; + + entityList.append("|") + .append(name).append("|") + .append(entityInfo.getType().getNormalName()).append("|") + .append(entityInfo.getOwner()).append("|") + .append(System.lineSeparator()); + } + return template.replace("${all_entities}", entityList.toString()); + } + + private RandomNameData generateRandomName(SolutionInstallContext ctx) { + int i = 0; + while (i < 10) { + var randomName = RandomNameUtil.next(); + var user = userService.findUserByEmail(ctx.getTenantId(), randomName.getEmail()); + if (user == null) { + return randomName; + } else { + i++; + } + } + String firstName = StringUtils.randomAlphanumeric(5); + String lastName = StringUtils.randomAlphanumeric(5); + return new RandomNameData(firstName, lastName, firstName + "." + lastName + "@thingsboard.io"); + } + + private String randomize(String src, RandomNameData name) { + return randomize(src, name, null); + } + + private String randomize(String src, RandomNameData name, RandomNameData customer) { + if (src == null) { + return null; + } else { + String result = src + .replace("$randomFirstName", name.getFirstName()) + .replace("$randomLastName", name.getLastName()) + .replace("$randomEmail", name.getEmail()); + if (customer != null) { + result = result + .replace("$customerFirstName", customer.getFirstName()) + .replace("$customerLastName", customer.getLastName()) + .replace("$customerEmail", customer.getEmail()); + } + return result.replace("$random", StringUtils.randomAlphanumeric(10).toLowerCase()); + } + } + + private void saveServerSideAttributes(SolutionInstallContext ctx, EntityId entityId, JsonNode attributes) { + saveServerSideAttributes(ctx, entityId, attributes, null); + } + + private void saveServerSideAttributes(SolutionInstallContext ctx, EntityId entityId, JsonNode attributes, RandomNameData randomNameData) { + saveAttributes(ctx, entityId, attributes, randomNameData, AttributeScope.SERVER_SCOPE); + } + + private void saveSharedAttributes(SolutionInstallContext ctx, EntityId entityId, JsonNode attributes) { + if (!EntityType.DEVICE.equals(entityId.getEntityType())) { + throw new IllegalArgumentException(entityId.getEntityType() + " cannot have shared attributes."); + } + saveAttributes(ctx, entityId, attributes, null, AttributeScope.SHARED_SCOPE); + } + + private void saveAttributes(SolutionInstallContext ctx, EntityId entityId, JsonNode attributes, RandomNameData randomNameData, AttributeScope attributeScope) { + if (attributes != null && !attributes.isNull() && !attributes.isEmpty()) { + attributes = prepareAttributes(attributes); + log.info("[{}] Saving attributes: {}", entityId, attributes); + if (randomNameData != null) { + attributes = JacksonUtil.toJsonNode(randomize(JacksonUtil.toString(attributes), randomNameData, null)); + } + attributesService.save(ctx.getTenantId(), entityId, attributeScope, + new ArrayList<>(JsonConverter.convertToAttributes(JsonParser.parseString(JacksonUtil.toString(attributes)), ctx.getOldestTelemetryTs()))); + } + } + + private JsonNode prepareAttributes(JsonNode attributes) { + ObjectNode attributesObj = (ObjectNode) attributes; + attributes.fields().forEachRemaining(entry -> { + JsonNode value = entry.getValue(); + if (value.isTextual() && isTimeExpression(value.asText())) { + value = JacksonUtil.toJsonNode(parseTimeExpression(value.asText())); + } + attributesObj.set(entry.getKey(), value); + }); + return attributesObj; + } + + private boolean isTimeExpression(String text) { + return Pattern.matches("\\$\\{currentTime(?:([+-])(\\d+)([mwdh]|min))?}", text); + } + + private String parseTimeExpression(String timeExpression) { + Matcher matcher = Pattern.compile("\\$\\{currentTime(?:([+-])(\\d+)([mwdh]|min))?}").matcher(timeExpression); + + if (!matcher.matches()) { + return timeExpression; + } + + String operator = matcher.group(1); + String amountStr = matcher.group(2); + String unit = matcher.group(3); + + ZonedDateTime now = ZonedDateTime.now(); + + if (operator != null && amountStr != null && unit != null) { + int amount = Integer.parseInt(amountStr); + now = switch (unit) { + case "m" -> operator.equals("+") ? now.plusMonths(amount) : now.minusMonths(amount); + case "w" -> operator.equals("+") ? now.plusWeeks(amount) : now.minusWeeks(amount); + case "d" -> operator.equals("+") ? now.plusDays(amount) : now.minusDays(amount); + case "h" -> operator.equals("+") ? now.plusHours(amount) : now.minusHours(amount); + case "min" -> operator.equals("+") ? now.plusMinutes(amount) : now.minusMinutes(amount); + default -> now; + }; + } + + return String.valueOf(now.toInstant().toEpochMilli()); + } + + private String getDashboardLink(TenantSolutionTemplateInstructions solutionInstructions, DashboardId dashboardId, boolean isPublic) { + if (isPublic && solutionInstructions.getPublicId() != null) { + return "/dashboard/" + dashboardId.getId() + "?publicId=" + solutionInstructions.getPublicId(); + } + return "/dashboards/" + dashboardId.getId(); + } + + private void rollback(TenantId tenantId, SolutionInstallContext ctx, Throwable e) { + List createdEntities = ctx.getCreatedEntitiesList(); + Collections.reverse(createdEntities); + for (EntityId entityId : createdEntities) { + try { + deleteEntity(tenantId, entityId, ctx.getUser()); + } catch (RuntimeException re) { + log.error("[{}] Failed to delete the entity: {}", tenantId, entityId, re); + } + } + ctx.getSolutionInstructions().setDetails(e.getMessage()); + } + + private void deleteEntity(TenantId tenantId, EntityId entityId, SecurityUser user) { + try { + List alarmIds = alarmService.findAlarms(tenantId, new AlarmQuery(entityId, new TimePageLink(Integer.MAX_VALUE), null, null, null, false)) + .getData().stream().map(AlarmInfo::getId).collect(Collectors.toList()); + Set typesToRemove = new HashSet<>(); + alarmIds.forEach(alarmId -> { + var result = alarmService.delAlarm(tenantId, alarmId, false); + if (result.isSuccessful()) { + typesToRemove.add(result.getAlarm().getType()); + } + }); + alarmService.delAlarmTypes(tenantId, typesToRemove); + } catch (Exception e) { + log.error("[{}] Failed to delete alarms for entity", entityId.getId(), e); + } + switch (entityId.getEntityType()) { + case CALCULATED_FIELD: + CalculatedField cf = calculatedFieldService.findById(tenantId, new CalculatedFieldId(entityId.getId())); + if (cf != null) { + tbCalculatedFieldService.delete(cf, user); + } + break; + case RULE_CHAIN: + ruleChainService.deleteRuleChainById(tenantId, new RuleChainId(entityId.getId())); + break; + case DEVICE: + Device device = deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId())); + if (device != null) { + tbDeviceService.delete(device, user); + } + break; + case DEVICE_PROFILE: + deviceProfileService.deleteDeviceProfile(tenantId, new DeviceProfileId(entityId.getId())); + break; + case ASSET: + Asset asset = assetService.findAssetById(tenantId, new AssetId(entityId.getId())); + if (asset != null) { + tbAssetService.delete(asset, user); + } + break; + case ASSET_PROFILE: + assetProfileService.deleteAssetProfile(tenantId, new AssetProfileId(entityId.getId())); + break; + case CUSTOMER: + customerService.deleteCustomer(tenantId, new CustomerId(entityId.getId())); + break; + case USER: + User userToDelete = userService.findUserById(tenantId, new UserId(entityId.getId())); + if (userToDelete != null) { + userService.deleteUser(tenantId, userToDelete); + } + break; + case EDGE: + Edge edge = edgeService.findEdgeById(tenantId, new EdgeId(entityId.getId())); + if (edge != null) { + tbEdgeService.delete(edge, user); + } + break; + case DASHBOARD: + dashboardService.deleteDashboard(tenantId, new DashboardId(entityId.getId())); + break; + default: + log.warn("[{}] Unsupported entity type for deletion: {}", tenantId, entityId.getEntityType()); + } + } + + private JsonNode replaceIds(SolutionInstallContext ctx, JsonNode json) { + String jsonStr = JacksonUtil.toString(json); + for (var e : ctx.getRealIds().entrySet()) { + jsonStr = jsonStr.replace(e.getKey(), e.getValue()); + } + return JacksonUtil.toJsonNode(jsonStr); + } + + private String readFileContent(Path path) { + try { + return Files.readString(path); + } catch (IOException e) { + log.warn("Failed to read file: {}", path, e); + return ""; + } + } + + private T loadEntityIfFileExists(Path tempDir, String fileName, Class clazz) { + Path filePath = tempDir.resolve("entities").resolve(fileName); + if (Files.exists(filePath)) { + return JacksonUtil.readValue(filePath.toFile(), clazz); + } else { + return null; + } + } + + private List loadListOfEntitiesIfFileExists(Path tempDir, String fileName, TypeReference> typeReference) { + Path filePath = tempDir.resolve("entities").resolve(fileName); + if (Files.exists(filePath)) { + try { + return JacksonUtil.readValue(filePath.toFile(), typeReference); + } catch (Exception e) { + throw new IllegalArgumentException("Invalid json file " + fileName + " data structure", e); + } + } else { + return new ArrayList<>(); + } + } + + private List loadListOfEntitiesFromDirectory(Path tempDir, String dirName, Class clazz) { + Path dirPath = tempDir.resolve(dirName); + if (Files.exists(dirPath) && Files.isDirectory(dirPath)) { + List result = new ArrayList<>(); + try { + for (Path filePath : Files.list(dirPath).collect(Collectors.toList())) { + try { + result.add(JacksonUtil.readValue(filePath.toFile(), clazz)); + } catch (Exception e) { + throw new IllegalArgumentException("Invalid json file " + filePath.getFileName() + " data structure", e); + } + } + } catch (IOException e) { + log.warn("Failed to read directory: {}", dirName, e); + throw new RuntimeException(e); + } + return result; + } else { + return new ArrayList<>(); + } + } + + private static void extractZip(byte[] zipData, Path destDir) throws IOException { + try (ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(zipData))) { + ZipEntry entry; + while ((entry = zis.getNextEntry()) != null) { + Path entryPath = destDir.resolve(entry.getName()).normalize(); + if (!entryPath.startsWith(destDir)) { + throw new IOException("ZIP entry outside of target directory: " + entry.getName()); + } + if (entry.isDirectory()) { + Files.createDirectories(entryPath); + } else { + Files.createDirectories(entryPath.getParent()); + Files.write(entryPath, zis.readAllBytes()); + } + zis.closeEntry(); + } + } + } + + private static void deleteDirectory(Path dir) { + try { + Files.walkFileTree(dir, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path d, IOException exc) throws IOException { + Files.delete(d); + return FileVisitResult.CONTINUE; + } + }); + } catch (IOException e) { + log.warn("Failed to clean up temp directory: {}", dir, e); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/SolutionService.java b/application/src/main/java/org/thingsboard/server/service/solutions/SolutionService.java new file mode 100644 index 0000000000..312376cc7c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/SolutionService.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2026 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.service.solutions; + +import jakarta.servlet.http.HttpServletRequest; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.service.solutions.data.solution.SolutionInstallResponse; + +import java.util.List; + +public interface SolutionService { + + SolutionInstallResponse installSolution(SecurityUser user, TenantId tenantId, byte[] zipData, HttpServletRequest request) throws Exception; + + void deleteSolution(TenantId tenantId, List createdEntityIds, SecurityUser user); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedAlarmRuleInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedAlarmRuleInfo.java new file mode 100644 index 0000000000..90e5fc9f66 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedAlarmRuleInfo.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.UUID; + +public record CreatedAlarmRuleInfo(EntityId entityId, String entityName, String alarmType, String severities) { + + public String getCfPageLink(UUID cfId) { + return "/alarms/alarm-rules/" + cfId; + } + + public String getEntityPageLink() { + if (entityId == null) { + return null; + } + return switch (entityId.getEntityType()) { + case DEVICE_PROFILE -> "/profiles/deviceProfiles/" + entityId.getId(); + case ASSET_PROFILE -> "/profiles/assetProfiles/" + entityId.getId(); + default -> null; + }; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedCalculatedFieldInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedCalculatedFieldInfo.java new file mode 100644 index 0000000000..9616d738af --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedCalculatedFieldInfo.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.UUID; + +public record CreatedCalculatedFieldInfo(EntityId entityId, String entityName, String type, String name) { + + public String getCfPageLink(UUID cfId) { + return "/calculatedFields/" + cfId; + } + + public String getEntityPageLink() { + if (entityId == null) { + return null; + } + return switch (entityId.getEntityType()) { + case DEVICE_PROFILE -> "/profiles/deviceProfiles/" + entityId.getId(); + case ASSET_PROFILE -> "/profiles/assetProfiles/" + entityId.getId(); + default -> null; + }; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedEntityInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedEntityInfo.java new file mode 100644 index 0000000000..53105a6e31 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/CreatedEntityInfo.java @@ -0,0 +1,49 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +import java.util.UUID; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CreatedEntityInfo { + + private String name; + private EntityType type; + private String owner; + + public String getEntityPageLink(UUID id) { + return switch (type) { + case CUSTOMER -> "/customers/" + id; + case USER -> "/users/" + id; + case ASSET -> "/entities/assets/" + id; + case DEVICE -> "/entities/devices/" + id; + case DEVICE_PROFILE -> "/profiles/deviceProfiles/" + id; + case ASSET_PROFILE -> "/profiles/assetProfiles/" + id; + case DASHBOARD -> "/dashboards/" + id; + case RULE_CHAIN -> "/ruleChains/" + id; + case EDGE -> "/edgeManagement/instances/" + id; + default -> null; + }; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/DashboardLinkInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/DashboardLinkInfo.java new file mode 100644 index 0000000000..63eb0e3757 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/DashboardLinkInfo.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.Data; +import org.thingsboard.server.common.data.id.DashboardId; + +@Data +public class DashboardLinkInfo { + + private final String name; + private final DashboardId dashboardId; + private final boolean isPublic; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/DeviceCredentialsInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/DeviceCredentialsInfo.java new file mode 100644 index 0000000000..e93104729c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/DeviceCredentialsInfo.java @@ -0,0 +1,30 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.Data; +import org.thingsboard.server.common.data.security.DeviceCredentials; + +@Data +public class DeviceCredentialsInfo { + + String name; + String type; + DeviceCredentials credentials; + String customerName; + boolean gateway; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/EdgeLinkInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/EdgeLinkInfo.java new file mode 100644 index 0000000000..e5f057636d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/EdgeLinkInfo.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.Data; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.EntityId; + +@Data +public class EdgeLinkInfo { + + private final EdgeId edgeId; + private final EntityId ownerId; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java new file mode 100644 index 0000000000..6ba950571c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/SolutionInstallContext.java @@ -0,0 +1,208 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.Data; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.DeviceProfile; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.StringUtils; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.asset.AssetProfile; +import org.thingsboard.server.common.data.cf.CalculatedField; +import org.thingsboard.server.common.data.edge.Edge; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.service.security.model.SecurityUser; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.service.solutions.data.definition.AssetDefinition; +import org.thingsboard.server.service.solutions.data.definition.AssetProfileDefinition; +import org.thingsboard.server.service.solutions.data.definition.CustomerDefinition; +import org.thingsboard.server.service.solutions.data.definition.DashboardDefinition; +import org.thingsboard.server.service.solutions.data.definition.DeviceDefinition; +import org.thingsboard.server.service.solutions.data.definition.EdgeDefinition; +import org.thingsboard.server.service.solutions.data.definition.DeviceProfileDefinition; +import org.thingsboard.server.service.solutions.data.definition.EntityDefinition; +import org.thingsboard.server.service.solutions.data.definition.EntitySearchKey; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.solutions.data.definition.RelationDefinition; +import org.thingsboard.server.service.solutions.data.solution.TenantSolutionTemplateInstructions; + +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Data +public class SolutionInstallContext { + + private final TenantId tenantId; + private final Path tempDir; + private final SecurityUser user; + private final TenantSolutionTemplateInstructions solutionInstructions; + private final List createdEntitiesList = new ArrayList<>(); + private final Map realIds = new HashMap<>(); + private final Map entityIdMap = new HashMap<>(); + private final Map> relationDefinitions = new LinkedHashMap<>(); + private final List dashboardLinks = new ArrayList<>(); + + // For instructions + private final Map createdDevices = new LinkedHashMap<>(); + private final Map createdUsers = new LinkedHashMap<>(); + private final Map createdEdges = new LinkedHashMap<>(); + private final Map createdEntities = new LinkedHashMap<>(); + private final Map createdAlarmRules = new LinkedHashMap<>(); + private final Map createdCalculatedFields = new LinkedHashMap<>(); + private final long installTs; + private long oldestTelemetryTs; + private Map deviceEmulators; + private Map assetEmulators; + + public SolutionInstallContext(TenantId tenantId, Path tempDir, SecurityUser user) { + this.tenantId = tenantId; + this.tempDir = tempDir; + this.user = user; + this.solutionInstructions = new TenantSolutionTemplateInstructions(); + this.installTs = System.currentTimeMillis(); + put(new EntitySearchKey(tenantId, EntityType.TENANT, null), tenantId); + } + + public void registerReferenceOnly(String referenceId, EntityId entityId) { + if (!StringUtils.isEmpty(referenceId)) { + realIds.put(referenceId, entityId.getId().toString()); + } + } + + public void register(String referenceId, EntityId entityId) { + registerReferenceOnly(referenceId, entityId); + register(entityId); + } + + public void register(EntityId entityId) { + createdEntitiesList.add(entityId); + } + + public void register(String referenceId, RuleChain ruleChain) { + register(referenceId, ruleChain.getId()); + createdEntities.put(ruleChain.getUuidId(), new CreatedEntityInfo(ruleChain.getName(), EntityType.RULE_CHAIN, "Tenant")); + } + + public void register(DeviceProfileDefinition definition, DeviceProfile deviceProfile) { + register(definition.getJsonId(), deviceProfile.getId()); + createdEntities.put(deviceProfile.getUuidId(), new CreatedEntityInfo(deviceProfile.getName(), EntityType.DEVICE_PROFILE, "Tenant")); + } + + public void register(AssetProfileDefinition definition, AssetProfile assetProfile) { + register(definition.getJsonId(), assetProfile.getId()); + createdEntities.put(assetProfile.getUuidId(), new CreatedEntityInfo(assetProfile.getName(), EntityType.ASSET_PROFILE, "Tenant")); + } + + public void register(AssetDefinition definition, Asset asset) { + register(definition.getJsonId(), asset.getId()); + createdEntities.put(asset.getUuidId(), new CreatedEntityInfo(asset.getName(), EntityType.ASSET, + StringUtils.isEmpty(definition.getCustomer()) ? "Tenant" : definition.getCustomer())); + } + + public void register(DeviceDefinition definition, Device device) { + register(definition.getJsonId(), device.getId()); + createdEntities.put(device.getUuidId(), new CreatedEntityInfo(device.getName(), EntityType.DEVICE, + StringUtils.isEmpty(definition.getCustomer()) ? "Tenant" : definition.getCustomer())); + } + + public void register(CustomerDefinition definition, Customer customer) { + register(definition.getJsonId(), customer.getId()); + createdEntities.put(customer.getUuidId(), new CreatedEntityInfo(customer.getName(), EntityType.CUSTOMER, "Tenant")); + } + + public void register(CustomerDefinition customerDef, User user) { + register((String) null, user.getId()); + createdEntities.put(user.getUuidId(), new CreatedEntityInfo(user.getName(), EntityType.USER, + StringUtils.isEmpty(customerDef.getName()) ? "Tenant" : customerDef.getName())); + } + + public void register(EdgeDefinition definition, Edge edge) { + register(definition.getJsonId(), edge.getId()); + createdEntities.put(edge.getUuidId(), new CreatedEntityInfo(edge.getName(), EntityType.EDGE, + StringUtils.isEmpty(definition.getCustomer()) ? "Tenant" : definition.getCustomer())); + } + + public void register(DashboardDefinition definition, Dashboard dashboard) { + register(definition.getJsonId(), dashboard.getId()); + createdEntities.put(dashboard.getUuidId(), new CreatedEntityInfo(dashboard.getTitle(), EntityType.DASHBOARD, + StringUtils.isEmpty(definition.getCustomer()) ? "Tenant" : definition.getCustomer())); + } + + public void register(CalculatedField calculatedField) { + register(calculatedField.getId()); + EntityId entityId = calculatedField.getEntityId(); + CreatedEntityInfo entityInfo = createdEntities.get(entityId.getId()); + boolean alarmRule = false; // TODO: CE doesn't have ALARM calculated field type yet + if (entityInfo == null) { + String target = alarmRule ? "Alarm rule" : "Calculated field"; + throw new IllegalStateException("Failed to register " + target + " with name: " + + calculatedField.getName() + " for non-existing entity with id: " + entityId); + } + if (alarmRule) { + createdAlarmRules.put(calculatedField.getUuidId(), new CreatedAlarmRuleInfo(entityId, entityInfo.getName(), calculatedField.getName(), null)); + return; + } + createdCalculatedFields.put(calculatedField.getUuidId(), new CreatedCalculatedFieldInfo(entityId, entityInfo.getName(), calculatedField.getType().name(), calculatedField.getName())); + } + + public void putIdToMap(EntityDefinition entityDefinition, EntityId entityId) { + putIdToMap(entityDefinition.getEntityType(), entityDefinition.getName(), entityId); + } + + public void putIdToMap(EntityType entityType, String entityName, EntityId entityId) { + putIdToMap(tenantId, entityType, entityName, entityId); + } + + public void putIdToMap(EntityId ownerId, EntityType entityType, String entityName, EntityId entityId) { + put(new EntitySearchKey(ownerId, entityType, entityName), entityId); + } + + public void put(EntitySearchKey entitySearchKey, EntityId entityId) { + entityIdMap.put(entitySearchKey, entityId); + } + + @SuppressWarnings("unchecked") + public T getIdFromMap(EntityType entityType, String entityName) { + return (T) entityIdMap.get(new EntitySearchKey(tenantId, entityType, entityName)); + } + + public void put(EntityId entityId, List relations) { + relationDefinitions.put(entityId, relations); + } + + public void addDeviceCredentials(DeviceCredentialsInfo deviceCredentialsInfo) { + createdDevices.put(deviceCredentialsInfo.getName(), deviceCredentialsInfo); + } + + public void addUserCredentials(UserCredentialsInfo userCredentialsInfo) { + createdUsers.put(userCredentialsInfo.getName(), userCredentialsInfo); + } + + public void addEdgeLinkInfo(String edgeName, EdgeLinkInfo edgeLinkInfo) { + createdEdges.put(edgeName, edgeLinkInfo); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/UserCredentialsInfo.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/UserCredentialsInfo.java new file mode 100644 index 0000000000..d35900c5b4 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/UserCredentialsInfo.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data; + +import lombok.Data; + +@Data +public class UserCredentialsInfo { + + String name; + String login; + String password; + String customerName; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetDefinition.java new file mode 100644 index 0000000000..2554dbafb0 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetDefinition.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class AssetDefinition extends CustomerEntityDefinition { + + private String type; + private String label; + private String emulator; + + @Override + public EntityType getEntityType() { + return EntityType.ASSET; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetProfileDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetProfileDefinition.java new file mode 100644 index 0000000000..9f95294fa7 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/AssetProfileDefinition.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.thingsboard.server.common.data.asset.AssetProfile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class AssetProfileDefinition extends AssetProfile { + + private String jsonId; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/BaseEntityDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/BaseEntityDefinition.java new file mode 100644 index 0000000000..84ec880380 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/BaseEntityDefinition.java @@ -0,0 +1,48 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collections; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public abstract class BaseEntityDefinition implements EntityDefinition { + + @JsonProperty("name") + private String name; + @JsonProperty("attributes") + private JsonNode attributes; + @JsonProperty("sharedAttributes") + private JsonNode sharedAttributes; + @JsonProperty("relations") + private List relations = Collections.emptyList(); + @JsonProperty("jsonId") + private String jsonId; + + public void setRelations(List relations) { + if (relations != null) { + this.relations = relations; + } + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CalculatedFieldDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CalculatedFieldDefinition.java new file mode 100644 index 0000000000..1dcc7a6bbd --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CalculatedFieldDefinition.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.thingsboard.server.common.data.cf.CalculatedField; + +@Data +@EqualsAndHashCode(callSuper = true) +public class CalculatedFieldDefinition extends CalculatedField { + + private Integer reprocessingOrder; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerDefinition.java new file mode 100644 index 0000000000..3cc40c658c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerDefinition.java @@ -0,0 +1,55 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.service.solutions.data.names.RandomNameData; + +import java.util.Collections; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +public class CustomerDefinition extends BaseEntityDefinition { + + private String email; + private String country; + private String city; + private String state; + private String zip; + private String address; + private List users = Collections.emptyList(); + + @JsonIgnore + private RandomNameData randomNameData; + + @Override + public EntityType getEntityType() { + return EntityType.CUSTOMER; + } + + public void setUsers(List users) { + if (users != null) { + this.users = users; + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerEntityDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerEntityDefinition.java new file mode 100644 index 0000000000..d2da2f266c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/CustomerEntityDefinition.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class CustomerEntityDefinition extends BaseEntityDefinition { + + private String customer; + private boolean makePublic; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardDefinition.java new file mode 100644 index 0000000000..a5a9e9c22b --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardDefinition.java @@ -0,0 +1,38 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class DashboardDefinition extends CustomerEntityDefinition { + + private String file; + private boolean main; + + @Override + public EntityType getEntityType() { + return EntityType.DASHBOARD; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardUserDetailsDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardUserDetailsDefinition.java new file mode 100644 index 0000000000..2ec4701829 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DashboardUserDetailsDefinition.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; + +@Data +public class DashboardUserDetailsDefinition { + + private String name; + private boolean fullScreen; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceDefinition.java new file mode 100644 index 0000000000..81239c46dd --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceDefinition.java @@ -0,0 +1,41 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class DeviceDefinition extends CustomerEntityDefinition { + + private String type; + private String label; + private String emulator; + private JsonNode additionalInfo; + + @Override + public EntityType getEntityType() { + return EntityType.DEVICE; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceProfileDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceProfileDefinition.java new file mode 100644 index 0000000000..3dee5c179a --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/DeviceProfileDefinition.java @@ -0,0 +1,28 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.thingsboard.server.common.data.DeviceProfile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class DeviceProfileDefinition extends DeviceProfile { + + private String jsonId; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EdgeDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EdgeDefinition.java new file mode 100644 index 0000000000..33034c93e9 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EdgeDefinition.java @@ -0,0 +1,45 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +import java.util.Collections; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class EdgeDefinition extends CustomerEntityDefinition { + + private String type; + private String label; + private String rootRuleChainId; + private List ruleChainIds = Collections.emptyList(); + private List deviceIds = Collections.emptyList(); + private List assetIds = Collections.emptyList(); + + @Override + public EntityType getEntityType() { + return EntityType.EDGE; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EmulatorDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EmulatorDefinition.java new file mode 100644 index 0000000000..37c726e091 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EmulatorDefinition.java @@ -0,0 +1,64 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import org.thingsboard.server.common.data.StringUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Data +public class EmulatorDefinition { + private String name; + private String extendz; + private String clazz; + private int publishPeriodInDays; + private int publishFrequencyInSeconds; + private int publishPauseInMillis; + private long activityPeriodInMillis; + private List telemetryProfiles = Collections.emptyList(); + + public void enrich(EmulatorDefinition parent) { + if (StringUtils.isEmpty(clazz)) { + clazz = parent.getClazz(); + } + if (publishPeriodInDays == 0) { + publishPeriodInDays = parent.getPublishPeriodInDays(); + } + if (publishFrequencyInSeconds == 0) { + publishFrequencyInSeconds = parent.getPublishFrequencyInSeconds(); + } + if (publishPauseInMillis == 0) { + publishPauseInMillis = parent.getPublishPauseInMillis(); + } + if (activityPeriodInMillis == 0L) { + activityPeriodInMillis = parent.getActivityPeriodInMillis(); + } + var profilesMap = telemetryProfiles.stream().collect(Collectors.toMap(TelemetryProfile::getKey, Function.identity())); + parent.getTelemetryProfiles().forEach(tp -> profilesMap.putIfAbsent(tp.getKey(), tp)); + telemetryProfiles = new ArrayList<>(profilesMap.values()); + } + + public long getOldestTs(long startTs) { + return startTs - TimeUnit.DAYS.toMillis(publishPeriodInDays) - publishFrequencyInSeconds; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntityDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntityDefinition.java new file mode 100644 index 0000000000..c76d183bda --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntityDefinition.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import org.thingsboard.server.common.data.EntityType; + +public interface EntityDefinition { + + String getName(); + + EntityType getEntityType(); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntitySearchKey.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntitySearchKey.java new file mode 100644 index 0000000000..f880e909b0 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/EntitySearchKey.java @@ -0,0 +1,31 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.EntityId; + +@Data +@AllArgsConstructor +public class EntitySearchKey { + + private final EntityId ownerId; + private final EntityType entityType; + private final String entityName; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/ReferenceableEntityDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/ReferenceableEntityDefinition.java new file mode 100644 index 0000000000..13dabb08cc --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/ReferenceableEntityDefinition.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ReferenceableEntityDefinition { + + private String name; + private String file; + private String update; + private String jsonId; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/RelationDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/RelationDefinition.java new file mode 100644 index 0000000000..670d3f1ab4 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/RelationDefinition.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.relation.EntitySearchDirection; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RelationDefinition { + + private EntityType entityType; + private String entityName; + private EntitySearchDirection direction; + private String type; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TelemetryProfile.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TelemetryProfile.java new file mode 100644 index 0000000000..259744a2f0 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TelemetryProfile.java @@ -0,0 +1,29 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import org.thingsboard.server.service.solutions.data.values.ValueStrategyDefinition; + +@Data +@AllArgsConstructor +public class TelemetryProfile { + + private String key; + private ValueStrategyDefinition valueStrategy; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TenantDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TenantDefinition.java new file mode 100644 index 0000000000..957547cff6 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/TenantDefinition.java @@ -0,0 +1,29 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.Data; +import org.thingsboard.server.common.data.EntityType; + +@Data +public class TenantDefinition extends BaseEntityDefinition { + + @Override + public EntityType getEntityType() { + return EntityType.TENANT; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/UserDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/UserDefinition.java new file mode 100644 index 0000000000..1815cc6e57 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/definition/UserDefinition.java @@ -0,0 +1,40 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.definition; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class UserDefinition extends BaseEntityDefinition { + + private String firstname; + private String lastname; + private String password; + private DashboardUserDetailsDefinition dashboard; + + @Override + public EntityType getEntityType() { + return EntityType.USER; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AbstractEmulatorLauncher.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AbstractEmulatorLauncher.java new file mode 100644 index 0000000000..abed74af3e --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AbstractEmulatorLauncher.java @@ -0,0 +1,195 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.util.Pair; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.HasName; +import org.thingsboard.server.common.data.HasTenantId; +import org.thingsboard.server.common.data.StringUtils; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.HasId; +import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgDataType; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.queue.TbQueueCallback; +import org.thingsboard.server.queue.TbQueueMsgMetadata; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; +import org.thingsboard.server.queue.provider.TbQueueProducerProvider; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +@Slf4j +@Data +public abstract class AbstractEmulatorLauncher & HasTenantId & HasName> { + + protected static final TbQueueCallback EMPTY_CALLBACK = new TbQueueCallback() { + @Override + public void onSuccess(TbQueueMsgMetadata metadata) { + + } + + @Override + public void onFailure(Throwable t) { + + } + }; + protected final T entity; + protected final EmulatorDefinition emulatorDefinition; + protected final ExecutorService oldTelemetryExecutor; + protected final TbClusterService tbClusterService; + protected final PartitionService partitionService; + protected final TbQueueProducerProvider tbQueueProducerProvider; + protected final TbServiceInfoProvider serviceInfoProvider; + protected final TelemetrySubscriptionService tsSubService; + protected final long publishFrequency; + + private final Emulator emulator; + private ScheduledFuture scheduledFuture; + + public AbstractEmulatorLauncher(T entity, + EmulatorDefinition emulatorDefinition, + ExecutorService oldTelemetryExecutor, + TbClusterService tbClusterService, + PartitionService partitionService, + TbQueueProducerProvider tbQueueProducerProvider, + TbServiceInfoProvider serviceInfoProvider, + TelemetrySubscriptionService tsSubService) throws Exception { + this.entity = entity; + this.emulatorDefinition = emulatorDefinition; + this.oldTelemetryExecutor = oldTelemetryExecutor; + this.tbClusterService = tbClusterService; + this.partitionService = partitionService; + this.tbQueueProducerProvider = tbQueueProducerProvider; + this.serviceInfoProvider = serviceInfoProvider; + this.tsSubService = tsSubService; + this.publishFrequency = TimeUnit.SECONDS.toMillis(Math.max(emulatorDefinition.getPublishFrequencyInSeconds(), 1)); + if (StringUtils.isEmpty(emulatorDefinition.getClazz())) { + emulator = new BasicEmulator(); + } else { + emulator = (Emulator) Class.forName(emulatorDefinition.getClazz()).getDeclaredConstructor().newInstance(); + } + emulator.init(emulatorDefinition); + } + + public CompletableFuture launch() { + final long oldestTs = emulatorDefinition.getOldestTs(System.currentTimeMillis()); + CompletableFuture future = new CompletableFuture<>(); + oldTelemetryExecutor.submit(() -> { + AtomicInteger pending = new AtomicInteger(1); + try { + if (emulator instanceof SimpleEmulator) { + if (oldestTs < (System.currentTimeMillis() - publishFrequency)) { + pushOldTelemetry(oldestTs, pending, future); + } + } else if (emulator instanceof CustomEmulator customEmulator) { + Pair telemetry = customEmulator.getNextValue(); + while (telemetry != null) { + pending.incrementAndGet(); + publishTelemetry(telemetry.getFirst(), telemetry.getSecond(), pending, future); + telemetry = customEmulator.getNextValue(); + } + } + } catch (Exception e) { + log.warn("Telemetry upload failed for {}", entity.getName(), e); + future.completeExceptionally(e); + } finally { + if (pending.decrementAndGet() == 0 && !future.isDone()) { + log.trace("[{}] Telemetry emulation finished. Producer and all callbacks completed successfully", entity.getName()); + future.complete(null); + } + } + + future.whenComplete((v, t) -> { + try { + postProcessEntity(entity); + } catch (Exception e) { + log.warn("Post-processing failed for {}", entity.getName(), e); + } + }); + + }); + return future; + } + + protected void postProcessEntity(T entity) { + } + + private void pushOldTelemetry(long oldestTs, AtomicInteger pending, CompletableFuture future) throws InterruptedException { + for (long ts = oldestTs; ts < System.currentTimeMillis(); ts += publishFrequency) { + pending.incrementAndGet(); + publishTelemetry(ts, pending, future); + } + } + + private void publishTelemetry(long ts, AtomicInteger pending, CompletableFuture future) throws InterruptedException { + ObjectNode values = ((SimpleEmulator) emulator).getValue(ts); + publishTelemetry(ts, values, pending, future); + Thread.sleep(emulatorDefinition.getPublishPauseInMillis()); + } + + public void stop() { + scheduledFuture.cancel(true); + } + + private void publishTelemetry(long ts, ObjectNode value, AtomicInteger pending, CompletableFuture future) { + String msgData = JacksonUtil.toString(value); + log.debug("[{}] Publishing telemetry: {}", entity.getName(), msgData); + TbMsgMetaData md = new TbMsgMetaData(); + md.putValue("ts", Long.toString(ts)); + TbMsg tbMsg = TbMsg.newMsg() + .type(TbMsgType.POST_TELEMETRY_REQUEST) + .originator(entity.getId()) + .copyMetaData(md) + .dataType(TbMsgDataType.JSON) + .data(msgData) + .build(); + + TbQueueCallback callback = new TbQueueCallback() { + + @Override + public void onSuccess(TbQueueMsgMetadata metadata) { + log.debug("[{}] Successfully pushed message to Rule Engine for ts {}", entity.getName(), ts); + if (pending.decrementAndGet() == 0 && !future.isDone()) { + log.trace("[{}] Completing emulation future from callback for msg with ts: {}", entity.getName(), ts); + future.complete(null); + } + } + + @Override + public void onFailure(Throwable t) { + log.warn("[{}] Telemetry upload failed for ts {}", entity.getName(), ts, t); + if (pending.decrementAndGet() == 0 && !future.isDone()) { + future.completeExceptionally(t); + } + } + }; + + tbClusterService.pushMsgToRuleEngine(entity.getTenantId(), entity.getId(), tbMsg, callback); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AssetEmulatorLauncher.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AssetEmulatorLauncher.java new file mode 100644 index 0000000000..1f2d144b99 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/AssetEmulatorLauncher.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import lombok.Builder; +import lombok.extern.slf4j.Slf4j; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; +import org.thingsboard.server.queue.provider.TbQueueProducerProvider; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; + +import java.util.concurrent.ExecutorService; + +@Slf4j +public class AssetEmulatorLauncher extends AbstractEmulatorLauncher { + + @Builder + public AssetEmulatorLauncher(Asset entity, EmulatorDefinition emulatorDefinition, ExecutorService oldTelemetryExecutor, TbClusterService tbClusterService, + PartitionService partitionService, + TbQueueProducerProvider tbQueueProducerProvider, + TbServiceInfoProvider serviceInfoProvider, + TelemetrySubscriptionService tsSubService) throws Exception { + super(entity, emulatorDefinition, oldTelemetryExecutor, tbClusterService, partitionService, tbQueueProducerProvider, serviceInfoProvider, tsSubService); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/BasicEmulator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/BasicEmulator.java new file mode 100644 index 0000000000..c81aed3c02 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/BasicEmulator.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.solutions.data.values.TelemetryGenerator; +import org.thingsboard.server.service.solutions.data.values.TelemetryGeneratorFactory; + +import java.util.HashMap; +import java.util.Map; + +public class BasicEmulator implements SimpleEmulator { + + private final Map tsGenerators = new HashMap<>(); + + @Override + public void init(EmulatorDefinition emulatorDefinition) { + emulatorDefinition.getTelemetryProfiles().forEach(tp -> tsGenerators.put(tp.getKey(), TelemetryGeneratorFactory.create(tp))); + } + + @Override + public ObjectNode getValue(long ts) { + ObjectNode values = JacksonUtil.newObjectNode(); + tsGenerators.values().forEach(gen -> gen.addValue(ts, values)); + return values; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/CustomEmulator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/CustomEmulator.java new file mode 100644 index 0000000000..627fe4e94d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/CustomEmulator.java @@ -0,0 +1,25 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.springframework.data.util.Pair; + +public interface CustomEmulator extends Emulator { + + Pair getNextValue(); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/DeviceEmulatorLauncher.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/DeviceEmulatorLauncher.java new file mode 100644 index 0000000000..62fe03aa31 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/DeviceEmulatorLauncher.java @@ -0,0 +1,98 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.google.common.util.concurrent.FutureCallback; +import lombok.Builder; +import lombok.extern.slf4j.Slf4j; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.thingsboard.rule.engine.api.AttributesSaveRequest; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.AttributeScope; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.kv.LongDataEntry; +import org.thingsboard.server.common.msg.queue.ServiceType; +import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; +import org.thingsboard.server.gen.transport.TransportProtos; +import org.thingsboard.server.queue.common.TbProtoQueueMsg; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; +import org.thingsboard.server.queue.provider.TbQueueProducerProvider; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; +import org.thingsboard.server.service.state.DefaultDeviceStateService; +import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; + +import java.util.UUID; +import java.util.concurrent.ExecutorService; + +@Slf4j +public class DeviceEmulatorLauncher extends AbstractEmulatorLauncher { + + @Builder + public DeviceEmulatorLauncher(Device entity, + EmulatorDefinition emulatorDefinition, + ExecutorService oldTelemetryExecutor, + TbClusterService tbClusterService, + PartitionService partitionService, + TbQueueProducerProvider tbQueueProducerProvider, + TbServiceInfoProvider serviceInfoProvider, + TelemetrySubscriptionService tsSubService) throws Exception { + super(entity, emulatorDefinition, oldTelemetryExecutor, tbClusterService, partitionService, tbQueueProducerProvider, serviceInfoProvider, tsSubService); + } + + @Override + protected void postProcessEntity(Device entity) { + if (this.emulatorDefinition.getActivityPeriodInMillis() > 0) { + tsSubService.saveAttributes(AttributesSaveRequest.builder() + .tenantId(entity.getTenantId()) + .entityId(entity.getId()) + .scope(AttributeScope.SERVER_SCOPE) + .entry(new LongDataEntry(DefaultDeviceStateService.INACTIVITY_TIMEOUT, this.emulatorDefinition.getActivityPeriodInMillis())) + .callback(new FutureCallback<>() { + @Override + public void onSuccess(@Nullable Void unused) { + TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, entity.getTenantId(), entity.getId()); + UUID sessionId = UUID.randomUUID(); + TransportProtos.TransportToDeviceActorMsg msg = TransportProtos.TransportToDeviceActorMsg.newBuilder() + .setSessionInfo(TransportProtos.SessionInfoProto.newBuilder() + .setSessionIdMSB(sessionId.getMostSignificantBits()) + .setSessionIdLSB(sessionId.getLeastSignificantBits()) + .setDeviceIdMSB(entity.getId().getId().getMostSignificantBits()) + .setDeviceIdLSB(entity.getId().getId().getLeastSignificantBits()) + .setDeviceProfileIdMSB(entity.getId().getId().getMostSignificantBits()) + .setDeviceProfileIdLSB(entity.getId().getId().getLeastSignificantBits()) + .setDeviceName(entity.getName()) + .setDeviceType(entity.getType()) + .setTenantIdMSB(entity.getTenantId().getId().getMostSignificantBits()) + .setTenantIdLSB(entity.getTenantId().getId().getLeastSignificantBits()) + .setNodeId(serviceInfoProvider.getServiceId()) + .build()) + .setSubscriptionInfo(TransportProtos.SubscriptionInfoProto.newBuilder().setLastActivityTime(System.currentTimeMillis()).build()) + .build(); + tbQueueProducerProvider.getTbCoreMsgProducer().send(tpi, + new TbProtoQueueMsg<>(entity.getUuidId(), + TransportProtos.ToCoreMsg.newBuilder().setToDeviceActorMsg(msg).build()), EMPTY_CALLBACK + ); + } + + @Override + public void onFailure(Throwable throwable) { + } + }) + .build()); + } + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/Emulator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/Emulator.java new file mode 100644 index 0000000000..45a9a029b8 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/Emulator.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; + +public interface Emulator { + + void init(EmulatorDefinition emulatorDefinition); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/FieldIrrigationStateEmulator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/FieldIrrigationStateEmulator.java new file mode 100644 index 0000000000..44c9eb550f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/FieldIrrigationStateEmulator.java @@ -0,0 +1,108 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.springframework.data.util.Pair; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.service.solutions.data.definition.EmulatorDefinition; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.TimeZone; + +public class FieldIrrigationStateEmulator implements CustomEmulator { + + private static final int START_HOUR = 6; + private int idx; + private List> data = new ArrayList<>(); + + @Override + public void init(EmulatorDefinition emulatorDefinition) { + idx = 0; + var tz = TimeZone.getTimeZone("America/New_York"); + Calendar c = Calendar.getInstance(); + c.setTimeInMillis(System.currentTimeMillis()); + c.setTimeZone(tz); + int curHour = c.get(Calendar.HOUR_OF_DAY); + c.add(Calendar.DAY_OF_MONTH, curHour < START_HOUR ? -7 : -6); + c.set(Calendar.HOUR_OF_DAY, START_HOUR); + c.set(Calendar.MINUTE, 0); + + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("durationThreshold", 30 * 60000) + .put("consumption", 423) + .put("duration", 30 * 60000) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("durationThreshold", 30 * 60000) + .put("consumption", 407) + .put("duration", 30 * 60000) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("consumptionThreshold", 1000) + .put("consumption", 1000) + .put("duration", 63 * 60000) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("consumptionThreshold", 500) + .put("consumption", 500) + .put("duration", 36 * 60000) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("consumptionThreshold", 1000) + .put("consumption", 1000) + .put("duration", 63 * 60000) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("durationThreshold", 30 * 60000) + .put("duration", 30 * 60000) + .put("consumption", 452) + ); + add(c, JacksonUtil.newObjectNode() + .put("startTs", c.getTimeInMillis()) + .put("durationThreshold", 30 * 60000) + .put("duration", 30 * 60000) + .put("consumption", 447) + ); + } + + private void add(Calendar c, ObjectNode objectNode) { + ObjectNode startIrrigationMsg = JacksonUtil.newObjectNode(); + startIrrigationMsg.put("irrigationState", "DONE"); + startIrrigationMsg.set("irrigationTask", objectNode); + data.add(Pair.of(c.getTimeInMillis(), startIrrigationMsg)); + c.add(Calendar.DAY_OF_MONTH, 1); + } + + @Override + public Pair getNextValue() { + if (idx < data.size()) { + var result = data.get(idx); + idx++; + return result; + } else { + return null; + } + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/SimpleEmulator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/SimpleEmulator.java new file mode 100644 index 0000000000..144a5f7f26 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/emulator/SimpleEmulator.java @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.emulator; + +import com.fasterxml.jackson.databind.node.ObjectNode; + +public interface SimpleEmulator extends Emulator { + + ObjectNode getValue(long ts); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameData.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameData.java new file mode 100644 index 0000000000..ca66c37199 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameData.java @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.names; + +import lombok.Data; + +@Data +public class RandomNameData { + + private final String firstName; + private final String lastName; + private final String email; +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameUtil.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameUtil.java new file mode 100644 index 0000000000..50bc3b9dc5 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/names/RandomNameUtil.java @@ -0,0 +1,100 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.names; + +import org.thingsboard.server.common.data.StringUtils; + +import java.util.Random; + +public class RandomNameUtil { + + private static final Random RANDOM = new Random(System.currentTimeMillis()); + + private static String[] FIRST_NAMES = new String[]{ + "Nadia", "Lynne", "Lera", "Holly", "Zina", "Mandi", "Kasie", "Josef", "Liane", "Man", + "Karan", "Nga", "Tesha", "Elva", "Bree", "Ida", "Mimi", "Altha", "Omar", "Ollie", + "Nicol", "Ned", "Teri", "Sabra", "Kari", "Eva", "Penni", "Simon", "Kaci", "Jess", + "Bea", "Ron", "Melba", "Vella", "Nada", "Cyndi", "Audry", "Helga", "Chana", "Lola", + "Terry", "Tami", "Dedra", "Erwin", "Anne", "Zoila", "Nelia", "Hyman", "Deane", "Erica", + "Amos", "Maura", "Gwenn", "Evan", "Lelia", "Grant", "Abe", "Fanny", "Cindi", "Pilar", + "Darcy", "Len", "Casie", "Jose", "Kylie", "Cami", "Casey", "Kerri", "Bruno", "Theda", + "Ardis", "Carin", "Belia", "Jeff", "Yetta", "Ola", "Lyla", "Megan", "Zita", "Rocky", + "Darci", "Dale", "Mirta", "Tanja", "Stacy", "Julie", "Aisha", "Avis", "Hugh", "Anh", + "Bud", "Earle", "Ossie", "Odell", "Dovie", "Afton", "Joel", "Aida", "Vina", "Emiko", + "Tori", "Keena", "Addie", "Nancy", "Tonda", "Josue", "Dina", "Mitch", "Thea", "Cole", + "Lyman", "Donna", "Roma", "Deena", "Lue", "Bette", "Ilene", "Vera", "Kirby", "Lenna", + "Pat", "Grace", "Gus", "Frank", "Lena", "Adele", "Kerry", "Santo", "Wade", "Trudi", + "Bruce", "Raul", "Katy", "Heidi", "Marna", "Faith", "Ronna", "Kylee", "Emma", "Luna", + "Ilda", "Mose", "Juan", "Cori", "Gayla", "Otha", "Jung", "Bambi", "Joi", "Sibyl", + "Reid", "Bonny", "Roni", "Joy", "Farah", "Jeane", "Jill", "Tisha", "Leon", "Leigh", + "Inge", "Zella", "Rubin", "Carri", "Nana", "Sofia", "Lucio", "Eboni", "Adam", "Lino", + "Elvis", "Marci", "Adina", "Nanci", "Joyce", "James", "Louis", "Aurea", "Chi", "Kathy", + "Nina", "Lise", "Reda", "Candi", "Ralph", "Velva", "Mari", "Mavis", "Kory", "Tammi", + "Lucy", "Lavon", "Ana", "Lin", "Alena", "Haley", "Myra", "Amy", "Marlo", "Ami" + }; + + private static String[] LAST_NAMES = new String[]{ + "Vinson", "Rogers", "Burkett", "Gamboa", "Gross", "Toledo", "Kiser", "Harman", "Pierce", "Lovett", + "Sexton", "Coates", "Seymour", "Holland", "Finley", "Hagen", "Schmitt", "Beach", "Rea", "Peck", + "Noel", "Archer", "Zamora", "Wood", "Rivera", "Lentz", "Alonso", "Rider", "Story", "Schwab", + "Mercado", "Caruso", "Bynum", "Spears", "Bingham", "Tyler", "Ponce", "Skaggs", "Matos", "Stinson", + "Burgos", "Coles", "Helton", "Joyce", "Galvan", "Grant", "Stahl", "Daigle", "Hayden", "Quiroz", + "Horne", "Shaw", "Addison", "Harvey", "Watkins", "Romano", "Ahmed", "Lind", "Swenson", "Kemp", + "Barnes", "Horton", "Dugan", "Farr", "Swanson", "Hale", "Hidalgo", "Schulte", "Ervin", "Osorio", + "Lincoln", "Zhang", "Oakes", "Stiles", "Lu", "Culver", "Singer", "Knott", "Bullard", "Butts", + "Coley", "Roth", "Cobb", "Darnell", "Vaughan", "Conrad", "Austin", "Rico", "Hobson", "Brunner", + "Mccray", "Mattson", "Barber", "Clement", "Ly", "Dejesus", "Painter", "Macias", "Healy", "Duncan", + "Forrest", "Hurley", "Torres", "Blue", "Rucker", "Ferrell", "Maddox", "Osborne", "Holt", "Briggs", + "Irvin", "Bassett", "Urban", "Overton", "Sloan", "Guzman", "Estrada", "Redding", "Gold", "Paz", + "Lucero", "Reyes", "Conner", "Keith", "Hays", "Hutton", "Moore", "Tuttle", "Powers", "William", + "Reeder", "Castro", "Vela", "Baca", "Frazier", "Kline", "Huggins", "Zepeda", "Pate", "Marion", + "Hollis", "Ybarra", "Cuellar", "Gallo", "Gomes", "Louis", "Bolden", "Liu", "Hayes", "Simpson", + "Otero", "Conway", "Peoples", "Mohr", "Loomis", "Engel", "Hughes", "Chapman", "Bower", "Schmidt", + "Mcmahon", "Booth", "Ward", "Drake", "Cutler", "Gordon", "Black", "Clifton", "Curran", "Pierre", + "Workman", "Tilley", "Moody", "Kuhn", "Eastman", "Scott", "Vang", "Tillman", "Cleary", "Yi", + "Griffin", "Mendoza", "Mason", "Pittman", "Landis", "Gay", "Rowland", "Jordan", "Lo", "Kumar", + "Vernon", "Boyd", "Rocha", "Mcqueen", "Cornett", "Deaton", "Borden", "Lacey", "Gaston", "Miles" + }; + + public static String nextFirstName() { + return randomElement(FIRST_NAMES); + } + + public static String nextLastName() { + return randomElement(LAST_NAMES); + } + + private static String toEmail(String firstName, String lastName) { + return firstName.toLowerCase() + "." + lastName.toLowerCase() + "@thingsboard.io"; + } + + public static RandomNameData next() { + var firstName = nextFirstName(); + var lastName = nextLastName(); + return new RandomNameData(firstName, lastName, toEmail(firstName, lastName)); + } + + public static RandomNameData nextSuperRandom() { + var firstName = nextFirstName() + StringUtils.randomAlphanumeric(10).toLowerCase(); + var lastName = nextLastName() + StringUtils.randomAlphanumeric(10).toLowerCase(); + return new RandomNameData(firstName, lastName, toEmail(firstName, lastName)); + } + + private static String randomElement(String[] array) { + return array[RANDOM.nextInt(array.length)]; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/SolutionInstallResponse.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/SolutionInstallResponse.java new file mode 100644 index 0000000000..e625a6bfce --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/SolutionInstallResponse.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.solution; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.List; + +@Schema +@Data +public class SolutionInstallResponse extends TenantSolutionTemplateInstructions { + + @Schema(description = "Indicates that template was installed successfully") + private boolean success; + @Schema(description = "List of entity IDs created during solution installation") + private List createdEntityIds; + + public SolutionInstallResponse(TenantSolutionTemplateInstructions instructions, boolean success, List createdEntityIds) { + super(instructions); + this.success = success; + this.createdEntityIds = createdEntityIds; + } + + public SolutionInstallResponse() { + super(); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/TenantSolutionTemplateInstructions.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/TenantSolutionTemplateInstructions.java new file mode 100644 index 0000000000..fabd89d072 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/solution/TenantSolutionTemplateInstructions.java @@ -0,0 +1,46 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.solution; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DashboardId; + +@Schema +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TenantSolutionTemplateInstructions { + + @Schema(description = "Id of the main dashboard of the solution") + private DashboardId dashboardId; + @Schema(description = "Id of the public customer if solution has public entities") + private CustomerId publicId; + @Schema(description = "Is the main dashboard public") + private boolean mainDashboardPublic; + @Schema(description = "Markdown with solution usage instructions") + private String details; + + public TenantSolutionTemplateInstructions(TenantSolutionTemplateInstructions instructions) { + this.dashboardId = instructions.getDashboardId(); + this.publicId = instructions.getPublicId(); + this.mainDashboardPublic = instructions.isMainDashboardPublic(); + this.details = instructions.getDetails(); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyDefinition.java new file mode 100644 index 0000000000..ba803faf87 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyDefinition.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class CompositeValueStrategyDefinition implements ValueStrategyDefinition { + + private ValueStrategyDefinition defaultHours; + private ValueStrategyDefinition workHours; + private ValueStrategyDefinition nightHours; + private ValueStrategyDefinition holidayHours; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.COMPOSITE; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyGenerator.java new file mode 100644 index 0000000000..6cbfaf550e --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CompositeValueStrategyGenerator.java @@ -0,0 +1,55 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +public class CompositeValueStrategyGenerator extends TelemetryGenerator { + + TelemetryGenerator defaultGenerator; + TelemetryGenerator whGenerator; + TelemetryGenerator nhGenerator; + TelemetryGenerator hhGenerator; + + public CompositeValueStrategyGenerator(TelemetryProfile tp) { + super(tp); + var def = (CompositeValueStrategyDefinition) tp.getValueStrategy(); + defaultGenerator = TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), def.getDefaultHours())); + if (def.getWorkHours() != null) { + whGenerator = TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), def.getWorkHours())); + } + if (def.getNightHours() != null) { + nhGenerator = TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), def.getNightHours())); + } + if (def.getHolidayHours() != null) { + hhGenerator = TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), def.getHolidayHours())); + } + } + + @Override + public void addValue(long ts, ObjectNode values) { + if (hhGenerator != null && GeneratorTools.isHoliday(ts)) { + hhGenerator.addValue(ts, values); + } else if (nhGenerator != null && GeneratorTools.isNightHour(ts)) { + nhGenerator.addValue(ts, values); + } else if (whGenerator != null && GeneratorTools.isWorkHour(ts)) { + whGenerator.addValue(ts, values); + } else { + defaultGenerator.addValue(ts, values); + } + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantTelemetryGenerator.java new file mode 100644 index 0000000000..59ca319f67 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantTelemetryGenerator.java @@ -0,0 +1,51 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +public class ConstantTelemetryGenerator extends TelemetryGenerator { + + private final ConstantValueStrategyDefinition strategy; + private JsonNode value; + + public ConstantTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (ConstantValueStrategyDefinition) telemetryProfile.getValueStrategy(); + this.value = strategy.getValue(); + } + + @Override + public void addValue(long ts, ObjectNode values) { + values.set(key, value); + } + + @Override + public double getValue() { + if (value != null && value.isNumber()) { + return value.doubleValue(); + } else { + return super.getValue(); + } + } + + @Override + public void setValue(double value) { + // do nothing; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantValueStrategyDefinition.java new file mode 100644 index 0000000000..ef18ef2c9b --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ConstantValueStrategyDefinition.java @@ -0,0 +1,31 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class ConstantValueStrategyDefinition implements ValueStrategyDefinition { + private JsonNode value; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.CONSTANT; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterTelemetryGenerator.java new file mode 100644 index 0000000000..544d143893 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterTelemetryGenerator.java @@ -0,0 +1,69 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Getter; +import lombok.Setter; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.getMultiplier; +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomDouble; + +public class CounterTelemetryGenerator extends TelemetryGenerator { + + private final CounterValueStrategyDefinition strategy; + @Getter @Setter + private double value; + + public CounterTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (CounterValueStrategyDefinition) telemetryProfile.getValueStrategy(); + this.value = getRandomStartValue(); + } + + @Override + public void addValue(long ts, ObjectNode values) { + double step = randomDouble(strategy.getMinIncrement(), strategy.getMaxIncrement()); + double multiplier = getMultiplier(ts, strategy.getHolidayMultiplier(), strategy.getWorkHoursMultiplier(), strategy.getNightHoursMultiplier()); + value += step * multiplier; + if (value > getRandomEndValue()) { + value = getRandomStartValue(); + } + put(values, value); + } + + private void put(ObjectNode values, double value) { + if (strategy.getPrecision() == 0) { + values.put(key, (int) value); + } else { + values.put(key, BigDecimal.valueOf(value) + .setScale(strategy.getPrecision(), RoundingMode.HALF_UP) + .doubleValue()); + } + } + + public double getRandomStartValue() { + return randomDouble(strategy.getMinStartValue(), strategy.getMaxStartValue()); + } + + public double getRandomEndValue() { + return randomDouble(strategy.getMinEndValue(), strategy.getMaxEndValue()); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterValueStrategyDefinition.java new file mode 100644 index 0000000000..9010af51bd --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/CounterValueStrategyDefinition.java @@ -0,0 +1,42 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class CounterValueStrategyDefinition implements ValueStrategyDefinition { + + private int precision; + private double minStartValue; + private double maxStartValue; + private double minEndValue; + private double maxEndValue; + private double minIncrement; + private double maxIncrement; + private double holidayMultiplier; + private double workHoursMultiplier; + private double nightHoursMultiplier; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.COUNTER; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementTelemetryGenerator.java new file mode 100644 index 0000000000..bbcb6cedf7 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementTelemetryGenerator.java @@ -0,0 +1,37 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomDouble; + +public class DecrementTelemetryGenerator extends IncDecTelemetryGenerator { + + public DecrementTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + } + + @Override + public void addValue(long ts, ObjectNode values) { + double step = randomDouble(strategy.getMinDecrement(), strategy.getMaxDecrement()); + double newValue = value - step; + value = Math.max(newValue, endValue); + put(values, value); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementValueStrategyDefinition.java new file mode 100644 index 0000000000..b5f254e2e5 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/DecrementValueStrategyDefinition.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class DecrementValueStrategyDefinition extends IncDecValueStrategyDefinition { + + private double minDecrement; + private double maxDecrement; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.DECREMENT; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventTelemetryGenerator.java new file mode 100644 index 0000000000..82555f7ed4 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventTelemetryGenerator.java @@ -0,0 +1,54 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomLong; + + +public class EventTelemetryGenerator extends TelemetryGenerator { + + private final EventValueStrategyDefinition strategy; + private final long currentAnomaly; + private Object value; + + public EventTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (EventValueStrategyDefinition) telemetryProfile.getValueStrategy(); + currentAnomaly = randomLong(0, strategy.getAnomalyChance()); + } + + @Override + public void addValue(long ts, ObjectNode values) { + boolean anomaly = false; + if (randomLong(0, strategy.getAnomalyChance()) == currentAnomaly) { + anomaly = true; + } + this.value = anomaly ? strategy.getAnomalyValue() : strategy.getNormalValue(); + if (value instanceof Boolean) { + values.put(key, (Boolean) value); + } else if (value instanceof Double) { + values.put(key, ((Double) value)); + } else if (value instanceof Integer) { + values.put(key, ((Integer) value)); + } else { + throw new RuntimeException("Not supported value for event telemetry generator: " + value); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventValueStrategyDefinition.java new file mode 100644 index 0000000000..855004da02 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/EventValueStrategyDefinition.java @@ -0,0 +1,33 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class EventValueStrategyDefinition implements ValueStrategyDefinition { + private Object normalValue; + private Object anomalyValue; + private double anomalyChance; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.EVENT; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/GeneratorTools.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/GeneratorTools.java new file mode 100644 index 0000000000..918379faa6 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/GeneratorTools.java @@ -0,0 +1,96 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import java.util.Calendar; +import java.util.Date; +import java.util.Random; +import java.util.TimeZone; + +public class GeneratorTools { + + private static final Random random = new Random(); + + public static long randomLong(double min, double max) { + return (long) randomDouble(min, max); + } + + public static double randomDouble(double min, double max) { + return min + random.nextDouble() * Math.abs(max - min); + } + + public static double getMultiplier(long ts, double holidayMultiplier, double workHoursMultiplier, double nightHoursMultiplier) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTime(date); + int dayOfWeek = c.get(Calendar.DAY_OF_WEEK); + int hour = c.get(Calendar.HOUR_OF_DAY); + double multiplier = 1.0; + if (dayOfWeek == 1 || dayOfWeek == 7) { + multiplier *= holidayMultiplier; + } + + if (hour > 8 && hour < 18) { + multiplier *= workHoursMultiplier; + } else if (hour < 6 || hour > 22) { + multiplier *= nightHoursMultiplier; + } + return multiplier; + } + + public static int getHour(TimeZone tz, long ts) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTimeZone(tz); + c.setTime(date); + return c.get(Calendar.HOUR_OF_DAY); + } + + public static int getMinute(TimeZone tz, long ts) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTimeZone(tz); + c.setTime(date); + return c.get(Calendar.MINUTE); + } + + public static boolean isHoliday(long ts) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTime(date); + int dayOfWeek = c.get(Calendar.DAY_OF_WEEK); + return dayOfWeek == 1 || dayOfWeek == 7; + } + + public static boolean isWorkHour(long ts) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTime(date); + int hour = c.get(Calendar.HOUR_OF_DAY); + + return hour > 8 && hour < 18; + } + + public static boolean isNightHour(long ts) { + Date date = new Date(ts); + Calendar c = Calendar.getInstance(); + c.setTime(date); + int hour = c.get(Calendar.HOUR_OF_DAY); + + return hour < 6 || hour >= 22; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecTelemetryGenerator.java new file mode 100644 index 0000000000..09d7e2dce2 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecTelemetryGenerator.java @@ -0,0 +1,64 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Getter; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomDouble; + +public abstract class IncDecTelemetryGenerator extends TelemetryGenerator { + + protected final T strategy; + @Getter + protected double value; + protected double endValue; + + @SuppressWarnings("unchecked") + public IncDecTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (T) telemetryProfile.getValueStrategy(); + this.value = getRandomStartValue(); + this.endValue = getRandomEndValue(); + } + + public void setValue(double value) { + this.value = value; + this.endValue = getRandomEndValue(); + } + + protected void put(ObjectNode values, double value) { + if (strategy.getPrecision() == 0) { + values.put(key, (int) value); + } else { + values.put(key, BigDecimal.valueOf(value) + .setScale(strategy.getPrecision(), RoundingMode.HALF_UP) + .doubleValue()); + } + } + + public double getRandomStartValue() { + return randomDouble(strategy.getMinStartValue(), strategy.getMaxStartValue()); + } + + public double getRandomEndValue() { + return randomDouble(strategy.getMinEndValue(), strategy.getMaxEndValue()); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecValueStrategyDefinition.java new file mode 100644 index 0000000000..adc3100dab --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncDecValueStrategyDefinition.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public abstract class IncDecValueStrategyDefinition implements ValueStrategyDefinition { + + private int precision; + private double minStartValue; + private double maxStartValue; + private double minEndValue; + private double maxEndValue; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementTelemetryGenerator.java new file mode 100644 index 0000000000..d18f36017f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementTelemetryGenerator.java @@ -0,0 +1,36 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomDouble; + +public class IncrementTelemetryGenerator extends IncDecTelemetryGenerator { + + public IncrementTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + } + + @Override + public void addValue(long ts, ObjectNode values) { + double step = randomDouble(strategy.getMinIncrement(), strategy.getMaxIncrement()); + double newValue = value + step; + value = Math.min(newValue, endValue); + put(values, value); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementValueStrategyDefinition.java new file mode 100644 index 0000000000..64d7bc0b4c --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/IncrementValueStrategyDefinition.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class IncrementValueStrategyDefinition extends IncDecValueStrategyDefinition { + + private double minIncrement; + private double maxIncrement; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.INCREMENT; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalTelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalTelemetryGenerator.java new file mode 100644 index 0000000000..927eb5a76f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalTelemetryGenerator.java @@ -0,0 +1,94 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Getter; +import lombok.Setter; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.getMultiplier; +import static org.thingsboard.server.service.solutions.data.values.GeneratorTools.randomDouble; + +public class NaturalTelemetryGenerator extends TelemetryGenerator { + + private final NaturalValueStrategyDefinition strategy; + @Getter @Setter + private double value; + private boolean isIncrement; + private double lowValue; + private double highValue; + + public NaturalTelemetryGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (NaturalValueStrategyDefinition) telemetryProfile.getValueStrategy(); + this.value = getRandomStartValue(); + this.lowValue = getRandomLowValue(); + this.highValue = getRandomHighValue(); + isIncrement = !strategy.isDecrementOnStart(); + } + + @Override + public void addValue(long ts, ObjectNode values) { + + double multiplier = getMultiplier(ts, strategy.getHolidayMultiplier(), strategy.getWorkHoursMultiplier(), strategy.getNightHoursMultiplier()); + + if (isIncrement) { + double step = randomDouble(strategy.getMinIncrement(), strategy.getMaxIncrement()); + value += step * multiplier; + if (value > highValue) { + value = highValue; + highValue = getRandomHighValue(); + isIncrement = false; + } + } else { + double step = randomDouble(strategy.getMinDecrement(), strategy.getMaxDecrement()); + value -= step * multiplier; + if (value < lowValue) { + value = lowValue; + lowValue = getRandomLowValue(); + isIncrement = true; + } + } + + put(values, value); + } + + private void put(ObjectNode values, double value) { + if (strategy.getPrecision() == 0) { + values.put(key, (int) value); + } else { + values.put(key, BigDecimal.valueOf(value) + .setScale(strategy.getPrecision(), RoundingMode.HALF_UP) + .doubleValue()); + } + } + + public double getRandomStartValue() { + return randomDouble(strategy.getMinStartValue(), strategy.getMaxStartValue()); + } + + public double getRandomLowValue() { + return randomDouble(strategy.getMinLowValue(), strategy.getMaxLowValue()); + } + + public double getRandomHighValue() { + return randomDouble(strategy.getMinHighValue(), strategy.getMaxHighValue()); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalValueStrategyDefinition.java new file mode 100644 index 0000000000..3141baa47a --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/NaturalValueStrategyDefinition.java @@ -0,0 +1,45 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class NaturalValueStrategyDefinition implements ValueStrategyDefinition { + private int precision; + private double minStartValue; + private double maxStartValue; + private double minLowValue; + private double maxLowValue; + private double minHighValue; + private double maxHighValue; + private double minIncrement; + private double maxIncrement; + private double minDecrement; + private double maxDecrement; + private double holidayMultiplier; + private double workHoursMultiplier; + private double nightHoursMultiplier; + private boolean decrementOnStart; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.NATURAL; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyDefinition.java new file mode 100644 index 0000000000..4804863bd3 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyDefinition.java @@ -0,0 +1,35 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class ScheduleValueStrategyDefinition implements ValueStrategyDefinition { + + private List schedule; + private String timeZone; + private ValueStrategyDefinition defaultDefinition; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.SCHEDULE; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyGenerator.java new file mode 100644 index 0000000000..1d067a3044 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ScheduleValueStrategyGenerator.java @@ -0,0 +1,70 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TimeZone; + +public class ScheduleValueStrategyGenerator extends TelemetryGenerator { + + private TelemetryGenerator defaultGenerator; + private TimeZone timeZone; + private Map scheduleGenerators; + private TelemetryGenerator prevGenerator; + + public ScheduleValueStrategyGenerator(TelemetryProfile tp) { + super(tp); + var def = (ScheduleValueStrategyDefinition) tp.getValueStrategy(); + timeZone = TimeZone.getTimeZone(def.getTimeZone()); + defaultGenerator = TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), def.getDefaultDefinition())); + scheduleGenerators = new LinkedHashMap<>(); + for (ValueStrategySchedule scheduleItem : def.getSchedule()) { + scheduleGenerators.put(scheduleItem, TelemetryGeneratorFactory.create(new TelemetryProfile(tp.getKey(), scheduleItem.getDefinition()))); + } + } + + @Override + public void addValue(long ts, ObjectNode values) { + int hour = GeneratorTools.getHour(timeZone, ts); + int minute = GeneratorTools.getMinute(timeZone, ts); + TelemetryGenerator generator = scheduleGenerators.entrySet().stream().filter(pair -> { + var schedule = pair.getKey(); + if (hour == schedule.getStartHour() && hour == schedule.getEndHour()) { + return schedule.getStartMinute() <= minute && minute <= schedule.getEndMinute(); + } else if (hour == schedule.getStartHour() && hour < schedule.getEndHour()) { + return schedule.getStartMinute() <= minute; + } else if (hour > schedule.getStartHour() && hour < schedule.getEndHour()) { + return true; + } else if (hour > schedule.getStartHour() && hour == schedule.getEndHour()) { + return minute <= schedule.getEndHour(); + } else { + return false; + } + }).map(Map.Entry::getValue).findFirst().orElse(defaultGenerator); + + if (prevGenerator != null && !prevGenerator.equals(generator)) { + generator.setValue(prevGenerator.getValue()); + } + + generator.addValue(ts, values); + + prevGenerator = generator; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyDefinition.java new file mode 100644 index 0000000000..d523715d67 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyDefinition.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Data; + + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class SequenceValueStrategyDefinition implements ValueStrategyDefinition { + private boolean random; + private ObjectNode telemetry; + + @Override + public ValueStrategyDefinitionType getStrategyType() { + return ValueStrategyDefinitionType.SEQUENCE; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyGenerator.java new file mode 100644 index 0000000000..d7c75025f4 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/SequenceValueStrategyGenerator.java @@ -0,0 +1,48 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +import java.util.Random; + +public class SequenceValueStrategyGenerator extends TelemetryGenerator { + + private final SequenceValueStrategyDefinition strategy; + private int max; + private int index; + + public SequenceValueStrategyGenerator(TelemetryProfile telemetryProfile) { + super(telemetryProfile); + this.strategy = (SequenceValueStrategyDefinition) telemetryProfile.getValueStrategy(); + max = strategy.getTelemetry().fields().next().getValue().size() - 1; + index = strategy.isRandom() ? new Random().nextInt(max + 1) : 0; + + } + + @Override + public void addValue(long ts, ObjectNode values) { + strategy.getTelemetry().fields().forEachRemaining(entry -> { + String key = entry.getKey(); + values.set(key, entry.getValue().get(index)); + }); + index++; + if (index > max) { + index = 0; + } + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGenerator.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGenerator.java new file mode 100644 index 0000000000..5024f4e590 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGenerator.java @@ -0,0 +1,41 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Data; +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +@Data +public abstract class TelemetryGenerator { + protected final TelemetryProfile profile; + protected final String key; + + public TelemetryGenerator(TelemetryProfile telemetryProfile) { + this.profile = telemetryProfile; + this.key = telemetryProfile.getKey(); + } + + public double getValue() { + throw new RuntimeException("Not supported"); + } + + public void setValue(double value) { + throw new RuntimeException("Not supported"); + } + + public abstract void addValue(long ts, ObjectNode values); +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGeneratorFactory.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGeneratorFactory.java new file mode 100644 index 0000000000..17d29ce3e1 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/TelemetryGeneratorFactory.java @@ -0,0 +1,48 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + + +import org.thingsboard.server.service.solutions.data.definition.TelemetryProfile; + +public class TelemetryGeneratorFactory { + + public static TelemetryGenerator create(TelemetryProfile tp) { + switch (tp.getValueStrategy().getStrategyType()) { + case COUNTER: + return new CounterTelemetryGenerator(tp); + case NATURAL: + return new NaturalTelemetryGenerator(tp); + case EVENT: + return new EventTelemetryGenerator(tp); + case CONSTANT: + return new ConstantTelemetryGenerator(tp); + case SEQUENCE: + return new SequenceValueStrategyGenerator(tp); + case COMPOSITE: + return new CompositeValueStrategyGenerator(tp); + case SCHEDULE: + return new ScheduleValueStrategyGenerator(tp); + case INCREMENT: + return new IncrementTelemetryGenerator(tp); + case DECREMENT: + return new DecrementTelemetryGenerator(tp); + default: + throw new RuntimeException("Not supported!"); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinition.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinition.java new file mode 100644 index 0000000000..34d5f9b5e7 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinition.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = CounterValueStrategyDefinition.class, name = "counter"), + @JsonSubTypes.Type(value = NaturalValueStrategyDefinition.class, name = "natural"), + @JsonSubTypes.Type(value = EventValueStrategyDefinition.class, name = "event"), + @JsonSubTypes.Type(value = SequenceValueStrategyDefinition.class, name = "sequence"), + @JsonSubTypes.Type(value = ConstantValueStrategyDefinition.class, name = "constant"), + @JsonSubTypes.Type(value = CompositeValueStrategyDefinition.class, name = "composite"), + @JsonSubTypes.Type(value = ScheduleValueStrategyDefinition.class, name = "schedule"), + @JsonSubTypes.Type(value = IncrementValueStrategyDefinition.class, name = "inc"), + @JsonSubTypes.Type(value = DecrementValueStrategyDefinition.class, name = "dec")}) +public interface ValueStrategyDefinition { + + ValueStrategyDefinitionType getStrategyType(); + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinitionType.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinitionType.java new file mode 100644 index 0000000000..a561d6469e --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategyDefinitionType.java @@ -0,0 +1,22 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +public enum ValueStrategyDefinitionType { + + COUNTER, NATURAL, EVENT, SEQUENCE, CONSTANT, COMPOSITE, SCHEDULE, INCREMENT, DECREMENT; + +} diff --git a/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategySchedule.java b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategySchedule.java new file mode 100644 index 0000000000..0bb2ccf8fa --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/solutions/data/values/ValueStrategySchedule.java @@ -0,0 +1,31 @@ +/** + * Copyright © 2016-2026 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.service.solutions.data.values; + +import lombok.Data; + +@Data +public class ValueStrategySchedule { + + private int startHour; + private int startMinute; + + private int endHour; + private int endMinute; + + private ValueStrategyDefinition definition; + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java index a4317b8aa6..8d0c44800c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java @@ -114,6 +114,9 @@ public class DeviceProfile extends BaseData implements HasName, this.description = deviceProfile.getDescription(); this.image = deviceProfile.getImage(); this.isDefault = deviceProfile.isDefault(); + this.type = deviceProfile.getType(); + this.transportType = deviceProfile.getTransportType(); + this.provisionType = deviceProfile.getProvisionType(); this.defaultRuleChainId = deviceProfile.getDefaultRuleChainId(); this.defaultDashboardId = deviceProfile.getDefaultDashboardId(); this.defaultQueueName = deviceProfile.getDefaultQueueName(); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java index e08b686515..544f44cbc2 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/IotHubInstalledItemDescriptor.java @@ -31,7 +31,8 @@ import java.io.Serializable; @Type(name = "DASHBOARD", value = DashboardInstalledItemDescriptor.class), @Type(name = "CALCULATED_FIELD", value = CalculatedFieldInstalledItemDescriptor.class), @Type(name = "RULE_CHAIN", value = RuleChainInstalledItemDescriptor.class), - @Type(name = "DEVICE", value = DeviceInstalledItemDescriptor.class) + @Type(name = "DEVICE", value = DeviceInstalledItemDescriptor.class), + @Type(name = "SOLUTION_TEMPLATE", value = SolutionTemplateInstalledItemDescriptor.class) }) public interface IotHubInstalledItemDescriptor extends Serializable { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/SolutionTemplateInstalledItemDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/SolutionTemplateInstalledItemDescriptor.java new file mode 100644 index 0000000000..51a34576aa --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/iot_hub/SolutionTemplateInstalledItemDescriptor.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2026 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.iot_hub; + +import lombok.Data; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DashboardId; +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.List; + +@Data +public class SolutionTemplateInstalledItemDescriptor implements IotHubInstalledItemDescriptor { + + private List createdEntityIds; + private DashboardId dashboardId; + private CustomerId publicId; + private boolean mainDashboardPublic; + private String details; + +} diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts index 00c0d3e5e1..361062149c 100644 --- a/ui-ngx/src/app/modules/home/components/home-components.module.ts +++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts @@ -207,6 +207,7 @@ import { CheckConnectivityDialogComponent } from '@home/components/ai-model/chec import { AIModelDialogComponent } from '@home/components/ai-model/ai-model-dialog.component'; import { ResourcesDialogComponent } from "@home/components/resources/resources-dialog.component"; import { ResourcesLibraryComponent } from "@home/components/resources/resources-library.component"; +import { SolutionInstallDialogComponent } from '@home/components/solution/solution-install-dialog.component'; @NgModule({ declarations: @@ -362,6 +363,7 @@ import { ResourcesLibraryComponent } from "@home/components/resources/resources- AIModelDialogComponent, ResourcesDialogComponent, ResourcesLibraryComponent, + SolutionInstallDialogComponent, ], imports: [ CommonModule, @@ -511,6 +513,7 @@ import { ResourcesLibraryComponent } from "@home/components/resources/resources- AIModelDialogComponent, ResourcesDialogComponent, ResourcesLibraryComponent, + SolutionInstallDialogComponent, ], providers: [ WidgetComponentService, diff --git a/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.html b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.html new file mode 100644 index 0000000000..e5736bf4f3 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.html @@ -0,0 +1,44 @@ + +
+ +

@if (instructions) {info_outline}{{ (instructions ? 'iot-hub.solution-instructions' : 'iot-hub.solution-install-title') | translate }}

+ + + +
+ +
+
+ + @if (dashboardId) { + + } +
+
diff --git a/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss new file mode 100644 index 0000000000..9b95152b86 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.scss @@ -0,0 +1,50 @@ +/** + * Copyright © 2016-2026 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. + */ + +:host { + h2 { + .mat-icon { + padding-right: 8px; + box-sizing: initial; + vertical-align: sub; + } + } +} + +:host ::ng-deep { + .mat-mdc-dialog-content { + tb-markdown { + .tb-markdown-view { + .table-wrapper { + overflow-y: auto; + margin: 30px 32px; + border: 1px solid rgba(42, 125, 236, .2); + border-radius: 4px; + padding: 0; + width: calc(100% - 64px); + table { + width: 100%; + table-layout: auto; + white-space: nowrap; + margin: 0; + border: 0; + border-radius: 0; + } + } + } + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.ts b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.ts new file mode 100644 index 0000000000..5ef74c4879 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/solution/solution-install-dialog.component.ts @@ -0,0 +1,59 @@ +/// +/// Copyright © 2016-2026 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 { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { SolutionTemplateInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models'; + +export interface SolutionInstallDialogData { + descriptor: SolutionTemplateInstalledItemDescriptor; + instructions?: boolean; +} + +@Component({ + selector: 'tb-solution-install-dialog', + templateUrl: './solution-install-dialog.component.html', + styleUrls: ['./solution-install-dialog.component.scss'], + standalone: false +}) +export class SolutionInstallDialogComponent { + + details: string; + dashboardId: string | null; + instructions: boolean; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: SolutionInstallDialogData, + private dialogRef: MatDialogRef, + private router: Router + ) { + this.details = data.descriptor.details || ''; + this.dashboardId = data.descriptor.dashboardId?.id || null; + this.instructions = !!data.instructions; + } + + gotoMainDashboard(): void { + if (this.dashboardId) { + this.dialogRef.close(); + this.router.navigateByUrl(`/dashboards/${this.dashboardId}`); + } + } + + close(): void { + this.dialogRef.close(); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index 3894da7685..b352a5293b 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -42,6 +42,11 @@ (click)="onTypeTabChange(ItemType.DASHBOARD)"> {{ 'item.type-dashboard' | translate }}s + + {{ 'item.type-solution-template' | translate }}s + diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index a9b7243898..5ca56d4a55 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -42,6 +42,7 @@ interface SortOption { const TYPE_TABS: ItemType[] = [ ItemType.WIDGET, ItemType.DASHBOARD, + ItemType.SOLUTION_TEMPLATE, ItemType.CALCULATED_FIELD, ItemType.RULE_CHAIN, ItemType.DEVICE @@ -296,6 +297,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { switch (this.activeType) { case ItemType.WIDGET: return 'iot-hub.title-widgets'; case ItemType.DASHBOARD: return 'iot-hub.title-dashboards'; + case ItemType.SOLUTION_TEMPLATE: return 'iot-hub.title-solution-templates'; case ItemType.CALCULATED_FIELD: return 'iot-hub.title-calculated-fields'; case ItemType.RULE_CHAIN: return 'iot-hub.title-rule-chains'; case ItemType.DEVICE: return 'iot-hub.title-devices'; @@ -306,6 +308,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { switch (this.activeType) { case ItemType.WIDGET: return 'iot-hub.subtitle-widgets'; case ItemType.DASHBOARD: return 'iot-hub.subtitle-dashboards'; + case ItemType.SOLUTION_TEMPLATE: return 'iot-hub.subtitle-solution-templates'; case ItemType.CALCULATED_FIELD: return 'iot-hub.subtitle-calculated-fields'; case ItemType.RULE_CHAIN: return 'iot-hub.subtitle-rule-chains'; case ItemType.DEVICE: return 'iot-hub.subtitle-devices'; @@ -316,6 +319,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { switch (this.activeType) { case ItemType.WIDGET: return 'iot-hub.search-widgets'; case ItemType.DASHBOARD: return 'iot-hub.search-dashboards'; + case ItemType.SOLUTION_TEMPLATE: return 'iot-hub.search-solution-templates'; case ItemType.CALCULATED_FIELD: return 'iot-hub.search-calculated-fields'; case ItemType.RULE_CHAIN: return 'iot-hub.search-rule-chains'; case ItemType.DEVICE: return 'iot-hub.search-devices'; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts index fd48b0f999..ecb623103d 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -15,16 +15,20 @@ /// import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; -import { IotHubInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { + IotHubInstalledItemDescriptor, + SolutionTemplateInstalledItemDescriptor +} from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TranslateService } from '@ngx-translate/core'; import { EntityType } from '@shared/models/entity-type.models'; import { EntityId } from '@shared/models/id/entity-id'; import { getEntityDetailsPageURL } from '@core/utils'; +import { SolutionInstallDialogComponent } from '@home/components/solution/solution-install-dialog.component'; export interface IotHubInstallDialogData { item: MpItemVersionView; @@ -173,6 +177,7 @@ export class TbIotHubInstallDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) public data: IotHubInstallDialogData, private dialogRef: MatDialogRef, + private dialog: MatDialog, private router: Router, private translate: TranslateService ) { @@ -199,8 +204,17 @@ export class TbIotHubInstallDialogComponent { this.data.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }, data).subscribe({ next: (result) => { if (result.success) { - this.state = 'success'; - this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); + if (result.descriptor?.type === 'SOLUTION_TEMPLATE') { + this.dialogRef.close('installed'); + this.dialog.open(SolutionInstallDialogComponent, { + disableClose: true, + panelClass: 'tb-solution-install-dialog-panel', + data: { descriptor: result.descriptor as SolutionTemplateInstalledItemDescriptor } + }); + } else { + this.state = 'success'; + this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); + } } else { this.state = 'error'; this.errorMessage = result.errorMessage || this.translate.instant('iot-hub.install-error', { name: this.item.name }); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss index d066356922..2897f9416a 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.scss @@ -187,9 +187,9 @@ } .mat-column-itemType { - width: 150px; - min-width: 150px; - max-width: 150px; + width: 170px; + min-width: 170px; + max-width: 170px; } .mat-column-version { @@ -231,6 +231,7 @@ &.tb-type-calc-field { background: #fff3e0; color: #e65100; } &.tb-type-rule-chain { background: #f3e5f5; color: #7b1fa2; } &.tb-type-device { background: #eceff1; color: #455a64; } + &.tb-type-solution-template { background: #e0f7fa; color: #00695c; } } .tb-iot-hub-up-to-date { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts index 317ba59816..31d00f041f 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts @@ -145,6 +145,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { case 'CALCULATED_FIELD': return 'tb-type-calc-field'; case 'RULE_CHAIN': return 'tb-type-rule-chain'; case 'DEVICE': return 'tb-type-device'; + case 'SOLUTION_TEMPLATE': return 'tb-type-solution-template'; default: return ''; } } @@ -169,6 +170,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { case 'DASHBOARD': return descriptor.dashboardId?.id; case 'CALCULATED_FIELD': return descriptor.entityId?.id; case 'RULE_CHAIN': return descriptor.ruleChainId?.id; + case 'SOLUTION_TEMPLATE': return descriptor.dashboardId?.id; default: return null; } } @@ -180,6 +182,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { case 'DASHBOARD': return EntityType.DASHBOARD; case 'CALCULATED_FIELD': return descriptor.entityId?.entityType as EntityType; case 'RULE_CHAIN': return EntityType.RULE_CHAIN; + case 'SOLUTION_TEMPLATE': return EntityType.DASHBOARD; default: return null; } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 87f5502696..995aefa065 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -66,6 +66,7 @@ export class TbIotHubItemCardComponent { case ItemType.CALCULATED_FIELD: return 'preview-calculated-field'; case ItemType.RULE_CHAIN: return 'preview-rule-chain'; case ItemType.DEVICE: return 'preview-device'; + case ItemType.SOLUTION_TEMPLATE: return 'preview-dashboard'; default: return ''; } } @@ -74,6 +75,7 @@ export class TbIotHubItemCardComponent { switch (this.item.type) { case ItemType.WIDGET: return 'widgets'; case ItemType.DASHBOARD: return 'dashboard'; + case ItemType.SOLUTION_TEMPLATE: return 'integration_instructions'; case ItemType.CALCULATED_FIELD: return this.item.icon || cfTypeIcons.get(this.item.dataDescriptor?.cfType) || 'functions'; case ItemType.RULE_CHAIN: diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index 770a6bdf15..dc12d92b31 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -69,15 +69,15 @@
} - - @if (item.type === ItemType.DASHBOARD) { + + @if (item.type === ItemType.DASHBOARD || item.type === ItemType.SOLUTION_TEMPLATE) {
@if (getPreviewUrl(); as url) { } @else {
- dashboard + {{ getTypeIcon() }}
}
@@ -116,7 +116,7 @@ } - @if (item.description && item.type !== ItemType.WIDGET && item.type !== ItemType.DASHBOARD) { + @if (item.description && item.type !== ItemType.WIDGET && item.type !== ItemType.DASHBOARD && item.type !== ItemType.SOLUTION_TEMPLATE) {
{{ item.description }}
} @@ -175,10 +175,21 @@
- @if (isSameVersion()) { - + } + @if (isSameVersion()) { + @if (item.type === ItemType.SOLUTION_TEMPLATE) { + + } @else { + + } } @else if (hasUpdate()) {
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 5ca56d4a55..4a9418eec8 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -26,12 +26,14 @@ import { getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { cfTypeTranslations, widgetTypeTranslations, ruleChainTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; +import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Router } from '@angular/router'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; +import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; interface SortOption { value: string; @@ -90,6 +92,8 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { widgetTypes: Map = widgetTypeTranslations; ruleChainTypes: Map = ruleChainTypeTranslations; + installedSolutionTemplates: IotHubInstalledItem[] = null; + private searchSubject = new Subject(); private destroy$ = new Subject(); @@ -139,6 +143,9 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.activeRuleChainTypes.clear(); this.updateCategories(); this.pageIndex = 0; + if (type === ItemType.SOLUTION_TEMPLATE) { + this.loadInstalledSolutionTemplates(); + } this.loadItems(); } @@ -326,27 +333,62 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } } + getInstalledItem(item: MpItemVersionView): IotHubInstalledItem | undefined { + if (this.activeType !== ItemType.SOLUTION_TEMPLATE || !this.installedSolutionTemplates) { + return undefined; + } + return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); + } + openItemDetail(item: MpItemVersionView): void { this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], autoFocus: false, data: { item, - iotHubApiService: this.iotHubApiService + iotHubApiService: this.iotHubApiService, + installedItem: this.getInstalledItem(item) } as IotHubItemDetailDialogData }); } installItem(item: MpItemVersionView): void { - this.dialog.open(TbIotHubInstallDialogComponent, { + const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], data: { item, iotHubApiService: this.iotHubApiService } as IotHubInstallDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed' && this.activeType === ItemType.SOLUTION_TEMPLATE) { + this.loadItems(); + } + }); } + updateItem(item: MpItemVersionView): void { + const installedItem = this.getInstalledItem(item); + if (!installedItem) { + return; + } + const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { + panelClass: ['tb-dialog'], + data: { + installedItemId: installedItem.id.id, + itemName: item.name, + itemType: item.type, + version: item.version, + versionId: item.id, + iotHubApiService: this.iotHubApiService + } as IotHubUpdateDialogData + }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'updated' && this.activeType === ItemType.SOLUTION_TEMPLATE) { + this.loadItems(); + } + }); + } navigateToCreator(creatorId: string): void { this.router.navigate(['/iot-hub/creator', creatorId]); @@ -356,6 +398,18 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.router.navigate(['/iot-hub/installed']); } + private loadInstalledSolutionTemplates(): void { + if (this.installedSolutionTemplates !== null) { + return; + } + const pageLink = new PageLink(10000, 0); + this.iotHubApiService.getInstalledItems(pageLink, ItemType.SOLUTION_TEMPLATE, {ignoreLoading: true}).subscribe({ + next: (data) => { + this.installedSolutionTemplates = data.data; + } + }); + } + private updateCategories(): void { this.categories = getCategoriesForType(this.activeType); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts index 31d00f041f..a8401a2313 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-installed-items.component.ts @@ -258,7 +258,7 @@ export class TbIotHubInstalledItemsComponent implements OnInit, AfterViewInit { direction: this.sort?.direction === 'asc' ? Direction.ASC : Direction.DESC }; const pageLink = new PageLink(this.pageSize, this.pageIndex, this.textSearch || null, sortOrder); - this.iotHubApiService.getInstalledItems(pageLink, {ignoreLoading: true}).subscribe({ + this.iotHubApiService.getInstalledItems(pageLink, null, {ignoreLoading: true}).subscribe({ next: (data) => { this.dataSource = data.data; this.totalElements = data.totalElements; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 1750548a2a..94be8cb80b 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -100,7 +100,15 @@ download {{ item.totalInstallCount | shortNumber }} - + @if (isInstalled()) { + @if (isSameVersion()) { + {{ 'iot-hub.installed' | translate }} + } @else { + + } + } @else { + + }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index afe2357bb3..2fc96ecd8d 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -349,4 +349,32 @@ } } + .tb-iot-hub-card-installed-label { + padding: 5px 14px; + border-radius: 6px; + background: #e8f5e9; + color: #2e7d32; + font-size: 12px; + font-weight: 600; + white-space: nowrap; + } + + .tb-iot-hub-card-update-btn { + padding: 5px 14px; + border-radius: 6px; + border: 1px solid #f57c00; + background: transparent; + color: #f57c00; + font-size: 12px; + font-weight: 600; + cursor: pointer; + white-space: nowrap; + transition: all 0.15s; + + &:hover { + background: #f57c00; + color: #fff; + } + } + } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 995aefa065..c43ba55e03 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -17,6 +17,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, NodeInfo, nodeComponentTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; import { ItemType, itemTypeTranslations, getCategoriesForType, useCaseTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { TranslateService } from '@ngx-translate/core'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; @@ -33,11 +34,13 @@ export class TbIotHubItemCardComponent { readonly maxVisibleNodes = 2; @Input() item: MpItemVersionView; + @Input() installedItem: IotHubInstalledItem; @Input() showCreator = true; @Input() showTypeChip = true; @Output() cardClick = new EventEmitter(); @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); + @Output() updateClick = new EventEmitter(); typeTranslations = itemTypeTranslations; @@ -184,6 +187,14 @@ export class TbIotHubItemCardComponent { } } + isInstalled(): boolean { + return !!this.installedItem; + } + + isSameVersion(): boolean { + return this.installedItem?.itemVersionId === this.item.id; + } + onCardClick(): void { this.cardClick.emit(this.item); } @@ -193,6 +204,11 @@ export class TbIotHubItemCardComponent { this.installClick.emit(this.item); } + onUpdateClick(event: MouseEvent): void { + event.stopPropagation(); + this.updateClick.emit(this.item); + } + onCreatorClick(event: MouseEvent): void { event.stopPropagation(); this.creatorClick.emit(this.item.creatorId); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index dc12d92b31..fc6980ccad 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -69,8 +69,8 @@
} - - @if (item.type === ItemType.DASHBOARD || item.type === ItemType.SOLUTION_TEMPLATE) { + + @if (item.type === ItemType.DASHBOARD) {
@if (getPreviewUrl(); as url) { @@ -87,6 +87,60 @@
} + + @if (item.type === ItemType.SOLUTION_TEMPLATE) { +
+ @if (carouselImages.length > 1) { +
+ +
+
+ +
+
+ + + + + + + +
+ + +
+ } @else { +
+ @if (getPreviewUrl(); as url) { + + } @else { +
+ {{ getTypeIcon() }} +
+ } +
+ } + @if (item.description) { +
{{ item.description }}
+ } +
+ } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss index 5c4404b1c8..378a6d9b44 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss @@ -215,6 +215,90 @@ line-height: 1.6; } +// Image carousel +.dlg-hero-carousel { + background: #f5f7fa; + border-radius: 8px; + overflow: hidden; + position: relative; + height: 340px; + animation: dlg-carousel-fade-in 0s 0.3s forwards; + visibility: hidden; +} + +@keyframes dlg-carousel-fade-in { + to { + visibility: visible; + } +} + +.dlg-carousel { + height: 340px; + + ::ng-deep .carousel { + display: flex !important; + flex-direction: column !important; + + > section { + flex: 1; + min-height: 0; + } + + ul.indicators { + position: relative !important; + bottom: auto !important; + flex-shrink: 0; + padding: 8px 0; + } + + .direction { + height: calc(100% - 40px) !important; + } + } + + .dlg-carousel-container { + display: flex; + height: 100%; + + .dlg-carousel-item { + position: relative; + overflow: hidden; + + img { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: contain; + padding: 8px; + } + } + } +} + +.dlg-carousel-nav { + color: rgba(0, 0, 0, 0.6); + background: rgba(255, 255, 255, 0.8); + + &:hover { + background: rgba(255, 255, 255, 0.95); + } +} + +.dlg-carousel-dot { + width: 8px; + height: 8px; + border-radius: 50%; + background: rgba(0, 0, 0, 0.2); + margin: 0 3px; + transition: background 0.2s; + + &.active { + background: rgba(0, 0, 0, 0.6); + } +} + // Stats bar .dlg-stats-bar { display: flex; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts index d2fe0f4833..64f6b33f0a 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.ts @@ -48,6 +48,8 @@ export class TbIotHubItemDetailDialogComponent { typeTranslations = itemTypeTranslations; readmeContent: string = ''; installedItem?: IotHubInstalledItem; + carouselImages: string[] = []; + carouselIndex = 0; private categoryMap: Map; private useCaseMap = useCaseTranslations; @@ -62,6 +64,7 @@ export class TbIotHubItemDetailDialogComponent { this.item = data.item; this.installedItem = data.installedItem; this.categoryMap = getCategoriesForType(this.item.type); + this.buildCarouselImages(); this.loadReadme(); } @@ -321,6 +324,19 @@ export class TbIotHubItemDetailDialogComponent { this.dialogRef.close(); } + private buildCarouselImages(): void { + if (this.item.type !== ItemType.SOLUTION_TEMPLATE || !this.item.resources?.length) { + return; + } + const screenshotResources = this.item.resources.filter(r => r.type === 'SCREENSHOT'); + const allResources = screenshotResources.length > 0 + ? screenshotResources + : this.item.resources.filter(r => r.type === 'ICON'); + this.carouselImages = allResources.map(r => + this.data.iotHubApiService.resolveResourceUrl(`/api/resources/${r.id}`) + ); + } + private loadReadme(): void { const versionId = this.item.id as string; this.data.iotHubApiService.getVersionReadme(versionId, { ignoreLoading: true }).subscribe( diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts index 7c646de3c4..c495c7be46 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-update-dialog.component.ts @@ -15,15 +15,19 @@ /// import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; -import { IotHubInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models'; +import { + IotHubInstalledItemDescriptor, + SolutionTemplateInstalledItemDescriptor +} from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { DialogService } from '@core/services/dialog.service'; import { TranslateService } from '@ngx-translate/core'; import { EntityType } from '@shared/models/entity-type.models'; import { getEntityDetailsPageURL } from '@core/utils'; +import { SolutionInstallDialogComponent } from '@home/components/solution/solution-install-dialog.component'; export interface IotHubUpdateDialogData { installedItemId: string; @@ -151,6 +155,7 @@ export class TbIotHubUpdateDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) public data: IotHubUpdateDialogData, private dialogRef: MatDialogRef, + private dialog: MatDialog, private dialogService: DialogService, private router: Router, private translate: TranslateService @@ -166,8 +171,17 @@ export class TbIotHubUpdateDialogComponent { this.data.iotHubApiService.updateItemVersion(this.data.installedItemId, this.data.versionId, { ignoreLoading: true }, force).subscribe({ next: (result) => { if (result.success) { - this.state = 'success'; - this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); + if (result.descriptor?.type === 'SOLUTION_TEMPLATE') { + this.dialogRef.close('updated'); + this.dialog.open(SolutionInstallDialogComponent, { + disableClose: true, + panelClass: 'tb-solution-install-dialog-panel', + data: { descriptor: result.descriptor as SolutionTemplateInstalledItemDescriptor } + }); + } else { + this.state = 'success'; + this.entityDetailsUrl = this.resolveEntityDetailsUrl(result.descriptor); + } } else if (result.entityModified) { this.state = 'confirm'; this.dialogService.confirm( diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts index 7ff055fc61..1d5637e2d0 100644 --- a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts +++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts @@ -77,6 +77,11 @@ export const ruleChainTypeTranslations = new Map([ ['EDGE', 'item-data.rule-chain-type-edge'], ]); +export interface MpItemVersionResource { + id: string; + type: string; +} + export interface MpItemVersionView { id: string; createdTime: number; @@ -103,6 +108,7 @@ export interface MpItemVersionView { creatorAvatarUrl: string; installCount: number; totalInstallCount: number; + resources: MpItemVersionResource[]; } export class MpItemVersionQuery { From 765164705078b76b56df65e2934cbbbfae8d9dfe Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 31 Mar 2026 18:52:26 +0300 Subject: [PATCH 007/219] Add IoT Hub home page with interactive hero, category cards, and popular items - Create TbIotHubHomeComponent as default route at /iot-hub - Move browse page to /iot-hub/browse, accept type/search query params - Interactive hero: hoverable keywords cycle through item types with color changes, background gradient transitions, and floating icon animations - Page load animation: hero and categories fade in with slide (down/up) - Category cards: 3x2 grid with exact Figma gradients and separated title/image layout - Popular sections: 5-column grid for widgets/dashboards/solutions, 3-column grid for calculated fields/rule chains - Become a Creator footer section - Export category card images and hero floating icons from Figma - Add plural item type translations and home page locale keys --- .../pages/iot-hub/iot-hub-browse.component.ts | 14 +- .../pages/iot-hub/iot-hub-home.component.html | 200 +++++++++ .../pages/iot-hub/iot-hub-home.component.scss | 419 ++++++++++++++++++ .../pages/iot-hub/iot-hub-home.component.ts | 222 ++++++++++ .../pages/iot-hub/iot-hub-routing.module.ts | 15 +- .../home/pages/iot-hub/iot-hub.module.ts | 2 + .../category-calculated-fields-img.svg | 233 ++++++++++ .../iot-hub/category-dashboards-img.svg | 84 ++++ .../iot-hub/category-device-library-img.svg | 95 ++++ .../iot-hub/category-rule-chains-img.svg | 107 +++++ .../category-solution-templates-img.png | Bin 0 -> 130222 bytes .../assets/iot-hub/category-widgets-img.svg | 181 ++++++++ .../assets/iot-hub/hero-dashboard-icon-1.svg | 30 ++ .../assets/iot-hub/hero-dashboard-icon-2.svg | 25 ++ .../assets/iot-hub/hero-dashboard-icon-3.svg | 30 ++ .../assets/iot-hub/hero-dashboard-icon-4.svg | 30 ++ .../src/assets/iot-hub/hero-widget-icon-1.svg | 27 ++ .../src/assets/iot-hub/hero-widget-icon-2.svg | 25 ++ .../src/assets/iot-hub/hero-widget-icon-3.svg | 35 ++ .../src/assets/iot-hub/hero-widget-icon-4.svg | 35 ++ .../assets/locale/locale.constant-en_US.json | 20 +- 21 files changed, 1825 insertions(+), 4 deletions(-) create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts create mode 100644 ui-ngx/src/assets/iot-hub/category-calculated-fields-img.svg create mode 100644 ui-ngx/src/assets/iot-hub/category-dashboards-img.svg create mode 100644 ui-ngx/src/assets/iot-hub/category-device-library-img.svg create mode 100644 ui-ngx/src/assets/iot-hub/category-rule-chains-img.svg create mode 100644 ui-ngx/src/assets/iot-hub/category-solution-templates-img.png create mode 100644 ui-ngx/src/assets/iot-hub/category-widgets-img.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 4a9418eec8..083b858c70 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -30,7 +30,7 @@ import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-it import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; @@ -101,7 +101,8 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { private iotHubApiService: IotHubApiService, private dialog: MatDialog, private translate: TranslateService, - private router: Router + private router: Router, + private route: ActivatedRoute ) {} ngOnInit(): void { @@ -112,6 +113,15 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.pageIndex = 0; this.loadItems(); }); + if (!this.embedded) { + const params = this.route.snapshot.queryParams; + if (params['type'] && Object.values(ItemType).includes(params['type'])) { + this.activeType = params['type'] as ItemType; + } + if (params['search']) { + this.textSearch = params['search']; + } + } this.updateCategories(); this.loadItems(); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html new file mode 100644 index 0000000000..8794fe53b1 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html @@ -0,0 +1,200 @@ + +
+ +
+ +
+ + + @for (heroType of heroTypes; track heroType.type) { + @if (heroType.icons.length) { +
+ @for (iconUrl of heroType.icons; track iconUrl; let i = $index) { + + } +
+ } + } + +
+

{{ 'iot-hub.home-title' | translate }}

+
+ {{ 'iot-hub.home-subtitle-prefix' | translate }} + @for (ht of heroTypes; track ht.type; let last = $last) { + {{ ht.labelKey | translate }}@if (!last) {,} + } +
+ + + + +
+
+ + +
+ @for (card of categoryCards; track card.type) { +
+ {{ card.titleKey | translate }} + +
+ } +
+ + @if (!isLoading) { + + @if (popularWidgets.length) { +
+ + {{ 'iot-hub.popular-widgets' | translate }} + chevron_right + +
+ @for (item of popularWidgets; track item.id) { + + + } +
+
+ } + + + @if (popularDashboards.length) { +
+ + {{ 'iot-hub.popular-dashboards' | translate }} + chevron_right + +
+ @for (item of popularDashboards; track item.id) { + + + } +
+
+ } + + + @if (popularSolutionTemplates.length) { +
+ + {{ 'iot-hub.popular-solution-templates' | translate }} + chevron_right + +
+ @for (item of popularSolutionTemplates; track item.id) { + + + } +
+
+ } + + + @if (popularCalcFields.length) { +
+ + {{ 'iot-hub.popular-calculated-fields' | translate }} + chevron_right + +
+ @for (item of popularCalcFields; track item.id) { + + + } +
+
+ } + + + @if (popularRuleChains.length) { +
+ + {{ 'iot-hub.popular-rule-chains' | translate }} + chevron_right + +
+ @for (item of popularRuleChains; track item.id) { + + + } +
+
+ } + + +
+
+

{{ 'iot-hub.become-a-creator' | translate }}

+

{{ 'iot-hub.become-creator-text' | translate }}

+ +
+ } + + @if (isLoading) { +
+ +
+ } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss new file mode 100644 index 0000000000..401d9ec234 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss @@ -0,0 +1,419 @@ +/** + * Copyright © 2016-2026 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. + */ + +// Outer page — 16px padding around the white container +:host { + display: block; + padding: 16px; +} + +// Page container — white card with 8px radius, matches Figma "page-container" +.tb-iot-hub-home { + position: relative; + background: white; + border-radius: 8px; + overflow: hidden; + + // Dot grid pattern — covers top 800px, fades out via gradient mask + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + height: 800px; + background-image: radial-gradient(circle, rgba(0, 0, 0, 0.1) 1px, transparent 1px); + background-size: 20px 20px; + mask-image: linear-gradient(to bottom, black 0%, transparent 100%); + -webkit-mask-image: linear-gradient(to bottom, black 0%, transparent 100%); + pointer-events: none; + z-index: 0; + } + + > * { + position: relative; + z-index: 1; + } +} + +// Hero section +.tb-iot-hub-hero { + text-align: center; + padding: 140px 40px 80px; + position: relative; + overflow: hidden; +} + +// Animated background gradient +.tb-iot-hub-hero-gradient { + position: absolute; + inset: 0; + transition: background 0.6s ease; + pointer-events: none; +} + +// Floating icons container per type +.tb-iot-hub-hero-icons { + position: absolute; + inset: 0; + pointer-events: none; + + // Icons start near center (translate toward center, scaled down, invisible) + .tb-iot-hub-hero-float-icon { + opacity: 0; + transform: var(--icon-rotation) translate(var(--start-x), var(--start-y)) scale(0.9); + transition: opacity 0.5s ease, transform 0.6s cubic-bezier(0.34, 1.56, 0.64, 1); + } + + // Active: icons move outward to final position, scale to 1, fully visible + &.active .tb-iot-hub-hero-float-icon { + opacity: 1; + transform: var(--icon-rotation) translate(0, 0) scale(1); + } +} + +// Individual floating icon — final (resting) positions match Figma +.tb-iot-hub-hero-float-icon { + position: absolute; + width: 64px; + height: 64px; + + // Top-left: moves from center-right and center-down to final pos + &.icon-pos-1 { + top: 40px; + left: 23%; + --icon-rotation: rotate(-15deg); + --start-x: 40px; + --start-y: 12px; + } + + // Top-right: moves from center-left and center-down + &.icon-pos-2 { + top: 40px; + right: 23%; + --icon-rotation: rotate(15deg); + --start-x: -40px; + --start-y: 12px; + } + + // Bottom-left: moves from center-right and center-up + &.icon-pos-3 { + bottom: 100px; + left: 18%; + --icon-rotation: rotate(-30deg); + --start-x: 50px; + --start-y: -8px; + } + + // Bottom-right: moves from center-left and center-up + &.icon-pos-4 { + bottom: 100px; + right: 18%; + --icon-rotation: rotate(30deg); + --start-x: -45px; + --start-y: -4px; + } +} + +.tb-iot-hub-hero-content { + display: flex; + flex-direction: column; + align-items: center; + gap: 40px; + position: relative; + z-index: 1; +} + +.tb-iot-hub-hero-title { + font-size: 56px; + font-weight: 500; + line-height: 1.2; + letter-spacing: 0.14px; + color: rgba(0, 0, 0, 0.87); + margin: 0; +} + +.tb-iot-hub-hero-subtitle { + font-size: 20px; + line-height: 24px; + letter-spacing: 0.1px; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 6px; +} + +.tb-iot-hub-hero-prefix { + font-weight: 400; + color: rgba(0, 0, 0, 0.76); +} + +.tb-iot-hub-hero-keyword { + font-weight: 600; + color: rgba(0, 0, 0, 0.54); + opacity: 0.48; + cursor: pointer; + transition: color 0.3s ease, opacity 0.3s ease; + + &.active { + color: var(--keyword-color); + opacity: 1; + } + + &:hover { + opacity: 0.8; + } +} + +.tb-iot-hub-hero-search { + width: 600px; + max-width: 100%; + + ::ng-deep .mat-mdc-text-field-wrapper { + background: white; + border-radius: 8px; + box-shadow: + 0 7px 16px 0 rgba(0, 0, 0, 0.04), + 0 29px 29px 0 rgba(0, 0, 0, 0.03), + 0 64px 38px 0 rgba(0, 0, 0, 0.02); + } + + .mat-mdc-form-field-subscript-wrapper { + display: none; + } +} + +// Category cards — Figma: centered 1200px container, flex-col gap=20, pb=48, 3-col rows +.tb-iot-hub-categories { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 20px; + max-width: 1200px; + margin: 0 auto; + padding-bottom: 48px; +} + +// Card — Figma: flex-col, gap=24, pt=24, rounded-8, border, overflow-clip, h=220 +.tb-iot-hub-category-card { + height: 220px; + border-radius: 8px; + cursor: pointer; + display: flex; + flex-direction: column; + align-items: center; + gap: 24px; + padding-top: 24px; + transition: transform 0.2s, box-shadow 0.2s; + border: 1px solid rgba(0, 0, 0, 0.12); + overflow: hidden; + + &:hover { + transform: translateY(-2px); + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); + } +} + +// Title — Figma: 18px Medium, centered, tracking=0.15, flex child +.tb-iot-hub-category-title { + font-size: 18px; + font-weight: 500; + line-height: 24px; + letter-spacing: 0.15px; + color: rgba(0, 0, 0, 0.87); + text-align: center; + width: 100%; + flex-shrink: 0; +} + +// Card image — Figma: h=148, w=full, overflow-clip, fills remaining space +.tb-iot-hub-category-img { + width: 100%; + height: 148px; + object-fit: cover; + flex-shrink: 0; +} + +// Exact Figma gradients (104.75deg angle) +.category-widgets { + background: linear-gradient(104.75deg, rgb(240, 255, 245) 0%, rgb(147, 246, 182) 100%); +} + +.category-dashboards { + background: linear-gradient(104.75deg, rgb(245, 246, 255) 0%, rgb(189, 197, 255) 100%); +} + +.category-solutions { + background: linear-gradient(104.75deg, rgb(245, 250, 255) 0%, rgb(149, 200, 255) 100%); +} + +.category-calc-fields { + background: linear-gradient(104.75deg, rgb(245, 252, 255) 0%, rgb(149, 222, 248) 100%); +} + +.category-rule-chains { + background: linear-gradient(104.75deg, rgb(255, 252, 245) 0%, rgb(255, 238, 194) 100%); +} + +.category-devices { + background: linear-gradient(104.75deg, rgb(245, 255, 252) 0%, rgb(147, 240, 213) 100%); +} + +// Sections — matches Figma "items-section" (px=40, gap between sections ~48px) +.tb-iot-hub-section { + padding: 0 40px; + margin-top: 48px; +} + +// Section header — matches Figma "button" (height=40, font-size=20, font-weight=500) +.tb-iot-hub-section-header { + display: inline-flex; + align-items: center; + gap: 4px; + font-size: 20px; + font-weight: 500; + line-height: 40px; + color: rgba(0, 0, 0, 0.87); + cursor: pointer; + text-decoration: none; + + mat-icon { + font-size: 20px; + width: 20px; + height: 20px; + } + + &:hover { + color: #00695c; + } +} + +// Big card row — matches Figma "cards-row" (5 cards, gap=20, mt=12 from header) +.tb-iot-hub-big-cards-row { + display: grid; + grid-template-columns: repeat(5, 1fr); + gap: 20px; + margin-top: 12px; +} + +// Compact card grid — matches Figma "cards" (3 columns, row gap=20, col gap=20) +.tb-iot-hub-compact-cards-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 20px; + margin-top: 12px; +} + +// Divider — matches Figma "divider" (1px, rgba(0,0,0,0.12)) +.tb-iot-hub-divider { + height: 1px; + background: rgba(0, 0, 0, 0.12); + margin: 48px 0 0; +} + +// Become a Creator — matches Figma (pt=64, text centered, button at y=156) +.tb-iot-hub-become-creator { + text-align: center; + padding: 64px 40px; + + h2 { + font-size: 24px; + font-weight: 500; + line-height: 32px; + color: rgba(0, 0, 0, 0.87); + margin: 0 0 8px; + } + + p { + font-size: 14px; + line-height: 20px; + color: rgba(0, 0, 0, 0.54); + margin: 0 0 32px; + } +} + +// Loading +.tb-iot-hub-loading { + display: flex; + justify-content: center; + padding: 80px 0; +} + +// Page load animation — Figma: Default→appear-first, Smart Animate 1.02s, Gentle easing +// Hero elements fade in + slide DOWN 20px; categories fade in + slide UP 20px +@keyframes iot-hub-fade-slide-down { + from { + opacity: 0; + transform: translateY(-20px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes iot-hub-fade-slide-up { + from { + opacity: 0; + transform: translateY(20px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +.tb-iot-hub-hero-title, +.tb-iot-hub-hero-subtitle, +.tb-iot-hub-hero-search { + animation: iot-hub-fade-slide-down 1s cubic-bezier(0.19, 1, 0.22, 1) 0.2s both; +} + +.tb-iot-hub-categories { + animation: iot-hub-fade-slide-up 1s cubic-bezier(0.19, 1, 0.22, 1) 0.2s both; +} + +// Responsive +@media (max-width: 1200px) { + .tb-iot-hub-big-cards-row { + grid-template-columns: repeat(3, 1fr); + } + + .tb-iot-hub-compact-cards-grid { + grid-template-columns: repeat(2, 1fr); + } +} + +@media (max-width: 900px) { + .tb-iot-hub-categories { + grid-template-columns: repeat(2, 1fr); + + .tb-iot-hub-category-card { + height: 180px; + } + } + + .tb-iot-hub-big-cards-row { + grid-template-columns: repeat(2, 1fr); + } + + .tb-iot-hub-hero-title { + font-size: 36px; + } + + .tb-iot-hub-hero { + padding: 80px 24px 40px; + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts new file mode 100644 index 0000000000..e0633aa243 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts @@ -0,0 +1,222 @@ +/// +/// Copyright © 2016-2026 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 { Component, OnInit, OnDestroy } from '@angular/core'; +import { Router } from '@angular/router'; +import { MatDialog } from '@angular/material/dialog'; +import { forkJoin } from 'rxjs'; +import { PageLink } from '@shared/models/page/page-link'; +import { Direction, SortOrder } from '@shared/models/page/sort-order'; +import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; +import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; +import { IotHubApiService } from '@core/http/iot-hub-api.service'; +import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; +import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; + +interface CategoryCard { + type: ItemType; + titleKey: string; + icon: string; + cssClass: string; + image: string; +} + +interface HeroTypeConfig { + type: ItemType; + labelKey: string; + color: string; + gradientColor: string; + icons: string[]; +} + +@Component({ + selector: 'tb-iot-hub-home', + standalone: false, + templateUrl: './iot-hub-home.component.html', + styleUrls: ['./iot-hub-home.component.scss'] +}) +export class TbIotHubHomeComponent implements OnInit, OnDestroy { + + readonly ItemType = ItemType; + + searchText = ''; + + heroTypes: HeroTypeConfig[] = [ + { + type: ItemType.WIDGET, labelKey: 'item.type-widget-plural', color: '#2c9755', + gradientColor: 'rgba(44, 151, 85, 0.1)', + icons: ['assets/iot-hub/hero-widget-icon-1.svg', 'assets/iot-hub/hero-widget-icon-2.svg', 'assets/iot-hub/hero-widget-icon-3.svg', 'assets/iot-hub/hero-widget-icon-4.svg'] + }, + { + type: ItemType.DASHBOARD, labelKey: 'item.type-dashboard-plural', color: '#4d5fd0', + gradientColor: 'rgba(77, 95, 208, 0.1)', + icons: ['assets/iot-hub/hero-dashboard-icon-1.svg', 'assets/iot-hub/hero-dashboard-icon-2.svg', 'assets/iot-hub/hero-dashboard-icon-3.svg', 'assets/iot-hub/hero-dashboard-icon-4.svg'] + }, + { + type: ItemType.SOLUTION_TEMPLATE, labelKey: 'item.type-solution-template-plural', color: '#2666a9', + gradientColor: 'rgba(38, 102, 169, 0.1)', icons: [] + }, + { + type: ItemType.CALCULATED_FIELD, labelKey: 'item.type-calculated-field-plural', color: '#006d92', + gradientColor: 'rgba(0, 109, 146, 0.1)', icons: [] + }, + { + type: ItemType.RULE_CHAIN, labelKey: 'item.type-rule-chain-plural', color: '#95694b', + gradientColor: 'rgba(149, 105, 75, 0.1)', icons: [] + }, + { + type: ItemType.DEVICE, labelKey: 'iot-hub.and-devices', color: '#4b8a79', + gradientColor: 'rgba(75, 138, 121, 0.1)', icons: [] + } + ]; + + activeHeroType: HeroTypeConfig = this.heroTypes[0]; + heroIconsReady = false; + private heroInterval: any; + + categoryCards: CategoryCard[] = [ + { type: ItemType.WIDGET, titleKey: 'item.type-widget-plural', icon: 'widgets', cssClass: 'category-widgets', image: 'assets/iot-hub/category-widgets-img.svg' }, + { type: ItemType.DASHBOARD, titleKey: 'item.type-dashboard-plural', icon: 'dashboard', cssClass: 'category-dashboards', image: 'assets/iot-hub/category-dashboards-img.svg' }, + { type: ItemType.SOLUTION_TEMPLATE, titleKey: 'item.type-solution-template-plural', icon: 'integration_instructions', cssClass: 'category-solutions', image: 'assets/iot-hub/category-solution-templates-img.png' }, + { type: ItemType.CALCULATED_FIELD, titleKey: 'item.type-calculated-field-plural', icon: 'functions', cssClass: 'category-calc-fields', image: 'assets/iot-hub/category-calculated-fields-img.svg' }, + { type: ItemType.RULE_CHAIN, titleKey: 'item.type-rule-chain-plural', icon: 'account_tree', cssClass: 'category-rule-chains', image: 'assets/iot-hub/category-rule-chains-img.svg' }, + { type: ItemType.DEVICE, titleKey: 'iot-hub.device-library', icon: 'memory', cssClass: 'category-devices', image: 'assets/iot-hub/category-device-library-img.svg' } + ]; + + popularWidgets: MpItemVersionView[] = []; + popularDashboards: MpItemVersionView[] = []; + popularSolutionTemplates: MpItemVersionView[] = []; + popularCalcFields: MpItemVersionView[] = []; + popularRuleChains: MpItemVersionView[] = []; + + isLoading = true; + + constructor( + private router: Router, + private dialog: MatDialog, + private iotHubApiService: IotHubApiService + ) {} + + ngOnInit(): void { + this.loadPopularItems(); + // One-tick delay so Angular renders icons in hidden state first, then triggers transition + requestAnimationFrame(() => { + this.heroIconsReady = true; + this.startHeroCycle(); + }); + } + + ngOnDestroy(): void { + this.stopHeroCycle(); + } + + onHeroTypeHover(config: HeroTypeConfig): void { + this.stopHeroCycle(); + this.activeHeroType = config; + } + + onHeroTypeLeave(): void { + this.startHeroCycle(); + } + + private startHeroCycle(): void { + this.stopHeroCycle(); + this.heroInterval = setInterval(() => { + const idx = this.heroTypes.indexOf(this.activeHeroType); + this.activeHeroType = this.heroTypes[(idx + 1) % this.heroTypes.length]; + }, 3000); + } + + private stopHeroCycle(): void { + if (this.heroInterval) { + clearInterval(this.heroInterval); + this.heroInterval = null; + } + } + + onSearch(): void { + if (this.searchText?.trim()) { + this.router.navigate(['/iot-hub/browse'], { queryParams: { search: this.searchText.trim() } }); + } + } + + navigateToBrowse(type: ItemType): void { + this.router.navigate(['/iot-hub/browse'], { queryParams: { type } }); + } + + navigateToInstalledItems(): void { + this.router.navigate(['/iot-hub/installed']); + } + + openItemDetail(item: MpItemVersionView): void { + this.dialog.open(TbIotHubItemDetailDialogComponent, { + panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], + autoFocus: false, + data: { + item, + iotHubApiService: this.iotHubApiService + } as IotHubItemDetailDialogData + }); + } + + installItem(item: MpItemVersionView): void { + this.dialog.open(TbIotHubInstallDialogComponent, { + panelClass: ['tb-dialog'], + data: { + item, + iotHubApiService: this.iotHubApiService + } as IotHubInstallDialogData + }); + } + + navigateToCreator(creatorId: string): void { + this.router.navigate(['/iot-hub/creator', creatorId]); + } + + openSignup(): void { + window.open('https://iothub.thingsboard.io/signup', '_blank'); + } + + private loadPopularItems(): void { + const sortOrder: SortOrder = { property: 'totalInstallCount', direction: Direction.DESC }; + const config = { ignoreLoading: true }; + + const buildQuery = (type: ItemType, size: number): MpItemVersionQuery => { + const pageLink = new PageLink(size, 0, null, sortOrder); + return new MpItemVersionQuery(pageLink, type); + }; + + forkJoin({ + widgets: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.WIDGET, 5), config), + dashboards: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.DASHBOARD, 5), config), + solutionTemplates: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.SOLUTION_TEMPLATE, 5), config), + calcFields: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.CALCULATED_FIELD, 6), config), + ruleChains: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.RULE_CHAIN, 6), config) + }).subscribe({ + next: (results) => { + this.popularWidgets = results.widgets.data; + this.popularDashboards = results.dashboards.data; + this.popularSolutionTemplates = results.solutionTemplates.data; + this.popularCalcFields = results.calcFields.data; + this.popularRuleChains = results.ruleChains.data; + this.isLoading = false; + }, + error: () => { + this.isLoading = false; + } + }); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts index 33580a26bd..040bf2ef5c 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-routing.module.ts @@ -18,6 +18,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { Authority } from '@shared/models/authority.enum'; +import { TbIotHubHomeComponent } from './iot-hub-home.component'; import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; import { TbIotHubInstalledItemsComponent } from './iot-hub-installed-items.component'; @@ -35,10 +36,22 @@ const routes: Routes = [ children: [ { path: '', + component: TbIotHubHomeComponent, + data: { + auth: [Authority.TENANT_ADMIN], + title: 'iot-hub.iot-hub' + } + }, + { + path: 'browse', component: TbIotHubBrowseComponent, data: { auth: [Authority.TENANT_ADMIN], - title: 'iot-hub.browse' + title: 'iot-hub.browse', + breadcrumb: { + label: 'iot-hub.browse', + icon: 'search' + } } }, { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts index 94110fb092..092dbc401c 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub.module.ts @@ -18,6 +18,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { IotHubRoutingModule } from './iot-hub-routing.module'; +import { TbIotHubHomeComponent } from './iot-hub-home.component'; import { TbIotHubBrowseComponent } from './iot-hub-browse.component'; import { TbIotHubCreatorProfileComponent } from './iot-hub-creator-profile.component'; import { TbIotHubItemDetailDialogComponent } from './iot-hub-item-detail-dialog.component'; @@ -28,6 +29,7 @@ import { TbIotHubUpdateDialogComponent } from './iot-hub-update-dialog.component @NgModule({ declarations: [ + TbIotHubHomeComponent, TbIotHubBrowseComponent, TbIotHubCreatorProfileComponent, TbIotHubItemDetailDialogComponent, diff --git a/ui-ngx/src/assets/iot-hub/category-calculated-fields-img.svg b/ui-ngx/src/assets/iot-hub/category-calculated-fields-img.svg new file mode 100644 index 0000000000..e74a12f489 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/category-calculated-fields-img.svg @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/category-dashboards-img.svg b/ui-ngx/src/assets/iot-hub/category-dashboards-img.svg new file mode 100644 index 0000000000..2db1d0fafa --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/category-dashboards-img.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/category-device-library-img.svg b/ui-ngx/src/assets/iot-hub/category-device-library-img.svg new file mode 100644 index 0000000000..57b90cde55 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/category-device-library-img.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/category-rule-chains-img.svg b/ui-ngx/src/assets/iot-hub/category-rule-chains-img.svg new file mode 100644 index 0000000000..09bd6882da --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/category-rule-chains-img.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/category-solution-templates-img.png b/ui-ngx/src/assets/iot-hub/category-solution-templates-img.png new file mode 100644 index 0000000000000000000000000000000000000000..efcd683abdd28d84f26f5d223b85e521a27a20ba GIT binary patch literal 130222 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˜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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg new file mode 100644 index 0000000000..471177f37b --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg new file mode 100644 index 0000000000..3e453e4b17 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg new file mode 100644 index 0000000000..fc733a6dc8 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg new file mode 100644 index 0000000000..949f7c267d --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg new file mode 100644 index 0000000000..9740f9c55a --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg new file mode 100644 index 0000000000..1d02f2d107 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg new file mode 100644 index 0000000000..0bd4d29731 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg new file mode 100644 index 0000000000..37d0c227b0 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 4ebba5fd38..7b82928c68 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3684,14 +3684,32 @@ "item": { "selected": "Selected", "type-widget": "Widget", + "type-widget-plural": "Widgets", "type-dashboard": "Dashboard", + "type-dashboard-plural": "Dashboards", "type-solution-template": "Solution Template", + "type-solution-template-plural": "Solution Templates", "type-calculated-field": "Calculated Field", + "type-calculated-field-plural": "Calculated Fields", "type-rule-chain": "Rule Chain", - "type-device": "Device" + "type-rule-chain-plural": "Rule Chains", + "type-device": "Device", + "type-device-plural": "Devices" }, "iot-hub": { "iot-hub": "IoT Hub", + "home-title": "ThingsBoard IoT Hub", + "home-subtitle-prefix": "Discover ready-to-use", + "and-devices": "& Devices", + "search-placeholder": "Search in IoT Hub...", + "device-library": "Device Library", + "popular-widgets": "Popular Widgets", + "popular-dashboards": "Popular Dashboards", + "popular-solution-templates": "Popular Solution Templates", + "popular-calculated-fields": "Popular Calculated Fields", + "popular-rule-chains": "Popular Rule Chains", + "become-creator-text": "Submit your templates to the ThingsBoard IoT Hub to get featured and showcase your solutions to our global community.", + "submit-template": "Submit Template", "browse": "Browse IoT Hub", "creator-profile": "Creator Profile", "title-widgets": "Widgets", From 9a3981c467bf161dd3a1c6350da226ef7bddbe79 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 31 Mar 2026 20:25:25 +0300 Subject: [PATCH 008/219] Update IoT Hub home page cards and hero icons to match design - Item card: match design big-card-stroke layout (8px radius, aspect-ratio preview, 16px gap, dot pattern bg, 500 weight name, no version/description) - Compact card: rewrite to design small-card horizontal layout (72px icon, flex content, inline install button) - Install button: use TB CE primary #305680, border rgba(0,0,0,0.12), 4px radius - Section headers: use mat-button with iconPositionEnd, no hover color change - Hero floating icons: re-export as complete self-contained SVGs with rotation baked in, remove CSS rotation, animation via translate + scale + opacity only - Footer: rename "Submit Template" to "Contribute" --- .../pages/iot-hub/iot-hub-home.component.html | 39 +- .../pages/iot-hub/iot-hub-home.component.scss | 44 +-- .../iot-hub/iot-hub-item-card.component.html | 133 +++---- .../iot-hub/iot-hub-item-card.component.scss | 358 ++++++++---------- .../assets/iot-hub/hero-dashboard-icon-1.svg | 10 +- .../assets/iot-hub/hero-dashboard-icon-2.svg | 8 +- .../assets/iot-hub/hero-dashboard-icon-3.svg | 10 +- .../assets/iot-hub/hero-dashboard-icon-4.svg | 10 +- .../src/assets/iot-hub/hero-widget-icon-1.svg | 12 +- .../src/assets/iot-hub/hero-widget-icon-2.svg | 8 +- .../src/assets/iot-hub/hero-widget-icon-3.svg | 12 +- .../src/assets/iot-hub/hero-widget-icon-4.svg | 12 +- .../assets/locale/locale.constant-en_US.json | 2 +- 13 files changed, 291 insertions(+), 367 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html index 8794fe53b1..e35310b5e3 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html @@ -28,9 +28,10 @@
@for (iconUrl of heroType.icons; track iconUrl; let i = $index) { - +
+ +
}
} @@ -74,10 +75,10 @@ @if (popularWidgets.length) {
- +
@for (item of popularWidgets; track item.id) { @if (popularDashboards.length) {
- +
@for (item of popularDashboards; track item.id) { @if (popularSolutionTemplates.length) {
- +
@for (item of popularSolutionTemplates; track item.id) { @if (popularCalcFields.length) {
- +
@for (item of popularCalcFields; track item.id) { @if (popularRuleChains.length) {
- +
@for (item of popularRuleChains; track item.id) { {{ 'iot-hub.become-a-creator' | translate }}

{{ 'iot-hub.become-creator-text' | translate }}

} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss index 401d9ec234..48741b3f84 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss @@ -71,58 +71,64 @@ inset: 0; pointer-events: none; - // Icons start near center (translate toward center, scaled down, invisible) + // Icons start near center (translated toward center, scaled down, invisible) .tb-iot-hub-hero-float-icon { opacity: 0; - transform: var(--icon-rotation) translate(var(--start-x), var(--start-y)) scale(0.9); + transform: translate(var(--start-x), var(--start-y)) scale(0.9); transition: opacity 0.5s ease, transform 0.6s cubic-bezier(0.34, 1.56, 0.64, 1); } // Active: icons move outward to final position, scale to 1, fully visible &.active .tb-iot-hub-hero-float-icon { opacity: 1; - transform: var(--icon-rotation) translate(0, 0) scale(1); + transform: translate(0, 0) scale(1); } } -// Individual floating icon — final (resting) positions match Figma +// Individual floating icon — SVG has rotation/bg/shadow baked in, CSS handles position + animation .tb-iot-hub-hero-float-icon { position: absolute; - width: 64px; - height: 64px; + width: 78px; + height: 78px; - // Top-left: moves from center-right and center-down to final pos + img { + width: 100%; + height: 100%; + display: block; + } + + // Top-left &.icon-pos-1 { top: 40px; left: 23%; - --icon-rotation: rotate(-15deg); + --icon-rotation: ; --start-x: 40px; --start-y: 12px; } - // Top-right: moves from center-left and center-down + // Top-right &.icon-pos-2 { top: 40px; right: 23%; - --icon-rotation: rotate(15deg); + --icon-rotation: ; --start-x: -40px; --start-y: 12px; } - // Bottom-left: moves from center-right and center-up + // Bottom-left &.icon-pos-3 { bottom: 100px; left: 18%; - --icon-rotation: rotate(-30deg); + --icon-rotation: ; --start-x: 50px; --start-y: -8px; } - // Bottom-right: moves from center-left and center-up + // Bottom-right &.icon-pos-4 { bottom: 100px; right: 18%; - --icon-rotation: rotate(30deg); + --icon-rotation: ; --start-x: -45px; --start-y: -4px; } @@ -277,17 +283,12 @@ margin-top: 48px; } -// Section header — matches Figma "button" (height=40, font-size=20, font-weight=500) +// Section header — mat-button, Figma: height=40, font-size=20, font-weight=500 .tb-iot-hub-section-header { - display: inline-flex; - align-items: center; - gap: 4px; font-size: 20px; font-weight: 500; line-height: 40px; color: rgba(0, 0, 0, 0.87); - cursor: pointer; - text-decoration: none; mat-icon { font-size: 20px; @@ -295,9 +296,6 @@ height: 20px; } - &:hover { - color: #00695c; - } } // Big card row — matches Figma "cards-row" (5 cards, gap=20, mt=12 from header) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 94be8cb80b..51fa17e8fb 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -15,101 +15,66 @@ limitations under the License. --> -
- @if (!isCompactLayout()) { -
- @if (getPreviewUrl(); as previewUrl) { - - } @else { -
- {{ getPlaceholderIcon() }} -
- } - @if (item.peOnly) { - PE - } +@if (isCompactLayout()) { + +
+
+ {{ getPlaceholderIcon() }}
- } -
- @if (isCompactLayout()) { -
-
- {{ getPlaceholderIcon() }} -
-
-
-

{{ item.name }}

- v{{ item.version }} -
- @if (getSubtypeLabel(); as subtypeLabel) { - {{ subtypeLabel }} - } -
- @if (item.peOnly) { - PE - } -
- } @else { -
-

{{ item.name }}

- v{{ item.version }} +
+

{{ item.name }}

+
+ person + {{ item.creatorDisplayName }} + · + download + {{ item.totalInstallCount | shortNumber }}
- @if (item.type === ItemType.WIDGET && getSubtypeLabel(); as subtypeLabel) { - {{ subtypeLabel }} +
+ @if (isInstalled()) { + @if (isSameVersion()) { + {{ 'iot-hub.installed' | translate }} + } @else { + } + } @else { + } - @if (item.description) { -

{{ item.description }}

- } - @if (getNodes(); as nodes) { - @if (nodes.length) { -
- @for (node of nodes | slice:0:maxVisibleNodes; track node.name) { - {{ node.name }} - } - @if (getNodeCount() > maxVisibleNodes) { - +{{ getNodeCount() - maxVisibleNodes }} - } +
+} @else { + +
+
+ @if (getPreviewUrl(); as previewUrl) { + + } @else { +
+ {{ getPlaceholderIcon() }}
} - } - @if (getCategoryLabels().length || getFirstUseCaseLabel()) { -
- @if (getCategoryLabels(); as labels) { - @if (labels.length) { - {{ labels[0] }} - } - } - @if (getFirstUseCaseLabel(); as useCaseLabel) { - {{ useCaseLabel }} - } -
- } -
- @if (showCreator) { - person{{ item.creatorDisplayName }} - @if (item.publishedTime) { - · - } - } - @if (item.publishedTime) { - {{ formatPublishedTime(item.publishedTime) }} - } - +
+
+

{{ item.name }}

+
+ person + {{ item.creatorDisplayName }} + · download {{ item.totalInstallCount | shortNumber }} - @if (isInstalled()) { - @if (isSameVersion()) { - {{ 'iot-hub.installed' | translate }} + + @if (isInstalled()) { + @if (isSameVersion()) { + {{ 'iot-hub.installed' | translate }} + } @else { + + } } @else { - + } - } @else { - - } - + +
-
+} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 2fc96ecd8d..04747e566c 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -19,9 +19,10 @@ height: 100%; } +// Card — Figma: white bg, border rgba(0,0,0,0.12), rounded-8, overflow-clip, flex-col, gap-16, pb-16 .tb-iot-hub-item-card { - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 12px; + border: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 8px; overflow: hidden; cursor: pointer; transition: box-shadow 0.2s, transform 0.2s; @@ -29,41 +30,33 @@ height: 100%; display: flex; flex-direction: column; + gap: 16px; &:hover { box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); transform: translateY(-2px); } - &.tb-iot-hub-card-compact { - border-color: #e5e7eb; - - .tb-iot-hub-card-content { - padding: 16px 18px; - } - } } -// Preview area +// Preview area — Figma: aspect ~305:172, bg rgba(0,0,0,0.04), overflow-clip, p-12, dot pattern bg .tb-iot-hub-card-preview { - height: 160px; + aspect-ratio: 305 / 172; + background: rgba(0, 0, 0, 0.04); display: flex; align-items: center; justify-content: center; position: relative; overflow: hidden; - - &.preview-widget, &.preview-dashboard { background: #f5f7fa; border-bottom: 1px solid #e5e7eb; } - &.preview-calculated-field { background: linear-gradient(135deg, #e3f2fd, #bbdefb); } - &.preview-rule-chain { background: linear-gradient(135deg, #f3e5f5, #e1bee7); } - &.preview-device { background: linear-gradient(135deg, #eceff1, #cfd8dc); } + padding: 12px; + background-image: radial-gradient(circle, rgba(0, 0, 0, 0.06) 1px, transparent 1px); + background-size: 20px 20px; } .tb-iot-hub-preview-image { - max-width: 100%; - max-height: 100%; + width: 100%; + height: 100%; object-fit: contain; - padding: 8px; } .tb-iot-hub-preview-placeholder { @@ -73,17 +66,14 @@ display: flex; align-items: center; justify-content: center; + background: rgba(0, 0, 0, 0.06); tb-icon { font-size: 36px; width: 36px; height: 36px; + color: rgba(0, 0, 0, 0.38); } - - .preview-widget &, .preview-dashboard & { background: rgba(107, 114, 128, 0.1); tb-icon { color: #6b7280; } } - .preview-calculated-field & { background: rgba(25, 118, 210, 0.15); tb-icon { color: #1565c0; } } - .preview-rule-chain & { background: rgba(123, 31, 162, 0.15); tb-icon { color: #7b1fa2; } } - .preview-device & { background: rgba(69, 90, 100, 0.15); tb-icon { color: #455a64; } } } .tb-iot-hub-pe-badge { @@ -98,283 +88,253 @@ font-weight: 600; } -// Content area +// Content area — Figma: px-16, gap-8, flex-col .tb-iot-hub-card-content { - padding: 12px 16px 12px; + padding: 0 16px 16px; flex: 1; display: flex; flex-direction: column; + gap: 8px; } -// Compact header (CF / RC) -.tb-iot-hub-card-cf-header { +// Compact card (CF / RC) — Figma: horizontal flex, gap-16, p-16, rounded-8 +.tb-iot-hub-card-compact { display: flex; - align-items: flex-start; - gap: 12px; - margin-bottom: 10px; + align-items: center; + gap: 16px; + padding: 16px; + background: white; + border: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 8px; + cursor: pointer; + height: 100%; + transition: box-shadow 0.2s, transform 0.2s; + + &:hover { + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); + transform: translateY(-2px); + } } -.tb-iot-hub-card-cf-icon { - width: 40px; - height: 40px; - border-radius: 10px; +// Compact icon — Figma: 72x72, rounded-6, colored bg, white icon 36px centered +.tb-iot-hub-compact-icon { + width: 72px; + height: 72px; + border-radius: 6px; display: flex; align-items: center; justify-content: center; flex-shrink: 0; tb-icon { - font-size: 22px; - width: 22px; - height: 22px; + font-size: 36px; + width: 36px; + height: 36px; color: #fff; } } -.tb-iot-hub-card-cf-title-area { +// Compact content — Figma: flex-1, flex-col, gap-8 +.tb-iot-hub-compact-content { flex: 1; min-width: 0; - - .tb-iot-hub-card-name-row { - margin-bottom: 2px; - } -} - -.tb-iot-hub-card-cf-type { - font-size: 11px; - font-weight: 500; - color: #6b7280; -} - -.tb-iot-hub-pe-badge-inline { - position: static; - flex-shrink: 0; - align-self: flex-start; -} - -// Name row -.tb-iot-hub-card-name-row { display: flex; - align-items: baseline; + flex-direction: column; gap: 8px; - margin-bottom: 4px; } -.tb-iot-hub-card-name { +// Compact name — Figma: 16px Medium, line-height 24, tracking 0.25, ellipsis +.tb-iot-hub-compact-name { font-size: 16px; - font-weight: 700; + font-weight: 500; + line-height: 24px; + letter-spacing: 0.25px; + color: rgba(0, 0, 0, 0.87); margin: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - color: rgba(0, 0, 0, 0.87); -} - -.tb-iot-hub-card-version { - font-size: 13px; - color: rgba(0, 0, 0, 0.4); - flex-shrink: 0; -} - -.tb-iot-hub-card-widget-type-label { - font-size: 11px; - font-weight: 500; - color: #6b7280; - margin-bottom: 4px; } -// Description -.tb-iot-hub-card-description { - font-size: 13px; - line-height: 1.4; - color: rgba(0, 0, 0, 0.55); - margin: 0 0 10px; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; +// Compact meta row — Figma: flex row, gap-8, items-center +.tb-iot-hub-compact-meta { + display: flex; + align-items: center; + gap: 4px; + font-size: 12px; + line-height: 16px; + letter-spacing: 0.25px; + color: rgba(0, 0, 0, 0.54); } -// Node chips (Rule Chain) -.tb-iot-hub-card-nodes { - display: flex; - gap: 6px; - flex-wrap: nowrap; - overflow: hidden; - margin-bottom: 8px; +.tb-iot-hub-compact-author-icon { + font-size: 16px; + width: 16px; + height: 16px; + flex-shrink: 0; } -.tb-iot-hub-card-node-chip { - display: inline-block; - padding: 2px 8px; - border-radius: 6px; - font-size: 11px; - line-height: 16px; - height: 20px; +.tb-iot-hub-compact-creator { + cursor: pointer; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - min-width: 0; - max-width: 120px; - - &.node-enrichment { background: #f5fcd5; color: #4a7a00; } - &.node-filter { background: #fcfadb; color: #7a7200; } - &.node-transformation { background: #ddf2fc; color: #1a6d9e; } - &.node-action { background: #fde3e2; color: #9e2a27; } - &.node-analytics { background: #d5f6f4; color: #0e7a74; } - &.node-external { background: #fef1d8; color: #8a5d00; } - &.node-flow { background: #f3edfc; color: #5b3a9e; } - &.node-unknown { background: #f5f5f5; color: rgba(0, 0, 0, 0.54); } + + &:hover { + color: #00695c; + text-decoration: underline; + } } -.tb-iot-hub-card-node-more { - font-size: 12px; - font-weight: 500; - color: rgba(0, 0, 0, 0.45); - padding: 3px 4px; +.tb-iot-hub-compact-dot { + margin: 0 4px; flex-shrink: 0; } -// Category / use case tags -.tb-iot-hub-card-categories { - display: flex; - gap: 4px; - flex-wrap: wrap; - margin-bottom: 12px; +.tb-iot-hub-compact-download-icon { + font-size: 12px; + width: 12px; + height: 12px; + flex-shrink: 0; } -.tb-iot-hub-card-category-chip { - display: inline-block; - padding: 2px 8px; - border-radius: 4px; - font-size: 11px; +.tb-iot-hub-compact-count { font-weight: 500; - background: #eff6ff; - color: #1e6bb8; - white-space: nowrap; + text-transform: uppercase; } -.tb-iot-hub-card-use-case-chip { - display: inline-block; - padding: 2px 8px; - border-radius: 4px; - font-size: 11px; +// Name — Figma: 16px Medium, line-height 24, tracking 0.25, ellipsis +.tb-iot-hub-card-name { + font-size: 16px; font-weight: 500; - background: #f0fdf4; - color: #16a34a; + line-height: 24px; + letter-spacing: 0.25px; + margin: 0; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: rgba(0, 0, 0, 0.87); } -// Footer + +// Footer — Figma: flex, justify-between, no border-top, inline with content .tb-iot-hub-card-footer { display: flex; align-items: center; font-size: 12px; - color: rgba(0, 0, 0, 0.45); + line-height: 16px; + letter-spacing: 0.25px; + color: rgba(0, 0, 0, 0.54); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; margin-top: auto; - margin-left: -16px; - margin-right: -16px; - margin-bottom: -12px; - padding: 12px 16px; - border-top: 1px solid rgba(0, 0, 0, 0.08); + // Author icon — Figma: person icon, 16px .tb-iot-hub-card-author-icon { - font-size: 14px; - width: 14px; - height: 14px; + font-size: 16px; + width: 16px; + height: 16px; flex-shrink: 0; margin-right: 4px; } .tb-iot-hub-card-creator { - color: #1976d2; - cursor: pointer; overflow: hidden; text-overflow: ellipsis; + cursor: pointer; &:hover { + color: #00695c; text-decoration: underline; } } + // Dot separator — Figma: 3px circle, rgba(0,0,0,0.38) .tb-iot-hub-card-dot { - margin: 0 6px; + margin: 0 8px; flex-shrink: 0; } .tb-iot-hub-card-published { - flex-shrink: 0; + display: none; } .tb-iot-hub-card-stats { display: flex; align-items: center; - gap: 10px; + gap: 8px; margin-left: auto; flex-shrink: 0; } + // Download stat — Figma: download icon 12px, count 12px Medium uppercase .tb-iot-hub-card-stat { display: flex; align-items: center; - gap: 3px; - font-size: 11px; - color: #9ca3af; + gap: 2px; + font-size: 12px; + font-weight: 500; + color: rgba(0, 0, 0, 0.54); + text-transform: uppercase; tb-icon { - font-size: 14px; - width: 14px; - height: 14px; + font-size: 12px; + width: 12px; + height: 12px; } } - .tb-iot-hub-card-install-btn { - padding: 5px 14px; - border-radius: 6px; - border: 1px solid #305680; - background: transparent; - color: #305680; - font-size: 12px; - font-weight: 600; - cursor: pointer; - white-space: nowrap; - transition: all 0.15s; +} - &:hover { - background: #305680; - color: #fff; - } - } +// Install button — Figma: border rgba(0,0,0,0.12), rounded-4, px-16 py-6, text #00695c 14px Medium +.tb-iot-hub-card-install-btn { + padding: 6px 16px; + border-radius: 4px; + border: 1px solid rgba(0, 0, 0, 0.12); + background: transparent; + color: #305680; + font-size: 14px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.25px; + cursor: pointer; + white-space: nowrap; + flex-shrink: 0; + transition: background 0.15s; - .tb-iot-hub-card-installed-label { - padding: 5px 14px; - border-radius: 6px; - background: #e8f5e9; - color: #2e7d32; - font-size: 12px; - font-weight: 600; - white-space: nowrap; + &:hover { + background: rgba(48, 86, 128, 0.04); } +} - .tb-iot-hub-card-update-btn { - padding: 5px 14px; - border-radius: 6px; - border: 1px solid #f57c00; - background: transparent; - color: #f57c00; - font-size: 12px; - font-weight: 600; - cursor: pointer; - white-space: nowrap; - transition: all 0.15s; +.tb-iot-hub-card-installed-label { + padding: 6px 16px; + border-radius: 4px; + background: #e8f5e9; + color: #2e7d32; + font-size: 14px; + font-weight: 500; + line-height: 20px; + white-space: nowrap; + flex-shrink: 0; +} - &:hover { - background: #f57c00; - color: #fff; - } - } +.tb-iot-hub-card-update-btn { + padding: 6px 16px; + border-radius: 4px; + border: 1px solid #f57c00; + background: transparent; + color: #f57c00; + font-size: 14px; + font-weight: 500; + line-height: 20px; + cursor: pointer; + white-space: nowrap; + flex-shrink: 0; + transition: background 0.15s; + &:hover { + background: rgba(245, 124, 0, 0.04); + } } diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg index 471177f37b..85f1a39345 100644 --- a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-1.svg @@ -1,13 +1,13 @@ - - + + - + - + @@ -24,7 +24,7 @@ - + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg index 3e453e4b17..ff17afc8fb 100644 --- a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-2.svg @@ -1,11 +1,11 @@ - - - + + + - + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg index fc733a6dc8..36ec0aca84 100644 --- a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-3.svg @@ -1,13 +1,13 @@ - - + + - + - + @@ -24,7 +24,7 @@ - + diff --git a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg index 949f7c267d..547826eeb1 100644 --- a/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg +++ b/ui-ngx/src/assets/iot-hub/hero-dashboard-icon-4.svg @@ -1,13 +1,13 @@ - - + + - + - + @@ -24,7 +24,7 @@ - + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg index 9740f9c55a..7058c55569 100644 --- a/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-1.svg @@ -1,13 +1,13 @@ - - - - - + + + + + - + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg index 1d02f2d107..905ae06615 100644 --- a/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-2.svg @@ -1,11 +1,11 @@ - - - + + + - + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg index 0bd4d29731..129999a1a7 100644 --- a/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-3.svg @@ -1,15 +1,15 @@ - + - + - + - + @@ -26,10 +26,10 @@ - + - + diff --git a/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg index 37d0c227b0..4483d53642 100644 --- a/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg +++ b/ui-ngx/src/assets/iot-hub/hero-widget-icon-4.svg @@ -1,15 +1,15 @@ - + - + - + - + @@ -26,10 +26,10 @@ - + - + diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 7b82928c68..e5955f8883 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3709,7 +3709,7 @@ "popular-calculated-fields": "Popular Calculated Fields", "popular-rule-chains": "Popular Rule Chains", "become-creator-text": "Submit your templates to the ThingsBoard IoT Hub to get featured and showcase your solutions to our global community.", - "submit-template": "Submit Template", + "contribute": "Contribute", "browse": "Browse IoT Hub", "creator-profile": "Creator Profile", "title-widgets": "Widgets", From 810aa4342fbc5198ffae3a7816b55aab1fad59b3 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 12:22:38 +0300 Subject: [PATCH 009/219] Update item detail dialog, card installed label, and home page installed items - Rewrite item detail dialog to match design: new header with subtitle row, side-by-side image+description layout, category/use-case chips section, markdown readme with style overrides, Close+Install footer buttons - Description uses tb-markdown component with matching style overrides - Installed label: check icon + text, no background, TB CE primary color - Home page fetches installed widgets and solution templates, passes installedItem to cards and detail dialog - Replace "Figma" with "Design" in all source code comments --- .../pages/iot-hub/iot-hub-home.component.html | 2 + .../pages/iot-hub/iot-hub-home.component.scss | 26 +- .../pages/iot-hub/iot-hub-home.component.ts | 36 +- .../iot-hub/iot-hub-item-card.component.html | 6 +- .../iot-hub/iot-hub-item-card.component.scss | 45 +- .../iot-hub-item-detail-dialog.component.html | 290 +++----- .../iot-hub-item-detail-dialog.component.scss | 690 ++++++++---------- 7 files changed, 471 insertions(+), 624 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html index e35310b5e3..44ef219800 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html @@ -83,6 +83,7 @@ @for (item of popularWidgets; track item.id) { i.itemId === item.itemId); + case ItemType.SOLUTION_TEMPLATE: + return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); + default: + return undefined; + } + } + installItem(item: MpItemVersionView): void { this.dialog.open(TbIotHubInstallDialogComponent, { - panelClass: ['tb-dialog'], + panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], data: { item, iotHubApiService: this.iotHubApiService @@ -186,6 +203,14 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { this.router.navigate(['/iot-hub/creator', creatorId]); } + getInstalledWidget(item: MpItemVersionView): IotHubInstalledItem | undefined { + return this.installedWidgets.find(i => i.itemId === item.itemId); + } + + getInstalledSolutionTemplate(item: MpItemVersionView): IotHubInstalledItem | undefined { + return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); + } + openSignup(): void { window.open('https://iothub.thingsboard.io/signup', '_blank'); } @@ -193,6 +218,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { private loadPopularItems(): void { const sortOrder: SortOrder = { property: 'totalInstallCount', direction: Direction.DESC }; const config = { ignoreLoading: true }; + const installedPageLink = new PageLink(10000, 0); const buildQuery = (type: ItemType, size: number): MpItemVersionQuery => { const pageLink = new PageLink(size, 0, null, sortOrder); @@ -204,7 +230,9 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { dashboards: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.DASHBOARD, 5), config), solutionTemplates: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.SOLUTION_TEMPLATE, 5), config), calcFields: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.CALCULATED_FIELD, 6), config), - ruleChains: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.RULE_CHAIN, 6), config) + ruleChains: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.RULE_CHAIN, 6), config), + installedWidgets: this.iotHubApiService.getInstalledItems(installedPageLink, ItemType.WIDGET, config), + installedSolutionTemplates: this.iotHubApiService.getInstalledItems(installedPageLink, ItemType.SOLUTION_TEMPLATE, config) }).subscribe({ next: (results) => { this.popularWidgets = results.widgets.data; @@ -212,6 +240,8 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { this.popularSolutionTemplates = results.solutionTemplates.data; this.popularCalcFields = results.calcFields.data; this.popularRuleChains = results.ruleChains.data; + this.installedWidgets = results.installedWidgets.data; + this.installedSolutionTemplates = results.installedSolutionTemplates.data; this.isLoading = false; }, error: () => { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 51fa17e8fb..e2b2813ff3 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -16,7 +16,7 @@ --> @if (isCompactLayout()) { - +
{{ getPlaceholderIcon() }} @@ -33,7 +33,7 @@
@if (isInstalled()) { @if (isSameVersion()) { - {{ 'iot-hub.installed' | translate }} + check{{ 'iot-hub.installed' | translate }} } @else { } @@ -66,7 +66,7 @@ @if (isInstalled()) { @if (isSameVersion()) { - {{ 'iot-hub.installed' | translate }} + check{{ 'iot-hub.installed' | translate }} } @else { } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 04747e566c..d9a251231e 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -19,7 +19,7 @@ height: 100%; } -// Card — Figma: white bg, border rgba(0,0,0,0.12), rounded-8, overflow-clip, flex-col, gap-16, pb-16 +// Card — Design: white bg, border rgba(0,0,0,0.12), rounded-8, overflow-clip, flex-col, gap-16, pb-16 .tb-iot-hub-item-card { border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 8px; @@ -39,7 +39,7 @@ } -// Preview area — Figma: aspect ~305:172, bg rgba(0,0,0,0.04), overflow-clip, p-12, dot pattern bg +// Preview area — Design: aspect ~305:172, bg rgba(0,0,0,0.04), overflow-clip, p-12, dot pattern bg .tb-iot-hub-card-preview { aspect-ratio: 305 / 172; background: rgba(0, 0, 0, 0.04); @@ -88,7 +88,7 @@ font-weight: 600; } -// Content area — Figma: px-16, gap-8, flex-col +// Content area — Design: px-16, gap-8, flex-col .tb-iot-hub-card-content { padding: 0 16px 16px; flex: 1; @@ -97,7 +97,7 @@ gap: 8px; } -// Compact card (CF / RC) — Figma: horizontal flex, gap-16, p-16, rounded-8 +// Compact card (CF / RC) — Design: horizontal flex, gap-16, p-16, rounded-8 .tb-iot-hub-card-compact { display: flex; align-items: center; @@ -116,7 +116,7 @@ } } -// Compact icon — Figma: 72x72, rounded-6, colored bg, white icon 36px centered +// Compact icon — Design: 72x72, rounded-6, colored bg, white icon 36px centered .tb-iot-hub-compact-icon { width: 72px; height: 72px; @@ -134,7 +134,7 @@ } } -// Compact content — Figma: flex-1, flex-col, gap-8 +// Compact content — Design: flex-1, flex-col, gap-8 .tb-iot-hub-compact-content { flex: 1; min-width: 0; @@ -143,7 +143,7 @@ gap: 8px; } -// Compact name — Figma: 16px Medium, line-height 24, tracking 0.25, ellipsis +// Compact name — Design: 16px Medium, line-height 24, tracking 0.25, ellipsis .tb-iot-hub-compact-name { font-size: 16px; font-weight: 500; @@ -156,7 +156,7 @@ text-overflow: ellipsis; } -// Compact meta row — Figma: flex row, gap-8, items-center +// Compact meta row — Design: flex row, gap-8, items-center .tb-iot-hub-compact-meta { display: flex; align-items: center; @@ -203,7 +203,7 @@ text-transform: uppercase; } -// Name — Figma: 16px Medium, line-height 24, tracking 0.25, ellipsis +// Name — Design: 16px Medium, line-height 24, tracking 0.25, ellipsis .tb-iot-hub-card-name { font-size: 16px; font-weight: 500; @@ -217,7 +217,7 @@ } -// Footer — Figma: flex, justify-between, no border-top, inline with content +// Footer — Design: flex, justify-between, no border-top, inline with content .tb-iot-hub-card-footer { display: flex; align-items: center; @@ -230,7 +230,7 @@ text-overflow: ellipsis; margin-top: auto; - // Author icon — Figma: person icon, 16px + // Author icon — Design: person icon, 16px .tb-iot-hub-card-author-icon { font-size: 16px; width: 16px; @@ -250,7 +250,7 @@ } } - // Dot separator — Figma: 3px circle, rgba(0,0,0,0.38) + // Dot separator — Design: 3px circle, rgba(0,0,0,0.38) .tb-iot-hub-card-dot { margin: 0 8px; flex-shrink: 0; @@ -268,7 +268,7 @@ flex-shrink: 0; } - // Download stat — Figma: download icon 12px, count 12px Medium uppercase + // Download stat — Design: download icon 12px, count 12px Medium uppercase .tb-iot-hub-card-stat { display: flex; align-items: center; @@ -287,7 +287,7 @@ } -// Install button — Figma: border rgba(0,0,0,0.12), rounded-4, px-16 py-6, text #00695c 14px Medium +// Install button — Design: border rgba(0,0,0,0.12), rounded-4, px-16 py-6, text #00695c 14px Medium .tb-iot-hub-card-install-btn { padding: 6px 16px; border-radius: 4px; @@ -308,16 +308,27 @@ } } +// Installed label — Design: check icon + text, no bg, #305680, h-32, pl-8 pr-12 py-6, rounded-4, gap-4 .tb-iot-hub-card-installed-label { - padding: 6px 16px; + display: inline-flex; + align-items: center; + gap: 4px; + height: 32px; + padding: 6px 12px 6px 8px; border-radius: 4px; - background: #e8f5e9; - color: #2e7d32; + color: #305680; font-size: 14px; font-weight: 500; line-height: 20px; + letter-spacing: 0.25px; white-space: nowrap; flex-shrink: 0; + + tb-icon { + font-size: 24px; + width: 24px; + height: 24px; + } } .tb-iot-hub-card-update-btn { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index fc6980ccad..5feb405405 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -15,186 +15,106 @@ limitations under the License. --> -
- +
+
-
- @if (item.type === ItemType.CALCULATED_FIELD || item.type === ItemType.RULE_CHAIN) { -
- {{ getCompactIcon() }} -
- } -
-
- {{ item.name }} - v{{ item.version }} - @if (getSubtypeLabel(); as subtypeLabel) { - {{ subtypeLabel }} - } -
-
- {{ typeTranslations.get(item.type) | translate }} - · - {{ 'iot-hub.by-creator' | translate:{ name: '' } }} - {{ item.creatorDisplayName }} - @if (item.publishedTime) { - · - {{ item.publishedTime | date:'mediumDate' }} - } -
+
+ {{ item.name }} +
+ {{ getTypeIcon() }} + {{ typeTranslations.get(item.type) | translate }} + + download + {{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }} + + Latest + + v {{ item.version }} + @if (item.publishedTime) { + + {{ item.publishedTime | date:'mediumDate' }} + }
-
+
- +
- - @if (item.type === ItemType.WIDGET) { -
-
- @if (getPreviewUrl(); as url) { - - } @else { -
- widgets + +
+
+
+ @if (item.type === ItemType.SOLUTION_TEMPLATE && carouselImages.length > 1) { +
+ +
+
+ +
+
+ + + + + + + +
+ +
- } -
- @if (item.description) { -
{{ item.description }}
- } -
- } - - - @if (item.type === ItemType.DASHBOARD) { -
-
- @if (getPreviewUrl(); as url) { - } @else { -
- {{ getTypeIcon() }} -
- } -
- @if (item.description) { -
{{ item.description }}
- } -
- } - - - @if (item.type === ItemType.SOLUTION_TEMPLATE) { -
- @if (carouselImages.length > 1) { -
- -
-
- -
-
- - - - - - - -
- - -
- } @else { -
@if (getPreviewUrl(); as url) { - + } @else { -
+
{{ getTypeIcon() }}
} + } +
+
+ @if (item.description) { +
+ +
+ } +
+ person + {{ item.creatorDisplayName }}
- } - @if (item.description) { -
{{ item.description }}
- } +
- } - - -
- - download - {{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }} - - - {{ getTypeIcon() }} - {{ typeTranslations.get(item.type) | translate }} - - @if (item.peOnly) { - PE - }
- - @if (item.type === ItemType.DEVICE) { -
- @if (getPreviewUrl(); as url) { - - } @else { -
- memory -
- } -
- } - - - @if (item.description && item.type !== ItemType.WIDGET && item.type !== ItemType.DASHBOARD && item.type !== ItemType.SOLUTION_TEMPLATE) { -
{{ item.description }}
- } - - - @if (item.type === ItemType.RULE_CHAIN && getNodes().length) { -
- @for (node of getNodes(); track node.name) { - {{ node.name }} - } - @if (getNodeCount() > getNodes().length) { - +{{ getNodeCount() - getNodes().length }} {{ 'iot-hub.more' | translate }} - } -
- } - @if (item.categories?.length || item.useCases?.length) { -
+
+
@if (item.categories?.length) {
- {{ 'iot-hub.categories' | translate }} + {{ 'iot-hub.category' | translate }}
@for (cat of item.categories; track cat) { - {{ getCategoryLabel(cat) }} + {{ getCategoryLabel(cat) }} }
@@ -204,7 +124,7 @@ {{ 'iot-hub.use-cases' | translate }}
@for (uc of item.useCases; track uc) { - {{ getUseCaseLabel(uc) }} + {{ getUseCaseLabel(uc) }} }
@@ -214,7 +134,8 @@ @if (readmeContent || item.changelog) { -
+
+
@if (readmeContent) { } @@ -228,38 +149,31 @@
-
- @if (isSameVersion() && item.type === ItemType.SOLUTION_TEMPLATE) { - - } - @if (isSameVersion()) { - @if (item.type === ItemType.SOLUTION_TEMPLATE) { - - } @else { - - } - } @else if (hasUpdate()) { - + } + + + @if (isSameVersion()) { + @if (item.type === ItemType.SOLUTION_TEMPLATE) { + } @else { - } -
-
- {{ 'iot-hub.created-by' | translate:{ name: item.creatorDisplayName } }} - · - - {{ 'iot-hub.become-a-creator' | translate }} - -
+ } @else if (hasUpdate()) { + + } @else { + + }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss index 378a6d9b44..8a610ccb6b 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss @@ -14,235 +14,361 @@ * limitations under the License. */ -:host-context(.tb-default .tb-dialog .mat-mdc-dialog-component-host) { - @media (min-width: 600px) { - .mat-mdc-dialog-content { - width: 800px; - max-height: 80vh; - } - } -} - +// Dialog container .tb-iot-hub-detail-dialog { display: flex; flex-direction: column; - padding: 0 !important; - --mat-dialog-supporting-text-line-height: 1.5; + background: white; + border-radius: 8px; + overflow: hidden; + max-height: 80vh; + width: 900px; } -// Header +// Header — Design: pl-24, pr-12, py-16, gap-8 .dlg-header { - padding: 20px 24px 16px; - border-bottom: 1px solid #e5e7eb; - flex-shrink: 0; -} - -.dlg-header-top { display: flex; align-items: flex-start; - gap: 14px; -} - -.dlg-icon { - width: 48px; - height: 48px; - border-radius: 12px; - display: flex; - align-items: center; - justify-content: center; + gap: 8px; + padding: 16px 12px 16px 24px; flex-shrink: 0; - - tb-icon { - font-size: 26px; - width: 26px; - height: 26px; - color: #fff; - } } -.dlg-header-info { +.dlg-header-content { flex: 1; min-width: 0; -} - -.dlg-title-row { display: flex; - align-items: baseline; + flex-direction: column; gap: 8px; - flex-wrap: wrap; } +// Title — Design: 24px Medium, rgba(0,0,0,0.87) .dlg-title { - font-size: 18px; - font-weight: 700; - color: #1a1a2e; -} - -.dlg-version { - font-size: 12px; + font-size: 24px; font-weight: 500; - color: #9ca3af; -} - -.dlg-type-badge { - padding: 2px 10px; - border-radius: 12px; - font-size: 12px; - font-weight: 500; - white-space: nowrap; - - &.wt-timeseries { background: #e3f2fd; color: #1565c0; } - &.wt-latest { background: #e8f5e9; color: #2e7d32; } - &.wt-rpc { background: #f3e5f5; color: #7b1fa2; } - &.wt-alarm { background: #ffebee; color: #c62828; } - &.wt-static { background: #eceff1; color: #455a64; } - &.cf-simple { background: #e3f2fd; color: #1565c0; } - &.cf-script { background: #f3e5f5; color: #6a1b9a; } - &.cf-geofencing { background: #e8f5e9; color: #2e7d32; } - &.cf-alarm { background: #ffebee; color: #c62828; } - &.cf-propagation { background: #e0f2f1; color: #00695c; } - &.cf-related-agg { background: #e8eaf6; color: #283593; } - &.cf-entity-agg { background: #fff3e0; color: #e65100; } - &.rc-core { background: #f3e5f5; color: #7b1fa2; } - &.rc-edge { background: #e0f2f1; color: #00695c; } + line-height: 32px; + color: rgba(0, 0, 0, 0.87); } +// Subtitle row — Design: 13px Regular, rgba(0,0,0,0.54), gap-12 between groups, gap-4 within .dlg-subtitle { - font-size: 12px; - color: #6b7280; - margin-top: 2px; + display: flex; + align-items: center; + gap: 4px; + font-size: 13px; + line-height: 16px; + letter-spacing: 0.4px; + color: rgba(0, 0, 0, 0.54); + flex-wrap: wrap; } -.dlg-creator-link { - color: #1976d2; - text-decoration: none; - cursor: pointer; +.dlg-subtitle-icon { + font-size: 16px; + width: 16px; + height: 16px; +} - &:hover { - text-decoration: underline; - } +// Dot separator — Design: 4px circle, rgba(0,0,0,0.54) +.dlg-dot { + width: 4px; + height: 4px; + border-radius: 2px; + background: rgba(0, 0, 0, 0.54); + flex-shrink: 0; + margin: 0 4px; } .dlg-close { flex-shrink: 0; - margin: -8px -8px 0 0; } -.dlg-sep { - color: #9ca3af; - padding: 0 2px; +// Scrollable body +.dlg-body { + overflow-y: auto; + overflow-x: hidden; + flex: 1; + min-height: 0; +} + +// Main content — Design: px-24, pb-16 +.dlg-main { + padding: 0 24px 16px; } -// Hero split (widget: image + description side by side) -.dlg-hero-split { +// Row 1 — Design: flex row, gap-24, items-center +.dlg-row-1 { display: flex; - gap: 20px; - padding: 20px 24px; - border-bottom: 1px solid #f3f4f6; + gap: 24px; + align-items: center; } -.dlg-hero-image { - flex: 0 0 48%; - background: #f5f7fa; +// Preview image — Design: flex-1, aspect 305:172, bg rgba(0,0,0,0.06), rounded-8, p-16, dot pattern +.dlg-preview { + flex: 1; + min-width: 0; + aspect-ratio: 305 / 172; + background: rgba(0, 0, 0, 0.06); + background-image: radial-gradient(circle, rgba(0, 0, 0, 0.06) 1px, transparent 1px); + background-size: 20px 20px; border-radius: 8px; overflow: hidden; display: flex; align-items: center; justify-content: center; - min-height: 140px; + padding: 16px; +} - img { - width: 100%; - height: 100%; - object-fit: contain; - padding: 8px; - } +.dlg-preview-img { + width: 100%; + height: 100%; + object-fit: contain; +} - .tb-iot-hub-preview-placeholder tb-icon { - font-size: 64px; - width: 64px; - height: 64px; - opacity: 0.3; +.dlg-preview-placeholder { + tb-icon { + font-size: 48px; + width: 48px; + height: 48px; + color: rgba(0, 0, 0, 0.2); } } -.dlg-hero-desc { +// Info panel (right side) — Design: flex-1, flex-col, gap-16 +.dlg-info { flex: 1; - font-size: 13px; - color: #4b5563; - line-height: 1.6; - - p { - margin: 0; - } + min-width: 0; + display: flex; + flex-direction: column; + gap: 16px; + justify-content: center; } -// Dashboard: full-width image + description below -.dlg-hero-full { - padding: 20px 24px; - border-bottom: 1px solid #f3f4f6; +// Description — rendered via tb-markdown, same overrides as dlg-readme +.dlg-description { + ::ng-deep tb-markdown .tb-markdown-view { + padding: 0; + + > p, > div { + padding: 0; + } + + p { + font-size: 14px; + font-weight: 400; + line-height: 24px; + letter-spacing: 0.2px; + color: rgba(0, 0, 0, 0.76); + margin: 0; + } + } } -.dlg-hero-full-image { - background: #f5f7fa; - border-radius: 8px; - overflow: hidden; +// Author — Design: person icon 20px + name 14px Medium #305680 +.dlg-author { display: flex; align-items: center; - justify-content: center; - min-height: 200px; - max-height: 300px; + gap: 4px; + cursor: pointer; - img { - width: 100%; - height: 100%; - object-fit: contain; - padding: 8px; + tb-icon { + font-size: 20px; + width: 20px; + height: 20px; + color: rgba(0, 0, 0, 0.54); } - .tb-iot-hub-preview-placeholder tb-icon { - font-size: 64px; - width: 64px; - height: 64px; - opacity: 0.3; + span { + font-size: 14px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.25px; + color: #305680; + } + + &:hover span { + text-decoration: underline; } } -.dlg-hero-full-desc { - margin-top: 12px; - font-size: 13px; - color: #4b5563; - line-height: 1.6; +// Divider +.dlg-divider { + height: 1px; + background: rgba(0, 0, 0, 0.12); +} + +// Meta section (categories + use cases) — Design: px-24, py-16, gap-24, flex row +.dlg-meta { + display: flex; + gap: 24px; + padding: 16px 24px; +} + +.dlg-meta-group { + display: flex; + flex-direction: column; + gap: 8px; +} + +// Meta label — Design: 12px Medium, rgba(0,0,0,0.54), tracking 0.25 +.dlg-meta-label { + font-size: 12px; + font-weight: 500; + line-height: 16px; + letter-spacing: 0.25px; + color: rgba(0, 0, 0, 0.54); +} + +.dlg-meta-chips { + display: flex; + flex-wrap: wrap; + gap: 8px; +} + +// Chip — Design: 12px Medium, h-24, p-4 px-8, rounded-4 +.dlg-chip { + display: inline-flex; + align-items: center; + height: 24px; + padding: 4px 8px; + border-radius: 4px; + font-size: 12px; + font-weight: 500; + line-height: 16px; + letter-spacing: 0.25px; + white-space: nowrap; +} + +// Category chip — Design: bg rgba(16,108,200,0.06), color #106cc8 +.dlg-chip-category { + background: rgba(16, 108, 200, 0.06); + color: #106cc8; +} + +// Use case chip — Design: bg rgba(25,128,56,0.06), color #198038 +.dlg-chip-usecase { + background: rgba(25, 128, 56, 0.06); + color: #198038; +} + +// Readme content — Design: px-24, pt-16, pb-24, gap-20 +.dlg-readme { + font-size: 14px; + line-height: 24px; + letter-spacing: 0.2px; + color: rgba(0, 0, 0, 0.76); + + // Override markdown-view styles to match Design: px-24, pt-16, pb-24, gap-20 + ::ng-deep tb-markdown .tb-markdown-view { + padding: 16px 24px 24px; + + // Headings: Design:20px SemiBold, line-height 24, tracking 0.1 + // Override markdown-view's padding: 30px 32px 10px on direct headings + h1, h2, h3, h4, h5, h6 { + font-size: 20px; + font-weight: 600; + line-height: 24px; + letter-spacing: 0.1px; + color: rgba(0, 0, 0, 0.76); + margin: 0; + padding: 0; + } + + // Direct child headings: override markdown-view's > h padding + > h1, > h2, > h3, > h4, > h5, > h6 { + padding: 0; + margin-top: 20px; + } + + // First heading: no top margin + > :first-child { + margin-top: 0; + } + + h1 { + font-size: 24px; + line-height: 32px; + padding-right: 0; + } + + // Paragraphs: Design:14px Regular, tracking 0.2, line-height 24 + // Override markdown-view's font-size: 16px and padding + p { + font-size: 14px; + font-weight: 400; + line-height: 24px; + letter-spacing: 0.2px; + color: rgba(0, 0, 0, 0.76); + margin: 0; + } + + > p, > div { + padding-left: 0; + padding-right: 0; + } + + p + p { + margin-top: 8px; + } + + // Heading followed by content: 8px gap + h1 + p, h2 + p, h3 + p, + h1 + ul, h2 + ul, h3 + ul, + h1 + ol, h2 + ol, h3 + ol { + margin-top: 8px; + } + + // Lists: Design:ms-21 per li, 14px, line-height 24, no extra margin/padding + // Override markdown-view's padding-left: 62px, margin: 16px + ul, ol { + padding-left: 21px; + padding-right: 0; + margin: 0; + font-size: 14px; + line-height: 24px; + letter-spacing: 0.2px; + color: rgba(0, 0, 0, 0.76); + + // Override markdown-view's heading-after-list padding + + h1, + h2, + h3, + h4, + h5, + h6 { + padding-top: 0; + margin-top: 20px; + } + } + + // List items: override markdown-view's padding-bottom: .75em + li { + padding-bottom: 0; + margin-bottom: 0; + line-height: 24px; + } + + // Code blocks: keep smaller font + code:not([class*=language-]) { + font-size: 14px; + } + } } -// Image carousel +// Carousel (solution templates) .dlg-hero-carousel { - background: #f5f7fa; - border-radius: 8px; - overflow: hidden; - position: relative; - height: 340px; + width: 100%; + height: 100%; animation: dlg-carousel-fade-in 0s 0.3s forwards; visibility: hidden; } @keyframes dlg-carousel-fade-in { - to { - visibility: visible; - } + to { visibility: visible; } } .dlg-carousel { - height: 340px; + height: 100%; ::ng-deep .carousel { display: flex !important; flex-direction: column !important; - > section { - flex: 1; - min-height: 0; - } + > section { flex: 1; min-height: 0; } ul.indicators { position: relative !important; @@ -251,9 +377,7 @@ padding: 8px 0; } - .direction { - height: calc(100% - 40px) !important; - } + .direction { height: calc(100% - 40px) !important; } } .dlg-carousel-container { @@ -266,8 +390,7 @@ img { position: absolute; - top: 0; - left: 0; + inset: 0; width: 100%; height: 100%; object-fit: contain; @@ -281,9 +404,7 @@ color: rgba(0, 0, 0, 0.6); background: rgba(255, 255, 255, 0.8); - &:hover { - background: rgba(255, 255, 255, 0.95); - } + &:hover { background: rgba(255, 255, 255, 0.95); } } .dlg-carousel-dot { @@ -294,250 +415,19 @@ margin: 0 3px; transition: background 0.2s; - &.active { - background: rgba(0, 0, 0, 0.6); - } -} - -// Stats bar -.dlg-stats-bar { - display: flex; - align-items: center; - gap: 16px; - padding: 10px 24px; - background: #f9fafb; - font-size: 12px; - color: #6b7280; - border-bottom: 1px solid #f3f4f6; -} - -.dlg-stat { - display: flex; - align-items: center; - gap: 4px; - - tb-icon { - font-size: 16px; - width: 16px; - height: 16px; - } - - strong { - color: #1a1a2e; - } -} - -.dlg-pe-label { - display: inline-block; - background: rgba(0, 0, 0, 0.6); - color: white; - padding: 2px 8px; - border-radius: 4px; - font-size: 11px; - font-weight: 600; -} - -// Device preview -.dlg-device-preview { - display: flex; - align-items: center; - justify-content: center; - min-height: 160px; - background: #f5f7fa; - border-bottom: 1px solid #f3f4f6; - - img { - max-width: 100%; - max-height: 160px; - object-fit: contain; - padding: 8px; - } - - .tb-iot-hub-preview-placeholder tb-icon { - font-size: 64px; - width: 64px; - height: 64px; - opacity: 0.3; - } -} - -// Description block (CF/RC) -.dlg-desc-block { - padding: 16px 24px; - font-size: 13px; - color: #4b5563; - line-height: 1.6; - border-bottom: 1px solid #f3f4f6; -} - -// Node chips (Rule Chain) -.dlg-node-chips { - display: flex; - flex-wrap: wrap; - gap: 6px; - padding: 12px 24px; - border-bottom: 1px solid #f3f4f6; -} - -.dlg-node-chip { - padding: 4px 12px; - border-radius: 14px; - font-size: 12px; - font-weight: 500; - border: 1px solid; - - &.dlg-node-enrichment { background: #f5fcd5; color: #4a7a00; border-color: #d4e6a0; } - &.dlg-node-filter { background: #fcfadb; color: #7a7200; border-color: #e8e4a0; } - &.dlg-node-transformation { background: #ddf2fc; color: #1a6d9e; border-color: #a8d8f0; } - &.dlg-node-action { background: #fde3e2; color: #9e2a27; border-color: #f0b8b6; } - &.dlg-node-analytics { background: #d5f6f4; color: #0e7a74; border-color: #a0e0dc; } - &.dlg-node-external { background: #fef1d8; color: #8a5d00; border-color: #f0d8a0; } - &.dlg-node-flow { background: #f3edfc; color: #5b3a9e; border-color: #d0c4f0; } - &.dlg-node-unknown { background: #f5f5f5; color: rgba(0, 0, 0, 0.54); border-color: #e0e0e0; } -} - -.dlg-node-more { - font-size: 11px; - font-weight: 500; - color: rgba(0, 0, 0, 0.54); - align-self: center; -} - -// Categories & Use Cases -.dlg-meta-section { - display: flex; - gap: 40px; - padding: 14px 24px; - border-bottom: 1px solid #e5e7eb; -} - -.dlg-meta-group { - display: flex; - flex-direction: column; - gap: 6px; + &.active { background: rgba(0, 0, 0, 0.6); } } -.dlg-meta-label { - font-size: 10px; - font-weight: 600; - color: #9ca3af; - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.dlg-meta-chips { - display: flex; - flex-wrap: wrap; - gap: 5px; -} - -.dlg-meta-chip { - padding: 3px 10px; - border-radius: 4px; - font-size: 11px; - font-weight: 500; - border: 1px solid #e5e7eb; - color: #4b5563; - background: #fff; -} - -// Scrollable body -.dlg-body { - overflow-y: auto; - flex: 1; - min-height: 0; -} - -.dlg-content { - padding: 0; - - h3 { - font-size: 16px; - font-weight: 600; - color: #1a1a2e; - margin: 20px 0 8px; - } -} - -// Footer +// Footer — Design: border-top rgba(0,0,0,0.12), p-8, flex row, justify-end, gap-8 .dlg-footer { - padding: 16px 24px; - border-top: 1px solid #e5e7eb; display: flex; - flex-direction: column; align-items: center; - gap: 10px; + gap: 8px; + padding: 8px; + border-top: 1px solid rgba(0, 0, 0, 0.12); flex-shrink: 0; } -.dlg-footer-actions { - display: flex; - justify-content: flex-end; - gap: 12px; - width: 100%; -} - -.dlg-outlined-btn { - padding: 12px 24px; - border: 1px solid #305680; - border-radius: 8px; - background: transparent; - color: #305680; - font-size: 14px; - font-weight: 500; - cursor: pointer; - transition: all 0.15s; - margin-right: auto; - - &:hover { - background: #305680; - color: #fff; - } -} - -.dlg-install-btn { - padding: 12px 24px; - border: none; - border-radius: 8px; - background: #305680; - color: #fff; - font-size: 14px; - font-weight: 500; - cursor: pointer; - transition: background 0.15s; - - &:hover { - background: #264466; - } -} - -.dlg-update-btn { - padding: 12px 24px; - border: 1px solid #e65100; - border-radius: 8px; - background: transparent; - color: #e65100; - font-size: 14px; - font-weight: 500; - cursor: pointer; - transition: all 0.15s; - - &:hover { - background: #e65100; - color: #fff; - } -} - -.dlg-creator-info { - font-size: 12px; - color: #9ca3af; -} - -.dlg-become-creator { - color: #305680; - cursor: pointer; - - &:hover { - text-decoration: underline; - } +.dlg-footer-spacer { + flex: 1; } From 45328a607e93f346ea7b667a72e538adc9587aa1 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 12:32:26 +0300 Subject: [PATCH 010/219] Use $tb-primary-color SCSS variable instead of hardcoded #305680 --- .../pages/iot-hub/iot-hub-item-card.component.scss | 10 ++++++---- .../iot-hub/iot-hub-item-detail-dialog.component.scss | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index d9a251231e..7cabcd8fa1 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -14,6 +14,8 @@ * limitations under the License. */ +@import "../../../../../scss/constants"; + :host { display: block; height: 100%; @@ -293,7 +295,7 @@ border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.12); background: transparent; - color: #305680; + color: $tb-primary-color; font-size: 14px; font-weight: 500; line-height: 20px; @@ -304,11 +306,11 @@ transition: background 0.15s; &:hover { - background: rgba(48, 86, 128, 0.04); + background: rgba($tb-primary-color, 0.04); } } -// Installed label — Design: check icon + text, no bg, #305680, h-32, pl-8 pr-12 py-6, rounded-4, gap-4 +// Installed label — Design: check icon + text, no bg, $tb-primary-color, h-32, pl-8 pr-12 py-6, rounded-4, gap-4 .tb-iot-hub-card-installed-label { display: inline-flex; align-items: center; @@ -316,7 +318,7 @@ height: 32px; padding: 6px 12px 6px 8px; border-radius: 4px; - color: #305680; + color: $tb-primary-color; font-size: 14px; font-weight: 500; line-height: 20px; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss index 8a610ccb6b..c9e70d26e4 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.scss @@ -14,6 +14,8 @@ * limitations under the License. */ +@import "../../../../../scss/constants"; + // Dialog container .tb-iot-hub-detail-dialog { display: flex; @@ -163,7 +165,7 @@ } } -// Author — Design: person icon 20px + name 14px Medium #305680 +// Author — Design: person icon 20px + name 14px Medium $tb-primary-color .dlg-author { display: flex; align-items: center; @@ -182,7 +184,7 @@ font-weight: 500; line-height: 20px; letter-spacing: 0.25px; - color: #305680; + color: $tb-primary-color; } &:hover span { From a503ee60b243299ce1f94b1eae793b32305183c4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 14:35:26 +0300 Subject: [PATCH 011/219] Add install/delete dialogs, detail dialog updates, and installed items handling - Create TbIotHubDeleteDialogComponent with warn-colored "Delete anyway" button - Extract install dialog template and styles to separate HTML/SCSS files - Install dialog: simplified confirm/success layout matching design, "Close" label when only button shown on success - Item card: installed label is now a clickable button emitting deleteClick - Detail dialog: 64px colored icon header for CF/RC types, description-only layout (no image) for CF/RC, delete button (stroked warn) in footer when installed, closes with 'deleted' result after confirmed deletion - Home component: handle install/delete dialog results by reloading installed items, pass installedItem to detail dialog --- .../iot-hub-delete-dialog.component.ts | 83 +++++++++++ .../pages/iot-hub/iot-hub-home.component.html | 6 +- .../pages/iot-hub/iot-hub-home.component.ts | 55 +++++++- .../iot-hub-install-dialog.component.html | 80 +++++++++++ .../iot-hub-install-dialog.component.scss | 57 ++++++++ .../iot-hub-install-dialog.component.ts | 115 +--------------- .../iot-hub/iot-hub-item-card.component.html | 4 +- .../iot-hub/iot-hub-item-card.component.scss | 9 ++ .../iot-hub/iot-hub-item-card.component.ts | 6 + .../iot-hub-item-detail-dialog.component.html | 129 +++++++++++------- .../iot-hub-item-detail-dialog.component.scss | 22 ++- .../iot-hub-item-detail-dialog.component.ts | 19 +++ .../home/pages/iot-hub/iot-hub.module.ts | 4 +- .../assets/locale/locale.constant-en_US.json | 7 + 14 files changed, 423 insertions(+), 173 deletions(-) create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-delete-dialog.component.ts create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.scss diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-delete-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-delete-dialog.component.ts new file mode 100644 index 0000000000..75eb44dddc --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-delete-dialog.component.ts @@ -0,0 +1,83 @@ +/// +/// Copyright © 2016-2026 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 { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +export interface IotHubDeleteDialogData { + itemName: string; +} + +@Component({ + selector: 'tb-iot-hub-delete-dialog', + standalone: false, + template: ` +
+

{{ 'iot-hub.delete-confirm-title' | translate:{ name: data.itemName } }}

+

{{ 'iot-hub.delete-desc' | translate }}

+
+
+ + +
+ `, + styles: [` + .tb-iot-hub-delete-content { + display: flex; + flex-direction: column; + gap: 20px; + padding: 24px; + } + .tb-iot-hub-delete-title { + font-size: 20px; + font-weight: 600; + line-height: 24px; + letter-spacing: 0.1px; + color: rgba(0, 0, 0, 0.87); + margin: 0; + } + .tb-iot-hub-delete-desc { + font-size: 14px; + font-weight: 400; + line-height: 20px; + letter-spacing: 0.2px; + color: rgba(0, 0, 0, 0.54); + margin: 0; + } + .tb-iot-hub-delete-actions { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 8px; + padding: 8px; + } + `] +}) +export class TbIotHubDeleteDialogComponent { + + constructor( + @Inject(MAT_DIALOG_DATA) public data: IotHubDeleteDialogData, + private dialogRef: MatDialogRef + ) {} + + confirm(): void { + this.dialogRef.close(true); + } + + cancel(): void { + this.dialogRef.close(false); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html index 44ef219800..301d9c27fb 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html @@ -88,7 +88,8 @@ [showCreator]="true" (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" - (installClick)="installItem($event)"> + (installClick)="installItem($event)" + (deleteClick)="deleteInstalledItem($event)"> }
@@ -133,7 +134,8 @@ [showCreator]="true" (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" - (installClick)="installItem($event)"> + (installClick)="installItem($event)" + (deleteClick)="deleteInstalledItem($event)"> }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts index 060585266a..7f8e5a77a7 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts @@ -26,6 +26,7 @@ import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-it import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; +import { TbIotHubDeleteDialogComponent, IotHubDeleteDialogData } from './iot-hub-delete-dialog.component'; interface CategoryCard { type: ItemType; @@ -167,7 +168,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { openItemDetail(item: MpItemVersionView): void { const installedItem = this.findInstalledItem(item); - this.dialog.open(TbIotHubItemDetailDialogComponent, { + const dialogRef = this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], autoFocus: false, data: { @@ -176,6 +177,25 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { installedItem } as IotHubItemDetailDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed' || result === 'deleted') { + this.reloadInstalledItems(item.type); + } + }); + } + + private reloadInstalledItems(type: ItemType): void { + const config = { ignoreLoading: true }; + const pageLink = new PageLink(10000, 0); + if (type === ItemType.WIDGET) { + this.iotHubApiService.getInstalledItems(pageLink, ItemType.WIDGET, config).subscribe(data => { + this.installedWidgets = data.data; + }); + } else if (type === ItemType.SOLUTION_TEMPLATE) { + this.iotHubApiService.getInstalledItems(pageLink, ItemType.SOLUTION_TEMPLATE, config).subscribe(data => { + this.installedSolutionTemplates = data.data; + }); + } } private findInstalledItem(item: MpItemVersionView): IotHubInstalledItem | undefined { @@ -190,13 +210,19 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { } installItem(item: MpItemVersionView): void { - this.dialog.open(TbIotHubInstallDialogComponent, { - panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], + const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { + panelClass: ['tb-dialog'], + autoFocus: false, data: { item, iotHubApiService: this.iotHubApiService } as IotHubInstallDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed') { + this.reloadInstalledItems(item.type); + } + }); } navigateToCreator(creatorId: string): void { @@ -211,6 +237,29 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); } + deleteInstalledItem(item: MpItemVersionView): void { + const installedItem = this.findInstalledItem(item); + if (!installedItem) { + return; + } + const dialogRef = this.dialog.open(TbIotHubDeleteDialogComponent, { + panelClass: ['tb-dialog'], + autoFocus: false, + data: { itemName: item.name } as IotHubDeleteDialogData + }); + dialogRef.afterClosed().subscribe(confirmed => { + if (confirmed) { + this.iotHubApiService.deleteInstalledItem(installedItem.id.id).subscribe(() => { + if (item.type === ItemType.WIDGET) { + this.installedWidgets = this.installedWidgets.filter(i => i.id.id !== installedItem.id.id); + } else if (item.type === ItemType.SOLUTION_TEMPLATE) { + this.installedSolutionTemplates = this.installedSolutionTemplates.filter(i => i.id.id !== installedItem.id.id); + } + }); + } + }); + } + openSignup(): void { window.open('https://iothub.thingsboard.io/signup', '_blank'); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.html new file mode 100644 index 0000000000..f101a75cbb --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.html @@ -0,0 +1,80 @@ + +
+ @switch (state) { + @case ('confirm') { +

{{ 'iot-hub.install-confirm-title' | translate:{ name: item.name } }}

+

{{ 'iot-hub.install-desc' | translate }}

+ } + @case ('select-entity') { +

{{ 'iot-hub.install-confirm-title' | translate:{ name: item.name } }}

+

{{ 'iot-hub.select-entity-for-cf' | translate:{ name: item.name } }}

+ + + } + @case ('installing') { +

{{ 'iot-hub.install-confirm-title' | translate:{ name: item.name } }}

+

{{ 'iot-hub.install-desc' | translate }}

+ } + @case ('success') { +

{{ 'iot-hub.install-success-title' | translate }}

+

{{ 'iot-hub.install-success-desc' | translate:{ name: item.name } }}

+ } + @case ('error') { +

{{ 'iot-hub.install-error-title' | translate }}

+

{{ 'iot-hub.install-error-message' | translate:{ name: item.name } }}

+
{{ errorMessage }}
+ } + } +
+ + @switch (state) { + @case ('confirm') { + + + } + @case ('select-entity') { + + + } + @case ('installing') { + + + } + @case ('success') { + + @if (entityDetailsUrl) { + + } + } + @case ('error') { + + } + } + diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.scss new file mode 100644 index 0000000000..a7ad4a2d3b --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.scss @@ -0,0 +1,57 @@ +/** + * Copyright © 2016-2026 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. + */ + +.tb-iot-hub-install-content { + display: flex; + flex-direction: column; + gap: 20px; + padding: 24px; +} + +.tb-iot-hub-install-title { + font-size: 20px; + font-weight: 600; + line-height: 24px; + letter-spacing: 0.1px; + color: rgba(0, 0, 0, 0.87); + margin: 0; +} + +.tb-iot-hub-install-desc { + color: rgba(0, 0, 0, 0.54); + font-size: 14px; + line-height: 20px; + letter-spacing: 0.2px; + margin: 0; +} + +.tb-iot-hub-inline-spinner { + display: inline-block; + margin-right: 8px; +} + +.tb-iot-hub-error-details { + max-height: 200px; + overflow-y: auto; + padding: 12px; + background: #f5f5f5; + border-radius: 4px; + font-family: monospace; + font-size: 12px; + color: rgba(0, 0, 0, 0.7); + white-space: pre-wrap; + word-break: break-word; +} diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts index ecb623103d..3b66341e08 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-install-dialog.component.ts @@ -40,119 +40,8 @@ export type InstallState = 'select-entity' | 'confirm' | 'installing' | 'success @Component({ selector: 'tb-iot-hub-install-dialog', standalone: false, - template: ` - @switch (state) { - @case ('confirm') { -

{{ 'iot-hub.install-item-title' | translate }}

- -

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

-

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

-

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

- - - - - - } - @case ('select-entity') { -

{{ 'iot-hub.install-item-title' | translate }}

- -

{{ 'iot-hub.select-entity-for-cf' | translate:{ name: item.name } }}

- - - - - - - - } - @case ('installing') { -

{{ 'iot-hub.install-item-title' | translate }}

- -

{{ 'iot-hub.install-confirm' | translate:{ name: item.name, version: item.version } }}

-

{{ 'iot-hub.install-type' | translate:{ type: getTypeLabel() } }}

-

{{ 'iot-hub.install-creator' | translate:{ creator: item.creatorDisplayName } }}

- - - - - - } - @case ('success') { -

- check_circle - {{ 'iot-hub.install-success-title' | translate }} -

- -

{{ 'iot-hub.install-success-message' | translate:{ name: item.name, version: item.version } }}

- - - - @if (entityDetailsUrl) { - - } - - } - @case ('error') { -

- error - {{ 'iot-hub.install-error-title' | translate }} -

- -

{{ 'iot-hub.install-error-message' | translate:{ name: item.name } }}

-
{{ errorMessage }}
- - - - - } - } - `, - styles: [` - .tb-iot-hub-install-meta { - margin: 4px 0; - color: rgba(0, 0, 0, 0.54); - font-size: 14px; - } - .tb-iot-hub-inline-spinner { - display: inline-block; - margin-right: 8px; - } - .tb-iot-hub-result-icon { - vertical-align: middle; - margin-right: 8px; - } - .tb-iot-hub-success-icon { - color: #2e7d32; - } - .tb-iot-hub-error-icon { - color: #c62828; - } - .tb-iot-hub-error-details { - max-height: 200px; - overflow-y: auto; - padding: 12px; - background: #f5f5f5; - border-radius: 4px; - font-family: monospace; - font-size: 12px; - color: rgba(0, 0, 0, 0.7); - white-space: pre-wrap; - word-break: break-word; - margin-top: 8px; - } - `] + templateUrl: './iot-hub-install-dialog.component.html', + styleUrls: ['./iot-hub-install-dialog.component.scss'] }) export class TbIotHubInstallDialogComponent { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index e2b2813ff3..cbebb07387 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -33,7 +33,7 @@
@if (isInstalled()) { @if (isSameVersion()) { - check{{ 'iot-hub.installed' | translate }} + } @else { } @@ -66,7 +66,7 @@ @if (isInstalled()) { @if (isSameVersion()) { - check{{ 'iot-hub.installed' | translate }} + } @else { } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 7cabcd8fa1..79ed432451 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -318,6 +318,8 @@ height: 32px; padding: 6px 12px 6px 8px; border-radius: 4px; + border: none; + background: none; color: $tb-primary-color; font-size: 14px; font-weight: 500; @@ -325,6 +327,13 @@ letter-spacing: 0.25px; white-space: nowrap; flex-shrink: 0; + cursor: pointer; + font-family: inherit; + transition: background 0.15s; + + &:hover { + background: rgba($tb-primary-color, 0.04); + } tb-icon { font-size: 24px; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index c43ba55e03..1e7f685808 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -41,6 +41,7 @@ export class TbIotHubItemCardComponent { @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); @Output() updateClick = new EventEmitter(); + @Output() deleteClick = new EventEmitter(); typeTranslations = itemTypeTranslations; @@ -209,6 +210,11 @@ export class TbIotHubItemCardComponent { this.updateClick.emit(this.item); } + onDeleteClick(event: MouseEvent): void { + event.stopPropagation(); + this.deleteClick.emit(this.item); + } + onCreatorClick(event: MouseEvent): void { event.stopPropagation(); this.creatorClick.emit(this.item.creatorId); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html index 5feb405405..de9c3f1f3b 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-detail-dialog.component.html @@ -18,6 +18,11 @@
+ @if (item.type === ItemType.CALCULATED_FIELD || item.type === ItemType.RULE_CHAIN) { +
+ {{ getCompactIcon() }} +
+ }
{{ item.name }}
@@ -26,8 +31,10 @@ download {{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }} - - Latest + @if (getSubtypeLabel(); as subtypeLabel) { + + {{ subtypeLabel }} + } v {{ item.version }} @if (item.publishedTime) { @@ -43,54 +50,10 @@
- +
-
-
- @if (item.type === ItemType.SOLUTION_TEMPLATE && carouselImages.length > 1) { -
- -
-
- -
-
- - - - - - - -
- - -
- } @else { - @if (getPreviewUrl(); as url) { - - } @else { -
- {{ getTypeIcon() }} -
- } - } -
+ @if (item.type === ItemType.CALCULATED_FIELD || item.type === ItemType.RULE_CHAIN) { +
@if (item.description) {
@@ -102,7 +65,67 @@ {{ item.creatorDisplayName }}
-
+ } @else { + +
+
+ @if (item.type === ItemType.SOLUTION_TEMPLATE && carouselImages.length > 1) { +
+ +
+
+ +
+
+ + + + + + + +
+ + +
+ } @else { + @if (getPreviewUrl(); as url) { + + } @else { +
+ {{ getTypeIcon() }} +
+ } + } +
+
+ @if (item.description) { +
+ +
+ } +
+ person + {{ item.creatorDisplayName }} +
+
+
+ }
@@ -149,6 +172,12 @@
+ @if (isInstalled()) { + + } @if (isSameVersion() && item.type === ItemType.SOLUTION_TEMPLATE) { + } +
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss index d07ade2ad6..11795fa233 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.scss @@ -14,6 +14,8 @@ * limitations under the License. */ +@import "../../../../../scss/constants"; + // Outer page — 16px padding around the white container :host { display: block; @@ -43,12 +45,26 @@ z-index: 0; } - > * { + > *:not(.tb-iot-hub-installed-btn) { position: relative; z-index: 1; } } +// Installed Items button — Design: top-right, white bg, primary border, card shadow +.tb-iot-hub-installed-btn { + position: absolute; + top: 24px; + right: 24px; + z-index: 2; + background: white; + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.08), 0 4px 8px 0 rgba(0, 0, 0, 0.08); + + &.mat-primary { + --mat-button-outlined-outline-color: #{$tb-primary-color}; + } +} + // Hero section .tb-iot-hub-hero { text-align: center; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts index 7f8e5a77a7..45905ea495 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts @@ -106,6 +106,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { installedWidgets: IotHubInstalledItem[] = []; installedSolutionTemplates: IotHubInstalledItem[] = []; + installedItemsCount = 0; isLoading = true; @@ -187,6 +188,9 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { private reloadInstalledItems(type: ItemType): void { const config = { ignoreLoading: true }; const pageLink = new PageLink(10000, 0); + this.iotHubApiService.getInstalledItemsCount(null, config).subscribe(count => { + this.installedItemsCount = count; + }); if (type === ItemType.WIDGET) { this.iotHubApiService.getInstalledItems(pageLink, ItemType.WIDGET, config).subscribe(data => { this.installedWidgets = data.data; @@ -250,6 +254,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { dialogRef.afterClosed().subscribe(confirmed => { if (confirmed) { this.iotHubApiService.deleteInstalledItem(installedItem.id.id).subscribe(() => { + this.installedItemsCount = Math.max(0, this.installedItemsCount - 1); if (item.type === ItemType.WIDGET) { this.installedWidgets = this.installedWidgets.filter(i => i.id.id !== installedItem.id.id); } else if (item.type === ItemType.SOLUTION_TEMPLATE) { @@ -281,7 +286,8 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { calcFields: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.CALCULATED_FIELD, 6), config), ruleChains: this.iotHubApiService.getPublishedVersions(buildQuery(ItemType.RULE_CHAIN, 6), config), installedWidgets: this.iotHubApiService.getInstalledItems(installedPageLink, ItemType.WIDGET, config), - installedSolutionTemplates: this.iotHubApiService.getInstalledItems(installedPageLink, ItemType.SOLUTION_TEMPLATE, config) + installedSolutionTemplates: this.iotHubApiService.getInstalledItems(installedPageLink, ItemType.SOLUTION_TEMPLATE, config), + installedCount: this.iotHubApiService.getInstalledItemsCount(null, config) }).subscribe({ next: (results) => { this.popularWidgets = results.widgets.data; @@ -291,6 +297,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { this.popularRuleChains = results.ruleChains.data; this.installedWidgets = results.installedWidgets.data; this.installedSolutionTemplates = results.installedSolutionTemplates.data; + this.installedItemsCount = results.installedCount; this.isLoading = false; }, error: () => { From 42b343f0331325844fc7d6d67c4675c3ef343308 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 16:12:24 +0300 Subject: [PATCH 014/219] Redesign IoT Hub browse page to match design - Two-column layout: left sidebar filters (280px, own scroll) + right card grid - Filters use mat-expansion-panel accordions with checkbox lists - Type, Category, Use Case filter sections with expand/collapse - Top bar: results count + search field, sort button with mat-menu - Active filter chips row with clear all button - 4-column card grid (responsive: 3 at 1200px, 2 at 900px) - Card subtype label: @Input showSubtype, 12px Medium uppercase above name - Tabs use plural item type translations - Remove old header, filter dropdowns, and footer sections --- .../iot-hub/iot-hub-browse.component.html | 332 +++++++------- .../iot-hub/iot-hub-browse.component.scss | 412 ++++++------------ .../pages/iot-hub/iot-hub-browse.component.ts | 12 + .../iot-hub/iot-hub-item-card.component.html | 3 + .../iot-hub/iot-hub-item-card.component.scss | 10 + .../iot-hub/iot-hub-item-card.component.ts | 1 + 6 files changed, 320 insertions(+), 450 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index 05bf3d72ad..94b1ce7940 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -15,214 +15,210 @@ limitations under the License. --> -
- - @if (!embedded) { -
-
-

{{ getTitle() | translate }}

-

{{ getSubtitle() | translate }}

-
- -
- } - +
-
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss index deef2d98bc..d228a5f2e6 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss @@ -18,249 +18,147 @@ display: flex; flex-direction: column; height: 100%; - padding: 16px 24px; - overflow: auto; +} - &.embedded { - padding: 0; - overflow: visible; - height: auto; - } +.tb-iot-hub-browse { + display: flex; + flex-direction: column; + height: 100%; } -.tb-iot-hub-browse-container { - max-width: 1400px; - margin: 0 auto; - width: 100%; - background: white; - padding: 24px; - border-radius: 4px; - box-shadow: 0 0 1px rgba(0, 0, 0, 0.14), 0 1px 1px rgba(0, 0, 0, 0.12); - - &.embedded { - max-width: none; - padding: 0; - border-radius: 0; - box-shadow: none; - background: transparent; - } +// Tabs — Design: px-40, border-bottom +.tb-iot-hub-tabs { + padding: 0 40px; + flex-shrink: 0; } -.tb-iot-hub-browse-header { +// Two-column layout below tabs +.tb-iot-hub-content { display: flex; - justify-content: space-between; - align-items: flex-start; - margin-bottom: 24px; - - h1 { - font-size: 28px; - font-weight: 700; - margin: 0 0 4px; - color: rgba(0, 0, 0, 0.87); - } - - p { - font-size: 14px; - color: rgba(0, 0, 0, 0.54); - margin: 0; - } + flex: 1; + min-height: 0; } -.tb-iot-hub-type-tabs { - margin-bottom: 16px; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - - ::ng-deep { - .mat-mdc-tab-link-container { - flex-grow: 0; - } - - .mat-mdc-tab-link { - text-transform: none; - font-weight: 400; - min-width: auto; - padding: 0 16px; - letter-spacing: normal; - height: 40px; - flex: 0 0 auto; - } - - --mat-tab-active-indicator-color: #1976d2; - - .mdc-tab__text-label { - color: rgba(0, 0, 0, 0.6); - } - - .mdc-tab--active .mdc-tab__text-label { - font-weight: 500; - } +// Left sidebar filters — Design: 280px wide, right border, own scroll +.tb-iot-hub-filters { + width: 280px; + flex-shrink: 0; + border-right: 1px solid rgba(0, 0, 0, 0.12); + overflow-y: auto; +} - --mat-tab-active-label-text-color: #1976d2; - --mat-tab-active-focus-label-text-color: #1976d2; - --mat-tab-active-hover-label-text-color: #1976d2; - --mat-tab-active-ripple-color: #1976d2; - --mat-tab-inactive-ripple-color: #1976d2; - --mat-tab-active-focus-indicator-color: #1976d2; - } +.tb-iot-hub-filters-inner { + display: flex; + flex-direction: column; + gap: 8px; + padding: 24px 0; } -// Shared field styles for search/filter/sort dropdowns -%tb-iot-hub-field-base { +// Filter expansion panels — Design: no border, no shadow, pl-40 for content +.tb-iot-hub-filter-panel { ::ng-deep { - .mat-mdc-text-field-wrapper { - height: 42px; - padding: 0 12px; + &.mat-expansion-panel { + box-shadow: none !important; + border-radius: 0 !important; + background: transparent; } - .mat-mdc-form-field-flex { - height: 42px; - align-items: center; + .mat-expansion-panel-header { + padding: 8px 16px 8px 40px; } - .mdc-notched-outline__leading, - .mdc-notched-outline__notch, - .mdc-notched-outline__trailing { - border-color: #d5dbe3; - } - - .mdc-notched-outline__leading { - border-radius: 8px 0 0 8px; - } - - .mdc-notched-outline__trailing { - border-radius: 0 8px 8px 0; - } - - .mat-mdc-form-field-infix { - padding-top: 0; - padding-bottom: 0; - min-height: unset; - } - - .mdc-notched-outline__notch { - display: none; - } - - .mat-mdc-floating-label { - display: none; - } - - .mat-mdc-form-field-subscript-wrapper { - display: none; - } - - input.mat-mdc-input-element { + .mat-expansion-panel-header-title { font-size: 14px; - color: #3e4a59; - - &::placeholder { - color: #8b95a2; - opacity: 1; - } + font-weight: 500; + color: rgba(0, 0, 0, 0.87); } - .mat-mdc-select-value-text { - font-size: 14px; - color: #3e4a59; + .mat-expansion-panel-body { + padding: 0; } + } - .mat-mdc-select-arrow-wrapper { - padding-left: 4px; - } + mat-checkbox { + display: block; + padding: 8px 16px 8px 40px; - .mat-icon { - color: #8b95a2; - font-size: 20px; - width: 20px; - height: 20px; + &:hover { + background: rgba(0, 0, 0, 0.04); } } +} - &.mat-focused ::ng-deep { - .mdc-notched-outline__leading, - .mdc-notched-outline__notch, - .mdc-notched-outline__trailing { - border-color: #8b95a2; - border-width: 1px; - } - } +// Right content area — Design: flex-1, pr-40, scrollable +.tb-iot-hub-results { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + overflow-y: auto; + padding: 0 40px 0 20px; } -.tb-iot-hub-search-row { +// Top bar: results count + search +.tb-iot-hub-results-top { display: flex; - gap: 12px; - margin-bottom: 12px; align-items: center; + justify-content: space-between; + padding: 16px 0 0; + flex-shrink: 0; +} - .tb-iot-hub-search-field, - .tb-iot-hub-sort-field { - @extend %tb-iot-hub-field-base; - } - - .tb-iot-hub-search-field { - flex: 1; - - ::ng-deep { - .mat-mdc-form-field-icon-prefix { - padding: 0 8px 0 0; - - > .mat-icon { - padding: 0; - } - } - - .mat-mdc-form-field-icon-suffix { - padding: 0; +.tb-iot-hub-results-count { + font-size: 14px; + color: rgba(0, 0, 0, 0.54); +} - .mat-mdc-icon-button { - width: 32px; - height: 32px; - padding: 4px; - } - } - } - } +.tb-iot-hub-search-field { + width: 240px; - .tb-iot-hub-sort-field { - width: 140px; - flex-shrink: 0; + .mat-mdc-form-field-subscript-wrapper { + display: none; } } -.tb-iot-hub-filter-row { +// Sort row + active filters +.tb-iot-hub-sort-row { display: flex; - gap: 12px; - margin-bottom: 16px; - padding-right: 152px; - - .tb-iot-hub-filter-select { - @extend %tb-iot-hub-field-base; - flex: 1; - min-width: 0; - } + align-items: center; + gap: 8px; + padding: 8px 0; + flex-shrink: 0; + flex-wrap: wrap; +} + +.tb-iot-hub-sort-spacer { + flex: 1; } +.tb-iot-hub-sort-btn { + color: rgba(0, 0, 0, 0.54); + flex-shrink: 0; +} + +// Active filter chips .tb-iot-hub-active-filters { display: flex; align-items: center; - gap: 6px; + gap: 8px; flex-wrap: wrap; - margin-bottom: 12px; } .tb-iot-hub-active-chip { display: inline-flex; align-items: center; gap: 4px; - padding: 4px 8px 4px 12px; - border-radius: 16px; + padding: 4px 8px; + border-radius: 4px; font-size: 12px; font-weight: 500; - background: #eef4ff; - color: #305ECA; + background: rgba(0, 0, 0, 0.06); + color: rgba(0, 0, 0, 0.76); cursor: pointer; white-space: nowrap; - transition: background-color 0.15s; mat-icon { font-size: 14px; @@ -269,135 +167,85 @@ } &:hover { - background: #dde8fc; + background: rgba(0, 0, 0, 0.1); } } -.tb-iot-hub-clear-filters { - border: none; - background: none; +.tb-iot-hub-clear-btn { font-size: 12px; - color: #8b95a2; + color: rgba(0, 0, 0, 0.54); cursor: pointer; + background: none; + border: none; padding: 4px 8px; - white-space: nowrap; + font-family: inherit; &:hover { - color: #3e4a59; - text-decoration: underline; + color: rgba(0, 0, 0, 0.87); } } -.tb-iot-hub-results-count { - font-size: 14px; - color: rgba(0, 0, 0, 0.54); - margin-bottom: 16px; +// Card grid — Design: 4 columns, gap 20px +.tb-iot-hub-card-grid { + display: grid; + grid-template-columns: repeat(4, 1fr); + gap: 20px; + padding: 8px 0 24px; } +// Loading / Empty states .tb-iot-hub-loading { display: flex; justify-content: center; - align-items: center; - min-height: 200px; + padding: 80px 0; } .tb-iot-hub-empty-state { display: flex; flex-direction: column; align-items: center; - justify-content: center; - min-height: 300px; + padding: 80px 0; text-align: center; - color: rgba(0, 0, 0, 0.54); - - .tb-iot-hub-empty-icon { - font-size: 64px; - width: 64px; - height: 64px; - margin-bottom: 16px; - opacity: 0.4; - } h3 { - margin: 0 0 8px 0; + font-size: 18px; + font-weight: 500; color: rgba(0, 0, 0, 0.87); + margin: 16px 0 8px; } p { - margin: 0 0 16px 0; + font-size: 14px; + color: rgba(0, 0, 0, 0.54); + margin: 0 0 24px; } } -.tb-iot-hub-card-grid { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); - gap: 16px; - margin-bottom: 16px; +.tb-iot-hub-empty-icon { + font-size: 48px; + width: 48px; + height: 48px; + color: rgba(0, 0, 0, 0.2); } -::ng-deep mat-paginator { - .mat-mdc-form-field { - .mat-mdc-text-field-wrapper { - height: 42px; - padding: 0 12px; - border: 1px solid #d5dbe3; - border-radius: 8px; - background: white; - } - - .mat-mdc-form-field-flex { - height: 42px; - align-items: center; - } - - .mdc-notched-outline { - display: none; - } - - .mat-mdc-form-field-infix { - padding-top: 0; - padding-bottom: 0; - min-height: unset; - border-top: none; - } - - .mat-mdc-floating-label { - display: none; - } - - .mat-mdc-form-field-subscript-wrapper { - display: none; - } - - .mat-mdc-select-value-text { - font-size: 14px; - color: #3e4a59; - } - - .mat-mdc-select-arrow-wrapper { - padding-left: 4px; - } +// Pagination +mat-paginator { + flex-shrink: 0; +} - &.mat-focused .mat-mdc-text-field-wrapper { - border-color: #8b95a2; - } +// Responsive +@media (max-width: 1200px) { + .tb-iot-hub-card-grid { + grid-template-columns: repeat(3, 1fr); } } -.tb-iot-hub-browse-footer { - text-align: center; - padding: 24px 0; - border-top: 1px solid rgba(0, 0, 0, 0.08); - margin-top: 16px; - - .tb-iot-hub-become-creator { - color: rgba(0, 0, 0, 0.38); - font-size: 13px; - text-decoration: none; +@media (max-width: 900px) { + .tb-iot-hub-filters { + width: 220px; + } - &:hover { - color: rgba(0, 0, 0, 0.54); - text-decoration: underline; - } + .tb-iot-hub-card-grid { + grid-template-columns: repeat(2, 1fr); } } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index 083b858c70..f753f0da27 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -159,6 +159,18 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.loadItems(); } + isSubtypeActive(key: string): boolean { + return this.getActiveSubtypes().has(key); + } + + isCategoryActive(key: string): boolean { + return this.activeCategories.has(key); + } + + isUseCaseActive(key: string): boolean { + return this.activeUseCases.has(key); + } + onCategoryToggle(category: string): void { if (this.activeCategories.has(category)) { this.activeCategories.delete(category); diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index cbebb07387..532e9a2770 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -54,6 +54,9 @@ }
+ @if (showSubtype && getSubtypeLabel(); as subtypeLabel) { + {{ subtypeLabel }} + }

{{ item.name }}

person diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss index 79ed432451..ca294f2846 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.scss @@ -205,6 +205,16 @@ text-transform: uppercase; } +// Subtype label — Design: 12px Medium uppercase, rgba(0,0,0,0.54), tracking 0.25 +.tb-iot-hub-card-subtype { + font-size: 12px; + font-weight: 500; + line-height: 16px; + letter-spacing: 0.25px; + text-transform: uppercase; + color: rgba(0, 0, 0, 0.54); +} + // Name — Design: 16px Medium, line-height 24, tracking 0.25, ellipsis .tb-iot-hub-card-name { font-size: 16px; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts index 1e7f685808..bc4ff60186 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.ts @@ -37,6 +37,7 @@ export class TbIotHubItemCardComponent { @Input() installedItem: IotHubInstalledItem; @Input() showCreator = true; @Input() showTypeChip = true; + @Input() showSubtype = false; @Output() cardClick = new EventEmitter(); @Output() creatorClick = new EventEmitter(); @Output() installClick = new EventEmitter(); From 7d6d4ecb9e37c9a20d2d21cee81e1412bd78b99d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 18:46:40 +0300 Subject: [PATCH 015/219] Update browse page filters, search, and creator profile to match design - Browse: custom search field (320px, rounded-8, border, plain input), sort button with primary color, results count 14px Medium - Filter chips: use Angular Material mat-chip-set with rgba(0,0,0,0.04) bg, "Clear all" text button - Filter sidebar: scroll via absolute-positioned wrapper, dividers between panels - Creator profile: flat layout (no mat-card), avatar+name+email header, description, website stroked button with globe icon, social icon buttons, "Published Items (N)" heading, embedded browse component --- .../iot-hub/iot-hub-browse.component.html | 48 +++--- .../iot-hub/iot-hub-browse.component.scss | 158 +++++++++++------- .../iot-hub-creator-profile.component.html | 103 ++++++------ .../iot-hub-creator-profile.component.scss | 126 +++++++------- .../assets/locale/locale.constant-en_US.json | 2 + 5 files changed, 246 insertions(+), 191 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index 94b1ce7940..a1e69167ec 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -55,6 +55,7 @@
+
@if (getSubtypeMap(); as subtypeMap) { @@ -71,6 +72,9 @@ } @if (categories.size > 0) { + @if (getSubtypeMap()) { +
+ } {{ 'iot-hub.category' | translate }} @@ -84,6 +88,9 @@ } + @if (getSubtypeMap() || categories.size > 0) { +
+ } {{ 'iot-hub.use-case' | translate }} @@ -96,6 +103,7 @@ }
+
@@ -105,47 +113,47 @@ {{ 'iot-hub.results-count' | translate:{ count: totalElements } }} - - search - + search + @if (textSearch) { - } - +
@if (hasActiveDropdownFilters()) { -
+ @for (key of getActiveSubtypesArray(); track key) { - + {{ getSubtypeLabel(key) }} - close - + close + } @for (key of getActiveCategoriesArray(); track key) { - + {{ getCategoryLabel(key) }} - close - + close + } @for (key of getActiveUseCasesArray(); track key) { - + {{ getUseCaseLabel(key) }} - close - + close + } - -
+ + } @if (creator) { - - - -
-
- @if (getAvatarUrl(); as avatarUrl) { - - } @else { - account_circle - } -
-
-

{{ creator.displayName }}

- @if (creator.description) { -

{{ creator.description }}

- } - @if (creator.website) { - - {{ creator.website }} - - } - @if (creator.contactEmail) { -
{{ creator.contactEmail }}
- } -
- @if (creator.githubUrl) { - - code - - } - @if (creator.linkedinUrl) { - - work - - } - @if (creator.twitterUrl) { - - chat - - } -
-
+ +
+
+
+ @if (getAvatarUrl(); as avatarUrl) { + + } @else { + person + }
- - +
+

{{ creator.displayName }}

+ @if (creator.contactEmail) { + {{ creator.contactEmail }} + } +
+
+ + @if (creator.description) { +

{{ creator.description }}

+ } - -
-

{{ 'iot-hub.published-items' | translate }} ({{ creator.publishedCount }})

+
+ @if (creator.website) { + + language + {{ creator.website | slice:0:40 }} + + } + @if (creator.githubUrl) { + + + + } + @if (creator.linkedinUrl) { + + + + } + @if (creator.twitterUrl) { + + + + } +
+ +

+ {{ 'iot-hub.published-items' | translate }} ({{ creator.publishedCount }}) +

+ + Date: Wed, 1 Apr 2026 19:49:43 +0300 Subject: [PATCH 016/219] Add hero icons for all types, browse improvements, and creator profile updates - Export and add hero floating icons for Solution Templates, Calculated Fields, Rule Chains, and Devices (16 new SVGs) - Browse: add installedWidgets, deleteInstalledItem, reload on install/delete, filter improvements, search field matching design, compact card subtype label - Creator profile: padding, browse negative margins, website label without protocol, social icon sizing and colors --- .../iot-hub/iot-hub-browse.component.html | 3 +- .../iot-hub/iot-hub-browse.component.scss | 9 +- .../pages/iot-hub/iot-hub-browse.component.ts | 82 +++++++++++++++++-- .../iot-hub-creator-profile.component.html | 4 +- .../iot-hub-creator-profile.component.scss | 24 +++++- .../iot-hub-creator-profile.component.ts | 4 + .../pages/iot-hub/iot-hub-home.component.ts | 12 ++- .../iot-hub/iot-hub-item-card.component.html | 3 + .../iot-hub/hero-calculated-field-icon-1.svg | 25 ++++++ .../iot-hub/hero-calculated-field-icon-2.svg | 25 ++++++ .../iot-hub/hero-calculated-field-icon-3.svg | 25 ++++++ .../iot-hub/hero-calculated-field-icon-4.svg | 25 ++++++ .../src/assets/iot-hub/hero-device-icon-1.svg | 25 ++++++ .../src/assets/iot-hub/hero-device-icon-2.svg | 25 ++++++ .../src/assets/iot-hub/hero-device-icon-3.svg | 25 ++++++ .../src/assets/iot-hub/hero-device-icon-4.svg | 30 +++++++ .../assets/iot-hub/hero-rule-chain-icon-1.svg | 25 ++++++ .../assets/iot-hub/hero-rule-chain-icon-2.svg | 25 ++++++ .../assets/iot-hub/hero-rule-chain-icon-3.svg | 25 ++++++ .../assets/iot-hub/hero-rule-chain-icon-4.svg | 35 ++++++++ .../iot-hub/hero-solution-template-icon-1.svg | 25 ++++++ .../iot-hub/hero-solution-template-icon-2.svg | 25 ++++++ .../iot-hub/hero-solution-template-icon-3.svg | 25 ++++++ .../iot-hub/hero-solution-template-icon-4.svg | 25 ++++++ 24 files changed, 538 insertions(+), 18 deletions(-) create mode 100644 ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-4.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-device-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-device-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-device-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-device-icon-4.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-4.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-solution-template-icon-1.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-solution-template-icon-2.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-solution-template-icon-3.svg create mode 100644 ui-ngx/src/assets/iot-hub/hero-solution-template-icon-4.svg diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index a1e69167ec..c0d3ac14c3 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -213,7 +213,8 @@ (cardClick)="openItemDetail($event)" (creatorClick)="navigateToCreator($event)" (installClick)="installItem($event)" - (updateClick)="updateItem($event)"> + (updateClick)="updateItem($event)" + (deleteClick)="deleteInstalledItem($event)"> }
diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss index 93b66b7c80..3f7c2373ee 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.scss @@ -26,11 +26,16 @@ height: 100%; } -// Tabs — Design: px-40, bottom border rgba(0,0,0,0.12) +// Tabs — Design: px-40, bottom border, labels auto-width (not stretched) .tb-iot-hub-tabs { padding: 0 40px; flex-shrink: 0; border-bottom: 1px solid rgba(0, 0, 0, 0.12); + + .mat-mdc-tab-link { + min-width: auto; + flex: 0 0 auto; + } } // Two-column layout below tabs @@ -45,6 +50,8 @@ flex-shrink: 0; border-right: 1px solid rgba(0, 0, 0, 0.12); position: relative; + padding-bottom: 48px; + margin-bottom: -48px; } .tb-iot-hub-filters-wrapper { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts index f753f0da27..697b540782 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.ts @@ -34,6 +34,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TbIotHubItemDetailDialogComponent, IotHubItemDetailDialogData } from './iot-hub-item-detail-dialog.component'; import { TbIotHubInstallDialogComponent, IotHubInstallDialogData } from './iot-hub-install-dialog.component'; import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub-update-dialog.component'; +import { TbIotHubDeleteDialogComponent, IotHubDeleteDialogData } from './iot-hub-delete-dialog.component'; interface SortOption { value: string; @@ -92,6 +93,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { widgetTypes: Map = widgetTypeTranslations; ruleChainTypes: Map = ruleChainTypeTranslations; + installedWidgets: IotHubInstalledItem[] = null; installedSolutionTemplates: IotHubInstalledItem[] = null; private searchSubject = new Subject(); @@ -123,6 +125,11 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } } this.updateCategories(); + if (this.activeType === ItemType.WIDGET) { + this.loadInstalledWidgets(); + } else if (this.activeType === ItemType.SOLUTION_TEMPLATE) { + this.loadInstalledSolutionTemplates(); + } this.loadItems(); } @@ -153,7 +160,9 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.activeRuleChainTypes.clear(); this.updateCategories(); this.pageIndex = 0; - if (type === ItemType.SOLUTION_TEMPLATE) { + if (type === ItemType.WIDGET) { + this.loadInstalledWidgets(); + } else if (type === ItemType.SOLUTION_TEMPLATE) { this.loadInstalledSolutionTemplates(); } this.loadItems(); @@ -356,14 +365,17 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } getInstalledItem(item: MpItemVersionView): IotHubInstalledItem | undefined { - if (this.activeType !== ItemType.SOLUTION_TEMPLATE || !this.installedSolutionTemplates) { - return undefined; + if (this.activeType === ItemType.WIDGET && this.installedWidgets) { + return this.installedWidgets.find(i => i.itemId === item.itemId); } - return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); + if (this.activeType === ItemType.SOLUTION_TEMPLATE && this.installedSolutionTemplates) { + return this.installedSolutionTemplates.find(i => i.itemId === item.itemId); + } + return undefined; } openItemDetail(item: MpItemVersionView): void { - this.dialog.open(TbIotHubItemDetailDialogComponent, { + const dialogRef = this.dialog.open(TbIotHubItemDetailDialogComponent, { panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], autoFocus: false, data: { @@ -372,19 +384,25 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { installedItem: this.getInstalledItem(item) } as IotHubItemDetailDialogData }); + dialogRef.afterClosed().subscribe(result => { + if (result === 'installed' || result === 'deleted') { + this.reloadInstalledItems(); + } + }); } installItem(item: MpItemVersionView): void { const dialogRef = this.dialog.open(TbIotHubInstallDialogComponent, { panelClass: ['tb-dialog'], + autoFocus: false, data: { item, iotHubApiService: this.iotHubApiService } as IotHubInstallDialogData }); dialogRef.afterClosed().subscribe(result => { - if (result === 'installed' && this.activeType === ItemType.SOLUTION_TEMPLATE) { - this.loadItems(); + if (result === 'installed') { + this.reloadInstalledItems(); } }); } @@ -396,6 +414,7 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } const dialogRef = this.dialog.open(TbIotHubUpdateDialogComponent, { panelClass: ['tb-dialog'], + autoFocus: false, data: { installedItemId: installedItem.id.id, itemName: item.name, @@ -406,8 +425,27 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { } as IotHubUpdateDialogData }); dialogRef.afterClosed().subscribe(result => { - if (result === 'updated' && this.activeType === ItemType.SOLUTION_TEMPLATE) { - this.loadItems(); + if (result === 'updated') { + this.reloadInstalledItems(); + } + }); + } + + deleteInstalledItem(item: MpItemVersionView): void { + const installedItem = this.getInstalledItem(item); + if (!installedItem) { + return; + } + const dialogRef = this.dialog.open(TbIotHubDeleteDialogComponent, { + panelClass: ['tb-dialog'], + autoFocus: false, + data: { itemName: item.name } as IotHubDeleteDialogData + }); + dialogRef.afterClosed().subscribe(confirmed => { + if (confirmed) { + this.iotHubApiService.deleteInstalledItem(installedItem.id.id).subscribe(() => { + this.reloadInstalledItems(); + }); } }); } @@ -420,6 +458,18 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { this.router.navigate(['/iot-hub/installed']); } + private loadInstalledWidgets(): void { + if (this.installedWidgets !== null) { + return; + } + const pageLink = new PageLink(10000, 0); + this.iotHubApiService.getInstalledItems(pageLink, ItemType.WIDGET, {ignoreLoading: true}).subscribe({ + next: (data) => { + this.installedWidgets = data.data; + } + }); + } + private loadInstalledSolutionTemplates(): void { if (this.installedSolutionTemplates !== null) { return; @@ -432,6 +482,20 @@ export class TbIotHubBrowseComponent implements OnInit, OnDestroy { }); } + private reloadInstalledItems(): void { + const config = {ignoreLoading: true}; + const pageLink = new PageLink(10000, 0); + if (this.activeType === ItemType.WIDGET) { + this.iotHubApiService.getInstalledItems(pageLink, ItemType.WIDGET, config).subscribe(data => { + this.installedWidgets = data.data; + }); + } else if (this.activeType === ItemType.SOLUTION_TEMPLATE) { + this.iotHubApiService.getInstalledItems(pageLink, ItemType.SOLUTION_TEMPLATE, config).subscribe(data => { + this.installedSolutionTemplates = data.data; + }); + } + } + private updateCategories(): void { this.categories = getCategoriesForType(this.activeType); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html index 62bac84619..d664a3bbfd 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html @@ -47,9 +47,9 @@
@if (creator.website) { - + language - {{ creator.website | slice:0:40 }} + {{ getWebsiteLabel() }} } @if (creator.githubUrl) { diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss index 5817d3e4c9..b639426cae 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss @@ -18,12 +18,13 @@ :host { display: block; + padding: 16px; } .tb-iot-hub-creator-page { background: white; border-radius: 8px; - padding: 24px 40px; + padding: 40px 40px 48px; } // Back button @@ -102,6 +103,15 @@ display: flex; align-items: center; gap: 8px; + + .mat-mdc-icon-button { + width: 40px; + height: 40px; + padding: 8px; + color: rgba(0, 0, 0, 0.54); + --mdc-icon-button-state-layer-size: 40px; + --mdc-icon-button-icon-color: rgba(0, 0, 0, 0.54); + } } .tb-iot-hub-creator-website { @@ -109,6 +119,18 @@ font-size: 14px; font-weight: 500; text-decoration: none; + height: 40px; + + &.mat-primary { + --mat-button-outlined-outline-color: #{$tb-primary-color}; + } +} + +// Browse component — stretch to full width and bottom, ignore parent padding +tb-iot-hub-browse { + margin-left: -40px; + margin-right: -40px; + margin-bottom: 0; } // Published items heading diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts index 5af791adbb..a70a446a80 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.ts @@ -56,6 +56,10 @@ export class TbIotHubCreatorProfileComponent implements OnInit, OnDestroy { return this.creator?.avatarUrl ? this.iotHubApiService.resolveResourceUrl(this.creator.avatarUrl) : null; } + getWebsiteLabel(): string { + return this.creator?.website?.replace(/^https?:\/\//, '') || ''; + } + goBack(): void { this.router.navigate(['/iot-hub']); } diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts index 45905ea495..1baeaebdcc 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts @@ -69,19 +69,23 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy { }, { type: ItemType.SOLUTION_TEMPLATE, labelKey: 'item.type-solution-template-plural', color: '#2666a9', - gradientColor: 'rgba(38, 102, 169, 0.1)', icons: [] + gradientColor: 'rgba(38, 102, 169, 0.1)', + icons: ['assets/iot-hub/hero-solution-template-icon-1.svg', 'assets/iot-hub/hero-solution-template-icon-2.svg', 'assets/iot-hub/hero-solution-template-icon-3.svg', 'assets/iot-hub/hero-solution-template-icon-4.svg'] }, { type: ItemType.CALCULATED_FIELD, labelKey: 'item.type-calculated-field-plural', color: '#006d92', - gradientColor: 'rgba(0, 109, 146, 0.1)', icons: [] + gradientColor: 'rgba(0, 109, 146, 0.1)', + icons: ['assets/iot-hub/hero-calculated-field-icon-1.svg', 'assets/iot-hub/hero-calculated-field-icon-2.svg', 'assets/iot-hub/hero-calculated-field-icon-3.svg', 'assets/iot-hub/hero-calculated-field-icon-4.svg'] }, { type: ItemType.RULE_CHAIN, labelKey: 'item.type-rule-chain-plural', color: '#95694b', - gradientColor: 'rgba(149, 105, 75, 0.1)', icons: [] + gradientColor: 'rgba(149, 105, 75, 0.1)', + icons: ['assets/iot-hub/hero-rule-chain-icon-1.svg', 'assets/iot-hub/hero-rule-chain-icon-2.svg', 'assets/iot-hub/hero-rule-chain-icon-3.svg', 'assets/iot-hub/hero-rule-chain-icon-4.svg'] }, { type: ItemType.DEVICE, labelKey: 'iot-hub.and-devices', color: '#4b8a79', - gradientColor: 'rgba(75, 138, 121, 0.1)', icons: [] + gradientColor: 'rgba(75, 138, 121, 0.1)', + icons: ['assets/iot-hub/hero-device-icon-1.svg', 'assets/iot-hub/hero-device-icon-2.svg', 'assets/iot-hub/hero-device-icon-3.svg', 'assets/iot-hub/hero-device-icon-4.svg'] } ]; diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html index 532e9a2770..9d3abff394 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-item-card.component.html @@ -22,6 +22,9 @@ {{ getPlaceholderIcon() }}
+ @if (showSubtype && getSubtypeLabel(); as subtypeLabel) { + {{ subtypeLabel }} + }

{{ item.name }}

person diff --git a/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-1.svg new file mode 100644 index 0000000000..7734b75c7a --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-1.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-2.svg new file mode 100644 index 0000000000..ac28694c40 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-3.svg new file mode 100644 index 0000000000..860997b4a5 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-3.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-4.svg new file mode 100644 index 0000000000..356d5dece0 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-calculated-field-icon-4.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-device-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-device-icon-1.svg new file mode 100644 index 0000000000..8ef1b628a4 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-device-icon-1.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-device-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-device-icon-2.svg new file mode 100644 index 0000000000..57e615a72d --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-device-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-device-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-device-icon-3.svg new file mode 100644 index 0000000000..1e7f844ba7 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-device-icon-3.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-device-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-device-icon-4.svg new file mode 100644 index 0000000000..164db57b9a --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-device-icon-4.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-1.svg new file mode 100644 index 0000000000..53a6019a4d --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-1.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-2.svg new file mode 100644 index 0000000000..917f875faa --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-3.svg new file mode 100644 index 0000000000..c5ecbe9b74 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-3.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-4.svg new file mode 100644 index 0000000000..eda7544128 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-rule-chain-icon-4.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-1.svg b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-1.svg new file mode 100644 index 0000000000..f1d0ee4799 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-1.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-2.svg b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-2.svg new file mode 100644 index 0000000000..9708abc935 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-3.svg b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-3.svg new file mode 100644 index 0000000000..7151c40b16 --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-3.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-4.svg b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-4.svg new file mode 100644 index 0000000000..11a06c0a4f --- /dev/null +++ b/ui-ngx/src/assets/iot-hub/hero-solution-template-icon-4.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From af38b9592431566d660190e2c8afbe02c2764a7c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 1 Apr 2026 19:55:11 +0300 Subject: [PATCH 017/219] Add per-type item pages with separate routes and hero sections - Create TbIotHubItemsPageComponent with hero section (title, description, illustration, installed items button, contribute link) per item type - Add separate routes: /iot-hub/widgets, /iot-hub/dashboards, /iot-hub/solution-templates, /iot-hub/calculated-fields, /iot-hub/rule-chains, /iot-hub/devices - Remove old /iot-hub/browse route, update all navigation links - Browse component: add @Input activeType and hideTabs for embedded use - Home component: navigateToBrowse now routes to type-specific pages - Add item type page description translations --- .../iot-hub/iot-hub-browse.component.html | 2 +- .../iot-hub/iot-hub-browse.component.scss | 4 + .../pages/iot-hub/iot-hub-browse.component.ts | 22 ++-- .../pages/iot-hub/iot-hub-home.component.ts | 17 ++- .../iot-hub/iot-hub-items-page.component.html | 52 ++++++++ .../iot-hub/iot-hub-items-page.component.scss | 92 ++++++++++++++ .../iot-hub/iot-hub-items-page.component.ts | 115 ++++++++++++++++++ .../pages/iot-hub/iot-hub-routing.module.ts | 64 ++++++++-- .../home/pages/iot-hub/iot-hub.module.ts | 2 + .../assets/locale/locale.constant-en_US.json | 6 + 10 files changed, 356 insertions(+), 20 deletions(-) create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-items-page.component.html create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-items-page.component.scss create mode 100644 ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-items-page.component.ts diff --git a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html index c0d3ac14c3..ff53654fca 100644 --- a/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html +++ b/ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-browse.component.html @@ -17,7 +17,7 @@ -->
-