@knovator/pagecreator-node 1.4.7 → 1.4.8

package/src/services/dataService.js

@@ -2,29 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleResetData = exports.handleUpdateData = exports.updateRedisPage = exports.getPageDataDB = exports.updateWidgetPagesData = exports.updateRedisWidget = exports.getWidgetDataDB = void 0;
 const tslib_1 = require("tslib");
-const mongoose_1 = require("mongoose");
 const helper_1 = require("../utils/helper");
 const redis_1 = require("../utils/redis");
 const defaults_1 = require("../utils/defaults");
-const getAggregationQuery = ({ collectionName, ids, }) => {
-    // Handle built-in "pages" collection
-    if (collectionName === 'pages') {
-        return [
-            {
-                $match: {
-                    _id: { $in: ids },
-                    isDeleted: false,
-                    $or: [
-                        { isActive: true },
-                        { isActive: { $exists: false } } // Include pages without isActive field
-                    ],
-                },
-            },
-            { $project: { _id: 1, name: 1, slug: 1, code: 1, filterQuery: 1 } },
-            { $addFields: { __order: { $indexOfArray: [ids, '$_id'] } } },
-            { $sort: { __order: 1 } },
-        ];
-    }
+// Helper to filter out undefined/null values from query fields
+const filterDefinedFields = (obj = {}) => {
+    return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined && value !== null));
+};
+const getAggregationQuery = ({ collectionName, ids, req, }) => {
     const collectionConfig = defaults_1.defaults.collections.find((c) => c.collectionName === collectionName);
     const aggregateQueryItem = [];
     if (Array.isArray(collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations) &&
@@ -32,76 +17,22 @@ const getAggregationQuery = ({ collectionName, ids, }) => {
         aggregateQueryItem.push(...collectionConfig.aggregations);
     }
     aggregateQueryItem.push({
-        $match: Object.assign({ _id: {
+        $match: Object.assign(Object.assign({ _id: {
                 $in: ids,
-            } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})),
+            } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})), filterDefinedFields(req === null || req === void 0 ? void 0 : req.defaultQueryFields)),
     }, { $addFields: { __order: { $indexOfArray: [ids, '$_id'] } } }, { $sort: { __order: 1 } });
     return aggregateQueryItem;
 };
