fix: make sure collection name is always set

pubkeyapp · Sep 10, 2023 · c93324d · c93324d
1 parent fc91298
commit c93324d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 23 deletions.
diff --git a/api-schema.graphql b/api-schema.graphql
@@ -205,7 +205,7 @@ type Collection {
   id: String!
   imageUrl: String
   metadataUrl: String
-  name: String
+  name: String!
   network: NetworkType
   symbol: String
   updatedAt: DateTime!

diff --git a/libs/api/collection/data-access/src/lib/entity/collection.entity.ts b/libs/api/collection/data-access/src/lib/entity/collection.entity.ts
@@ -13,7 +13,7 @@ export class Collection {
   account!: string
   @Field(() => Int, { nullable: true })
   assetCount!: number
-  @Field({ nullable: true })
+  @Field()
   name?: string | null
   @Field({ nullable: true })
   imageUrl?: string | null

diff --git a/libs/api/collection/feature/src/lib/api-collection-field.resolver.ts b/libs/api/collection/feature/src/lib/api-collection-field.resolver.ts
@@ -14,4 +14,9 @@ export class ApiCollectionFieldResolver {
   combos(@Parent() collection: Collection) {
     return collection.combos ?? []
   }
+
+  @ResolveField(() => String)
+  name(@Parent() collection: Collection) {
+    return collection.name ?? collection.account ?? 'Unknown'
+  }
 }
diff --git a/libs/sdk/src/generated/graphql-sdk.ts b/libs/sdk/src/generated/graphql-sdk.ts
@@ -230,7 +230,7 @@ export type Collection = {
   id: Scalars['String']
   imageUrl?: Maybe<Scalars['String']>
   metadataUrl?: Maybe<Scalars['String']>
-  name?: Maybe<Scalars['String']>
+  name: Scalars['String']
   network?: Maybe<NetworkType>
   symbol?: Maybe<Scalars['String']>
   updatedAt: Scalars['DateTime']
@@ -1111,7 +1111,7 @@ export type UserFindManyAssetQuery = {
         createdAt: Date
         account?: string | null
         id: string
-        name?: string | null
+        name: string
         imageUrl?: string | null
         metadataUrl?: string | null
         description?: string | null
@@ -1211,7 +1211,7 @@ export type UserFindOneAssetQuery = {
       createdAt: Date
       account?: string | null
       id: string
-      name?: string | null
+      name: string
       imageUrl?: string | null
       metadataUrl?: string | null
       description?: string | null
@@ -1582,7 +1582,7 @@ export type CollectionDetailsFragment = {
   createdAt: Date
   account?: string | null
   id: string
-  name?: string | null
+  name: string
   imageUrl?: string | null
   metadataUrl?: string | null
   description?: string | null
@@ -1624,7 +1624,7 @@ export type AdminFindManyCollectionQuery = {
       createdAt: Date
       account?: string | null
       id: string
-      name?: string | null
+      name: string
       imageUrl?: string | null
       metadataUrl?: string | null
       description?: string | null
@@ -1676,7 +1676,7 @@ export type AdminFindOneCollectionQuery = {
     createdAt: Date
     account?: string | null
     id: string
-    name?: string | null
+    name: string
     imageUrl?: string | null
     metadataUrl?: string | null
     description?: string | null
@@ -1726,7 +1726,7 @@ export type AdminCreateCollectionMutation = {
     createdAt: Date
     account?: string | null
     id: string
-    name?: string | null
+    name: string
     imageUrl?: string | null
     metadataUrl?: string | null
     description?: string | null
@@ -1768,7 +1768,7 @@ export type AdminUpdateCollectionMutation = {
     createdAt: Date
     account?: string | null
     id: string
-    name?: string | null
+    name: string
     imageUrl?: string | null
     metadataUrl?: string | null
     description?: string | null
@@ -1827,7 +1827,7 @@ export type UserFindManyCollectionQuery = {
       createdAt: Date
       account?: string | null
       id: string
-      name?: string | null
+      name: string
       imageUrl?: string | null
       metadataUrl?: string | null
       description?: string | null
@@ -1879,7 +1879,7 @@ export type UserFindOneCollectionQuery = {
     createdAt: Date
     account?: string | null
     id: string
-    name?: string | null
+    name: string
     imageUrl?: string | null
     metadataUrl?: string | null
     description?: string | null
@@ -1967,7 +1967,7 @@ export type DiscordRoleConditionDetailsFragment = {
     createdAt: Date
     account?: string | null
     id: string
-    name?: string | null
+    name: string
     imageUrl?: string | null
     metadataUrl?: string | null
     description?: string | null
@@ -2036,7 +2036,7 @@ export type DiscordRoleDetailsFragment = {
       createdAt: Date
       account?: string | null
       id: string
-      name?: string | null
+      name: string
       imageUrl?: string | null
       metadataUrl?: string | null
       description?: string | null
@@ -2169,7 +2169,7 @@ export type AdminFindOneDiscordServerQuery = {
           createdAt: Date
           account?: string | null
           id: string
-          name?: string | null
+          name: string
           imageUrl?: string | null
           metadataUrl?: string | null
           description?: string | null
@@ -2334,7 +2334,7 @@ export type UserFindManyDiscordServerQuery = {
           createdAt: Date
           account?: string | null
           id: string
-          name?: string | null
+          name: string
           imageUrl?: string | null
           metadataUrl?: string | null
           description?: string | null
@@ -2710,7 +2710,7 @@ export type AdminFindOneNetworkQuery = {
       createdAt: Date
       account?: string | null
       id: string
-      name?: string | null
+      name: string
       imageUrl?: string | null
       metadataUrl?: string | null
       description?: string | null

diff --git a/libs/web/asset/data-access/src/lib/use-user-find-many-asset.ts b/libs/web/asset/data-access/src/lib/use-user-find-many-asset.ts
@@ -45,8 +45,7 @@ export function useUserFindManyAsset(
   const total = query.data?.paging.meta.totalCount ?? 0
   const items = query.data?.paging.data ?? []
   const collections: AssetGroup[] = useMemo(
-    () =>
-      groupAssetsByCollection(items).sort((a, b) => (a.collection.name ?? '').localeCompare(b.collection?.name ?? '')),
+    () => groupAssetsByCollection(items).sort((a, b) => a.collection.name.localeCompare(b.collection.name)),
     [items],
   )
 

diff --git a/libs/web/collection/data-access/src/lib/use-admin-find-many-collection.ts b/libs/web/collection/data-access/src/lib/use-admin-find-many-collection.ts
@@ -25,7 +25,7 @@ export function useAdminFindManyCollection() {
   return {
     items,
     collectionOptions: items.map((item) => ({
-      label: `${item.name ?? item.account}`,
+      label: item.name,
       value: item.account ?? '',
     })),
     query,

diff --git a/libs/web/collection/ui/src/lib/web-collection-ui-dashboard.tsx b/libs/web/collection/ui/src/lib/web-collection-ui-dashboard.tsx
@@ -25,7 +25,7 @@ export function WebCollectionUiDashboard() {
             ))
           ) : (
             <WebProfileUiAssetAttributes
-              name={collection.name ?? 'Unknown'}
+              name={collection.name}
               network={collection.network as NetworkType}
               collectionAccount={collection.account ?? ''}
             />

diff --git a/libs/web/discord/ui/src/lib/discord-ui-role-add-collection.tsx b/libs/web/discord/ui/src/lib/discord-ui-role-add-collection.tsx
@@ -21,7 +21,7 @@ export function DiscordUiRoleAddCollection({
     () =>
       items
         // Map to option
-        .map((item) => ({ value: item.id, label: `${item.name ?? item.account}` })),
+        .map((item) => ({ value: item.id, label: item.name })),
     // Filter out already added collections
     // .filter((item) => !condition.collections?.find((collection) => collection.id === item.value)),
     [items, condition.collections],

diff --git a/libs/web/discord/ui/src/lib/discord-ui-view-role-conditions.tsx b/libs/web/discord/ui/src/lib/discord-ui-view-role-conditions.tsx
@@ -40,7 +40,7 @@ export function DiscordUiViewRoleConditions({ role }: { role: DiscordRole }) {
               ? condition.collections.map((coll) => (
                   <UiStack key={coll.id}>
                     <WebProfileUiAssetAttributes
-                      name={coll.name ?? 'Unknown'}
+                      name={coll.name}
                       network={coll.network as NetworkType}
                       collectionAccount={coll.account ?? ''}
                     />