Merge branch 'master' into dependabot/npm_and_yarn/sharp-0.34.2

Author: ar2rsawseen

CHANGELOG.md

@@ -5,6 +5,7 @@ Enterprise Features:
 
 Fixes:
 - [core] Unifying alphabetical order for dropdowns with dashboard apps
+- [hooks] Added null check for incoming data
 
 Enterprise Fixes:
 - [content] Asset URL was wrongly constructed when user switches between apps
@@ -16,6 +17,7 @@ Enterprise Fixes:
 Dependencies:
 - Bump eslint-plugin-vue from 9.33.0 to 10.1.0
 - Bump lint-staged from 15.5.2 to 16.0.0
+- Bump moment-timezone from 0.5.48 to 0.6.0
 - Bump nodemailer from 6.10.1 to 7.0.3
 - Bump puppeteer from 24.8.0 to 24.9.0
 - Bump sass from 1.87.0 to 1.89.0

api/utils/countly-request/package-lock.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://count.ly/",
   "dependencies": {
-    "moment-timezone": "0.5.48",
+    "moment-timezone": "0.6.0",
     "node-fetch": "3.3.2"
   }
 }

bin/scripts/timezones/package-lock.json

@@ -1,6 +1,6 @@
 <div>
     <slot :showDialog="showDialog" name="trigger">
-        <el-button @click="showDialog" :disabled="disabled" type="default" size="small">
+        <el-button data-test-id="last-queries-button" @click="showDialog" :disabled="disabled" type="default" size="small">
             <div v-show="unread > 0" class="cly-bullet cly-bullet--orange bu-mr-1"></div>
             Last queries
             <span class="bu-tag is-curved">{{runningCount}}</span>
@@ -13,4 +13,4 @@
         :visible.sync="isDialogVisible">
         <cly-report-manager-table maxHeight="400px" @view-task="onViewTask" :disableAutoNavigationToTask="disableAutoNavigationToTask" report-type="auto" :fixed-origin="origin" compact></cly-report-manager-table>
     </cly-dialog>
-</div>
+</div>

bin/scripts/timezones/package.json

@@ -84,7 +84,7 @@
     "mcc-mnc-list": "1.1.11",
     "method-override": "3.0.0",
     "moment": "2.30.1",
-    "moment-timezone": "0.5.48",
+    "moment-timezone": "0.6.0",
     "mongodb": "6.16.0",
     "nginx-conf": "2.1.0",
     "nodemailer": "7.0.3",

frontend/express/public/core/report-manager/templates/reportmanager-dialog.html

@@ -189,6 +189,9 @@ class IncomingDataTrigger {
          */
         function assertOperation(value, filterObj) {
             var matched = true;
+            if (typeof value === 'undefined' || value === null) {
+                return false;
+            }
             if (filterObj.$in && filterObj.$in.indexOf(value) === -1) {
                 matched = false;
             }

package-lock.json

@@ -474,7 +474,7 @@ function uploadFile(myfile, id, callback) {
             params.app_user = params.app_user || {};
 
             var user = JSON.parse(JSON.stringify(params.app_user));
-            common.db.collection('feedback_widgets').find({"app_id": params.app_id + "", "status": true, type: "rating"}, {_id: 1, popup_header_text: 1, cohortID: 1, type: 1, appearance: 1, showPolicy: 1, trigger_position: 1, hide_sticker: 1, trigger_bg_color: 1, trigger_font_color: 1, trigger_button_text: 1, trigger_size: 1, target_pages: 1}).toArray(function(err, widgets) {
+            common.db.collection('feedback_widgets').find({"app_id": params.app_id + "", "status": true, type: "rating"}, {_id: 1, popup_header_text: 1, cohortID: 1, type: 1, appearance: 1, showPolicy: 1, trigger_position: 1, hide_sticker: 1, trigger_bg_color: 1, trigger_font_color: 1, trigger_button_text: 1, trigger_size: 1, target_pages: 1, wv: 1}).toArray(function(err, widgets) {
                 if (err) {
                     log.e(err);
                     reject(err);
@@ -492,6 +492,7 @@ function uploadFile(myfile, id, callback) {
                     }
                     widget.tg = widget.target_pages;
                     widget.name = widget.popup_header_text;
+                    widget.wv = widget.wv?.toString() || null;
                     // remove this props from response
                     delete widget.hide_sticker;
                     delete widget.trigger_position;
@@ -565,6 +566,11 @@ function uploadFile(myfile, id, callback) {
             phone: true,
             tablet: true
         };
+        /**
+         * NOTE: This property is used to help SDK identify if the widget has the new handling for close button and
+         * allows widget to be fullscreen. Since the server will support this from here on, it can be hardcoded.
+         */
+        widget.wv = 1;
 
         //widget.created_by = common.db.ObjectID(obParams.member._id);
         validateCreate(obParams, FEATURE_NAME, function(params) {

package.json

@@ -5,12 +5,13 @@
 .ratings-popup .modal-content {
   .hidden {
     display: none;
-}
+  }
 
-.disabled {
+  .disabled { 
     cursor: auto !important;
     opacity: 0.5;
-}
+  }
+
   border-radius: 13px;
   background-color: white;
   padding: 0px 25px 40px 25px;
@@ -31,6 +32,17 @@
       cursor: pointer;
     }
   }
+
+  /* .ratings-popup .modal-content--fullscreen */
+  &--fullscreen {
+    margin: 40px 0;
+    height: calc(100vh - 100px);
+
+    /* .ratings-popup--fullscreen .modal-content__top */
+    &__top {
+      margin-top: 0px;
+    }
+  }
 }
 
 .ratings-popup .emotions-area {
@@ -228,4 +240,4 @@
 
 .rating-loader-wrapper .rating-loader {
   width: 50px;
-}
+}