fix: Simplify rating logic (#7918)

frontend/app/components/Domain/Recipe/RecipeCardRating.vue

@@ -6,8 +6,8 @@
       class="star"
       :class="{
         'star-half': star === 'half',
-        'text-secondary': !useGroupStyle,
+        'text-secondary': !showGroupAverage,
-        'text-grey-darken-1': useGroupStyle,
+        'text-grey-darken-1': showGroupAverage,
       }"
     >
       <!-- We render both the full and empty stars for "half" stars because they're layered over each other -->
@@ -28,7 +28,6 @@
 </template>
 
 <script setup lang="ts">
-import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { useUserSelfRatings } from "~/composables/use-users";
 
 type Star = "full" | "half" | "empty";
@@ -44,15 +43,17 @@ const props = defineProps({
   },
 });
 
-const { isOwnGroup } = useLoggedInState();
 const { userRatings } = useUserSelfRatings();
 
 const userRating = computed(() => {
-  return userRatings.value.find(r => r.recipeId === props.recipeId)?.rating ?? undefined;
+  return userRatings.value.find(r => r.recipeId === props.recipeId)?.rating ?? null;
 });
 
-const ratingValue = computed(() => userRating.value || props.modelValue || 0);
+// this display is always readonly, so we show the user's own rating if they have one,
-const useGroupStyle = computed(() => isOwnGroup.value && !userRating.value && props.modelValue);
+// and otherwise fall back to the group average (in grey), if there is one.
+// An unset rating may be null or 0
+const showGroupAverage = computed(() => !userRating.value && !!props.modelValue);
+const ratingValue = computed(() => (showGroupAverage.value ? props.modelValue : userRating.value) || 0);
 const ratingDisplay = computed<Star[]>(
   () => {
     const stars: Star[] = [];

frontend/app/components/Domain/Recipe/RecipeRating.vue

@@ -1,8 +1,6 @@
 <template>
   <div @click.prevent>
-    <!-- User Rating: shows the group average until the user rates the recipe themselves -->
     <v-rating
-      v-if="isOwnGroup"
       :model-value="displayRating"
       :active-color="showGroupAverage ? 'grey-darken-1' : 'secondary'"
       color="secondary-lighten-3"
@@ -10,22 +8,11 @@
       :half-increments="showGroupAverage"
       :density="small ? 'compact' : 'default'"
       :size="small ? 'x-small' : undefined"
-      :hover="canHover"
+      :readonly="isReadonly"
-      :clearable="!!userRatingDisplayValue"
+      :hover="!isReadonly && canHover"
+      :clearable="!!displayRating"
       @update:model-value="updateRating(+$event)"
     />
-    <!-- Group Rating -->
-    <v-rating
-      v-else
-      :model-value="groupRating"
-      :half-increments="true"
-      active-color="grey-darken-1"
-      color="secondary-lighten-3"
-      length="5"
-      :density="small ? 'compact' : 'default'"
-      :size="small ? 'x-small' : undefined"
-      readonly
-    />
   </div>
 </template>
 
@@ -35,23 +22,23 @@ import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { useUserSelfRatings } from "~/composables/use-users";
 
 interface Props {
-  emitOnly?: boolean;
+  readonly?: boolean;
   recipeId?: string;
   slug?: string;
   small?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  emitOnly: false,
+  readonly: false,
   recipeId: "",
   slug: "",
   small: false,
 });
 
-const modelValue = defineModel<number>({ default: 0 });
+const groupRating = defineModel<number>({ default: 0 });
-const groupRating = computed(() => modelValue.value);
 
 const { isOwnGroup } = useLoggedInState();
+const isReadonly = computed(() => props.readonly || !isOwnGroup.value);
 const { userRatings, setRating } = useUserSelfRatings();
 
 // on touch devices a tap fires mouseenter without a matching mouseleave, which leaves v-rating
@@ -72,19 +59,22 @@ watch(userRating, (value) => {
   }
 });
 
-const userRatingDisplayValue = computed(() => localUserRating.value ?? 0);
+// only fall back to the group average when we can't offer the user their own rating,
-const showGroupAverage = computed(() => localUserRating.value === null);
+// and only when there's actually a group average to show. An unset rating may be null or 0
+const showGroupAverage = computed(() => {
+  return isReadonly.value && !localUserRating.value && !!groupRating.value;
+});
 
 const displayRating = computed(() => {
-  return showGroupAverage.value ? groupRating.value : userRatingDisplayValue.value;
+  return showGroupAverage.value ? groupRating.value : (localUserRating.value || 0);
 });
 
 async function updateRating(val?: number) {
-  if (!isOwnGroup.value) {
+  if (isReadonly.value) {
     return;
   }
 
-  // the group average can be a half value, but user ratings are always whole stars
+  // user ratings are always whole stars
   let rating = Math.round(val ?? 0);
   if (rating === localUserRating.value) {
     rating = 0;
@@ -92,11 +82,6 @@ async function updateRating(val?: number) {
 
   localUserRating.value = rating;
 
-  if (props.emitOnly) {
-    modelValue.value = rating;
-    return;
-  }
-
   pendingWrites.value++;
   try {
     await setRating(props.slug, rating, null);