From f8815156e49795dc95916d4398c749373e054650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=B1nar=20Gen=C3=A7?= Date: Thu, 7 Sep 2023 11:56:09 +0300 Subject: [PATCH 1/3] [SER-787] Adding data-test-id attribute to elements on the Rating-Drawer --- .../countly/vue/components/date.js | 5 + .../countly/vue/components/drawer.js | 4 + .../countly/vue/components/dropdown.js | 4 + .../countly/vue/components/helpers.js | 4 +- .../countly/vue/components/input.js | 13 +- .../countly/vue/templates/datatable.html | 33 ++-- .../countly/vue/templates/datepicker.html | 29 +-- .../countly/vue/templates/drawer.html | 24 +-- .../countly/vue/templates/selectx.html | 9 +- .../javascripts/utils/vue/element-ui.js | 2 +- .../frontend/public/templates/drawer.html | 166 ++++++++++-------- 11 files changed, 173 insertions(+), 120 deletions(-) diff --git a/frontend/express/public/javascripts/countly/vue/components/date.js b/frontend/express/public/javascripts/countly/vue/components/date.js index 27140a9b76e..18647e8ad5a 100644 --- a/frontend/express/public/javascripts/countly/vue/components/date.js +++ b/frontend/express/public/javascripts/countly/vue/components/date.js @@ -1001,6 +1001,11 @@ type: Boolean, default: false, required: false + }, + testId: { + type: String, + default: "cly-datepicker-test-id", + required: false } }, data: function() { diff --git a/frontend/express/public/javascripts/countly/vue/components/drawer.js b/frontend/express/public/javascripts/countly/vue/components/drawer.js index 824eda8b53c..30998a1e44d 100644 --- a/frontend/express/public/javascripts/countly/vue/components/drawer.js +++ b/frontend/express/public/javascripts/countly/vue/components/drawer.js @@ -32,6 +32,10 @@ return value >= 1 && value <= 12; } }, + testId: { + type: String, + default: "drawer-test-id", + } }, data: function() { return { diff --git a/frontend/express/public/javascripts/countly/vue/components/dropdown.js b/frontend/express/public/javascripts/countly/vue/components/dropdown.js index f130e74ed3a..050d5d5cd1b 100644 --- a/frontend/express/public/javascripts/countly/vue/components/dropdown.js +++ b/frontend/express/public/javascripts/countly/vue/components/dropdown.js @@ -19,6 +19,7 @@ placeholder: {type: String, default: ''}, disabled: {type: Boolean, default: false}, adaptiveLength: {type: Boolean, default: false}, + testId: {type: String, default: 'cly-input-dropdown-trigger'} }, computed: { iconClass: function() { @@ -59,6 +60,9 @@ }, template: '\ - {{tab.label}}\ + {{tab.label}}\ \ \ ', @@ -541,6 +542,7 @@ title: { type: String, require: false}, selectedApp: {type: String, required: false, default: ''}, disabled: {type: Boolean, default: false}, + testId: {type: String, default: "event-select-test-id"} }, data: function() { return { diff --git a/frontend/express/public/javascripts/countly/vue/components/input.js b/frontend/express/public/javascripts/countly/vue/components/input.js index 71a0eb4ef9e..01b75318438 100644 --- a/frontend/express/public/javascripts/countly/vue/components/input.js +++ b/frontend/express/public/javascripts/countly/vue/components/input.js @@ -240,7 +240,12 @@ mixins: [SearchableOptionsMixin], props: { searchable: {type: Boolean, default: false, required: false}, //override the mixin - value: { type: [String, Number] } + value: { type: [String, Number] }, + testId: { + type: String, + default: 'cly-listbox-test-id', + required: false + } }, computed: { searchedOptions: function() { @@ -270,6 +275,7 @@ \
\ \
\ \ -
{{option.label}}
\ +
{{option.label}}
\ \ \
\ @@ -803,7 +809,8 @@ remoteMethod: {type: Function, required: false}, showSearch: {type: Boolean, default: false}, popperAppendToBody: {type: Boolean, default: true}, - persistColumnOrderKey: { type: String, default: null} + persistColumnOrderKey: { type: String, default: null}, + testId: { type: String, default: "cly-select-x-test-id"}, }, data: function() { return { diff --git a/frontend/express/public/javascripts/countly/vue/templates/datatable.html b/frontend/express/public/javascripts/countly/vue/templates/datatable.html index 9e0c271a66f..11218ba90da 100644 --- a/frontend/express/public/javascripts/countly/vue/templates/datatable.html +++ b/frontend/express/public/javascripts/countly/vue/templates/datatable.html @@ -29,16 +29,16 @@
- +
- +
-
+
{{ i18n("common.items-per-page") }}:
- +
- {{ paginationInfo }} + {{ paginationInfo }}
@@ -136,25 +137,25 @@
- +
- of {{formatNumber(totalPages)}} pages + of {{formatNumber(totalPages)}} pages
-
+
-
+
-
+
-
+
diff --git a/frontend/express/public/javascripts/countly/vue/templates/datepicker.html b/frontend/express/public/javascripts/countly/vue/templates/datepicker.html index 0cf84f795d7..6a3dcd53e51 100644 --- a/frontend/express/public/javascripts/countly/vue/templates/datepicker.html +++ b/frontend/express/public/javascripts/countly/vue/templates/datepicker.html @@ -11,6 +11,7 @@ - {{i18n('common.time-period-select.custom-range')}} + {{i18n('common.time-period-select.custom-range')}}
- {{shortcut.label}} + {{shortcut.label}}
@@ -44,13 +45,13 @@
@@ -74,14 +74,14 @@

{{title}}

- {{cancelButtonLabel}} - {{i18n('common.drawer.previous-step')}} - {{i18n('common.drawer.next-step')}} - {{saveButtonLabel}} + {{cancelButtonLabel}} + {{i18n('common.drawer.previous-step')}} + {{i18n('common.drawer.next-step')}} + {{saveButtonLabel}}
- {{cancelButtonLabel}} - {{saveButtonLabel}} + {{cancelButtonLabel}} + {{saveButtonLabel}}
diff --git a/frontend/express/public/javascripts/countly/vue/templates/selectx.html b/frontend/express/public/javascripts/countly/vue/templates/selectx.html index 6b5504863a2..ea571fcd295 100644 --- a/frontend/express/public/javascripts/countly/vue/templates/selectx.html +++ b/frontend/express/public/javascripts/countly/vue/templates/selectx.html @@ -17,6 +17,7 @@ multiple ref="trigger" class="el-select-head" + :test-id="testId" :disabled="disabled" :opened="dropdown.visible" :placeholder="placeholder" @@ -29,6 +30,7 @@ - + @@ -70,12 +73,14 @@ - + {{tab.label}} 3?0:(e-e%10!=10)*e%10]}};var g={D:function(e){return e.getDay()},DD:function(e){return d(e.getDay())},Do:function(e,t){return t.DoFn(e.getDate())},d:function(e){return e.getDate()},dd:function(e){return d(e.getDate())},ddd:function(e,t){return t.dayNamesShort[e.getDay()]},dddd:function(e,t){return t.dayNames[e.getDay()]},M:function(e){return e.getMonth()+1},MM:function(e){return d(e.getMonth()+1)},MMM:function(e,t){return t.monthNamesShort[e.getMonth()]},MMMM:function(e,t){return t.monthNames[e.getMonth()]},yy:function(e){return d(String(e.getFullYear()),4).substr(2)},yyyy:function(e){return d(e.getFullYear(),4)},h:function(e){return e.getHours()%12||12},hh:function(e){return d(e.getHours()%12||12)},H:function(e){return e.getHours()},HH:function(e){return d(e.getHours())},m:function(e){return e.getMinutes()},mm:function(e){return d(e.getMinutes())},s:function(e){return e.getSeconds()},ss:function(e){return d(e.getSeconds())},S:function(e){return Math.round(e.getMilliseconds()/100)},SS:function(e){return d(Math.round(e.getMilliseconds()/10),2)},SSS:function(e){return d(e.getMilliseconds(),3)},a:function(e,t){return e.getHours()<12?t.amPm[0]:t.amPm[1]},A:function(e,t){return e.getHours()<12?t.amPm[0].toUpperCase():t.amPm[1].toUpperCase()},ZZ:function(e){var t=e.getTimezoneOffset();return(t>0?"-":"+")+d(100*Math.floor(Math.abs(t)/60)+Math.abs(t)%60,4)}},b={d:["\\d\\d?",function(e,t){e.day=t}],Do:["\\d\\d?"+a,function(e,t){e.day=parseInt(t,10)}],M:["\\d\\d?",function(e,t){e.month=t-1}],yy:["\\d\\d?",function(e,t){var i=+(""+(new Date).getFullYear()).substr(0,2);e.year=""+(t>68?i-1:i)+t}],h:["\\d\\d?",function(e,t){e.hour=t}],m:["\\d\\d?",function(e,t){e.minute=t}],s:["\\d\\d?",function(e,t){e.second=t}],yyyy:["\\d{4}",function(e,t){e.year=t}],S:["\\d",function(e,t){e.millisecond=100*t}],SS:["\\d{2}",function(e,t){e.millisecond=10*t}],SSS:["\\d{3}",function(e,t){e.millisecond=t}],D:["\\d\\d?",u],ddd:[a,u],MMM:[a,h("monthNamesShort")],MMMM:[a,h("monthNames")],a:[a,function(e,t,i){var n=t.toLowerCase();n===i.amPm[0]?e.isPm=!1:n===i.amPm[1]&&(e.isPm=!0)}],ZZ:["[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z",function(e,t){var i,n=(t+"").match(/([+-]|\d\d)/gi);n&&(i=60*n[1]+parseInt(n[2],10),e.timezoneOffset="+"===n[0]?i:-i)}]};b.dd=b.d,b.dddd=b.ddd,b.DD=b.D,b.mm=b.m,b.hh=b.H=b.HH=b.h,b.MM=b.M,b.ss=b.s,b.A=b.a,r.masks={default:"ddd MMM dd yyyy HH:mm:ss",shortDate:"M/D/yy",mediumDate:"MMM d, yyyy",longDate:"MMMM d, yyyy",fullDate:"dddd, MMMM d, yyyy",shortTime:"HH:mm",mediumTime:"HH:mm:ss",longTime:"HH:mm:ss.SSS"},r.format=function(e,t,i){var n=i||r.i18n;if("number"==typeof e&&(e=new Date(e)),"[object Date]"!==Object.prototype.toString.call(e)||isNaN(e.getTime()))throw new Error("Invalid Date in fecha.format");t=r.masks[t]||t||r.masks.default;var s=[];return(t=(t=t.replace(l,(function(e,t){return s.push(t),"@@@"}))).replace(o,(function(t){return t in g?g[t](e,n):t.slice(1,t.length-1)}))).replace(/@@@/g,(function(){return s.shift()}))},r.parse=function(e,t,i){var n=i||r.i18n;if("string"!=typeof t)throw new Error("Invalid format in fecha.parse");if(t=r.masks[t]||t,e.length>1e3)return null;var s={},a=[],u=[];t=t.replace(l,(function(e,t){return u.push(t),"@@@"}));var c,h=(c=t,c.replace(/[|\\{()[^$+*?.-]/g,"\\$&")).replace(o,(function(e){if(b[e]){var t=b[e];return a.push(t[1]),"("+t[0]+")"}return e}));h=h.replace(/@@@/g,(function(){return u.shift()}));var d=e.match(new RegExp(h,"i"));if(!d)return null;for(var p=1;p0?n:i)(e)}},function(e,t,i){var n=i(28)("keys"),s=i(19);e.exports=function(e){return n[e]||(n[e]=s(e))}},function(e,t,i){var n=i(11),s=i(3),r=s["__core-js_shared__"]||(s["__core-js_shared__"]={});(e.exports=function(e,t){return r[e]||(r[e]=void 0!==t?t:{})})("versions",[]).push({version:n.version,mode:i(18)?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(e,t){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,t){t.f=Object.getOwnPropertySymbols},function(e,t,i){var n=i(25);e.exports=function(e){return Object(n(e))}},function(e,t){e.exports={}},function(e,t,i){var n=i(8).f,s=i(5),r=i(10)("toStringTag");e.exports=function(e,t,i){e&&!s(e=i?e:e.prototype,r)&&n(e,r,{configurable:!0,value:t})}},function(e,t,i){t.f=i(10)},function(e,t,i){var n=i(3),s=i(11),r=i(18),o=i(34),a=i(8).f;e.exports=function(e){var t=s.Symbol||(s.Symbol=r?{}:n.Symbol||{});"_"==e.charAt(0)||e in t||a(t,e,{value:o.f(e)})}},function(e,t,i){var n=i(37),s=i(1);e.exports={throttle:n,debounce:s}},function(e,t){e.exports=function(e,t,i,n){var s,r=0;return"boolean"!=typeof t&&(n=i,i=t,t=void 0),function(){var o=this,a=Number(new Date)-r,l=arguments;function u(){r=Number(new Date),i.apply(o,l)}function c(){s=void 0}n&&!s&&u(),s&&clearTimeout(s),void 0===n&&a>e?u():!0!==t&&(s=setTimeout(n?c:u,void 0===n?e-a:e))}}},function(e,t){var i;i=function(){return this}();try{i=i||new Function("return this")()}catch(e){"object"==typeof window&&(i=window)}e.exports=i},function(e,t,i){e.exports=!i(4)&&!i(13)((function(){return 7!=Object.defineProperty(i(40)("div"),"a",{get:function(){return 7}}).a}))},function(e,t,i){var n=i(12),s=i(3).document,r=n(s)&&n(s.createElement);e.exports=function(e){return r?s.createElement(e):{}}},function(e,t,i){var n=i(5),s=i(9),r=i(75)(!1),o=i(27)("IE_PROTO");e.exports=function(e,t){var i,a=s(e),l=0,u=[];for(i in a)i!=o&&n(a,i)&&u.push(i);for(;t.length>l;)n(a,i=t[l++])&&(~r(u,i)||u.push(i));return u}},function(e,t,i){var n=i(43);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==n(e)?e.split(""):Object(e)}},function(e,t){var i={}.toString;e.exports=function(e){return i.call(e).slice(8,-1)}},function(e,t,i){"use strict";var n=i(18),s=i(23),r=i(45),o=i(7),a=i(32),l=i(82),u=i(33),c=i(85),h=i(10)("iterator"),d=!([].keys&&"next"in[].keys()),p=function(){return this};e.exports=function(e,t,i,f,m,v,g){l(i,t,f);var b,y,w,_=function(e){if(!d&&e in S)return S[e];switch(e){case"keys":case"values":return function(){return new i(this,e)}}return function(){return new i(this,e)}},x=t+" Iterator",C="values"==m,k=!1,S=e.prototype,D=S[h]||S["@@iterator"]||m&&S[m],$=D||_(m),E=m?C?_("entries"):$:void 0,T="Array"==t&&S.entries||D;if(T&&(w=c(T.call(new e)))!==Object.prototype&&w.next&&(u(w,x,!0),n||"function"==typeof w[h]||o(w,h,p)),C&&D&&"values"!==D.name&&(k=!0,$=function(){return D.call(this)}),n&&!g||!d&&!k&&S[h]||o(S,h,$),a[t]=$,a[x]=p,m)if(b={values:C?$:_("values"),keys:v?$:_("keys"),entries:E},g)for(y in b)y in S||r(S,y,b[y]);else s(s.P+s.F*(d||k),t,b);return b}},function(e,t,i){e.exports=i(7)},function(e,t,i){var n=i(15),s=i(83),r=i(29),o=i(27)("IE_PROTO"),a=function(){},l=function(){var e,t=i(40)("iframe"),n=r.length;for(t.style.display="none",i(84).appendChild(t),t.src="javascript:",(e=t.contentWindow.document).open(),e.write("