@openneuro/app 4.2.0 → 4.2.1

package/src/scripts/{datalad → refactor_2021/dataset}/download/__tests__/__snapshots__/shell-example.spec.jsx.snap

@@ -1,7 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`dataset/download/ShellExample renders successfully 1`] = `
-<ContextConsumer>
-  <Component />
-</ContextConsumer>
+<Fragment>
+  <Noop />
+  <pre
+    className="css-xak41w"
+  />
+</Fragment>
 `;

package/src/scripts/refactor_2021/dataset/files/file-tree.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import File from './file.jsx'
 import UpdateFile from '../mutations/update-file.jsx'
@@ -41,13 +41,14 @@ const FileTree = ({
             <UpdateFile
               datasetId={datasetId}
               path={unescapePath(path)}
+              tooltip={`Choose one or more files to be added to ${name}.`}
               multiple>
               <i className="fa fa-plus" /> Add Files
             </UpdateFile>
             <UpdateFile
               datasetId={datasetId}
               path={unescapePath(path)}
-              tooltip={`Choose a folder to be added to /${name}. Adding a folder with an existing name will overwrite that folder.`}
+              tooltip={`Choose a folder to be added to ${name}. Adding a folder with an existing name will overwrite that folder.`}
               directory>
               <i className="fa fa-plus" /> Add Directory
             </UpdateFile>

package/src/scripts/refactor_2021/dataset/fragments/__tests__/__snapshots__/cancel-button.spec.tsx.snap

@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CancelButton component renders with default props 1`] = `
+<Button
+  className="description-btn description-button-cancel"
+  icon="fas fa-times"
+  label="Cancel"
+  onClick={[Function]}
+/>
+`;

package/src/scripts/refactor_2021/dataset/fragments/__tests__/__snapshots__/edit-button.spec.tsx.snap

@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EditButton component renders with default props 1`] = `
+<Button
+  className="description-btn description-button-edit"
+  icon="fas fa-edit"
+  label="Edit"
+  onClick={[Function]}
+/>
+`;

package/src/scripts/refactor_2021/dataset/fragments/__tests__/__snapshots__/edit-list.spec.jsx.snap

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EditList component renders with default props 1`] = `
+<DocumentFragment>
+  <div
+    class="edit-list-group"
+  >
+    <input
+      class="form-control"
+      type="text"
+      value=""
+    />
+    <button
+      aria-label="Add"
+      class="on-button on-button--small on-button--primary  edit-list-add"
+      role="button"
+      type="button"
+    >
+      Add
+    </button>
+  </div>
+  <div />
+</DocumentFragment>
+`;

package/src/scripts/refactor_2021/dataset/fragments/__tests__/__snapshots__/save-button.spec.tsx.snap

@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SaveButton component renders with default props 1`] = `
+<Button
+  className="description-btn description-button-save"
+  icon="fas fa-check"
+  label="Save"
+  onClick={[Function]}
+/>
+`;

package/src/scripts/{datalad/fragments/__tests__/cancel-button.spec.jsx → refactor_2021/dataset/fragments/__tests__/cancel-button.spec.tsx}

@@ -1,10 +1,10 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import CancelButton from '../cancel-button.jsx'
+import { CancelButton } from '../cancel-button'
 
 describe('CancelButton component', () => {
   it('renders with default props', () => {
-    const wrapper = shallow(<CancelButton />)
+    const wrapper = shallow(<CancelButton action={() => {}} />)
     expect(wrapper).toMatchSnapshot()
   })
 })

package/src/scripts/{datalad/fragments/__tests__/edit-button.spec.jsx → refactor_2021/dataset/fragments/__tests__/edit-button.spec.tsx}

@@ -1,10 +1,10 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import EditButton from '../edit-button.jsx'
+import { EditButton } from '../edit-button'
 
 describe('EditButton component', () => {
   it('renders with default props', () => {
-    const wrapper = shallow(<EditButton />)
+    const wrapper = shallow(<EditButton action={() => {}} />)
     expect(wrapper).toMatchSnapshot()
   })
 })

