From cd65fda9273c885d7ba6a571fbfed36d48dc4612 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Fri, 13 Sep 2019 15:39:26 +0200
Subject: [PATCH] summarize dashlet store categories and dashlet roles

---
 .../_____LANGUAGE_EXTRA.aod                    |  6 ++++++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod |  7 +++++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod |  6 ++++++
 .../ActivityFilter_view.aod                    |  9 +--------
 .../AppointmentCheckUp_view.aod                |  3 +++
 .../AppointmentFilterDashlet_view.aod          |  3 +++
 .../CampaignCostChart_view.aod                 |  7 +++----
 .../CampaignFilter_view.aod                    | 14 ++++++--------
 .../ContractFilter_view.aod                    |  8 ++++----
 .../FacebookTimeline_view.aod                  |  8 --------
 .../MyDashboardScoreCard_view.aod              |  8 ++------
 neonView/OfferFilter_view/OfferFilter_view.aod | 18 +++++++++---------
 neonView/OrderFilter_view/OrderFilter_view.aod | 16 ++++++++--------
 .../OrganisationFilter_view.aod                |  6 +-----
 .../PersonFilter_view/PersonFilter_view.aod    |  6 +-----
 .../ProductFilter_view/ProductFilter_view.aod  |  8 ++++----
 .../SalesprojectFilter_view.aod                | 16 ++++++++--------
 .../SalesprojectPhases_view.aod                | 12 ++++++++----
 .../SalesprojectScoreCard_view.aod             |  8 ++++++--
 .../SupportTicketFilter_view.aod               | 11 +++++++----
 neonView/TaskFilter_view/TaskFilter_view.aod   |  5 +++--
 .../TurnoverChartForecast_view.aod             |  4 ++--
 .../TwitterTimeline_view.aod                   |  8 --------
 .../UniversalFileProcessorDropzone_view.aod    |  4 ++--
 .../UnlinkedMailFilter_view.aod                |  8 ++------
 25 files changed, 102 insertions(+), 107 deletions(-)

diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 138bbb2461..d2d3785cd3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5055,6 +5055,12 @@
     <entry>
       <key>Credit</key>
     </entry>
+    <entry>
+      <key>Show tickets where I am editor</key>
+    </entry>
+    <entry>
+      <key>My tickets</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index bbe44b77a5..27d0c0e54b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6393,6 +6393,13 @@
       <key>Credit</key>
       <value>Gutschrift</value>
     </entry>
+    <entry>
+      <key>Show tickets where I am editor</key>
+    </entry>
+    <entry>
+      <key>My tickets</key>
+      <value>Meine Tickets</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index d84e2d85d5..b3febb8ba3 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5105,6 +5105,12 @@
     <entry>
       <key>Credit</key>
     </entry>
+    <entry>
+      <key>Show tickets where I am editor</key>
+    </entry>
+    <entry>
+      <key>My tickets</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 0a38ead6e8..5993b1e5eb 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -11,16 +11,13 @@
       <fragment>Activity/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles />
       <icon>VAADIN:HOURGLASS_END</icon>
       <categories>
         <neonDashletCategory>
           <name>contactmanagement</name>
           <title>Contactmanagement</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
     <neonDashletConfiguration>
@@ -36,10 +33,6 @@
           <name>contactmanagement</name>
           <title>Contactmanagement</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
diff --git a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
index 688e281e02..1b47fded0a 100644
--- a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
+++ b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
@@ -7,6 +7,9 @@
       <name>AppointmentCheckupDashletConfig</name>
       <title>Appointment checkup</title>
       <fragment>Appointment/full</fragment>
+      <storeRoles>
+        <element>INTERNAL_ADMINISTRATOR</element>
+      </storeRoles>
       <icon>VAADIN:CALENDAR</icon>
       <categories>
         <neonDashletCategory>
diff --git a/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
index 509b780078..0a1bec97ea 100644
--- a/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
+++ b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
@@ -10,6 +10,9 @@
       <title>Linked Appointments</title>
       <description>Shows linked appointments</description>
       <fragment>Appointment/full</fragment>
+      <storeRoles>
+        <element>INTERNAL_ADMINISTRATOR</element>
+      </storeRoles>
       <icon>VAADIN:CALENDAR</icon>
       <categories>
         <neonDashletCategory>
diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
index d9d2fb0593..15599baa63 100644
--- a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
+++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
@@ -9,16 +9,15 @@
       <description>Shows campaing costs graphically processed</description>
       <fragment>Campaign/full</fragment>
       <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_Marketing</element>
+      </storeRoles>
       <icon>VAADIN:MONEY</icon>
       <categories>
         <neonDashletCategory>
           <name>marketing</name>
           <title>Marketing</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>campaignmanagement</name>
-          <title>Campaign management</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/CampaignFilter_view/CampaignFilter_view.aod b/neonView/CampaignFilter_view/CampaignFilter_view.aod
index 10ec1fbfe7..73542fcd07 100644
--- a/neonView/CampaignFilter_view/CampaignFilter_view.aod
+++ b/neonView/CampaignFilter_view/CampaignFilter_view.aod
@@ -12,16 +12,15 @@
       <description>Show my campaigns</description>
       <fragment>Campaign/filter</fragment>
       <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_Marketing</element>
+      </storeRoles>
       <icon>NEON:GROUP_APPOINTMENT</icon>
       <categories>
         <neonDashletCategory>
           <name>marketing</name>
           <title>Marketing</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>campaignmanagement</name>
-          <title>Campaign management</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
@@ -36,16 +35,15 @@
       <description>Shows all campaigns</description>
       <fragment>Campaign/filter</fragment>
       <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_Marketing</element>
+      </storeRoles>
       <icon>NEON:GROUP_APPOINTMENT</icon>
       <categories>
         <neonDashletCategory>
           <name>marketing</name>
           <title>Marketing</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>campaignmanagement</name>
-          <title>Campaign management</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index f880957695..5fc1ae1b63 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -11,16 +11,16 @@
       <fragment>Contract/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:form</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>contract</name>
-          <title>Contract</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index 3ff241f4d7..3811ff5c13 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -17,10 +17,6 @@
           <name>social</name>
           <title>Social Media</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>facebook</name>
-          <title>Facebook</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
@@ -41,10 +37,6 @@
           <name>social</name>
           <title>Social Media</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>facebook</name>
-          <title>Facebook</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
diff --git a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
index b1e060e24f..0452933bd5 100644
--- a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
+++ b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
@@ -12,12 +12,8 @@
       <icon>VAADIN:CLIPBOARD_CHECK</icon>
       <categories>
         <neonDashletCategory>
-          <name>tasks</name>
-          <title>Tasks</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>calendar</name>
-          <title>Calendar</title>
+          <name>contactmanagement</name>
+          <title>Contactmanagement</title>
         </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 73222a07c2..d2dc31488a 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -11,35 +11,35 @@
       <fragment>Offer/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:cart</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>offer</name>
-          <title>Offer</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
     <neonDashletConfiguration>
       <name>SendOffersDashlet</name>
       <title>Sent offers</title>
       <description>Show all sent offers</description>
-      <fragment>Offer/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJTVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJWZXJzZW5kZXQiLCJrZXkiOiJPRkZFUlNUQVRTRU5UICAgICAgICAgICAgICAgICAgICAgICAiLCJjb250ZW50dHlwZSI6IlRFWFQifV19</fragment>
+      <fragment>Offer/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:cart</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>offer</name>
-          <title>Offer</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 1c2cd1ed43..084490fa90 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -11,16 +11,16 @@
       <fragment>Order/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>VAADIN:FILE_TEXT_O</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>order</name>
-          <title>Receipt</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
     <neonDashletConfiguration>
@@ -30,16 +30,16 @@
       <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>VAADIN:FILE_TEXT_O</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>order</name>
-          <title>Receipt</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 68f25862f2..59d2100e1a 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -9,7 +9,7 @@
       <title>Companies</title>
       <description>Show all companies</description>
       <fragment>Organisation/filter</fragment>
-      <singleton v="true" />
+      <singleton v="false" />
       <requiresConfiguration v="false" />
       <icon>vaadin:building</icon>
       <categories>
@@ -17,10 +17,6 @@
           <name>contactmanagement</name>
           <title>Contactmanagement</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>org</name>
-          <title>Company</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 4bf6de7553..e345254134 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -9,7 +9,7 @@
       <title>Contacts</title>
       <description>Show all contacts</description>
       <fragment>Person/filter</fragment>
-      <singleton v="true" />
+      <singleton v="false" />
       <requiresConfiguration v="false" />
       <icon>vaadin:users</icon>
       <categories>
@@ -17,10 +17,6 @@
           <name>contactmanagement</name>
           <title>Contactmanagement</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>person</name>
-          <title>Contact</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 872dbd01f7..255fe83ade 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -11,16 +11,16 @@
       <fragment>Product/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:hammer</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>product</name>
-          <title>Product</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 964dfa8a66..33e4c09107 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -11,16 +11,16 @@
       <fragment>Salesproject/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:filter</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>salesproject</name>
-          <title>Salesproject</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
     <neonDashletConfiguration>
@@ -30,16 +30,16 @@
       <fragment>Salesproject/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJTVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJPZmZlbiIsImtleSI6IlNBTFBST0pTVEFUT1BFTiAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%253D</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>vaadin:filter</icon>
       <categories>
         <neonDashletCategory>
           <name>sales</name>
           <title>Sales</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>salesproject</name>
-          <title>Salesproject</title>
-        </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
   </dashletConfigurations>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
index 6eba3c2afc..5b8054824e 100644
--- a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -9,15 +9,19 @@
       <description>Shows how many sales projects are in the various sales phases</description>
       <fragment>SalesprojectAnalyses/full</fragment>
       <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>VAADIN:FUNNEL</icon>
       <categories>
         <neonDashletCategory>
-          <name>salesproject</name>
-          <title>Salesproject</title>
+          <name>sales</name>
+          <title>Sales</title>
         </neonDashletCategory>
         <neonDashletCategory>
-          <name>chart</name>
-          <title>Chart</title>
+          <name>charts</name>
+          <title>Charts</title>
         </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
index bded03bc2d..cd6b17fce7 100644
--- a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -9,11 +9,15 @@
       <description>Most important salse key figures</description>
       <fragment>SalesprojectAnalyses/full</fragment>
       <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
       <icon>VAADIN:GRID_BIG</icon>
       <categories>
         <neonDashletCategory>
-          <name>salesproject</name>
-          <title>Salesproject</title>
+          <name>sales</name>
+          <title>Sales</title>
         </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index b1408c731b..86fe1316e5 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -6,16 +6,19 @@
   <dashletConfigurations>
     <neonDashletConfiguration>
       <name>mytickets</name>
-      <title>My tasks</title>
-      <description>Show tasks where I am editor</description>
+      <title>My tickets</title>
+      <description>Show tickets where I am editor</description>
       <fragment>Ticket/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_Support</element>
+      </storeRoles>
       <icon>VAADIN:TASKS</icon>
       <categories>
         <neonDashletCategory>
-          <name>tickets</name>
-          <title>Tickets</title>
+          <name>service</name>
+          <title>Service</title>
         </neonDashletCategory>
       </categories>
       <parameters>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index cded3b0759..a4768f0cf3 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -11,11 +11,12 @@
       <fragment>Task/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
+      <storeRoles />
       <icon>VAADIN:TASKS</icon>
       <categories>
         <neonDashletCategory>
-          <name>tasks</name>
-          <title>Tasks</title>
+          <name>contactmanagement</name>
+          <title>Contactmanagement</title>
         </neonDashletCategory>
       </categories>
       <parameters>
diff --git a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
index 7b850debc5..99b2f2de4c 100644
--- a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
+++ b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
@@ -17,8 +17,8 @@
       <icon>VAADIN:CHART</icon>
       <categories>
         <neonDashletCategory>
-          <name>turnover</name>
-          <title>Turnover</title>
+          <name>charts</name>
+          <title>Charts</title>
         </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index 0af99bc565..7c25691a4f 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -17,10 +17,6 @@
           <name>social</name>
           <title>Social Media</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>twitter</name>
-          <title>Twitter</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
@@ -41,10 +37,6 @@
           <name>social</name>
           <title>Social Media</title>
         </neonDashletCategory>
-        <neonDashletCategory>
-          <name>twitter</name>
-          <title>Twitter</title>
-        </neonDashletCategory>
       </categories>
       <parameters>
         <neonDashletParameter>
diff --git a/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod b/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
index 70fce04d55..cdd230408e 100644
--- a/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
+++ b/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
@@ -13,8 +13,8 @@
       <icon>VAADIN:UPLOAD</icon>
       <categories>
         <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
+          <name>email</name>
+          <title>Email</title>
         </neonDashletCategory>
       </categories>
       <parameters>
diff --git a/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod b/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
index 8cbfe491f4..e86c693f90 100644
--- a/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
+++ b/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
@@ -12,12 +12,8 @@
       <icon>VAADIN:AT</icon>
       <categories>
         <neonDashletCategory>
-          <name>contactmanagement</name>
-          <title>Contactmanagement</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
+          <name>email</name>
+          <title>Email</title>
         </neonDashletCategory>
       </categories>
     </neonDashletConfiguration>
-- 
GitLab