@openneuro/app 4.35.0 → 4.36.0

package/src/scripts/users/user-menu.tsx

@@ -64,23 +64,18 @@ export const UserMenu = (
                 </p>
               </li>
               <li>
-                {
-                  /* {user?.orcid
+                {user?.orcid
                   ? <Link to={`/user/${user?.orcid}`}>My Datasets</Link>
-                  : <Link to="/search?mydatasets">My Datasets</Link>} */
-                }
-                <Link to="/search?mydatasets">My Datasets</Link>
+                  : <Link to="/search?mydatasets">My Datasets</Link>}
               </li>
 
-              {
-                /* {user?.orcid && (
+              {user?.orcid && (
                 <li>
                   <Link to={`/user/${user?.orcid}/account`}>
                     Account Info
                   </Link>
                 </li>
-              )} */
-              }
+              )}
 
               <li className="user-menu-link">
                 <Link to="/keygen">Obtain an API Key</Link>

package/src/scripts/users/user-notifications-view.tsx

@@ -11,7 +11,7 @@ import iconUnread from "../../assets/icon-unread.png"
 import iconSaved from "../../assets/icon-saved.png"
 import iconArchived from "../../assets/icon-archived.png"
 
-export const UserNotificationsView = ({ user }) => {
+export const UserNotificationsView = ({ orcidUser }) => {
   const tabsRef = useRef<HTMLUListElement | null>(null)
   const { tab = "unread" } = useParams()
   const navigate = useNavigate()
@@ -50,18 +50,20 @@ export const UserNotificationsView = ({ user }) => {
   // Redirect to default tab if no tab is specified
   useEffect(() => {
     if (!["unread", "saved", "archived"].includes(tab)) {
-      navigate(`/user/${user.orcid}/notifications/unread`, { replace: true })
+      navigate(`/user/${orcidUser.orcid}/notifications/unread`, {
+        replace: true,
+      })
     }
-  }, [tab, user.orcid, navigate])
+  }, [tab, orcidUser.orcid, navigate])
 
   return (
     <div data-testid="user-notifications-view">
-      <h3>Notifications for {user.name}</h3>
+      <h3>Notifications for {orcidUser.name}</h3>
       <div className={styles.tabContainer}>
         <ul className={styles.tabs} ref={tabsRef}>
           <li>
             <NavLink
-              to={`/user/${user.orcid}/notifications/unread`}
+              to={`/user/${orcidUser.orcid}/notifications/unread`}
               className={({ isActive }) =>
                 isActive
                   ? `${styles.active} ${styles.tabUnread}`
@@ -73,7 +75,7 @@ export const UserNotificationsView = ({ user }) => {
           </li>
           <li>
             <NavLink
-              to={`/user/${user.orcid}/notifications/saved`}
+              to={`/user/${orcidUser.orcid}/notifications/saved`}
               className={({ isActive }) =>
                 isActive
                   ? `${styles.active} ${styles.tabSaved}`
@@ -85,7 +87,7 @@ export const UserNotificationsView = ({ user }) => {
           </li>
           <li>
             <NavLink
-              to={`/user/${user.orcid}/notifications/archived`}
+              to={`/user/${orcidUser.orcid}/notifications/archived`}
               className={({ isActive }) =>
                 isActive
                   ? `${styles.active} ${styles.tabArchived}`

package/src/scripts/users/user-query.tsx

@@ -11,7 +11,7 @@ import { useUser } from "../queries/user"
 export const UserQuery: React.FC = () => {
   const { orcid } = useParams()
   const isOrcidValid = orcid && isValidOrcid(orcid)
-  const { user, loading, error } = useUser()
+  const { user, loading, error } = useUser(orcid)
 
   const [cookies] = useCookies()
   const profile = getProfile(cookies)
@@ -23,16 +23,13 @@ export const UserQuery: React.FC = () => {
 
   if (loading) return <div>Loading...</div>
 
-  if (error || !user || user?.orcid !== orcid) {
+  if (error || !user) {
     return <FourOFourPage />
   }
 
-  if (!profile || !profile.sub) {
-    return <FourOFourPage />
-  }
   // is admin or profile matches id from the user data being returned
   const isUser = (user?.id === profile?.sub) ? true : false
   const hasEdit = isAdminUser || (user?.id === profile?.sub) ? true : false
   // Render user data with UserRoutes
-  return <UserRoutes user={user} hasEdit={hasEdit} isUser={isUser} />
+  return <UserRoutes orcidUser={user} hasEdit={hasEdit} isUser={isUser} />
 }

package/src/scripts/users/user-routes.tsx

@@ -15,7 +15,7 @@ import {
 import type { UserRoutesProps } from "../types/user-types"
 
 export const UserRoutes: React.FC<UserRoutesProps> = (
-  { user, hasEdit, isUser },
+  { orcidUser, hasEdit, isUser },
 ) => {
   return (
     <Routes>
@@ -23,21 +23,27 @@ export const UserRoutes: React.FC<UserRoutesProps> = (
       <Route
         path="*"
         element={
-          <UserAccountContainer user={user} hasEdit={hasEdit} isUser={isUser} />
+          <UserAccountContainer
+            orcidUser={orcidUser}
+            hasEdit={hasEdit}
+            isUser={isUser}
+          />
         }
       >
         <Route
           path=""
-          element={<UserDatasetsView user={user} hasEdit={hasEdit} />}
+          element={<UserDatasetsView orcidUser={orcidUser} hasEdit={hasEdit} />}
         />
         <Route
           path="account"
-          element={hasEdit ? <UserAccountView /> : <FourOThreePage />}
+          element={hasEdit
+            ? <UserAccountView orcidUser={orcidUser} />
+            : <FourOThreePage />}
         />
         <Route
           path="notifications/*"
           element={hasEdit
-            ? <UserNotificationsView user={user} />
+            ? <UserNotificationsView orcidUser={orcidUser} />
             : <FourOThreePage />}
         >
           <Route index element={<UnreadNotifications />} />

package/src/scripts/users/user-tabs.tsx

@@ -50,7 +50,8 @@ export const UserAccountTabs: React.FC<UserAccountTabsProps> = (
             {isUser ? "My" : "User"} Datasets
           </NavLink>
         </li>
-        <li>
+        {
+          /* <li>
           <NavLink
             data-testid="user-notifications-tab"
             to="notifications"
@@ -59,7 +60,8 @@ export const UserAccountTabs: React.FC<UserAccountTabsProps> = (
           >
             Notifications
           </NavLink>
-        </li>
+        </li> */
+        }
         <li>
           <NavLink
             to="account"

package/src/scripts/users/__tests__/datasest-card.spec.tsx

@@ -1,201 +0,0 @@
-import React from "react"
-import { fireEvent, render, screen, waitFor } from "@testing-library/react"
-import { DATASETS_QUERY, UserDatasetsView } from "../user-datasets-view"
-import { MockedProvider } from "@apollo/client/testing"
-import DatasetCard from "../dataset-card"
-
-// Mocked datasets
-const mockDatasets = [
-  {
-    node: {
-      id: "ds000001",
-      name: "The DBS-fMRI dataset",
-      created: "2025-01-22T19:55:49.997Z",
-      followers: [
-        { userId: "user1", datasetId: "ds000001" },
-        { userId: "user2", datasetId: "ds000001" },
-      ],
-      stars: [
-        { userId: "user1", datasetId: "ds000001" },
-      ],
-      latestSnapshot: {
-        id: "ds000001:1.0.0",
-        size: 6000,
-        created: "2025-01-22T19:55:49.997Z",
-        issues: [{ severity: "low" }],
-        description: {
-          Name: "DBS-FMRI",
-          Authors: ["John Doe"],
-          SeniorAuthor: "Dr. Smith",
-          DatasetType: "fMRI",
-        },
-      },
-    },
-  },
-  {
-    node: {
-      id: "ds000002",
-      name: "The DBS-fMRI dataset 2",
-      created: "2025-01-22T19:55:49.997Z",
-      followers: [
-        { userId: "user1", datasetId: "ds000002" },
-        { userId: "user2", datasetId: "ds000002" },
-      ],
-      stars: [
-        { userId: "user1", datasetId: "ds000002" },
-      ],
-      latestSnapshot: {
-        id: "ds000002:1.0.0",
-        size: 6000,
-        created: "2025-01-22T19:55:49.997Z",
-        issues: [{ severity: "medium" }],
-        description: {
-          Name: "DBS-FMRI 2",
-          Authors: ["Jane Doe"],
-          SeniorAuthor: "Dr. Johnson",
-          DatasetType: "fMRI",
-        },
-      },
-    },
-  },
-]
-
-describe("<UserDatasetsView />", () => {
-  const mockUser = {
-    id: "user1",
-    name: "John Doe",
-    location: "Somewhere",
-    institution: "Some University",
-    email: "john.doe@example.com",
-  }
-  const mockHasEdit = true
-
-  it("renders loading state", () => {
-    const mockLoadingQuery = {
-      request: {
-        query: DATASETS_QUERY,
-        variables: { first: 25 },
-      },
-      result: { data: { datasets: { edges: [] } } },
-    }
-
-    render(
-      <MockedProvider mocks={[mockLoadingQuery]} addTypename={false}>
-        <UserDatasetsView user={mockUser} hasEdit={mockHasEdit} />
-      </MockedProvider>,
-    )
-
-    expect(screen.getByText("Loading datasets...")).toBeInTheDocument()
-  })
-
-  it("renders error state", async () => {
-    const mockErrorQuery = {
-      request: {
-        query: DATASETS_QUERY,
-        variables: { first: 25 },
-      },
-      error: new Error("Failed to fetch datasets"),
-    }
-
-    render(
-      <MockedProvider mocks={[mockErrorQuery]} addTypename={false}>
-        <UserDatasetsView user={mockUser} hasEdit={mockHasEdit} />
-      </MockedProvider>,
-    )
-
-    await waitFor(() => {
-      expect(
-        screen.getByText("Failed to fetch datasets: Failed to fetch datasets"),
-      ).toBeInTheDocument()
-    })
-  })
-
-  it("filters datasets by public filter", async () => {
-    const mockDatasetQuery = {
-      request: {
-        query: DATASETS_QUERY,
-        variables: { first: 25 },
-      },
-      result: { data: { datasets: { edges: mockDatasets } } },
-    }
-
-    render(
-      <MockedProvider mocks={[mockDatasetQuery]} addTypename={false}>
-        <UserDatasetsView user={mockUser} hasEdit={mockHasEdit} />
-      </MockedProvider>,
-    )
-
-    await waitFor(() => screen.getByTestId("public-filter"))
-    fireEvent.click(screen.getByTestId("public-filter"))
-    await waitFor(() => screen.getByText("Public"))
-    fireEvent.click(screen.getByText("Public"))
-
-    expect(screen.getByTestId("public-filter")).toHaveTextContent(
-      "Filter by: Public",
-    )
-  })
-
-  it("handles sorting datasets", async () => {
-    const mockDatasetQuery = {
-      request: {
-        query: DATASETS_QUERY,
-        variables: { first: 25 },
-      },
-      result: { data: { datasets: { edges: mockDatasets } } },
-    }
-
-    render(
-      <MockedProvider mocks={[mockDatasetQuery]} addTypename={false}>
-        <UserDatasetsView user={mockUser} hasEdit={mockHasEdit} />
-      </MockedProvider>,
-    )
-
-    await waitFor(() => screen.queryByText(mockDatasets[0].node.name))
-
-    fireEvent.click(screen.getByTestId("sort-order"))
-    await waitFor(() => screen.getByText("Name (A-Z)"))
-    fireEvent.click(screen.getByText("Name (Z-A)"))
-
-    expect(screen.getByTestId("sort-order")).toHaveTextContent("Name (Z-A)")
-  })
-})
-
-const mockDataset = {
-  id: "ds000001",
-  name: "Test Dataset",
-  created: "2025-01-01T00:00:00Z",
-  date: "2025-01-01T00:00:00Z",
-  public: true,
-  analytics: {
-    downloads: 12345,
-    views: 67890,
-  },
-  followers: [
-    { userId: "user1", datasetId: "ds000001" },
-    { userId: "user2", datasetId: "ds000001" },
-  ],
-  stars: [
-    { userId: "user1", datasetId: "ds000001" },
-  ],
-  latestSnapshot: {
-    id: "ds000001:1.0.0",
-    size: 1024 ** 3,
-    issues: [{ severity: "low" }],
-    created: "2025-01-01T00:00:00Z",
-    description: {
-      Authors: ["John Doe"],
-      SeniorAuthor: "Dr. Smith",
-      DatasetType: "fMRI",
-    },
-  },
-}
-
-describe("DatasetCard", () => {
-  it("should render dataset information correctly", () => {
-    render(<DatasetCard dataset={mockDataset} hasEdit={false} />)
-
-    expect(screen.getByText("Test Dataset")).toBeInTheDocument()
-    expect(screen.getByText("ds000001")).toBeInTheDocument()
-    expect(screen.getByText("1.00 GB")).toBeInTheDocument()
-  })
-})

package/src/scripts/users/fragments/query.js

@@ -1,42 +0,0 @@
-import { gql } from "@apollo/client"
-
-export const INDEX_DATASET_FRAGMENT = gql`
-  fragment DatasetIndex on Dataset {
-    id
-    created
-    name
-    public
-    analytics {
-        views
-        downloads
-    }
-    stars {
-        userId
-        datasetId
-    }
-    followers {
-        userId
-        datasetId
-    }
-    latestSnapshot {
-        id
-        size
-        created
-        issues {
-        severity
-        }
-        description {
-        Name
-        Authors
-        SeniorAuthor
-        DatasetType
-        }
-    }
-    draft {
-        id
-    }
-    uploader {
-        id
-    }
-  }
-`