Merge branch 'refs/heads/hotfix/maximilian/filtres-export-data' into …

…develop # Conflicts: # CHANGELOG.md # opensilex-front/front/src/components/data/DataExportModal.vue # opensilex-front/front/src/components/geometry/MapView.vue
OpenSILEX · Apr 16, 2024 · 744c7d4 · 744c7d4
2 parents 66f92f3 + e780e7c
commit 744c7d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 <!-- TOC -->
 * [Changelog](#changelog)
+  * [[1.2.4]](#124)
+    * * [Fixed or optimized](#fixed-or-optimized) 
   * [[1.2.3]](#123)
     * [Highlight](#highlight)
     * [Changes and new features](#changes-and-new-features)
@@ -83,6 +85,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.4]
+
+### Fixed or optimized
+
+- (!1212) Device filter no longer ignored during data export.
+
 ## [1.2.3]
 
 >  ⚠️ WARNING : upgrading to this new version require manual operations. Please

diff --git a/opensilex-front/front/src/components/data/DataExportModal.vue b/opensilex-front/front/src/components/data/DataExportModal.vue
@@ -59,6 +59,7 @@
 <script lang="ts">
 import Vue from "vue";
 import { Component, Prop, Ref } from "vue-property-decorator";
+import {DataSearchDTO} from "opensilex-core/model/dataSearchDTO";
 
 @Component
 export default class DataExportModal extends Vue {
@@ -99,10 +100,11 @@ export default class DataExportModal extends Vue {
       String(today.getMonth() + 1).padStart(2, "0") +
       String(today.getDate()).padStart(2, "0");
 
-    let exportDto = {
+    let exportDto: DataSearchDTO = {
       start_date: this.filter.start_date,
       end_date: this.filter.end_date,
       targets: this.filter.scientificObjects,
+      devices: this.filter.devices,
       experiments: this.filter.experiments,
       variables: this.filter.variables,
       provenances: this.filter.provenance ? [this.filter.provenance] : null,

diff --git a/opensilex-front/front/src/components/geometry/MapView.vue b/opensilex-front/front/src/components/geometry/MapView.vue
@@ -1829,7 +1829,7 @@ export default class MapView extends Vue {
   }
 
   downloadFeatures(values) {
-    
+
       this.$opensilex.showInfoToast(this.$i18n.t("MapView.export-info").toString());
 
       if(this.exportedOS.length> 0){