From ff384fb734c8f4231d53b3aa30e5eb6fef63dc51 Mon Sep 17 00:00:00 2001
From: Niels Simenon <niels.simenon@gmail.com>
Date: Tue, 30 Jun 2020 01:52:17 +0200
Subject: [PATCH] Fixed search documents to coalesce empty parent entities.

---
 assets/components/releases/release.vue  | 4 ++--
 assets/components/releases/releases.vue | 8 ++++++++
 assets/components/search/search.vue     | 5 +++++
 assets/js/ui/actions.js                 | 8 ++++----
 docs/associated-tags.sql                | 4 +++-
 migrations/20190325001339_releases.js   | 3 +++
 src/store-releases.js                   | 9 ++++-----
 7 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/assets/components/releases/release.vue b/assets/components/releases/release.vue
index b49fd752..7fd84d2e 100644
--- a/assets/components/releases/release.vue
+++ b/assets/components/releases/release.vue
@@ -314,8 +314,8 @@ export default {
 
 .logo-site {
     height: 3rem;
-	width: 100%;
     max-width: 15rem;
+	margin: .25rem 0;
     object-fit: contain;
     object-position: 100% 50%;
 }
@@ -470,7 +470,7 @@ export default {
         display: inline-block;
     }
 
-	.site {
+	.logo-site {
 		max-width: 100%;
 	}
 
diff --git a/assets/components/releases/releases.vue b/assets/components/releases/releases.vue
index 7fc21a51..fadc47a5 100644
--- a/assets/components/releases/releases.vue
+++ b/assets/components/releases/releases.vue
@@ -85,6 +85,14 @@ export default {
 
 .releases {
 	border-top: solid 1px var(--crease);
+
+	&.embedded {
+		border: none;
+
+		.tiles {
+			padding: 0;
+		}
+	}
 }
 
 .tiles {
diff --git a/assets/components/search/search.vue b/assets/components/search/search.vue
index 768f44ac..c73b3b03 100644
--- a/assets/components/search/search.vue
+++ b/assets/components/search/search.vue
@@ -30,6 +30,7 @@
 
 		<Releases
 			v-if="!loading && releases.length > 0"
+			class="embedded"
 			:releases="releases"
 		/>
 	</div>
@@ -93,6 +94,10 @@ export default {
 <style lang="scss" scoped>
 @import 'theme';
 
+.content-inner {
+	padding: 1rem;
+}
+
 .summary {
     display: block;
     margin: 0 0 1rem 0;
diff --git a/assets/js/ui/actions.js b/assets/js/ui/actions.js
index 2f3f139e..db5a9e6f 100644
--- a/assets/js/ui/actions.js
+++ b/assets/js/ui/actions.js
@@ -43,12 +43,12 @@ function initUiActions(_store, _router) {
                     url
                     type
                     isNew
-                    site {
+                    entity {
                         id
                         slug
                         name
                         url
-                        network {
+                        parent {
                             id
                             slug
                             name
@@ -105,7 +105,7 @@ function initUiActions(_store, _router) {
 						dateOfBirth
 						dateOfDeath
 						gender
-						network {
+						entity {
 							id
 							name
 							slug
@@ -124,7 +124,7 @@ function initUiActions(_store, _router) {
 						  alias
 						}
 					}
-                    network {
+                    entity {
                         id
                         name
                         slug
diff --git a/docs/associated-tags.sql b/docs/associated-tags.sql
index da4d9624..a55e636d 100644
--- a/docs/associated-tags.sql
+++ b/docs/associated-tags.sql
@@ -2,4 +2,6 @@ SELECT tags.name FROM actors
 LEFT JOIN releases_actors ON releases_actors.actor_id = actors.id
 LEFT JOIN releases_tags ON releases_tags.release_id = releases_actors.release_id
 LEFT JOIN tags ON tags.id = releases_tags.tag_id
-WHERE actors.slug = 'vina-sky';
+WHERE actors.slug = 'vina-sky'
+GROUP BY tags.id
+ORDER BY tags.name;
diff --git a/migrations/20190325001339_releases.js b/migrations/20190325001339_releases.js
index e0d789dd..631b2f13 100644
--- a/migrations/20190325001339_releases.js
+++ b/migrations/20190325001339_releases.js
@@ -97,6 +97,9 @@ exports.up = knex => Promise.resolve()
 		table.integer('priority', 2)
 			.defaultTo(0);
 
+		table.boolean('filter')
+			.defaultTo(false);
+
 		table.boolean('secondary')
 			.defaultTo(false);
 
diff --git a/src/store-releases.js b/src/store-releases.js
index 1d5aafe3..dacbb898 100644
--- a/src/store-releases.js
+++ b/src/store-releases.js
@@ -174,13 +174,12 @@ async function updateReleasesSearch(releaseIds) {
             TO_TSVECTOR(
                 'traxxx',
                 COALESCE(releases.title, '') || ' ' ||
-                parents.name || ' ' ||
-                parents.slug || ' ' ||
-                parents.url || ' ' ||
                 entities.name || ' ' ||
                 entities.slug || ' ' ||
-                COALESCE(entities.url, '') || ' ' ||
                 COALESCE(entities.alias, '') || ' ' ||
+                COALESCE(parents.name, '') || ' ' ||
+                COALESCE(parents.slug, '') || ' ' ||
+                COALESCE(parents.alias, '') || ' ' ||
                 COALESCE(releases.shoot_id, '') || ' ' ||
                 COALESCE(TO_CHAR(releases.date, 'YYYY YY MM FMMM FMmonth mon DD FMDD'), '') || ' ' ||
                 STRING_AGG(COALESCE(actors.name, ''), ' ') || ' ' ||
@@ -196,7 +195,7 @@ async function updateReleasesSearch(releaseIds) {
         LEFT JOIN tags ON local_tags.tag_id = tags.id AND tags.priority >= 7
         LEFT JOIN tags as tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
         ${releaseIds ? 'WHERE releases.id = ANY(?)' : ''}
-        GROUP BY releases.id, entities.name, entities.slug, entities.alias, entities.url, parents.name, parents.slug, parents.url;
+        GROUP BY releases.id, entities.name, entities.slug, entities.alias, parents.name, parents.slug, parents.alias;
     `, releaseIds && [releaseIds]);
 
 	if (documents.rows?.length > 0) {