Merge pull request #13 from spartez/separator-prop

added separator props
spartez · Dec 1, 2021 · 556cf90 · 556cf90
2 parents 3c3a27f + ca2c7c9
commit 556cf90
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/dist/vue-aui-jira-extras.esm.js b/dist/vue-aui-jira-extras.esm.js
@@ -1195,7 +1195,8 @@ var JiraApi = function () {
     }, {
         key: 'getUsers',
         value: function getUsers$$1(username) {
-            return this.api.isMock ? getUsers(username) : this.api.get('/rest/api/2/user/search?query=' + encodeURIComponent(username));
+            var query = getPlatform() === 'server' ? 'username' : 'query';
+            return this.api.isMock ? getUsers(username) : this.api.get('/rest/api/2/user/search?' + query + '=' + encodeURIComponent(username));
         }
     }, {
         key: 'getGroupsForPicker',
@@ -4667,7 +4668,7 @@ var GROUP_PREFIX$1 = "group\t";
 var SEPARATOR = '\0';
 
 var UserPickerUserKey = { render: function render() {
-        var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('va-select2', { ref: "select", attrs: { "allow-clear": _vm.allowClear, "disabled": _vm.disabled, "init-selection": _vm.initialValue, "locked": _vm.locked, "multiple": _vm.multiple, "placeholder": _vm.placeholder, "query": _vm.queryValues, "value": _vm.value }, on: { "input": function input($event) {
+        var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('va-select2', { ref: "select", attrs: { "allow-clear": _vm.allowClear, "disabled": _vm.disabled, "init-selection": _vm.initialValue, "locked": _vm.locked, "multiple": _vm.multiple, "placeholder": _vm.placeholder, "query": _vm.queryValues, "value": _vm.value, "separator": _vm.separator }, on: { "input": function input($event) {
                     _vm.onValueChanged($event);
                 } }, scopedSlots: _vm._u([{ key: "formatSelection", fn: function fn(option) {
                     return _c('span', {}, [option.data.avatarUrls ? _c('aui-avatar', { attrs: { "squared": "", "size": "xsmall", "src": option.data.avatarUrls['48x48'] } }) : _vm._e(), _vm._v(" " + _vm._s(option.data.displayName) + " ")], 1);
@@ -4687,7 +4688,11 @@ var UserPickerUserKey = { render: function render() {
         },
         multiple: Boolean,
         placeholder: String,
-        value: [String, Array]
+        value: [String, Array],
+        separator: {
+            type: String,
+            default: SEPARATOR
+        }
     },
 
     data: function data() {
@@ -4806,7 +4811,7 @@ var UserPickerUserKey = { render: function render() {
 
             if (this.multiple) {
                 if (element.val()) {
-                    var userKeys = element.val().split(SEPARATOR);
+                    var userKeys = element.val().split(this.separator);
 
                     Promise.all(userKeys.map(function (userKey) {
                         return _this3.$jira.getUser({ key: userKey });

diff --git a/dist/vue-aui-jira-extras.js b/dist/vue-aui-jira-extras.js
@@ -1199,7 +1199,8 @@ var JiraApi = function () {
     }, {
         key: 'getUsers',
         value: function getUsers$$1(username) {
-            return this.api.isMock ? getUsers(username) : this.api.get('/rest/api/2/user/search?query=' + encodeURIComponent(username));
+            var query = getPlatform() === 'server' ? 'username' : 'query';
+            return this.api.isMock ? getUsers(username) : this.api.get('/rest/api/2/user/search?' + query + '=' + encodeURIComponent(username));
         }
     }, {
         key: 'getGroupsForPicker',
@@ -4671,7 +4672,7 @@ var GROUP_PREFIX$1 = "group\t";
 var SEPARATOR = '\0';
 
 var UserPickerUserKey = { render: function render() {
-        var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('va-select2', { ref: "select", attrs: { "allow-clear": _vm.allowClear, "disabled": _vm.disabled, "init-selection": _vm.initialValue, "locked": _vm.locked, "multiple": _vm.multiple, "placeholder": _vm.placeholder, "query": _vm.queryValues, "value": _vm.value }, on: { "input": function input($event) {
+        var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('va-select2', { ref: "select", attrs: { "allow-clear": _vm.allowClear, "disabled": _vm.disabled, "init-selection": _vm.initialValue, "locked": _vm.locked, "multiple": _vm.multiple, "placeholder": _vm.placeholder, "query": _vm.queryValues, "value": _vm.value, "separator": _vm.separator }, on: { "input": function input($event) {
                     _vm.onValueChanged($event);
                 } }, scopedSlots: _vm._u([{ key: "formatSelection", fn: function fn(option) {
                     return _c('span', {}, [option.data.avatarUrls ? _c('aui-avatar', { attrs: { "squared": "", "size": "xsmall", "src": option.data.avatarUrls['48x48'] } }) : _vm._e(), _vm._v(" " + _vm._s(option.data.displayName) + " ")], 1);
@@ -4691,7 +4692,11 @@ var UserPickerUserKey = { render: function render() {
         },
         multiple: Boolean,
         placeholder: String,
-        value: [String, Array]
+        value: [String, Array],
+        separator: {
+            type: String,
+            default: SEPARATOR
+        }
     },
 
     data: function data() {
@@ -4810,7 +4815,7 @@ var UserPickerUserKey = { render: function render() {
 
             if (this.multiple) {
                 if (element.val()) {
-                    var userKeys = element.val().split(SEPARATOR);
+                    var userKeys = element.val().split(this.separator);
 
                     Promise.all(userKeys.map(function (userKey) {
                         return _this3.$jira.getUser({ key: userKey });

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -184,9 +184,10 @@ export default class JiraApi {
     }
 
     getUsers(username: string): Promise<Array<Jira.User>> {
+        const query = getPlatform() === 'server' ? 'username' : 'query';
         return this.api.isMock
             ? JiraMocksApi.getUsers(username)
-            : this.api.get(`/rest/api/2/user/search?query=${encodeURIComponent(username)}`);
+            : this.api.get(`/rest/api/2/user/search?${query}=${encodeURIComponent(username)}`);
     }
 
     getGroupsForPicker(query: { query: string }) {

diff --git a/src/components/UserPickerUserKey.vue b/src/components/UserPickerUserKey.vue
@@ -8,6 +8,7 @@
                 :placeholder="placeholder"
                 :query="queryValues"
                 :value="value"
+                :separator="separator"
                 @input="onValueChanged($event)"
     >
         <span slot="formatSelection" slot-scope="option">
@@ -42,7 +43,11 @@
             },
             multiple: Boolean,
             placeholder: String,
-            value: [String, Array]
+            value: [String, Array],
+            separator: {
+                type: String,
+                default: SEPARATOR
+            }
         },
 
         data() {
@@ -122,7 +127,7 @@
             initialValue(element, callback) {
                 if (this.multiple) {
                     if (element.val()) {
-                        const userKeys = element.val().split(SEPARATOR);
+                        const userKeys = element.val().split(this.separator);
 
                         Promise.all(userKeys.map(userKey => this.$jira.getUser({key: userKey})))
                             .then(users => {
@@ -171,4 +176,4 @@
         font-weight: 600;
         color: #8993A4;
     }
-</style>
+</style>