@openneuro/app 4.5.0 → 4.6.0-alpha.1

package/src/scripts/{refactor_2021/search → search}/inputs/show-datasets-radios.tsx

@@ -35,8 +35,7 @@ const ShowDatasetsRadios: FC = () => {
         className={
           datasetType_selected.replace(/\s/g, '') +
           ' btn-group-wrapper facet-radio'
-        }
-      >
+        }>
         <RadioGroup
           radioArr={datasetType_available}
           layout="btn-group"
@@ -50,8 +49,7 @@ const ShowDatasetsRadios: FC = () => {
           <AccordionTab
             accordionStyle="plain"
             label="My Datasets Status"
-            startOpen={true}
-          >
+            startOpen={true}>
             <FacetSelect
               selected={datasetStatus_selected}
               setSelected={setShowMyUploadsSelected}

package/src/scripts/{refactor_2021/search → search}/search-container.tsx

@@ -33,7 +33,7 @@ import {
   SortBySelect,
 } from './inputs'
 import FiltersBlockContainer from './filters-block-container'
-import AggregateCountsContainer from '../aggregate-queries/aggregate-counts-container'
+import AggregateCountsContainer from '../pages/front-page/aggregate-queries/aggregate-counts-container'
 import { useCookies } from 'react-cookie'
 import { useSearchResults } from './use-search-results'
 import { SearchParamsCtx } from './search-params-ctx'

package/src/scripts/{refactor_2021/search → search}/use-search-results.tsx

@@ -59,6 +59,7 @@ const searchQuery = gql`
             ages
           }
           latestSnapshot {
+            size
             summary {
               modalities
               secondaryModalities

package/src/scripts/test-utils.js

@@ -1,4 +1,4 @@
-import cookies from './refactor_2021/utils/cookies.js'
+import cookies from './utils/cookies.js'
 
 /**
  * Sets a login cookie during a test run

package/src/scripts/{refactor_2021/uploader → uploader}/file-upload.js

@@ -1,4 +1,4 @@
-import { config } from '../../config'
+import { config } from '../config'
 import { uploads } from '@openneuro/client'
 
 /**

package/src/scripts/{refactor_2021/uploader → uploader}/upload-issues.jsx

@@ -4,7 +4,7 @@ import pluralize from 'pluralize'
 import { Loading } from '@openneuro/components/loading'
 import Results from '../validation/validation-results.jsx'
 import UploaderContext from './uploader-context.js'
-import validate from '../../workers/validate'
+import validate from '../workers/validate'
 
 const UploadValidatorStatus = ({ issues, next, reset }) => {
   const errorCount = issues.errors.length

package/src/scripts/{refactor_2021/uploader → uploader}/uploader-view.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import BlockNavigation from '../../common/partials/block-navigation.jsx'
+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'

package/src/scripts/{refactor_2021/uploader → uploader}/uploader.jsx

@@ -1,4 +1,4 @@
-import { apm } from '../../apm'
+import { apm } from '../apm'
 import { toast } from 'react-toastify'
 import ToastContent from '../common/partials/toast-content.jsx'
 import React from 'react'

package/src/scripts/{refactor_2021 → utils}/user-login-modal-ctx.tsx

@@ -1,7 +1,6 @@
 import React, { createContext, useState, FC, ReactNode } from 'react'
 import { UserLoginModal } from '@openneuro/components/modal'
-import loginUrls from './authentication/loginUrls'
-import { useLocation } from 'react-router-dom'
+import loginUrls from '../authentication/loginUrls'
 
 export const UserModalOpenCtx = createContext(null)
 

package/src/scripts/{refactor_2021/validation → validation}/validation.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import ValidationStatus from './validation-status.jsx'
-import ErrorBoundary from '../../errors/errorBoundary.jsx'
+import ErrorBoundary from '../errors/errorBoundary.jsx'
 
 const Validation = ({ issues }) => (
   <>

package/src/scripts/refactor_2021/common/partials/toast-content.jsx

@@ -1,18 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ToastContent = ({ title, body, children }) => (
-  <span>
-    <h3>{title}</h3>
-    <h4>{body}</h4>
-    {children}
-  </span>
-)
-
-ToastContent.propTypes = {
-  title: PropTypes.string,
-  body: PropTypes.string,
-  children: PropTypes.node,
-}
-
-export default ToastContent

package/src/scripts/refactor_2021/dataset/dataset-routes.jsx

@@ -1,163 +0,0 @@
-import React, { useEffect } from 'react'
-import PropTypes from 'prop-types'
-import { Route, Switch } from 'react-router-dom'
-import AdminDataset from './routes/admin-datalad.jsx'
-import AdminExports from './routes/admin-exports.jsx'
-
-import SnapshotContainer from './snapshot-container'
-import DraftContainer from './draft-container'
-import DownloadDataset from './routes/download-dataset'
-import Publish from './routes/publish.jsx'
-import Share from './routes/manage-permissions.jsx'
-import Snapshot from './routes/snapshot.jsx'
-import AddMetadata from './routes/add-metadata.jsx'
-import DeletePage from './routes/delete-page'
-import { DeprecateSnapshotPage } from './routes/deprecate-snapshot-page'
-import { FileDisplay } from './files'
-
-//TODO imports
-
-const stubComponent = () => null
-
-const DatasetRoutes = ({ dataset, error }) => {
-  useEffect(() => {
-    if (error) {
-      throw error
-    }
-  }, [dataset, error])
-
-  return (
-    <Switch>
-      <Route
-        exact
-        path="/datasets/:datasetId"
-        render={() => <DraftContainer dataset={dataset} />}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/download"
-        component={() => (
-          <DownloadDataset
-            worker={dataset.worker}
-            datasetPermissions={dataset.permissions}
-          />
-        )}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/admin-datalad"
-        component={() => <AdminDataset dataset={dataset} />}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/admin-exports"
-        component={() => <AdminExports dataset={dataset} />}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/publish"
-        component={() => (
-          <Publish datasetId={dataset.id} metadata={dataset.metadata} />
-        )}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/snapshot"
-        component={() => (
-          <Snapshot
-            datasetId={dataset.id}
-            snapshots={dataset.snapshots}
-            issues={dataset.draft.issues}
-            description={dataset.draft.description}
-          />
-        )}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/share"
-        component={() => (
-          <Share
-            datasetId={dataset.id}
-            permissions={dataset.permissions}
-            reviewers={dataset.reviewers}
-          />
-        )}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/file-edit"
-        component={stubComponent}
-      />
-      <Route
-        path="/datasets/:datasetId/file-display/:filePath"
-        render={({
-          match: {
-            params: { datasetId, filePath },
-          },
-        }) => {
-          return <FileDisplay datasetId={datasetId} filePath={filePath} />
-        }}
-      />
-      {/* Snapshot routes */}
-      <Route
-        exact
-        path="/datasets/:datasetId/versions/:tag"
-        render={({
-          match: {
-            params: { tag },
-          },
-        }) => {
-          return <SnapshotContainer dataset={dataset} tag={tag} />
-        }}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/versions/:snapshotId/download"
-        component={() => (
-          <DownloadDataset
-            worker={dataset.worker}
-            datasetPermissions={dataset.permissions}
-          />
-        )}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/versions/:snapshotTag/deprecate"
-        component={() => <DeprecateSnapshotPage />}
-      />
-      <Route
-        path="/datasets/:datasetId/versions/:snapshotTag/file-display/:filePath"
-        render={({
-          match: {
-            params: { datasetId, filePath, snapshotTag },
-          },
-        }) => {
-          return (
-            <FileDisplay
-              datasetId={datasetId}
-              snapshotTag={snapshotTag}
-              filePath={filePath}
-            />
-          )
-        }}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/metadata"
-        component={() => <AddMetadata dataset={dataset} />}
-      />
-      <Route
-        exact
-        path="/datasets/:datasetId/delete"
-        component={() => <DeletePage dataset={dataset} />}
-      />
-    </Switch>
-  )
-}
-
-DatasetRoutes.propTypes = {
-  dataset: PropTypes.object,
-  error: PropTypes.object,
-}
-
-export default DatasetRoutes

package/src/scripts/refactor_2021/dataset/fragments/dataset-history.jsx

@@ -1,103 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import styled from '@emotion/styled'
-import { gql, useQuery } from '@apollo/client'
-
-import Revalidate from '../mutations/revalidate.jsx'
-import UpdateRef from '../mutations/update-ref.jsx'
-
-const GET_HISTORY = gql`
-  query getHistory($datasetId: ID!) {
-    dataset(id: $datasetId) {
-      id
-      history {
-        id
-        authorName
-        authorEmail
-        date
-        references
-        message
-      }
-      worker
-    }
-  }
-`
-
-const DatasetHistoryTable = styled.div`
-  .row {
-    line-height: 1.2em;
-  }
-  .row:nth-of-type(2n) {
-    padding-top: 1em;
-  }
-  .row:nth-of-type(2n + 1) {
-    padding-bottom: 1em;
-  }
-  .row:nth-of-type(4n),
-  .row:nth-of-type(4n + 1) {
-    background: #f4f4f4;
-  }
-`
-
-const DatasetHistory = ({ datasetId }) => {
-  const { loading, data } = useQuery(GET_HISTORY, {
-    variables: { datasetId },
-    errorPolicy: 'all',
-  })
-  if (loading) {
-    return <div className="dataset-history">Loading...</div>
-  } else {
-    return (
-      <div className="grid dataset-history">
-        <div className="col col-12">
-          <h3>Worker Assignment</h3> {data.dataset.worker}
-        </div>
-        <div className="col col-12">
-          <h3>Git History</h3>
-          <DatasetHistoryTable>
-            <div className="grid faux-table-header">
-              <h4 className="col-lg col col-4">Commit</h4>
-              <h4 className="col-lg col col-2">Date</h4>
-              <h4 className="col-lg col col-2">Author</h4>
-              <h4 className="col-lg col col-2">References</h4>
-              <h4 className="col-lg col col-2 text--right">Action</h4>
-            </div>
-            {data.dataset.history.map(commit => (
-              <React.Fragment key={commit.id}>
-                <div className="grid faux-table">
-                  <div className="commit col-lg col col-4">
-                    <label>Commit: </label>
-                    {commit.id}
-                  </div>
-                  <div className="col-lg col col-2">
-                    <label>Date: </label>
-                    {commit.date}
-                  </div>
-                  <div className="col-lg col col-2">
-                    <label>Author: </label>
-                    {commit.authorName} &lt;{commit.authorEmail}&gt;
-                  </div>
-                  <div className="col-lg col col-2">
-                    <label>References: </label>
-                    {commit.references}
-                  </div>
-                  <div className="col-lg col col-2 grid actions">
-                    <Revalidate datasetId={datasetId} revision={commit.id} />
-                    <UpdateRef datasetId={datasetId} revision={commit.id} />
-                  </div>
-                  <div className="col-lg col col-12">{commit.message}</div>
-                </div>
-              </React.Fragment>
-            ))}
-          </DatasetHistoryTable>
-        </div>
-      </div>
-    )
-  }
-}
-
-DatasetHistory.propTypes = {
-  datasetId: PropTypes.string,
-}
-
-export default DatasetHistory

package/src/scripts/refactor_2021/dataset/routes/admin-datalad.jsx

@@ -1,47 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { Link } from 'react-router-dom'
-import DatasetHistory from '../fragments/dataset-history.jsx'
-import CacheClear from '../mutations/cache-clear.jsx'
-
-const AdminDataset = ({ dataset }) => (
-  <div className="datalad-dataset-form container">
-    <div className="grid">
-      <div className="col col-12">
-        <h2>Admin: Datalad Tools</h2>
-      </div>
-      <div className="col col-12">
-        <p>
-          Delete dataset cache drops all dataset caches (snapshot index,
-          draft/snapshot file listings, current dataset description) and the
-          cache is repopulated on the next API call.
-        </p>
-        <p>
-          Reset draft head will move the draft to a given commit and rerun
-          validation.
-        </p>
-      </div>
-      <div className="col col-12">
-        <h3>Draft Head</h3> {dataset.draft.head}
-      </div>
-      <DatasetHistory datasetId={dataset.id} />
-      <hr />
-      <div className="col col-12 dataset-form-controls">
-        <div className="grid">
-          <CacheClear datasetId={dataset.id} />
-          <Link
-            className="return-link col-middle"
-            to={`/datasets/${dataset.id}`}>
-            Return to Dataset
-          </Link>
-        </div>
-      </div>
-    </div>
-  </div>
-)
-
-AdminDataset.propTypes = {
-  dataset: PropTypes.object,
-}
-
-export default AdminDataset

package/src/scripts/refactor_2021/dataset/routes/admin-exports.jsx

@@ -1,132 +0,0 @@
-// dependencies -------------------------------------------------------
-
-import React from 'react'
-import { gql, useMutation } from '@apollo/client'
-import Helmet from 'react-helmet'
-import { Link } from 'react-router-dom'
-import PropTypes from 'prop-types'
-import { reexporterLogsURL } from '../../../resources/kibana'
-import styled from '@emotion/styled'
-
-const ButtonsContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-  minWidth: '300px',
-})
-
-const NormalizedButton = styled.button({
-  margin: 0,
-  fontWeight: 400,
-  fontSize: '12pt',
-  textAlign: 'center',
-  padding: '9px 12px',
-  width: '100%',
-})
-
-const SuccessMessage = styled.p({
-  color: 'rgb(92, 184, 92)',
-})
-const InProgressMessage = styled.p({
-  color: 'orange',
-})
-const ErrorMessage = styled.p({
-  color: 'red',
-})
-
-const DividerContainer = styled.div({
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  width: '100%',
-})
-const HBar = styled.div({
-  height: '2px',
-  backgroundColor: 'lightgrey',
-  flexGrow: 1,
-})
-const DividerText = styled.p({
-  padding: '19px 1rem',
-  margin: 0,
-  fontWeight: 400,
-  fontSize: '14pt',
-  textAlign: 'center',
-})
-
-const Divider = ({ text }) => (
-  <DividerContainer>
-    <HBar />
-    <DividerText>{text}</DividerText>
-    <HBar />
-  </DividerContainer>
-)
-
-Divider.propTypes = {
-  text: PropTypes.string,
-}
-
-const REEXPORT_REMOTES = gql`
-  mutation reexportRemotes($datasetId: ID!) {
-    reexportRemotes(datasetId: $datasetId)
-  }
-`
-
-const AdminExports = ({ dataset }) => {
-  const [reexportRemotes, { data, loading, error }] =
-    useMutation(REEXPORT_REMOTES)
-  const success = data && data.reexportRemotes
-  return (
-    <>
-      <Helmet>
-        <title>Admin Dashboard - OpenNeuro</title>
-      </Helmet>
-      <div className="dataset-form container">
-        <div className="grid">
-          <div className="col col-12 grid m-t-10 m-b-20">
-            <h3>Admin: Remote Exports</h3>
-          </div>
-
-          <div className="col col-4">
-            <ButtonsContainer>
-              {loading && (
-                <InProgressMessage>Your export is starting.</InProgressMessage>
-              )}
-              {error && <ErrorMessage>An error has occurred.</ErrorMessage>}
-              {success && (
-                <SuccessMessage>Your export has begun.</SuccessMessage>
-              )}
-              <NormalizedButton
-                className="n-button on-button--primary"
-                onClick={() =>
-                  reexportRemotes({ variables: { datasetId: dataset.id } })
-                }
-              >
-                Run Export
-              </NormalizedButton>
-              <Divider text="or" />
-              <NormalizedButton
-                className="on-button on-button--nobg"
-                onClick={() => {
-                  window.open(reexporterLogsURL, '_blank')
-                }}
-              >
-                View Export Logs
-              </NormalizedButton>
-            </ButtonsContainer>
-          </div>
-          <div className="col col-12 m-t-20">
-            <Link className="return-link m-l-0 " to={`/datasets/${dataset.id}`}>
-              Return to Dataset
-            </Link>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-AdminExports.propTypes = {
-  dataset: PropTypes.object,
-}
-
-export default AdminExports