updates to fix test errors and imports

Author: thinknoack

packages/openneuro-app/src/scripts/users/__tests__/user-account-view.spec.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, within, waitFor} from '@testing-library/react';
 import { UserAccountView } from '../user-account-view';
 
 const baseUser = {
@@ -23,57 +23,47 @@ describe('<UserAccountView />', () => {
     expect(screen.getByText('[email protected]')).toBeInTheDocument();
     expect(screen.getByText('ORCID:')).toBeInTheDocument();
     expect(screen.getByText('0000-0001-2345-6789')).toBeInTheDocument();
-    expect(screen.getByText('Connect your github')).toBeInTheDocument();
+    expect(screen.getByText('johndoe')).toBeInTheDocument();
   });
 
-  it('should render links with EditableContent', () => {
+  it('should render links with EditableContent', async () => {
     render(<UserAccountView user={baseUser} />);
-
-    // Editable Links section
-    const linksSection = screen.getByText('Links');
-    expect(linksSection).toBeInTheDocument();
-
-    const linkItems = screen.getAllByRole('listitem');
-    expect(linkItems).toHaveLength(2); // initially 2 links
-
-    // Edit a link
-    fireEvent.click(screen.getByText('Edit'));
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: 'https://newlink.com' } });
-    fireEvent.click(screen.getByText('Save'));
-
-    // Check if new link was added
-    expect(screen.getByText('https://newlink.com')).toBeInTheDocument();
+    const institutionSection = within(screen.getByText('Institution').closest('.user-meta-block'));
+    expect(screen.getByText('Institution')).toBeInTheDocument();
+    const editButton = institutionSection.getByText('Edit');
+    fireEvent.click(editButton);
+    const textbox = institutionSection.getByRole('textbox');
+    fireEvent.change(textbox, { target: { value: 'New University' } });
+    const saveButton = institutionSection.getByText('Save');
+    const closeButton = institutionSection.getByText('Close');
+    fireEvent.click(saveButton);
+    fireEvent.click(closeButton);
+    // Add debug step
+    await waitFor(() => screen.debug());
+    // Use a flexible matcher to check for text
+    await waitFor(() =>
+      expect(institutionSection.getByText('New University')).toBeInTheDocument()
+    );
   });
+  
 
-  it('should render location with EditableContent', () => {
+  it('should render location with EditableContent', async () => {
     render(<UserAccountView user={baseUser} />);
-
-    // Editable Location section
-    const locationSection = screen.getByText('Location');
-    expect(locationSection).toBeInTheDocument();
-
-    // Edit location
-    fireEvent.click(screen.getByText('Edit'));
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: 'Los Angeles, USA' } });
-    fireEvent.click(screen.getByText('Save'));
-
-    // Verify updated location
-    expect(screen.getByText('Los Angeles, USA')).toBeInTheDocument();
-  });
-
-  it('should render institution with EditableContent', () => {
-    render(<UserAccountView user={baseUser} />);
-
-    // Editable Institution section
-    const institutionSection = screen.getByText('Institution');
-    expect(institutionSection).toBeInTheDocument();
-
-    // Edit institution
-    fireEvent.click(screen.getByText('Edit'));
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: 'New University' } });
-    fireEvent.click(screen.getByText('Save'));
-
-    // Verify updated institution
-    expect(screen.getByText('New University')).toBeInTheDocument();
+    const locationSection = within(screen.getByText('Location').closest('.user-meta-block'));
+    expect(screen.getByText('Location')).toBeInTheDocument();
+    const editButton = locationSection.getByText('Edit');
+    fireEvent.click(editButton);
+    const textbox = locationSection.getByRole('textbox');
+    fireEvent.change(textbox, { target: { value: 'Marin, CA' } });
+    const saveButton = locationSection.getByText('Save');
+    const closeButton = locationSection.getByText('Close');
+    fireEvent.click(saveButton);
+    fireEvent.click(closeButton);
+    // Add debug step
+    await waitFor(() => screen.debug());
+    // Use a flexible matcher to check for text
+    await waitFor(() =>
+      expect(locationSection.getByText('Marin, CA')).toBeInTheDocument()
+    );
   });
 });

packages/openneuro-app/src/scripts/users/user-query.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { useParams } from 'react-router-dom';
 import { UserRoutes } from './user-routes';
 import FourOFourPage from '../errors/404page';
-import { isValidOrcid } from "../../utils/validationUtils";
+import { isValidOrcid } from "../utils/validationUtils";