From 20b0b02c6b913bf12f22a4090c67a593b1143c9b Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 25 Jan 2023 17:48:10 +0100
Subject: [PATCH 1/2] =?UTF-8?q?bug=20lors=20de=20la=20d=C3=A9publication?=
=?UTF-8?q?=20ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/src/locales/fr.json | 4 ++-
.../datatype/DataTypesRepositoryView.vue | 30 ++++++++++---------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ui/src/locales/fr.json b/ui/src/locales/fr.json
index 354b977e3..5fde4d7f1 100644
--- a/ui/src/locales/fr.json
+++ b/ui/src/locales/fr.json
@@ -277,8 +277,10 @@
"submit": "Envoyer",
"list-file-data": "Liste des jeux de données associés à votre sélection",
"list-file-data-period": "Liste des versions pour la période",
+ "table-file-data-version": "N° version",
"table-file-data-id": "ID",
- "table-file-data-size": "Taille",
+ "table-file-data-size": "Taille du fichier",
+ "table-file-data-size-unit" : "Ko",
"table-file-data-create": "Dernier dépôt",
"table-file-data-create-by": "Dernier dépositaire",
"table-file-data-publish": "Date de publication",
diff --git a/ui/src/views/datatype/DataTypesRepositoryView.vue b/ui/src/views/datatype/DataTypesRepositoryView.vue
index b8056473e..e5ba3ec24 100644
--- a/ui/src/views/datatype/DataTypesRepositoryView.vue
+++ b/ui/src/views/datatype/DataTypesRepositoryView.vue
@@ -172,7 +172,7 @@
</caption>
<tr>
<th align>{{ $t("dataTypesRepository.table-file-data-period") }}</th>
- <th align>{{ $t("ponctuation.star") }}</th>
+ <th align>{{ $t("dataTypesRepository.version-number") }}</th>
<th align>{{ $t("dataTypesRepository.table-file-data-publication") }}</th>
</tr>
<tr
@@ -194,12 +194,8 @@
style="text-align: center; vertical-align: center"
>
<caption>
- {{
- $t("dataTypesRepository.list-file-data-period")
- }}
- {{
- currentDataset[0].periode
- }}
+ {{ $t("dataTypesRepository.list-file-data-period") }}
+ {{ currentDataset[0].periode }}
<div v-if="errorsMessages.length" style="margin: 10px">
<div v-for="msg in errorsMessages" v-bind:key="msg">
<b-message
@@ -216,6 +212,7 @@
</caption>
<tr>
+ <th align>{{ $t("dataTypesRepository.table-file-data-version") }}</th>
<th align>{{ $t("dataTypesRepository.table-file-data-id") }}</th>
<th align>{{ $t("dataTypesRepository.table-file-data-size") }}</th>
<th align>{{ $t("dataTypesRepository.table-file-data-create") }}</th>
@@ -225,7 +222,8 @@
<th align>{{ $t("dataTypesRepository.table-file-data-publication") }}</th>
<th align>{{ $t("dataTypesRepository.table-file-data-action") }}</th>
</tr>
- <tr v-for="dataset in currentDataset" :key="dataset.id">
+ <tr v-for="(dataset, index) in currentDataset" :key="dataset.id">
+ <td align>{{ index + 1 }}</td>
<td align>
<b-tooltip type="is-dark" :id="dataset.id" multilined role="tooltip">
<template v-slot:content>
@@ -236,15 +234,18 @@
:aria-describedby="dataset.id"
tabindex="0"
@keypress.enter="changeCss(dataset.id)"
- >{{ dataset.id.slice(0, 8) }}</a
>
+ {{ dataset.id.slice(0, 8) }}
+ </a>
</b-tooltip>
</td>
- <td align>{{ dataset.size }}</td>
+ <td align>{{ dataset.size / 1000 }} {{ $t("dataTypesRepository.table-file-data-size-unit") }}</td>
<td align>{{ formatDate(dataset.params.createdate) }}</td>
<td align>{{ dataset.createuser }}</td>
- <td align>{{ formatDate(dataset.params.publisheddate) }}</td>
- <td align>{{ dataset.publisheduser }}</td>
+ <td align v-if="dataset.params.published">{{ formatDate(dataset.params.publisheddate) }}</td>
+ <td align v-else></td>
+ <td align v-if="dataset.params.published">{{ dataset.publisheduser }}</td>
+ <td align v-else></td>
<td align>
<b-field>
<b-button
@@ -256,7 +257,7 @@
/>
</b-field>
</td>
- <td>
+ <td align>
<b-field>
<b-tooltip :label="$t('dataTypesRepository.table-file-data-delete')" position="is-left">
<b-button
@@ -606,7 +607,7 @@ export default class DataTypesRepositoryView extends Vue {
}
async publish(dataset, pusblished) {
- // TODO : ajout loading en JS
+ // ajout loading en JS
const loadingComponent = this.$buefy.loading.open({
container: document.getElementById("element")
})
@@ -619,6 +620,7 @@ export default class DataTypesRepositoryView extends Vue {
}, requiredAuthorizations);
dataset.params.binaryFiledataset.requiredAuthorizations = requiredAuthorizations;
var fileOrId = new FileOrUUID(dataset.id, dataset.params.binaryFiledataset, pusblished);
+ console.log(dataset)
try {
var uuid = await this.dataService.addData(
this.applicationName,
--
GitLab
From c5a03fd90d69cf992660349f315f338835df3b42 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Thu, 26 Jan 2023 10:04:29 +0100
Subject: [PATCH 2/2] suppression console log et ajout des
internationnalisation
---
ui/src/locales/en.json | 12 +++++++++---
ui/src/locales/fr.json | 4 ++--
ui/src/views/datatype/DataTypesRepositoryView.vue | 1 -
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 4c699b23a..33890910e 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -1,5 +1,6 @@
{
"exceptionMessage": {
+ "undefined": "Unable to read error message : {message}",
"sqlConvertException": "An error in a sql query is served row {locationLineNumber} column {locationColumnNumber}<br/>{message}",
"badStoreValueType": "Failed to get a value for key {referenceDatumKey}. Value type {storeValueType} is not one of the accepted return types: {knownStoreValueType}",
"badCheckerType": "The checker type {checkerType} is not valid. You can use one of these checkers: {knownCheckerType}",
@@ -276,8 +277,10 @@
"submit": "Submit",
"list-file-data": "List of datasets on this repository",
"list-file-data-period": "List of versions for the period",
+ "table-file-data-version": "Version number",
"table-file-data-id": "ID",
- "table-file-data-size": "Size",
+ "table-file-data-size": "File size",
+ "table-file-data-size-unit" : "ko",
"table-file-data-create": "Created on",
"table-file-data-create-by": "Created by :",
"table-file-data-publish": "Published on",
@@ -286,7 +289,9 @@
"table-file-data-action": "Actions",
"table-file-data-delete": "Delete",
"table-file-data-download": "Download",
- "table-file-data-period": "Period"
+ "table-file-data-period": "Period",
+ "version-number": "Version number",
+ "tooltip-jeux de données": "Select a dataset to see the list of corresponding versioned files (revisions)."
},
"dataTypeAuthorizations": {
"add-auhtorization": "Add an authorization",
@@ -330,7 +335,8 @@
"showMore": "Show more...",
"search": "Search...",
"save" : "Save change",
- "add-application-name": "Add an app"
+ "add-application-name": "Add an app",
+ "all-autorisation" : "Check all the rights boxes on the line "
},
"ponctuation": {
"semicolon" : ";",
diff --git a/ui/src/locales/fr.json b/ui/src/locales/fr.json
index 5fde4d7f1..12566e1f7 100644
--- a/ui/src/locales/fr.json
+++ b/ui/src/locales/fr.json
@@ -1,6 +1,6 @@
{
"exceptionMessage": {
- "undefined": "Impossible de lire le message d'erreur {message}",
+ "undefined": "Impossible de lire le message d'erreur : {message}",
"sqlConvertException": "Une erreur dans une requête sql est survenue ligne {locationLineNumber} colonne {locationColumnNumber}<br/>{message}",
"badStoreValueType": "Impossible d'obtenir une valeur pour la clef {referenceDatumKey}. Le type de la valeur {storeValueType} n'est pas l'un des types de retour acceptés : {knownStoreValueType} ",
"badCheckerType": "Le checker de type {checkerType} n'est pas valide. Vous pouvez utiliser l'un de ces checkers : {knownCheckerType} ",
@@ -280,7 +280,7 @@
"table-file-data-version": "N° version",
"table-file-data-id": "ID",
"table-file-data-size": "Taille du fichier",
- "table-file-data-size-unit" : "Ko",
+ "table-file-data-size-unit" : "ko",
"table-file-data-create": "Dernier dépôt",
"table-file-data-create-by": "Dernier dépositaire",
"table-file-data-publish": "Date de publication",
diff --git a/ui/src/views/datatype/DataTypesRepositoryView.vue b/ui/src/views/datatype/DataTypesRepositoryView.vue
index e5ba3ec24..7bbc2effd 100644
--- a/ui/src/views/datatype/DataTypesRepositoryView.vue
+++ b/ui/src/views/datatype/DataTypesRepositoryView.vue
@@ -620,7 +620,6 @@ export default class DataTypesRepositoryView extends Vue {
}, requiredAuthorizations);
dataset.params.binaryFiledataset.requiredAuthorizations = requiredAuthorizations;
var fileOrId = new FileOrUUID(dataset.id, dataset.params.binaryFiledataset, pusblished);
- console.log(dataset)
try {
var uuid = await this.dataService.addData(
this.applicationName,
--
GitLab