Added pagination and total to revisions.

components/edit/revisions.vue

@@ -5,8 +5,10 @@ import { computed, inject, ref } from 'vue';
 import Avatar from '#/components/edit/avatar.vue';
 import Socials from '#/components/edit/revision-socials.vue';
 import Checkbox from '#/components/form/checkbox.vue';
+import Pagination from '#/components/pagination/pagination.vue';
 
 import { get, post } from '#/src/api.js';
+import navigate from '#/src/navigate.js';
 import { formatDuration } from '#/utils/format.js';
 
 defineProps({
@@ -31,10 +33,14 @@ const moviesById = computed(() => Object.fromEntries(movies.value.map((movie) =>
 const avatarsById = computed(() => Object.fromEntries(avatars.value.map((avatar) => [avatar.id, avatar])));
 
 const feedbacks = ref({});
-const showReviewed = ref(false);
+const showReviewed = ref(Object.hasOwn(pageContext.urlParsed.search, 'final'));
 const reviewedRevisions = ref(new Set());
 const expanded = ref(new Set());
 
+const total = ref(pageContext.pageProps.revisionTotal);
+const page = Number(pageContext.routeParams.page) || 1;
+const limit = Number(pageContext.urlParsed.search.limit) || 100;
+
 const mappedKeys = {
 	actors: actorsById,
 	// tags: tagsById,
@@ -163,7 +169,8 @@ const curatedRevisions = computed(() => revisions.value.map((revision) => {
 async function reloadRevisions() {
 	const updatedRevisions = await get(`/revisions/${domain}`, {
 		isFinalized: showReviewed.value ? undefined : false,
-		limit: 50,
+		page,
+		limit,
 	});
 
 	actors.value = updatedRevisions.actors;
@@ -171,6 +178,14 @@ async function reloadRevisions() {
 	movies.value = updatedRevisions.movies;
 	avatars.value = updatedRevisions.avatars;
 	revisions.value = updatedRevisions.revisions;
+	total.value = updatedRevisions.total;
+
+	navigate(pageContext.urlParsed.pathname, {
+		...pageContext.urlParsed.search,
+		final: showReviewed.value || undefined,
+	}, {
+		redirect: false,
+	});
 }
 
 async function reviewRevision(revision, isApproved) {
@@ -208,10 +223,12 @@ async function banEditor(revision) {
 <template>
 	<div class="page">
 		<div
-			v-if="context === 'admin'"
 			class="revs-header"
 		>
+			<span class="revs-total">{{ total }} revisions</span>
+
 			<Checkbox
+				v-if="context === 'admin'"
 				label="Show finalized"
 				:checked="showReviewed"
 				@change="(checked) => { showReviewed = checked; reloadRevisions(); }"
@@ -388,13 +405,12 @@ async function banEditor(revision) {
 					class="rev-compact"
 					@click="expanded.add(rev.id)"
 				>
-
 					<span class="rev-scene nolink noshrink"><template v-if="context !== 'scene' && context !== 'actor'">{{ rev.sceneId || rev.actorId }}</template>@{{ rev.hash.slice(0, 6) }}</span>
 
 					<span
 						v-if="context !== 'scene'"
 						class="rev-title nolink ellipsis"
-					>{{ rev.base.title }}</span>
+					>{{ rev.base.title || rev.base.name }}</span>
 
 					<span class="rev-summary">
 						<span class="summary-deltas ellipsis">{{ rev.deltas.map((delta) => delta.key).join(', ') }}</span>
@@ -431,6 +447,13 @@ async function banEditor(revision) {
 				</div>
 			</li>
 		</ul>
+
+		<Pagination
+			v-if="total"
+			:total="total"
+			:page="page"
+			:limit="limit"
+		/>
 	</div>
 </template>
 
@@ -443,13 +466,20 @@ async function banEditor(revision) {
 
 .revs-header {
 	display: flex;
-	margin-bottom: 1rem;
+	justify-content: space-between;
+	box-sizing: border-box;
+	padding: .5rem .5rem .75rem .5rem;
+	width: 100%;
 
 	.check-container {
 		display: inline-flex;
 	}
 }
 
+.revs-total {
+	color: var(--shadow-strong-10);
+}
+
 .revs {
 	width: 100%;
 	flex-grow: 1;

components/pagination/pagination.vue

@@ -13,6 +13,10 @@ const props = defineProps({
 		type: Number,
 		default: null,
 	},
+	limit: {
+		type: Number,
+		default: null,
+	},
 	redirect: {
 		type: Boolean,
 		default: true,

pages/admin/revisions/actors/+onBeforeRender.js

@@ -10,10 +10,12 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		avatars,
 	} = await fetchActorRevisions(null, {
-		isFinalized: false,
+		isFinalized: Object.hasOwn(pageContext.urlParsed.search, 'final'),
-		limit: 50,
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -21,6 +23,7 @@ export async function onBeforeRender(pageContext) {
 			title: pageContext.routeParams.section,
 			pageProps: {
 				revisions,
+				revisionTotal,
 				avatars,
 			},
 		},

pages/admin/revisions/actors/+route.js

@@ -1,6 +1,6 @@
 import { match } from 'path-to-regexp';
 
-const path = '/admin/:section/:domain(actors)';
+const path = '/admin/:section/:domain(actors)/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -11,6 +11,8 @@ export default (pageContext) => {
 			routeParams: {
 				section: matched.params.section,
 				domain: matched.params.domain,
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

pages/admin/revisions/scenes/+onBeforeRender.js

@@ -10,12 +10,14 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		actors,
 		tags,
 		movies,
 	} = await fetchSceneRevisions(null, {
-		isFinalized: false,
+		isFinalized: Object.hasOwn(pageContext.urlParsed.search, 'final'),
-		limit: 50,
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -23,6 +25,7 @@ export async function onBeforeRender(pageContext) {
 			title: pageContext.routeParams.section,
 			pageProps: {
 				revisions,
+				revisionTotal,
 				actors,
 				tags,
 				movies,

pages/admin/revisions/scenes/+route.js

@@ -1,6 +1,6 @@
 import { match } from 'path-to-regexp';
 
-const path = '/admin/:section/:domain(scenes)';
+const path = '/admin/:section/:domain(scenes)/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -11,6 +11,8 @@ export default (pageContext) => {
 			routeParams: {
 				section: matched.params.section,
 				domain: matched.params.domain,
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

pages/users/@username/+onBeforeRender.js

@@ -15,14 +15,16 @@ async function fetchRevisions(pageContext) {
 	if (pageContext.routeParams.section === 'revisions' && pageContext.routeParams.domain === 'scenes') {
 		return fetchSceneRevisions(null, {
 			userId: pageContext.user.id,
-			limit: 100,
+			limit: Number(pageContext.urlParsed.search.limit) || 100,
+			page: Number(pageContext.routeParams.page) || 1,
 		}, pageContext.user);
 	}
 
 	if (pageContext.routeParams.section === 'revisions' && pageContext.routeParams.domain === 'actors') {
 		return fetchActorRevisions(null, {
 			userId: pageContext.user.id,
-			limit: 100,
+			limit: Number(pageContext.urlParsed.search.limit) || 100,
+			page: Number(pageContext.routeParams.page) || 1,
 		}, pageContext.user);
 	}
 
@@ -47,6 +49,7 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		actors,
 		tags,
 		movies,
@@ -63,6 +66,7 @@ export async function onBeforeRender(pageContext) {
 				stashes,
 				alerts,
 				revisions,
+				revisionTotal,
 				keys,
 				actors,
 				tags,

pages/users/@username/+route.js

@@ -1,7 +1,7 @@
 import { match } from 'path-to-regexp';
 import { redirect } from 'vike/abort';
 
-const path = '/user/:username/:section?/:domain?';
+const path = '/user/:username/:section?/:domain?/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -18,6 +18,8 @@ export default (pageContext) => {
 				username: matched.params.username,
 				section: matched.params.section || '',
 				domain: matched.params.domain || '',
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

src/actors.js

@@ -1059,6 +1059,7 @@ export async function fetchActorRevisions(revisionId, filters = {}, reqUser) {
 			'actors_revisions.*',
 			'users.username as username',
 			'reviewers.username as reviewer_username',
+			knex.raw('count(*) over() as total'),
 		)
 		.leftJoin('users', 'users.id', 'actors_revisions.user_id')
 		.leftJoin('users as reviewers', 'reviewers.id', 'actors_revisions.reviewed_by')
@@ -1105,6 +1106,7 @@ export async function fetchActorRevisions(revisionId, filters = {}, reqUser) {
 	return {
 		revisions: curatedRevisions,
 		revision: revisionId && curatedRevisions.find((revision) => revision.id === revisionId),
+		total: Number(revisions[0]?.total) || 0,
 		avatars,
 	};
 }

src/scenes.js

@@ -766,6 +766,7 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 			'scenes_revisions.*',
 			'users.username as username',
 			'reviewers.username as reviewer_username',
+			knexOwner.raw('count(*) over() as total'),
 		)
 		.leftJoin('users', 'users.id', 'scenes_revisions.user_id')
 		.leftJoin('users as reviewers', 'reviewers.id', 'scenes_revisions.reviewed_by')
@@ -824,6 +825,7 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 	return {
 		revisions: curatedRevisions,
 		revision: revisionId && curatedRevisions.find((revision) => revision.id === revisionId),
+		total: Number(revisions[0]?.total) || 0,
 		actors,
 		tags,
 		movies,