diff --git a/api/src/services/fields.ts b/api/src/services/fields.ts index 5f6bee14e8..08a48ea4d2 100644 --- a/api/src/services/fields.ts +++ b/api/src/services/fields.ts @@ -94,9 +94,16 @@ export class FieldsService { let aliasFields = [ ...((await this.payloadService.processValues('read', await aliasQuery)) as FieldMeta[]), - ...systemFieldRows, ]; + if (collection) { + aliasFields.push( + ...systemFieldRows.filter((fieldMeta) => fieldMeta.collection === collection) + ); + } else { + aliasFields.push(...systemFieldRows); + } + const aliasTypes = ['alias', 'o2m', 'm2m', 'files', 'files', 'translations']; aliasFields = aliasFields.filter((field) => { @@ -113,7 +120,7 @@ export class FieldsService { const data = { collection: field.collection, field: field.field, - type: field.special?.[0], + type: Array.isArray(field.special) ? field.special[0] : field.special, schema: null, meta: field, }; diff --git a/app/src/composables/use-sync/use-sync.ts b/app/src/composables/use-sync/use-sync.ts index 21bfc436f0..38801968a1 100644 --- a/app/src/composables/use-sync/use-sync.ts +++ b/app/src/composables/use-sync/use-sync.ts @@ -4,7 +4,7 @@ export default function useSync( props: T, key: K, emit: (event: string, ...args: any[]) => void -): Ref> { +): Ref { return computed({ get() { return props[key]; diff --git a/app/src/layouts/cards/cards.vue b/app/src/layouts/cards/cards.vue index a48a747020..2296a97755 100644 --- a/app/src/layouts/cards/cards.vue +++ b/app/src/layouts/cards/cards.vue @@ -112,6 +112,18 @@ + + {{ $t('unexpected_error_copy') }} + + + + @@ -119,18 +131,18 @@ diff --git a/app/src/layouts/cards/components/header.vue b/app/src/layouts/cards/components/header.vue index 51843f3ce5..950297c97f 100644 --- a/app/src/layouts/cards/components/header.vue +++ b/app/src/layouts/cards/components/header.vue @@ -29,6 +29,7 @@ @@ -49,8 +50,8 @@