Compare commits

..

No commits in common. "85942c5d00e8f14c32743f6907ddc22c5c367481" and "67365507b5bdffb36daa755cded60f6c53aa2763" have entirely different histories.

3 changed files with 26 additions and 34 deletions

View File

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

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.18", "version": "1.227.17",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "traxxx", "name": "traxxx",
"version": "1.227.18", "version": "1.227.17",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.18", "version": "1.227.17",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {