0.42.21

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.42.20",
+  "version": "0.42.21",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.42.20",
+      "version": "0.42.21",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -87,7 +87,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.42.20",
+  "version": "0.42.21",
   "imports": {
     "#/*": "./*.js"
   }

pages/entities/@entitySlug/+Page.vue

@@ -169,24 +169,6 @@ const entityUrl = (() => {
 	}
 
 	return entity.affiliateUrl || entity.url;
-
-	/*
-	// affiliate might be inherited, only use full URL when directly associated
-	if (entity.affiliate?.url && entity.affiliate.entityId === entity.id) {
-		return entity.affiliate.url;
-	}
-
-	if (entity.affiliate?.parameters) {
-		const newParams = new URLSearchParams({
-			...Object.fromEntries(new URL(entity.url).searchParams),
-			...Object.fromEntries(new URLSearchParams(entity.affiliate.parameters)),
-		});
-
-		return `${entity.url}?${newParams}`;
-	}
-
-	return entity.url;
-	*/
 })();
 </script>
 

src/entities.js

@@ -119,6 +119,7 @@ export async function fetchEntitiesById(entityIds, options = {}, reqUser) {
 			.whereIn('entities.parent_id', entityIds)
 			.whereNot('type', 'info')
 			.orderBy([
+				{ column: knex.raw('array_position(array[\'network\', \'channel\']::varchar[], type)'), order: 'asc' },
 				{ column: 'independent', order: 'desc' },
 				{ column: 'slug', order: 'asc' },
 			]) : [],