Merge branch 'master' into feat/type-improvements

ArtursKadikis · web-flow · commit 96e96c463752 · 2025-07-04T21:46:20.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Version 25.03.8
+Fixes:
+- [core] Fix adding llm observability to cly-event-select component
+- [crashes] Derive crash name from crash stracktrace for drill event
+- [data-manager] Fix frontend component attribute name
+- [star-rating] Fix rating not appearing when app version contains space ' '
+
+Enterprise Features:
+- [journey-engine] Added default translations to prevent an error when languages are not yet defined, and visually indicate the browser language as the default
+
 ## Version 25.03.7
 Enterprise Features:
 - [funnels] Added explanatory tooltip for filters section on Funnel Detail page
@@ -4758,4 +4768,4 @@ This version provides several features and bugfixes to both server and SDKs. The
     admin or user. An admin of an application can edit application settings. 
     A user of an application can only view analytics for that application 
     and cannot edit its settings.
-  * Added csfr protection to all methods provided through app.js.
+  * Added csfr protection to all methods provided through app.js.
diff --git a/api/utils/requestProcessor.js b/api/utils/requestProcessor.js
@@ -209,7 +209,7 @@ const processRequest = (params) => {
                         params.qstring.args = JSON.parse(params.qstring.args);
                     }
                     catch (SyntaxError) {
-                        console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);
+                        console.log('Parse %s JSON failed. URL: %s, Body: %s', apiPath, params.req.url, JSON.stringify(params.req.body));
                     }
                 }
 
@@ -345,7 +345,7 @@ const processRequest = (params) => {
                         params.qstring.args = JSON.parse(params.qstring.args);
                     }
                     catch (SyntaxError) {
-                        console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);
+                        console.log('Parse %s JSON failed %s', apiPath, params.req.url, params.req.body);
                     }
                 }
                 switch (paths[3]) {
@@ -649,7 +649,7 @@ const processRequest = (params) => {
                         params.qstring.args = JSON.parse(params.qstring.args);
                     }
                     catch (SyntaxError) {
-                        console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);
+                        console.log('Parse %s JSON failed %s', apiPath, params.req.url, params.req.body);
                     }
                 }
 
diff --git a/frontend/express/public/javascripts/countly/vue/templates/content/content-header.html b/frontend/express/public/javascripts/countly/vue/templates/content/content-header.html
@@ -89,7 +89,7 @@
                     isToggleDisabled ? 'is-disabled' : '',
                     toggleLocalValue ? 'el-button--warning' : 'el-button--success'
                 ]"
-                test-id="journey-publish"
+                :data-test-id="'journey-' + (toggleLocalValue ? 'Pause' : 'Publish').toLowerCase() + '-button'"
                 :disabled="false"
                 @click="onPublishButtonClick"
             >
diff --git a/plugins/data-manager/frontend/public/templates/create-events-drawer.html b/plugins/data-manager/frontend/public/templates/create-events-drawer.html
@@ -64,11 +64,11 @@
                     </cly-form-field>
                 </div>
 
-                <cly-form-field test-id="event-drawer-visibilty-dropdown-label" :label="i18n('data-manager.visibility')">
-                    <el-select test-id="event-drawer-visibilty-dropdown" class="bu-pt-1" v-model="drawerScope.editedObject.is_visible" >
-                        <el-option test-id="event-drawer-visibilty-dropdown" :value=true :label="i18n('data-manager.visible')">
+                <cly-form-field test-id="event-drawer-visibility-dropdown-label" :label="i18n('data-manager.visibility')">
+                    <el-select test-id="event-drawer-visibility-dropdown" class="bu-pt-1" v-model="drawerScope.editedObject.is_visible" >
+                        <el-option test-id="event-drawer-visibility-dropdown" :value=true :label="i18n('data-manager.visible')">
                         </el-option>
-                        <el-option test-id="event-drawer-visibilty-dropdown" :value=false :label="i18n('data-manager.hidden')">
+                        <el-option test-id="event-drawer-visibility-dropdown" :value=false :label="i18n('data-manager.hidden')">
                         </el-option>
                     </el-select>
                 </cly-form-field>
diff --git a/plugins/data-manager/frontend/public/templates/events.html b/plugins/data-manager/frontend/public/templates/events.html
@@ -10,7 +10,7 @@
               <cly-report-manager-dialog class="bu-mr-2" origin="data-manager"></cly-report-manager-dialog>
           </div>
           <div v-if="currentSecondaryTab !== 'validations'">
