MID-7815 mail/sms transport missing fields panels, probably done

Evolveum · Sep 16, 2022 · d1053d0 · d1053d0
1 parent e7dc874
commit d1053d0
Showing 1 changed file with 56 additions and 8 deletions.
diff --git a/.../evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/SmsGatewayPanel.java b/.../evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/SmsGatewayPanel.java
@@ -10,20 +10,22 @@
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.ThreadContext;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.validation.validator.RangeValidator;
 
 import com.evolveum.midpoint.gui.api.component.password.PasswordPanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.web.component.input.ExpressionEditorPanel;
+import com.evolveum.midpoint.util.logging.LoggingUtils;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.input.TextPanel;
-import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.web.component.util.SerializableBiConsumer;
 import com.evolveum.midpoint.web.component.util.SerializableFunction;
-import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
+import com.evolveum.midpoint.web.page.admin.reports.component.AceEditorPanel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.HttpMethodType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SmsGatewayConfigurationType;
 
@@ -34,6 +36,8 @@ public class SmsGatewayPanel extends ComplexPropertyInputPanel<SmsGatewayConfigu
 
     private static final long serialVersionUID = 1L;
 
+    private static final Trace LOGGER = TraceManager.getTrace(SmsGatewayPanel.class);
+
     private static final String ID_METHOD = "method";
     private static final String ID_URL_EXPRESSION = "urlExpression";
     private static final String ID_HEADERS_EXPRESSION = "headersExpression";
@@ -63,9 +67,12 @@ protected void onInitialize() {
     private void initLayout() {
         add(new TextPanel<>(ID_NAME, createEmbeddedModel(o -> o.getName(), (o, v) -> o.setName(v))), false);
         add(WebComponentUtil.createEnumPanel(HttpMethodType.class, ID_METHOD, createEmbeddedModel(o -> o.getMethod(), (o, v) -> o.setMethod(v)), this));
-        add(new ExpressionEditorPanel(ID_URL_EXPRESSION, createEmbeddedModel(o -> o.getUrlExpression(), (o, v) -> o.setUrlExpression(v)), getPageBase()));
-        add(new ExpressionEditorPanel(ID_HEADERS_EXPRESSION, createEmbeddedModel(o -> o.getHeadersExpression(), (o, v) -> o.setHeadersExpression(v)), getPageBase()));
-        add(new ExpressionEditorPanel(ID_BODY_EXPRESSION, createEmbeddedModel(o -> o.getBodyExpression(), (o, v) -> o.setBodyExpression(v)), getPageBase()));
+        add(new AceEditorPanel(ID_URL_EXPRESSION, null,
+                createExpressionModel(createEmbeddedModel(o -> o.getUrlExpression(), (o, v) -> o.setUrlExpression(v))), 10));
+        add(new AceEditorPanel(ID_HEADERS_EXPRESSION, null,
+                createExpressionModel(createEmbeddedModel(o -> o.getHeadersExpression(), (o, v) -> o.setHeadersExpression(v))), 10));
+        add(new AceEditorPanel(ID_BODY_EXPRESSION, null,
+                createExpressionModel(createEmbeddedModel(o -> o.getBodyExpression(), (o, v) -> o.setBodyExpression(v))), 10));
         add(new TextPanel<>(ID_BODY_ENCODING, createEmbeddedModel(o -> o.getBodyEncoding(), (o, v) -> o.setBodyEncoding(v))));
         add(new TextPanel<>(ID_USERNAME, createEmbeddedModel(o -> o.getUsername(), (o, v) -> o.setUsername(v))));
         add(new PasswordPanel(ID_PASSWORD, createEmbeddedModel(o -> o.getPassword(), (o, v) -> o.setPassword(v))), false);
@@ -83,6 +90,47 @@ private void initLayout() {
         add(new TextPanel<>(ID_LOG_TO_FILE, createEmbeddedModel(o -> o.getLogToFile(), (o, v) -> o.setLogToFile(v))));
     }
 
+    private IModel<String> createExpressionModel(IModel<ExpressionType> model) {
+        return new IModel<>() {
+            @Override
+            public String getObject() {
+                ExpressionType expression = model.getObject();
+                if (expression == null) {
+                    return null;
+                }
+
+                try {
+                    return getPageBase().getPrismContext().xmlSerializer().serializeRealValue(expression);
+                } catch (Exception e) {
+                    LoggingUtils.logUnexpectedException(LOGGER, "Cannot serialize filter", e);
+                    ThreadContext.getSession().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log");
+                }
+
+                return null;
+            }
+
+            @Override
+            public void setObject(String object) {
+                if (model == null) {
+                    return;
+                }
+
+                if (StringUtils.isBlank(object)) {
+                    model.setObject(null);
+                    return;
+                }
+
+                try {
+                    ExpressionType expression = getPageBase().getPrismContext().parserFor(object).parseRealValue(ExpressionType.class);
+                    model.setObject(expression);
+                } catch (Exception e) {
+                    LoggingUtils.logUnexpectedException(LOGGER, "Cannot parse filter", e);
+                    ThreadContext.getSession().error("Cannot parse filter: " + e.getMessage() + ". For more details, please, see midpoint log");
+                }
+            }
+        };
+    }
+
     @Override
     public FormComponent getBaseFormComponent() {
         return ((TextPanel) get(ID_NAME)).getBaseFormComponent();