Merge branch 'release' of forgemia.inra.fr:OpenSILEX/opensilex-dev in…

…to release
OpenSILEX · Dec 18, 2023 · de45caa · de45caa
2 parents d5c75fe + 0f0ce69
commit de45caa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/opensilex-front/front/src/components/data/ProvenanceDetailsPage.vue b/opensilex-front/front/src/components/data/ProvenanceDetailsPage.vue
@@ -283,7 +283,9 @@ export default class ProvenanceDetailsPage extends Vue {
               promiseAgent = this.$opensilex.getService<SecurityService>("opensilex.SecurityService")
               .getPerson(prov.prov_agent[i].uri)
               .then((http: HttpResponse<OpenSilexResponse<UserGetDTO>>) => {
-                prov.prov_agent[i]["operator"] = http.response.result
+                let userDto = http.response.result;
+                prov.prov_agent[i]["operator"] = userDto;
+                prov.prov_agent[i]["name"] = userDto.first_name + userDto.last_name;
               })
               .catch(this.$opensilex.errorHandler);
             } else {

diff --git a/opensilex-front/front/src/components/germplasm/GermplasmTable.vue b/opensilex-front/front/src/components/germplasm/GermplasmTable.vue
@@ -798,7 +798,7 @@ export default class GermplasmTable extends Vue {
         form.code == null &&
         form.synonyms.length == 0 &&
         form.metadata == null &&
-        form.relations == null &&
+        (form.relations == null || form.relations.length === 0) &&
         form.website == null
       ) {
         this.emptyLines = this.emptyLines + 1;

diff --git a/opensilex-front/front/src/main.ts b/opensilex-front/front/src/main.ts
@@ -517,7 +517,7 @@ function loadTheme(vueJsService: VueJsService, config: FrontConfigDTO) {
 $opensilex.loadModules([
   "opensilex-security",
   "opensilex-core",
-  // "opensilex-dataverse"
+  "opensilex-dataverse"
 ]).then(() => {
   $opensilex.initAsyncComponents(components).then(() => {
     console.debug("Default components loaded !");

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
         <!--<module>inrae-sixtine</module>-->
 
         <!-- Dataverse module -->
-        <!--<module>opensilex-dataverse</module>-->
+        <module>opensilex-dataverse</module>
 
         <!-- Development module -->
         <module>opensilex-dev-tools</module>
@@ -157,11 +157,11 @@
         </dependency> -->
 
         <!-- Dataverse dependency -->
-<!--        <dependency>-->
-<!--            <groupId>org.opensilex</groupId>-->
-<!--            <artifactId>opensilex-dataverse</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.opensilex</groupId>
+            <artifactId>opensilex-dataverse</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
     <build>