Browse Source

feat: extract source id in middleware and remove unnecessary optional chaining

pull/8708/head
Pranav C 2 weeks ago
parent
commit
4e641f3fd2
  1. 49
      packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts

49
packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts

@ -85,7 +85,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.tableNotFound(params.tableId || params.modelId);
}
req.ncBaseId = model?.base_id;
req.ncBaseId = model.base_id;
req.ncSourceId = model.source_id;
} else if (params.viewId) {
const view =
(await View.get(context, params.viewId)) ||
@ -95,7 +96,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.viewNotFound(params.viewId);
}
req.ncBaseId = view?.base_id;
req.ncBaseId = view.base_id;
req.ncSourceId = view.source_id;
} else if (
params.formViewId ||
params.gridViewId ||
@ -122,7 +124,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
);
}
req.ncBaseId = view?.base_id;
req.ncBaseId = view.base_id;
req.ncSourceId = view.source_id;
} else if (params.publicDataUuid) {
const view = await View.getByUUID(context, req.params.publicDataUuid);
@ -130,7 +133,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.viewNotFound(params.publicDataUuid);
}
req.ncBaseId = view?.base_id;
req.ncBaseId = view.base_id;
req.ncSourceId = view.source_id;
} else if (params.sharedViewUuid) {
const view = await View.getByUUID(context, req.params.sharedViewUuid);
@ -138,7 +142,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.viewNotFound(req.params.sharedViewUuid);
}
req.ncBaseId = view?.base_id;
req.ncBaseId = view.base_id;
req.ncSourceId = view.source_id;
} else if (params.sharedBaseUuid) {
const base = await Base.getByUuid(context, req.params.sharedBaseUuid);
@ -154,7 +159,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.genericNotFound('Webhook', params.hookId);
}
req.ncBaseId = hook?.base_id;
req.ncBaseId = hook.base_id;
req.ncSourceId = hook.source_id;
} else if (params.gridViewColumnId) {
const gridViewColumn = await GridViewColumn.get(
context,
@ -165,7 +171,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.fieldNotFound(params.gridViewColumnId);
}
req.ncBaseId = gridViewColumn?.base_id;
req.ncBaseId = gridViewColumn.base_id;
req.ncSourceId = gridViewColumn.source_id;
} else if (params.formViewColumnId) {
const formViewColumn = await FormViewColumn.get(
context,
@ -176,7 +183,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.fieldNotFound(params.formViewColumnId);
}
req.ncBaseId = formViewColumn?.base_id;
req.ncBaseId = formViewColumn.base_id;
req.ncSourceId = formViewColumn.source_id;
} else if (params.galleryViewColumnId) {
const galleryViewColumn = await GalleryViewColumn.get(
context,
@ -187,7 +195,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.fieldNotFound(params.galleryViewColumnId);
}
req.ncBaseId = galleryViewColumn?.base_id;
req.ncBaseId = galleryViewColumn.base_id;
req.ncSourceId = galleryViewColumn.source_id;
} else if (params.columnId) {
const column = await Column.get(context, { colId: params.columnId });
@ -195,7 +204,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.fieldNotFound(params.columnId);
}
req.ncBaseId = column?.base_id;
req.ncBaseId = column.base_id;
req.ncSourceId = column.source_id;
} else if (params.filterId) {
const filter = await Filter.get(context, params.filterId);
@ -203,7 +213,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.genericNotFound('Filter', params.filterId);
}
req.ncBaseId = filter?.base_id;
req.ncBaseId = filter.base_id;
req.ncSourceId = filter.source_id;
} else if (params.filterParentId) {
const filter = await Filter.get(context, params.filterParentId);
@ -211,7 +222,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.genericNotFound('Filter', params.filterParentId);
}
req.ncBaseId = filter?.base_id;
req.ncBaseId = filter.base_id;
req.ncSourceId = filter.source_id;
} else if (params.sortId) {
const sort = await Sort.get(context, params.sortId);
@ -219,7 +231,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.genericNotFound('Sort', params.sortId);
}
req.ncBaseId = sort?.base_id;
req.ncBaseId = sort.base_id;
req.ncSourceId = sort.source_id;
} else if (params.syncId) {
const syncSource = await SyncSource.get(context, req.params.syncId);
@ -228,6 +241,7 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
}
req.ncBaseId = syncSource.base_id;
req.ncSourceId = syncSource.source_id;
} else if (params.extensionId) {
const extension = await Extension.get(context, req.params.extensionId);
@ -258,7 +272,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.tableNotFound(req.body.fk_model_id);
}
req.ncBaseId = model?.base_id;
req.ncBaseId = model.base_id;
req.ncSourceId = model.source_id;
}
// extract fk_model_id from query params only if it's audit get endpoint
else if (
@ -281,7 +296,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.tableNotFound(req.query?.fk_model_id);
}
req.ncBaseId = model?.base_id;
req.ncBaseId = model.base_id;
req.ncSourceId = model.source_id;
} else if (
[
'/api/v1/db/meta/comment/:commentId',
@ -296,7 +312,8 @@ export class ExtractIdsMiddleware implements NestMiddleware, CanActivate {
NcError.genericNotFound('Comment', params.commentId);
}
req.ncBaseId = comment?.base_id;
req.ncBaseId = comment.base_id;
req.ncSourceId = comment.source_id;
}
// extract base id from query params only if it's userMe endpoint or webhook plugin list
else if (

Loading…
Cancel
Save