Browse Source

Added provisioning device mobile action

pull/12467/head
mpetrov 2 years ago
parent
commit
64f15f99df
  1. 30
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html
  2. 26
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts
  3. 17
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts
  4. 20
      ui-ngx/src/app/modules/home/components/widget/widget.component.ts
  5. 37
      ui-ngx/src/app/shared/models/widget.models.ts
  6. 10
      ui-ngx/src/assets/locale/locale.constant-en_US.json

30
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html

@ -36,6 +36,36 @@
</mat-form-field>
</div>
<ng-container [formGroup]="mobileActionTypeFormGroup" [ngSwitch]="mobileActionFormGroup.get('type').value">
<ng-template [ngSwitchCase]="mobileActionType.provisioningDevice">
<div class="tb-form-row">
<div class="fixed-title-width">{{ 'widget-action.mobile.provisioning-device.type' | translate }}*</div>
<mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
<mat-select required formControlName="provisionType" placeholder="{{ 'widget-action.mobile.provisioning-device.select-type' | translate }}">
<mat-option *ngFor="let actionType of mobileProvisionTypes" [value]="actionType">
{{ widgetMobileProvisionTypeTranslationMap.get(mobileProvisionType[actionType]) | translate }}
</mat-option>
</mat-select>
<mat-icon matSuffix
matTooltipPosition="above"
matTooltipClass="tb-error-tooltip"
[matTooltip]="'widget-action.mobile.provisioning-device.type-required' | translate"
*ngIf="mobileActionTypeFormGroup.get('provisionType').hasError('required')
&& mobileActionTypeFormGroup.get('provisionType').touched"
class="tb-error">
warning
</mat-icon>
</mat-form-field>
</div>
<tb-js-func
formControlName="handleProvisionSuccessFunction"
functionName="handleProvisionSuccess"
withModules
[functionArgs]="['deviceName', '$event', 'widgetContext', 'entityId', 'entityName', 'additionalParams', 'entityLabel']"
[globalVariables]="functionScopeVariables"
[editorCompleter]="customActionEditorCompleter"
hideBrackets
></tb-js-func>
</ng-template>
<ng-template [ngSwitchCase]="mobileActionFormGroup.get('type').value === mobileActionType.mapDirection ||
mobileActionFormGroup.get('type').value === mobileActionType.mapLocation ?
mobileActionFormGroup.get('type').value : ''">

26
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts

@ -24,10 +24,12 @@ import {
} from '@angular/forms';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import {
WidgetMobileProvisionType,
WidgetActionType,
WidgetMobileActionDescriptor,
WidgetMobileActionType,
widgetMobileActionTypeTranslationMap
widgetMobileActionTypeTranslationMap,
widgetMobileProvisionTypeTranslationMap
} from '@shared/models/widget.models';
import { CustomActionEditorCompleter } from '@home/components/widget/lib/settings/common/action/custom-action.models';
import {
@ -38,7 +40,8 @@ import {
getDefaultProcessImageFunction,
getDefaultProcessLaunchResultFunction,
getDefaultProcessLocationFunction,
getDefaultProcessQrCodeFunction
getDefaultProcessQrCodeFunction,
getDefaultProvisioningSuccessFunction
} from '@home/components/widget/lib/settings/common/action/mobile-action-editor.models';
import { WidgetService } from '@core/http/widget.service';
import { TbFunction } from '@shared/models/js-function.models';
@ -59,6 +62,9 @@ export class MobileActionEditorComponent implements ControlValueAccessor, OnInit
mobileActionTypes = Object.keys(WidgetMobileActionType);
mobileActionTypeTranslations = widgetMobileActionTypeTranslationMap;
mobileActionType = WidgetMobileActionType;
mobileProvisionType = WidgetMobileProvisionType;
mobileProvisionTypes = Object.keys(WidgetMobileProvisionType);
widgetMobileProvisionTypeTranslationMap = widgetMobileProvisionTypeTranslationMap;
customActionEditorCompleter = CustomActionEditorCompleter;
@ -254,6 +260,22 @@ export class MobileActionEditorComponent implements ControlValueAccessor, OnInit
this.fb.control(processLocationFunction, [Validators.required])
);
break;
case WidgetMobileActionType.provisioningDevice:
let handleProvisionSuccessFunction = action?.handleProvisionSuccessFunction;
if (changed) {
const defaultProvisioningSuccessFunction = getDefaultProvisioningSuccessFunction();
if (defaultProvisioningSuccessFunction !== handleProvisionSuccessFunction) {
handleProvisionSuccessFunction = defaultProvisioningSuccessFunction;
}
}
this.mobileActionTypeFormGroup.addControl(
'handleProvisionSuccessFunction',
this.fb.control(handleProvisionSuccessFunction, [Validators.required])
);
this.mobileActionTypeFormGroup.addControl(
'provisionType',
this.fb.control(null, [Validators.required])
);
}
}
this.mobileActionTypeFormGroup.valueChanges.pipe(

17
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts

@ -138,6 +138,15 @@ const processLocationFunction: TbFunction =
' }, 100);\n' +
'}';
const provisioningSuccessFunction: TbFunction =
'// Function body to handle device provision success. \n' +
'// - device - device that was successfully provisioned.\n' +
'function showDeviceProvisioningSuccess(deviceName, message) {\n' +
' setTimeout(function() {\n' +
' widgetContext.dialogs.alert(`Device ` + deviceName + ` was successfully provisioned`, message).subscribe();\n' +
' }, 100);\n' +
'}\n';
const handleEmptyResultFunctionTemplate: TbFunction =
'// Optional function body to handle empty result. \n' +
'// Usually this happens when user cancels the action (for ex. by pressing phone back button). \n\n' +
@ -241,6 +250,8 @@ export const getDefaultProcessQrCodeFunction = () => processQrCodeFunction;
export const getDefaultProcessLocationFunction = () => processLocationFunction;
export const getDefaultProvisioningSuccessFunction = () => provisioningSuccessFunction;
export const getDefaultGetLocationFunction = () => getLocationFunctionTemplate;
export const getDefaultGetPhoneNumberFunction = () => getPhoneNumberFunctionTemplate;
@ -272,6 +283,9 @@ export const getDefaultHandleEmptyResultFunction = (type: WidgetMobileActionType
case WidgetMobileActionType.takeScreenshot:
message = 'Take screenshot action was cancelled!';
break;
case WidgetMobileActionType.provisioningDevice:
message = 'Provisioning device was not invoked!';
break;
}
return handleEmptyResultFunctionTemplate.replace('--MESSAGE--', message);
};
@ -303,6 +317,9 @@ export const getDefaultHandleErrorFunction = (type: WidgetMobileActionType): TbF
case WidgetMobileActionType.takeScreenshot:
title = 'Failed to take screenshot';
break;
case WidgetMobileActionType.provisioningDevice:
title = 'Failed to make device provisioning';
break;
}
return handleErrorFunctionTemplate.replace('--TITLE--', title);
};

20
ui-ngx/src/app/modules/home/components/widget/widget.component.ts

@ -1292,6 +1292,26 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges,
);
}
break;
case WidgetMobileActionType.provisioningDevice:
const deviceName = actionResult.device.name;
if (isNotEmptyTbFunction(mobileAction.handleProvisionSuccessFunction)) {
compileTbFunction(this.http, mobileAction.handleProvisionSuccessFunction, 'deviceName', '$event', 'widgetContext', 'entityId',
'entityName', 'additionalParams', 'entityLabel').subscribe(
{
next: (compiled) => {
try {
compiled.execute(deviceName, $event, this.widgetContext, entityId, entityName, additionalParams, entityLabel);
} catch (e) {
console.error(e);
}
},
error: (err) => {
console.error(err);
}
}
);
}
break;
case WidgetMobileActionType.scanQrCode:
const code = actionResult.code;
const format = actionResult.format;

37
ui-ngx/src/app/shared/models/widget.models.ts

