From 9570abe2ce8364ece33cec155ca6e1c16aefd977 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Tue, 11 Mar 2025 18:55:07 +0200
Subject: [PATCH] Naming improvement

---
 .../action/mobile-action-editor.component.html    |  2 +-
 .../action/mobile-action-editor.component.ts      | 10 +++++-----
 .../common/action/mobile-action-editor.models.ts  | 15 ++++++++-------
 .../home/components/widget/widget.component.ts    |  4 ++--
 ui-ngx/src/app/shared/models/widget.models.ts     |  8 ++++----
 .../src/assets/locale/locale.constant-en_US.json  |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html
index c21595eea9..c3194676cf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.html
@@ -36,7 +36,7 @@
     </mat-form-field>
   </div>
   <ng-container [formGroup]="mobileActionTypeFormGroup" [ngSwitch]="mobileActionFormGroup.get('type').value">
-    <ng-template [ngSwitchCase]="mobileActionType.provisionDevice">
+    <ng-template [ngSwitchCase]="mobileActionType.deviceProvision">
       <tb-js-func
         formControlName="handleProvisionSuccessFunction"
         functionName="handleProvisionSuccess"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts
index 90c31fea6b..52064fdf91 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.component.ts
@@ -39,7 +39,7 @@ import {
   getDefaultProcessLaunchResultFunction,
   getDefaultProcessLocationFunction,
   getDefaultProcessQrCodeFunction,
-  getDefaultProvisioningSuccessFunction
+  getDefaultProvisionSuccessFunction
 } 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';
@@ -255,12 +255,12 @@ export class MobileActionEditorComponent implements ControlValueAccessor, OnInit
             this.fb.control(processLocationFunction, [Validators.required])
           );
           break;
-        case WidgetMobileActionType.provisionDevice:
+        case WidgetMobileActionType.deviceProvision:
           let handleProvisionSuccessFunction = action?.handleProvisionSuccessFunction;
           if (changed) {
-            const defaultProvisioningSuccessFunction = getDefaultProvisioningSuccessFunction();
-            if (defaultProvisioningSuccessFunction !== handleProvisionSuccessFunction) {
-              handleProvisionSuccessFunction = defaultProvisioningSuccessFunction;
+            const defaultProvisionSuccessFunction = getDefaultProvisionSuccessFunction();
+            if (defaultProvisionSuccessFunction !== handleProvisionSuccessFunction) {
+              handleProvisionSuccessFunction = defaultProvisionSuccessFunction;
             }
           }
           this.mobileActionTypeFormGroup.addControl(
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts
index 54e70dc34b..0d4c46c589 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/mobile-action-editor.models.ts
@@ -138,12 +138,13 @@ const processLocationFunction: TbFunction =
   '    }, 100);\n' +
   '}';
 
-const provisioningSuccessFunction: TbFunction =
+const provisionSuccessFunction: TbFunction =
   '// Function body to handle device provision success. \n' +
   '// - deviceName - name of device that was successfully provisioned.\n' +
-  'showDeviceProvisioningSuccess(deviceName);\n' +
   '\n' +
-  'function showDeviceProvisioningSuccess(deviceName) {\n' +
+  'showDeviceProvisionSuccess(deviceName);\n' +
+  '\n' +
+  'function showDeviceProvisionSuccess(deviceName) {\n' +
   '    setTimeout(function() {\n' +
   '        widgetContext.showSuccessToast(`Device ` + deviceName + ` was successfully provisioned`).subscribe();\n' +
   '    }, 100);\n' +
@@ -252,7 +253,7 @@ export const getDefaultProcessQrCodeFunction = () => processQrCodeFunction;
 
 export const getDefaultProcessLocationFunction = () => processLocationFunction;
 
-export const getDefaultProvisioningSuccessFunction = () => provisioningSuccessFunction;
+export const getDefaultProvisionSuccessFunction = () => provisionSuccessFunction;
 
 export const getDefaultGetLocationFunction = () => getLocationFunctionTemplate;
 
@@ -285,8 +286,8 @@ export const getDefaultHandleEmptyResultFunction = (type: WidgetMobileActionType
     case WidgetMobileActionType.takeScreenshot:
       message = 'Take screenshot action was cancelled!';
       break;
-    case WidgetMobileActionType.provisionDevice:
-      message = 'Provisioning device was not invoked!';
+    case WidgetMobileActionType.deviceProvision:
+      message = 'Device provision was not invoked!';
       break;
   }
   return handleEmptyResultFunctionTemplate.replace('--MESSAGE--', message);
@@ -319,7 +320,7 @@ export const getDefaultHandleErrorFunction = (type: WidgetMobileActionType): TbF
     case WidgetMobileActionType.takeScreenshot:
       title = 'Failed to take screenshot';
       break;
-    case WidgetMobileActionType.provisionDevice:
+    case WidgetMobileActionType.deviceProvision:
       title = 'Failed to make device provision';
       break;
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
index ca11c2f4e0..3d20bcbd35 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget.component.ts
@@ -1203,7 +1203,7 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges,
       case WidgetMobileActionType.scanQrCode:
       case WidgetMobileActionType.getLocation:
       case WidgetMobileActionType.takeScreenshot:
-      case WidgetMobileActionType.provisionDevice:
+      case WidgetMobileActionType.deviceProvision:
         argsObservable = of([]);
         break;
       case WidgetMobileActionType.mapDirection:
@@ -1293,7 +1293,7 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges,
                         );
                       }
                       break;
