From be96fb2d236728b81d2a8b878494b217f669fe6e Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 19 Mar 2021 17:50:18 +0100
Subject: [PATCH] Minor fixes on nodes sharing implementation
---
.../ia2/vospace/ui/service/NodesHtmlGenerator.java | 10 ++++++----
.../it/inaf/ia2/vospace/ui/service/SharingService.java | 2 +-
vospace-ui-frontend/src/App.vue | 2 +-
.../src/components/modal/ShareModal.vue | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
index e45c778..bffec0a 100644
--- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
+++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
@@ -102,10 +102,12 @@ public class NodesHtmlGenerator {
List<String> personGroups = new ArrayList<>();
List<String> peopleGroups = new ArrayList<>();
for (String value : values) {
- if (value.startsWith("people.")) {
- personGroups.add(value.substring("people.".length()).replace("\\.", "."));
- } else {
- peopleGroups.add(value);
+ if (!value.isBlank()) {
+ if (value.startsWith("people.")) {
+ personGroups.add(value.substring("people.".length()).replace("\\.", "."));
+ } else {
+ peopleGroups.add(value);
+ }
}
}
if (!personGroups.isEmpty()) {
diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/SharingService.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/SharingService.java
index 535ef43..8abb1a9 100644
--- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/SharingService.java
+++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/SharingService.java
@@ -195,7 +195,7 @@ public class SharingService {
if (identity.getType() == IdentityType.EDU_GAIN
&& identity.getEppn().endsWith("@" + trustedEppnScope)) {
String username = identity.getEppn().substring(0, identity.getEppn().indexOf("@"));
- existingUsers.put(user.getId(), username);
+ existingUsers.put(user.getId(), username.toLowerCase());
break;
}
}
diff --git a/vospace-ui-frontend/src/App.vue b/vospace-ui-frontend/src/App.vue
index cc2e8ec..6750c69 100644
--- a/vospace-ui-frontend/src/App.vue
+++ b/vospace-ui-frontend/src/App.vue
@@ -7,7 +7,7 @@
<div id="footer-fix"></div>
<footer class="text-center" id="site-footer">
— Powered by <img alt="IA2 logo" src="./assets/ia2-logo-footer.png">
- <strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="blank_">IA2</a></strong> —
+ <strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="_blank">IA2</a></strong> —
</footer>
<div id="loading" v-if="loading" class="loading">
<div class="spinner-wrapper">
diff --git a/vospace-ui-frontend/src/components/modal/ShareModal.vue b/vospace-ui-frontend/src/components/modal/ShareModal.vue
index c07803d..421986f 100644
--- a/vospace-ui-frontend/src/components/modal/ShareModal.vue
+++ b/vospace-ui-frontend/src/components/modal/ShareModal.vue
@@ -52,7 +52,7 @@ export default {
groupArr.splice(0, groupArr.length);
for (let group of nodeArr.split(' ')) {
if (group.startsWith('people.')) {
- userArr.push(group.substring('people.'.length).replaceAll('\\\\', '\\'));
+ userArr.push(group.substring('people.'.length).replaceAll('\\', ''));
} else if (group.trim() !== '') {
groupArr.push(group.replaceAll('\\\\', '\\'));
}
--
GitLab