diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js index f82d3416..afdfa0c7 100755 --- a/assets/js/entities/actions.js +++ b/assets/js/entities/actions.js @@ -14,7 +14,7 @@ function initEntitiesActions(store, router) { }) { const { before, after, orderBy } = getDateRange(range); - const { entity, batches: [lastBatch] } = await graphql(` + const { entity, connection, batches: [lastBatch] } = await graphql(` query Entity( $entitySlug: String! $entityType: String! = "channel" @@ -84,32 +84,40 @@ function initEntitiesActions(store, router) { hasLogo ${campaignsFragment} } - connection: scenesConnection( - first: $limit - offset: $offset - orderBy: $orderBy - filter: { - effectiveDate: { - lessThan: $before, - greaterThan: $after + } + connection: releasesConnection( + first: $limit + offset: $offset + orderBy: $orderBy + filter: { + entity: { + slug: { + equalTo: $entitySlug } - releasesTagsConnection: { - none: { - tag: { - slug: { - in: $exclude - } + type: { + equalTo: $entityType + } + } + effectiveDate: { + lessThan: $before, + greaterThan: $after + } + releasesTagsConnection: { + none: { + tag: { + slug: { + in: $exclude } } } } - ) { - releases: nodes { - ${releaseFields} - } - totalCount } - } + ) { + releases: nodes { + ${releaseFields} + } + totalCount + } ${batchFragment} } `, { @@ -131,8 +139,8 @@ function initEntitiesActions(store, router) { } return { - entity: curateEntity(entity, null, entity.connection.releases, { lastBatch: lastBatch.id }), - totalCount: entity.connection.totalCount, + entity: curateEntity(entity, null, connection.releases, { lastBatch: lastBatch.id }), + totalCount: connection.totalCount, }; }