From 09d4ba2bb026f07c4cd51a106e763802425ee6b4 Mon Sep 17 00:00:00 2001 From: garronej Date: Sun, 3 Jul 2022 15:58:00 +0200 Subject: [PATCH] Refactor (avoid using else) changelog ignore --- ..._object_to_js_code_declaring_an_object.ftl | 88 +++++++++---------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl index 81cfe51a..d1e6a56b 100644 --- a/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +++ b/src/bin/build-keycloak-theme/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl @@ -30,66 +30,62 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc}; "printIfExists": function (fieldName, x) { - <#if messagesPerField?? > - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ - <#attempt> - return "${messagesPerField.printIfExists(fieldName,'1')}" ? x : undefined; - <#recover> - - } - - throw new Error("There is no " + fieldName + " field"); - <#else> + <#if !messagesPerField?? > return undefined; + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ + <#attempt> + return "${messagesPerField.printIfExists(fieldName,'1')}" ? x : undefined; + <#recover> + + } + + throw new Error("There is no " + fieldName + " field"); }, "existsError": function (fieldName) { - <#if messagesPerField?? > - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ - <#attempt> - return <#if messagesPerField.existsError('${fieldName}')>true<#else>false; - <#recover> - - } - - throw new Error("There is no " + fieldName + " field"); - <#else> + <#if !messagesPerField?? > return false; + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ + <#attempt> + return <#if messagesPerField.existsError('${fieldName}')>true<#else>false; + <#recover> + + } + + throw new Error("There is no " + fieldName + " field"); }, "get": function (fieldName) { - <#if messagesPerField?? > - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ - <#attempt> - <#if messagesPerField.existsError('${fieldName}')> - return "${messagesPerField.get('${fieldName}')?no_esc}"; - - <#recover> - - } - - throw new Error("There is no " + fieldName + " field"); - <#else> + <#if !messagesPerField?? > return ''; + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ + <#attempt> + <#if messagesPerField.existsError('${fieldName}')> + return "${messagesPerField.get('${fieldName}')?no_esc}"; + + <#recover> + + } + + throw new Error("There is no " + fieldName + " field"); }, "exists": function (fieldName) { - <#if messagesPerField?? > - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ - <#attempt> - return <#if messagesPerField.exists('${fieldName}')>true<#else>false; - <#recover> - - } - - throw new Error("There is no " + fieldName + " field"); - <#else> + <#if !messagesPerField?? > return false; + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ + <#attempt> + return <#if messagesPerField.exists('${fieldName}')>true<#else>false; + <#recover> + + } + + throw new Error("There is no " + fieldName + " field"); } };