Merge remote-tracking branch 'origin/master' into fix-allow-text-selection-and-copy-in-dashboard-widget

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -10,6 +10,7 @@ Enterprise Fixes:
 - [users] Fix condition for custom property update
 - [drill] [survey] Fix duplicate question id
 - [drill] [survey] Display survey answer value instead of id in drill result
+- [cohorts] Fix query transformation for chr
 
 
 ## Version 25.03.21

plugins/remote-config/frontend/public/templates/conditions.html

@@ -36,9 +36,9 @@
         </el-table-column>
         <el-table-column type="options" v-if="hasUpdateRight || hasDeleteRight">
           <template v-slot="rowScope">
-            <cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, scope, rowScope.row)">
-              <el-dropdown-item v-if="hasUpdateRight" command="edit">{{i18n('common.edit')}}</el-dropdown-item>
-              <el-dropdown-item v-if="hasDeleteRight" command="remove">{{i18n('common.delete')}}</el-dropdown-item>
+            <cly-more-options :test-id="'more-option-button-' + rowScope.$index" v-if="rowScope.row.hover" size="small" @command="handleCommand($event, scope, rowScope.row)">
+              <el-dropdown-item v-if="hasUpdateRight" command="edit" data-test-id="condition-data-table-more-option-edit-button">{{i18n('common.edit')}}</el-dropdown-item>
+              <el-dropdown-item v-if="hasDeleteRight" command="remove" data-test-id="condition-data-table-more-option-delete-button">{{i18n('common.delete')}}</el-dropdown-item>
             </cly-more-options>
           </template>
         </el-table-column>

ui-tests/cypress/e2e/dashboard/manage/apps/apps.cy.js

@@ -97,6 +97,7 @@ describe('Create apps with different types such as Desktop, Mobile, and Web. ',
         appHelper.clickDeleteAppOption();
         appHelper.verifyDeleteAppPopupElements();
         appHelper.clickYesDeleteButton();
+        navigationHelpers.goToApplicationsPage();
         appHelper.searchApp(app.appName);
         appHelper.verifyAppShouldBeDeleted();