-                    case WidgetMobileActionType.provisionDevice:
+                    case WidgetMobileActionType.deviceProvision:
                       const deviceName = actionResult.deviceName;
                       if (isNotEmptyTbFunction(mobileAction.handleProvisionSuccessFunction)) {
                         compileTbFunction(this.http, mobileAction.handleProvisionSuccessFunction, 'deviceName', '$event', 'widgetContext', 'entityId',
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index 132c82cfd1..4461758c85 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -588,7 +588,7 @@ export enum WidgetMobileActionType {
   makePhoneCall = 'makePhoneCall',
   getLocation = 'getLocation',
   takeScreenshot = 'takeScreenshot',
-  provisionDevice = 'provisionDevice',
+  deviceProvision = 'deviceProvision',
 }
 
 export const widgetActionTypes = Object.keys(WidgetActionType) as WidgetActionType[];
@@ -616,7 +616,7 @@ export const widgetMobileActionTypeTranslationMap = new Map<WidgetMobileActionTy
     [ WidgetMobileActionType.makePhoneCall, 'widget-action.mobile.make-phone-call' ],
     [ WidgetMobileActionType.getLocation, 'widget-action.mobile.get-location' ],
     [ WidgetMobileActionType.takeScreenshot, 'widget-action.mobile.take-screenshot' ],
-    [ WidgetMobileActionType.provisionDevice, 'widget-action.mobile.provision-device' ]
+    [ WidgetMobileActionType.deviceProvision, 'widget-action.mobile.device-provision' ]
   ]
 );
 
@@ -638,7 +638,7 @@ export interface MobileLocationResult {
   longitude: number;
 }
 
-export interface MobileDeviceProvisioningResult {
+export interface MobileDeviceProvisionResult {
   deviceName: string;
 }
 
@@ -646,7 +646,7 @@ export type MobileActionResult = MobileLaunchResult &
                                  MobileImageResult &
                                  MobileQrCodeResult &
                                  MobileLocationResult &
-                                 MobileDeviceProvisioningResult;
+                                 MobileDeviceProvisionResult;
 
 export interface WidgetMobileActionResult<T extends MobileActionResult> {
   result?: T;
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 4ccb6ed8f5..e71b2f6930 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -6536,7 +6536,7 @@
         "URL": "URL",
         "url-required": "URL is required.",
         "mobile": {
-          "provision-device": "Provision device",
+          "device-provision": "Device provision",
           "action-type": "Mobile action type",
           "select-action-type": "Select mobile action type",
           "action-type-required": "Mobile action type is required",