-            <cly-more-options v-if="showMoreOptions" size="small" text="Create new" type="success" icon="el-icon-circle-plus" @command="handleCreateCommand($event, currentSecondaryTab)">
+            <cly-more-options v-if="showMoreOptions" test-id="create-new-event-more-option" size="small" text="Create new" type="success" icon="el-icon-circle-plus" @command="handleCreateCommand($event, currentSecondaryTab)">
                 <el-dropdown-item v-if="isDrill && canUserCreateTransform && (currentSecondaryTab === 'events' || currentSecondaryTab === 'segmentation') " :data-test-id="'events-page-create-new-' +i18n('data-manager.create-transformation').replaceAll(' ', '-').toLowerCase() + '-button'" command="create-transform">
                     {{i18n('data-manager.create-transformation')}}
                 </el-dropdown-item>
diff --git a/plugins/star-rating/frontend/public/javascripts/countly.views.js b/plugins/star-rating/frontend/public/javascripts/countly.views.js
@@ -622,7 +622,7 @@
                     regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\*\\*)';
                 }
                 if (this.activeFilter.version === '') {
-                    regexString += '(\\w+)(\\S*)(\\w*)(\\*\\*)[1-5]';
+                    regexString += '(.*)(\\*\\*)[1-5]';
                 }
                 else {
                     regexString += this.activeFilter.version.toString() + '(\\*\\*)[1-5]';
@@ -1281,7 +1281,7 @@
                     regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\*\\*)';
                 }
                 if (this.activeFilter.version === '') {
-                    regexString += '(\\w+)(\\S*)(\\w*)(\\*\\*)[1-5]';
+                    regexString += '(.*)(\\*\\*)[1-5]';
                 }
                 else {
                     regexString += this.activeFilter.version.toString() + '(\\*\\*)[1-5]';

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ const processRequest = (params) => {`
`209`	`209`	`params.qstring.args = JSON.parse(params.qstring.args);`
`210`	`210`	`}`
`211`	`211`	`catch (SyntaxError) {`
`212`		`- console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);`
	`212`	`+ console.log('Parse %s JSON failed. URL: %s, Body: %s', apiPath, params.req.url, JSON.stringify(params.req.body));`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`@@ -345,7 +345,7 @@ const processRequest = (params) => {`
`345`	`345`	`params.qstring.args = JSON.parse(params.qstring.args);`
`346`	`346`	`}`
`347`	`347`	`catch (SyntaxError) {`
`348`		`- console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);`
	`348`	`+ console.log('Parse %s JSON failed %s', apiPath, params.req.url, params.req.body);`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`switch (paths[3]) {`
`@@ -649,7 +649,7 @@ const processRequest = (params) => {`
`649`	`649`	`params.qstring.args = JSON.parse(params.qstring.args);`
`650`	`650`	`}`
`651`	`651`	`catch (SyntaxError) {`
`652`		`- console.log('Parse ' + apiPath + ' JSON failed', params.req.url, params.req.body);`
	`652`	`+ console.log('Parse %s JSON failed %s', apiPath, params.req.url, params.req.body);`
`653`	`653`	`}`
`654`	`654`	`}`
`655`	`655`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`isToggleDisabled ? 'is-disabled' : '',`
`90`	`90`	`toggleLocalValue ? 'el-button--warning' : 'el-button--success'`
`91`	`91`	`]"`
`92`		`- test-id="journey-publish"`
	`92`	`+ :data-test-id="'journey-' + (toggleLocalValue ? 'Pause' : 'Publish').toLowerCase() + '-button'"`
`93`	`93`	`:disabled="false"`
`94`	`94`	`@click="onPublishButtonClick"`
`95`	`95`	`>`
Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@`
`622`	`622`	`regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\\\)';`
`623`	`623`	`}`
`624`	`624`	`if (this.activeFilter.version === '') {`
`625`		`- regexString += '(\\w+)(\\S)(\\w)(\\\\)[1-5]';`
	`625`	`+ regexString += '(.)(\\\\*)[1-5]';`
`626`	`626`	`}`
`627`	`627`	`else {`
`628`	`628`	`regexString += this.activeFilter.version.toString() + '(\\\\)[1-5]';`
`@@ -1281,7 +1281,7 @@`
`1281`	`1281`	`regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\\\)';`
`1282`	`1282`	`}`
`1283`	`1283`	`if (this.activeFilter.version === '') {`
`1284`		`- regexString += '(\\w+)(\\S)(\\w)(\\\\)[1-5]';`
	`1284`	`+ regexString += '(.)(\\\\*)[1-5]';`
`1285`	`1285`	`}`
`1286`	`1286`	`else {`
`1287`	`1287`	`regexString += this.activeFilter.version.toString() + '(\\\\)[1-5]';`