package/src/scripts/refactor_2021/dataset/fragments/__tests__/edit-list.spec.jsx

@@ -0,0 +1,27 @@
+import React from 'react'
+import { render, fireEvent, screen } from '@testing-library/react'
+import EditList from '../edit-list.jsx'
+
+// Mount is used because enzyme does not yet support hooks
+describe('EditList component', () => {
+  it('renders with default props', () => {
+    const { asFragment } = render(<EditList />)
+    expect(asFragment()).toMatchSnapshot()
+  })
+  it('calls setElements when an item is added', () => {
+    const testText = 'this is a test entry'
+    const setElements = jest.fn()
+    render(<EditList setElements={setElements} />)
+    fireEvent.change(screen.getByRole('textbox'), {
+      target: { value: testText },
+    })
+    fireEvent.click(screen.getByLabelText('Add'))
+    // Added an empty string to an empty list
+    expect(setElements).toHaveBeenCalledWith([testText])
+  })
+  it('renders any elements', () => {
+    render(<EditList elements={['One', 'Two']} />)
+    expect(screen.getByText('One')).toBeVisible()
+    expect(screen.getByText('Two')).toBeVisible()
+  })
+})

package/src/scripts/{datalad/fragments/__tests__/save-button.spec.jsx → refactor_2021/dataset/fragments/__tests__/save-button.spec.tsx}

@@ -1,10 +1,10 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import SaveButton from '../edit-button.jsx'
+import { SaveButton } from '../save-button'
 
 describe('SaveButton component', () => {
   it('renders with default props', () => {
-    const wrapper = shallow(<SaveButton />)
+    const wrapper = shallow(<SaveButton action={() => {}} />)
     expect(wrapper).toMatchSnapshot()
   })
 })

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

