From cef97454906022322d290d954b8de089ef9c4f37 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 27 Nov 2024 11:10:48 +0100
Subject: [PATCH 1/2] =?UTF-8?q?retrait=20des=20log=20oubli=C3=A9=20r=C3=A9?=
=?UTF-8?q?paration=20de=20la=20fonctionnalit=C3=A9=20de=20filtre=20avec?=
=?UTF-8?q?=20les=20tags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/composable/application/synthesis.js | 1 -
src/services/InternationalisationService.js | 1 -
src/services/TagService.js | 49 ++++++++-------------
src/views/data/DataTableView.vue | 12 ++++-
src/views/data/DatasManagementView.vue | 7 ++-
5 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/src/composable/application/synthesis.js b/src/composable/application/synthesis.js
index 9ebee4b9d..3d240c460 100644
--- a/src/composable/application/synthesis.js
+++ b/src/composable/application/synthesis.js
@@ -1,5 +1,4 @@
export function lineCountSynthesis(referenceSynthesis, ref) {
- console.log("lineCountSynthesis", referenceSynthesis);
if (referenceSynthesis) {
for (let i = 0; i <= referenceSynthesis.length - 1; i++) {
if (referenceSynthesis[i].referenceType === ref.label) {
diff --git a/src/services/InternationalisationService.js b/src/services/InternationalisationService.js
index fad2be8f1..fb8312401 100644
--- a/src/services/InternationalisationService.js
+++ b/src/services/InternationalisationService.js
@@ -249,7 +249,6 @@ export class InternationalisationService extends Fetcher {
}
treeReferenceName(application) {
- console.log("application in treeReferenceName", application);
if (application.references) {
for (let referenceName in application.references) {
application.references[referenceName] = new Node(
diff --git a/src/services/TagService.js b/src/services/TagService.js
index 1126c92e9..0c3df8848 100644
--- a/src/services/TagService.js
+++ b/src/services/TagService.js
@@ -29,23 +29,23 @@ export class TagService extends Fetcher {
data = { ...data, isInterval: true, intervalValues: {}, simpleValue: "" };
if (data) {
return data.tags.some((tag) => {
- if (
- data.tags.length === 1 &&
- (tag.tagDefinition === Tag.ORDER_TAG || tag.type === Tag.ORDER_TAG) &&
- tag.localName !== Tag.HIDDEN_TAG
- ) {
- return true;
- } else if (
- data.tags.length === 1 &&
- (tag.tagDefinition === Tag.NO_TAG || tag.type === Tag.NO_TAG) &&
- tag.localName !== Tag.HIDDEN_TAG
- ) {
- return true;
- } else {
- return selectedTags.some(
- (selectedTag) =>
- selectedTag.tagName === tag.tagName && tag.localName !== Tag.HIDDEN_TAG
- );
+ if (tag.selected !== false || (tag.localName !== Tag.HIDDEN_TAG || tag.type !== Tag.HIDDEN_TAG )) {
+ if (
+ data.tags.length === 1 &&
+ (tag.tagDefinition === Tag.ORDER_TAG || tag.type === Tag.ORDER_TAG)
+ ) {
+ return true;
+ } else if (
+ data.tags.length === 1 &&
+ (tag.tagDefinition === Tag.NO_TAG || tag.type === Tag.NO_TAG)
+ ) {
+ return true;
+ } else {
+ return selectedTags.some(
+ (selectedTag) =>
+ selectedTag.tagName === tag.tagName
+ );
+ }
}
});
}
@@ -62,7 +62,7 @@ export class TagService extends Fetcher {
}
return -1;
});
- if (!tags?.value?.length) {
+ if (!tags || !Object.keys(tags || {}).length) {
return datas;
}
return this.orderDatasTobeShownWithTag(tags, datas);
@@ -107,17 +107,4 @@ export class TagService extends Fetcher {
document.getElementById("tagsCollapse").className = "column";
}
}
-
- filterTags(columnsComponentsToBeShown) {
- let paramsSelect = [];
- for (let i = 0; i < columnsComponentsToBeShown.length; i++) {
- if (columnsComponentsToBeShown[i].variable && columnsComponentsToBeShown[i].component) {
- paramsSelect.push({
- variable: columnsComponentsToBeShown[i].variable,
- component: columnsComponentsToBeShown[i].component,
- });
- }
- }
- return paramsSelect;
- }
}
diff --git a/src/views/data/DataTableView.vue b/src/views/data/DataTableView.vue
index 1d9fbfdb2..a6c328c73 100644
--- a/src/views/data/DataTableView.vue
+++ b/src/views/data/DataTableView.vue
@@ -11,6 +11,7 @@
</h1>
<div id="tagsCollapse" class="column">
<TagsCollapse
+ v-if="hasTags"
:tags="tags"
@change:tag="changeTagSelected($event, 'changeTagSelected')"
@change:allTags="changeAllValueTags($event)"
@@ -201,6 +202,7 @@ import { lineCountSynthesis } from "@/composable/application/synthesis";
import { dataLoader } from "@/composable/data/dataLoader";
import { patternCheckerDateRef } from "@/composable/application/DatePattern";
import DatasPatternLink from "@/components/datas/DatasPatternLink.vue";
+import { Tag } from "@/model/application/Tag";
export default {
name: "DataTableView",
@@ -243,7 +245,6 @@ export default {
const { shallowRefArray: referenceTypeForReferencingColumns } = useArray();
const { reactiveObject: referencesDynamic, doChangeObject: changeReferencesDynamic } =
useObject();
- const hasTags = useBoolean(false).refBoolean;
const tableHeight = computed(() => {
if (rows.value.length < params.limit) {
return 66 * (rows.value.length + 1) + "px";
@@ -268,9 +269,15 @@ export default {
}
});
+ const hasTags = useBoolean(false).refBoolean;
const changeTags = function (tagsToChange) {
_changeTags({ ...tagsToChange });
- hasTags.value = tags && Object.keys(tags || {}).length;
+ hasTags.value =
+ tags.value &&
+ Object.keys(tags.value || {}).length !== 0 &&
+ !(
+ Object.keys(tags.value || {}).length === 1 && Object.keys(tags.value).includes(Tag.NO_TAG_NAME)
+ );
};
const totalRows = ref(0);
@@ -619,6 +626,7 @@ export default {
filters,
MANY,
ONE,
+ hasTags,
getRefColumnId,
lineCountSynthesis,
getColumnNameView,
diff --git a/src/views/data/DatasManagementView.vue b/src/views/data/DatasManagementView.vue
index 3251ae3ff..e71611387 100644
--- a/src/views/data/DatasManagementView.vue
+++ b/src/views/data/DatasManagementView.vue
@@ -103,6 +103,7 @@ import { buildTags } from "@/composable/application/tags";
import { lineCountSynthesis } from "@/composable/application/synthesis";
import LoadingAnimate from "@/components/common/LoadingAnimate.vue";
import ShowErrors from "@/components/application/ShowErrors.vue";
+import { Tag } from "@/model/application/Tag";
export default {
name: "DatasManagementView",
@@ -143,7 +144,10 @@ export default {
const hasTags = useBoolean(false).refBoolean;
const changeTags = function (tagsToChange) {
_changeTags({ ...tagsToChange });
- hasTags.value = tags && Object.keys(tags || {}).length;
+ hasTags.value =
+ tags &&
+ Object.keys(tags || {}).length !== 0 &&
+ !(Object.keys(tags || {}).length === 1 && Object.keys(tags).includes(Tag.NO_TAG_NAME));
changeDatasToBeShown(services.tagService.toBeShown(tags, datas.value));
};
@@ -237,7 +241,6 @@ export default {
addAuthorizationToData
)
);
- console.log("data", datas.value);
}
} catch (error) {
services.alertService.toastServerError();
--
GitLab
From 7bd9af3ffa52c3f4fdaf230da0d4611fd68e19ef Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 27 Nov 2024 11:21:03 +0100
Subject: [PATCH 2/2] esLint
---
src/services/TagService.js | 6 +++++-
src/views/data/DataTableView.vue | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/services/TagService.js b/src/services/TagService.js
index 0c3df8848..deaaa608b 100644
--- a/src/services/TagService.js
+++ b/src/services/TagService.js
@@ -29,7 +29,11 @@ export class TagService extends Fetcher {
data = { ...data, isInterval: true, intervalValues: {}, simpleValue: "" };
if (data) {
return data.tags.some((tag) => {
- if (tag.selected !== false || (tag.localName !== Tag.HIDDEN_TAG || tag.type !== Tag.HIDDEN_TAG )) {
+ if (
+ tag.selected !== false ||
+ tag.localName !== Tag.HIDDEN_TAG ||
+ tag.type !== Tag.HIDDEN_TAG
+ ) {
if (
data.tags.length === 1 &&
(tag.tagDefinition === Tag.ORDER_TAG || tag.type === Tag.ORDER_TAG)
diff --git a/src/views/data/DataTableView.vue b/src/views/data/DataTableView.vue
index 0ebe87b0a..cfe0c6242 100644
--- a/src/views/data/DataTableView.vue
+++ b/src/views/data/DataTableView.vue
@@ -276,7 +276,8 @@ export default {
tags.value &&
Object.keys(tags.value || {}).length !== 0 &&
!(
- Object.keys(tags.value || {}).length === 1 && Object.keys(tags.value).includes(Tag.NO_TAG_NAME)
+ Object.keys(tags.value || {}).length === 1 &&
+ Object.keys(tags.value).includes(Tag.NO_TAG_NAME)
);
};
const totalRows = ref(0);
--
GitLab