Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions apps/cms/src/app/(payload)/admin/importMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8c
import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc';
import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from '@payloadcms/storage-s3/client';

import { default as default_1b21cdd8d72b60f58886e03c7a7a4ebd } from '@codeware/app-cms/ui/blocks/card/CardBlockArrayRowLabel.client';
import { default as default_75fddbc22d1b88f24f1cec1b82919953 } from '@codeware/app-cms/ui/blocks/social-media/SocialMediaBlockArrayRowLabel.client';
import { default as default_83b0dfab156f3636ed94b94854d15ad5 } from '@codeware/app-cms/ui/components/RedirectNotifier';
import { default as default_7925a79d2af6389df70d2dd269ffbfbb } from '@codeware/app-cms/ui/components/VerifyTenantDomain';
import { default as default_9f66f0d44caf76088020099a6b3fd616 } from '@codeware/app-cms/ui/fields/card-group/CardGroupArrayRowLabel.client';
import { default as default_06af4458abd1296f9d6bccce90425927 } from '@codeware/app-cms/ui/fields/code/Code.client';
import { default as default_8586e6ac5ddd6a3f87ffe1dd472673f5 } from '@codeware/app-cms/ui/fields/color-picker/ColorPickerField.client';
import { default as default_ae19db27eee762af26f037dd7af0b736 } from '@codeware/app-cms/ui/fields/icon-picker/IconPickerField.client';
Expand All @@ -45,10 +46,6 @@ import { default as default_dec1059b7bb8eb8da3a9f0fc400fffbd } from '@codeware/a
export const importMap = {
'@payloadcms/plugin-multi-tenant/client#TenantField':
TenantField_1d0591e3cf4f332c83a86da13a0de59a,
'@codeware/app-cms/ui/fields/icon-picker/IconPickerField.client#default':
default_ae19db27eee762af26f037dd7af0b736,
'@codeware/app-cms/ui/fields/color-picker/ColorPickerField.client#default':
default_8586e6ac5ddd6a3f87ffe1dd472673f5,
'@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell':
RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
'@payloadcms/richtext-lexical/rsc#RscEntryLexicalField':
Expand Down Expand Up @@ -107,10 +104,16 @@ export const importMap = {
PreviewComponent_a8a977ebc872c5d5ea7ee689724c0860,
'@payloadcms/richtext-lexical/client#BlocksFeatureClient':
BlocksFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
'@codeware/app-cms/ui/fields/card-group/CardGroupArrayRowLabel.client#default':
default_9f66f0d44caf76088020099a6b3fd616,
'@codeware/app-cms/ui/fields/icon-picker/IconPickerField.client#default':
default_ae19db27eee762af26f037dd7af0b736,
'@codeware/app-cms/ui/fields/color-picker/ColorPickerField.client#default':
default_8586e6ac5ddd6a3f87ffe1dd472673f5,
'@codeware/app-cms/ui/blocks/card/CardBlockArrayRowLabel.client#default':
default_1b21cdd8d72b60f58886e03c7a7a4ebd,
'@codeware/app-cms/ui/fields/code/Code.client#default':
default_06af4458abd1296f9d6bccce90425927,
'@codeware/app-cms/ui/blocks/social-media/SocialMediaBlockArrayRowLabel.client#default':
default_75fddbc22d1b88f24f1cec1b82919953,
'@codeware/apps/cms/components/TenantsArrayRowLabel#default':
default_dec1059b7bb8eb8da3a9f0fc400fffbd,
'@codeware/apps/cms/components/Logo.client#default':
Expand Down
35 changes: 0 additions & 35 deletions apps/cms/src/collections/cards/cards.collection.ts

This file was deleted.

25 changes: 17 additions & 8 deletions apps/cms/src/collections/pages/pages.collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,25 @@ import { seoTab } from '@codeware/app-cms/ui/tabs';
import { verifyApiKeyAccess } from '@codeware/app-cms/util/access';
import { adminGroups } from '@codeware/app-cms/util/definitions';
import { populatePublishedAtHook } from '@codeware/app-cms/util/hooks';
import { BlockSlug } from '@codeware/shared/util/payload-types';
import { getActiveKeys } from '@codeware/shared/util/pure';

const env = getEnv();

/**
* Define which blocks are available for the layout builder.
*/
// Using a record to make sure all blocks are included and not forgotten
const blocks: Record<BlockSlug, boolean> = {
content: true,
card: true,
form: true,
media: true,
code: true,
'reusable-content': true,
'social-media': true
};

/**
* Pages collection
*/
Expand Down Expand Up @@ -71,14 +87,7 @@ const pages: CollectionConfig<'pages'> = {
name: 'layout',
type: 'blocks',
label: 'Layout builder',
blockReferences: [
'content',
'card',
'form',
'media',
'code',
'reusable-content'
],
blockReferences: getActiveKeys<BlockSlug>(blocks),
blocks: [],
required: true,
localized: true,
Expand Down
19 changes: 18 additions & 1 deletion apps/cms/src/collections/posts/posts.collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,28 @@ import { seoTab } from '@codeware/app-cms/ui/tabs';
import { verifyApiKeyAccess } from '@codeware/app-cms/util/access';
import { adminGroups } from '@codeware/app-cms/util/definitions';
import { filterByTenantScope } from '@codeware/app-cms/util/filters';
import type { BlockSlug } from '@codeware/shared/util/payload-types';
import { getActiveKeys } from '@codeware/shared/util/pure';

import { updatePublishedAtHook } from './hooks/update-published-at.hook';

const env = getEnv();

/**
* Define which blocks are available for the rich text editor.
*/
// Using a record to make sure all blocks are included and not forgotten
const blocks: Record<BlockSlug, boolean> = {
card: true,
media: true,
code: true,
'social-media': true,
// Unsupported blocks
form: false,
content: false,
'reusable-content': false
};

/**
* Posts collection
*/
Expand Down Expand Up @@ -70,7 +87,7 @@ const posts: CollectionConfig<'posts'> = {
enabledHeadingSizes: ['h1', 'h2', 'h3', 'h4']
}),
BlocksFeature({
blocks: ['card', 'code', 'media', 'reusable-content']
blocks: getActiveKeys<BlockSlug>(blocks)
})
]
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,25 @@ import type { CollectionConfig } from 'payload';
import { getEnv } from '@codeware/app-cms/feature/env-loader';
import { verifyApiKeyAccess } from '@codeware/app-cms/util/access';
import { adminGroups } from '@codeware/app-cms/util/definitions';
import { BlockSlug } from '@codeware/shared/util/payload-types';
import { getActiveKeys } from '@codeware/shared/util/pure';

const env = getEnv();

/**
* Define which blocks are available for the layout builder.
*/
// Using a record to make sure all blocks are included and not forgotten
const blocks: Record<BlockSlug, boolean> = {
card: true,
code: true,
content: true,
form: true,
media: true,
'social-media': true,
'reusable-content': false
};

/**
* Reusable content collection
*/
Expand Down Expand Up @@ -43,7 +59,7 @@ const reusableContent: CollectionConfig = {
{
name: 'layout',
type: 'blocks',
blockReferences: ['card', 'code', 'content', 'form', 'media'],
blockReferences: getActiveKeys<BlockSlug>(blocks),
blocks: [],
required: true
}
Expand Down
3 changes: 1 addition & 2 deletions apps/cms/src/components/Logo.client.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
'use client';
import { CdwrCloud } from '@codeware/shared/ui/react-components';
import { CdwrCloud } from '@codeware/shared/ui/react-universal-components';

const Logo: React.FC = () => {
return (
Expand Down
Loading