Skip to content

Commit cb61157

Browse files
demshydemshy
committed
Merge branch 'main' into feat/index-fields
2 parents 9805fc3 + 08f0ccb commit cb61157

File tree

20 files changed

+121
-32
lines changed

20 files changed

+121
-32
lines changed

‎.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
5353
NODE_OPTIONS: --max-old-space-size=4096
5454
TZ: Europe/Amsterdam
55-
- uses: actions/upload-artifact@v3
55+
- uses: actions/upload-artifact@v4
5656
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x' && failure()
5757
with:
5858
name: cypress-results

‎package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/decap-cms-app/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [3.6.1](https://github.com/decaporg/decap-cms/compare/[email protected]@3.6.1) (2025-01-30)
7+
8+
**Note:** Version bump only for package decap-cms-app
9+
10+
# [3.6.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.6.0) (2025-01-29)
11+
12+
**Note:** Version bump only for package decap-cms-app
13+
614
# [3.5.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.5.0) (2025-01-15)
715

816
### Bug Fixes

‎packages/decap-cms-app/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-app",
33
"description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.",
4-
"version": "3.5.0",
4+
"version": "3.6.1",
55
"homepage": "https://www.decapcms.org",
66
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-app",
77
"bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -40,10 +40,10 @@
4040
"decap-cms-backend-gitlab": "^3.2.2",
4141
"decap-cms-backend-proxy": "^3.1.4",
4242
"decap-cms-backend-test": "^3.1.3",
43-
"decap-cms-core": "^3.5.0",
43+
"decap-cms-core": "^3.6.0",
4444
"decap-cms-editor-component-image": "^3.1.3",
4545
"decap-cms-lib-auth": "^3.0.5",
46-
"decap-cms-lib-util": "^3.1.0",
46+
"decap-cms-lib-util": "^3.2.0",
4747
"decap-cms-lib-widgets": "^3.1.0",
4848
"decap-cms-locales": "^3.3.0",
4949
"decap-cms-ui-default": "^3.1.4",
@@ -53,11 +53,11 @@
5353
"decap-cms-widget-datetime": "^3.2.3",
5454
"decap-cms-widget-file": "^3.1.3",
5555
"decap-cms-widget-image": "^3.1.3",
56-
"decap-cms-widget-list": "^3.2.2",
56+
"decap-cms-widget-list": "^3.3.0",
5757
"decap-cms-widget-map": "^3.1.4",
58-
"decap-cms-widget-markdown": "^3.2.0",
58+
"decap-cms-widget-markdown": "^3.3.0",
5959
"decap-cms-widget-number": "^3.1.3",
60-
"decap-cms-widget-object": "^3.2.0",
60+
"decap-cms-widget-object": "^3.3.1",
6161
"decap-cms-widget-relation": "^3.3.2",
6262
"decap-cms-widget-select": "^3.2.2",
6363
"decap-cms-widget-string": "^3.1.3",

‎packages/decap-cms-core/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.6.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.6.0) (2025-01-29)
7+
8+
### Bug Fixes
9+
10+
- **widgetsFor:** return widgets for variable type lists ([#7296](https://github.com/decaporg/decap-cms/issues/7296)) ([9be2693](https://github.com/decaporg/decap-cms/commit/9be2693d1b35bf56c7ef05bdece6c24a21ba7567)), closes [/github.com/decaporg/decap-cms/issues/2307#issuecomment-638326225](https://github.com//github.com/decaporg/decap-cms/issues/2307/issues/issuecomment-638326225)
11+
12+
### Features
13+
14+
- **nested collections:** allow non-index files ([#7359](https://github.com/decaporg/decap-cms/issues/7359)) ([47a2f70](https://github.com/decaporg/decap-cms/commit/47a2f70ef788ae8e61bbbc0ac21e00d68d0029d0)), closes [#4972](https://github.com/decaporg/decap-cms/issues/4972)
15+
- visual editing (click-to-edit) ([#7374](https://github.com/decaporg/decap-cms/issues/7374)) ([989c2dd](https://github.com/decaporg/decap-cms/commit/989c2dd6ed80f69b572b8b73c4e37b5106ae04fb))
16+
617
# [3.5.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.5.0) (2024-11-12)
718

819
### Bug Fixes

‎packages/decap-cms-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-core",
33
"description": "Decap CMS core application, see decap-cms package for the main distribution.",
4-
"version": "3.5.0",
4+
"version": "3.6.0",
55
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-core",
66
"bugs": "https://github.com/decaporg/decap-cms/issues",
77
"module": "dist/esm/index.js",

‎packages/decap-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,28 @@ export class PreviewPane extends React.Component {
169169
const { fields, entry, fieldsMetaData } = this.props;
170170
const field = fields.find(f => f.get('name') === name);
171171
const nestedFields = field && field.get('fields');
172+
const variableTypes = field && field.get('types');
172173
const value = entry.getIn(['data', field.get('name')]);
173174
const metadata = fieldsMetaData.get(field.get('name'), Map());
174175

176+
// Variable Type lists
177+
if (List.isList(value) && variableTypes) {
178+
return value.map(val => {
179+
const valueType = variableTypes.find(t => t.get('name') === val.get('type'));
180+
const typeFields = valueType && valueType.get('fields');
181+
const widgets =
182+
typeFields &&
183+
Map(
184+
typeFields.map((f, i) => [
185+
f.get('name'),
186+
<div key={i}>{this.getWidget(f, val, metadata.get(f.get('name')), this.props)}</div>,
187+
]),
188+
);
189+
return Map({ data: val, widgets });
190+
});
191+
}
192+
193+
// List widgets
175194
if (List.isList(value)) {
176195
return value.map(val => {
177196
const widgets =

‎packages/decap-cms-lib-util/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.2.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.2.0) (2025-01-29)
7+
8+
### Features
9+
10+
- visual editing (click-to-edit) ([#7374](https://github.com/decaporg/decap-cms/issues/7374)) ([989c2dd](https://github.com/decaporg/decap-cms/commit/989c2dd6ed80f69b572b8b73c4e37b5106ae04fb))
11+
612
# [3.1.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.1.0) (2024-08-07)
713

814
### Bug Fixes

‎packages/decap-cms-lib-util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-lib-util",
33
"description": "Shared utilities for Decap CMS.",
4-
"version": "3.1.0",
4+
"version": "3.2.0",
55
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-lib-util",
66
"bugs": "https://github.com/decaporg/decap-cms/issues",
77
"module": "dist/esm/index.js",

‎packages/decap-cms-widget-list/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.3.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.3.0) (2025-01-29)
7+
8+
### Features
9+
10+
- visual editing (click-to-edit) ([#7374](https://github.com/decaporg/decap-cms/issues/7374)) ([989c2dd](https://github.com/decaporg/decap-cms/commit/989c2dd6ed80f69b572b8b73c4e37b5106ae04fb))
11+
612
## [3.2.2](https://github.com/decaporg/decap-cms/compare/[email protected]@3.2.2) (2024-08-13)
713

814
### Reverts

‎packages/decap-cms-widget-list/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-widget-list",
33
"description": "Widget for editing lists in Decap CMS.",
4-
"version": "3.2.2",
4+
"version": "3.3.0",
55
"homepage": "https://www.decapcms.org/docs/widgets/#list",
66
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-list",
77
"bugs": "https://github.com/decaporg/decap-cms/issues",

‎packages/decap-cms-widget-markdown/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.3.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.3.0) (2025-01-29)
7+
8+
### Bug Fixes
9+
10+
- **markdown:** convert inline CSS from Google Docs to Markdown ([#7351](https://github.com/decaporg/decap-cms/issues/7351)) ([8b8e873](https://github.com/decaporg/decap-cms/commit/8b8e873af9a0749720ec03cadbc4b0d391ad84e1))
11+
12+
### Features
13+
14+
- visual editing (click-to-edit) ([#7374](https://github.com/decaporg/decap-cms/issues/7374)) ([989c2dd](https://github.com/decaporg/decap-cms/commit/989c2dd6ed80f69b572b8b73c4e37b5106ae04fb))
15+
616
# [3.2.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.2.0) (2024-11-12)
717

818
### Bug Fixes

‎packages/decap-cms-widget-markdown/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-widget-markdown",
33
"description": "Widget for editing markdown in Decap CMS.",
4-
"version": "3.2.0",
4+
"version": "3.3.0",
55
"homepage": "https://www.decapcms.org/docs/widgets/#markdown",
66
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-markdown",
77
"bugs": "https://github.com/decaporg/decap-cms/issues",

‎packages/decap-cms-widget-object/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [3.3.1](https://github.com/decaporg/decap-cms/compare/[email protected]@3.3.1) (2025-01-30)
7+
8+
### Bug Fixes
9+
10+
- **ObjectControl:** hotfix nested object validation ([#7385](https://github.com/decaporg/decap-cms/issues/7385)) ([3f5461c](https://github.com/decaporg/decap-cms/commit/3f5461c4e854ce3b9a7fb08974e270d54f5fccff))
11+
12+
# [3.3.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.3.0) (2025-01-29)
13+
14+
### Features
15+
16+
- visual editing (click-to-edit) ([#7374](https://github.com/decaporg/decap-cms/issues/7374)) ([989c2dd](https://github.com/decaporg/decap-cms/commit/989c2dd6ed80f69b572b8b73c4e37b5106ae04fb))
17+
618
# [3.2.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.2.0) (2025-01-15)
719

820
### Bug Fixes

‎packages/decap-cms-widget-object/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms-widget-object",
33
"description": "Widget for displaying an object of fields for Decap CMS.",
4-
"version": "3.2.0",
4+
"version": "3.3.1",
55
"homepage": "https://www.decapcms.org/docs/widgets/#object",
66
"repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-object",
77
"bugs": "https://github.com/decaporg/decap-cms/issues",

‎packages/decap-cms-widget-object/src/ObjectControl.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ export default class ObjectControl extends React.Component {
7979
if (field.get('widget') === 'hidden') return;
8080
const name = field.get('name');
8181
const control = this.childRefs[name];
82-
control?.validate?.();
82+
83+
if (control?.innerWrappedControl?.validate) {
84+
control.innerWrappedControl.validate();
85+
} else {
86+
control?.validate?.();
87+
}
8388
});
8489
};
8590

‎packages/decap-cms/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [3.6.1](https://github.com/decaporg/decap-cms/compare/[email protected]@3.6.1) (2025-01-30)
7+
8+
**Note:** Version bump only for package decap-cms
9+
10+
# [3.6.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.6.0) (2025-01-29)
11+
12+
**Note:** Version bump only for package decap-cms
13+
614
# [3.5.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.5.0) (2025-01-15)
715

816
### Bug Fixes

‎packages/decap-cms/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "decap-cms",
33
"description": "An extensible, open source, Git-based, React CMS for static sites.",
4-
"version": "3.5.0",
4+
"version": "3.6.1",
55
"homepage": "https://www.decapcms.org",
66
"repository": "https://github.com/decaporg/decap-cms",
77
"bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"codemirror": "^5.46.0",
2424
"create-react-class": "^15.7.0",
25-
"decap-cms-app": "^3.5.0",
25+
"decap-cms-app": "^3.6.1",
2626
"decap-cms-media-library-cloudinary": "^3.0.3",
2727
"decap-cms-media-library-uploadcare": "^3.0.2",
2828
"file-loader": "^6.2.0",

‎packages/decap-server/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.2.0](https://github.com/decaporg/decap-cms/compare/[email protected]@3.2.0) (2025-01-29)
7+
8+
**Note:** Version bump only for package decap-server
9+
610
## [3.1.2](https://github.com/decaporg/decap-cms/compare/[email protected]@3.1.2) (2024-08-13)
711

812
### Reverts

0 commit comments

Comments
 (0)