-const getLatestBlogsQuery = ({ collectionName, category, limit, }) => {
-    const collectionConfig = defaults_1.defaults.collections.find((c) => c.collectionName === collectionName);
-    const aggregateQueryItem = [];
-    // Add custom aggregations from config
-    if (Array.isArray(collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations) &&
-        (collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations.length)) {
-        aggregateQueryItem.push(...collectionConfig.aggregations);
-    }
-    // Build match conditions
-    const matchConditions = Object.assign({}, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {}));
-    // Add category filter if provided
-    if (category) {
-        try {
-            const categoryObjectId = new mongoose_1.Types.ObjectId(category);
-            const categoryString = category.toString();
-            // Handle multiple category field structures:
-            // - Array of ObjectIds (unpopulated)
-            // - Populated objects with _id field
-            // - Populated objects with id field (ObjectId or string)
-            matchConditions.$or = [
-                { category: { $in: [categoryObjectId] } },
-                { 'category._id': categoryObjectId },
-                { 'category.id': categoryObjectId },
-                { 'category.id': categoryString },
-            ];
-        }
-        catch (error) {
-            // Fallback to simple match if ObjectId conversion fails
-            matchConditions.category = category;
-        }
-    }
-    aggregateQueryItem.push({
-        $match: matchConditions,
-    });
-    // Sort by createdAt descending (latest first)
-    aggregateQueryItem.push({
-        $sort: { createdAt: -1 },
-    });
-    // Apply limit if provided
-    if (limit && limit > 0) {
-        aggregateQueryItem.push({
-            $limit: limit,
-        });
-    }
-    return aggregateQueryItem;
-};
-const getWidgetDataDB = (code, models) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getWidgetDataDB = (code, models, req) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const { Widget } = models;
     const widgetDataArr = (yield Widget.aggregate([
         {
-            $match: {
-                isDeleted: false,
-                isActive: true,
-                code,
-            },
+            $match: Object.assign(Object.assign({}, filterDefinedFields(req === null || req === void 0 ? void 0 : req.defaultQueryFields)), { isDeleted: false, isActive: true, code }),
         },
         {
             // Get only the fields that are not excluded
-            $project: {
-                __v: 0,
-                isDeleted: 0,
-                deletedAt: 0,
-            },
+            $project: Object.assign({}, defaults_1.commonExcludedFields),
         },
         {
             // Get Items data
@@ -213,25 +144,13 @@ const getWidgetDataDB = (code, models) => tslib_1.__awaiter(void 0, void 0, void
         return null;
     }
     const widgetData = widgetDataArr[0];
-    // Fetch latest blogs by category/limit if configured
-    if (widgetData.collectionName === 'blog' &&
-        (widgetData.blogLimit || widgetData.blogCategory)) {
-        const aggregateQueryItem = getLatestBlogsQuery({
-            collectionName: widgetData.collectionName,
-            category: widgetData.blogCategory,
-            limit: widgetData.blogLimit,
-        });
-        const collectionModal = (0, helper_1.getCollectionModal)(widgetData.collectionName, models);
-        const collectionItems = yield collectionModal.aggregate(aggregateQueryItem);
-        widgetData.collectionItems = collectionItems;
-    }
-    // Otherwise, fetch specific collection items if they exist
-    else if (widgetData.collectionName &&
+    if (widgetData.collectionName &&
         widgetData.collectionItems &&
         widgetData.collectionItems.length > 0) {
         const aggregateQueryItem = getAggregationQuery({
             collectionName: widgetData.collectionName,
-            ids: (0, helper_1.formatCollectionItems)(widgetData.collectionItems),
+            ids: widgetData.collectionItems,
+            req,
         });
         const collectionModal = (0, helper_1.getCollectionModal)(widgetData.collectionName, models);
         const collectionItems = yield collectionModal.aggregate(aggregateQueryItem);
@@ -246,7 +165,8 @@ const getWidgetDataDB = (code, models) => tslib_1.__awaiter(void 0, void 0, void
         }, []);
         const aggregateQueryItem = getAggregationQuery({
             collectionName: widgetData.collectionName,
-            ids: (0, helper_1.formatCollectionItems)(tabCollectionItemIds),
+            ids: tabCollectionItemIds,
+            req,
         });
         const collectionModal = (0, helper_1.getCollectionModal)(widgetData.collectionName, models);
         const collectionItems = yield collectionModal.aggregate(aggregateQueryItem);
@@ -288,15 +208,12 @@ const updateWidgetPagesData = (widgetIds, models) => tslib_1.__awaiter(void 0, v
     }
 });
 exports.updateWidgetPagesData = updateWidgetPagesData;
-const getPageDataDB = (code, models) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getPageDataDB = (code, models, req) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     var _b;
     const { Page } = models;
     const pageData = (yield Page.aggregate([
         {
-            $match: {
-                isDeleted: false,
-                code: code,
-            },
+            $match: Object.assign(Object.assign({}, filterDefinedFields(req === null || req === void 0 ? void 0 : req.defaultQueryFields)), { isDeleted: false, code: code }),
         },
         {
             $project: {
@@ -434,7 +351,7 @@ const getPageDataDB = (code, models) => tslib_1.__awaiter(void 0, void 0, void 0
     if (!pageData.length) {
         return null;
     }
-    pageData[0].widgetsData = yield (0, helper_1.appendCollectionData)(pageData[0].widgetsData, models);
+    pageData[0].widgetsData = yield (0, helper_1.appendCollectionData)(pageData[0].widgetsData, models, req);
     if (Array.isArray(pageData[0].widgetsData) &&
         pageData[0].widgetsData.length > 0) {
         pageData[0].widgetsData.forEach((widget) => {

package/src/services/dataService.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataService.js","sourceRoot":"","sources":["../../../../../libs/node/src/services/dataService.ts"],"names":[],"mappings":";;;;AAAA,uCAA2D;AAC3D,4CAKyB;AACzB,0CAAiE;AACjE,gDAAmE;AAGnE,MAAM,mBAAmB,GAAG,CAAC,EAC3B,cAAc,EACd,GAAG,GAIJ,EAAE,EAAE;IACH,qCAAqC;IACrC,IAAI,cAAc,KAAK,OAAO,EAAE;QAC9B,OAAO;YACL;gBACE,MAAM,EAAE;oBACN,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;oBACjB,SAAS,EAAE,KAAK;oBAChB,GAAG,EAAE;wBACH,EAAE,QAAQ,EAAE,IAAI,EAAE;wBAClB,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAE,uCAAuC;qBAC1E;iBACF;aACF;YACD,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE;YACnE,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE;YAC7D,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;SAC1B,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,mBAAQ,CAAC,WAAW,CAAC,IAAI,CAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,cAAc,CAC3C,CAAC;IACF,MAAM,kBAAkB,GAAuB,EAAE,CAAC;IAClD,IACE,KAAK,CAAC,OAAO,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC;SAC7C,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,MAAM,CAAA,EACrC;QACA,kBAAkB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;KAC3D;IACD,kBAAkB,CAAC,IAAI,CACrB;QACE,MAAM,kBACJ,GAAG,EAAE;gBACH,GAAG,EAAE,GAAG;aACT,IACE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,KAAI,EAAE,CAAC,CACnC;KACF,EACD,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAC7D,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAC1B,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAC3B,cAAc,EACd,QAAQ,EACR,KAAK,GAKN,EAAE,EAAE;IACH,MAAM,gBAAgB,GAAG,mBAAQ,CAAC,WAAW,CAAC,IAAI,CAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,cAAc,CAC3C,CAAC;IACF,MAAM,kBAAkB,GAAuB,EAAE,CAAC;IAElD,sCAAsC;IACtC,IACE,KAAK,CAAC,OAAO,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC;SAC7C,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,MAAM,CAAA,EACrC;QACA,kBAAkB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;KAC3D;IAED,yBAAyB;IACzB,MAAM,eAAe,qBAChB,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,KAAI,EAAE,CAAC,CACnC,CAAC;IAEF,kCAAkC;IAClC,IAAI,QAAQ,EAAE;QACZ,IAAI;YACF,MAAM,gBAAgB,GAAG,IAAI,gBAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACtD,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAE3C,6CAA6C;YAC7C,qCAAqC;YACrC,qCAAqC;YACrC,yDAAyD;YACzD,eAAe,CAAC,GAAG,GAAG;gBACpB,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE;gBACzC,EAAE,cAAc,EAAE,gBAAgB,EAAE;gBACpC,EAAE,aAAa,EAAE,gBAAgB,EAAE;gBACnC,EAAE,aAAa,EAAE,cAAc,EAAE;aAClC,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,wDAAwD;YACxD,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;SACrC;KACF;IAED,kBAAkB,CAAC,IAAI,CAAC;QACtB,MAAM,EAAE,eAAe;KACxB,CAAC,CAAC;IAEH,8CAA8C;IAC9C,kBAAkB,CAAC,IAAI,CAAC;QACtB,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;KACzB,CAAC,CAAC;IAEH,0BAA0B;IAC1B,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE;QACtB,kBAAkB,CAAC,IAAI,CAAC;YACtB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;KACJ;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAO,IAAY,EAAE,MAAc,EAAE,EAAE;;IACpE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC;QAC5C;YACE,MAAM,EAAE;gBACN,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,IAAI;gBACd,IAAI;aACL;SACF;QACD;YACE,4CAA4C;YAC5C,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAC;gBACN,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb;SACF;QACD;YACE,iBAAiB;YACjB,OAAO,EAAE;gBACP,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBACvB,QAAQ,EAAE;oBACR;wBACE,MAAM,EAAE;4BACN,KAAK,EAAE;gCACL,GAAG,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;6BAC/B;4BACD,SAAS,EAAE,KAAK;yBACjB;qBACF;oBACD,GAAG,CAAC,mBAAQ,CAAC,SAAS,IAAI,CAAA,MAAA,mBAAQ,CAAC,SAAS,0CAAE,MAAM,IAAG,CAAC;wBACtD,CAAC,CAAC,mBAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAU,EAAE,GAAG,EAAE,EAAE;4BAC9C,GAAG,CAAC,IAAI,CACN;gCACE,OAAO,EAAE;oCACP,IAAI,EAAE,MAAM;oCACZ,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,SAAS,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE;oCAClD,EAAE,EAAE,UAAU,GAAG,CAAC,IAAI,EAAE;oCACxB,QAAQ,EAAE;wCACR;4CACE,MAAM,EAAE;gDACN,KAAK,EAAE;oDACL,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;iDACvB;6CACF;yCACF;wCACD;4CACE,QAAQ,EAAE;gDACR,GAAG,EAAE,CAAC;gDACN,GAAG,EAAE,CAAC;6CACP;yCACF;qCACF;iCACF;6BACF,EACD;gCACE,OAAO,EAAE;oCACP,IAAI,EAAE,WAAW,GAAG,CAAC,IAAI,EAAE;oCAC3B,0BAA0B,EAAE,IAAI;iCACjC;6BACF,CACF,CAAC;4BACF,OAAO,GAAG,CAAC;wBACb,CAAC,EAAE,EAAE,CAAC;wBACN,CAAC,CAAC;4BACA;gCACE,OAAO,EAAE;oCACP,IAAI,EAAE,MAAM;oCACZ,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;oCACpB,EAAE,EAAE,OAAO;oCACX,QAAQ,EAAE;wCACR;4CACE,MAAM,EAAE;gDACN,KAAK,EAAE;oDACL,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;iDACvB;6CACF;yCACF;wCACD;4CACE,QAAQ,EAAE;gDACR,GAAG,EAAE,CAAC;gDACN,GAAG,EAAE,CAAC;6CACP;yCACF;qCACF;iCACF;6BACF;4BACD;gCACE,OAAO,EAAE;oCACP,IAAI,EAAE,QAAQ;oCACd,0BAA0B,EAAE,IAAI;iCACjC;6BACF;yBACF,CAAC;oBACJ;wBACE,QAAQ,kBACN,QAAQ,EAAE,CAAC,EACX,IAAI,EAAE,CAAC,IACJ,+BAAoB,CACxB;qBACF;oBACD,IAAI;oBACJ,eAAe;oBACf,uBAAuB;oBACvB,6BAA6B;oBAC7B,oBAAoB;oBACpB,kBAAkB;oBAClB,UAAU;oBACV,oBAAoB;oBACpB,qBAAqB;oBACrB,0CAA0C;oBAC1C,eAAe;oBACf,aAAa;oBACb,WAAW;oBACX,UAAU;oBACV,sBAAsB;oBACtB,qCAAqC;oBACrC,oBAAoB;oBACpB,uBAAuB;oBACvB,aAAa;oBACb,WAAW;oBACX,SAAS;oBACT,OAAO;oBACP,KAAK;iBACN;gBACD,EAAE,EAAE,OAAO;aACZ;SACF;KACF,CAAC,CAAyB,CAAC;IAE5B,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAEpC,qDAAqD;IACrD,IACE,UAAU,CAAC,cAAc,KAAK,MAAM;QACpC,CAAC,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,YAAY,CAAC,EACjD;QACA,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;YAC7C,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,QAAQ,EAAE,UAAU,CAAC,YAAY;YACjC,KAAK,EAAE,UAAU,CAAC,SAAS;SAC5B,CAAC,CAAC;QAEH,MAAM,eAAe,GAAQ,IAAA,2BAAkB,EAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC5E,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;KAC9C;IACD,2DAA2D;SACtD,IACH,UAAU,CAAC,cAAc;QACzB,UAAU,CAAC,eAAe;QAC1B,UAAU,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EACrC;QACA,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;YAC7C,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,GAAG,EAAE,IAAA,8BAAqB,EAAC,UAAU,CAAC,eAAe,CAAC;SACvD,CAAC,CAAC;QACH,MAAM,eAAe,GAAQ,IAAA,2BAAkB,EAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC5E,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;KAC9C;IACD,IACE,UAAU,CAAC,cAAc;QACzB,UAAU,CAAC,IAAI;QACf,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAC1B;QACA,MAAM,oBAAoB,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CACjD,CAAC,GAAa,EAAE,OAAY,EAAE,EAAE;YAC9B,GAAG,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YACrC,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH,CAAC;QACF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;YAC7C,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,GAAG,EAAE,IAAA,8BAAqB,EAAC,oBAAoB,CAAC;SACjD,CAAC,CAAC;QAEH,MAAM,eAAe,GAAQ,IAAA,2BAAkB,EAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACnF,MAAM,eAAe,GAAQ,MAAM,eAAe,CAAC,SAAS,CAC1D,kBAAkB,CACnB,CAAC;QACF,2DAA2D;QAC3D,MAAM,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YACxE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YACrB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAChD,OAAO;gBACL,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,CAC1C,CAAC,YAAY,EAAE,EAAE,CAAC,kBAAkB,CAAC,YAAY,CAAC,CACnD;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IACD,IAAA,0BAAiB,EAAC,UAAU,CAAC,CAAC;IAC9B,OAAO,UAAU,CAAC;AACpB,CAAC,CAAA,CAAC;AA5MW,QAAA,eAAe,mBA4M1B;AAEK,MAAM,iBAAiB,GAAG,CAAO,IAAY,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvD,IAAI,UAAU,EAAE;QACd,MAAM,IAAA,qBAAa,EAAC,cAAc,IAAI,EAAE,EAAE,UAA6B,CAAC,CAAC;KAC1E;AACH,CAAC,CAAA,CAAC;AALW,QAAA,iBAAiB,qBAK5B;AAEK,MAAM,qBAAqB,GAAG,CACnC,SAAmB,EACnB,MAAc,EACd,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAC/B;QACE,OAAO,EAAE;YACP,GAAG,EAAE,SAAS;SACf;KACF,EACD,MAAM,CACP,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnB,IAAI,SAAS,CAAC,MAAM,EAAE;QACpB,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,IAAA,wBAAgB,EAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAlBW,QAAA,qBAAqB,yBAkBhC;AAEK,MAAM,aAAa,GAAG,CAAO,IAAY,EAAE,MAAc,EAAE,EAAE;;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,QAAQ,GAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC;QAC1C;YACE,MAAM,EAAE;gBACN,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,IAAI;aACX;SACF;QACD;YACE,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;gBACZ,GAAG,EAAE,CAAC;aACP;SACF;QACD;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,SAAS;gBACf,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;gBAC5B,QAAQ,EAAE;oBACR;wBACE,MAAM,EAAE;4BACN,KAAK,EAAE;gCACL,GAAG,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC;6BAC3B;4BACD,SAAS,EAAE,KAAK;4BAChB,QAAQ,EAAE,IAAI;yBACf;qBACF;oBACD;wBACE,QAAQ,kBACN,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,CAAC,IACR,+BAAoB,CACxB;qBACF;oBACD;wBACE,OAAO,EAAE;4BACP,IAAI,EAAE,OAAO;4BACb,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;4BACvB,QAAQ,EAAE;gCACR;oCACE,MAAM,EAAE;wCACN,KAAK,EAAE;4CACL,GAAG,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;yCAC/B;wCACD,SAAS,EAAE,KAAK;qCACjB;iCACF;gCACD,GAAG,CAAC,mBAAQ,CAAC,SAAS,IAAI,CAAA,MAAA,mBAAQ,CAAC,SAAS,0CAAE,MAAM,IAAG,CAAC;oCACtD,CAAC,CAAC,mBAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAU,EAAE,GAAG,EAAE,EAAE;wCAC9C,GAAG,CAAC,IAAI,CACN;4CACE,OAAO,EAAE;gDACP,IAAI,EAAE,MAAM;gDACZ,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,SAAS,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE;gDAClD,EAAE,EAAE,UAAU,GAAG,CAAC,IAAI,EAAE;gDACxB,QAAQ,EAAE;oDACR;wDACE,MAAM,EAAE;4DACN,KAAK,EAAE;gEACL,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;6DACvB;yDACF;qDACF;oDACD;wDACE,QAAQ,EAAE;4DACR,GAAG,EAAE,CAAC;4DACN,GAAG,EAAE,CAAC;yDACP;qDACF;iDACF;6CACF;yCACF,EACD;4CACE,OAAO,EAAE;gDACP,IAAI,EAAE,WAAW,GAAG,CAAC,IAAI,EAAE;gDAC3B,0BAA0B,EAAE,IAAI;6CACjC;yCACF,CACF,CAAC;wCACF,OAAO,GAAG,CAAC;oCACb,CAAC,EAAE,EAAE,CAAC;oCACN,CAAC,CAAC;wCACA;4CACE,OAAO,EAAE;gDACP,IAAI,EAAE,MAAM;gDACZ,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;gDACpB,EAAE,EAAE,OAAO;gDACX,QAAQ,EAAE;oDACR;wDACE,MAAM,EAAE;4DACN,KAAK,EAAE;gEACL,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;6DACvB;yDACF;qDACF;oDACD;wDACE,QAAQ,EAAE;4DACR,GAAG,EAAE,CAAC;4DACN,GAAG,EAAE,CAAC;yDACP;qDACF;iDACF;6CACF;yCACF;wCACD;4CACE,OAAO,EAAE;gDACP,IAAI,EAAE,QAAQ;gDACd,0BAA0B,EAAE,IAAI;6CACjC;yCACF;qCACF,CAAC;gCACJ;oCACE,QAAQ,kBACN,QAAQ,EAAE,CAAC,EACX,IAAI,EAAE,CAAC,IACJ,+BAAoB,CACxB;iCACF;gCACD,IAAI;gCACJ,eAAe;gCACf,uBAAuB;gCACvB,6BAA6B;gCAC7B,oBAAoB;gCACpB,kBAAkB;gCAClB,UAAU;gCACV,oBAAoB;gCACpB,qBAAqB;gCACrB,0CAA0C;gCAC1C,eAAe;gCACf,aAAa;gCACb,WAAW;gCACX,UAAU;gCACV,sBAAsB;gCACtB,qCAAqC;gCACrC,oBAAoB;gCACpB,uBAAuB;gCACvB,aAAa;gCACb,WAAW;gCACX,SAAS;gCACT,OAAO;gCACP,KAAK;6BACN;4BACD,EAAE,EAAE,OAAO;yBACZ;qBACF;iBACF;gBACD,EAAE,EAAE,aAAa;aAClB;SACF;KACF,CAAC,CAAuB,CAAC;IAE1B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IACD,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,MAAM,IAAA,6BAAoB,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACtF,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACtC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAClC;QACA,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAqB,EAAE,EAAE;YACxD,IAAA,0BAAiB,EAAC,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;KACJ;IACD,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CACtD,CAAC,GAAQ,EAAE,UAAe,EAAE,EAAE;QAC5B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IACF,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO;SACtC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC5D,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/B,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;AACrB,CAAC,CAAA,CAAC;AAlLW,QAAA,aAAa,iBAkLxB;AAEK,MAAM,eAAe,GAAG,CAAO,IAAY,EAAE,MAAc,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnD,IAAI,QAAQ,EAAE;QACZ,MAAM,IAAA,qBAAa,EAAC,YAAY,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;KACnD;AACH,CAAC,CAAA,CAAC;AALW,QAAA,eAAe,mBAK1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,cAAsB,EACtB,MAAyB,EACzB,MAAc,EACd,EAAE;IACF,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAC/B;QACE,cAAc,EAAE,cAAc;QAC9B,eAAe,EAAE;YACf,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SAC/C;KACF,EACD,UAAU,CACX,CAAC,IAAI,EAAE,CAAC;IACT,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAA,6BAAqB,EACnB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EACxC,MAAM,CACP,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,IAAA,wBAAgB,EAAC,cAAc,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B;AAEK,MAAM,eAAe,GAAG,CAAC,IAAuB,EAAE,IAAY,EAAE,EAAE;IACvE,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI;QAChD,IAAA,wBAAgB,EAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAHW,QAAA,eAAe,mBAG1B"}
+{"version":3,"file":"dataService.js","sourceRoot":"","sources":["../../../../../libs/node/src/services/dataService.ts"],"names":[],"mappings":"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"}

package/src/services/dbService.d.ts

@@ -8,9 +8,10 @@ export declare function getAll<T>(Modal: Model<T>, query?: FilterQuery<T>, optio
 export declare function list<T>(Modal: IModel<T>, where: FilterQuery<T>, options: QueryOptions<T>): Promise<any>;
 export declare function getOne<T>(Modal: Model<T>, query: FilterQuery<T>, projection?: ProjectionType<T>): Promise<HydratedDocument<T>>;
 export declare function bulkInsert<T>(Modal: Model<T>, docs: T[]): Promise<Array<HydratedDocument<T>>>;
-export declare function checkUnique<T extends EntityType>({ Modal, uniqueField, errorMessage, value }: {
+export declare function checkUnique<T extends EntityType>({ Modal, uniqueField, errorMessage, value, query: additionalQuery }: {
     Modal: Model<T>;
     uniqueField: keyof T;
     value: any;
     errorMessage: string;
+    query?: Record<string, any>;
 }): Promise<void>;

package/src/services/dbService.js

@@ -73,14 +73,16 @@ function bulkInsert(Modal, docs) {
     });
 }
 exports.bulkInsert = bulkInsert;
-function checkUnique({ Modal, uniqueField, errorMessage, value }) {
+function checkUnique({ Modal, uniqueField, errorMessage, value, query: additionalQuery }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const query = { [uniqueField]: value };
+        const query = Object.assign({ [uniqueField]: value }, additionalQuery);
         let result;
         try {
             result = yield getOne(Modal, query);
         }
-        catch (error) { }
+        catch (error) {
+            // eslint-disable-next-line no-empty
+        }
         if (result)
             throw new Error(errorMessage);
     });

package/src/services/dbService.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbService.js","sourceRoot":"","sources":["../../../../../libs/node/src/services/dbService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dbService.js","sourceRoot":"","sources":["../../../../../libs/node/src/services/dbService.ts"],"names":[],"mappings":"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"}

package/src/types/IRequest.d.ts

@@ -3,4 +3,12 @@ export interface IRequest extends Request {
     i18n?: {
         t: (key: string) => string;
     };
+    defaultQueryFields?: {
+        clientId?: string;
+        clientDomainName?: string;
+    };
+    defaultStoreFields?: {
+        clientId?: string;
+        clientDomainName?: string;
+    };
 }

package/src/types/common.d.ts

@@ -17,7 +17,6 @@ export interface IPageSchema extends Document {
     name: string;
     code: string;
     slug: string;
-    isActive: boolean;
     canDel: boolean;
     widgets: string[];
     filterQuery: string;
@@ -49,8 +48,6 @@ export interface IWidgetSchema extends Document {
     widgetType: WidgetTypes;
     collectionName: string;
     collectionItems: string[];
-    blogCategory?: string;
-    blogLimit?: number;
     tabs: {
         name: string;
         names?: LanguageSchemaFieldType;
@@ -85,10 +82,16 @@ export type CollectionItem = {
     title: string;
     collectionName: string;
     filters?: {
-        [key: string]: string | number | boolean;
+        [key: string]: string | number | boolean | ObjectType;
+    };
+    /** Dynamic filters function - receives request object and returns filters */
+    getFilters?: (req: any) => {
+        [key: string]: any;
     };
     searchColumns?: string[];
     match?: ObjectType;
+    /** Dynamic match function - receives request object and returns match query for aggregation */
+    getMatch?: (req: any) => ObjectType;
     aggregations?: any[];
     searchLimit?: number;
 };

package/src/types/enums.d.ts

@@ -1,15 +1,12 @@
 export declare enum ItemsType {
-    Image = "Image",
-    Pages = "pages",
-    Links = "links"
+    Image = "Image"
 }
 export declare enum WidgetTypes {
     FixedCard = "FixedCard",
     Carousel = "Carousel",
     Tabs = "Tabs",
     Text = "Text",
-    HTML = "HTML",
-    Links = "Links"
+    HTML = "HTML"
 }
 export declare enum ItemTypes {
     Web = "Web",

package/src/types/enums.js

@@ -4,8 +4,6 @@ exports.ItemTypes = exports.WidgetTypes = exports.ItemsType = void 0;
 var ItemsType;
 (function (ItemsType) {
     ItemsType["Image"] = "Image";
-    ItemsType["Pages"] = "pages";
-    ItemsType["Links"] = "links";
 })(ItemsType = exports.ItemsType || (exports.ItemsType = {}));
 var WidgetTypes;
 (function (WidgetTypes) {
@@ -14,7 +12,6 @@ var WidgetTypes;
     WidgetTypes["Tabs"] = "Tabs";
     WidgetTypes["Text"] = "Text";
     WidgetTypes["HTML"] = "HTML";
-    WidgetTypes["Links"] = "Links";
 })(WidgetTypes = exports.WidgetTypes || (exports.WidgetTypes = {}));
 var ItemTypes;
 (function (ItemTypes) {

package/src/types/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../libs/node/src/types/enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,4BAAe,CAAA;IACf,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAED,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,sCAAuB,CAAA;IACvB,oCAAqB,CAAA;IACrB,4BAAa,CAAA;IACb,4BAAa,CAAA;IACb,4BAAa,CAAA;IACb,8BAAe,CAAA;AACjB,CAAC,EAPW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAOtB;AAED,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../../libs/node/src/types/enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,4BAAe,CAAA;AACjB,CAAC,EAFW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAEpB;AAED,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,sCAAuB,CAAA;IACvB,oCAAqB,CAAA;IACrB,4BAAa,CAAA;IACb,4BAAa,CAAA;IACb,4BAAa,CAAA;AACf,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAED,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"}

package/src/utils/helper.d.ts

@@ -1,6 +1,6 @@
 import { Models, Types } from 'mongoose';
-import { IWidgetSchema, SrcSetItem } from '../types';
-export declare function appendCollectionData(widgetData: IWidgetSchema[], models: Models): Promise<IWidgetSchema[]>;
+import { IRequest, IWidgetSchema, SrcSetItem } from '../types';
+export declare function appendCollectionData(widgetData: IWidgetSchema[], models: Models, req?: IRequest): Promise<IWidgetSchema[]>;
 export declare function buildSrcSetItem(uri: string, setItem: SrcSetItem): string;
 export declare function AddSrcSetsToItems(widgetData: IWidgetSchema): void;
 export declare const getCollectionModal: (collectionName: string, models: Models) => any;

package/src/utils/helper.js

@@ -4,7 +4,7 @@ exports.formatCollectionItems = exports.getCollectionModal = exports.AddSrcSetsT
 const tslib_1 = require("tslib");
 const mongoose_1 = require("mongoose");
 const defaults_1 = require("./defaults");
-function appendCollectionData(widgetData, models) {
+function appendCollectionData(widgetData, models, req) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { Widget } = models;
         // reduce widget data to optimize query
@@ -21,67 +21,7 @@ function appendCollectionData(widgetData, models) {
             return acc;
         }, {});
         if (Object.keys(newData).length > 0) {
-            // Fetch latest blogs for widgets with category/limit configuration
-            const blogWidgetsData = {};
-            for (const widget of widgetData) {
-                if (widget.collectionName === 'blog' && (widget.blogCategory || widget.blogLimit)) {
-                    try {
-                        const collectionConfig = defaults_1.defaults.collections.find((c) => c.collectionName === widget.collectionName);
-                        const aggregateQueryItem = [];
-                        // Add custom aggregations from config
-                        if (Array.isArray(collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations) &&
-                            (collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations.length)) {
-                            aggregateQueryItem.push(...collectionConfig.aggregations);
-                        }
-                        // Build match conditions
-                        const matchConditions = Object.assign({}, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {}));
-                        // Add category filter if provided
-                        if (widget.blogCategory) {
-                            const categoryObjectId = new mongoose_1.Types.ObjectId(widget.blogCategory);
-                            const categoryString = widget.blogCategory.toString();
-                            // Handle multiple category field structures:
-                            // - Array of ObjectIds (unpopulated)
-                            // - Populated objects with _id field
-                            // - Populated objects with id field (ObjectId or string)
-                            matchConditions.$or = [
-                                { category: { $in: [categoryObjectId] } },
-                                { 'category._id': categoryObjectId },
-                                { 'category.id': categoryObjectId },
-                                { 'category.id': categoryString },
-                            ];
-                        }
-                        // Add match, sort, and limit stages
-                        aggregateQueryItem.push({
-                            $match: matchConditions,
-                        });
-                        aggregateQueryItem.push({
-                            $sort: { createdAt: -1 },
-                        });
-                        if (widget.blogLimit && widget.blogLimit > 0) {
-                            aggregateQueryItem.push({
-                                $limit: widget.blogLimit,
-                            });
-                        }
-                        // Fetch data from collection
-                        const collectionModal = (0, exports.getCollectionModal)(widget.collectionName, models);
-                        const collectionItems = yield collectionModal.aggregate(aggregateQueryItem);
-                        blogWidgetsData[widget.code] = collectionItems;
-                    }
-                    catch (error) {
-                        blogWidgetsData[widget.code] = [];
-                    }
-                }
-            }
-            // Apply blog widgets data
-            if (Object.keys(blogWidgetsData).length > 0) {
-                widgetData = widgetData.map((widget) => {
-                    if (blogWidgetsData[widget.code]) {
-                        return Object.assign(Object.assign({}, widget), { collectionItems: blogWidgetsData[widget.code] });
-                    }
-                    return widget;
-                });
-            }
-            const aggregationQueryCollectionItems = buildCollectionItemsQuery(newData);
+            const aggregationQueryCollectionItems = buildCollectionItemsQuery(newData, req);
             if (aggregationQueryCollectionItems.length > 0) {
                 // getting collection data by populating widget
                 let aggregationData = yield Widget.aggregate(aggregationQueryCollectionItems);
@@ -93,17 +33,13 @@ function appendCollectionData(widgetData, models) {
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 widgetData = widgetData.map((widget) => {
-                    // Skip widgets already processed by blog section
-                    if (blogWidgetsData[widget.code]) {
-                        return widget;
-                    }
                     if (aggregationData[widget.code]) {
                         return Object.assign(Object.assign({}, widget), { collectionItems: aggregationData[widget.code] });
                     }
                     return widget;
                 });
             }
-            const aggregationQueryTabs = buildTabCollectionItemsQuery(newData);
+            const aggregationQueryTabs = buildTabCollectionItemsQuery(newData, req);
             if (aggregationQueryTabs.length > 0) {
                 let aggregationDataTabs = yield Widget.aggregate(aggregationQueryTabs);
                 aggregationDataTabs = aggregationDataTabs.reduce((acc, aggregation) => {
@@ -138,7 +74,7 @@ function appendCollectionData(widgetData, models) {
     });
 }
 exports.appendCollectionData = appendCollectionData;
-function buildCollectionItemsQuery(formattedWidgetData) {
+function buildCollectionItemsQuery(formattedWidgetData, req) {
     const aggregationQuery = [
         {
             $match: {
@@ -159,44 +95,19 @@ function buildCollectionItemsQuery(formattedWidgetData) {
     Object.keys(formattedWidgetData).forEach((key) => {
         if (formattedWidgetData[key].collectionItems &&
             formattedWidgetData[key].collectionItems.length > 0) {
-            const ids = (0, exports.formatCollectionItems)(formattedWidgetData[key].collectionItems);
-            // Handle built-in "pages" collection
-            if (formattedWidgetData[key].collectionName === 'pages') {
-                aggregationQuery.push({
-                    $lookup: {
-                        from: 'pages',
-                        pipeline: [
-                            {
-                                $match: {
-                                    _id: { $in: ids },
-                                    isDeleted: false,
-                                    $or: [
-                                        { isActive: true },
-                                        { isActive: { $exists: false } } // Include pages without isActive field
-                                    ],
-                                },
-                            },
-                            { $project: { _id: 1, name: 1, slug: 1, code: 1, filterQuery: 1 } },
-                            { $addFields: { __order: { $indexOfArray: [ids, '$_id'] } } },
-                            { $sort: { __order: 1 } },
-                        ],
-                        as: formattedWidgetData[key].code,
-                    },
-                });
-                return;
-            }
             const aggregationQueryPiplelines = [];
             collectionConfig = defaults_1.defaults.collections.find((c) => c.collectionName === formattedWidgetData[key].collectionName);
             if (Array.isArray(collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations) &&
                 (collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations.length)) {
                 aggregationQueryPiplelines.push(...collectionConfig.aggregations);
             }
+            const ids = (0, exports.formatCollectionItems)(formattedWidgetData[key].collectionItems);
             // Build piplelines with config
             aggregationQueryPiplelines.push(...[
                 {
-                    $match: Object.assign({ _id: {
+                    $match: Object.assign(Object.assign({ _id: {
                             $in: ids,
-                        } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})),
+                        } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})), ((req === null || req === void 0 ? void 0 : req.defaultQueryFields) || {})),
                 },
                 {
                     $project: Object.assign({}, defaults_1.commonExcludedFields),
@@ -216,7 +127,7 @@ function buildCollectionItemsQuery(formattedWidgetData) {
     });
     return aggregationQuery;
 }
-function buildTabCollectionItemsQuery(formattedWidgetData) {
+function buildTabCollectionItemsQuery(formattedWidgetData, req) {
     const aggregationQuery = [
         {
             $match: {
@@ -237,33 +148,6 @@ function buildTabCollectionItemsQuery(formattedWidgetData) {
     Object.keys(formattedWidgetData).forEach((key) => {
         if (formattedWidgetData[key].tabs &&
             formattedWidgetData[key].tabs.length > 0) {
-            const tabIds = formattedWidgetData[key].tabs.reduce((arr, tabItem) => {
-                arr.push(...(0, exports.formatCollectionItems)(tabItem.collectionItems));
-                return arr;
-            }, []);
-            // Handle built-in "pages" collection
-            if (formattedWidgetData[key].collectionName === 'pages') {
-                aggregationQuery.push({
-                    $lookup: {
-                        from: 'pages',
-                        pipeline: [
-                            {
-                                $match: {
-                                    _id: { $in: tabIds },
-                                    isDeleted: false,
-                                    $or: [
-                                        { isActive: true },
-                                        { isActive: { $exists: false } } // Include pages without isActive field
-                                    ],
-                                },
-                            },
-                            { $project: { _id: 1, name: 1, slug: 1, code: 1, filterQuery: 1 } },
-                        ],
-                        as: formattedWidgetData[key].code,
-                    },
-                });
-                return;
-            }
             const aggregationQueryPiplelines = [];
             collectionConfig = defaults_1.defaults.collections.find((c) => c.collectionName === formattedWidgetData[key].collectionName);
             if (Array.isArray(collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.aggregations) &&
@@ -273,9 +157,12 @@ function buildTabCollectionItemsQuery(formattedWidgetData) {
             // Build piplelines with config
             aggregationQueryPiplelines.push(...[
                 {
-                    $match: Object.assign({ _id: {
-                            $in: tabIds,
-                        } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})),
+                    $match: Object.assign(Object.assign({ _id: {
+                            $in: formattedWidgetData[key].tabs.reduce((arr, tabItem) => {
+                                arr.push(...(0, exports.formatCollectionItems)(tabItem.collectionItems));
+                                return arr;
+                            }, []),
+                        } }, ((collectionConfig === null || collectionConfig === void 0 ? void 0 : collectionConfig.match) || {})), ((req === null || req === void 0 ? void 0 : req.defaultQueryFields) || {})),
                 },
                 {
                     $project: Object.assign({}, defaults_1.commonExcludedFields),
@@ -315,25 +202,12 @@ function AddSrcSetsToItems(widgetData) {
 }
 exports.AddSrcSetsToItems = AddSrcSetsToItems;
 const getCollectionModal = (collectionName, models) => {
-    let collectionModal;
-    if (models && models[collectionName]) {
-        collectionModal = models[collectionName];
-    }
-    else if (models &&
-        models[collectionName.charAt(0).toUpperCase() + collectionName.slice(1)]) {
-        collectionModal =
-            models[collectionName.charAt(0).toUpperCase() + collectionName.slice(1)];
-    }
-    else {
-        try {
-            collectionModal = (0, mongoose_1.model)(collectionName);
-        }
-        catch (error) {
-            if (!collectionModal) {
-                const schema = new mongoose_1.Schema({}, { strict: false });
-                collectionModal = (0, mongoose_1.model)(collectionName, schema, collectionName);
-            }
-        }
+    let collectionModal = models[collectionName];
+    if (!collectionModal)
+        collectionModal = models[collectionName.charAt(0).toUpperCase() + collectionName.slice(1)];
+    if (!collectionModal) {
+        const schema = new mongoose_1.Schema({}, { strict: false });
+        collectionModal = (0, mongoose_1.model)(collectionName, schema, collectionName);
     }
     return collectionModal;
 };