Merge pull request #3 from zbarbuto/master

Make custom property on options optional
gid-oss · Jun 29, 2022 · 83426c8 · 83426c8
2 parents 3199297 + 79b7954
commit 83426c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts
@@ -310,10 +310,10 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
     builder.select(select);
 
     // search
-    this.setSearchCondition(builder, parsed.search, options.operators.custom);
+    this.setSearchCondition(builder, parsed.search, options.operators?.custom);
 
     // set joins
-    const joinOptions = options.query.join || {};
+    const joinOptions = options.query?.join || {};
     const allowedJoins = objKeys(joinOptions);
 
     if (hasLength(allowedJoins)) {
@@ -431,7 +431,7 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
       : await this.createBuilder(parsed, options, true, withDeleted);
 
     if (shallow) {
-      this.setSearchCondition(builder, parsed.search, options.operators.custom);
+      this.setSearchCondition(builder, parsed.search, options.operators?.custom);
     }
 
     const found = withDeleted

diff --git a/packages/crud/src/interceptors/crud-request.interceptor.ts b/packages/crud/src/interceptors/crud-request.interceptor.ts
@@ -31,7 +31,7 @@ export class CrudRequestInterceptor extends CrudBaseInterceptor
         const { ctrlOptions, crudOptions, action } = this.getCrudInfo(context);
         const parser = RequestQueryParser.create();
 
-        parser.parseQuery(req.query, crudOptions.operators.custom);
+        parser.parseQuery(req.query, crudOptions.operators?.custom);
 
         if (!isNil(ctrlOptions)) {
           const search = this.getSearch(parser, crudOptions, action, req.params);