@jsreport/jsreport-core 3.0.1 → 3.1.2-test.2

package/lib/main/folders/validateDuplicatedName.js

@@ -1,107 +1,107 @@
-const omit = require('lodash.omit')
-const resolveEntityPath = require('../../shared/folders/resolveEntityPath')
-
-async function findEntity (reporter, name, folder, req) {
-  for (const c of Object.keys(reporter.documentStore.collections)) {
-    if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
-      continue
-    }
-
-    const localReq = req ? reporter.Request(req) : req
-
-    // we should validate against all entities without caring about permissions
-    if (localReq) {
-      localReq.context = localReq.context ? omit(localReq.context, 'user') : localReq.context
-    }
-
-    const allEntities = await reporter.documentStore.collection(c).find({
-      folder
-    }, {
-      name: 1
-    }, localReq)
-
-    const existingEntity = allEntities.find((entity) => {
-      if (entity.name) {
-        // doing the check for case insensitive string (foo === FOO)
-        return entity.name.toLowerCase() === name.toLowerCase()
-      }
-
-      return false
-    })
-
-    if (existingEntity) {
-      return { entity: existingEntity, entitySet: c }
-    }
-  }
-}
-
-async function validateDuplicatedName (reporter, c, doc, originalIdValue, req) {
-  const resolveEntityPathFn = resolveEntityPath(reporter)
-
-  if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
-    return
-  }
-
-  const name = doc.name
-
-  if (!name) {
-    return
-  }
-
-  const existingEntity = await findEntity(reporter, name, doc.folder, req)
-
-  if (existingEntity) {
-    if (originalIdValue != null && existingEntity.entity._id === originalIdValue) {
-      return
-    }
-
-    let msg = `Entity with name "${name}" already exists`
-    let folder
-
-    if (doc.folder != null) {
-      folder = await reporter.documentStore.collection('folders').findOne({
-        shortid: doc.folder.shortid
-      }, req)
-
-      if (folder) {
-        const folderFullPath = await resolveEntityPathFn(folder, 'folders', req)
-
-        msg = `${msg} in the ${folderFullPath} folder.`
-      } else {
-        msg = `${msg} in the same folder.`
-      }
-    } else {
-      msg = `${msg} at the root level.`
-    }
-
-    // prints existing name in message when name are different, this can happen because the name validation
-    // is case insensitivity (uppercase and lowercase form are equivalent)
-    if (reporter.documentStore.model.entitySets[existingEntity.entitySet].entityTypeDef.name && existingEntity.entity.name !== name) {
-      msg = `${msg} existing: "${existingEntity.entity.name}".`
-    }
-
-    throw reporter.createError(msg, {
-      statusCode: 400,
-      code: 'DUPLICATED_ENTITY',
-      existingEntity: existingEntity.entity,
-      existingEntityEntitySet: existingEntity.entitySet
-    })
-  }
-}
-
-module.exports = function (reporter) {
-  for (const c of Object.keys(reporter.documentStore.collections)) {
-    reporter.documentStore.collection(c).beforeInsertListeners.add('unique-name-folders', (doc, req) => validateDuplicatedName(reporter, c, doc, undefined, req))
-    reporter.documentStore.collection(c).beforeUpdateListeners.add('unique-name-folders', async (q, update, opts, req) => {
-      if (update.$set && opts && opts.upsert === true) {
-        await validateDuplicatedName(reporter, c, update.$set, undefined, req)
-      }
-
-      // we need to get folder spec so we need to load them anyway
-      const entitiesToUpdate = await reporter.documentStore.collection(c).find(q, req)
-      return Promise.all(entitiesToUpdate.map(e => validateDuplicatedName(reporter, c, Object.assign({}, e, update.$set), e._id, req)))
-    })
-  }
-}
-
-module.exports.validateDuplicatedName = validateDuplicatedName
+const omit = require('lodash.omit')
+const resolveEntityPath = require('../../shared/folders/resolveEntityPath')
+
+async function findEntity (reporter, name, folder, req) {
+  for (const c of Object.keys(reporter.documentStore.collections)) {
+    if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
+      continue
+    }
+
+    const localReq = req ? reporter.Request(req) : req
+
+    // we should validate against all entities without caring about permissions
+    if (localReq) {
+      localReq.context = localReq.context ? omit(localReq.context, 'user') : localReq.context
+    }
+
+    const allEntities = await reporter.documentStore.collection(c).find({
+      folder
+    }, {
+      name: 1
+    }, localReq)
+
+    const existingEntity = allEntities.find((entity) => {
+      if (entity.name) {
+        // doing the check for case insensitive string (foo === FOO)
+        return entity.name.toLowerCase() === name.toLowerCase()
+      }
+
+      return false
+    })
+
+    if (existingEntity) {
+      return { entity: existingEntity, entitySet: c }
+    }
+  }
+}
+
+async function validateDuplicatedName (reporter, c, doc, originalIdValue, req) {
+  const resolveEntityPathFn = resolveEntityPath(reporter)
+
+  if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
+    return
+  }
+
+  const name = doc.name
+
+  if (!name) {
+    return
+  }
+
+  const existingEntity = await findEntity(reporter, name, doc.folder, req)
+
+  if (existingEntity) {
+    if (originalIdValue != null && existingEntity.entity._id === originalIdValue) {
+      return
+    }
+
+    let msg = `Entity with name "${name}" already exists`
+    let folder
+
+    if (doc.folder != null) {
+      folder = await reporter.documentStore.collection('folders').findOne({
+        shortid: doc.folder.shortid
+      }, req)
+
+      if (folder) {
+        const folderFullPath = await resolveEntityPathFn(folder, 'folders', req)
+
+        msg = `${msg} in the ${folderFullPath} folder.`
+      } else {
+        msg = `${msg} in the same folder.`
+      }
+    } else {
+      msg = `${msg} at the root level.`
+    }
+
+    // prints existing name in message when name are different, this can happen because the name validation
+    // is case insensitivity (uppercase and lowercase form are equivalent)
+    if (reporter.documentStore.model.entitySets[existingEntity.entitySet].entityTypeDef.name && existingEntity.entity.name !== name) {
+      msg = `${msg} existing: "${existingEntity.entity.name}".`
+    }
+
+    throw reporter.createError(msg, {
+      statusCode: 400,
+      code: 'DUPLICATED_ENTITY',
+      existingEntity: existingEntity.entity,
+      existingEntityEntitySet: existingEntity.entitySet
+    })
+  }
+}
+
+module.exports = function (reporter) {
+  for (const c of Object.keys(reporter.documentStore.collections)) {
+    reporter.documentStore.collection(c).beforeInsertListeners.add('unique-name-folders', (doc, req) => validateDuplicatedName(reporter, c, doc, undefined, req))
+    reporter.documentStore.collection(c).beforeUpdateListeners.add('unique-name-folders', async (q, update, opts, req) => {
+      if (update.$set && opts && opts.upsert === true) {
+        await validateDuplicatedName(reporter, c, update.$set, undefined, req)
+      }
+
+      // we need to get folder spec so we need to load them anyway
+      const entitiesToUpdate = await reporter.documentStore.collection(c).find(q, req)
+      return Promise.all(entitiesToUpdate.map(e => validateDuplicatedName(reporter, c, Object.assign({}, e, update.$set), e._id, req)))
+    })
+  }
+}
+
+module.exports.validateDuplicatedName = validateDuplicatedName

