From 41d7d2fa34390557ae254def9799ae35b797dbae Mon Sep 17 00:00:00 2001
From: Niels Simenon <niels.simenon@gmail.com>
Date: Sun, 28 Jun 2020 04:22:19 +0200
Subject: [PATCH] Fixed actor description logos.

---
 assets/components/actors/actor.vue      | 18 +++++---------
 assets/components/releases/releases.vue |  7 +++++-
 assets/js/actors/actions.js             | 33 ++++++++++++++++++++-----
 assets/js/curate.js                     |  3 +--
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue
index 20cf3f45..07daa773 100644
--- a/assets/components/actors/actor.vue
+++ b/assets/components/actors/actor.vue
@@ -5,7 +5,7 @@
 	>
 		<div class="actor-header">
 			<h2 class="header-name">
-				<span v-if="actor.network">{{ actor.name }} ({{ actor.network.name }})</span>
+				<span v-if="actor.entity">{{ actor.name }} ({{ actor.entity.name }})</span>
 				<span v-else="">{{ actor.name }}</span>
 
 				<Gender
@@ -248,20 +248,20 @@
 					>
 						<p
 							v-for="description in actor.descriptions"
-							:key="`description-${description.network.id}`"
+							:key="`description-${description.entity.id}`"
 							class="description"
 						>
 							{{ description.text }}
-							<router-link :to="{ name: 'network', params: { networkSlug: description.network.slug } }">
+							<router-link :to="`/${description.entity.type}/${description.entity.slug}`">
 								<img
-									v-if="description.site"
-									:src="`/img/logos/${description.network.slug}/thumbs/${description.site.slug}.png`"
+									v-if="description.entity.type === 'network'"
+									:src="`/img/logos/${description.entity.slug}/thumbs/network.png`"
 									class="description-logo"
 								>
 
 								<img
 									v-else
-									:src="`/img/logos/${description.network.slug}/thumbs/network.png`"
+									:src="`/img/logos/${description.entity.parent.slug}/thumbs/${description.entity.slug}.png`"
 									class="description-logo"
 								>
 							</router-link>
@@ -633,12 +633,6 @@ export default {
 	background: var(--background-dim);
 }
 
-.releases {
-    flex-grow: 1;
-	border-top: solid 1px var(--crease);
-    padding: 1rem;
-}
-
 .profile-social {
     display: none;
 }
diff --git a/assets/components/releases/releases.vue b/assets/components/releases/releases.vue
index 3ffa04d8..7fc21a51 100644
--- a/assets/components/releases/releases.vue
+++ b/assets/components/releases/releases.vue
@@ -6,6 +6,7 @@
 		><span class="range">{{ range }}</span> releases for '{{ context }}'</h3>
 
 		<ul
+			v-if="releases.length > 0"
 			:key="sfw"
 			v-lazy-container="{ selector: '.thumbnail' }"
 			class="nolist tiles"
@@ -82,6 +83,10 @@ export default {
     }
 }
 
+.releases {
+	border-top: solid 1px var(--crease);
+}
+
 .tiles {
     width: 100%;
     display: grid;
@@ -89,10 +94,10 @@ export default {
     grid-gap: 1rem;
 	box-sizing: border-box;
 	padding: 1rem;
-	border-top: solid 1px var(--crease);
 }
 
 .empty {
+	display: inline-block;
 	padding: 1rem;
     color: var(--shadow-strong);
     font-weight: bold;
diff --git a/assets/js/actors/actions.js b/assets/js/actors/actions.js
index 366551b6..f2d14010 100644
--- a/assets/js/actors/actions.js
+++ b/assets/js/actors/actions.js
@@ -57,10 +57,17 @@ function initActorActions(store, _router) {
                     description
 					createdAt
 					updatedAt
-                    network: entity {
+                    entity {
                         id
                         name
                         slug
+						type
+						parent {
+							id
+							name
+							slug
+							type
+						}
                     }
 					avatar: avatarMedia {
 						id
@@ -80,10 +87,17 @@ function initActorActions(store, _router) {
 					profiles: actorsProfiles {
 						description
 						descriptionHash
-						network: entity {
+						entity {
 							id
-							slug
 							name
+							slug
+							type
+							parent {
+								id
+								name
+								slug
+								type
+							}
 						}
 						avatar: avatarMedia {
 							id
@@ -157,12 +171,12 @@ function initActorActions(store, _router) {
 								${releaseActorsFragment}
 								${releaseTagsFragment}
 								${releasePosterFragment}
-								site: entity {
+								entity {
 									id
 									name
 									slug
 									url
-									network: parent {
+									parent {
 										id
 										name
 										slug
@@ -260,10 +274,17 @@ function initActorActions(store, _router) {
 						dateOfBirth
 						dateOfDeath
 						gender
-						network: entity {
+						entity {
 							id
 							name
 							slug
+							type
+							parent {
+								id
+								name
+								slug
+								type
+							}
 						}
 						avatar: avatarMedia {
 							id
diff --git a/assets/js/curate.js b/assets/js/curate.js
index 2abb3554..cfd6fdae 100644
--- a/assets/js/curate.js
+++ b/assets/js/curate.js
@@ -39,8 +39,7 @@ function curateActor(actor, release) {
 			...(profile.description && {
 				[profile.descriptionHash]: {
 					text: profile.description,
-					network: profile.network,
-					site: profile.site,
+					entity: profile.entity,
 				},
 			}),
 		}), {});