diff --git a/ui/src/components/references/ReferencesLink.vue b/ui/src/components/references/ReferencesLink.vue index 0b91e668f50d9f0ae97e80ab5354aeb765df46ea..bbbaa3b2f99d3bc242936ed42447cab756c5d5e6 100644 --- a/ui/src/components/references/ReferencesLink.vue +++ b/ui/src/components/references/ReferencesLink.vue @@ -59,6 +59,7 @@ " :value="props.row.valeur" ></ReferencesLink> + <p v-else-if="column.field === 'colonne'">{{ getColumnNameView(props.row[column.field], application, referenceType) }}</p> <p v-else>{{ props.row[column.field] }}</p> </span> </b-table-column> @@ -79,10 +80,11 @@ import useBoolean from "@/composable/components/boolean"; import useObject from "@/composable/components/object"; import app from "@/main"; import { datePatternLang } from "../../composable/application/DatePattern"; +import {getColumnNameView} from "../../composable/references/referenceLoader"; export default { name: "ReferencesLink", - methods: { datePatternLang }, + methods: {getColumnNameView, datePatternLang }, emits: ["changedRefValues"], components: { LoadingAnimate, ReferencesManyLink, ReferencesDynamicLink }, props: { diff --git a/ui/src/composable/references/referenceLoader.js b/ui/src/composable/references/referenceLoader.js index 3bf3e818546b706cc086268ba8bba935cd966151..7c370a25d2fcd6254c691a98f731a35e121f130e 100644 --- a/ui/src/composable/references/referenceLoader.js +++ b/ui/src/composable/references/referenceLoader.js @@ -49,3 +49,22 @@ export function referenceOrderTag(components) { ), ]; } + +export function getColumnNameView(columnId, application, refId, column) { + if (application.data[refId].componentDescriptions[columnId]) { + let importHeader = application.data[refId].componentDescriptions[columnId].importHeader; + let exportHeader = + column ? + column.exportHeader : + application.data[refId].componentDescriptions[columnId].exportHeaderName; + if (exportHeader !== columnId) { + return exportHeader; + } else if (importHeader !== undefined && importHeader !== columnId) { + return importHeader; + } else { + return columnId; + } + } else { + return columnId; + } +} diff --git a/ui/src/views/references/ReferenceTableView.vue b/ui/src/views/references/ReferenceTableView.vue index 080cde01b5a3842f720cfa1841ae63cb4c6735d9..20eda66eac4e3a1580eaed5b3b4243d267e3d915 100644 --- a/ui/src/views/references/ReferenceTableView.vue +++ b/ui/src/views/references/ReferenceTableView.vue @@ -62,7 +62,6 @@ v-for="column in columnsToBeShown" :key="column.id" :field="column.id" - :label="column.title" sortable > <template v-slot:header> @@ -72,10 +71,10 @@ :tags-column="Object.keys(tags).length !== 0 ? tags : {}" > </TagsInfos> - {{ column.exportHeader || column.id }} + {{ getColumnNameView(column.id, application, refId, column) }} </div> <div v-else class="column"> - {{ column.exportHeader || column.id }} + {{ getColumnNameView(column.id, application, refId, column) }} </div> </template> <template v-slot="props"> @@ -101,7 +100,7 @@ v-else-if="column.id !== '#'" :application="application" :column-id="getRefColumnId(props.row, column)" - :column-title="column.title" + :column-title="getColumnNameView(column.id, application, refId)" :component="props.row" :loaded-references-by-key="{}" :pattern-checker-date="patternCheckerDateRef(application, column.title, refId)" @@ -171,12 +170,12 @@ import { init } from "@cypress/webpack-dev-server/dist/aut-runner"; import { patternCheckerDateRef } from "@/composable/application/DatePattern"; import TagsInfos from "@/components/common/TagsInfos.vue"; import { Component } from "@/model/application/Component"; -import { referenceLoader, referenceOrderTag } from "@/composable/references/referenceLoader"; +import {getColumnNameView, referenceLoader, referenceOrderTag} from "@/composable/references/referenceLoader"; import { lineCountSynthesis } from "@/composable/application/synthesis"; export default { name: "ReferenceTableView", - methods: { patternCheckerDateRef, init }, + methods: {getColumnNameView, patternCheckerDateRef, init }, props: { applicationName: String, refId: String, @@ -259,7 +258,7 @@ export default { () => app.$router.push(`/applications`) ), new SubMenuPath( - reference.value.label ? reference.value.label : props.refId, + application.localRefName ? application.localRefName : props.refId, () => app.$router.push(`/applications/${props.applicationName}/references/${props.refId}`), () => app.$router.push(`/applications/${props.applicationName}/${dataIsType}`)