mantra/mantra.press
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace entry with artifact and add entity

Browse Source
This commit is contained in:
Kgothatso Ngako
2022-01-05 03:04:43 +02:00
parent e22f85a1aa
commit 7be5200094
28 changed files with 560 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
server/router/fork/index.js
View File

@@ -6,19 +6,19 @@ module.exports = function (options) {
router.route('/t/:id')
.post(function(request, response, next) {
db.TranslationEntryVersion.findByPk(request.params.id, {
}).then(async (translationEntryVersion) => {
if (translationEntryVersion) {
db.TranslationArtifactVersion.findByPk(request.params.id, {
}).then(async (translationArtifactVersion) => {
if (translationArtifactVersion) {
// fork...
const forkedTranslationEntryVersion = await db.TranslationEntryVersion.create({
name: translationEntryVersion.name,
entryVersionId: translationEntryVersion.entryVersionId,
const forkedTranslationArtifactVersion = await db.TranslationArtifactVersion.create({
name: translationArtifactVersion.name,
artifactVersionId: translationArtifactVersion.artifactVersionId,
userId: request.user.id,
dialectId: translationEntryVersion.dialectId,
forkedFromId: translationEntryVersion.id
dialectId: translationArtifactVersion.dialectId,
forkedFromId: translationArtifactVersion.id
})
if (forkedTranslationEntryVersion) {
return response.redirect(`/v/${forkedTranslationEntryVersion.entryVersionId}/translations/${forkedTranslationEntryVersion.id}`)
if (forkedTranslationArtifactVersion) {
return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`)
}
} else {
next()
@@ -30,18 +30,18 @@ module.exports = function (options) {
router.route('/e/:id')
.get(function(request, response, next) {
db.EntryVersion.findByPk(request.params.id, {
db.ArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.EntryVersion.Entry
association: db.ArtifactVersion.Artifact
}
]
}).then(entryVersion => {
if (entryVersion) {
response.display("fork-entry-version", {
}).then(artifactVersion => {
if (artifactVersion) {
response.display("fork-artifact-version", {
user: request.user,
pageTitle: "Add translation - Mantra",
entryVersion: entryVersion
artifactVersion: artifactVersion
})
} else {
next()
@@ -64,13 +64,13 @@ module.exports = function (options) {
})
if (dialect) {
const entryVersion = await db.EntryVersion.findByPk(request.params.id, {
const artifactVersion = await db.ArtifactVersion.findByPk(request.params.id, {
include: [
{
association: db.EntryVersion.Entry
association: db.ArtifactVersion.Artifact
},
{
association: db.EntryVersion.TranslationEntryVersions,
association: db.ArtifactVersion.TranslationArtifactVersions,
required: false,
where: {
dialectId: dialect.id,
@@ -79,10 +79,10 @@ module.exports = function (options) {
]
})
if (entryVersion) {
const forkedTranslationEntryVersion = await forkEntryVersion(entryVersion, dialect, request.user.id)
if (forkedTranslationEntryVersion) {
return response.redirect(`/v/${forkedTranslationEntryVersion.entryVersionId}/translations/${forkedTranslationEntryVersion.id}`)
if (artifactVersion) {
const forkedTranslationArtifactVersion = await forkArtifactVersion(artifactVersion, dialect, request.user.id)
if (forkedTranslationArtifactVersion) {
return response.redirect(`/v/${forkedTranslationArtifactVersion.artifactVersionId}/translations/${forkedTranslationArtifactVersion.id}`)
}
}
}
@@ -90,22 +90,22 @@ module.exports = function (options) {
next()
})
const forkEntryVersion = (entryVersion, dialect, userId) => {
if (entryVersion.translationEntryVersions.length == 0) {
// create a translationEntryVersion with a new dialect...
return db.TranslationEntryVersion.create({
const forkArtifactVersion = (artifactVersion, dialect, userId) => {
if (artifactVersion.translationArtifactVersions.length == 0) {
// create a translationArtifactVersion with a new dialect...
return db.TranslationArtifactVersion.create({
name: dialect.name,
entryVersionId: entryVersion.id,
artifactVersionId: artifactVersion.id,
dialectId: dialect.id,
userId: userId,
})
} else {
return db.TranslationEntryVersion.create({
name: entryVersion.translationEntryVersions[0].name,
entryVersionId: entryVersion.translationEntryVersions[0].entryVersionId,
return db.TranslationArtifactVersion.create({
name: artifactVersion.translationArtifactVersions[0].name,
artifactVersionId: artifactVersion.translationArtifactVersions[0].artifactVersionId,
userId: userId,
dialectId: entryVersion.translationEntryVersions[0].dialectId,
forkedFromId: entryVersion.translationEntryVersions[0].id
dialectId: artifactVersion.translationArtifactVersions[0].dialectId,
forkedFromId: artifactVersion.translationArtifactVersions[0].id
})
}
}