differenciate between the code owners

Author: ildyria

src/ResponsesTypes.ts

@@ -39,7 +39,7 @@ export type PullRequest = {
 	head: { ref: string };
 };
 
-export const CONTRIBUTOR = 'CONTRIBUTOR';
+export const CONTRIBUTORS = ['JasonMillward', 'ppshobi', 'ildyria', 'RonnieTaz', 'sancsin', 'd7415'];
 export const APPROVED = 'APPROVED';
 export const CHANGES_REQUESTED = 'CHANGES_REQUESTED';
 export type PullRequestReview = {
@@ -59,6 +59,7 @@ export type ReviewStatus = {
 	review?: {
 		approved: boolean;
 		changes_requested: boolean;
+		code_owner_approved: boolean;
 		by: User[];
 	};
 };

src/components/PrList.vue

@@ -5,8 +5,7 @@
 			:key="pr.id"
 			:class="{
 				'flex justify-between gap-16': true,
-				'transition-opacity duration-100 ease-in-out opacity-50 hover:opacity-100':
-					pr.draft,
+				'transition-opacity duration-100 ease-in-out opacity-50 hover:opacity-100': pr.draft,
 			}"
 		>
 			<div class="flex flex-col">
@@ -46,18 +45,19 @@
 					</span>
 				</div>
 			</div>
-			<div v-if="pr.review && pr.review.changes_requested" class="text-red-400 font-bold">
-				Changes requested.
-			</div>
+			<div v-if="pr.review && pr.review.changes_requested" class="text-red-400 font-bold">Changes requested.</div>
 			<div v-else-if="pr.review && pr.review.approved" class="flex flex-col">
-				<div class="text-green-500 text-right">Approved</div>
+				<div
+					:class="{
+						'text-right': true,
+						'text-green-500': pr.review.approved && pr.review.code_owner_approved,
+					}"
+				>
+					Approved
+				</div>
 				<div class="text-xs">
 					by
-					<UserTag
-						v-for="(user, idx) in pr.review.by"
-						:user="user"
-						:key="`u${pr.id}-${idx}`"
-					/>
+					<UserTag v-for="(user, idx) in pr.review.by" :user="user" :key="`u${pr.id}-${idx}`" />
 				</div>
 			</div>
 			<div

src/components/UserTag.vue

@@ -1,5 +1,5 @@
 <template>
-	<a :href="props.user.html_url" class="text-muted-color-emphasis">
+	<a :href="props.user.html_url" class="text-muted-color-emphasis ml-2">
 		<img :src="props.user.avatar_url" class="rounded-full h-4 inline" /> {{ props.user.login }}
 	</a>
 </template>

src/composables/getData.ts

@@ -1,7 +1,7 @@
 import {
 	APPROVED,
 	CHANGES_REQUESTED,
-	CONTRIBUTOR,
+	CONTRIBUTORS,
 	type PullRequest,
 	type PullRequestReview,
 	type ReviewStatus,
@@ -54,10 +54,7 @@ export function useGetData(
 		// Ignore all the reviews that are not from the contributors.
 		const statuses = reviews.reduce(
 			(acc, review) => {
-				if (
-					(review.state === APPROVED || review.state === CHANGES_REQUESTED) &&
-					review.author_association === CONTRIBUTOR
-				) {
+				if (review.state === APPROVED || review.state === CHANGES_REQUESTED) {
 					acc[review.user.login] = { status: review.state, user: review.user };
 				}
 				return acc;
@@ -69,14 +66,18 @@ export function useGetData(
 			review: {
 				approved: false,
 				changes_requested: false,
+				code_owner_approved: false,
 				by: [],
 			},
 		};
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		Object.entries(statuses).forEach(([_, review]) => {
-			if (review.status === APPROVED) {
+			if (review.status === APPROVED && CONTRIBUTORS.includes(review.user.login)) {
 				result.review!.approved = true;
-			} else if (status === CHANGES_REQUESTED) {
+				result.review!.code_owner_approved = true;
+			} else if (review.status === APPROVED) {
+				result.review!.approved = true;
+			} else if (review.status === CHANGES_REQUESTED) {
 				result.review!.changes_requested = true;
 			}
 			result.review!.by.push(review.user);

src/composables/octokitWrapper.ts

@@ -3,10 +3,7 @@ import type { QueryStore } from '@/stores/queryStore';
 import { type Octokit } from 'octokit';
 
 export function useOctokitWrapper(octokit: Octokit, store: QueryStore) {
-	async function fetchPullRequests(
-		owner: string,
-		repo: string,
-	): Promise<PullRequest[] | undefined> {
+	async function fetchPullRequests(owner: string, repo: string): Promise<PullRequest[] | undefined> {
 		const group = {
 			owner: owner,
 			repo: repo,

src/composables/splitter.ts

@@ -36,11 +36,7 @@ export function useSplitter() {
 		return ret;
 	}
 
-	function verifyOrder(
-		is_debug: boolean,
-		data: { id: string }[],
-		splitData: SplitData<{ id: string }>[],
-	) {
+	function verifyOrder(is_debug: boolean, data: { id: string }[], splitData: SplitData<{ id: string }>[]) {
 		if (!is_debug) {
 			return;
 		}
@@ -60,18 +56,14 @@ export function useSplitter() {
 				}
 				const candidate = chunk.iter + idx;
 				if (expected !== candidate) {
-					console.error(
-						`Data mismatch for id ${d.id} (expected ${expected}, got ${candidate})`,
-					);
+					console.error(`Data mismatch for id ${d.id} (expected ${expected}, got ${candidate})`);
 					check = true;
 				}
 			});
 		});
 
 		if (check) {
-			alert(
-				'Data mismatch found in splitter, please check the console logs and contact the developer.',
-			);
+			alert('Data mismatch found in splitter, please check the console logs and contact the developer.');
 		}
 	}