yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Visually differentiate unread documents (#1507)

Browse Source 
* feat: Visually differentiate unread documents

* feat: add document treatment in document preview

* fix requested changes

Co-authored-by: Tom Moor <tom.moor@gmail.com>
This commit is contained in:
Guilherme DIniz
2020-09-21 02:32:28 -03:00
committed by GitHub
parent 4ffc04bc5d
commit d487da8f15
12 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/api/documents.js
View File

@@ -98,10 +98,12 @@ router.post("documents.list", auth(), pagination(), async (ctx) => {
// add the users starred state to the response by default
const starredScope = { method: ["withStarred", user.id] };
const collectionScope = { method: ["withCollection", user.id] };
const viewScope = { method: ["withViews", user.id] };
const documents = await Document.scope(
"defaultScope",
starredScope,
collectionScope
collectionScope,
viewScope
).findAll({
where,
order: [[sort, direction]],
@@ -137,10 +139,12 @@ router.post("documents.pinned", auth(), pagination(), async (ctx) => {
const starredScope = { method: ["withStarred", user.id] };
const collectionScope = { method: ["withCollection", user.id] };
const viewScope = { method: ["withViews", user.id] };
const documents = await Document.scope(
"defaultScope",
starredScope,
collectionScope
collectionScope,
viewScope
).findAll({
where: {
teamId: user.teamId,
@@ -176,9 +180,11 @@ router.post("documents.archived", auth(), pagination(), async (ctx) => {
const collectionIds = await user.collectionIds();
const collectionScope = { method: ["withCollection", user.id] };
const viewScope = { method: ["withViews", user.id] };
const documents = await Document.scope(
"defaultScope",
collectionScope
collectionScope,
viewScope
).findAll({
where: {
teamId: user.teamId,
@@ -214,7 +220,8 @@ router.post("documents.deleted", auth(), pagination(), async (ctx) => {
const collectionIds = await user.collectionIds({ paranoid: false });
const collectionScope = { method: ["withCollection", user.id] };
const documents = await Document.scope(collectionScope).findAll({
const viewScope = { method: ["withViews", user.id] };
const documents = await Document.scope(collectionScope, viewScope).findAll({
where: {
teamId: user.teamId,
collectionId: collectionIds,
@@ -349,9 +356,11 @@ router.post("documents.drafts", auth(), pagination(), async (ctx) => {
const collectionIds = await user.collectionIds();
const collectionScope = { method: ["withCollection", user.id] };
const viewScope = { method: ["withViews", user.id] };
const documents = await Document.scope(
"defaultScope",
collectionScope
collectionScope,
viewScope
).findAll({
where: {
userId: user.id,