@openneuro/app 4.2.1 → 4.2.5-alpha.0

package/src/scripts/refactor_2021/dataset/fragments/__tests__/select-input.spec.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render, fireEvent, screen } from '@testing-library/react'
 import SelectInput from '../select-input'
 
 describe('SelectInput', () => {
   it('handles display as disabled', () => {
-    const wrapper = shallow(
+    const { asFragment } = render(
       <SelectInput
         {...{
           name: 'Expected name',
@@ -16,10 +16,10 @@ describe('SelectInput', () => {
         }}
       />,
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
   it('handles display as not disabled', () => {
-    const wrapper = shallow(
+    const { asFragment } = render(
       <SelectInput
         {...{
           name: 'Expected name',
@@ -31,10 +31,10 @@ describe('SelectInput', () => {
         }}
       />,
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
   it('handles boolean display', () => {
-    const wrapper = shallow(
+    const { asFragment } = render(
       <SelectInput
         {...{
           name: 'Expected name',
@@ -50,12 +50,12 @@ describe('SelectInput', () => {
         }}
       />,
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
   it('handles boolean values', () => {
     let _, value
     const onChange = (...args) => ([_, value] = args)
-    const wrapper = shallow(
+    render(
       <SelectInput
         {...{
           name: 'Expected name',
@@ -78,7 +78,7 @@ describe('SelectInput', () => {
       },
       target: { value: 'false' },
     }
-    wrapper.find('styledSelect[name="Expected name"]').simulate('change', event)
+    fireEvent.change(screen.getByRole('combobox'), event)
     expect(value).toBe(false)
   })
 })

package/src/scripts/refactor_2021/dataset/fragments/select-input.tsx

@@ -70,7 +70,7 @@ const Select = styled.select<ShowOtherProps>(
       height: '100%',
       color: 'rgba(0,0,0,0)',
       backgroundColor: 'rgba(0,0,0,0)',
-      '-moz-appearance': 'none',
+      MozAppearance: 'none',
     },
   },
   ({ showOther }) =>

package/src/scripts/refactor_2021/dataset/mutations/__tests__/__snapshots__/description.spec.jsx.snap

@@ -1,281 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`UpdateDescription mutation renders with common props 1`] = `
-<Mutation
-  mutation={
-    Object {
-      "definitions": Array [
-        Object {
-          "directives": Array [],
-          "kind": "OperationDefinition",
-          "name": Object {
-            "kind": "Name",
-            "value": "updateDescription",
-          },
-          "operation": "mutation",
-          "selectionSet": Object {
-            "kind": "SelectionSet",
-            "selections": Array [
-              Object {
-                "alias": undefined,
-                "arguments": Array [
-                  Object {
-                    "kind": "Argument",
-                    "name": Object {
-                      "kind": "Name",
-                      "value": "datasetId",
-                    },
-                    "value": Object {
-                      "kind": "Variable",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "datasetId",
-                      },
-                    },
-                  },
-                  Object {
-                    "kind": "Argument",
-                    "name": Object {
-                      "kind": "Name",
-                      "value": "field",
-                    },
-                    "value": Object {
-                      "kind": "Variable",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "field",
-                      },
-                    },
-                  },
-                  Object {
-                    "kind": "Argument",
-                    "name": Object {
-                      "kind": "Name",
-                      "value": "value",
-                    },
-                    "value": Object {
-                      "kind": "Variable",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "value",
-                      },
-                    },
-                  },
-                ],
-                "directives": Array [],
-                "kind": "Field",
-                "name": Object {
-                  "kind": "Name",
-                  "value": "updateDescription",
-                },
-                "selectionSet": Object {
-                  "kind": "SelectionSet",
-                  "selections": Array [
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "id",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "Name",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "BIDSVersion",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "License",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "Authors",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "Acknowledgements",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "HowToAcknowledge",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "Funding",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "ReferencesAndLinks",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "DatasetDOI",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "EthicsApprovals",
-                      },
-                      "selectionSet": undefined,
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-          "variableDefinitions": Array [
-            Object {
-              "defaultValue": undefined,
-              "directives": Array [],
-              "kind": "VariableDefinition",
-              "type": Object {
-                "kind": "NonNullType",
-                "type": Object {
-                  "kind": "NamedType",
-                  "name": Object {
-                    "kind": "Name",
-                    "value": "ID",
-                  },
-                },
-              },
-              "variable": Object {
-                "kind": "Variable",
-                "name": Object {
-                  "kind": "Name",
-                  "value": "datasetId",
-                },
-              },
-            },
-            Object {
-              "defaultValue": undefined,
-              "directives": Array [],
-              "kind": "VariableDefinition",
-              "type": Object {
-                "kind": "NonNullType",
-                "type": Object {
-                  "kind": "NamedType",
-                  "name": Object {
-                    "kind": "Name",
-                    "value": "String",
-                  },
-                },
-              },
-              "variable": Object {
-                "kind": "Variable",
-                "name": Object {
-                  "kind": "Name",
-                  "value": "field",
-                },
-              },
-            },
-            Object {
-              "defaultValue": undefined,
-              "directives": Array [],
-              "kind": "VariableDefinition",
-              "type": Object {
-                "kind": "NonNullType",
-                "type": Object {
-                  "kind": "NamedType",
-                  "name": Object {
-                    "kind": "Name",
-                    "value": "String",
-                  },
-                },
-              },
-              "variable": Object {
-                "kind": "Variable",
-                "name": Object {
-                  "kind": "Name",
-                  "value": "value",
-                },
-              },
-            },
-          ],
-        },
-      ],
-      "kind": "Document",
-      "loc": Object {
-        "end": 374,
-        "start": 0,
-      },
-    }
-  }
-  update={[Function]}
->
-  <Component />
-</Mutation>
+<DocumentFragment>
+  Mutation mock
+</DocumentFragment>
 `;

package/src/scripts/refactor_2021/dataset/mutations/__tests__/description.spec.jsx

@@ -1,47 +1,60 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render } from '@testing-library/react'
+import { MockedProvider } from '@apollo/client/testing'
 import UpdateDescription, {
   mergeFieldValue,
   UPDATE_DESCRIPTION,
   UPDATE_DESCRIPTION_LIST,
 } from '../description.jsx'
 
+const mockMutation = jest.fn()
+jest.mock('@apollo/client/react/components', () => ({
+  ...jest.requireActual('@apollo/client/react/components'),
+  Mutation: props => {
+    mockMutation(props)
+    return <>Mutation mock</>
+  },
+}))
+
 describe('UpdateDescription mutation', () => {
   it('renders with common props', () => {
-    const wrapper = shallow(
+    const { asFragment } = render(
       <UpdateDescription
         datasetId="ds001"
         field="Name"
         value="New Name"
         done={jest.fn()}
       />,
+      { wrapper: MockedProvider },
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
   it('uses the scalar mutation for scalar values', () => {
-    const wrapper = shallow(
+    render(
       <UpdateDescription
         datasetId="ds001"
         field="Name"
         value="New Name"
         done={jest.fn()}
       />,
+      { wrapper: MockedProvider },
     )
-    expect(wrapper.find('Mutation').props().mutation).toEqual(
-      UPDATE_DESCRIPTION,
+    expect(mockMutation).toHaveBeenCalledWith(
+      expect.objectContaining({ mutation: UPDATE_DESCRIPTION }),
     )
   })
   it('uses the list mutation for array values', () => {
-    const wrapper = shallow(
+    render(
       <UpdateDescription
         datasetId="ds001"
         field="Authors"
         value={['John Doe', 'Jane Doe']}
         done={jest.fn()}
       />,
+      { wrapper: MockedProvider },
     )
-    expect(wrapper.find('Mutation').props().mutation).toEqual(
-      UPDATE_DESCRIPTION_LIST,
+    expect(mockMutation).toHaveBeenCalledWith(
+      expect.objectContaining({ mutation: UPDATE_DESCRIPTION_LIST }),
     )
   })
   describe('mergeFieldValue()', () => {

package/src/scripts/refactor_2021/dataset/mutations/update-file.jsx

@@ -1,37 +1,33 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import UploaderContext from '../../uploader/uploader-context.js'
-import { Tooltip } from '@openneuro/components/tooltip'
 
 const UpdateFile = ({
   datasetId,
   directory = false,
   multiple = false,
   path = null,
-  tooltip = '',
   children,
 }) => {
   return (
     <UploaderContext.Consumer>
       {uploader => (
         <div className="edit-file">
-          <Tooltip tooltip={tooltip}>
-            <input
-              type="file"
-              className="update-file"
-              onChange={e => {
-                e.preventDefault()
-                uploader.resumeDataset(
-                  datasetId,
-                  path,
-                  false,
-                )({ files: e.target.files })
-              }}
-              webkitdirectory={directory && 'true'}
-              multiple={multiple && true}
-            />
-            {children}
-          </Tooltip>
+          <input
+            type="file"
+            className="update-file"
+            onChange={e => {
+              e.preventDefault()
+              uploader.resumeDataset(
+                datasetId,
+                path,
+                false,
+              )({ files: e.target.files })
+            }}
+            webkitdirectory={directory && 'true'}
+            multiple={multiple && true}
+          />
+          {children}
         </div>
       )}
     </UploaderContext.Consumer>

package/src/scripts/refactor_2021/dataset/routes/__tests__/__snapshots__/publish.spec.jsx.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Publish dataset route renders with common props 1`] = `[Function]`;

package/src/scripts/refactor_2021/dataset/routes/__tests__/publish.spec.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+import { render } from '@testing-library/react'
+import { MemoryRouter } from 'react-router-dom'
+import Publish from '../publish.jsx'
+
+describe('Publish dataset route', () => {
+  it('renders with common props', () => {
+    const { asFragment } = render(<Publish datasetId="ds00001" />, {
+      wrapper: MemoryRouter,
+    })
+    expect(asFragment).toMatchSnapshot()
+  })
+})

package/src/scripts/refactor_2021/dataset/snapshot-container.tsx

@@ -173,8 +173,7 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
             fileTree={true}
             id="collapse-tree"
             expandLabel="Read More"
-            collapseabel="Collapse"
-          >
+            collapseLabel="Collapse">
             <Files
               datasetId={datasetId}
               snapshotTag={snapshot.tag}
@@ -192,8 +191,7 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
               <ReadMore
                 id="readme"
                 expandLabel="Read More"
-                collapseabel="Collapse"
-              >
+                collapseLabel="Collapse">
                 <Markdown>
                   {snapshot.readme == null ? 'N/A' : snapshot.readme}
                 </Markdown>
@@ -378,8 +376,7 @@ const SnapshotContainer: React.FC<SnapshotContainerProps> = ({
             isOpen={deprecatedmodalIsOpen}
             toggle={() => setDeprecatedModalIsOpen(prevIsOpen => !prevIsOpen)}
             closeText={'close'}
-            className="deprecated-modal"
-          >
+            className="deprecated-modal">
             <p>
               You have selected a deprecated version. The author of the dataset
               does not recommend this specific version.
@@ -437,8 +434,7 @@ const SnapshotLoader: React.FC<SnapshotLoaderProps> = ({ dataset, tag }) => {
           datasetId: dataset.id,
           fetchMore,
           error: null,
-        }}
-      >
+        }}>
         <SnapshotContainer
           dataset={dataset}
           tag={tag}

package/src/scripts/refactor_2021/routes.tsx

@@ -17,15 +17,15 @@ import FourOFourPage from '../errors/404page'
 
 const Routes: React.VoidFunctionComponent = () => (
   <Switch>
-    <Route name="faq" exact path="/faq" component={FAQS} />
-    <Route name="front-page" exact path="/" component={FrontPageContainer} />
-    <Route name="api-key" exact path="/keygen" component={APIKey} />
-    <Route name="dataset" path="/datasets" component={Dataset} />
-    <Route name="search" path="/search" component={SearchRoutes} />
-    <Route name="admin" path="/admin" component={Admin} />
-    <Route name="error" path="/error" component={ErrorRoute} />
-    <Route name="pet-landing" path="/pet" component={PETRedirect} />
-    <Route name="citation" path="/cite" component={Citation} />
+    <Route exact path="/faq" component={FAQS} />
+    <Route exact path="/" component={FrontPageContainer} />
+    <Route exact path="/keygen" component={APIKey} />
+    <Route path="/datasets" component={Dataset} />
+    <Route path="/search" component={SearchRoutes} />
+    <Route path="/admin" component={Admin} />
+    <Route path="/error" component={ErrorRoute} />
+    <Route path="/pet" component={PETRedirect} />
+    <Route path="/cite" component={Citation} />
     <Redirect from="/public" to="/search" />
     <Redirect from="/saved" to="/search?bookmarks" />
     <Redirect from="/dashboard" to="/search?mydatasets" />

package/src/scripts/refactor_2021/uploader/uploader-setup-routes.jsx

@@ -14,30 +14,10 @@ const UploaderSetupRoutes = props => (
     <div className="tasks-col fade-in">
       <div id="upload-tabs" className="uploader">
         <Switch location={props.location}>
-          <Route
-            name="upload-select"
-            path="/upload"
-            exact
-            component={UploadSelect}
-          />
-          <Route
-            name="upload-issues"
-            path="/upload/issues"
-            exact
-            component={UploadIssues}
-          />
-          <Route
-            name="upload-metadata"
-            path="/upload/metadata"
-            exact
-            component={UploadMetadata}
-          />
-          <Route
-            name="upload-disclaimer"
-            path="/upload/disclaimer"
-            exact
-            component={UploadDisclaimer}
-          />
+          <Route path="/upload" exact component={UploadSelect} />
+          <Route path="/upload/issues" exact component={UploadIssues} />
+          <Route path="/upload/metadata" exact component={UploadMetadata} />
+          <Route path="/upload/disclaimer" exact component={UploadDisclaimer} />
         </Switch>
       </div>
     </div>

package/src/scripts/refactor_2021/uploader/uploader-status-routes.jsx

@@ -9,12 +9,7 @@ const UploaderStatusRoutes = props => (
     <div className="tasks-col fade-in">
       <div id="upload-tabs" className="uploader">
         <Switch location={props.location}>
-          <Route
-            name="upload-status"
-            path="/upload"
-            exact
-            component={UploadStatus}
-          />
+          <Route path="/upload" exact component={UploadStatus} />
         </Switch>
       </div>
     </div>

package/src/scripts/common/forms/__tests__/__snapshots__/input.spec.jsx.snap

@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`common/forms/Input renders successfully 1`] = `
-<div
-  className="form-group float-label-input "
->
-  <label />
-  <input
-    onChange={[Function]}
-    value="test-value"
-  />
-</div>
-`;

package/src/scripts/common/forms/__tests__/input.spec.jsx

@@ -1,25 +0,0 @@
-import React from 'react'
-import { shallow, mount } from 'enzyme'
-import Input from '../input'
-
-describe('common/forms/Input', () => {
-  it('renders successfully', () => {
-    const wrapper = shallow(<Input initialValue="test-value" />)
-    expect(wrapper).toMatchSnapshot()
-  })
-  it('resets when remounted', () => {
-    const initValue = 'one'
-    const newValue = 'two'
-    const component = mount(<Input initialValue={initValue} />)
-    const input = component.find('input')
-    expect(component.state('value')).toBe(initValue)
-
-    // User types in a value
-    input.simulate('change', { target: { value: newValue } })
-    expect(component.state('value')).toBe(newValue)
-
-    // Reset by parent component (cleared)
-    component.setProps({ value: initValue })
-    expect(component.state('value')).toBe(initValue)
-  })
-})