@webtypen/webframez-core 0.3.63 → 0.3.65

package/dist/Datatable/Datatable.d.ts

@@ -1,4 +1,14 @@
 import { Request } from "../Router/Request";
+export interface DatatableModelSelectorConfig {
+    value?: string;
+    label?: string;
+    subtitle?: string;
+}
+export interface NormalizedDatatableModelSelectorConfig {
+    value: string;
+    label: string;
+    subtitle?: string;
+}
 export declare class Datatable {
     collection: string | Function;
     aggregation: {
@@ -26,6 +36,7 @@ export declare class Datatable {
     defaultUnwind?: string | null;
     disablePerPageConfig: boolean;
     selectable: boolean;
+    modelSelector: boolean | DatatableModelSelectorConfig;
     selectableFunctions: {
         [key: string]: {
             label: string;
@@ -38,6 +49,8 @@ export declare class Datatable {
         };
     } | null;
     getInit(req: Request): Promise<any>;
+    getModelSelectorConfig(): NormalizedDatatableModelSelectorConfig | null;
+    getModelSelectorPreview(req: Request): Promise<any>;
     getSelectableFunctionsDef(req: Request): Promise<{
         label: string;
         icon: string | undefined;

package/dist/Datatable/Datatable.js

@@ -8,12 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Datatable = void 0;
 const moment_1 = __importDefault(require("moment"));
+const mongodb_1 = require("mongodb");
 const DBConnection_1 = require("../Database/DBConnection");
 const NumericFunctions_1 = require("../Functions/NumericFunctions");
 class Datatable {
@@ -32,6 +44,7 @@ class Datatable {
         this.defaultUnwind = null;
         this.disablePerPageConfig = false;
         this.selectable = false;
+        this.modelSelector = false;
         this.selectableFunctions = null;
     }
     getInit(req) {
@@ -41,6 +54,10 @@ class Datatable {
                 selectable: this.selectable ? true : false,
                 selectableFunctions: yield this.getSelectableFunctionsDef(req),
             };
+            const modelSelector = this.getModelSelectorConfig();
+            if (modelSelector) {
+                out.modelSelector = modelSelector;
+            }
             const promises = [];
             promises.push(new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 out.filter = yield this.getFilter(req);
@@ -78,6 +95,73 @@ class Datatable {
             return out;
         });
     }
+    getModelSelectorConfig() {
+        if (!this.modelSelector) {
+            return null;
+        }
+        const config = this.modelSelector === true ? {} : this.modelSelector;
+        const subtitle = typeof config.subtitle === "string" && config.subtitle.trim() !== "" ? config.subtitle : undefined;
+        return Object.assign({ value: typeof config.value === "string" && config.value.trim() !== "" ? config.value.trim() : "_id", label: typeof config.label === "string" && config.label.trim() !== "" ? config.label.trim() : "_id" }, (subtitle ? { subtitle: subtitle.trim() } : {}));
+    }
+    getModelSelectorPreview(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = this.getModelSelectorConfig();
+            if (!config) {
+                throw new Error("Datatable is not enabled for model selection.");
+            }
+            const rawValue = req.body.value;
+            if (rawValue === undefined || rawValue === null || rawValue === "") {
+                return null;
+            }
+            let value = rawValue;
+            if (config.value === "_id") {
+                if (rawValue instanceof mongodb_1.ObjectId) {
+                    value = rawValue;
+                }
+                else if (typeof rawValue === "string" && mongodb_1.ObjectId.isValid(rawValue)) {
+                    value = new mongodb_1.ObjectId(rawValue);
+                }
+                else {
+                    return null;
+                }
+            }
+            const normalizeStages = (stages) => (stages !== null && stages !== void 0 ? stages : []).map((stage) => {
+                if (!stage || typeof stage !== "object" || !Object.prototype.hasOwnProperty.call(stage, "skipStats")) {
+                    return stage;
+                }
+                const { skipStats: _skipStats } = stage, normalized = __rest(stage, ["skipStats"]);
+                return normalized;
+            });
+            const aggregation = [
+                ...normalizeStages(yield this.getAggregation(req)),
+                ...normalizeStages(yield this.getSubAggregation(req)),
+                { $match: { [config.value]: value } },
+                { $limit: 1 },
+            ];
+            const connection = yield DBConnection_1.DBConnection.getConnection();
+            const results = yield connection.client
+                .db(null)
+                .collection(yield this.getCollection(req))
+                .aggregate(aggregation, {
+                collation: {
+                    locale: "de",
+                    strength: 2,
+                },
+            })
+                .toArray();
+            if (!results[0]) {
+                return null;
+            }
+            let result = results[0];
+            if (this.onRow) {
+                result = yield this.onRow(result);
+            }
+            if (this.onAttributes) {
+                result.__cellattr = yield this.onAttributes(result);
+            }
+            return result;
+        });
+    }
     getSelectableFunctionsDef(req) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.selectableFunctions) {

package/dist/Datatable/DatatableController.js

@@ -43,6 +43,18 @@ class DatatableController extends Controller_1.Controller {
                 });
             }
             const table = new tableClass();
+            if (req.body.mode === "model-selector-preview") {
+                if (!table.getModelSelectorConfig()) {
+                    return res.status(403).send({
+                        status: "error",
+                        message: "Datatable is not enabled for model selection.",
+                    });
+                }
+                return res.send({
+                    status: "success",
+                    data: yield table.getModelSelectorPreview(req),
+                });
+            }
             if (req.body.type === "stats" || req.body.mode === "stats") {
                 return res.send({
                     status: "success",

package/dist/Notifications/NotificationService.d.ts

@@ -123,6 +123,8 @@ declare class NotificationServiceFacade {
     set registy(registry: {
         [key: string]: NotificationDefinition;
     });
+    private getObjectIdString;
+    private normalizeObjectId;
     private getNotificationReferenceId;
     init(): void;
     registerType(type: NotificationDefinition): this;

package/dist/Notifications/NotificationService.js

@@ -56,16 +56,23 @@ class NotificationServiceFacade {
     set registy(registry) {
         this.registry = registry;
     }
-    getNotificationReferenceId(notificationRef) {
-        const notificationId = typeof notificationRef === "string"
-            ? notificationRef
-            : notificationRef && typeof notificationRef.toString === "function"
-                ? notificationRef.toString()
+    getObjectIdString(value) {
+        const objectIdString = typeof value === "string"
+            ? value
+            : value && typeof value.toString === "function"
+                ? value.toString()
                 : null;
-        return notificationId && notificationId.length === 24 && mongodb_1.ObjectId.isValid(notificationId)
-            ? notificationId
+        return objectIdString && objectIdString.length === 24 && mongodb_1.ObjectId.isValid(objectIdString)
+            ? objectIdString
             : null;
     }
+    normalizeObjectId(value) {
+        const objectIdString = this.getObjectIdString(value);
+        return objectIdString ? new mongodb_1.ObjectId(objectIdString) : null;
+    }
+    getNotificationReferenceId(notificationRef) {
+        return this.getObjectIdString(notificationRef);
+    }
     init() {
         this.registry = {};
         this.notificationsConfig = Config_1.Config.get("notifications") || {};
@@ -168,14 +175,11 @@ class NotificationServiceFacade {
         return this.targetRegistry[target] || null;
     }
     normalizeTargetId(targetId) {
-        var _a;
-        if (targetId instanceof mongodb_1.ObjectId)
-            return targetId;
-        const value = typeof targetId === "string" ? targetId : (_a = targetId === null || targetId === void 0 ? void 0 : targetId.toString) === null || _a === void 0 ? void 0 : _a.call(targetId);
-        if (typeof value !== "string" || value.length !== 24 || !mongodb_1.ObjectId.isValid(value)) {
+        const normalized = this.normalizeObjectId(targetId);
+        if (!normalized) {
             throw new NotificationTargetValidationError("Invalid notification target_id.");
         }
-        return new mongodb_1.ObjectId(value);
+        return normalized;
     }
     normalizeTargetContext(context) {
         if (!context || typeof context.target !== "string" || context.target.trim() === "") {
@@ -243,15 +247,8 @@ class NotificationServiceFacade {
         return notification;
     }
     getModelId(model) {
-        var _a, _b;
-        const value = (_a = model === null || model === void 0 ? void 0 : model._id) !== null && _a !== void 0 ? _a : model === null || model === void 0 ? void 0 : model.id;
-        if (value instanceof mongodb_1.ObjectId)
-            return value;
-        const stringValue = typeof value === "string" ? value : (_b = value === null || value === void 0 ? void 0 : value.toString) === null || _b === void 0 ? void 0 : _b.call(value);
-        if (typeof stringValue === "string" && stringValue.length === 24 && mongodb_1.ObjectId.isValid(stringValue)) {
-            return new mongodb_1.ObjectId(stringValue);
-        }
-        return null;
+        var _a;
+        return this.normalizeObjectId((_a = model === null || model === void 0 ? void 0 : model._id) !== null && _a !== void 0 ? _a : model === null || model === void 0 ? void 0 : model.id);
     }
     getPreferencesField(target) {
         var _a;
@@ -746,18 +743,9 @@ class NotificationServiceFacade {
     getNotificationForTarget(notificationRef, context) {
         return __awaiter(this, void 0, void 0, function* () {
             const notificationId = notificationRef instanceof Notification_1.Notification ? notificationRef._id : notificationRef;
-            if (!notificationId)
+            const objectId = this.normalizeObjectId(notificationId);
+            if (!objectId)
                 return null;
-            let objectId;
-            if (notificationId instanceof mongodb_1.ObjectId) {
-                objectId = notificationId;
-            }
-            else if (typeof notificationId === "string" && mongodb_1.ObjectId.isValid(notificationId)) {
-                objectId = new mongodb_1.ObjectId(notificationId);
-            }
-            else {
-                return null;
-            }
             const notifications = yield Notification_1.Notification.aggregate([
                 {
                     $match: Object.assign(Object.assign({}, (yield this.getLoadMatch(context))), { _id: objectId }),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.63",
+    "version": "0.3.65",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",