diff --git a/lerna.json b/lerna.json index 5186af2a..386ead68 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "1.2.13" + "version": "1.2.14" } diff --git a/packages/app/package.json b/packages/app/package.json index f82cfffa..aafbcc63 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@staticcms/app", - "version": "1.2.13", + "version": "1.2.14", "license": "MIT", "description": "Static CMS application.", "repository": "https://github.com/StaticJsCMS/static-cms", @@ -35,7 +35,7 @@ "@babel/eslint-parser": "7.21.3", "@babel/runtime": "7.21.0", "@emotion/babel-preset-css-prop": "11.10.0", - "@staticcms/core": "^1.2.13", + "@staticcms/core": "^1.2.14", "buffer": "6.0.3", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/core/package.json b/packages/core/package.json index 6a568914..3b1c8617 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@staticcms/core", - "version": "1.2.13", + "version": "1.2.14", "license": "MIT", "description": "Static CMS core application.", "repository": "https://github.com/StaticJsCMS/static-cms", diff --git a/packages/core/src/components/App.tsx b/packages/core/src/components/App.tsx index 1d50a0b4..525f41e1 100644 --- a/packages/core/src/components/App.tsx +++ b/packages/core/src/components/App.tsx @@ -55,8 +55,8 @@ function CollectionSearchRedirect() { } function EditEntityRedirect() { - const { name, entryName } = useParams(); - return ; + const { name, ...params } = useParams(); + return ; } const App = ({ @@ -214,9 +214,9 @@ const App = ({ path="/collections/:name/search/:searchTerm" element={} /> - } /> + } /> } /> - } /> + } /> } /> } /> } /> diff --git a/packages/core/src/components/collections/CollectionRoute.tsx b/packages/core/src/components/collections/CollectionRoute.tsx index 36ab505f..487002c7 100644 --- a/packages/core/src/components/collections/CollectionRoute.tsx +++ b/packages/core/src/components/collections/CollectionRoute.tsx @@ -16,7 +16,8 @@ interface CollectionRouteProps { } const CollectionRoute = ({ isSearchResults, isSingleSearchResult }: CollectionRouteProps) => { - const { name, searchTerm, filterTerm } = useParams(); + const { name, searchTerm, ...params } = useParams(); + const filterTerm = params['*']; const collectionSelector = useMemo(() => selectCollection(name), [name]); const collection = useAppSelector(collectionSelector);