Explorar o código

Remove duplicate IDs issue

Martin Filser %!s(int64=2) %!d(string=hai) anos
pai
achega
f6d7377977
Modificáronse 2 ficheiros con 6 adicións e 3 borrados
  1. 4 2
      client/components/cards/attachments.js
  2. 2 1
      models/lib/fileStoreStrategy.js

+ 4 - 2
client/components/cards/attachments.js

@@ -1,3 +1,5 @@
+import { ObjectID } from 'bson';
+
 const filesize = require('filesize');
 const prettyMilliseconds = require('pretty-ms');
 
@@ -46,7 +48,7 @@ Template.cardAttachmentsPopup.events({
     if (files) {
       let uploads = [];
       for (const file of files) {
-        const fileId = Random.id();
+        const fileId = new ObjectID().toString();
         const config = {
           file: file,
           fileId: fileId,
@@ -130,7 +132,7 @@ Template.previewClipboardImagePopup.events({
     if (pastedResults && pastedResults.file) {
       const file = pastedResults.file;
       window.oPasted = pastedResults;
-      const fileId = Random.id();
+      const fileId = new ObjectID().toString();
       const config = {
         file,
         fileId: fileId,

+ 2 - 1
models/lib/fileStoreStrategy.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { createObjectId } from './grid/createObjectId';
 import { httpStreamOutput } from './httpStream.js'
+import { ObjectID } from 'bson';
 
 export const STORAGE_NAME_FILESYSTEM = "fs";
 export const STORAGE_NAME_GRIDFS     = "gridfs";
@@ -371,7 +372,7 @@ export const copyFile = function(fileObj, newCardId, fileStoreStrategyFactory) {
 
     // https://forums.meteor.com/t/meteor-code-must-always-run-within-a-fiber-try-wrapping-callbacks-that-you-pass-to-non-meteor-libraries-with-meteor-bindenvironmen/40099/8
     readStream.on('end', Meteor.bindEnvironment(() => {
-      const fileId = Random.id();
+      const fileId = new ObjectID().toString();
       Attachments.addFile(
         tempPath,
         {