103 changed files with 1217 additions and 521 deletions
@ -0,0 +1,55 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 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 lombok.extern.slf4j.Slf4j; |
||||
|
import org.springframework.http.HttpStatus; |
||||
|
import org.springframework.http.ResponseEntity; |
||||
|
import org.springframework.security.access.prepost.PreAuthorize; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestMethod; |
||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
import org.springframework.web.context.request.async.DeferredResult; |
||||
|
import org.thingsboard.server.common.data.exception.ThingsboardException; |
||||
|
import org.thingsboard.server.common.data.id.DeviceId; |
||||
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
||||
|
|
||||
|
import java.util.UUID; |
||||
|
|
||||
|
@RestController |
||||
|
@TbCoreComponent |
||||
|
@RequestMapping(TbUrlConstants.RPC_V1_URL_PREFIX) |
||||
|
@Slf4j |
||||
|
public class RpcV1Controller extends AbstractRpcController { |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST) |
||||
|
@ResponseBody |
||||
|
public DeferredResult<ResponseEntity> handleOneWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { |
||||
|
return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT); |
||||
|
} |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST) |
||||
|
@ResponseBody |
||||
|
public DeferredResult<ResponseEntity> handleTwoWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { |
||||
|
return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,108 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 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 lombok.extern.slf4j.Slf4j; |
||||
|
import org.springframework.http.HttpStatus; |
||||
|
import org.springframework.http.ResponseEntity; |
||||
|
import org.springframework.security.access.prepost.PreAuthorize; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestMethod; |
||||
|
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
import org.springframework.web.context.request.async.DeferredResult; |
||||
|
import org.thingsboard.server.common.data.exception.ThingsboardException; |
||||
|
import org.thingsboard.server.common.data.id.DeviceId; |
||||
|
import org.thingsboard.server.common.data.id.RpcId; |
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
import org.thingsboard.server.common.data.page.PageData; |
||||
|
import org.thingsboard.server.common.data.page.PageLink; |
||||
|
import org.thingsboard.server.common.data.rpc.Rpc; |
||||
|
import org.thingsboard.server.common.data.rpc.RpcStatus; |
||||
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
||||
|
import org.thingsboard.server.service.security.permission.Operation; |
||||
|
|
||||
|
import java.util.UUID; |
||||
|
|
||||
|
@RestController |
||||
|
@TbCoreComponent |
||||
|
@RequestMapping(TbUrlConstants.RPC_V2_URL_PREFIX) |
||||
|
@Slf4j |
||||
|
public class RpcV2Controller extends AbstractRpcController { |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST) |
||||
|
@ResponseBody |
||||
|
public DeferredResult<ResponseEntity> handleOneWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { |
||||
|
return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT); |
||||
|
} |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST) |
||||
|
@ResponseBody |
||||
|
public DeferredResult<ResponseEntity> handleTwoWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { |
||||
|
return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT); |
||||
|
} |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.GET) |
||||
|
@ResponseBody |
||||
|
public Rpc getPersistedRpc(@PathVariable("rpcId") String strRpc) throws ThingsboardException { |
||||
|
checkParameter("RpcId", strRpc); |
||||
|
try { |
||||
|
RpcId rpcId = new RpcId(UUID.fromString(strRpc)); |
||||
|
return checkRpcId(rpcId, Operation.READ); |
||||
|
} catch (Exception e) { |
||||
|
throw handleException(e); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
@RequestMapping(value = "/persistent/device/{deviceId}", method = RequestMethod.GET) |
||||
|
@ResponseBody |
||||
|
public PageData<Rpc> getPersistedRpcByDevice(@PathVariable("deviceId") String strDeviceId, |
||||
|
@RequestParam int pageSize, |
||||
|
@RequestParam int page, |
||||
|
@RequestParam RpcStatus rpcStatus, |
||||
|
@RequestParam(required = false) String textSearch, |
||||
|
@RequestParam(required = false) String sortProperty, |
||||
|
@RequestParam(required = false) String sortOrder) throws ThingsboardException { |
||||
|
checkParameter("DeviceId", strDeviceId); |
||||
|
try { |
||||
|
TenantId tenantId = getCurrentUser().getTenantId(); |
||||
|
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder); |
||||
|
DeviceId deviceId = new DeviceId(UUID.fromString(strDeviceId)); |
||||
|
return checkNotNull(rpcService.findAllByDeviceIdAndStatus(tenantId, deviceId, rpcStatus, pageLink)); |
||||
|
} catch (Exception e) { |
||||
|
throw handleException(e); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')") |
||||
|
@RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.DELETE) |
||||
|
@ResponseBody |
||||
|
public void deleteResource(@PathVariable("rpcId") String strRpc) throws ThingsboardException { |
||||
|
checkParameter("RpcId", strRpc); |
||||
|
try { |
||||
|
rpcService.deleteRpc(getTenantId(), new RpcId(UUID.fromString(strRpc))); |
||||
|
} catch (Exception e) { |
||||
|
throw handleException(e); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,27 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 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.transport.lwm2m.bootstrap.secure; |
||||
|
|
||||
|
import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore; |
||||
|
import org.eclipse.leshan.server.bootstrap.BootstrapConfigurationStoreAdapter; |
||||
|
|
||||
|
public class LwM2MInMemoryBootstrapConfigurationAdapter extends BootstrapConfigurationStoreAdapter { |
||||
|
|
||||
|
public LwM2MInMemoryBootstrapConfigurationAdapter(BootstrapConfigStore store) { |
||||
|
super(store); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,61 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 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.transport.mqtt.session; |
||||
|
|
||||
|
import org.junit.Test; |
||||
|
|
||||
|
import java.util.WeakHashMap; |
||||
|
import java.util.concurrent.ConcurrentMap; |
||||
|
import java.util.concurrent.TimeUnit; |
||||
|
import java.util.concurrent.locks.Lock; |
||||
|
import java.util.concurrent.locks.ReentrantLock; |
||||
|
|
||||
|
import static org.awaitility.Awaitility.await; |
||||
|
import static org.junit.Assert.assertTrue; |
||||
|
import static org.mockito.BDDMockito.willCallRealMethod; |
||||
|
import static org.mockito.Mockito.mock; |
||||
|
|
||||
|
public class GatewaySessionHandlerTest { |
||||
|
|
||||
|
@Test |
||||
|
public void givenWeakHashMap_WhenGC_thenMapIsEmpty() { |
||||
|
WeakHashMap<String, Lock> map = new WeakHashMap<>(); |
||||
|
|
||||
|
String deviceName = new String("device"); //constants are static and doesn't affected by GC, so use new instead
|
||||
|
map.put(deviceName, new ReentrantLock()); |
||||
|
assertTrue(map.containsKey(deviceName)); |
||||
|
|
||||
|
deviceName = null; |
||||
|
System.gc(); |
||||
|
|
||||
|
await().atMost(10, TimeUnit.SECONDS).until(() -> !map.containsKey("device")); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void givenConcurrentReferenceHashMap_WhenGC_thenMapIsEmpty() { |
||||
|
GatewaySessionHandler gsh = mock(GatewaySessionHandler.class); |
||||
|
willCallRealMethod().given(gsh).createWeakMap(); |
||||
|
|
||||
|
ConcurrentMap<String, Lock> map = gsh.createWeakMap(); |
||||
|
map.put("device", new ReentrantLock()); |
||||
|
assertTrue(map.containsKey("device")); |
||||
|
|
||||
|
System.gc(); |
||||
|
|
||||
|
await().atMost(10, TimeUnit.SECONDS).until(() -> !map.containsKey("device")); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,34 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8" ?> |
||||
|
<!-- |
||||
|
|
||||
|
Copyright © 2016-2021 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. |
||||
|
|
||||
|
--> |
||||
|
<!DOCTYPE configuration> |
||||
|
<configuration> |
||||
|
|
||||
|
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> |
||||
|
<encoder> |
||||
|
<pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern> |
||||
|
</encoder> |
||||
|
</appender> |
||||
|
|
||||
|
<logger name="org.thingsboard.server" level="INFO" /> |
||||
|
|
||||
|
<root level="INFO"> |
||||
|
<appender-ref ref="STDOUT"/> |
||||
|
</root> |
||||
|
|
||||
|
</configuration> |
||||
@ -0,0 +1,40 @@ |
|||||
|
<!-- |
||||
|
|
||||
|
Copyright © 2016-2021 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. |
||||
|
|
||||
|
--> |
||||
|
<section [formGroup]="timeUnitSelectFormGroup" fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="8px"> |
||||
|
<mat-form-field class="mat-block" fxFlex> |
||||
|
<mat-label>{{ labelText | translate }}</mat-label> |
||||
|
<input matInput type="number" min="0" formControlName="time" required> |
||||
|
<mat-error *ngIf="timeUnitSelectFormGroup.get('time').hasError('required')"> |
||||
|
{{ requiredText | translate }} |
||||
|
</mat-error> |
||||
|
<mat-error *ngIf="timeUnitSelectFormGroup.get('time').hasError('pattern')"> |
||||
|
{{ patternText | translate }} |
||||
|
</mat-error> |
||||
|
<mat-error *ngIf="timeUnitSelectFormGroup.get('time').hasError('min')"> |
||||
|
{{ (minText || patternText) | translate : {min: minTime/1000} }} |
||||
|
</mat-error> |
||||
|
</mat-form-field> |
||||
|
<mat-form-field class="mat-block" fxFlex> |
||||
|
<mat-label translate>device-profile.condition-duration-time-unit</mat-label> |
||||
|
<mat-select formControlName="unit"> |
||||
|
<mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit"> |
||||
|
{{ timeUnitTranslations.get(timeUnit) | translate }} |
||||
|
</mat-option> |
||||
|
</mat-select> |
||||
|
</mat-form-field> |
||||
|
</section> |
||||
@ -0,0 +1,194 @@ |
|||||
|
///
|
||||
|
/// Copyright © 2016-2021 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, forwardRef, Input, OnDestroy, OnInit } from '@angular/core'; |
||||
|
import { |
||||
|
ControlValueAccessor, |
||||
|
FormBuilder, |
||||
|
FormGroup, |
||||
|
NG_VALIDATORS, |
||||
|
NG_VALUE_ACCESSOR, |
||||
|
ValidationErrors, |
||||
|
Validator, |
||||
|
Validators |
||||
|
} from '@angular/forms'; |
||||
|
import { Subject } from 'rxjs'; |
||||
|
import { takeUntil } from 'rxjs/operators'; |
||||
|
import { |
||||
|
FullTimeUnit, |
||||
|
HOUR, |
||||
|
MINUTE, |
||||
|
SECOND, |
||||
|
TimeUnit, |
||||
|
TimeUnitMilli, |
||||
|
timeUnitTranslationMap |
||||
|
} from '@shared/models/time/time.models'; |
||||
|
import { isDefinedAndNotNull, isNumber } from '@core/utils'; |
||||
|
|
||||
|
interface FormGroupModel { |
||||
|
time: number; |
||||
|
unit: FullTimeUnit; |
||||
|
} |
||||
|
|
||||
|
@Component({ |
||||
|
selector: 'tb-time-unit-select', |
||||
|
templateUrl: './time-unit-select.component.html', |
||||
|
styleUrls: [], |
||||
|
providers: [ |
||||
|
{ |
||||
|
provide: NG_VALUE_ACCESSOR, |
||||
|
useExisting: forwardRef(() => TimeUnitSelectComponent), |
||||
|
multi: true |
||||
|
}, |
||||
|
{ |
||||
|
provide: NG_VALIDATORS, |
||||
|
useExisting: forwardRef(() => TimeUnitSelectComponent), |
||||
|
multi: true |
||||
|
} |
||||
|
] |
||||
|
}) |
||||
|
export class TimeUnitSelectComponent implements OnInit, OnDestroy, ControlValueAccessor, Validator { |
||||
|
|
||||
|
timeUnitSelectFormGroup: FormGroup; |
||||
|
|
||||
|
timeUnits = Object.values({...TimeUnitMilli, ...TimeUnit}).filter(item => item !== TimeUnit.DAYS); |
||||
|
timeUnitTranslations = timeUnitTranslationMap; |
||||
|
|
||||
|
private destroy$ = new Subject(); |
||||
|
|
||||
|
private timeUnitToTimeMap = new Map<FullTimeUnit, number>( |
||||
|
[ |
||||
|
[TimeUnitMilli.MILLISECONDS, 1], |
||||
|
[TimeUnit.SECONDS, SECOND], |
||||
|
[TimeUnit.MINUTES, MINUTE], |
||||
|
[TimeUnit.HOURS, HOUR] |
||||
|
] |
||||
|
); |
||||
|
|
||||
|
private timeToTimeUnitMap = new Map<number, FullTimeUnit>( |
||||
|
[ |
||||
|
[SECOND, TimeUnitMilli.MILLISECONDS], |
||||
|
[MINUTE, TimeUnit.SECONDS], |
||||
|
[HOUR, TimeUnit.MINUTES] |
||||
|
] |
||||
|
); |
||||
|
|
||||
|
@Input() |
||||
|
disabled: boolean; |
||||
|
|
||||
|
@Input() |
||||
|
labelText: string; |
||||
|
|
||||
|
@Input() |
||||
|
requiredText: string; |
||||
|
|
||||
|
@Input() |
||||
|
patternText: string; |
||||
|
|
||||
|
@Input() |
||||
|
minTime = 0; |
||||
|
|
||||
|
@Input() |
||||
|
minText: string; |
||||
|
|
||||
|
private propagateChange = (v: any) => { |
||||
|
} |
||||
|
|
||||
|
constructor(private fb: FormBuilder) { |
||||
|
} |
||||
|
|
||||
|
ngOnInit() { |
||||
|
this.timeUnitSelectFormGroup = this.fb.group({ |
||||
|
time: [0, [Validators.required, Validators.min(this.minTime), Validators.pattern('[0-9]*')]], |
||||
|
unit: [TimeUnitMilli.MILLISECONDS] |
||||
|
}); |
||||
|
this.timeUnitSelectFormGroup.valueChanges.pipe( |
||||
|
takeUntil(this.destroy$) |
||||
|
).subscribe((value) => { |
||||
|
this.updateModel(value); |
||||
|
}); |
||||
|
this.timeUnitSelectFormGroup.get('unit').valueChanges.pipe( |
||||
|
takeUntil(this.destroy$) |
||||
|
).subscribe((unit: FullTimeUnit) => { |
||||
|
if (this.minTime > 0) { |
||||
|
const unitTime = this.timeUnitToTimeMap.get(unit); |
||||
|
const validationTime = Math.ceil(this.minTime / unitTime); |
||||
|
this.timeUnitSelectFormGroup.get('time').setValidators([Validators.required, Validators.min(validationTime), Validators.pattern('[0-9]*')]); |
||||
|
this.timeUnitSelectFormGroup.get('time').updateValueAndValidity({emitEvent: false}); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
ngOnDestroy() { |
||||
|
this.destroy$.next(); |
||||
|
this.destroy$.complete(); |
||||
|
} |
||||
|
|
||||
|
registerOnChange(fn: any) { |
||||
|
this.propagateChange = fn; |
||||
|
} |
||||
|
|
||||
|
registerOnTouched(fn: any) { |
||||
|
} |
||||
|
|
||||
|
setDisabledState(isDisabled: boolean) { |
||||
|
this.disabled = isDisabled; |
||||
|
if (this.disabled) { |
||||
|
this.timeUnitSelectFormGroup.disable({emitEvent: false}); |
||||
|
} else { |
||||
|
this.timeUnitSelectFormGroup.enable({emitEvent: false}); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
writeValue(value: number) { |
||||
|
const formValue: FormGroupModel = { |
||||
|
time: 0, |
||||
|
unit: TimeUnitMilli.MILLISECONDS |
||||
|
}; |
||||
|
if (isDefinedAndNotNull(value) && isNumber(value) && value >= 0) { |
||||
|
formValue.unit = this.calculateTimeUnit(value); |
||||
|
formValue.time = value / this.timeUnitToTimeMap.get(formValue.unit); |
||||
|
} |
||||
|
this.timeUnitSelectFormGroup.reset(formValue, {emitEvent: false}); |
||||
|
this.timeUnitSelectFormGroup.get('unit').updateValueAndValidity({onlySelf: true}); |
||||
|
} |
||||
|
|
||||
|
validate(): ValidationErrors | null { |
||||
|
return this.timeUnitSelectFormGroup.valid ? null : { |
||||
|
timeUnitSelect: false |
||||
|
}; |
||||
|
} |
||||
|
|
||||
|
private updateModel(value: FormGroupModel) { |
||||
|
const time = value.time * this.timeUnitToTimeMap.get(value.unit); |
||||
|
this.propagateChange(time); |
||||
|
} |
||||
|
|
||||
|
private calculateTimeUnit(value: number): FullTimeUnit { |
||||
|
if (value === 0) { |
||||
|
return TimeUnitMilli.MILLISECONDS; |
||||
|
} |
||||
|
const iterators = this.timeToTimeUnitMap[Symbol.iterator](); |
||||
|
let iterator = iterators.next(); |
||||
|
while (!iterator.done) { |
||||
|
if (!Number.isInteger(value / iterator.value[0])) { |
||||
|
return iterator.value[1]; |
||||
|
} |
||||
|
iterator = iterators.next(); |
||||
|
} |
||||
|
return TimeUnit.HOURS; |
||||
|
} |
||||
|
} |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue