Browse Source

Use plural path for alarm rules by entity endpoint

pull/15326/head
Viacheslav Klimov 4 months ago
parent
commit
d2b0cd049f
Failed to extract signature
  1. 2
      application/src/main/java/org/thingsboard/server/controller/AlarmRuleController.java
  2. 2
      ui-ngx/src/app/core/http/alarm-rules.service.ts

2
application/src/main/java/org/thingsboard/server/controller/AlarmRuleController.java

@ -150,7 +150,7 @@ public class AlarmRuleController extends BaseController {
@ApiOperation(value = "Get Alarm Rules by Entity Id (getAlarmRulesByEntityId)",
notes = "Fetch the Alarm Rules based on the provided Entity Id." + TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@GetMapping(value = "/alarm/rule/{entityType}/{entityId}")
@GetMapping(value = "/alarm/rules/{entityType}/{entityId}")
public PageData<AlarmRuleDefinition> getAlarmRulesByEntityId(
@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,

2
ui-ngx/src/app/core/http/alarm-rules.service.ts

@ -56,7 +56,7 @@ export class AlarmRulesService {
}
public getAlarmRulesByEntityId({ entityType, id }: EntityId, pageLink: PageLink, config?: RequestConfig): Observable<PageData<CalculatedField>> {
return this.http.get<PageData<CalculatedField>>(`/api/alarm/rule/${entityType}/${id}${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
return this.http.get<PageData<CalculatedField>>(`/api/alarm/rules/${entityType}/${id}${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
}
public testScript(inputParams: CalculatedFieldTestScriptInputParams, config?: RequestConfig): Observable<EntityTestScriptResult> {

Loading…
Cancel
Save