Skip to content

Commit 789dc78

Browse files
committed
fix(cms): consolidate enum names to have unique sources
closed COD-321
1 parent 3bb3b3f commit 789dc78

20 files changed

Lines changed: 7974 additions & 4 deletions

apps/cms/src/collections/navigation/navigation.collection.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
systemUserOrTenantAdminAccess,
66
verifyApiKeyAccess
77
} from '@codeware/app-cms/util/access';
8+
import { enumName } from '@codeware/app-cms/util/db';
89
import { adminGroups } from '@codeware/app-cms/util/definitions';
910
import type { Navigation } from '@codeware/shared/util/payload-types';
1011

@@ -57,6 +58,7 @@ const navigation: CollectionConfig = {
5758
admin: {
5859
layout: 'horizontal'
5960
},
61+
enumName: enumName('navigation_label_source'),
6062
defaultValue: 'document',
6163
options: [
6264
{

apps/cms/src/collections/tenants/tenants.collection.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
authenticatedAccess,
66
systemUserAccess
77
} from '@codeware/app-cms/util/access';
8+
import { enumName } from '@codeware/app-cms/util/db';
89
import { adminGroups } from '@codeware/app-cms/util/definitions';
910

1011
import { enforceApiKeyHook } from './hooks/enforce-api-key.hook';
@@ -85,6 +86,7 @@ const tenants: CollectionConfig = {
8586
name: 'pageTypes',
8687
type: 'select',
8788
label: { en: 'Page types', sv: 'Typ av sidor' },
89+
enumName: enumName('tenant_domain_page_type'),
8890
options: [
8991
{ label: { en: 'CMS', sv: 'CMS' }, value: 'cms' },
9092
{ label: { en: 'Web client', sv: 'Webbklient' }, value: 'client' },

apps/cms/src/collections/users/fields/tenants-array.field.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { tenantsArrayField as tenantsArrayFieldPlugin } from '@payloadcms/plugin-multi-tenant/fields';
22
import type { Field } from 'payload';
33

4-
import {
5-
systemUserAccess,
6-
systemUserOrTenantAdminAccess
7-
} from '@codeware/app-cms/util/access';
4+
import { systemUserOrTenantAdminAccess } from '@codeware/app-cms/util/access';
5+
import { enumName } from '@codeware/app-cms/util/db';
86

97
/**
108
* Customized tenants array field in the users collection, based on the `tenantsArrayField` plugin utility function.
@@ -20,6 +18,7 @@ export const tenantsArrayField = (): Field => {
2018
name: 'role',
2119
type: 'select',
2220
label: { en: 'Role', sv: 'Roll' },
21+
enumName: enumName('tenant_user_role'),
2322
options: [
2423
{ label: { en: 'User', sv: 'Användare' }, value: 'user' },
2524
{ label: { en: 'Admin', sv: 'Administratör' }, value: 'admin' }

apps/cms/src/collections/users/users.collection.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
systemUserAccess,
55
systemUserOrTenantAdminAccess
66
} from '@codeware/app-cms/util/access';
7+
import { enumName } from '@codeware/app-cms/util/db';
78
import { adminGroups } from '@codeware/app-cms/util/definitions';
89

910
import { adminAccessToAllDocTenants } from './access/admin-access-to-all-doc-tenants';
@@ -54,6 +55,7 @@ const users: CollectionConfig<'users'> = {
5455
create: systemUserAccess,
5556
update: systemUserAccess
5657
},
58+
enumName: enumName('user_role'),
5759
options: [
5860
{ label: { en: 'User', sv: 'Användare' }, value: 'user' },
5961
{

0 commit comments

Comments
 (0)