From 19f37aa23bc8b686c1930304526c1fc540ee18ea Mon Sep 17 00:00:00 2001 From: axolotle Date: Wed, 10 Mar 2021 17:32:48 +0100 Subject: [PATCH] renamed text_en_rebonds, text_de_depart et text_produits to siblings, parents and children --- src/api/fragments/TextTreeFields.gql | 4 +-- src/api/fragments/TextrefTreeFields.gql | 4 +-- src/api/queries/TextCard.gql | 4 +-- src/api/queries/TextdepartRecursive.gql | 6 ++--- src/components/text/TextCard.vue | 24 ++++++++--------- src/helpers/d3Data.js | 10 ++++---- src/messages/fr.json | 2 +- src/pages/Library.vue | 34 ++++++++++++------------- src/store/modules/texts.js | 2 +- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/api/fragments/TextTreeFields.gql b/src/api/fragments/TextTreeFields.gql index afe5897..0dc2054 100644 --- a/src/api/fragments/TextTreeFields.gql +++ b/src/api/fragments/TextTreeFields.gql @@ -1,9 +1,9 @@ fragment TextTreeFields on TextInterface { id title - familles { + families: familles { id name } - __typename + type: __typename } diff --git a/src/api/fragments/TextrefTreeFields.gql b/src/api/fragments/TextrefTreeFields.gql index 0a0f774..eae1e5e 100644 --- a/src/api/fragments/TextrefTreeFields.gql +++ b/src/api/fragments/TextrefTreeFields.gql @@ -2,9 +2,9 @@ fragment TextrefTreeFields on Textref { ...TextTreeFields - text_produits{ + children: text_produits { ...TextTreeFields - text_de_depart { + parents: text_de_depart { ...TextTreeFields } } diff --git a/src/api/queries/TextCard.gql b/src/api/queries/TextCard.gql index 5d51b19..7fe4765 100644 --- a/src/api/queries/TextCard.gql +++ b/src/api/queries/TextCard.gql @@ -5,10 +5,10 @@ query TextRef ($id: Int!) { ...TextCardFields ... on Textref { - prods: text_produits { + children: text_produits { id } - bounces: text_en_rebond { + siblings: text_en_rebond { id title authors: auteurs { diff --git a/src/api/queries/TextdepartRecursive.gql b/src/api/queries/TextdepartRecursive.gql index 517edf6..9363eb1 100644 --- a/src/api/queries/TextdepartRecursive.gql +++ b/src/api/queries/TextdepartRecursive.gql @@ -3,11 +3,11 @@ query TextdepartRecursive($id: Int!) { textref(id: $id) { ...TextrefTreeFields - text_en_rebond { + siblings: text_en_rebond { ...TextrefTreeFields - text_en_rebond { + siblings: text_en_rebond { ...TextrefTreeFields - text_en_rebond { + siblings: text_en_rebond { ...TextrefTreeFields } } diff --git a/src/components/text/TextCard.vue b/src/components/text/TextCard.vue index eed42d3..282f634 100644 --- a/src/components/text/TextCard.vue +++ b/src/components/text/TextCard.vue @@ -16,10 +16,10 @@ - {{ prod.id }} + {{ child.id }} @@ -39,20 +39,20 @@ - {{ $t('bounce_texts') }} + {{ $t('siblings') }} -
+
- {{ bounce.authors | list }}, - {{ bounce.title }}, - {{ bounce.edition }} + {{ sibling.authors | list }}, + {{ sibling.title }}, + {{ sibling.edition }}
diff --git a/src/helpers/d3Data.js b/src/helpers/d3Data.js index a18bb53..fabee37 100644 --- a/src/helpers/d3Data.js +++ b/src/helpers/d3Data.js @@ -8,7 +8,7 @@ function flatten (arr, accumulator = []) { } function getLinked (text) { - const types = ['text_en_rebond', 'text_produits', 'text_de_depart'] + const types = ['siblings', 'children', 'parents'] return types.reduce((acc, type) => { // Handle `null` and `undefined` return text[type] ? [...acc, ...text[type]] : acc @@ -29,8 +29,8 @@ export function toSingleManyData (rawData) { const links = h.links() nodes.forEach(node => { Object.assign(node.data, { - type: node.data.__typename.toLowerCase(), - class: 'family-' + node.data.familles[0].id + type: node.data.type.toLowerCase(), + class: 'family-' + node.data.families[0].id }) }) return { nodes, links } @@ -73,8 +73,8 @@ export function toManyManyData (rawData) { id: data.id, data: { ...data, - type: data.__typename.toLowerCase(), - class: 'family-' + data.familles[0].id + type: data.type.toLowerCase(), + class: 'family-' + data.families[0].id } } }) diff --git a/src/messages/fr.json b/src/messages/fr.json index 5a9ecd1..4f0dd92 100644 --- a/src/messages/fr.json +++ b/src/messages/fr.json @@ -9,5 +9,5 @@ "gallery": "Créations numériques", "blog": "Blog" }, - "bounce_texts": "Textes rebonds" + "siblings": "Textes rebonds" } diff --git a/src/pages/Library.vue b/src/pages/Library.vue index e6d18a6..6e3ff11 100644 --- a/src/pages/Library.vue +++ b/src/pages/Library.vue @@ -4,13 +4,13 @@ -
- +
+
@@ -38,36 +38,36 @@ export default { }, computed: { - groups () { + parents () { return this.texts.map(text => { - const [id, ...prod] = text - return { id, prod } + const [id, ...children] = text + return { id, children } }) } }, methods: { - openText (group, id) { - if (group.prod.includes(id)) return - group.prod.push(id) - this.updateQuery(this.groups) + openText (parent, id) { + if (parent.children.includes(id)) return + parent.children.push(id) + this.updateQuery(this.parents) }, - closeText (group, id) { + closeText (parent, id) { if (!id) { - this.updateQuery(this.groups.filter(grp => grp !== group)) + this.updateQuery(this.parents.filter(p => p !== parent)) } else { - group.prod = group.prod.filter(id_ => id_ !== id) - this.updateQuery(this.groups) + parent.children = parent.children.filter(id_ => id_ !== id) + this.updateQuery(this.parents) } }, - updateQuery (groups) { + updateQuery (parents) { // Update the route's query (will not reload the page) and let vue determine what changed. this.$router.push({ query: { mode: this.mode, - texts: groups.map(grp => [grp.id, ...grp.prod]) + texts: parents.map(parent => [parent.id, ...parent.children]) } }) } diff --git a/src/store/modules/texts.js b/src/store/modules/texts.js index 89aa7f2..e3c2918 100644 --- a/src/store/modules/texts.js +++ b/src/store/modules/texts.js @@ -39,7 +39,7 @@ export default { function formatQuery (str, depth) { if (depth > 0) { return formatQuery( - str.replace('INPUT', '...TextrefTreeFields\ntext_en_rebond {\nINPUT\n}'), + str.replace('INPUT', '...TextrefTreeFields\nsiblings: text_en_rebond {\nINPUT\n}'), --depth ) } else {