From b6614eb25af3bb2724aa9a90cbcb3949de198871 Mon Sep 17 00:00:00 2001 From: Yan <61414485+yanthomasdev@users.noreply.github.com> Date: Tue, 23 Jun 2026 16:33:40 -0300 Subject: [PATCH] feat: remove frontmatter `draft` from dev-test --- cypress/e2e/view_filters_spec.js | 42 +++++++++---------- cypress/e2e/view_groups_spec.js | 6 +-- dev-test/backends/azure/config.yml | 4 -- dev-test/backends/bitbucket/config.yml | 4 -- dev-test/backends/git-gateway/config.yml | 4 -- dev-test/backends/gitea/config.yml | 4 -- dev-test/backends/github/config.yml | 4 -- dev-test/backends/gitlab/config.yml | 4 -- dev-test/backends/proxy/config.yml | 4 -- dev-test/backends/test/config.yml | 10 ++--- dev-test/backends/test/index.html | 2 +- dev-test/config.yml | 22 ++++++---- dev-test/index.html | 2 +- .../src/__tests__/relation.spec.js | 24 ++++++----- 14 files changed, 60 insertions(+), 76 deletions(-) diff --git a/cypress/e2e/view_filters_spec.js b/cypress/e2e/view_filters_spec.js index ad7924b4bcc0..54aef9719ac3 100644 --- a/cypress/e2e/view_filters_spec.js +++ b/cypress/e2e/view_filters_spec.js @@ -55,14 +55,31 @@ describe('View Filter', () => { assertInEntries('This is a TOML front matter post'); }); + it('can apply multiple filters', () => { + // enable filter + filter('Posts Without Index'); + + assertEntriesCount(3); + + assertInEntries('This is a YAML front matter post'); + assertInEntries('This is a JSON front matter post'); + assertInEntries('This is a TOML front matter post'); + + filter('Posts With Index'); + + assertEntriesCount(0); + + cy.contains('div', 'No Entries'); + }); + it('can apply boolean filter', () => { // enable filter - filter('Drafts'); + filter('Relation Test'); assertEntriesCount(10); for (let i = 1; i <= 20; i++) { - const draft = i % 2 === 0; - if (draft) { + const inRelationTest = i % 2 !== 0; + if (inRelationTest) { assertInEntries(`This is post # ${i} --`); } else { assertNotInEntries(`This is post # ${i} --`); @@ -73,7 +90,7 @@ describe('View Filter', () => { assertNotInEntries('This is a TOML front matter post'); // disable filter - filter('Drafts'); + filter('Relation Test'); assertEntriesCount(23); for (let i = 1; i <= 20; i++) { assertInEntries(`This is post # ${i} --`); @@ -82,21 +99,4 @@ describe('View Filter', () => { assertInEntries('This is a JSON front matter post'); assertInEntries('This is a TOML front matter post'); }); - - it('can apply multiple filters', () => { - // enable filter - filter('Posts Without Index'); - - assertEntriesCount(3); - - assertInEntries('This is a YAML front matter post'); - assertInEntries('This is a JSON front matter post'); - assertInEntries('This is a TOML front matter post'); - - filter('Drafts'); - - assertEntriesCount(0); - - cy.contains('div', 'No Entries'); - }); }); diff --git a/cypress/e2e/view_groups_spec.js b/cypress/e2e/view_groups_spec.js index d17d3f1f3060..ab09ebb9d83c 100644 --- a/cypress/e2e/view_groups_spec.js +++ b/cypress/e2e/view_groups_spec.js @@ -59,12 +59,12 @@ describe('View Group', () => { assertInEntries('This is a TOML front matter post'); //enable group - group('Drafts'); + group('Relation Test'); assertEntriesCount(23); assertGroupsCount(3); - assertEachGroupCount('Draftstrue', 10); - assertEachGroupCount('Draftsfalse', 10); + assertEachGroupCount('Relation Testtrue', 10); + assertEachGroupCount('Relation Testfalse', 10); assertEachGroupCount('missing_value', 3); }); }); diff --git a/dev-test/backends/azure/config.yml b/dev-test/backends/azure/config.yml index 77d251ecd74d..6031f0b987c8 100644 --- a/dev-test/backends/azure/config.yml +++ b/dev-test/backends/azure/config.yml @@ -58,10 +58,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/bitbucket/config.yml b/dev-test/backends/bitbucket/config.yml index dd70cbd4a601..0a0a529825e1 100644 --- a/dev-test/backends/bitbucket/config.yml +++ b/dev-test/backends/bitbucket/config.yml @@ -56,10 +56,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/git-gateway/config.yml b/dev-test/backends/git-gateway/config.yml index e57f1224a94c..6a4686fcb732 100644 --- a/dev-test/backends/git-gateway/config.yml +++ b/dev-test/backends/git-gateway/config.yml @@ -55,10 +55,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/gitea/config.yml b/dev-test/backends/gitea/config.yml index dceab87193f5..893200fc2638 100644 --- a/dev-test/backends/gitea/config.yml +++ b/dev-test/backends/gitea/config.yml @@ -56,10 +56,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/github/config.yml b/dev-test/backends/github/config.yml index dbf4e5802824..9aababea55c7 100644 --- a/dev-test/backends/github/config.yml +++ b/dev-test/backends/github/config.yml @@ -56,10 +56,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/gitlab/config.yml b/dev-test/backends/gitlab/config.yml index f8c09ff064da..8e080b84e8be 100644 --- a/dev-test/backends/gitlab/config.yml +++ b/dev-test/backends/gitlab/config.yml @@ -56,10 +56,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/proxy/config.yml b/dev-test/backends/proxy/config.yml index cc1edb035def..6579e44ad0b9 100644 --- a/dev-test/backends/proxy/config.yml +++ b/dev-test/backends/proxy/config.yml @@ -60,10 +60,6 @@ collections: - label: Title name: title widget: string - - label: Draft - name: draft - widget: boolean - default: true - label: Body name: body widget: markdown diff --git a/dev-test/backends/test/config.yml b/dev-test/backends/test/config.yml index c4b0ee55a7e5..514057f04c75 100644 --- a/dev-test/backends/test/config.yml +++ b/dev-test/backends/test/config.yml @@ -24,18 +24,18 @@ collections: # A list of collections the CMS should be able to edit - label: Posts Without Index field: title pattern: front matter post - - label: Drafts - field: draft + - label: Relation Test + field: relation_test pattern: true view_groups: - label: Year field: date pattern: \d{4} - - label: Drafts - field: draft + - label: Relation Test + field: relation_test fields: # The fields each document in this collection have - { label: 'Title', name: 'title', widget: 'string', tagname: 'h1' } - - { label: 'Draft', name: 'draft', widget: 'boolean', default: false } + - { label: 'Relation Test', name: 'relation_test', widget: 'hidden', default: true } - { label: 'Publish Date', name: 'date', diff --git a/dev-test/backends/test/index.html b/dev-test/backends/test/index.html index 8147bcc0118d..eeceb94d46dd 100644 --- a/dev-test/backends/test/index.html +++ b/dev-test/backends/test/index.html @@ -61,7 +61,7 @@ var slug = dateString + "-post-number-" + i + ".md"; window.repoFiles._posts[slug] = { - content: "---\ntitle: \"This is post # " + i + `\"\ndraft: ${i % 2 === 0}` + "\ndate: " + dateString + "T00:00:00.000Z\n---\n\n# The post is number " + i + "\n\nAnd this is yet another identical post body" + content: "---\ntitle: \"This is post # " + i + `\"\nrelation_test: ${i % 2 !== 0}` + "\ndate: " + dateString + "T00:00:00.000Z\n---\n\n# The post is number " + i + "\n\nAnd this is yet another identical post body" } } diff --git a/dev-test/config.yml b/dev-test/config.yml index 3b8d15d82fbc..da2b804dded2 100644 --- a/dev-test/config.yml +++ b/dev-test/config.yml @@ -22,7 +22,6 @@ collections: # A list of collections the CMS should be able to edit sortable_fields: - title - { field: date, default_sort: desc } - - draft view_filters: - label: Posts With Index field: title @@ -30,18 +29,18 @@ collections: # A list of collections the CMS should be able to edit - label: Posts Without Index field: title pattern: front matter post - - label: Drafts - field: draft + - label: Relation Test + field: relation_test pattern: true view_groups: - label: Year field: date pattern: \d{4} - - label: Drafts - field: draft + - label: Relation Test + field: relation_test fields: # The fields each document in this collection have - { label: 'Title', name: 'title', widget: 'string', tagname: 'h1' } - - { label: 'Draft', name: 'draft', widget: 'boolean', default: false } + - { label: 'Relation Test', name: 'relation_test', widget: 'hidden', default: true } - { label: 'Publish Date', name: 'date', @@ -75,7 +74,16 @@ collections: # A list of collections the CMS should be able to edit - { label: 'Title', name: 'title', widget: 'string', tagname: 'h1' } - { label: 'Body', name: 'body', widget: 'markdown', hint: 'Main content goes here.' } - { name: 'gallery', widget: 'image', choose_url: true, media_library: {config: {multiple: true, max_files: 999}}} - - { name: 'post', widget: relation, collection: posts, multiple: true, search_fields: [ "title" ], display_fields: [ "title" ], value_field: "{{slug}}", filters: [ {field: "draft", values: [false]} ] } + - name: post + widget: relation + collection: posts + multiple: true + search_fields: ['title'] + display_fields: ['title'] + value_field: '{{slug}}' + filters: + - field: relation_test + values: [true] - name: authors label: Authors label_singular: 'Author' diff --git a/dev-test/index.html b/dev-test/index.html index 340567be61ff..5d49f3f52a8d 100644 --- a/dev-test/index.html +++ b/dev-test/index.html @@ -67,7 +67,7 @@ var slug = dateString + "-post-number-" + i + ".md"; window.repoFiles._posts[slug] = { - content: "---\ntitle: \"This is post # " + i + `\"\ndraft: ${i % 2 === 0}` + "\ndate: " + dateString + "T00:00:00.000Z\n---\n\n# The post is number " + i + "\n\nAnd this is yet another identical post body" + content: "---\ntitle: \"This is post # " + i + `\"\nrelation_test: ${i % 2 !== 0}` + "\ndate: " + dateString + "T00:00:00.000Z\n---\n\n# The post is number " + i + "\n\nAnd this is yet another identical post body" } } diff --git a/packages/decap-cms-widget-relation/src/__tests__/relation.spec.js b/packages/decap-cms-widget-relation/src/__tests__/relation.spec.js index 3ac35f7f4377..c6e83c172adb 100644 --- a/packages/decap-cms-widget-relation/src/__tests__/relation.spec.js +++ b/packages/decap-cms-widget-relation/src/__tests__/relation.spec.js @@ -74,7 +74,7 @@ const filterBooleanFieldConfig = { value_field: 'title', filters: [ { - field: 'draft', + field: 'featured', values: [false], }, ], @@ -120,7 +120,7 @@ const multipleFiltersFieldConfig = { values: ['Post # 1', 'Post # 2', 'Post # 7', 'Post # 9', 'Post # 15'], }, { - field: 'draft', + field: 'featured', values: [true], }, ], @@ -134,7 +134,7 @@ const emptyFilterFieldConfig = { value_field: 'title', filters: [ { - field: 'draft', + field: 'featured', values: [], }, ], @@ -158,10 +158,10 @@ function generateHits(length) { const hits = Array.from({ length }, (val, idx) => { const title = `Post # ${idx + 1}`; const slug = `post-number-${idx + 1}`; - const draft = idx % 2 === 0; + const featured = idx % 2 === 0; const num = idx + 1; const path = `posts/${slug}.md`; - return { collection: 'posts', data: { title, slug, draft, num }, slug, path }; + return { collection: 'posts', data: { title, slug, featured, num }, slug, path }; }); return [ @@ -385,7 +385,7 @@ describe('Relation widget', () => { const label = 'Post # 1 post-number-1'; const metadata = { post: { - posts: { 'Post # 1': { title: 'Post # 1', draft: true, num: 1, slug: 'post-number-1' } }, + posts: { 'Post # 1': { title: 'Post # 1', featured: true, num: 1, slug: 'post-number-1' } }, }, }; @@ -405,7 +405,7 @@ describe('Relation widget', () => { const label = 'Post # 1 post-number-1'; const metadata = { post: { - posts: { 'Post # 1': { title: 'Post # 1', draft: true, num: 1, slug: 'post-number-1' } }, + posts: { 'Post # 1': { title: 'Post # 1', featured: true, num: 1, slug: 'post-number-1' } }, }, }; @@ -465,7 +465,7 @@ describe('Relation widget', () => { const metadata = { post: { posts: { - 'post-number-1': { title: 'Post # 1', draft: true, num: 1, slug: 'post-number-1' }, + 'post-number-1': { title: 'Post # 1', featured: true, num: 1, slug: 'post-number-1' }, }, }, }; @@ -524,12 +524,16 @@ describe('Relation widget', () => { const { getByText, input, onChangeSpy } = setup({ field }); const metadata1 = { post: { - posts: { 'Post # 1': { title: 'Post # 1', draft: true, num: 1, slug: 'post-number-1' } }, + posts: { + 'Post # 1': { title: 'Post # 1', featured: true, num: 1, slug: 'post-number-1' }, + }, }, }; const metadata2 = { post: { - posts: { 'Post # 2': { title: 'Post # 2', draft: false, num: 2, slug: 'post-number-2' } }, + posts: { + 'Post # 2': { title: 'Post # 2', featured: false, num: 2, slug: 'post-number-2' }, + }, }, };