Merge pull request #4660 from Countly/ratings/conflicts

changes to resolve ratings conflicts
Countly · Nov 1, 2023 · 35a3917 · 35a3917
2 parents 666fffc + afd3d6c
commit 35a3917
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/plugins/star-rating/frontend/public/templates/comments-table.html b/plugins/star-rating/frontend/public/templates/comments-table.html
@@ -1,9 +1,18 @@
-<cly-datatable-n test-id="ratings-comments-table" :rows="preparedRows" :persist-key="commentsTablePersistKey" :force-loading="loadingState" width="100%">
+<cly-datatable-n test-id="ratings-comments-table" :rows="preparedRows" :persist-key="commentsTablePersistKey" width="100%">
   <template v-slot="scope">
-      <el-table-column sortable="true" prop="rating" :label="i18n('feedback.rating')"  min-width="60">
+      <el-table-column prop="comment" :label="i18n('feedback.comment')" min-width="260">
+        <template v-slot="rowScope">
+          <div class="has-ellipsis" v-tooltip="{content:rowScope.row.comment,placement:'auto'}">
+            <span class="text-medium" :data-test-id="'ratings-comment-table-comment-row-' + rowScope.$index">
+              {{ rowScope.row.comment }}
+            </span>
+          </div>
+        </template>
+      </el-table-column>
+        <el-table-column sortable="true" prop="rating" :label="i18n('feedback.rating')" min-width="60">
           <template v-slot="rowScope">
               <span class="text-medium" :data-test-id="'ratings-comment-table-rating-row-' + rowScope.$index">
-                {{rowScope.row.rating}}
+                <span :class="'rating-color rating-comments-color-' + rowScope.row.rating"></span> {{ rowScope.row.rating}}
               </span>
           </template>
       </el-table-column>
@@ -12,15 +21,6 @@
             <span class="text-medium" :data-test-id="'ratings-comment-table-time-row-' + rowScope.$index" v-html="rowScope.row.cd"></span>
         </template>
       </el-table-column>
-      <el-table-column prop="comment" :label="i18n('feedback.comment')" min-width="260">
-        <template v-slot="rowScope">
-          <div class="has-ellipsis" v-tooltip="{content:rowScope.row.comment,placement:'auto'}"></div>
-            <span class="text-medium" :data-test-id="'ratings-comment-table-comment-row-' + rowScope.$index">
-              {{ rowScope.row.comment }}
-            </span>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column prop="email" :label="i18n('feedback.email')" min-width="200">
         <template v-slot="rowScope">
             <span class="text-medium" :data-test-id="'ratings-comment-table-time-email-row' + rowScope.$index">
@@ -29,4 +29,4 @@
         </template>
       </el-table-column>
   </template>
-</cly-datatable-n>
+</cly-datatable-n>