@optimiser/common 1.0.428 → 1.0.430

package/dist/aws/awsservices.d.ts

@@ -33,6 +33,12 @@ export default class AwsServices {
     GeneratePreSignedUrlNotAccelerated(params: {
         [key: string]: any;
     }): Promise<string | Error>;
+    GeneratePreSignedUrlForVideoUpload(params: {
+        [key: string]: any;
+    }): Promise<string | Error>;
+    GeneratePreSignedUrlForPlayback(params: {
+        [key: string]: any;
+    }): Promise<string | Error>;
     GeneratePreSignedUrl(Bucket: string, Path: string, Acl: string, Region: string, ContentType: string, FileName: string, ContryRegionName: string): Promise<string | Error>;
     ImageUpload(BucketName: string, Region: string, FilePath: string, base64String: string, ContentType: string, FileName: string, FileType: string, UploadType: string, Acltype: string, Socketid: string, req: Express.Request): Promise<S3.ManagedUpload.SendData | Error>;
     uploadFromStream(params: S3.Types.PutObjectRequest): Promise<S3.ManagedUpload.SendData>;

package/dist/aws/awsservices.js

@@ -293,6 +293,59 @@ var AwsServices = /** @class */ (function () {
             });
         });
     };
+    AwsServices.prototype.GeneratePreSignedUrlForVideoUpload = function (params) {
+        var region = params.region, bucket = params.bucket, path = params.path, _a = params.expires, expires = _a === void 0 ? 60 : _a, _b = params.acl, acl = _b === void 0 ? 'private' : _b, _c = params.contentType, contentType = _c === void 0 ? 'application/octet-stream' : _c, _d = params.accessKeyId, accessKeyId = _d === void 0 ? this.accessKeyId : _d, _e = params.secretAccessKey, secretAccessKey = _e === void 0 ? this.secretAccessKey : _e;
+        if (params.accessType != '' && params.accessType != undefined && params.accessType != null) {
+            acl = params.accessType;
+        }
+        var S3 = new aws_sdk_1.default.S3({
+            accessKeyId: accessKeyId,
+            secretAccessKey: secretAccessKey,
+            region: region,
+            endpoint: new aws_sdk_1.default.Endpoint("optimiser-".concat(params.bucketSuffix, ".s3-accelerate.amazonaws.com")),
+            useAccelerateEndpoint: true,
+            s3ForcePathStyle: true,
+            signatureVersion: 'v4'
+        });
+        var Params = { Bucket: bucket, Key: path, Expires: expires, ACL: acl, ContentType: contentType };
+        return new Promise(function (resolve, reject) {
+            S3.getSignedUrl('putObject', Params, function (err, url) {
+                if (err) {
+                    resolve(err);
+                }
+                else {
+                    resolve(url);
+                }
+            });
+        });
+    };
+    AwsServices.prototype.GeneratePreSignedUrlForPlayback = function (params) {
+        var region = params.region, bucket = params.bucket, path = params.path, _a = params.expires, expires = _a === void 0 ? 3600 : _a, _b = params.accessKeyId, accessKeyId = _b === void 0 ? this.accessKeyId : _b, _c = params.secretAccessKey, secretAccessKey = _c === void 0 ? this.secretAccessKey : _c;
+        var S3 = new aws_sdk_1.default.S3({
+            accessKeyId: accessKeyId,
+            secretAccessKey: secretAccessKey,
+            region: region,
+            endpoint: new aws_sdk_1.default.Endpoint("optimiser-".concat(params.bucketSuffix, ".s3-accelerate.amazonaws.com")),
+            useAccelerateEndpoint: true,
+            s3ForcePathStyle: true,
+            signatureVersion: 'v4'
+        });
+        var Params = {
+            Bucket: bucket,
+            Key: path,
+            Expires: expires
+        };
+        return new Promise(function (resolve, reject) {
+            S3.getSignedUrl('getObject', Params, function (err, url) {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(url);
+                }
+            });
+        });
+    };
     AwsServices.prototype.GeneratePreSignedUrl = function (Bucket, Path, Acl, Region, ContentType, FileName, ContryRegionName) {
         var _this = this;
         return new Promise(function (resolve, reject) {

package/dist/lib/utility.js

@@ -106,6 +106,7 @@ var sanitize_html_1 = __importDefault(require("sanitize-html"));
 var sanitize = require('mongo-sanitize');
 var phoneUtil = require("google-libphonenumber").PhoneNumberUtil.getInstance();
 var qrcode = require('qrcode');
+var convert = require('html-to-text').convert;
 var _settingData = {};
 function GetObjectByKeyValueFromList(list, key, val) {
     if (list && list.length > 0) {
@@ -1580,7 +1581,7 @@ exports.GetObjectByString = GetObjectByString;
 function BuildLookupDataField(fieldSchema, updateObj, db) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var fldValue, fldName_2, alias, searchAlias, fldLookupData, aggregateArry, project_1, i, obj, lookupObj, i, i, data, _c, result, _loop_10, j, i, unionDetail, unionPipeline, unionObj, result, i, lookupRecord, j, result, j, result, i, lookupRecord, j, result, i, lookupRecord, fetchFileData, video_Id, thumbnail_Id, error_2, fieldValueType, errMsg;
+        var fldValue, fldName_2, alias, searchAlias, fldLookupData, aggregateArry, project_1, i, obj, lookupObj, i, i, data, _c, result, _loop_10, j, i, unionDetail, unionPipeline, unionObj, result, i, lookupRecord, j, result, j, result, i, lookupRecord, j, result, i, lookupRecord, fetchFileData, video_Id, thumbnail_Id, isManualThumbnail_1, promises, error_2, fieldValueType, errMsg;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -1844,39 +1845,42 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                 // }
                 return [3 /*break*/, 21];
                 case 19:
-                    {
-                        // // Remove previous lookup data
+                    { // Remove previous lookup data
                         delete updateObj[fldName_2]['VideoFile_LookupData'];
                         delete updateObj[fldName_2]['ThumbnailImage_LookupData'];
                         fetchFileData = function (fileId, includeDuration) {
                             if (!fileId)
                                 return Promise.resolve([]);
-                            var projectQuery = __assign(__assign({}, project_1), { FileName: 1 }); // Keep existing values
+                            var parsedId = mongodb_1.ObjectId.isValid(fileId) ? new mongodb_1.ObjectId(fileId) : fileId;
+                            var projectQuery = __assign(__assign({}, project_1), { FileName: 1 });
                             if (includeDuration) {
                                 projectQuery['Duration'] = 1;
+                                projectQuery['Thumbnail'] = 1;
                             }
                             return db.collection('Drive').aggregate([
-                                { $match: { _id: fileId } },
+                                { $match: { _id: parsedId } },
                                 { $project: projectQuery }
                             ]).toArray();
                         };
                         video_Id = fldValue["VideoFile"];
                         thumbnail_Id = fldValue["ThumbnailImage"];
-                        Promise.all([
+                        isManualThumbnail_1 = updateObj[fldName_2]['Thumbnail'] === 'manual';
+                        promises = [
                             fetchFileData(video_Id !== null && video_Id !== void 0 ? video_Id : "", true),
-                            fetchFileData(thumbnail_Id !== null && thumbnail_Id !== void 0 ? thumbnail_Id : "", false)
-                        ])
+                            isManualThumbnail_1 ? fetchFileData(thumbnail_Id !== null && thumbnail_Id !== void 0 ? thumbnail_Id : "", false) : Promise.resolve([])
+                        ];
+                        Promise.all(promises)
                             .then(function (_a) {
                             var videoData = _a[0], thumbnailData = _a[1];
                             if (videoData.length > 0) {
                                 updateObj[fldName_2]['VideoFile_LookupData'] = videoData[0];
                             }
-                            if (thumbnailData.length > 0) {
+                            if (thumbnailData.length > 0 && isManualThumbnail_1) {
                                 updateObj[fldName_2]['ThumbnailImage_LookupData'] = thumbnailData[0];
                             }
                         })
-                            .catch(function (error) {
-                            console.error("Error in Video Upload Process:", error);
+                            .catch(function (err) {
+                            console.error("Error fetching lookup data:", err);
                         });
                     }
                     return [3 /*break*/, 21];
@@ -4906,7 +4910,7 @@ function ValidateUserInput(options) {
                         }
                     }
                     _loop_20 = function (pageField) {
-                        var fieldName, fieldData, field, parentData, oldValue, newValue, isSame, searchQuery, result, fld, _k, minValue, maxValue, filter, searchObj, dbConnection, result, searchObj, totalRecord, _l, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _m, fieldData_1, obj, searchObj, totalRecord, searchObj, result, searchVideoObj, searchThumbnailObj, _o, videoResult, thumbnailResult, _p, fieldData_2, obj;
+                        var fieldName, fieldData, field, parentData, oldValue, newValue, isSame, searchQuery, result, fld, _k, minValue, maxValue, filter, searchObj, dbConnection, result, searchObj, totalRecord, _l, schemaData, result, searchObj, result, schemaData, result, searchObj, totalRecord, regexpression, phone, files, _m, fieldData_1, obj, searchObj, totalRecord, searchObj, result, searchVideoObj, videoPromise, thumbnailPromise, searchThumbnailObj, _o, videoResult, thumbnailResult, text, _p, fieldData_2, obj;
                         return __generator(this, function (_q) {
                             switch (_q.label) {
                                 case 0:
@@ -5048,10 +5052,10 @@ function ValidateUserInput(options) {
                                             msg = 'Invalid value for ' + field.DisplayName + '!';
                                         }
                                         else if (minValue !== undefined && minValue !== null && fieldData < minValue) {
-                                            msg = field.DisplayName + ' value must be greater then or equal to ' + minValue;
+                                            msg = field.DisplayName + ' value must be greater than or equal to ' + minValue;
                                         }
                                         else if (maxValue !== undefined && maxValue !== null && maxValue < fieldData) {
-                                            msg = field.DisplayName + ' value must be smaller then or equal to ' + maxValue;
+                                            msg = field.DisplayName + ' value must be smaller than or equal to ' + maxValue;
                                         }
                                     }
                                     return [3 /*break*/, 59];
@@ -5305,29 +5309,40 @@ function ValidateUserInput(options) {
                                 case 50: return [3 /*break*/, 59];
                                 case 51:
                                     searchVideoObj = { _id: fieldData['VideoFile'] };
-                                    searchThumbnailObj = { _id: fieldData['ThumbnailImage'] };
                                     if (action === 'add') {
                                         searchVideoObj.IsActive = true;
-                                        searchThumbnailObj.IsActive = true;
+                                    }
+                                    videoPromise = db.collection("Drive").findOne(searchVideoObj);
+                                    thumbnailPromise = Promise.resolve(true);
+                                    if (fieldData['Thumbnail'] === 'manual') {
+                                        searchThumbnailObj = { _id: fieldData['ThumbnailImage'] };
+                                        if (action === 'add') {
+                                            searchThumbnailObj.IsActive = true;
+                                        }
+                                        thumbnailPromise = db.collection("Drive").findOne(searchThumbnailObj);
                                     }
                                     return [4 /*yield*/, Promise.all([
-                                            db.collection("Drive").findOne(searchVideoObj),
-                                            db.collection("Drive").findOne(searchThumbnailObj)
+                                            videoPromise,
+                                            thumbnailPromise
                                         ])];
                                 case 52:
                                     _o = _q.sent(), videoResult = _o[0], thumbnailResult = _o[1];
                                     if (!videoResult) {
                                         msg = field.DisplayName + ' (VideoFile) does not exist!';
                                     }
-                                    if (!thumbnailResult) {
+                                    if (fieldData['Thumbnail'] === 'manual' && !thumbnailResult) {
                                         msg += (msg ? ' ' : '') + field.DisplayName + ' (ThumbnailImage) does not exist!';
                                     }
                                     return [3 /*break*/, 59];
                                 case 53:
                                     {
-                                        // Maxlength check;                      
+                                        // Maxlength check;  
+                                        if (field.UIDataType === 'texteditor') {
+                                            text = convert(fieldData, { wordwrap: false });
+                                            fieldData = text.replace(/\n/g, ' ').trim();
+                                        }
                                         if (field.MaxLength !== undefined && field.MaxLength !== null && fieldData.length > field.MaxLength) {
-                                            msg = field.DisplayName + ' can not be greater then ' + field.MaxLength + ' characters!';
+                                            msg = field.DisplayName + ' can not be greater than ' + field.MaxLength + ' characters!';
                                         }
                                         if (!IsStringValue(fieldData)) {
                                             msg = 'Invalid value for ' + field.DisplayName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.428",
+  "version": "1.0.430",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -29,6 +29,7 @@
     "firebase-admin": "^12.0.0",
     "geoip-lite": "^1.4.2",
     "google-libphonenumber": "^3.2.30",
+    "html-to-text": "^8.2.0",
     "ioredis": "^4.17.3",
     "libphonenumber-js": "^1.9.51",
     "moment": "^2.25.3",