Merge pull request #5677 from Countly/journey+content

Merge common components from journey+content, Update EcmaVersion to 2023 [node 20 compat]

Author: kanwarujjaval

.eslintrc.json

@@ -212,7 +212,7 @@
                 "node": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off",

Gruntfile.js

@@ -144,6 +144,7 @@ module.exports = function(grunt) {
                     'frontend/express/public/javascripts/countly/vue/components/date.js',
                     'frontend/express/public/javascripts/countly/vue/components/dropdown.js',
                     'frontend/express/public/javascripts/countly/vue/components/input.js',
+                    'frontend/express/public/javascripts/countly/vue/components/content.js',
                     'frontend/express/public/javascripts/countly/vue/datatable-legacy.js',
                     'frontend/express/public/javascripts/countly/vue/components/datatable.js',
                     'frontend/express/public/javascripts/countly/vue/components/dialog.js',

api/utils/countlyFs.js

@@ -316,6 +316,60 @@ countlyFs.gridfs = {};
         }
     };
 
+    /**
+     * Update file fields by ID
+     * @param {string} category - collection where the file is stored
+     * @param {string} id - file id
+     * @param {object} updateFields - fields to update
+     * @param {function} callback - function called when updating was completed or errored, providing error object as first param
+     * @example
+     * countlyFs.gridfs.updateFileById("test", "66d6c2d770434130c03b7dae", { filename: "newname.png", "metadata.tags": "newtag" }, function(err){
+     *   console.log("Update finished", err);
+     * });
+     */
+    ob.updateFileById = function(category, id, updateFields, callback) {
+        if (!db) {
+            if (callback) {
+                callback(new Error("Database connection not available"));
+            }
+            return;
+        }
+
+        const collection = db.collection(category + ".files");
+        const setOps = {};
+
+        for (const [key, value] of Object.entries(updateFields)) {
+            setOps[key] = value;
+        }
+
+        collection.findOneAndUpdate(
+            { _id: new db.ObjectID(id) },
+            { $set: setOps },
+            { returnOriginal: true },
+            function(err, result) {
+                if (err) {
+                    log.e("Error updating file:", err);
+                    if (callback) {
+                        callback(err);
+                    }
+                    return;
+                }
+
+                if (!result.value) {
+                    if (callback) {
+                        callback(new Error("File not found"));
+                    }
+                    return;
+                }
+
+                log.d("File updated successfully");
+                if (callback) {
+                    callback(null, result.value);
+                }
+            }
+        );
+    };
+
     /**
     * Delete file from shared system
     * @param {string} category - collection where to store data
@@ -647,10 +701,12 @@ countlyFs.gridfs = {};
         bucket.find().toArray()
             .then((records) => callback(
                 null,
-                records.map(({ filename, uploadDate, length }) => ({
+                records.map(({ _id, filename, uploadDate, length, metadata }) => ({
+                    _id,
                     filename,
                     createdOn: uploadDate,
-                    size: length
+                    size: length,
+                    metadata
                 }))
             ))
             .catch((error) => callback(error, null));

frontend/express/public/core/date-presets/templates/preset-management.html

@@ -10,6 +10,7 @@
 
     <cly-main>
         <cly-datatable-n 
+            :display-mode="'list'"
             :rows="rows" 
             :resizable="true" 
             :force-loading="isLoading"