From 542fbee85e7fbf4dbd47671e49326f240bf633fd Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Mon, 16 Jan 2023 16:49:47 +0100 Subject: [PATCH] Using showcase view in filter. --- assets/js/fragments.js | 31 ++++++++++++++----------------- assets/js/releases/actions.js | 4 ++-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/assets/js/fragments.js b/assets/js/fragments.js index d17ba5226..0a8681da0 100755 --- a/assets/js/fragments.js +++ b/assets/js/fragments.js @@ -415,21 +415,20 @@ const releaseFields = ` `; const releasesFragment = ` - connection: releasesShowcasedsConnection( + connection: releasesConnection( filter: { - release: { - date: { - lessThan: $before, - greaterThan: $after - } - releasesTagsConnection: { - none: { - tag: { - or: [ - { slug: { in: $exclude } } - { name: { in: $exclude } } - ] - } + releasesShowcasedsConnectionExist: true + date: { + lessThan: $before, + greaterThan: $after + } + releasesTagsConnection: { + none: { + tag: { + or: [ + { slug: { in: $exclude } } + { name: { in: $exclude } } + ] } } } @@ -439,9 +438,7 @@ const releasesFragment = ` orderBy: $orderBy ) { releases: nodes { - release { - ${releaseFields} - } + ${releaseFields} } totalCount } diff --git a/assets/js/releases/actions.js b/assets/js/releases/actions.js index d06a4c772..e0bf7434a 100755 --- a/assets/js/releases/actions.js +++ b/assets/js/releases/actions.js @@ -22,7 +22,7 @@ function initReleasesActions(store, router) { $offset:Int = 0, $after:Datetime = "1900-01-01 00:00:00", $before:Datetime = "2100-01-01 00:00:00", - $orderBy: [ReleasesShowcasedsOrderBy!], + $orderBy: [ReleasesOrderBy!], $exclude: [String!] ) { ${releasesFragment} @@ -34,7 +34,7 @@ function initReleasesActions(store, router) { offset: Math.max(0, (pageNumber - 1)) * limit, after, before, - orderBy: `RELEASE_BY_RELEASE_ID__${orderBy}`, + orderBy, exclude: store.state.ui.tagFilter, });