Merge branch 'feature/new-ui'

Author: ar2rsawseen

plugins/populator/frontend/public/javascripts/countly.common.populator.js

@@ -982,6 +982,16 @@
             };
         },
         methods: {
+            addedTag: function(val) {
+                var lastInserted = val[val.length - 1];
+                var lastInsertedIndex = val.length - 1;
+                lastInserted.split(",").forEach(function(tag) {
+                    if (tag.length && val.indexOf(tag) < 0) {
+                        val.push(tag);
+                    }
+                });
+                val.splice(lastInsertedIndex, 1);
+            },
             isAddEventDisabled: function(editedObject) {
                 return editedObject.events && editedObject.events.length && editedObject.events.slice(-1)[0].eventName === '';
             },

plugins/populator/frontend/public/templates/template_drawer.html

@@ -30,7 +30,7 @@ <h4 class="bu-mb-4">{{ i18n('populator.custom-user-props') }}</h4>
                                 <cly-tooltip-icon></cly-tooltip-icon>
                             </div>
                             <div>
-                                <el-select class="custom-value" :collapse-tags="false" :placeholder="i18n('populator.enter-your-values')" v-model="drawerScope.editedObject.up[index].value" multiple filterable allow-create></el-select>
+                                <el-select class="custom-value" @change="addedTag" :collapse-tags="false" :placeholder="i18n('populator.enter-your-values')" v-model="drawerScope.editedObject.up[index].value" multiple filterable allow-create></el-select>
                             </div>
                         </div>
                     </div>
@@ -70,7 +70,7 @@ <h4 class="bu-mb-4">{{ i18n('populator.events') }}</h4>
                                         <cly-tooltip-icon></cly-tooltip-icon>
                                     </div>
                                     <div>
-                                        <el-select v-model="drawerScope.editedObject.events[index].segments[segmentIndex].value" class="custom-value" :collapse-tags="false" multiple filterable allow-create></el-select>
+                                        <el-select v-model="drawerScope.editedObject.events[index].segments[segmentIndex].value" @change="addedTag" class="custom-value" :collapse-tags="false" multiple filterable allow-create></el-select>
                                     </div>
                                 </div>
                                 <div class="bu-is-flex bu-is-flex-direction-column bu-ml-2 bu-is-justify-content-center">