diff --git a/src/main/java/fr/inra/oresing/rest/OreSiService.java b/src/main/java/fr/inra/oresing/rest/OreSiService.java index f3ad71c9e886a3bbcf6942d147c347132288ba47..01c383bed4b06a22812fb0b62b2e46ecd50a25be 100644 --- a/src/main/java/fr/inra/oresing/rest/OreSiService.java +++ b/src/main/java/fr/inra/oresing/rest/OreSiService.java @@ -697,7 +697,7 @@ public class OreSiService { "timerangeoutofinterval", ImmutableMap.of( "from", DATE_FORMATTER_DDMMYYYY.format(from), - "to", DATE_TIME_FORMATTER.format(to), + "to", DATE_FORMATTER_DDMMYYYY.format(to), "value", DATE_FORMATTER_DDMMYYYY.format(timeScope.getRange().lowerEndpoint()) ) ), diff --git a/ui/cypress/support/commands.js b/ui/cypress/support/commands.js index 76ae9eb05028c789e66722361239dc8f022db467..c37bdde143e8a0cf175bada91b41e29767be7ea6 100644 --- a/ui/cypress/support/commands.js +++ b/ui/cypress/support/commands.js @@ -31,7 +31,6 @@ Cypress.Commands.add('setLocale', (locale) => { }); }) Cypress.Commands.add('login', (userRole, applications) => { - console.log(userRole) localStorage.clear() let applicationsResponse = [] if (applications && applications instanceof Array) { diff --git a/ui/src/services/ErrorsService.js b/ui/src/services/ErrorsService.js index af60cfebd82cc93bf63a82e520c46ca07d3850ae..a3473977ef02e6dbd9eaf44cc550a69c9acccd8a 100644 --- a/ui/src/services/ErrorsService.js +++ b/ui/src/services/ErrorsService.js @@ -132,7 +132,6 @@ export class ErrorsService { } getCsvErrorsMessages(csvErrors) { - console.log("coucou : ",csvErrors); return csvErrors.map((csvError) => { const func = ERRORS[csvError.validationCheckResult.message]; if (!func) { @@ -148,4 +147,4 @@ export class ErrorsService { return func(params); }); } -} +} \ No newline at end of file diff --git a/ui/src/services/Fetcher.js b/ui/src/services/Fetcher.js index 077a9ac6aa5939e297adae76dae2167d8b1495bb..917273c98f4652b6dbafb9f825e355aa4fa36c98 100644 --- a/ui/src/services/Fetcher.js +++ b/ui/src/services/Fetcher.js @@ -114,7 +114,6 @@ export class Fetcher { async downloadFile(urlPath) { const url = new URL(`${config.API_URL}${urlPath}`); - console.log(url) const link = document.createElement("a"); link.href=url; link.type='application/octet-stream' diff --git a/ui/src/views/datatype/DataTypesManagementView.vue b/ui/src/views/datatype/DataTypesManagementView.vue index 3c1817d794666886c41c9c51fba93c39faf0f642..7b58c44272d0cc17c3568cf94814becaff478c72 100644 --- a/ui/src/views/datatype/DataTypesManagementView.vue +++ b/ui/src/views/datatype/DataTypesManagementView.vue @@ -268,7 +268,6 @@ export default class DataTypesManagementView extends Vue { async downloadDataType(event) { let param = new DownloadDatasetQuery(this.application, this.applicationName, event) - console.log('download',new DownloadDatasetQuery(), event) let csv = await this.dataService.getDataTypesCsv( this.applicationName, event, diff --git a/ui/src/views/datatype/DataTypesRepositoryView.vue b/ui/src/views/datatype/DataTypesRepositoryView.vue index cdab0a1304e709374dd48ffd3a963f114f889698..ef0a1162172331ca2852312eada5c190ff1bba43 100644 --- a/ui/src/views/datatype/DataTypesRepositoryView.vue +++ b/ui/src/views/datatype/DataTypesRepositoryView.vue @@ -478,6 +478,14 @@ export default class DataTypesRepositoryView extends Vue { async publish(dataset, pusblished) { dataset.params.published = pusblished; + let requiredauthorizations = dataset.params.binaryFiledataset.requiredauthorizations; + requiredauthorizations = Object.keys(requiredauthorizations).reduce(function (acc, key){ + acc[key] = acc[key]?acc[key].sql:""; + return acc; + }, requiredauthorizations) + console.log('requiredauthorizations',requiredauthorizations) + dataset.params.binaryFiledataset.requiredauthorizations = requiredauthorizations; + console.log('binaryFiledataset',dataset.params.binaryFiledataset) var fileOrId = new FileOrUUID(dataset.id, dataset.params.binaryFiledataset, pusblished); var uuid = await this.dataService.addData( this.applicationName, @@ -492,7 +500,6 @@ export default class DataTypesRepositoryView extends Vue { this.selected.requiredauthorizations[key] = event.referenceValues.hierarchicalKey; this.requiredauthorizationsObject[key] = event.completeLocalName; this.datasets = this.currentDataset = null; - console.log(this.$refs?.[key]); this.$refs?.[key]?.[0].toggle(); if (this.isAuthorisationsSelected()) { this.$emit("authorizationChanged"); @@ -682,4 +689,4 @@ caption { .tooltip-content { } } -</style> +</style> \ No newline at end of file diff --git a/ui/src/views/references/ReferencesManagementView.vue b/ui/src/views/references/ReferencesManagementView.vue index 97e8cec5ae664f70030d7a308c1342fd5693205a..e9cb389d63283479033570ed15735fcf2ada6047 100644 --- a/ui/src/views/references/ReferencesManagementView.vue +++ b/ui/src/views/references/ReferencesManagementView.vue @@ -172,7 +172,6 @@ export default class ReferencesManagementView extends Vue { const reference = this.findReferenceByLabel(label); if (reference) { let csv = await this.referenceService.getReferenceCsv(this.applicationName, reference.id); - console.log(csv); var hiddenElement = document.createElement("a"); hiddenElement.href = "data:text/csv;charset=utf-8," + encodeURI(csv); @@ -228,4 +227,4 @@ export default class ReferencesManagementView extends Vue { margin-bottom: 10px; border: 1px solid white; } -</style> +</style> \ No newline at end of file