Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24.12 into FLEX #5976

Merged
merged 8 commits into from
Feb 5, 2025
+23 −5
Merged

24.12 into FLEX #5976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b31a605
log when a plugin fails
John-Weak Jan 29, 2025
17e4c84
[SER-2121] The Internal Name" and "Add user consent" texts are not co…
pnrgenc Feb 3, 2025
0e5b467
fix: ui-test on ratings widget
pnrgenc Feb 3, 2025
9c906f0
Codacy fix
pnrgenc Feb 4, 2025
154a057
Merge pull request #5970 from pnrgenc/star-ratings-drawer-localizatio…
can-angun Feb 4, 2025
66c92da
Merge pull request #5962 from Countly/SER-2292
ArtursKadikis Feb 4, 2025
ec0119f
Merge branch 'master' into release.24.10
ArtursKadikis Feb 4, 2025
3b6b43d
Merge branch 'release.24.10' into release.24.12
ArtursKadikis Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/parts/mgmt/app_users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ usersApi.mergeOtherPlugins = function(options, callback) {
if (result && result.length) {
for (let index = 0; index < result.length; index++) {
if (result[index].status === "rejected") {
log.e(result[index]);
retry = true;
break;
}
Expand Down
1 change: 1 addition & 0 deletions plugins/star-rating/frontend/public/localization/star-rating.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ feedback.selected-pages = On selected pages
feedback.internalName = Internal Name
feedback.internalName.placeholder = Widget Name
feedback.internalName.description = Name survey for internal purposes. It is not going to be shown on survey.
feedback.consent = Add user consent
feedback.question = Question
feedback.rating-symbol = Rating Symbol
feedback.rating-score = Rating Score
Expand Down
16 changes: 16 additions & 0 deletions plugins/star-rating/frontend/public/stylesheets/ratings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,22 @@
}
}

&__step {
&__consent-wrapper {
.el-checkbox__label {
padding-left: 8px;

&:hover {
color: #333c48;
}
}

.el-checkbox__input.is-checked + .el-checkbox__label {
color: #333c48;
}
}
}

&__target-page-selector {
width: 100%;
}
Expand Down
8 changes: 4 additions & 4 deletions plugins/star-rating/frontend/public/templates/drawer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<cly-form-step id="step1" :name="i18n('feedback.settings')">
<div class="cly-vue-drawer-step__section">
<div class="text-medium text-heading bu-mb-1" data-test-id="ratings-drawer-settings-widget-name-label">
{{i18n('surveys.drawer.internal.name')}}
{{i18n('feedback.internalName')}}
</div>
<div class="text-smallish color-cool-gray-50 bu-mb-1" data-test-id="ratings-drawer-settings-widget-name-desc">
{{i18n('feedback.internalName.description')}}
Expand Down Expand Up @@ -178,13 +178,13 @@
<el-input test-id="ratings-drawer-settings-contact-input" v-model="drawerScope.editedObject.popup_email_callout" :placeholder="i18n('feedback.type-your-option-name')"></el-input>
</validation-provider>
</div>
<div class="cly-vue-drawer-step__section bu-py-1 cly-vue-surveys-drawer__consent">
<div class="cly-vue-drawer-step__section bu-py-1 ratings-drawer__step__consent-wrapper">
<el-checkbox
test-id="ratings-drawer-settings-add-user-consent"
class="text-smallish"
@change="onConsentCheckbox(drawerScope.editedObject)"
size="small"
v-bind:label="i18n('surveys.drawer.consent')"
v-bind:label="i18n('feedback.consent')"
v-model="drawerScope.editedObject.consent"
v-if="drawerScope.currentStepId === 'step1'">
</el-checkbox>
Expand All @@ -197,7 +197,7 @@
v-model="drawerScope.editedObject.links">
</star-consent-link>
<div class="cly-vue-drawer-step__section">
<div class="text-medium-big cly-vue-surveys-drawer--font-weight-medium bu-pb-2 bu-pt-4">
<div class="text-medium-big bu-has-text-weight-medium bu-pb-2 bu-pt-4">
{{i18n('feedback.buttons.heading')}}
</div>
<div class="text-medium text-heading bu-mb-2" data-test-id="ratings-drawer-settings-button-callout-label">
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const verifySettingsPageElements = ({

cy.verifyElement({
labelElement: feedbackRatingWidgetsPageElements.WIDGET_NAME_LABEL,
labelText: "surveys.drawer.internal.name", //TODO: Will be updated after SER-2121 fixed
labelText: "Internal Name",
element: feedbackRatingWidgetsPageElements.WIDGET_NAME_INPUT,
value: widgetName,
elementPlaceHolder: "Widget Name"
Expand Down
Loading