From 609cb6b5d97bf12601d160b68f1b349401c9a012 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 25 Sep 2020 16:36:20 +0200
Subject: [PATCH] Added option for showing/hiding the user id in searches
---
gms-ui/.env.development | 1 +
gms-ui/.env.production | 1 +
gms-ui/package-lock.json | 3 ++-
gms-ui/src/components/modals/SearchUser.vue | 4 +++-
gms/pom.xml | 4 ++++
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gms-ui/.env.development b/gms-ui/.env.development
index 50ae1fd..e5ef8f8 100644
--- a/gms-ui/.env.development
+++ b/gms-ui/.env.development
@@ -1,2 +1,3 @@
VUE_APP_API_CLIENT = 'mock'
VUE_APP_API_BASE_URL = ''
+VUE_APP_SHOW_USER_ID_IN_SEARCH = true
diff --git a/gms-ui/.env.production b/gms-ui/.env.production
index 6010f55..249ade8 100644
--- a/gms-ui/.env.production
+++ b/gms-ui/.env.production
@@ -1,2 +1,3 @@
VUE_APP_API_CLIENT = 'server'
VUE_APP_API_BASE_URL = ''
+VUE_APP_SHOW_USER_ID_IN_SEARCH = true
diff --git a/gms-ui/package-lock.json b/gms-ui/package-lock.json
index 87acba7..d46c5e9 100644
--- a/gms-ui/package-lock.json
+++ b/gms-ui/package-lock.json
@@ -6573,7 +6573,8 @@
"dependencies": {
"acorn": {
"version": "6.1.1",
- "resolved": "",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+ "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
"dev": true
},
"acorn-jsx": {
diff --git a/gms-ui/src/components/modals/SearchUser.vue b/gms-ui/src/components/modals/SearchUser.vue
index 5f96f4b..a37151d 100644
--- a/gms-ui/src/components/modals/SearchUser.vue
+++ b/gms-ui/src/components/modals/SearchUser.vue
@@ -17,6 +17,8 @@
</template>
<script>
+const SHOW_USER_ID_IN_SEARCH = process.env.VUE_APP_SHOW_USER_ID_IN_SEARCH === 'true';
+
import client from 'api-client';
import debounce from 'debounce'; // for delaying the input event (search filter)
@@ -50,7 +52,7 @@ export default {
let user = res[i];
this.users.push({
value: user.id,
- text: user.displayName + ' [' + user.id + ']'
+ text: user.displayName + (SHOW_USER_ID_IN_SEARCH ? ' [' + user.id + ']' : '')
});
}
if (this.users.length > 0) {
diff --git a/gms/pom.xml b/gms/pom.xml
index 47d61e3..c54b418 100644
--- a/gms/pom.xml
+++ b/gms/pom.xml
@@ -16,6 +16,7 @@
<properties>
<java.version>1.8</java.version>
+ <show.user_id_in_search>true</show.user_id_in_search>
</properties>
<dependencies>
@@ -75,6 +76,9 @@
<version>1.7.6</version>
<configuration>
<nodeVersion>v12.6.0</nodeVersion>
+ <environmentVariables>
+ <VUE_APP_SHOW_USER_ID_IN_SEARCH>${show.user_id_in_search}</VUE_APP_SHOW_USER_ID_IN_SEARCH>
+ </environmentVariables>
</configuration>
<executions>
<execution>
--
GitLab