From 4078c21dbec89102cb81a5b2f751e3dfae688d95 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Tue, 18 Oct 2022 11:54:35 +0200
Subject: [PATCH 1/3] ajout tooltip et traduction
---
ui/src/components/common/CollapsibleTree.vue | 15 +++++++++++----
ui/src/locales/en.json | 6 ++++--
ui/src/locales/fr.json | 6 ++++--
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index 5a555b564..dcbeda7c7 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -38,12 +38,19 @@
@keypress.enter="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
tabindex="0"
>
- {{ option.localName || option.label }}
+ <b-tooltip v-if="option.withSynthesis" :label="$t('dataTypesManagement.tooltip_show_authorization')"
+ position="is-right">
+ {{ option.localName || option.label }}
+ </b-tooltip>
+ <b-tooltip v-else :label="$t('referencesManagement.tooltip_delete_ref')">
+ {{ option.localName || option.label }}
+ </b-tooltip>
+<!-- <p v-else > {{ option.localName || option.label }} </p>-->
</div>
- <span class="file-name" v-if="refFile">
+<!-- <span class="file-name" v-if="refFile">
{{ refFile.name }}
- </span>
- <span class="file-name" v-else-if="lineCount > 0">
+ </span>-->
+ <span class="file-name" v-if="lineCount > 0">
{{ $t("validation.count-line") }} {{ lineCount }}
</span>
<span v-else-if="!option.synthesisMinMax" class="nodata has-text-danger">
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 1b5e45f64..8a37141c6 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -243,7 +243,8 @@
"download":"Download",
"delete":"Delete",
"references":"References",
- "data":"Data"
+ "data":"Data",
+ "tooltip_delete_ref": "Deleted reference"
},
"dataTypesManagement": {
"no_authorization": "No authorization management for {localName}",
@@ -262,7 +263,8 @@
"title-modal-date": "Choice of date range",
"manage-datasets": "Manage datasets",
"accepted": "Accepted",
- "refuse": "Refuse"
+ "refuse": "Refuse",
+ "tooltip_show_authorization": "Consult authorizations"
},
"dataTypesRepository": {
"card-title-upload-file": "Drop a version on this dataset",
diff --git a/ui/src/locales/fr.json b/ui/src/locales/fr.json
index be1eca68a..bd167a14c 100644
--- a/ui/src/locales/fr.json
+++ b/ui/src/locales/fr.json
@@ -248,7 +248,8 @@
"download": "Télécharger",
"delete": "Supprimer",
"references": "Référentiels",
- "data": "Données"
+ "data": "Données",
+ "tooltip_delete_ref": "Supprimer la référence"
},
"dataTypesManagement": {
"no_authorization": "Il n'y a pas de gestion des autorisations pour {localName}",
@@ -267,7 +268,8 @@
"title-modal-date": "Choix de l'interval de date",
"manage-datasets": "Gérer les jeux de données",
"accepted": "Accepté",
- "refuse": "Refusé"
+ "refuse": "Refusé",
+ "tooltip_show_authorization": "Consulter les autorisations"
},
"dataTypesRepository": {
"card-title-upload-file": "Déposer une version pour ce jeux de données",
--
GitLab
From e5378d5124666662d2866117f46633e0fa85bdd8 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Tue, 18 Oct 2022 17:45:59 +0200
Subject: [PATCH 2/3] modif nom variable
---
ui/src/components/common/CollapsibleTree.vue | 2 +-
ui/src/views/datatype/DataTypesManagementView.vue | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index dcbeda7c7..c80989ed3 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -38,7 +38,7 @@
@keypress.enter="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
tabindex="0"
>
- <b-tooltip v-if="option.withSynthesis" :label="$t('dataTypesManagement.tooltip_show_authorization')"
+ <b-tooltip v-if="option.withTooltip" :label="$t('dataTypesManagement.tooltip_show_authorization')"
position="is-right">
{{ option.localName || option.label }}
</b-tooltip>
diff --git a/ui/src/views/datatype/DataTypesManagementView.vue b/ui/src/views/datatype/DataTypesManagementView.vue
index 2efe3d88b..61a254720 100644
--- a/ui/src/views/datatype/DataTypesManagementView.vue
+++ b/ui/src/views/datatype/DataTypesManagementView.vue
@@ -39,6 +39,7 @@
synthesis: synthesis[data.id],
synthesisMinMax: synthesisMinMax[data.id],
withSynthesis: true,
+ withTooltip: true,
}"
:level="0"
:on-click-label-cb="(event, label) => openDataTypeCb(event, label)"
--
GitLab
From 1bd36af5a7488a3090f4859fcb6fb9f2ec466b34 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 19 Oct 2022 11:47:50 +0200
Subject: [PATCH 3/3] pour que tous le monde soit content =D
---
ui/src/components/common/CollapsibleTree.vue | 58 +++++++++++---------
ui/src/locales/en.json | 5 +-
ui/src/locales/fr.json | 5 +-
ui/src/main.js | 4 +-
4 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index c80989ed3..cd6ce1940 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -15,42 +15,46 @@
class="CollapsibleTree-header-infos column"
:style="`transform:translate(${level * 50}px);`"
>
- <FontAwesomeIcon
- v-if="option.children && option.children.length !== 0"
- :icon="displayChildren ? 'caret-down' : 'caret-right'"
- class="clickable mr-3"
- tabindex="0"
- />
-
<b-checkbox
- v-if="withRadios"
- v-model="innerOptionChecked"
- :name="radioName"
- @click.native="stopPropagation"
- :native-value="option.id"
+ v-if="withRadios"
+ v-model="innerOptionChecked"
+ :name="radioName"
+ @click.native="stopPropagation"
+ :native-value="option.id"
>
{{ option.localName || option.label }}
</b-checkbox>
<div
- v-else
- :class="onClickLabelCb ? 'link' : ''"
- @click="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
- @keypress.enter="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
- tabindex="0"
+ v-else
+ :class="onClickLabelCb ? 'link' : ''"
+ @click="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
+ @keypress.enter="(event) => onClickLabelCb && onClickLabelCb(event, option.label)"
+ tabindex="0"
>
- <b-tooltip v-if="option.withTooltip" :label="$t('dataTypesManagement.tooltip_show_authorization')"
- position="is-right">
- {{ option.localName || option.label }}
+ <b-tooltip type="is-primary is-light"
+ :label="$t('dataTypesManagement.tooltip_show_secondary_menu')">
+ <b-button
+ class="is-small"
+ tabindex="0"
+ type="is-primary"
+ outlined
+ style="margin: 10px;"
+ >
+ <b-icon icon="ellipsis-h" ></b-icon>
+ </b-button>
</b-tooltip>
- <b-tooltip v-else :label="$t('referencesManagement.tooltip_delete_ref')">
- {{ option.localName || option.label }}
- </b-tooltip>
-<!-- <p v-else > {{ option.localName || option.label }} </p>-->
</div>
-<!-- <span class="file-name" v-if="refFile">
+ <FontAwesomeIcon
+ v-if="option.children && option.children.length !== 0"
+ :icon="displayChildren ? 'caret-down' : 'caret-right'"
+ class="clickable mr-3"
+ tabindex="0"
+ />
+ <p > {{ option.localName || option.label }} </p>
+ <span class="file-name" v-if="refFile">
{{ refFile.name }}
- </span>-->
- <span class="file-name" v-if="lineCount > 0">
+ </span>
+ <span class="file-name" v-else-if="lineCount > 0">
{{ $t("validation.count-line") }} {{ lineCount }}
</span>
<span v-else-if="!option.synthesisMinMax" class="nodata has-text-danger">
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 8a37141c6..68bdd27f3 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -243,8 +243,7 @@
"download":"Download",
"delete":"Delete",
"references":"References",
- "data":"Data",
- "tooltip_delete_ref": "Deleted reference"
+ "data":"Data"
},
"dataTypesManagement": {
"no_authorization": "No authorization management for {localName}",
@@ -264,7 +263,7 @@
"manage-datasets": "Manage datasets",
"accepted": "Accepted",
"refuse": "Refuse",
- "tooltip_show_authorization": "Consult authorizations"
+ "tooltip_show_secondary_menu": "Open secondary menu"
},
"dataTypesRepository": {
"card-title-upload-file": "Drop a version on this dataset",
diff --git a/ui/src/locales/fr.json b/ui/src/locales/fr.json
index bd167a14c..e71b0832f 100644
--- a/ui/src/locales/fr.json
+++ b/ui/src/locales/fr.json
@@ -248,8 +248,7 @@
"download": "Télécharger",
"delete": "Supprimer",
"references": "Référentiels",
- "data": "Données",
- "tooltip_delete_ref": "Supprimer la référence"
+ "data": "Données"
},
"dataTypesManagement": {
"no_authorization": "Il n'y a pas de gestion des autorisations pour {localName}",
@@ -269,7 +268,7 @@
"manage-datasets": "Gérer les jeux de données",
"accepted": "Accepté",
"refuse": "Refusé",
- "tooltip_show_authorization": "Consulter les autorisations"
+ "tooltip_show_secondary_menu": "Ouvrir le menu secondaire"
},
"dataTypesRepository": {
"card-title-upload-file": "Déposer une version pour ce jeux de données",
diff --git a/ui/src/main.js b/ui/src/main.js
index b91b708ab..92bbdb417 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -59,6 +59,7 @@ import {
faUserPlus,
faVial,
faWrench,
+ faEllipsisH,
} from "@fortawesome/free-solid-svg-icons";
import {
faCalendar as farCalendar,
@@ -137,7 +138,8 @@ library.add(
faTimesCircle,
faEdit,
faInfo,
- faQuestion
+ faQuestion,
+ faEllipsisH
);
Vue.component("vue-fontawesome", FontAwesomeIcon);
--
GitLab