Added EdgeInfo, fix for CustomerIsPublic

deaflynx
1 parent 4c2effd9
Showing 14 changed files with 82 additions and 34 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/EdgeController.java
common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java
dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
ui-ngx/proxy.conf.js
ui-ngx/src/app/core/http/edge.service.ts
ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @ceadc39
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @ceadc39
@@ -50,6 +50,7 @@ import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetInfo;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
@@ -643,6 +644,18 @@ public abstract class BaseController {
         }
     }
+    EdgeInfo checkEdgeInfoId(EdgeId edgeId, Operation operation) throws ThingsboardException {
+        try {
+            validateId(edgeId, "Incorrect edgeId " + edgeId);
+            EdgeInfo edge = edgeService.findEdgeInfoById(getCurrentUser().getTenantId(), edgeId);
+            checkNotNull(edge);
+            accessControlService.checkPermission(getCurrentUser(), Resource.EDGE, operation, edgeId, edge);
+            return edge;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
     DashboardInfo checkDashboardInfoId(DashboardId dashboardId, Operation operation) throws ThingsboardException {
         try {
             validateId(dashboardId, "Incorrect dashboardId " + dashboardId);
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @ceadc39
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @ceadc39
@@ -36,10 +36,7 @@ import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.EdgeId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -77,6 +74,19 @@ public class EdgeController extends BaseController {
         }
     }
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/edge/info/{edgeId}", method = RequestMethod.GET)
+    @ResponseBody
+    public EdgeInfo getEdgeInfoById(@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
+        checkParameter(EDGE_ID, strEdgeId);
+        try {
+            EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
+            return checkEdgeInfoId(edgeId, Operation.READ);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge", method = RequestMethod.POST)
     @ResponseBody
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
View file @ceadc39
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
View file @ceadc39
@@ -20,12 +20,7 @@ import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
-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.EntityId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -36,6 +31,8 @@ public interface EdgeService {
     Edge findEdgeById(TenantId tenantId, EdgeId edgeId);
+    EdgeInfo findEdgeInfoById(TenantId tenantId, EdgeId edgeId);
+
     ListenableFuture<Edge> findEdgeByIdAsync(TenantId tenantId, EdgeId edgeId);
     Edge findEdgeByTenantIdAndName(TenantId tenantId, String name);
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
View file @ceadc39
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
View file @ceadc39
@@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileCon
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
@@ -80,6 +81,9 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     private DashboardService dashboardService;
     @Autowired
+    private EdgeService edgeService;
+
+    @Autowired
     @Lazy
     private TbTenantProfileCache tenantProfileCache;
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java
View file @ceadc39
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java
View file @ceadc39
@@ -43,6 +43,15 @@ public interface EdgeDao extends Dao<Edge> {
     Edge save(TenantId tenantId, Edge edge);
     /**
+     * Find edge info by id.
+     *
+     * @param tenantId the tenant id
+     * @param edgeId the edge id
+     * @return the edge info object
+     */
+    EdgeInfo findEdgeInfoById(TenantId tenantId, UUID edgeId);
+
+    /**
      * Find edges by tenantId and page link.
      *
      * @param tenantId the tenantId
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @ceadc39
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @ceadc39
@@ -44,14 +44,7 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
-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.EntityId;
-import org.thingsboard.server.common.data.id.IdBased;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -144,6 +137,13 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     }
     @Override
+    public EdgeInfo findEdgeInfoById(TenantId tenantId, EdgeId edgeId) {
+        log.trace("Executing findEdgeInfoById [{}]", edgeId);
+        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        return edgeDao.findEdgeInfoById(tenantId, edgeId.getId());
+    }
+
+    @Override
     public ListenableFuture<Edge> findEdgeByIdAsync(TenantId tenantId, EdgeId edgeId) {
         log.trace("Executing findEdgeById [{}]", edgeId);
         validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java
View file @ceadc39
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java
View file @ceadc39
@@ -36,6 +36,12 @@ public interface EdgeRepository extends PagingAndSortingRepository<EdgeEntity, U
                                                  @Param("textSearch") String textSearch,
                                                  Pageable pageable);
+    @Query("SELECT new org.thingsboard.server.dao.model.sql.EdgeInfoEntity(d, c.title, c.additionalInfo) " +
+            "FROM EdgeEntity d " +
+            "LEFT JOIN CustomerEntity c on c.id = d.customerId " +
+            "WHERE d.id = :edgeId")
+    EdgeInfoEntity findEdgeInfoById(@Param("edgeId") UUID edgeId);
+
     @Query("SELECT d FROM EdgeEntity d WHERE d.tenantId = :tenantId " +
             "AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%'))")
     Page<EdgeEntity> findByTenantId(@Param("tenantId") UUID tenantId,
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
View file @ceadc39
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
View file @ceadc39
@@ -68,6 +68,11 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple
     }
     @Override
+    public EdgeInfo findEdgeInfoById(TenantId tenantId, UUID edgeId) {
+        return DaoUtil.getData(edgeRepository.findEdgeInfoById(edgeId));
+    }
+
+    @Override
     public PageData<Edge> findEdgesByTenantId(UUID tenantId, PageLink pageLink) {
         return DaoUtil.toPageData(
                 edgeRepository.findByTenantId(
--- a/ui-ngx/proxy.conf.js
View file @ceadc39
+++ b/ui-ngx/proxy.conf.js
View file @ceadc39
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
-const forwardUrl = "http://localhost:8081";
-const wsForwardUrl = "ws://localhost:8081";
+const forwardUrl = "http://localhost:8080";
+const wsForwardUrl = "ws://localhost:8080";
 const ruleNodeUiforwardUrl = forwardUrl;
 const PROXY_CONFIG = {
--- a/ui-ngx/src/app/core/http/edge.service.ts
View file @ceadc39
+++ b/ui-ngx/src/app/core/http/edge.service.ts
View file @ceadc39
@@ -38,8 +38,12 @@ export class EdgeService {
       defaultHttpOptionsFromConfig(config));
   }
-  public getEdge(edgeId: string, config?: RequestConfig): Observable<EdgeInfo> {
-    return this.http.get<EdgeInfo>(`/api/edge/${edgeId}`, defaultHttpOptionsFromConfig(config));
+  public getEdge(edgeId: string, config?: RequestConfig): Observable<Edge> {
+    return this.http.get<Edge>(`/api/edge/${edgeId}`, defaultHttpOptionsFromConfig(config));
+  }
+
+  public getEdgeInfo(edgeId: string, config?: RequestConfig): Observable<EdgeInfo> {
+    return this.http.get<EdgeInfo>(`/api/edge/info/${edgeId}`, defaultHttpOptionsFromConfig(config));
   }
   public saveEdge(edge: Edge, config?: RequestConfig): Observable<Edge> {
@@ -72,7 +76,7 @@ export class EdgeService {
   }
   public makeEdgePublic(edgeId: string, config?: RequestConfig): Observable<Edge> {
-    return this.http.post<Edge>(`/api/customer/public/edge/${edgeId}`,
+    return this.http.post<Edge>(`/api/customer/public/edge/${edgeId}`, null,
       defaultHttpOptionsFromConfig(config));
   }
--- a/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
View file @ceadc39
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
View file @ceadc39
@@ -415,7 +415,7 @@ export class ImportExportService {
           this.store.dispatch(new ActionNotificationShow(
             {message: this.translate.instant('rulechain.invalid-rulechain-type-error', { expectedRuleChainType: expectedRuleChainType }),
               type: 'error'}));
-          throw new Error('Invalid rule chain file');
+          throw new Error('Invalid rule chain type');
         } else {
           return this.ruleChainService.resolveRuleChainMetadata(ruleChainImport.metadata).pipe(
             map((resolvedMetadata) => {
--- a/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
View file @ceadc39
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge-routing.module.ts
View file @ceadc39
@@ -27,9 +27,9 @@ import { RuleChainsTableConfigResolver } from "@home/pages/rulechain/rulechains-
 import { DashboardPageComponent } from "@home/pages/dashboard/dashboard-page.component";
 import { dashboardBreadcumbLabelFunction, DashboardResolver } from "@home/pages/dashboard/dashboard-routing.module";
 import { BreadCrumbConfig } from "@shared/components/breadcrumb";
-import {RuleChainPageComponent} from "@home/pages/rulechain/rulechain-page.component";
-import {ConfirmOnExitGuard} from "@core/guards/confirm-on-exit.guard";
-import {ruleChainType} from "@shared/models/rule-chain.models";
+import { RuleChainPageComponent } from "@home/pages/rulechain/rulechain-page.component";
+import { ConfirmOnExitGuard } from "@core/guards/confirm-on-exit.guard";
+import { ruleChainType } from "@shared/models/rule-chain.models";
 import {
   importRuleChainBreadcumbLabelFunction,
   ResolvedRuleChainMetaDataResolver,
--- a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View file @ceadc39
+++ b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View file @ceadc39
@@ -86,13 +86,13 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
     this.config.deleteEntitiesTitle = count => this.translate.instant('edge.delete-edges-title', {count});
     this.config.deleteEntitiesContent = () => this.translate.instant('edge.delete-edges-text');
-    this.config.loadEntity = id => this.edgeService.getEdge(id.id);
+    this.config.loadEntity = id => this.edgeService.getEdgeInfo(id.id);
     this.config.saveEntity = edge => {
       return this.edgeService.saveEdge(edge).pipe(
         tap(() => {
           this.broadcast.broadcast('edgeSaved');
         }),
-        mergeMap((savedEdge) => this.edgeService.getEdge(savedEdge.id.id)
+        mergeMap((savedEdge) => this.edgeService.getEdgeInfo(savedEdge.id.id)
         ));
     };
     this.config.onEntityAction = action => this.onEdgeAction(action);
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View file @ceadc39
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View file @ceadc39
@@ -45,7 +45,7 @@ import {
   AddEntitiesToEdgeDialogData
 } from "@home/dialogs/add-entities-to-edge-dialog.component";
 import {MatDialog} from "@angular/material/dialog";
-import {isDefined, isUndefined} from "@core/utils";
+import {isUndefined} from "@core/utils";
 import {PageLink} from "@shared/models/page/page-link";
 import {Edge} from "@shared/models/edge.models";
@@ -490,17 +490,17 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
   isNonRootRuleChain(ruleChain: RuleChain) {
     if (this.config.componentsData.ruleChainScope === 'edge') {
-      return (isDefined(this.config.componentsData.edge.rootRuleChainId) && this.config.componentsData.edge.rootRuleChainId != null && this.config.componentsData.edge.rootRuleChainId.id != ruleChain.id.id);
+      return this.config.componentsData.edge.rootRuleChainId && true && this.config.componentsData.edge.rootRuleChainId.id != ruleChain.id.id;
     }
-    return (isDefined(ruleChain)) && !ruleChain.root;
+    return !ruleChain.root;
   }
   isDefaultEdgeRuleChain(ruleChain) {
-    return (isDefined(ruleChain)) && !ruleChain.root && this.config.componentsData.defaultEdgeRuleChainIds.includes(ruleChain.id.id);
+    return !ruleChain.root && this.config.componentsData.defaultEdgeRuleChainIds.includes(ruleChain.id.id);
   }
   isNonDefaultEdgeRuleChain(ruleChain) {
-    return (isDefined(ruleChain)) && !ruleChain.root && !this.config.componentsData.defaultEdgeRuleChainIds.includes(ruleChain.id.id);
+    return !ruleChain.root && !this.config.componentsData.defaultEdgeRuleChainIds.includes(ruleChain.id.id);
   }
   fetchRuleChains(pageLink: PageLink) {