@openneuro/app 4.2.4 → 4.3.0-alpha.1

package/jestsetup.ts

@@ -1,7 +1,4 @@
 import React from 'react'
-// Make Enzyme functions available in all test files without importing
-import Enzyme, { shallow, render, mount } from 'enzyme'
-import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import fetch from 'jest-fetch-mock'
 import fromEntries from 'object.fromentries'
 import { jest } from '@jest/globals'
@@ -9,8 +6,6 @@ import '@testing-library/jest-dom'
 import '@testing-library/jest-dom/extend-expect'
 import './src/scripts/apm'
 
-Enzyme.configure({ adapter: new Adapter() })
-
 global.fetch = fetch
 
 if (!Object.fromEntries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/app",
-  "version": "4.2.4",
+  "version": "4.3.0-alpha.1",
   "description": "React JS web frontend for the OpenNeuro platform.",
   "license": "MIT",
   "main": "public/client.js",
@@ -19,8 +19,8 @@
     "@elastic/apm-rum": "5.9.1",
     "@emotion/react": "11.6.0",
     "@emotion/styled": "11.6.0",
-    "@openneuro/client": "^4.2.4",
-    "@openneuro/components": "^4.2.4",
+    "@openneuro/client": "^4.3.0-alpha.1",
+    "@openneuro/components": "^4.3.0-alpha.1",
     "babel-runtime": "^6.26.0",
     "bids-validator": "1.8.8",
     "bytes": "^3.0.0",
@@ -30,9 +30,9 @@
     "date-fns": "^2.16.1",
     "draft-js": "^0.11.7",
     "email-validator": "^2.0.4",
-    "enzyme-to-json": "^3.3.5",
     "express": "^4.17.1",
     "graphql": "14.7.0",
+    "history": "5.2.0",
     "jwt-decode": "^2.2.0",
     "markdown-to-jsx": "^7.1.2",
     "os-browserify": "^0.3.0",
@@ -76,15 +76,13 @@
     "@testing-library/react": "^11.1.0",
     "@types/jest": "^26.0.22",
     "@types/jsdom": "^16",
-    "@types/node": "^14.14.37",
+    "@types/node": "16.11.13",
     "@types/react": "^17.0.8",
     "@types/react-dom": "^17.0.5",
     "@types/react-router-dom": "5.1.8",
     "@types/testing-library__jest-dom": "^5.14.0",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.9.0",
-    "enzyme": "3.9.0",
     "esbuild-plugin-globals": "^0.1.1",
     "jest": "^26.6.3",
     "jest-fetch-mock": "^1.4.1",
@@ -93,16 +91,13 @@
     "rollup-plugin-polyfill-node": "^0.6.2",
     "sass": "^1.32.8",
     "stream-browserify": "^3.0.0",
-    "typescript": "4.0.6",
+    "typescript": "4.5.4",
     "vite": "2.3.1"
   },
   "jest": {
     "setupFilesAfterEnv": [
       "./jestsetup.ts"
     ],
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
       "\\.(css|less)$": "<rootDir>/__mocks__/styleMock.js",
@@ -121,5 +116,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4be2d1b7d3c1f1ebb69d469e9c986b9b5ed4af77"
+  "gitHead": "7bddf78a87c14fc36561344bf7170ee01582aa4e"
 }

package/src/scripts/common/forms/__tests__/__snapshots__/warn-button.spec.jsx.snap

@@ -1,35 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`common/forms/WarnButton renders successfully 1`] = `
-<span
-  className=""
->
-  <button
-    className="btn-warn-component warning"
-    onClick={[Function]}
+<DocumentFragment>
+  <span
+    class=""
   >
-    <i
-      className="fa fa-trash-o"
-    />
-     
-    A Button!
-  </button>
-</span>
+    <button
+      class="btn-warn-component warning"
+    >
+      <i
+        class="fa fa-trash-o"
+      />
+       A Button!
+    </button>
+  </span>
+</DocumentFragment>
 `;
 
 exports[`common/forms/WarnButton renders with warnings disable 1`] = `
-<span
-  className=""
->
-  <button
-    className="btn-warn-component warning"
-    onClick={[Function]}
+<DocumentFragment>
+  <span
+    class=""
   >
-    <i
-      className="fa fa-trash-o"
-    />
-     
-    A Button!
-  </button>
-</span>
+    <button
+      class="btn-warn-component warning"
+    >
+      <i
+        class="fa fa-trash-o"
+      />
+       A Button!
+    </button>
+  </span>
+</DocumentFragment>
 `;

package/src/scripts/common/forms/__tests__/warn-button.spec.jsx

@@ -1,14 +1,16 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render } from '@testing-library/react'
 import WarnButton from '../warn-button'
 
 describe('common/forms/WarnButton', () => {
   it('renders successfully', () => {
-    const wrapper = shallow(<WarnButton message="A Button!" />)
-    expect(wrapper).toMatchSnapshot()
+    const { asFragment } = render(<WarnButton message="A Button!" />)
+    expect(asFragment()).toMatchSnapshot()
   })
   it('renders with warnings disable', () => {
-    const wrapper = shallow(<WarnButton message="A Button!" warn={false} />)
-    expect(wrapper).toMatchSnapshot()
+    const { asFragment } = render(
+      <WarnButton message="A Button!" warn={false} />,
+    )
+    expect(asFragment()).toMatchSnapshot()
   })
 })

package/src/scripts/datalad/dataset/dataset-query-fragments.js

@@ -136,6 +136,12 @@ export const SNAPSHOT_FIELDS = gql`
     tag
     created
     readme
+    deprecated {
+      id
+      user
+      reason
+      timestamp
+    }
     description {
       Name
       Authors

package/src/scripts/datalad/subscriptions/__tests__/__snapshots__/files-subscription.spec.jsx.snap

@@ -1,161 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FilesSubscription renders with common props 1`] = `
-<Subscription
-  onSubscriptionData={[Function]}
-  subscription={
-    Object {
-      "definitions": Array [
-        Object {
-          "directives": Array [],
-          "kind": "OperationDefinition",
-          "name": Object {
-            "kind": "Name",
-            "value": "filesUpdated",
-          },
-          "operation": "subscription",
-          "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",
-                      },
-                    },
-                  },
-                ],
-                "directives": Array [],
-                "kind": "Field",
-                "name": Object {
-                  "kind": "Name",
-                  "value": "filesUpdated",
-                },
-                "selectionSet": Object {
-                  "kind": "SelectionSet",
-                  "selections": Array [
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "action",
-                      },
-                      "selectionSet": undefined,
-                    },
-                    Object {
-                      "alias": undefined,
-                      "arguments": Array [],
-                      "directives": Array [],
-                      "kind": "Field",
-                      "name": Object {
-                        "kind": "Name",
-                        "value": "payload",
-                      },
-                      "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": "filename",
-                            },
-                            "selectionSet": undefined,
-                          },
-                          Object {
-                            "alias": undefined,
-                            "arguments": Array [],
-                            "directives": Array [],
-                            "kind": "Field",
-                            "name": Object {
-                              "kind": "Name",
-                              "value": "size",
-                            },
-                            "selectionSet": undefined,
-                          },
-                          Object {
-                            "alias": undefined,
-                            "arguments": Array [],
-                            "directives": Array [],
-                            "kind": "Field",
-                            "name": Object {
-                              "kind": "Name",
-                              "value": "directory",
-                            },
-                            "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",
-                },
-              },
-            },
-          ],
-        },
-      ],
-      "kind": "Document",
-      "loc": Object {
-        "end": 196,
-        "start": 0,
-      },
-    }
-  }
-  variables={
-    Object {
-      "datasetId": "ds001",
-    }
-  }
-/>
-`;
+exports[`FilesSubscription renders with common props 1`] = `<DocumentFragment />`;

package/src/scripts/datalad/subscriptions/__tests__/files-subscription.spec.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render } from '@testing-library/react'
+import { MockedProvider } from '@apollo/client/testing'
 import FilesSubscription, {
   deleteFilesReducer,
   updateFilesReducer,
@@ -7,8 +8,10 @@ import FilesSubscription, {
 
 describe('FilesSubscription', () => {
   it('renders with common props', () => {
-    const wrapper = shallow(<FilesSubscription datasetId="ds001" />)
-    expect(wrapper).toMatchSnapshot()
+    const { asFragment } = render(<FilesSubscription datasetId="ds001" />, {
+      wrapper: MockedProvider,
+    })
+    expect(asFragment()).toMatchSnapshot()
   })
 })
 

package/src/scripts/errors/errorRoute.jsx

@@ -13,29 +13,10 @@ class ErrorRoute extends React.Component {
     return (
       <div className="container errors">
         <div className="panel">
-          <Route
-            name="orcidError"
-            path="/error/orcid"
-            component={OrcidGeneral}
-          />
-          <Route
-            name="email"
-            exact
-            path="/error/orcid/email"
-            component={OrcidEmail}
-          />
-          <Route
-            name="given"
-            exact
-            path="/error/orcid/given"
-            component={OrcidGiven}
-          />
-          <Route
-            name="family"
-            exact
-            path="/error/orcid/family"
-            component={OrcidFamily}
-          />
+          <Route path="/error/orcid" component={OrcidGeneral} />
+          <Route exact path="/error/orcid/email" component={OrcidEmail} />
+          <Route exact path="/error/orcid/given" component={OrcidGiven} />
+          <Route exact path="/error/orcid/family" component={OrcidFamily} />
         </div>
       </div>
     )