@openneuro/app 4.12.4 → 4.12.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.12.4",
+  "version": "4.12.5",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -20,8 +20,8 @@
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
     "@niivue/niivue": "0.23.1",
-    "@openneuro/client": "^4.12.4",
-    "@openneuro/components": "^4.12.4",
+    "@openneuro/client": "^4.12.5",
+    "@openneuro/components": "^4.12.5",
     "bids-validator": "1.9.9",
     "bytes": "^3.0.0",
     "comlink": "^4.0.5",
@@ -104,5 +104,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0bc1eac64ac5277a574127e36d371374cfa9b7df"
+  "gitHead": "0c79489a3f2e040dc07966c888fe49aba5b1c4b4"
 }

package/src/scripts/__mocks__/config.ts

@@ -23,4 +23,7 @@ export const config = {
   sentry: {
     environment: 'unit-tests',
   },
+  support: {
+    url: 'https://example.com/test-suite',
+  },
 }

package/src/scripts/__utils__/mock-app-shell.tsx

@@ -0,0 +1,22 @@
+import React from 'react'
+import { MemoryRouter } from 'react-router-dom'
+import { MockedProvider } from '@apollo/client/testing'
+import { SearchParamsCtx } from '../search/search-params-ctx'
+import { UserModalOpenCtx } from '../utils/user-login-modal-ctx'
+import initialSearchParams from '../search/initial-search-params'
+
+/**
+ * Reusable shell component that provides any context required by major component trees
+ */
+export const MockAppShell = ({ children, route = '/' }) => (
+  <MockedProvider>
+    <SearchParamsCtx.Provider
+      value={{
+        searchParams: initialSearchParams,
+      }}>
+      <UserModalOpenCtx.Provider value={false}>
+        <MemoryRouter initialEntries={[route]}>{children}</MemoryRouter>
+      </UserModalOpenCtx.Provider>
+    </SearchParamsCtx.Provider>
+  </MockedProvider>
+)

package/src/scripts/common/containers/__tests__/header.spec.tsx

@@ -0,0 +1,34 @@
+import React from 'react'
+import { MockAppShell } from '../../../__utils__/mock-app-shell'
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
+import { HeaderContainer } from '../header'
+
+jest.mock(
+  '../../../uploader/uploader-view.jsx',
+  () => () => 'mocked UploaderView',
+)
+
+const mockNavigate = jest.fn()
+
+jest.mock('react-router-dom', () => {
+  const reactRouterDom = jest.requireActual('react-router-dom')
+  return {
+    ...reactRouterDom,
+    useNavigate: () => mockNavigate,
+  }
+})
+
+describe('HeaderContainer component', () => {
+  it('navigates prepopulated search when you use the home page search box', async () => {
+    render(<HeaderContainer />, { wrapper: MockAppShell })
+    const searchbox = screen.getByRole('textbox')
+    const button = screen.getByLabelText('Search')
+    await fireEvent.change(searchbox, { target: { value: 'test argument' } })
+    await fireEvent.click(button)
+    await waitFor(() =>
+      expect(mockNavigate).toHaveBeenCalledWith(
+        '/search?query={"keywords":["test argument"]}',
+      ),
+    )
+  })
+})

package/src/scripts/common/containers/header.tsx

@@ -5,8 +5,6 @@ import UploadProgress from '../../uploader/upload-progress.jsx'
 import { Header, LandingExpandedHeader } from '@openneuro/components/header'
 import { Input } from '@openneuro/components/input'
 import ModalitySelect from '../../search/inputs/modality-select'
-import { SearchParamsCtx } from '../../search/search-params-ctx'
-import initialSearchParams from '../../search/initial-search-params'
 import { UserModalOpenCtx } from '../../utils/user-login-modal-ctx'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { useCookies } from 'react-cookie'
@@ -18,7 +16,8 @@ import loginUrls from '../../authentication/loginUrls'
 import UploaderView from '../../uploader/uploader-view.jsx'
 import UploadButton from '../../uploader/upload-button.jsx'
 import UploadProgressButton from '../../uploader/upload-progress-button.jsx'