@ -47,6 +47,7 @@ import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-con
import { TbFunction } from '@shared/models/js-function.models';
import { FormProperty, jsonFormSchemaToFormProperties } from '@shared/models/dynamic-form.models';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Device } from '@shared/models/device.models';
export enum widgetType {
timeseries = 'timeseries',
@ -585,9 +586,26 @@ export enum WidgetMobileActionType {
scanQrCode = 'scanQrCode',
makePhoneCall = 'makePhoneCall',
getLocation = 'getLocation',
takeScreenshot = 'takeScreenshot'
takeScreenshot = 'takeScreenshot',
provisioningDevice = 'provisioningDevice',
}
export enum WidgetMobileProvisionType {
smartConfigEspTouch = 'SmartConfigEspTouch',
smartConfigEspTouchV2 = 'SmartConfigEspTouchV2',
wifi = 'wifi',
softAp = 'SoftAp',
}
export const widgetMobileProvisionTypeTranslationMap = new Map<WidgetMobileProvisionType, string>(
[
[ WidgetMobileProvisionType.smartConfigEspTouch, 'widget-action.mobile.provisioning-device.smart-config-esp-touch' ],
[ WidgetMobileProvisionType.smartConfigEspTouchV2, 'widget-action.mobile.provisioning-device.smart-config-esp-touch-v2' ],
[ WidgetMobileProvisionType.wifi, 'widget-action.mobile.provisioning-device.wifi' ],
[ WidgetMobileProvisionType.softAp, 'widget-action.mobile.provisioning-device.soft-ap' ]
]
);
export const widgetActionTypes = Object.keys(WidgetActionType) as WidgetActionType[];
export const widgetActionTypeTranslationMap = new Map<WidgetActionType, string>(
@ -612,7 +630,8 @@ export const widgetMobileActionTypeTranslationMap = new Map<WidgetMobileActionTy
[ WidgetMobileActionType.scanQrCode, 'widget-action.mobile.scan-qr-code' ],
[ WidgetMobileActionType.makePhoneCall, 'widget-action.mobile.make-phone-call' ],
[ WidgetMobileActionType.getLocation, 'widget-action.mobile.get-location' ],
[ WidgetMobileActionType.takeScreenshot, 'widget-action.mobile.take-screenshot' ]
[ WidgetMobileActionType.takeScreenshot, 'widget-action.mobile.take-screenshot' ],
[ WidgetMobileActionType.provisioningDevice, 'widget-action.mobile.provisioning-device.label' ]
]
);
@ -634,10 +653,15 @@ export interface MobileLocationResult {
longitude: number;
}
export interface MobileDeviceProvisioningResult {
device: Device;
}
export type MobileActionResult = MobileLaunchResult &
MobileImageResult &
MobileQrCodeResult &
MobileLocationResult;
MobileLocationResult &
MobileDeviceProvisioningResult;
export interface WidgetMobileActionResult<T extends MobileActionResult> {
result?: T;
@ -646,6 +670,10 @@ export interface WidgetMobileActionResult<T extends MobileActionResult> {
hasError: boolean;
}
export interface ProvisionSuccessDescriptor {
handleProvisionSuccessFunction: TbFunction;
}
export interface ProcessImageDescriptor {
processImageFunction: TbFunction;
}
@ -674,7 +702,8 @@ export type WidgetMobileActionDescriptors = ProcessImageDescriptor &
LaunchMapDescriptor &
ScanQrCodeDescriptor &
MakePhoneCallDescriptor &
GetLocationDescriptor;
GetLocationDescriptor &
ProvisionSuccessDescriptor;
export interface WidgetMobileActionDescriptor extends WidgetMobileActionDescriptors {
type: WidgetMobileActionType;

10
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -5593,6 +5593,16 @@
"URL": "URL",
"url-required": "URL is required.",
"mobile": {
"provisioning-device": {
"label": "Provisioning device",
"type": "Provisioning device type",
"select-type": "Select provisioning device type",
"type-required": "Provisioning device type is required",
"smart-config-esp-touch": "Smart Config ESP-Touch",
"smart-config-esp-touch-v2": "Smart Config ESP-Touch v2",
"wifi": "Wi-Fi Provisioning via Bluetooth Low Energy BLE/QR code",
"soft-ap": "SoftAP"
},
"action-type": "Mobile action type",
"select-action-type": "Select mobile action type",
"action-type-required": "Mobile action type is required",

Loading…
Cancel
Save