package/lib/main/folders/validateReservedName.js

@@ -1,53 +1,53 @@
-function validateReservedName (reporter, c, doc) {
-  if (doc.folder) {
-    return
-  }
-
-  if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
-    return
-  }
-
-  const name = doc.name
-
-  if (!name) {
-    return
-  }
-
-  const reservedNames = [
-    'storage',
-    ...Object.keys(
-      reporter.documentStore.model.entitySets
-    ).filter((name) => !reporter.documentStore.model.entitySets[name].splitIntoDirectories).map((name) => name.toLowerCase())
-  ]
-
-  if (reservedNames.includes(name.toLowerCase())) {
-    throw reporter.createError(`The name "${name}" is reserved in the root folder.`, {
-      statusCode: 400
-    })
-  }
-}
-
-module.exports = function (reporter) {
-  for (const c of Object.keys(reporter.documentStore.collections)) {
-    if (!reporter.documentStore.model.entitySets[c].splitIntoDirectories) {
-      continue
-    }
-
-    reporter.documentStore.collection(c).beforeInsertListeners.add('folders', (doc, req) => validateReservedName(reporter, c, doc))
-    reporter.documentStore.collection(c).beforeUpdateListeners.add('folders', async (q, update, opts, req) => {
-      if (update.$set && opts && opts.upsert === true) {
-        await validateReservedName(reporter, c, update.$set)
-      }
-
-      if (!update.$set.name || update.$set.folder) {
-        return
-      }
-
-      // we need to get folder spec so we need to load them anyway
-      const entitiesToUpdate = await reporter.documentStore.collection(c).find(q, req)
-      entitiesToUpdate.forEach(e => validateReservedName(reporter, c, Object.assign({}, e, update.$set)))
-    })
-  }
-}
-
-module.exports.validateReservedName = validateReservedName
+function validateReservedName (reporter, c, doc) {
+  if (doc.folder) {
+    return
+  }
+
+  if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
+    return
+  }
+
+  const name = doc.name
+
+  if (!name) {
+    return
+  }
+
+  const reservedNames = [
+    'storage',
+    ...Object.keys(
+      reporter.documentStore.model.entitySets
+    ).filter((name) => !reporter.documentStore.model.entitySets[name].splitIntoDirectories).map((name) => name.toLowerCase())
+  ]
+
+  if (reservedNames.includes(name.toLowerCase())) {
+    throw reporter.createError(`The name "${name}" is reserved in the root folder.`, {
+      statusCode: 400
+    })
+  }
+}
+
+module.exports = function (reporter) {
+  for (const c of Object.keys(reporter.documentStore.collections)) {
+    if (!reporter.documentStore.model.entitySets[c].splitIntoDirectories) {
+      continue
+    }
+
+    reporter.documentStore.collection(c).beforeInsertListeners.add('folders', (doc, req) => validateReservedName(reporter, c, doc))
+    reporter.documentStore.collection(c).beforeUpdateListeners.add('folders', async (q, update, opts, req) => {
+      if (update.$set && opts && opts.upsert === true) {
+        await validateReservedName(reporter, c, update.$set)
+      }
+
+      if (!update.$set.name || update.$set.folder) {
+        return
+      }
+
+      // we need to get folder spec so we need to load them anyway
+      const entitiesToUpdate = await reporter.documentStore.collection(c).find(q, req)
+      entitiesToUpdate.forEach(e => validateReservedName(reporter, c, Object.assign({}, e, update.$set)))
+    })
+  }
+}
+
+module.exports.validateReservedName = validateReservedName