From b31a60514128c48758b69a23f2f79c2f5de5c9d9 Mon Sep 17 00:00:00 2001
From: John-Weak <tusharbali11@gmail.com>
Date: Wed, 29 Jan 2025 12:06:11 +0530
Subject: [PATCH 1/4] log when a plugin fails

---
 api/parts/mgmt/app_users.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/parts/mgmt/app_users.js b/api/parts/mgmt/app_users.js
index 33adf032797..3ee62d4e005 100644
--- a/api/parts/mgmt/app_users.js
+++ b/api/parts/mgmt/app_users.js
@@ -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;
                                 }

From 17e4c84c0c8830a1928b8c174f9ae48a7b04d855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=B1nar=20Gen=C3=A7?= <gncpin@hotmail.com>
Date: Mon, 3 Feb 2025 17:24:19 +0300
Subject: [PATCH 2/4] [SER-2121] The Internal Name" and "Add user consent"
 texts are not correct

---
 .../public/localization/star-rating.properties   |  1 +
 .../frontend/public/stylesheets/ratings.scss     | 16 ++++++++++++++++
 .../frontend/public/templates/drawer.html        |  9 +++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/plugins/star-rating/frontend/public/localization/star-rating.properties b/plugins/star-rating/frontend/public/localization/star-rating.properties
index 187f72c78a2..7544348afb6 100644
--- a/plugins/star-rating/frontend/public/localization/star-rating.properties
+++ b/plugins/star-rating/frontend/public/localization/star-rating.properties
@@ -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
diff --git a/plugins/star-rating/frontend/public/stylesheets/ratings.scss b/plugins/star-rating/frontend/public/stylesheets/ratings.scss
index 513f15c7000..c5056f23eb8 100644
--- a/plugins/star-rating/frontend/public/stylesheets/ratings.scss
+++ b/plugins/star-rating/frontend/public/stylesheets/ratings.scss
@@ -54,6 +54,22 @@
         }
     }
 
+    &__step {
+        &__consent-wrapper {
+            .el-checkbox__input.is-checked + .el-checkbox__label {
+                color: #333c48;
+            }
+
+            .el-checkbox__label {
+                padding-left: 8px;
+
+                &:hover {
+                    color: #333c48;
+                }
+            }
+        }
+    }
+
     &__target-page-selector {
         width: 100%;
     }
diff --git a/plugins/star-rating/frontend/public/templates/drawer.html b/plugins/star-rating/frontend/public/templates/drawer.html
index 145a186f128..784c5dc7146 100644
--- a/plugins/star-rating/frontend/public/templates/drawer.html
+++ b/plugins/star-rating/frontend/public/templates/drawer.html
@@ -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')}}
@@ -178,12 +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>
@@ -196,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">

From 0e5b467b7af3c1ffa9f604fb200d724bd22c20c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=B1nar=20Gen=C3=A7?= <gncpin@hotmail.com>
Date: Mon, 3 Feb 2025 17:57:36 +0300
Subject: [PATCH 3/4] fix: ui-test on ratings widget

---
 ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js b/ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js
index 5bdc3e6f343..50916aa4770 100644
--- a/ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js
+++ b/ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js
@@ -50,7 +50,7 @@ const verifySettingsPageElements = ({
 
     cy.verifyElement({
         labelElement: feedbackRatingWidgetsPageElements.WIDGET_NAME_LABEL,
-        labelText: "surveys.drawer.internal.name",
+        labelText: "Internal Name",
         element: feedbackRatingWidgetsPageElements.WIDGET_NAME_INPUT,
         value: widgetName,
         elementPlaceHolder: "Widget Name"

From 9c906f00c54fdafd76db9be55cb0ccbacfe30e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=B1nar=20Gen=C3=A7?= <gncpin@hotmail.com>
Date: Tue, 4 Feb 2025 09:34:58 +0300
Subject: [PATCH 4/4] Codacy fix

---
 .../frontend/public/stylesheets/ratings.scss  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/star-rating/frontend/public/stylesheets/ratings.scss b/plugins/star-rating/frontend/public/stylesheets/ratings.scss
index c5056f23eb8..85d0efaeb48 100644
--- a/plugins/star-rating/frontend/public/stylesheets/ratings.scss
+++ b/plugins/star-rating/frontend/public/stylesheets/ratings.scss
@@ -56,17 +56,17 @@
 
     &__step {
         &__consent-wrapper {
-            .el-checkbox__input.is-checked + .el-checkbox__label {
-                color: #333c48;
-            }
-
-            .el-checkbox__label {
-                padding-left: 8px;
-
-                &:hover {
-                    color: #333c48;
-                }
+          .el-checkbox__label {
+            padding-left: 8px;
+      
+            &:hover {
+              color: #333c48;
             }
+          }
+      
+          .el-checkbox__input.is-checked + .el-checkbox__label {
+            color: #333c48;
+          }
         }
     }