[AAE-622] No implicit returns (#5157)

* enable noImplicitReturns rule * type fixes * fix return types * fix return value * fix tests * fix visibility service * update tests * add missing types * fix test
2025-07-24 17:32:15 +00:00 · 2019-10-17 09:35:39 +01:00
parent 48aca2d30f
commit d7ab0417b8
65 changed files with 366 additions and 319 deletions
--- a/lib/core/form/models/widget-visibility.model.ts
+++ b/lib/core/form/models/widget-visibility.model.ts
@@ -16,90 +16,92 @@
 */

 export class WidgetVisibilityModel {
-        rightRestResponseId?: string;
-        rightFormFieldId?: string;
-        leftRestResponseId?: string;
-        leftFormFieldId?: string;
-        operator: string;
-        nextCondition: WidgetVisibilityModel;
-        nextConditionOperator: string;
+    rightRestResponseId?: string;
+    rightFormFieldId?: string;
+    leftRestResponseId?: string;
+    leftFormFieldId?: string;
+    operator: string;
+    nextCondition: WidgetVisibilityModel;
+    nextConditionOperator: string;

-        constructor(private json?: any) {
-                if (json) {
-                        this.operator = json.operator;
-                        this.nextCondition = new WidgetVisibilityModel(json.nextCondition);
-                        this.nextConditionOperator = json.nextConditionOperator;
-                        this.rightRestResponseId = json.rightRestResponseId;
-                        this.rightFormFieldId = json.rightFormFieldId;
-                        this.leftFormFieldId = json.leftFormFieldId;
-                        this.leftRestResponseId = json.leftRestResponseId;
-                } else {
-                        this.json = {};
-                }
+    constructor(private json?: any) {
+        if (json) {
+            this.operator = json.operator;
+            this.nextCondition = new WidgetVisibilityModel(json.nextCondition);
+            this.nextConditionOperator = json.nextConditionOperator;
+            this.rightRestResponseId = json.rightRestResponseId;
+            this.rightFormFieldId = json.rightFormFieldId;
+            this.leftFormFieldId = json.leftFormFieldId;
+            this.leftRestResponseId = json.leftRestResponseId;
+        } else {
+            this.json = {};
+        }
+    }
+
+    get leftType(): string {
+        if (this.leftFormFieldId) {
+            return WidgetTypeEnum.field;
+        } else if (this.leftRestResponseId) {
+            return WidgetTypeEnum.variable;
+        } else if (!!this.json.leftType) {
+            return this.json.leftType;
+        }
+        return null;
+    }
+
+    set leftType(leftType: string) {
+        this.json.leftType = leftType;
+    }
+
+    get leftValue(): any {
+        if (this.json.leftValue) {
+            return this.json.leftValue;
+        } else if (this.leftFormFieldId) {
+            return this.leftFormFieldId;
+        } else {
+            return this.leftRestResponseId;
+        }
+    }
+
+    set leftValue(leftValue: any) {
+        this.json.leftValue = leftValue;
+    }
+
+    get rightType(): string {
+        if (!!this.json.rightType) {
+            return this.json.rightType;
+        } else if (this.json.rightValue) {
+            return WidgetTypeEnum.value;
+        } else if (this.rightRestResponseId) {
+            return WidgetTypeEnum.variable;
+        } else if (this.rightFormFieldId) {
+            return WidgetTypeEnum.field;
        }

-        set leftType(leftType: string) {
-                this.json.leftType = leftType;
-        }
+        return null;
+    }

-        set rightType(rightType: string) {
-                this.json.rightType = rightType;
-        }
+    set rightType(rightType: string) {
+        this.json.rightType = rightType;
+    }

-        set leftValue(leftValue: string) {
-                this.json.leftValue = leftValue;
-        }
-
-        set rightValue(rightValue: string) {
-                this.json.rightValue = rightValue;
-        }
-
-        get leftType() {
-                if (this.leftFormFieldId) {
-                        return WidgetTypeEnum.field;
-                } else if (this.leftRestResponseId) {
-                        return WidgetTypeEnum.variable;
-                } else if ( !!this.json.leftType) {
-                        return this.json.leftType;
-                }
-        }
-
-        get leftValue() {
-                if ( this.json.leftValue ) {
-                        return this.json.leftValue;
-                } else if (this.leftFormFieldId) {
-                        return this.leftFormFieldId;
-                } else {
-                        return this.leftRestResponseId;
-                }
-        }
-
-        get rightType() {
-                if ( !!this.json.rightType ) {
-                        return this.json.rightType;
-                } else if (this.json.rightValue) {
-                        return WidgetTypeEnum.value;
-                } else if (this.rightRestResponseId) {
-                        return WidgetTypeEnum.variable;
-                } else if (this.rightFormFieldId) {
-                        return WidgetTypeEnum.field;
-                }
-        }
-
-        get rightValue() {
-                if (this.json.rightValue) {
-                        return this.json.rightValue;
-                } else if (this.rightFormFieldId) {
-                        return this.rightFormFieldId;
-                } else {
-                        return this.rightRestResponseId;
-                }
+    get rightValue(): any {
+        if (this.json.rightValue) {
+            return this.json.rightValue;
+        } else if (this.rightFormFieldId) {
+            return this.rightFormFieldId;
+        } else {
+            return this.rightRestResponseId;
        }
+    }

+    set rightValue(rightValue: any) {
+        this.json.rightValue = rightValue;
+    }
 }

 export enum WidgetTypeEnum {
-        field = 'field',
-        variable = 'variable',
-        value = 'value'
+    field = 'field',
+    variable = 'variable',
+    value = 'value'
 }