Skip to content

pattern can be RegExp #6794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shadow-light wants to merge 4 commits into
base: main
Choose a base branch
from
+14 −12
Open

pattern can be RegExp #6794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
339a4ab
pattern can be RegExp
shadow-light Jun 6, 2023
00857cf
Merge branch 'main' into pr/6794
yanthomasdev May 19, 2026
32f9dd2
fix: other pattern types
yanthomasdev May 19, 2026
1792538
fix: add guard for undefined pattern
yanthomasdev May 19, 2026
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
4 changes: 2 additions & 2 deletions packages/decap-cms-core/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ declare module 'decap-cms-core' {
label?: string;
required?: boolean;
hint?: string;
pattern?: [string, string];
pattern?: [string | RegExp, string];
i18n?: boolean | 'translate' | 'duplicate' | 'none';
media_folder?: string;
public_folder?: string;
Expand Down Expand Up @@ -299,7 +299,7 @@ declare module 'decap-cms-core' {
export interface ViewFilter {
label: string;
field: string;
pattern: string;
pattern: string | boolean;
}

export interface ViewGroup {
Expand Down
16 changes: 9 additions & 7 deletions packages/decap-cms-core/src/reducers/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,14 +474,16 @@ function getGroup(entry: EntryMap, selectedGroup: GroupMap) {
if (selectedGroup.has('pattern')) {
const pattern = selectedGroup.get('pattern');
let value = '';
try {
const regex = new RegExp(pattern);
const matched = dataAsString.match(regex);
if (matched) {
value = matched[0];
if (pattern !== undefined) {
try {
const regex = new RegExp(pattern);
const matched = dataAsString.match(regex);
if (matched) {
value = matched[0];
}
} catch (e) {
console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
}
} catch (e) {
console.warn(`Invalid view group pattern '${pattern}' for field '${field}'`, e);
}
return {
id: `${label}${value}`,
Expand Down
6 changes: 3 additions & 3 deletions packages/decap-cms-core/src/types/redux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export interface CmsFieldBase {
label?: string;
required?: boolean;
hint?: string;
pattern?: [string, string];
pattern?: [string | RegExp, string];
i18n?: boolean | 'translate' | 'duplicate' | 'none';
media_folder?: string;
public_folder?: string;
Expand Down Expand Up @@ -315,14 +315,14 @@ export interface CmsCollectionFile {
export interface ViewFilter {
label: string;
field: string;
pattern: string;
pattern: string | boolean;
id: string;
}

export interface ViewGroup {
label: string;
field: string;
pattern: string;
pattern?: string;
id: string;
}

Expand Down
Loading