coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: Upgrade Prettier 1.8 -> 2.0 (#1436)

Browse Source
This commit is contained in:
Tom Moor
2020-08-08 18:53:11 -07:00
committed by GitHub
parent 68dcb4de5f
commit e312b264a6
218 changed files with 1156 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/commands/documentMover.js
View File

@ -53,13 +53,13 @@ export default async function documentMover({
if (collectionChanged) {
result.collections.push(newCollection);
const loopChildren = async documentId => {
const loopChildren = async (documentId) => {
const childDocuments = await Document.findAll({
where: { parentDocumentId: documentId },
});
await Promise.all(
childDocuments.map(async child => {
childDocuments.map(async (child) => {
await loopChildren(child.id);
await child.update({ collectionId }, { transaction });
child.collection = newCollection;
@ -84,8 +84,8 @@ export default async function documentMover({
teamId: document.teamId,
data: {
title: document.title,
collectionIds: result.collections.map(c => c.id),
documentIds: result.documents.map(d => d.id),
collectionIds: result.collections.map((c) => c.id),
documentIds: result.documents.map((d) => d.id),
},
ip,
});

12
server/commands/userInviter.js
View File

@ -19,12 +19,12 @@ export default async function userInviter({
// filter out empties and obvious non-emails
const compactedInvites = invites.filter(
invite => !!invite.email.trim() && invite.email.match("@")
(invite) => !!invite.email.trim() && invite.email.match("@")
);
// normalize to lowercase and remove duplicates
const normalizedInvites = uniqBy(
compactedInvites.map(invite => ({
compactedInvites.map((invite) => ({
...invite,
email: invite.email.toLowerCase(),
})),
@ -32,23 +32,23 @@ export default async function userInviter({
);
// filter out any existing users in the system
const emails = normalizedInvites.map(invite => invite.email);
const emails = normalizedInvites.map((invite) => invite.email);
const existingUsers = await User.findAll({
where: {
teamId: user.teamId,
email: emails,
},
});
const existingEmails = existingUsers.map(user => user.email);
const existingEmails = existingUsers.map((user) => user.email);
const filteredInvites = normalizedInvites.filter(
invite => !existingEmails.includes(invite.email)
(invite) => !existingEmails.includes(invite.email)
);
let users = [];
// send and record remaining invites
await Promise.all(
filteredInvites.map(async invite => {
filteredInvites.map(async (invite) => {
const transaction = await sequelize.transaction();
try {
const newUser = await User.create(