fix encoded paths and fix test

marmelab · Jan 24, 2025 · 0d16fa0 · 0d16fa0
1 parent 67b2001
commit 0d16fa0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx b/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx
@@ -46,7 +46,8 @@ describe('<TabbedForm />', () => {
 
         const tabs = await screen.findAllByRole('tab');
         expect(tabs.length).toEqual(2);
-        await screen.findByLabelText('Title');
+        const titleInput = await screen.findByLabelText('Title');
+        expect(titleInput).toBeVisible();
     });
 
     it('should set the style of an inactive Tab button with errors', async () => {

diff --git a/packages/ra-ui-materialui/src/form/TabbedFormView.tsx b/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
@@ -74,12 +74,15 @@ export const TabbedFormView = (props: TabbedFormViewProps): ReactElement => {
                         return null;
                     }
                     const tabPath = getTabbedFormTabFullPath(tab, index);
+                    console.log(
+                        'matchPath',
+                        `${splatPathBase}/${tabPath}`,
+                        location.pathname
+                    );
                     const hidden = syncWithLocation
                         ? !matchPath(
                               `${splatPathBase}/${tabPath}`,
-                              // The current location might have encoded segments (e.g. the record id) but resolvedPath.pathname doesn't
-                              // and the match would fail.
-                              getDecodedPathname(location.pathname)
+                              location.pathname
                           )
                         : tabValue !== index;
 
@@ -98,12 +101,6 @@ export const TabbedFormView = (props: TabbedFormViewProps): ReactElement => {
     );
 };
 
-/**
- * Returns the pathname with each segment decoded
- */
-const getDecodedPathname = (pathname: string) =>
-    pathname.split('/').map(decodeURIComponent).join('/');
-
 const DefaultTabs = <TabbedFormTabs />;
 const DefaultComponent = ({ children }) => (
     <CardContent>{children}</CardContent>

diff --git a/test-setup.js b/test-setup.js
@@ -3,6 +3,7 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
+import '@testing-library/jest-dom/jest-globals';
 
 // Ignore warnings about act()
 // See https://github.com/testing-library/react-testing-library/issues/281,