@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DeleteDataset mutation renders with common props 1`] = `
+<DocumentFragment>
+  <span>
+    <button
+      class="on-button on-button--primary on-button--small"
+    >
+      <i
+        class="fa fa-trash"
+      />
+       Delete Dataset
+    </button>
+  </span>
+</DocumentFragment>
+`;
+
+exports[`DeleteDir mutation renders with common props 1`] = `
+<DocumentFragment>
+  <span
+    class="delete-file"
+  >
+    <div
+      class="warn-btn edit-file"
+    >
+      <span
+        class=" "
+        data-flow="up"
+        data-tooltip="Delete undefined"
+      >
+        <span
+          class="warn-btn-click"
+        >
+          <button
+            aria-label=""
+            class="on-button on-button--medium on-button--default  btn-warn-component"
+            role="button"
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              class="fa fa-trash css-1qxtz39"
+            />
+          </button>
+        </span>
+      </span>
+    </div>
+  </span>
+</DocumentFragment>
+`;

package/src/scripts/refactor_2021/dataset/mutations/__tests__/__snapshots__/update-permissions.spec.jsx.snap

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UpdateDatasetPermissions mutation renders with default props 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Share"
+    class="on-button on-button--small on-button--primary  btn-modal-action"
+    role="button"
+    type="button"
+  >
+    Share
+  </button>
+</DocumentFragment>
+`;
+
+exports[`UpdateDatasetPermissions mutation renders with typical props 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Share"
+    class="on-button on-button--small on-button--primary  btn-modal-action"
+    role="button"
+    type="button"
+  >
+    Share
+  </button>
+</DocumentFragment>
+`;

package/src/scripts/{datalad → refactor_2021/dataset}/mutations/__tests__/delete.spec.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { render, waitFor, fireEvent } from '@testing-library/react'
+import { render, fireEvent, screen } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import DeleteDataset, { DELETE_DATASET } from '../delete.jsx'
 import DeleteDir, { DELETE_FILES } from '../delete-dir.jsx'
@@ -35,18 +35,18 @@ const deleteDirMock = {
 
 describe('DeleteDataset mutation', () => {
   it('renders with common props', () => {
-    const wrapper = render(
+    const { asFragment } = render(
       <MockedProvider mocks={[deleteDatasetMock]} addTypename={false}>
         <DeleteDataset datasetId="ds001" />
       </MockedProvider>,
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
 })
 
 describe('DeleteDir mutation', () => {
   it('renders with common props', () => {
-    const wrapper = render(
+    const { asFragment } = render(
       <MockedProvider mocks={[deleteDirMock]} addTypename={false}>
         <DeleteDir
           datasetId="ds002"
@@ -58,19 +58,19 @@ describe('DeleteDir mutation', () => {
         />
       </MockedProvider>,
     )
-    expect(wrapper).toMatchSnapshot()
+    expect(asFragment()).toMatchSnapshot()
   })
   it('fires the correct mutation', async done => {
-    const { container } = render(
+    render(
       <MockedProvider mocks={[deleteDirMock]} addTypename={false}>
         <DeleteDir {...{ datasetId, path }} />
       </MockedProvider>,
     )
 
     // click "Delete" button
-    fireEvent.click(container.querySelector('button.warning'))
+    fireEvent.click(screen.getByRole('button'))
     // confirm delete
-    fireEvent.click(container.querySelector('button.success'))
+    fireEvent.click(screen.getByLabelText('confirm'))
 
     expect(deleteDirMock.newData).toHaveBeenCalled()
     done()

package/src/scripts/{datalad/mutations/__tests__/remove-permissions.spec.jsx → refactor_2021/dataset/mutations/__tests__/remove-permissions.spec.tsx}

@@ -1,4 +1,4 @@
-import { userPermissionsFilter } from '../remove-permissions.jsx'
+import { userPermissionsFilter } from '../remove-permissions'
 
 describe('RemovePermissions mutation', () => {
   describe('userPermissionsFilter()', () => {

package/src/scripts/refactor_2021/dataset/mutations/__tests__/update-permissions.spec.jsx

@@ -0,0 +1,28 @@
+import React from 'react'
+import { render } from '@testing-library/react'
+import { MockedProvider } from '@apollo/client/testing'
+import { UpdateDatasetPermissions } from '../update-permissions'
+
+describe('UpdateDatasetPermissions mutation', () => {
+  it('renders with default props', () => {
+    const { asFragment } = render(
+      <MockedProvider>
+        <UpdateDatasetPermissions />
+      </MockedProvider>,
+    )
+    expect(asFragment()).toMatchSnapshot()
+  })
+  it('renders with typical props', () => {
+    const { asFragment } = render(
+      <MockedProvider>
+        <UpdateDatasetPermissions
+          datasetId="ds000005"
+          userEmail="test@example.com"
+          access="ro"
+          done={jest.fn()}
+        />
+      </MockedProvider>,
+    )
+    expect(asFragment()).toMatchSnapshot()
+  })
+})

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

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import UploaderContext from '../../uploader/uploader-context.js'
-import Tooltip from '../../../common/partials/tooltip.jsx'
+import { Tooltip } from '@openneuro/components/tooltip'
 
 const UpdateFile = ({
   datasetId,
@@ -30,8 +30,8 @@ const UpdateFile = ({
               webkitdirectory={directory && 'true'}
               multiple={multiple && true}
             />
+            {children}
           </Tooltip>
-          {children}
         </div>
       )}
     </UploaderContext.Consumer>

package/src/scripts/refactor_2021/routes.tsx

@@ -15,7 +15,7 @@ import { PETRedirect } from '../pet/redirect'
 import Citation from '../pages/citation-page'
 import FourOFourPage from '../errors/404page'
 
-const Routes = () => (
+const Routes: React.VoidFunctionComponent = () => (
   <Switch>
     <Route name="faq" exact path="/faq" component={FAQS} />
     <Route name="front-page" exact path="/" component={FrontPageContainer} />

package/src/scripts/refactor_2021/search/initial-search-params.tsx

@@ -108,7 +108,7 @@ export const flattenedModalities = modality_available.reduce(
   [] as ModalityOption[],
 )
 
-export const gender_list = [
+export const sex_list = [
   { label: 'All', value: 'All' },
   { label: 'Male', value: 'Male' },
   { label: 'Female', value: 'Female' },
@@ -139,8 +139,8 @@ export interface SearchParams {
   tasks: string[]
   authors: string[]
   // more
-  gender_available: string[]
-  gender_selected: string | null
+  sex_available: string[]
+  sex_selected: string | null
   date_available: string[]
   date_selected: string | null
   species_available: string[]
@@ -175,8 +175,8 @@ const initialSearchParams: SearchParams = {
   tasks: [],
   authors: [],
   // more
-  gender_available: [],
-  gender_selected: null,
+  sex_available: [],
+  sex_selected: null,
   date_available: [],
   date_selected: null,
   species_available: [],
@@ -216,8 +216,8 @@ const TEMPORARY_initialSearchParams: SearchParams = {
   tasks: [],
   authors: [],
   // more
-  gender_available: ['All', 'Male', 'Female'],
-  gender_selected: 'All',
+  sex_available: ['All', 'Male', 'Female'],
+  sex_selected: 'All',
   date_available: [
     'All Time',
     'Last 30 days',

package/src/scripts/refactor_2021/search/inputs/index.ts

@@ -7,7 +7,7 @@ import SubjectCountRangeInput from './subject-count-range-input'
 import DiagnosisSelect from './diagnosis-select'
 import TaskInput from './task-input'
 import AuthorInput from './author-input'
-import GenderRadios from './gender-radios'
+import SexRadios from './sex-radios'
 import DateRadios from './date-radios'
 import SpeciesSelect from './species-select'
 import SectionSelect from './section-select'
@@ -29,7 +29,7 @@ export {
   DiagnosisSelect,
   TaskInput,
   AuthorInput,
-  GenderRadios,
+  SexRadios,
   DateRadios,
   SpeciesSelect,
   SectionSelect,

package/src/scripts/refactor_2021/search/inputs/{gender-radios.tsx → sex-radios.tsx}

@@ -3,29 +3,29 @@ import { SearchParamsCtx } from '../search-params-ctx'
 import { FacetRadio } from '@openneuro/components/facets'
 import { AccordionTab, AccordionWrap } from '@openneuro/components/accordion'
 
-const GenderRadios: FC = () => {
+const SexRadios: FC = () => {
   const { searchParams, setSearchParams } = useContext(SearchParamsCtx)
 
-  const { gender_available, gender_selected } = searchParams
-  const setGender = gender_selected =>
+  const { sex_available, sex_selected } = searchParams
+  const setSex = sex_selected =>
     setSearchParams(prevState => ({
       ...prevState,
-      gender_selected,
+      sex_selected,
     }))
 
   return (
     <AccordionWrap className="facet-accordion">
-      <AccordionTab startOpen={false} label="Gender" accordionStyle="plain">
+      <AccordionTab startOpen={false} label="Sex" accordionStyle="plain">
         <FacetRadio
-          selected={gender_selected}
-          setSelected={setGender}
-          radioArr={gender_available}
+          selected={sex_selected}
+          setSelected={setSex}
+          radioArr={sex_available}
           layout="row"
-          name="Gender"
+          name="Sex"
         />
       </AccordionTab>
     </AccordionWrap>
   )
 }
 
-export default GenderRadios
+export default SexRadios

package/src/scripts/refactor_2021/search/search-container.tsx

@@ -20,7 +20,7 @@ import {
   DiagnosisSelect,
   TaskInput,
   AuthorInput,
-  GenderRadios,
+  SexRadios,
   DateRadios,
   SpeciesSelect,
   SectionSelect,
@@ -173,7 +173,7 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
             <DiagnosisSelect />
             <TaskInput />
             <AuthorInput />
-            <GenderRadios />
+            <SexRadios />
             <DateRadios />
             <SpeciesSelect />
             <SectionSelect />

package/src/scripts/refactor_2021/search/search-params-ctx.tsx

@@ -36,7 +36,7 @@ export const removeFilterItem = setSearchParams => (param, value) => {
     case 'datasetStatus_selected':
     case 'ageRange':
     case 'subjectCountRange':
-    case 'gender_selected':
+    case 'sex_selected':
     case 'date_selected':
     case 'diagnosis_selected':
     case 'section_selected':
@@ -85,7 +85,7 @@ export const getSelectParams = ({
   ageRange,
   subjectCountRange,
   authors,
-  gender_selected,
+  sex_selected,
   date_selected,
   tasks,
   diagnosis_selected,
@@ -106,7 +106,7 @@ export const getSelectParams = ({
   ageRange,
   subjectCountRange,
   authors,
-  gender_selected,
+  sex_selected,
   date_selected,
   tasks,
   diagnosis_selected,

package/src/scripts/refactor_2021/search/use-search-results.tsx

@@ -136,7 +136,7 @@ export const useSearchResults = () => {
     diagnosis_selected,
     tasks,
     authors,
-    gender_selected,
+    sex_selected,
     date_selected,
     species_selected,
     section_selected,
@@ -237,10 +237,10 @@ export const useSearchResults = () => {
         '3',
       ),
     )
-  if (gender_selected !== 'All')
+  if (sex_selected !== 'All')
     boolQuery.addClause(
       'filter',
-      matchQuery('latestSnapshot.summary.subjectMetadata.sex', gender_selected),
+      matchQuery('latestSnapshot.summary.subjectMetadata.sex', sex_selected),
     )
   if (date_selected !== 'All Time') {
     let d: number

package/src/scripts/refactor_2021/user/api.jsx

@@ -1,19 +1,24 @@
 import React from 'react'
-import Spinner from '../../common/partials/spinner'
+import { Loading } from '@openneuro/components/loading'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
-import crn from '../../utils/crn.js'
 import Helmet from 'react-helmet'
 import { pageTitle } from '../../resources/strings.js'
-import { AccordionTab, AccordionWrap } from '@openneuro/components/accordion'
 import { Button } from '@openneuro/components/button'
+import { config } from '../../config'
+
 /**
  * Create API Key
  *
  * Given the current user, creates an api key
  * for use with the standalone CLI
  */
-const createAPIKey = () => {
-  return crn.createAPIKey().then(res => (res && res.body ? res.body.key : null))
+export const createAPIKey = async () => {
+  const req = await fetch(`${config.api}keygen`, {
+    method: 'POST',
+    credentials: 'same-origin',
+  })
+  const res = await req.json()
+  return res?.key
 }
 
 class APIKeyGen extends React.Component {
@@ -51,7 +56,7 @@ class APIKeyGen extends React.Component {
 
   _loadingSpinner() {
     if (this.state.loading) {
-      return <Spinner active={true} />
+      return <Loading />
     } else {
       return null
     }

package/src/sass/_bootstrap-compass.scss

@@ -1,9 +0,0 @@
-@function twbs-font-path($path) {
-  @return font-url($path, true);
-}
-
-@function twbs-image-path($path) {
-  @return image-url($path, true);
-}
-
-$bootstrap-sass-asset-helper: true;

package/src/sass/_bootstrap-mincer.scss

@@ -1,19 +0,0 @@
-// Mincer asset helper functions
-//
-// This must be imported into a .css.ejs.scss file.
-// Then, <% %>-interpolations will be parsed as strings by Sass, and evaluated by EJS after Sass compilation.
-
-
-@function twbs-font-path($path) {
-  // do something like following
-  // from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>"
-  // from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>"
-  // or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>"
-  @return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>";
-}
-
-@function twbs-image-path($file) {
-  @return "<%- asset_path('#{$file}') %>";
-}
-
-$bootstrap-sass-asset-helper: true;

package/src/sass/_bootstrap-sprockets.scss

@@ -1,9 +0,0 @@
-@function twbs-font-path($path) {
-  @return font-path($path);
-}
-
-@function twbs-image-path($path) {
-  @return image-path($path);
-}
-
-$bootstrap-sass-asset-helper: true;