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

fix: uuid import broken by dep bump 🤦‍♂️

Browse Source
This commit is contained in:
Tom Moor
2021-04-25 12:54:06 -07:00
parent 2d22399bbc
commit 6de793e94e
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/models/Collection.test.js
View File

@ -1,5 +1,5 @@
/* eslint-disable flowtype/require-valid-file-annotation */
import uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import { Collection, Document } from "../models";
import {
buildUser,
@ -22,7 +22,7 @@ describe("#url", () => {
describe("#addDocumentToStructure", () => {
test("should add as last element without index", async () => {
const { collection } = await seed();
const id = uuid.v4();
const id = uuidv4();
const newDocument = new Document({
id,
title: "New end node",
@ -36,7 +36,7 @@ describe("#addDocumentToStructure", () => {
test("should add with an index", async () => {
const { collection } = await seed();
const id = uuid.v4();
const id = uuidv4();
const newDocument = new Document({
id,
title: "New end node",
@ -50,7 +50,7 @@ describe("#addDocumentToStructure", () => {
test("should add as a child if with parent", async () => {
const { collection, document } = await seed();
const id = uuid.v4();
const id = uuidv4();
const newDocument = new Document({
id,
title: "New end node",
@ -67,11 +67,11 @@ describe("#addDocumentToStructure", () => {
test("should add as a child if with parent with index", async () => {
const { collection, document } = await seed();
const newDocument = new Document({
id: uuid.v4(),
id: uuidv4(),
title: "node",
parentDocumentId: document.id,
});
const id = uuid.v4();
const id = uuidv4();
const secondDocument = new Document({
id,
title: "New start node",
@ -89,9 +89,9 @@ describe("#addDocumentToStructure", () => {
describe("options: documentJson", () => {
test("should append supplied json over document's own", async () => {
const { collection } = await seed();
const id = uuid.v4();
const id = uuidv4();
const newDocument = new Document({
id: uuid.v4(),
id: uuidv4(),
title: "New end node",
parentDocumentId: null,
});

4
server/models/Team.js
View File

@ -3,7 +3,7 @@ import fs from "fs";
import path from "path";
import { URL } from "url";
import util from "util";
import uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import {
stripSubdomain,
RESERVED_SUBDOMAINS,
@ -120,7 +120,7 @@ const uploadAvatar = async (model) => {
try {
const newUrl = await uploadToS3FromUrl(
avatarUrl,
`avatars/${model.id}/${uuid.v4()}`,
`avatars/${model.id}/${uuidv4()}`,
"public-read"
);
if (newUrl) model.avatarUrl = newUrl;

4
server/models/User.js
View File

@ -3,7 +3,7 @@ import crypto from "crypto";
import addMinutes from "date-fns/add_minutes";
import subMinutes from "date-fns/sub_minutes";
import JWT from "jsonwebtoken";
import uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import { languages } from "../../shared/i18n";
import { ValidationError } from "../errors";
import { sendEmail } from "../mailer";
@ -187,7 +187,7 @@ const uploadAvatar = async (model) => {
try {
const newUrl = await uploadToS3FromUrl(
avatarUrl,
`avatars/${model.id}/${uuid.v4()}`,
`avatars/${model.id}/${uuidv4()}`,
"public-read"
);
if (newUrl) model.avatarUrl = newUrl;