type some collection operations

This commit is contained in:
Elliot DeNolf
2020-12-01 16:38:27 -05:00
parent be69ff5849
commit 4ac08dac65
9 changed files with 17 additions and 8 deletions

View File

@@ -231,7 +231,7 @@ async function create(incomingArgs) {
// Send verification email if applicable
// /////////////////////////////////////
if (collectionConfig.auth && collectionConfig.auth.verify && !disableVerificationEmail) {
if (collectionConfig.auth && collectionConfig.auth.verify) {
sendVerificationEmail({
config: this.config,
sendEmail: this.sendEmail,
@@ -239,6 +239,7 @@ async function create(incomingArgs) {
user: result,
token: data._verificationToken,
req,
disableEmail: disableVerificationEmail,
});
}

View File

@@ -6,6 +6,7 @@ import { NotFound, Forbidden, ErrorDeletingFile } from '../../errors';
import executeAccess from '../../auth/executeAccess';
import fileExists from '../../uploads/fileExists';
import { BeforeOperationHook } from '../config/types';
import { Query } from './types';
async function deleteQuery(incomingArgs) {
let args = incomingArgs;
@@ -56,7 +57,7 @@ async function deleteQuery(incomingArgs) {
// Retrieve document
// /////////////////////////////////////
const queryToBuild = {
const queryToBuild: Query = {
where: {
and: [
{

View File

@@ -1,6 +1,7 @@
import executeAccess from '../../auth/executeAccess';
import removeInternalFields from '../../utilities/removeInternalFields';
import { BeforeOperationHook, BeforeReadHook } from '../config/types';
import { Query } from './types';
async function find(incomingArgs) {
let args = incomingArgs;
@@ -39,7 +40,7 @@ async function find(incomingArgs) {
// Access
// /////////////////////////////////////
const queryToBuild = {};
const queryToBuild: Query = {};
if (where) {
let and = [];

View File

@@ -4,6 +4,7 @@ import { BeforeOperationHook } from '../config/types';
import removeInternalFields from '../../utilities/removeInternalFields';
import { Forbidden, NotFound } from '../../errors';
import executeAccess from '../../auth/executeAccess';
import { Query } from './types';
async function findByID(incomingArgs) {
let args = incomingArgs;
@@ -45,7 +46,7 @@ async function findByID(incomingArgs) {
const accessResults = !overrideAccess ? await executeAccess({ req, disableErrors, id }, collectionConfig.access.read) : true;
const hasWhereAccess = typeof accessResults === 'object';
const queryToBuild = {
const queryToBuild: Query = {
where: {
and: [
{
@@ -76,6 +77,8 @@ async function findByID(incomingArgs) {
req.findByID[collectionConfig.slug] = memoize(nonMemoizedFindByID, {
isPromise: true,
maxSize: 100,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore This is straight from their docs, bad typings
transformKey: JSON.stringify,
});
}

View File

@@ -156,7 +156,6 @@ export type RadioField = FieldBase & {
value: string;
label: string;
}[] | string[];
hasMany?: boolean;
}
export type Block = {