From 7214aa7eac57cb58eef50e36257597a3dff20c42 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 15 Oct 2023 21:05:38 +0200 Subject: [PATCH 1/2] fix(markdown): Remove import from skully docs --- markdown/org/docs/designs/skully/en.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/markdown/org/docs/designs/skully/en.md b/markdown/org/docs/designs/skully/en.md index 3f413a0467e..edfd0f5ab03 100644 --- a/markdown/org/docs/designs/skully/en.md +++ b/markdown/org/docs/designs/skully/en.md @@ -2,7 +2,5 @@ title: Skully --- -import { DesignInfo } from 'shared/components/designs/info.mjs' - From 8fe5e66ceabec771617602b610e9afb049b949d9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 15 Oct 2023 21:07:24 +0200 Subject: [PATCH 2/2] chore(backend): Keep tags without translation --- sites/backend/prisma/schema.prisma | 16 +++------------- sites/backend/src/models/curated-set.mjs | 10 +++------- sites/backend/src/models/option-pack.mjs | 10 +++------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/sites/backend/prisma/schema.prisma b/sites/backend/prisma/schema.prisma index 6d2ed90404b..fa09aa98fc8 100644 --- a/sites/backend/prisma/schema.prisma +++ b/sites/backend/prisma/schema.prisma @@ -140,13 +140,8 @@ model CuratedSet { notesFr String @default("") notesNl String @default("") notesUk String @default("") - tagsDe String @default("{}") - tagsEn String @default("{}") - tagsEs String @default("{}") - tagsFr String @default("{}") - tagsNl String @default("{}") - tagsUk String @default("{}") - measies String @default("{}") + tags String @default("{}") + measies String @default("[]") patterns Pattern[] updatedAt DateTime @updatedAt published Boolean @default(false) @@ -169,12 +164,7 @@ model OptionPack { notesFr String @default("") notesNl String @default("") notesUk String @default("") - tagsDe String @default("{}") - tagsEn String @default("{}") - tagsEs String @default("{}") - tagsFr String @default("{}") - tagsNl String @default("{}") - tagsUk String @default("{}") + tags String @default("[]") options String @default("{}") updatedAt DateTime @updatedAt } diff --git a/sites/backend/src/models/curated-set.mjs b/sites/backend/src/models/curated-set.mjs index 6b906825973..b0ed1510cb5 100644 --- a/sites/backend/src/models/curated-set.mjs +++ b/sites/backend/src/models/curated-set.mjs @@ -9,7 +9,7 @@ import { decorateModel } from '../utils/model-decorator.mjs' export function CuratedSetModel(tools) { return decorateModel(this, tools, { name: 'curatedSet', - jsonFields: ['measies', 'tagsDe', 'tagsEn', 'tagsEs', 'tagsFr', 'tagsNl', 'tagsUk'], + jsonFields: ['measies', 'tags'], models: ['confirmation', 'set'], }) } @@ -48,9 +48,8 @@ CuratedSetModel.prototype.guardedCreate = async function ({ body, user }) { const key = field + capitalize(lang) if (body[key] && typeof body[key] === 'string') data[key] = body[key] } - const key = 'tags' + capitalize(lang) - if (body[key] && Array.isArray(body[key])) data[key] = JSON.stringify(body[key]) } + if (body.tags && Array.isArray(body.tags)) data.tags = JSON.stringify(body.tags) /* * Add the (sanitized) measurements if there are any @@ -147,10 +146,7 @@ CuratedSetModel.prototype.allCuratedSets = async function () { * See https://github.com/prisma/prisma/issues/3786 */ asPojo.measies = JSON.parse(asPojo.measies) - for (const lang of this.config.languages) { - const key = `tags${capitalize(lang)}` - asPojo[key] = JSON.parse(asPojo[key] || []) - } + asPojo.tags = JSON.parse(asPojo.tags) list.push(asPojo) } diff --git a/sites/backend/src/models/option-pack.mjs b/sites/backend/src/models/option-pack.mjs index 280408919d0..2e21d7484fe 100644 --- a/sites/backend/src/models/option-pack.mjs +++ b/sites/backend/src/models/option-pack.mjs @@ -9,7 +9,7 @@ import { decorateModel } from '../utils/model-decorator.mjs' export function OptionPackModel(tools) { return decorateModel(this, tools, { name: 'optionPack', - jsonFields: ['options', 'tagsDe', 'tagsEn', 'tagsEs', 'tagsFr', 'tagsNl', 'tagsUk'], + jsonFields: ['options', 'tags'], models: ['confirmation'], }) } @@ -54,9 +54,8 @@ OptionPackModel.prototype.guardedCreate = async function ({ body, user }) { const key = field + capitalize(lang) if (body[key] && typeof body[key] === 'string') data[key] = body[key] } - const key = 'tags' + capitalize(lang) - if (body[key] && Array.isArray(body[key])) data[key] = JSON.stringify(body[key]) } + if (body.tags && Array.isArray(body.tags)) data.tags = JSON.stringify(body.tags) /* * Add the options if there are any @@ -147,10 +146,7 @@ OptionPackModel.prototype.allOptionPacks = async function () { * See https://github.com/prisma/prisma/issues/3786 */ asPojo.options = JSON.parse(asPojo.options) - for (const lang of this.config.languages) { - const key = `tags${capitalize(lang)}` - asPojo[key] = JSON.parse(asPojo[key] || []) - } + asPojo.tags = JSON.parse(asPojo.tags || []) list.push(asPojo) }