Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
cda1f1e8
Unverified
Commit
cda1f1e8
authored
Aug 31, 2020
by
jaljo
Committed by
GitHub
Aug 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: export creation date in dumped content (#2345)
* Export creation date in dumped content * date_creation -> dateCreated Co-authored-by:
Joris Langlois
<
joris.langlois@knplabs.com
>
parent
ae733392
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
26 deletions
+46
-26
page.js
server/helpers/page.js
+2
-1
storage.js
server/modules/storage/azure/storage.js
+1
-1
storage.js
server/modules/storage/disk/storage.js
+1
-1
storage.js
server/modules/storage/git/storage.js
+1
-1
common.js
server/modules/storage/s3/common.js
+1
-1
storage.js
server/modules/storage/sftp/storage.js
+1
-1
page.test.js
server/test/helpers/page.test.js
+39
-20
No files found.
server/helpers/page.js
View file @
cda1f1e8
...
...
@@ -72,7 +72,8 @@ module.exports = {
[
'published'
,
page
.
isPublished
.
toString
()],
[
'date'
,
page
.
updatedAt
],
[
'tags'
,
page
.
tags
?
page
.
tags
.
map
(
t
=>
t
.
tag
).
join
(
', '
)
:
''
],
[
'editor'
,
page
.
editorKey
]
[
'editor'
,
page
.
editorKey
],
[
'dateCreated'
,
page
.
createdAt
],
]
switch
(
page
.
contentType
)
{
case
'markdown'
:
...
...
server/modules/storage/azure/storage.js
View file @
cda1f1e8
...
...
@@ -126,7 +126,7 @@ module.exports = {
// -> Pages
await
pipeline
(
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
).
select
().
from
(
'pages'
).
where
({
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
,
'createdAt'
).
select
().
from
(
'pages'
).
where
({
isPrivate
:
false
}).
stream
(),
new
stream
.
Transform
({
...
...
server/modules/storage/disk/storage.js
View file @
cda1f1e8
...
...
@@ -127,7 +127,7 @@ module.exports = {
// -> Pages
await
pipeline
(
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
).
select
().
from
(
'pages'
).
where
({
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
,
'createdAt'
).
select
().
from
(
'pages'
).
where
({
isPrivate
:
false
}).
stream
(),
new
stream
.
Transform
({
...
...
server/modules/storage/git/storage.js
View file @
cda1f1e8
...
...
@@ -411,7 +411,7 @@ module.exports = {
// -> Pages
await
pipeline
(
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
).
select
().
from
(
'pages'
).
where
({
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
,
'createdAt'
).
select
().
from
(
'pages'
).
where
({
isPrivate
:
false
}).
stream
(),
new
stream
.
Transform
({
...
...
server/modules/storage/s3/common.js
View file @
cda1f1e8
...
...
@@ -131,7 +131,7 @@ module.exports = class S3CompatibleStorage {
// -> Pages
await
pipeline
(
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
).
select
().
from
(
'pages'
).
where
({
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
,
'createdAt'
).
select
().
from
(
'pages'
).
where
({
isPrivate
:
false
}).
stream
(),
new
stream
.
Transform
({
...
...
server/modules/storage/sftp/storage.js
View file @
cda1f1e8
...
...
@@ -115,7 +115,7 @@ module.exports = {
// -> Pages
await
pipeline
(
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
).
select
().
from
(
'pages'
).
where
({
WIKI
.
models
.
knex
.
column
(
'path'
,
'localeCode'
,
'title'
,
'description'
,
'contentType'
,
'content'
,
'isPublished'
,
'updatedAt'
,
'createdAt'
).
select
().
from
(
'pages'
).
where
({
isPrivate
:
false
}).
stream
(),
new
stream
.
Transform
({
...
...
server/test/helpers/page.test.js
View file @
cda1f1e8
const
{
injectPageMetadata
}
=
require
(
'../../helpers/page'
)
describe
(
'
injectPageMetadata tests
'
,
()
=>
{
le
t
page
=
{
describe
(
'
helpers/page/injectPageMetadata
'
,
()
=>
{
cons
t
page
=
{
title
:
'PAGE TITLE'
,
description
:
'A PAGE'
,
isPublished
:
true
,
updatedAt
:
new
Date
(),
content
:
'TEST CONTENT'
content
:
'TEST CONTENT'
,
createdAt
:
new
Date
(
'2019-01-01'
),
}
test
(
'injectPageMetadata: default'
,
()
=>
{
it
(
'returns the page content by default when content type is unknown'
,
()
=>
{
const
expected
=
'TEST CONTENT'
const
result
=
injectPageMetadata
(
page
)
expect
(
result
).
toEqual
(
expected
)
})
test
(
'injectPageMetadata: markdown'
,
()
=>
{
page
.
contentType
=
'markdown'
it
(
'injects metadata for markdown contents'
,
()
=>
{
const
markdownPage
=
{
...
page
,
contentType
:
'markdown'
,
editorKey
:
'markdown'
,
}
const
expected
=
`---
title:
${
page
.
title
}
description:
${
page
.
description
}
published:
${
page
.
isPublished
.
toString
()}
date:
${
page
.
updatedAt
}
tags: \n---
title:
${
markdownPage
.
title
}
description:
${
markdownPage
.
description
}
published:
${
markdownPage
.
isPublished
.
toString
()}
date:
${
markdownPage
.
updatedAt
}
tags:\x20
editor:
${
markdownPage
.
editorKey
}
dateCreated:
${
markdownPage
.
createdAt
}
\n---
TEST CONTENT`
const
result
=
injectPageMetadata
(
page
)
const
result
=
injectPageMetadata
(
markdownPage
)
expect
(
result
).
toEqual
(
expected
)
})
test
(
'injectPageMetadata: hmtl'
,
()
=>
{
page
.
contentType
=
'html'
it
(
'injects metadata for html contents'
,
()
=>
{
const
htmlPage
=
{
...
page
,
contentType
:
'html'
,
editorKey
:
'html'
,
}
const
expected
=
`<!--
title:
${
page
.
title
}
description:
${
page
.
description
}
published:
${
page
.
isPublished
.
toString
()}
date:
${
page
.
updatedAt
}
tags: \n-->
title:
${
htmlPage
.
title
}
description:
${
htmlPage
.
description
}
published:
${
htmlPage
.
isPublished
.
toString
()}
date:
${
htmlPage
.
updatedAt
}
tags:\x20
editor:
${
htmlPage
.
editorKey
}
dateCreated:
${
htmlPage
.
createdAt
}
\n-->
TEST CONTENT`
const
result
=
injectPageMetadata
(
page
)
const
result
=
injectPageMetadata
(
htmlPage
)
expect
(
result
).
toEqual
(
expected
)
})
})
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment