Replace entry with artifact and add entity

This commit is contained in:
2022-01-05 03:04:43 +02:00
parent e22f85a1aa
commit 7be5200094
28 changed files with 560 additions and 523 deletions

View File

@@ -7,14 +7,14 @@ module.exports = function (options) {
router.route('/:id')
.get(function(request, response, next) {
db.TranslationEntryVersion.findByPk(request.params.id, {
db.TranslationArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.TranslationEntryVersion.EntryVersion,
association: db.TranslationArtifactVersion.ArtifactVersion,
required: true,
include: [
{
association: db.EntryVersion.Chapters,
association: db.ArtifactVersion.Chapters,
required: true,
limit: 1,
// TODO: Order by chapter index
@@ -22,9 +22,9 @@ module.exports = function (options) {
]
}
]
}).then(translationEntryVersion => {
if (translationEntryVersion) {
response.redirect(`/translate/${translationEntryVersion.id}/chapter/${translationEntryVersion.entryVersion.chapters[0].id}`)
}).then(translationArtifactVersion => {
if (translationArtifactVersion) {
response.redirect(`/translate/${translationArtifactVersion.id}/chapter/${translationArtifactVersion.artifactVersion.chapters[0].id}`)
} else {
next()
}
@@ -44,21 +44,21 @@ module.exports = function (options) {
]
},
{
association: db.Chapter.EntryVersion,
association: db.Chapter.ArtifactVersion,
required: true,
include: [
{
association: db.EntryVersion.TranslationEntryVersions,
association: db.ArtifactVersion.TranslationArtifactVersions,
required: true,
where: {
id: request.params.id
}
},
{
association: db.EntryVersion.Entry,
association: db.ArtifactVersion.Artifact,
include: [
{
association: db.Entry.Dialect
association: db.Artifact.Dialect
}
]
}
@@ -104,21 +104,21 @@ module.exports = function (options) {
required: true,
include: [
{
association: db.Chapter.EntryVersion,
association: db.Chapter.ArtifactVersion,
required: true,
include: [
{
association: db.EntryVersion.TranslationEntryVersions,
association: db.ArtifactVersion.TranslationArtifactVersions,
required: true,
where: {
id: request.params.id
}
},
{
association: db.EntryVersion.Entry,
association: db.ArtifactVersion.Artifact,
include: [
{
association: db.Entry.Dialect
association: db.Artifact.Dialect
}
]
}
@@ -133,7 +133,7 @@ module.exports = function (options) {
if (chunk) {
response.display("translate-chunk", {
user: request.user,
pageTitle: `Translate ${chunk.chapter.entryVersion.entry.name}`,
pageTitle: `Translate ${chunk.chapter.artifactVersion.artifact.name}`,
chunk: chunk,
previousChunk: chunks.find(chunk => chunk.index == previousIndex),
nextChunk: chunks.find(chunk => chunk.index == nextIndex)
@@ -164,21 +164,21 @@ module.exports = function (options) {
required: true,
include: [
{
association: db.Chapter.EntryVersion,
association: db.Chapter.ArtifactVersion,
required: true,
include: [
{
association: db.EntryVersion.TranslationEntryVersions,
association: db.ArtifactVersion.TranslationArtifactVersions,
required: true,
where: {
id: request.params.id
}
},
{
association: db.EntryVersion.Entry,
association: db.ArtifactVersion.Artifact,
include: [
{
association: db.Entry.Dialect
association: db.Artifact.Dialect
}
]
}
@@ -196,7 +196,7 @@ module.exports = function (options) {
translation = await db.Translation.create({
chunkId: chunk.id,
text: request.body.translatedText,
translationEntryVersionId: request.params.id
translationArtifactVersionId: request.params.id
})
}
response.redirect(`/translate/${request.params.id}/chapter/${request.params.chapterId}/t/${Number(request.params.chunkIndex)+1}`)
@@ -210,14 +210,14 @@ module.exports = function (options) {
router.route('/:id/back')
.post(function(request, response, next) {
db.TranslationEntryVersion.findByPk(request.params.id, {
db.TranslationArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.TranslationEntryVersion.EntryVersion,
association: db.TranslationArtifactVersion.ArtifactVersion,
required: true,
include: [
{
association: db.EntryVersion.Chapters,
association: db.ArtifactVersion.Chapters,
required: true,
include: [
{
@@ -234,31 +234,31 @@ module.exports = function (options) {
]
},
{
association: db.EntryVersion.Entry,
association: db.ArtifactVersion.Artifact,
include: [
{
association: db.Entry.Dialect
association: db.Artifact.Dialect
}
]
}
]
}
]
}).then((translationEntryVersion) => {
if (translationEntryVersion) {
}).then((translationArtifactVersion) => {
if (translationArtifactVersion) {
// TODO: Create a backTranslation...
backTranslatedEntry = {}
backTranslatedArtifact = {}
return db.BackTranslation.create({
translationEntryVersionId: translationEntryVersion.id,
entry: {
name: translationEntryVersion.name + translationEntryVersion.entryVersion.entry.name,
translationArtifactVersionId: translationArtifactVersion.id,
artifact: {
name: translationArtifactVersion.name + translationArtifactVersion.artifactVersion.artifact.name,
url: `/translate/${request.params.id}`,
dialectId: translationEntryVersion.dialectId,
dialectId: translationArtifactVersion.dialectId,
licenseId: "copyright", // Should be closed because it's a back translation not meant to be published
entryVersions: [
artifactVersions: [
{
tag: translationEntryVersion.entryVersion.tag,
chapters: translationEntryVersion.entryVersion.chapters.map(chapter => {
tag: translationArtifactVersion.artifactVersion.tag,
chapters: translationArtifactVersion.artifactVersion.chapters.map(chapter => {
return {
name: chapter.chunks[0].translation.text, // TODO: This isn't important...
chunks: chapter.chunks.map(chunk => {
@@ -269,10 +269,10 @@ module.exports = function (options) {
})
}
}),
translationEntryVersions: [
translationArtifactVersions: [
{
dialectId: translationEntryVersion.entryVersion.entry.dialect.id,
name: translationEntryVersion.entryVersion.entry.dialect.name
dialectId: translationArtifactVersion.artifactVersion.artifact.dialect.id,
name: translationArtifactVersion.artifactVersion.artifact.dialect.name
}
]
}
@@ -281,13 +281,13 @@ module.exports = function (options) {
}, {
include: [
{
association: db.BackTranslation.Entry,
association: db.BackTranslation.Artifact,
include: [
{
association: db.Entry.EntryVersions,
association: db.Artifact.ArtifactVersions,
include: [
{
association: db.EntryVersion.Chapters,
association: db.ArtifactVersion.Chapters,
include: [
{
association: db.Chapter.Chunks
@@ -295,7 +295,7 @@ module.exports = function (options) {
]
},
{
association: db.EntryVersion.TranslationEntryVersions
association: db.ArtifactVersion.TranslationArtifactVersions
}
]
}
@@ -308,7 +308,7 @@ module.exports = function (options) {
}
}).then(backTranslation => {
if (backTranslation) {
response.redirect(`/library/${backTranslation.entryId}`)
response.redirect(`/library/${backTranslation.artifactId}`)
} else {
// TODO: Let user know we cannot back translate
response.redirect(`/translate/${request.params.id}`)
@@ -320,25 +320,25 @@ module.exports = function (options) {
router.route('/:id/campaign')
.get(function(request, response, next) {
db.TranslationEntryVersion.findByPk(request.params.id, {
db.TranslationArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.TranslationEntryVersion.TranslationEntryVersionCampaigns,
association: db.TranslationArtifactVersion.TranslationArtifactVersionCampaigns,
required: true,
include: [
{
association: db.TranslationEntryVersionCampaign.Campaign,
association: db.TranslationArtifactVersionCampaign.Campaign,
required: true
}
]
}
]
}).then(translationEntryVersion => {
if (translationEntryVersion) {
if (translationEntryVersion.translationEntryVersionCampaings.length == 1) {
response.redirect(`/campaigns/${translationEntryVersion.translationEntryVersionCampaings[0].campaignId}`)
}).then(translationArtifactVersion => {
if (translationArtifactVersion) {
if (translationArtifactVersion.translationArtifactVersionCampaings.length == 1) {
response.redirect(`/campaigns/${translationArtifactVersion.translationArtifactVersionCampaings[0].campaignId}`)
} else {
// TODO: Display translation entry campaign...
// TODO: Display translation artifact campaign...
next()
}
} else {
@@ -349,36 +349,36 @@ module.exports = function (options) {
router.route('/:id/campaign/create')
.get(function(request, response, next) {
db.TranslationEntryVersion.findByPk(request.params.id, {
db.TranslationArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.TranslationEntryVersion.EntryVersion,
association: db.TranslationArtifactVersion.ArtifactVersion,
include: [
{
association: db.EntryVersion.Entry
association: db.ArtifactVersion.Artifact
}
]
},
{
association: db.TranslationEntryVersion.TranslationEntryVersionCampaigns,
association: db.TranslationArtifactVersion.TranslationArtifactVersionCampaigns,
required: false,
include: [
{
association: db.TranslationEntryVersionCampaign.Campaign,
association: db.TranslationArtifactVersionCampaign.Campaign,
required: false
}
]
}
]
}).then(translationEntryVersion => {
if (translationEntryVersion) {
}).then(translationArtifactVersion => {
if (translationArtifactVersion) {
response.display("campaign-form", {
user: request.user,
pageTitle: "Campaign - Mantra",
campaign: {
name: `Campaign for ${translationEntryVersion.name} translation of ${translationEntryVersion.entryVersion.entry.name}`
name: `Campaign for ${translationArtifactVersion.name} translation of ${translationArtifactVersion.artifactVersion.artifact.name}`
},
translationEntryVersions: [translationEntryVersion]
translationArtifactVersions: [translationArtifactVersion]
})
} else {
next()