Merge branch 'master' into anna/master

Author: Cookiezaurs

.github/workflows/deploy.yml

@@ -54,7 +54,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
         with:
           push: true
           file: ./Dockerfile-core

.github/workflows/docker-image.yml

@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
         with:
           context: .
           push: true
@@ -63,7 +63,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
         with:
           push: true
           file: ./Dockerfile-api
@@ -94,7 +94,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
         with:
           push: true
           file: ./Dockerfile-frontend
@@ -125,7 +125,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
         with:
           push: true
           file: ./Dockerfile-core

CHANGELOG.md

@@ -1,22 +1,28 @@
 
 ## Version 25.03.x
+Enterprise Features:
+- [journey_engine] Record Event block added
 
 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
 - [ab-testing] Updates
     - Do not wait for result calculation when requesting experiments
     - Do not calculate result for completed experiments
-
+- [drill] [license] Shorten warning period from 14 days to 3 days
 
 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.8.2
-- Bump sass from 1.87.0 to 1.88.0
+- Bump puppeteer from 24.8.0 to 24.9.0
+- Bump sass from 1.87.0 to 1.89.0
 - Bump semver from 7.7.1 to 7.7.2
+- Bump sharp from 0.33.5 to 0.34.2
 - Bump supertest from 7.1.0 to 7.1.1
 
 ## Version 25.03.5

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

@@ -238,6 +238,11 @@
                 type: String,
                 required: false,
                 default: '#fff'
+            },
+            toolTipLeft: {
+                type: String,
+                required: false,
+                default: 'Screens'
             }
         },
         data: function() {

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

@@ -1,17 +1,10 @@
 <div class="cly-vue-content-builder__layout-main__body" :class="{ 'bu-is-justify-content-flex-end': hideLeftSidebar, 'bu-is-justify-content-flex-start': hideRightSidebar, 'cly-vue-content-builder__layout-main__body__dashed-bg': hasDashedBackground }" :style="{'background-color': backgroundColor}">
     <transition :name="toggleTransition" @enter="onViewEntered">
-        <div v-if="!hideLeftSidebar" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
-            <template v-if="$slots['content-layout-left-sidebar-wrapper']">
-                <vue-scroll :ops="scrollOps">
-                    <slot name="content-layout-left-sidebar-wrapper"></slot>
-                </vue-scroll>
-            </template>
-        </div>
         <div v-if="!hideLeftSidebar && (collapsible && !isCollapsed)" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
             <div class="cly-vue-content-builder__layout-main__body__left-sidebar__header">
                 <div class="cly-vue-content-builder__layout-main__body__left-sidebar__header__title">
                     <h4>Screens</h4>
-                    <cly-tooltip-icon class="bu-ml-1" tooltip="Screens"></cly-tooltip-icon>
+                    <cly-tooltip-icon class="bu-ml-1" :tooltip="toolTipLeft"></cly-tooltip-icon>
                 </div>
                 <div v-if="collapsible" class="cly-vue-content-builder__layout-main__body__collapse-button" @click="collapseBar('left')">
                     <div class="cly-vue-content-builder__layout-main__body__collapse-button__icon color-warm-gray-80">
@@ -28,6 +21,13 @@ <h4>Screens</h4>
                 <i class="cly-io cly-io-arrow-sm-left"></i>
             </div>
         </div>
+        <div  v-else-if="!hideLeftSidebar" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
+            <template v-if="$slots['content-layout-left-sidebar-wrapper']">
+                <vue-scroll :ops="scrollOps">
+                    <slot name="content-layout-left-sidebar-wrapper"></slot>
+                </vue-scroll>
+            </template>
+        </div>
     </transition>
     <!-- <component 
         v-if="currentTabComponent" 

frontend/express/public/javascripts/countly/vue/components/content.js

@@ -31,6 +31,7 @@ $colors: (
     "charts-light-turquoise": #EBF9F9,
     "charts-amber": #F5C900,
     "charts-orange": #F96300,
+    "charts-light-orange": #FEEFE5,
     "charts-magenta": #F34971,
     "charts-light-magenta": #FEEDF1,
     "charts-coral": #FF9382,