-const HeaderContainer: FC = () => {
+
+export const HeaderContainer: FC = () => {
   const navigate = useNavigate()
 
   const { pathname: currentPath } = useLocation()
@@ -27,23 +26,18 @@ const HeaderContainer: FC = () => {
   const [cookies] = useCookies()
   const profile = getUnexpiredProfile(cookies)
 
-  const { setSearchParams } = useContext(SearchParamsCtx)
   const { userModalOpen, setUserModalOpen } = useContext(UserModalOpenCtx)
 
   const [newKeyword, setNewKeyword, newKeywordRef] = useState('')
 
   const handleSubmit = () => {
-    // reset search params and set keyword to initiate new search, then navigate to global search page
-    setSearchParams(() => ({
-      ...initialSearchParams,
+    const query = JSON.stringify({
       keywords: newKeywordRef.current ? [newKeywordRef.current] : [],
-    }))
+    })
     setNewKeyword('')
-    navigate('/search')
+    navigate(`/search?query=${query}`)
   }
 
-  const clearSearchParams = () => setSearchParams(initialSearchParams)
-
   const toggleLoginModal = (): void => {
     setUserModalOpen(prevState => ({
       ...prevState,
@@ -134,9 +128,6 @@ const HeaderContainer: FC = () => {
             onSearch={() => {
               handleSubmit()
             }}
-            clearSearchParams={() => {
-              clearSearchParams()
-            }}
           />
         )}
       />

package/src/scripts/dataset/routes/__tests__/deprecate-snapshot-page.spec.tsx

@@ -0,0 +1,12 @@
+import React from 'react'
+import { render, screen } from '@testing-library/react'
+import { DeprecateSnapshotPage } from '../deprecate-snapshot-page'
+
+describe('DeprecateSnapshotPage component', () => {
+  it('renders accession number and tag', () => {
+    render(<DeprecateSnapshotPage datasetId="ds000001" snapshotTag="1.0.0" />)
+    expect(
+      screen.getByText(/Deprecate ds000001 version 1\.0\.0/),
+    ).toBeInTheDocument()
+  })
+})

package/src/scripts/dataset/routes/deprecate-snapshot-page.tsx

@@ -6,8 +6,15 @@ import LoggedIn from '../../authentication/logged-in.jsx'
 import { DatasetPageBorder } from './styles/dataset-page-border'
 import { HeaderRow3 } from './styles/header-row'
 
-export const DeprecateSnapshotPage = (): React.ReactElement => {
-  const { datasetId, snapshotTag } = useParams()
+interface DeprecateSnapshotProps {
+  datasetId: string
+  snapshotTag: string
+}
+
+export const DeprecateSnapshotPage = ({
+  datasetId,
+  snapshotTag,
+}: DeprecateSnapshotProps): React.ReactElement => {
   const [reason, setReason] = useState('')
 
   return (

package/src/scripts/dataset/routes/tab-routes-snapshot.tsx

@@ -27,7 +27,15 @@ export const TabRoutesSnapshot = ({ dataset, snapshot }) => {
         path="derivatives"
         element={<Derivatives derivatives={dataset.derivatives} />}
       />
-      <Route path="deprecate" element={<DeprecateSnapshotPage />} />
+      <Route
+        path="deprecate"
+        element={
+          <DeprecateSnapshotPage
+            datasetId={dataset.id}
+            snapshotTag={snapshot.tag}
+          />
+        }
+      />
       <Route path="file-display/:filePath" element={<FileDisplayRoute />} />
       <Route path="metadata" element={<AddMetadata dataset={dataset} />} />
     </Routes>

package/src/scripts/uploader/uploader-view.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import BlockNavigation from '../common/partials/block-navigation.jsx'
-import UploaderContext from './uploader-context.js'
 import UploaderSetupRoutes from './uploader-setup-routes.jsx'
 import UploaderStatusRoutes from './uploader-status-routes.jsx'