feat(api,ui): 🎸 filter by platform

✅ Closes: #520
andrew-codes · Sep 27, 2024 · 8adfa23 · 8adfa23
1 parent e3439d1
commit 8adfa23
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/apps/playnite-web/src/server/graphql/modules/filter/resolvers/Query/filterItems.ts b/apps/playnite-web/src/server/graphql/modules/filter/resolvers/Query/filterItems.ts
@@ -30,5 +30,15 @@ export const filterItems: NonNullable<QueryResolvers['filterItems']> = async (
     field: 'releaseYear',
   })
 
+  const platforms = await _ctx.api.platform.getAll()
+  filterItems.push({
+    name: 'Platform',
+    allowedValues: platforms.map((platform) => ({
+      value: platform.id,
+      display: platform.name,
+    })),
+    field: 'platform.id',
+  })
+
   return filterItems
 }
diff --git a/apps/playnite-web/src/server/graphql/modules/game/resolvers/Query/games.ts b/apps/playnite-web/src/server/graphql/modules/game/resolvers/Query/games.ts
@@ -2,7 +2,7 @@ import _ from 'lodash'
 import type { QueryResolvers } from '../../../../../../../.generated/types.generated'
 import { GameEntity } from '../../../../resolverTypes'
 
-const { merge } = _
+const { get, merge } = _
 const exactMatch = /(".*")|('.*')/
 
 export const games: NonNullable<QueryResolvers['games']> = async (
@@ -45,7 +45,7 @@ export const games: NonNullable<QueryResolvers['games']> = async (
                 }
 
                 return game.releases.some((release) => {
-                  const gameValue = release[filterItem.field]
+                  const gameValue = get(release, filterItem.field)
                   if (gameValue === undefined) {
                     return false
                   }

diff --git a/apps/playnite-web/src/server/graphql/modules/platform/api/index.ts b/apps/playnite-web/src/server/graphql/modules/platform/api/index.ts
@@ -20,19 +20,12 @@ function create(this: DomainApi) {
     )
 
     return ids.map((id) =>
-      results[id] ? omit(results[id], '_id') : null,
+      results[id] ? results[id] : null,
     ) as Array<PlatformEntity>
   })
 
   return autoBind(this, {
     async getById(this: DomainApi, id: string) {
-      if (id === '00000000-0000-0000-0000-000000000000') {
-        return {
-          id: '00000000-0000-0000-0000-000000000000',
-          name: 'Unknown',
-        }
-      }
-
       return loader.load(id)
     },
     async getAll(this: DomainApi) {
@@ -41,15 +34,15 @@ function create(this: DomainApi) {
         .find()
         .toArray()
 
-      return items.map((item) => omit(item, ['_id'])) as Array<PlatformEntity>
+      return items as Array<PlatformEntity>
     },
     async getBy(this: DomainApi, query: Filter<Document>) {
       const items = await (await this.db())
         .collection<PlatformDbEntity>('platform')
         .find(query)
         .toArray()
 
-      return items.map((item) => omit(item, ['_id'])) as Array<PlatformEntity>
+      return items as Array<PlatformEntity>
     },
   })
 }

diff --git a/libs/mqtt-client/src/index.ts b/libs/mqtt-client/src/index.ts
@@ -24,11 +24,18 @@ const createConnectedMqttClient = async (
   debug(
     `Existing MQTT client not found; creating one with the following options: host=${host}, port=${port}, username=${username}`,
   )
-  const mqttClient = await connectAsync(`tcp://${host}`, {
-    password,
-    port,
-    username,
-  })
+  let mqttClient
+  if (username && password) {
+    mqttClient = await connectAsync(`tcp://${host}`, {
+      password,
+      port,
+      username,
+    })
+  } else {
+    mqttClient = await connectAsync(`tcp://${host}`, {
+      port,
+    })
+  }
   debug('MQTT client connected')
 
   return mqttClient