From 80f5308ff4c608cf81fa88f5a739d9756c000035 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Thu, 19 Apr 2018 12:31:50 +0200
Subject: [PATCH 1/3] restricting of expression panel usage

---
 .../web/component/prism/PrismPropertyPanel.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
index d1ff7fd5a3e..40720175647 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
@@ -31,9 +31,7 @@
 import com.evolveum.midpoint.web.component.input.ExpressionValuePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ItemDeltaType;
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 
@@ -261,7 +259,11 @@ public boolean isVisible() {
             @Override
             protected void populateItem(final ListItem<ValueWrapper> item) {
                 BasePanel panel;
-                if (item.getModelObject().getItem().getItemDefinition().getTypeName().equals(ExpressionType.COMPLEX_TYPE)){
+                ItemWrapper itemWrapper = item.getModelObject().getItem();
+                if (itemWrapper.getPath().containsName(AssignmentType.F_CONSTRUCTION) &&
+                        itemWrapper.getPath().containsName(ConstructionType.F_ASSOCIATION) &&
+                        itemWrapper.getPath().containsName(ResourceObjectAssociationType.F_OUTBOUND) &&
+                        itemWrapper.getPath().containsName(MappingType.F_EXPRESSION)){
                     ExpressionWrapper expressionWrapper = (ExpressionWrapper)item.getModelObject().getItem();
                     panel = new ExpressionValuePanel("value", new PropertyModel(item.getModel(), "value.value"),
                             expressionWrapper.getConstruction(), pageBase);

From 4d0eebf8fb02feffb25d32a3278fc87744a4f2fe Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Thu, 19 Apr 2018 15:58:39 +0200
Subject: [PATCH 2/3] Multi-language notificaitons + velocity templates in
 function library (untested)

---
 .../function-library-mail-templates.xml       | 61 +++++++++++++
 ...m-configuration-multilanguage-notifier.xml | 85 +++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 samples/objects/function-library-mail-templates.xml
 create mode 100644 samples/objects/system-configuration-multilanguage-notifier.xml

diff --git a/samples/objects/function-library-mail-templates.xml b/samples/objects/function-library-mail-templates.xml
new file mode 100644
index 00000000000..664f6449b16
--- /dev/null
+++ b/samples/objects/function-library-mail-templates.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2018 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<functionLibrary oid="bc5d74e6-4317-11e8-9dec-8fd64e20fbe0"
+		xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+		xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+		xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'
+		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+		xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+    <name>mailTemplates</name>
+    <description>Velocity mail templates for various languages</description>
+    <function>
+    	<name>en</name>
+    	<parameter>
+    		<name>username</name>
+    		<type>xsd:string</type>
+    	</parameter>
+    	<script>
+    		<language>http://midpoint.evolveum.com/xml/ns/public/expression/language#velocity</language>
+            <code>Hello $username</code>
+    	</script>
+    	<returnType>xsd:string</returnType>
+    </function>
+    <function>
+    	<name>sk</name>
+    	<parameter>
+    		<name>username</name>
+    		<type>xsd:string</type>
+    	</parameter>
+    	<script>
+    		<language>http://midpoint.evolveum.com/xml/ns/public/expression/language#velocity</language>
+            <code>Ahoj $username</code>
+    	</script>
+    	<returnType>xsd:string</returnType>
+    </function>
+    <function>
+    	<name>default</name>
+    	<parameter>
+    		<name>username</name>
+    		<type>xsd:string</type>
+    	</parameter>
+    	<script>
+    		<language>http://midpoint.evolveum.com/xml/ns/public/expression/language#velocity</language>
+            <code>Ugh $username !!!</code>
+    	</script>
+    	<returnType>xsd:string</returnType>
+    </function>
+</functionLibrary>
diff --git a/samples/objects/system-configuration-multilanguage-notifier.xml b/samples/objects/system-configuration-multilanguage-notifier.xml
new file mode 100644
index 00000000000..df7f0dde1f2
--- /dev/null
+++ b/samples/objects/system-configuration-multilanguage-notifier.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2018 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<systemConfiguration
+		xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+		xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+		xmlns:t='http://prism.evolveum.com/xml/ns/public/types-3'
+		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+		xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+    <name>System Configuration</name>
+    
+    <!-- ... -->
+
+<notificationConfiguration>
+    <handler>
+        <generalNotifier>
+            <name>Welcome new user</name>
+            <expressionFilter>
+                <script>
+                    <code>
+                    import com.evolveum.midpoint.notifications.api.events.ModelEvent
+                    import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType
+ 
+                   (event instanceof ModelEvent &amp;&amp; event.getFocusContext() != null &amp;&amp; UserType.class.isAssignableFrom(event.getFocusContext().getObjectTypeClass()) &amp;&amp; event.getFocusContext().isAdd())
+                    </code>
+                </script>
+            </expressionFilter>
+            <recipientExpression>
+                <value>iam@localhost</value>
+            </recipientExpression>
+            <subjectExpression>
+                <script>
+                    <code>
+                    return 'New user notification'
+                </code>
+               </script>
+            </subjectExpression>
+            <bodyExpression>
+                <script>
+                   <code>
+                   import com.evolveum.midpoint.notifications.api.events.ModelEvent;
+                   
+                   focusContext = ((ModelEvent) event).getFocusContext();
+                   objectNew = focusContext.getObjectNew();
+                   username = basic.stringify(objectNew.getName());
+                   
+                   language = objectNew.asObjectable().getPreferredLanguage();
+                   if (!language) {
+                       language = 'default'
+                   }
+                   
+                   templateParams = new HashMap()
+                   templateParams.put("username", username)
+                   return mailTemplates.execute(language, templateParams)
+                   </code>
+               </script>
+           </bodyExpression>
+           <transport>mail</transport>
+       </generalNotifier>
+   </handler>
+   <!-- configurations suitable for testing - they redirect all notifications to log files; some more real configurations are show below -->
+   <mail>
+        <redirectToFile>mail-notifications.log</redirectToFile>
+   </mail>
+   <sms>
+        <redirectToFile>sms-notifications.log</redirectToFile>
+   </sms>
+</notificationConfiguration>
+
+    <!-- ... -->
+    
+</systemConfiguration>

From f80c5e6217fbf6594c0f80510750c3ab6702bdd0 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Thu, 19 Apr 2018 16:11:13 +0200
Subject: [PATCH 3/3] Multilanguage notifications fixes

---
 .../objects/system-configuration-multilanguage-notifier.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/objects/system-configuration-multilanguage-notifier.xml b/samples/objects/system-configuration-multilanguage-notifier.xml
index df7f0dde1f2..758089bf18e 100644
--- a/samples/objects/system-configuration-multilanguage-notifier.xml
+++ b/samples/objects/system-configuration-multilanguage-notifier.xml
@@ -32,9 +32,9 @@
                 <script>
                     <code>
                     import com.evolveum.midpoint.notifications.api.events.ModelEvent
-                    import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType
+                    import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType
  
-                   (event instanceof ModelEvent &amp;&amp; event.getFocusContext() != null &amp;&amp; UserType.class.isAssignableFrom(event.getFocusContext().getObjectTypeClass()) &amp;&amp; event.getFocusContext().isAdd())
+                   (event instanceof ModelEvent &amp;&amp; event.getFocusContext() != null &amp;&amp; UserType.class.isAssignableFrom(event.getFocusContext().getObjectTypeClass()) &amp;&amp; event.getFocusContext().isAdd()))
                     </code>
                 </script>
             </expressionFilter>