DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fixed scene filter breaking without page entity. Improved scroll restore after applying filter.

This commit is contained in:
DebaucheryLibrarian 2024-09-04 22:50:51 +02:00
parent 858a1f7087
commit 3cf8fd1bb8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/scenes/scenes.vue
View File

@ -51,6 +51,7 @@
</transition> </transition>
<div <div
ref="scenesContainer"
class="scenes-container" class="scenes-container"
:class="{ loading }" :class="{ loading }"
> >
@ -154,12 +155,17 @@
</template> </template>
<script setup> <script setup>
import { ref, computed, inject } from 'vue'; import {
ref,
computed,
inject,
} from 'vue';
import { parse } from 'path-to-regexp'; import { parse } from 'path-to-regexp';
import navigate from '#/src/navigate.js'; import navigate from '#/src/navigate.js';
import { get } from '#/src/api.js'; import { get } from '#/src/api.js';
import events from '#/src/events.js'; // import events from '#/src/events.js';
import entityPrefixes from '#/src/entities-prefixes.js'; import entityPrefixes from '#/src/entities-prefixes.js';
import { getActorIdentifier, parseActorIdentifier } from '#/src/query.js'; import { getActorIdentifier, parseActorIdentifier } from '#/src/query.js';
@ -216,6 +222,7 @@ const currentPage = ref(Number(routeParams.page));
const scope = ref(routeParams.scope || props.defaultScope); const scope = ref(routeParams.scope || props.defaultScope);
const total = ref(Number(pageProps.sceneTotal || pageProps.total)); const total = ref(Number(pageProps.sceneTotal || pageProps.total));
const loading = ref(false); const loading = ref(false);
const scenesContainer = ref(null);
const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || []; const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || [];
const queryActors = actorIds.map((urlActorId) => aggActors.value.find((aggActor) => aggActor.id === urlActorId)).filter(Boolean); const queryActors = actorIds.map((urlActorId) => aggActors.value.find((aggActor) => aggActor.id === urlActorId)).filter(Boolean);
@ -279,7 +286,7 @@ async function search(options = {}) {
const entity = filters.value.entity || pageEntity; const entity = filters.value.entity || pageEntity;
// const entitySlug = entity?.type === 'network' ? `_${entity.slug}` : entity?.slug; // const entitySlug = entity?.type === 'network' ? `_${entity.slug}` : entity?.slug;
const entitySlug = `${entityPrefixes[entity.type]}${entity.slug}`; const entitySlug = entity && `${entityPrefixes[entity.type]}${entity.slug}`;
loading.value = true; loading.value = true;
@ -312,7 +319,8 @@ async function search(options = {}) {
total.value = res.total; total.value = res.total;
loading.value = false; loading.value = false;
events.emit('scrollUp'); // events.emit('scrollUp');
scenesContainer.value?.scrollIntoView(true);
} }
function updateFilter(prop, value, reload = true) { function updateFilter(prop, value, reload = true) {
@ -353,6 +361,7 @@ function updateFilter(prop, value, reload = true) {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
scroll-margin-top: 3rem; /* ensure scroll into view includes meta bar */
} }
.meta { .meta {

2
src/scenes.js
View File

@ -570,8 +570,6 @@ export async function fetchScenes(filters, rawOptions, reqUser) {
const tagCounts = options.aggregateTags && countAggregations(result.aggregations?.tagIds); const tagCounts = options.aggregateTags && countAggregations(result.aggregations?.tagIds);
const channelCounts = options.aggregateChannels && countAggregations(entityIds); const channelCounts = options.aggregateChannels && countAggregations(entityIds);
console.log('entity ids', entityIds);
console.time('fetch aggregations'); console.time('fetch aggregations');
const [aggActors, aggTags, aggChannels] = await Promise.all([ const [aggActors, aggTags, aggChannels] = await Promise.all([