@openneuro/app 4.2.0 → 4.2.4

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;

package/src/sass/_bootstrap.scss

@@ -1,50 +0,0 @@
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-@import "bootstrap/print";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/grid";
-@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/button-groups";
-@import "bootstrap/input-groups";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
-@import "bootstrap/jumbotron";
-@import "bootstrap/thumbnails";
-@import "bootstrap/alerts";
-@import "bootstrap/progress-bars";
-@import "bootstrap/media";
-@import "bootstrap/list-group";
-@import "bootstrap/panels";
-@import "bootstrap/responsive-embed";
-@import "bootstrap/wells";
-@import "bootstrap/close";
-
-// Components w/ JavaScript
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-@import "bootstrap/carousel";
-
-// Utility classes
-@import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
-@import "bootstrap/float-label.scss";

package/src/sass/animate/_attention-seekers/_bounce.scss

@@ -1,15 +0,0 @@
-@include keyframes(bounce) {
-	0%, 20%, 50%, 80%, 100% {@include transform(translateY(0));}
-	40% {@include transform(translateY(-30px));}
-	60% {@include transform(translateY(-15px));}
-}
-
-@mixin bounce($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(bounce);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_flash.scss

@@ -1,14 +0,0 @@
-@include keyframes(flash) {
-	0%, 50%, 100% {opacity: 1;}
-	25%, 75% {opacity: 0;}
-}
-
-@mixin flash($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(flash);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_pulse.scss

@@ -1,17 +0,0 @@
-// originally authored by Nick Pettit - https://github.com/nickpettit/glide
-
-@include keyframes(pulse) {
-	  0% {@include transform(scale(1));}
-   50% {@include transform(scale(1.1));}
-  100% {@include transform(scale(1));}
-}
-
-@mixin pulse($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(pulse);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_rubberBand.scss

@@ -1,19 +0,0 @@
-@include keyframes(rubberBand) {
-	  0% {@include transform(scale3d(1, 1, 1));}
-   30% {@include transform(scale3d(1.25, 0.75, 1));}
-	 40% {@include transform(scale3d(0.75, 1.25, 1));}
-	 50% {@include transform(scale3d(1.15, 0.85, 1));}
-	 65% {@include transform(scale3d(.95, 1.05, 1));}
-	 75% {@include transform(scale3d(1.05, .95, 1));}
-	100% {@include transform(scale3d(1, 1, 1));}
-}
-
-@mixin rubberBand($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(rubberBand);
-  @include count($count);
-  @include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_shake.scss

@@ -1,15 +0,0 @@
-@include keyframes(shake) {
-  0%, 100% {@include transform(translateX(0));}
-	10%, 30%, 50%, 70%, 90% {@include transform(translateX(-10px));}
-	20%, 40%, 60%, 80% {@include transform(translateX(10px));}
-}
-
-@mixin shake($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(shake);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_swing.scss

@@ -1,19 +0,0 @@
-@include keyframes(swing) {
-	20%, 40%, 60%, 80%, 100% {@include transform-origin(top center);}
-	20% {@include transform(rotate(15deg));}
-	40% {@include transform(rotate(-10deg));}
-	60% {@include transform(rotate(5deg));}
-	80% {@include transform(rotate(-5deg));}
-	100% {@include transform(rotate(0deg));}
-}
-
-@mixin swing($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include transform-origin(top center);
-  @include animation-name(swing);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_tada.scss

@@ -1,17 +0,0 @@
-@include keyframes(tada) {
-	0% {@include transform(scale(1));}
-	10%, 20% {@include transform(scale(0.9) rotate(-3deg));}
-	30%, 50%, 70%, 90% {@include transform(scale(1.1) rotate(3deg));}
-	40%, 60%, 80% {@include transform(scale(1.1) rotate(-3deg));}
-	100% {@include transform(scale(1) rotate(0));}
-}
-
-@mixin tada($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(tada);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/_wobble.scss

@@ -1,21 +0,0 @@
-// originally authored by Nick Pettit - https://github.com/nickpettit/glide
-
-@include keyframes(wobble) {
-    0% {@include transform(translateX(0%));}
-   15% {@include transform(translateX(-25%) rotate(-5deg));}
-   30% {@include transform(translateX(20%) rotate(3deg));}
-   45% {@include transform(translateX(-15%) rotate(-3deg));}
-   60% {@include transform(translateX(10%) rotate(2deg));}
-   75% {@include transform(translateX(-5%) rotate(-1deg));}
-  100% {@include transform(translateX(0%));}
-}
-
-@mixin wobble($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(wobble);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_attention-seekers/attention-seekers.scss

@@ -1,12 +0,0 @@
-// INDEX OF ATTENTION SEEKERS
-
-@import 
-  "./_bounce",
-  "./_flash",
-  "./_pulse",
-  "./_rubberBand",
-  "./_shake",
-  "./_swing",
-  "./_tada",
-  "./_wobble";
-  

package/src/sass/animate/_bouncing-entrances/_bounceIn.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceIn) {
-  0% {
-    opacity: 0;
-    @include transform(scale(.3));
-  }
-  50% {
-    opacity: 1;
-    @include transform(scale(1.05));
-  }
-  70% {
-	@include transform(scale(.9));
-  }
-  100% {
-	@include transform(scale(1));
-  }
-}
-
-@mixin bounceIn($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceIn);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-entrances/_bounceInDown.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceInDown) {
-  0% {
-    opacity: 0;
-    @include transform(translateY(-2000px));
-    }
-  60% {
-    opacity: 1;
-    @include transform(translateY(30px));
-  }
-  80% {
-    @include transform(translateY(-10px));
-  }
-  100% {
-    @include transform(translateY(0));
-  }
-}
-
-@mixin bounceInDown($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceInDown);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-entrances/_bounceInLeft.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceInLeft) {
-  0% {
-    opacity: 0;
-    @include transform(translateX(-2000px));
-  }
-  60% {
-    opacity: 1;
-    @include transform(translateX(30px));
-  }
-  80% {
-    @include transform(translateX(-10px));
-  }
-  100% {
-    @include transform(translateX(0));
-  }
-}
-
-@mixin bounceInLeft($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceInLeft);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-entrances/_bounceInRight.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceInRight) {
-  0% {
-    opacity: 0;
-    @include transform(translateX(2000px));
-  }
-  60% {
-    opacity: 1;
-    @include transform(translateX(-30px));
-  }
-  80% {
-    @include transform(translateX(10px));
-  }
-  100% {
-    @include transform(translateX(0));
-  }
-}
-
-@mixin bounceInRight($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceInRight);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-entrances/_bounceInUp.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceInUp) {
-  0% {
-    opacity: 0;
-    @include transform(translateY(2000px));
-  }
-  60% {
-    opacity: 1;
-    @include transform(translateY(-30px));
-  }
-  80% {
-    @include transform(translateY(10px));
-  }
-  100% {
-    @include transform(translateY(0));
-  }
-}
-
-@mixin bounceInUp($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceInUp);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-entrances/bouncing-entrances.scss

@@ -1,9 +0,0 @@
-// INDEX OF BOUNCING ENTRANCES
-
-@import
-  "./_bounceIn",
-  "./_bounceInDown",
-  "./_bounceInLeft",
-  "./_bounceInRight",
-  "./_bounceInUp";
-  

package/src/sass/animate/_bouncing-exits/_bounceOut.scss

@@ -1,26 +0,0 @@
-@include keyframes(bounceOut) {
-  0% {
-    @include transform(scale(1));
-  }
-  25% {
-    @include transform(scale(.95));
-  }
-  50% {
-    opacity: 1;
-    @include transform(scale(1.1));
-  }
-  100% {
-    opacity: 0;
-    @include transform(scale(.3));
-  }
-}
-
-@mixin bounceOut($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceOut);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-exits/_bounceOutDown.scss

@@ -1,23 +0,0 @@
-@include keyframes(bounceOutDown) {
-  0% {
-    @include transform(translateY(0));
-  }
-  20% {
-    opacity: 1;
-    @include transform(translateY(-20px));
-  }
-  100% {
-    opacity: 0; 
-    @include transform(translateY(2000px));
-  }
-}
-
-@mixin bounceOutDown($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceOutDown);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-exits/_bounceOutLeft.scss

@@ -1,23 +0,0 @@
-@include keyframes(bounceOutLeft) {
-    0% {
-      @include transform(translateX(0));
-    }
-   20% {
-     opacity: 1;
-     @include transform(translateX(20px));
-    }
-  100% {
-    opacity: 0;
-    @include transform(translateX(-2000px));
-  }
-}
-
-@mixin bounceOutLeft($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceOutLeft);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-exits/_bounceOutRight.scss

@@ -1,23 +0,0 @@
-@include keyframes(bounceOutRight) {
-    0% {
-      @include transform(translateX(0));
-    }
-   20% {
-     opacity: 1;
-     @include transform(translateX(-20px));
-    }
-  100% {
-    opacity: 0;
-    @include transform(translateX(2000px));
-  }
-}
-
-@mixin bounceOutRight($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(bounceOutRight);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}

package/src/sass/animate/_bouncing-exits/_bounceOutUp.scss

@@ -1,23 +0,0 @@
-@include keyframes(bounceOutUp) {
-  0% {
-	  @include transform(translateY(0));
-	 }
-  20% {
-    opacity: 1;
-    @include transform(translateY(20px));
-  }
-	100% {
-  	opacity: 0;
-  	@include transform(translateY(-2000px));
-  }
-}
-
-@mixin bounceOutUp($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(bounceOutUp);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	@include visibility($visibility);
-}

package/src/sass/animate/_bouncing-exits/bouncing-exits.scss

@@ -1,4 +0,0 @@
-// INDEX OF BOUNCING EXITS
-
-@import './_bounceOut', './_bounceOutDown', './_bounceOutLeft',
-  './_bounceOutRight', './_bounceOutUp';

package/src/sass/animate/_fading-entrances/_fadeIn.scss

@@ -1,14 +0,0 @@
-@include keyframes(fadeIn) {
-	  0% {opacity: 0;}
-	100% {opacity: 1;}
-}
-
-@mixin fadeIn($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-	@include animation-name(fadeIn);
-	@include count($count);
-	@include duration($duration);
-	@include delay($delay);
-	@include function($function);
-	@include fill-mode($fill);
-	//@include visibility($visibility);
-}

package/src/sass/animate/_fading-entrances/_fadeInDown.scss

@@ -1,20 +0,0 @@
-@include keyframes(fadeInDown) {
-  0% {
-    opacity: 0;
-    @include transform(translateY(-20px));
-  }
-  100% {
-    opacity: 1;
-    @include transform(translateY(0));
-  }
-}
-
-@mixin fadeInDown($count: $countDefault, $duration: $durationDefault, $delay: $delayDefault, $function: $functionDefault, $fill: $fillDefault, $visibility: $visibilityDefault) {
-  @include animation-name(fadeInDown);
-  @include count($count);
-  @include duration($duration);
-  @include delay($delay);
-  @include function($function);
-  @include fill-mode($fill);
-  @include visibility($visibility);
-}