Add Contributor Request/Response Workflow and Events UI

docker-compose.yml

@@ -1,5 +1,5 @@
 # docker compose versions
-version: '2.3'
+version: "2.3"
 
 services:
   # This dummy service provides shared configuration for all Node deps
@@ -30,7 +30,7 @@ services:
       retries: 10
     ports:
       # HMR port
-      - '9992:9992'
+      - "9992:9992"
     environment:
       - NODE_ENV=development
     depends_on:
@@ -76,7 +76,7 @@ services:
   # mongodb
   mongo:
     image: docker.io/library/mongo:8
-    command: ['--replSet', 'rs0', '--bind_ip_all', '--port', '27017']
+    command: ["--replSet", "rs0", "--bind_ip_all", "--port", "27017"]
     ports:
       - 27017:27017
     healthcheck:
@@ -107,20 +107,20 @@ services:
     init: true
     command:
       [
-        'uvicorn',
-        '--host',
-        '0.0.0.0',
-        '--port',
-        '80',
-        '--reload',
-        '--factory',
-        'datalad_service.app:create_app',
-        '--workers',
-        '8',
-        '--timeout-keep-alive',
-        '30',
-        '--log-level',
-        'debug',
+        "uvicorn",
+        "--host",
+        "0.0.0.0",
+        "--port",
+        "80",
+        "--reload",
+        "--factory",
+        "datalad_service.app:create_app",
+        "--workers",
+        "8",
+        "--timeout-keep-alive",
+        "30",
+        "--log-level",
+        "debug",
       ]
     networks:
       default:
@@ -140,13 +140,13 @@ services:
     env_file: ./config.env
     init: true
     command: [
-      'taskiq',
-      'worker',
-      'datalad_service.broker:broker',
-      '--tasks-pattern',
-      'datalad_service/tasks/*.py',
-      '--fs-discover',
-      '--reload'
+      "taskiq",
+      "worker",
+      "datalad_service.broker:broker",
+      "--tasks-pattern",
+      "datalad_service/tasks/*.py",
+      "--fs-discover",
+      "--reload",
     ]
     depends_on:
       redis:
@@ -169,12 +169,12 @@ services:
     env_file: ./config.env
     init: true
     command: [
-      'taskiq',
-      'scheduler',
-      'datalad_service.broker.scheduler:scheduler',
-      '--tasks-pattern',
-      'datalad_service/tasks/*.py',
-      '--fs-discover',
+      "taskiq",
+      "scheduler",
+      "datalad_service.broker.scheduler:scheduler",
+      "--tasks-pattern",
+      "datalad_service/tasks/*.py",
+      "--fs-discover",
     ]
     depends_on:
       redis:
@@ -191,8 +191,8 @@ services:
     volumes:
       - ./nginx/nginx.dev.conf:/etc/nginx/conf.d/default.conf:ro
     ports:
-      - '8110:8110'
-      - '9876:80'
+      - "8110:8110"
+      - "9876:80"
     depends_on:
       server:
         condition: service_healthy
@@ -206,7 +206,7 @@ services:
     platform: ${ES_PLATFORM}
     environment:
       discovery.type: single-node
-      cluster.routing.allocation.disk.threshold_enabled: 'true'
+      cluster.routing.allocation.disk.threshold_enabled: "true"
       cluster.routing.allocation.disk.watermark.flood_stage: 1gb
       cluster.routing.allocation.disk.watermark.low: 10gb
       cluster.routing.allocation.disk.watermark.high: 5gb
@@ -217,10 +217,10 @@ services:
     security_opt:
       - seccomp=${SECOMP}
     healthcheck:
-      test: 'curl -s -f http://localhost:9200 || exit 1'
+      test: "curl -s -f http://localhost:9200 || exit 1"
       interval: 10s
       timeout: 5s
       retries: 3
     ports:
-      - '9200:9200'
-      - '9300:9300'
+      - "9200:9200"
+      - "9300:9300"

packages/openneuro-app/src/scripts/components/button/button.scss

@@ -10,6 +10,7 @@
   line-height: 1.4em;
 }
 
+
 .on-button--primary {
   color: #fff;
   background-color: var(--current-theme-primary);
@@ -40,6 +41,20 @@
     border-color: $on-light-green;
   }
 }
+.on-button--ghost {
+  color: $on-dark-aqua;
+  background-color: transparent;
+  text-transform: uppercase;
+  transition: background-color 0.3s;
+  box-shadow:none;
+  border: 2px solid transparent;
+  &:hover,
+  &.active {
+    background-color: transparent;
+    color: $on-dark-aqua;
+    border: 2px solid $on-dark-aqua;
+  }
+}
 
 .icon-text {
   display: flex;

packages/openneuro-app/src/scripts/dataset/comments/__tests__/__snapshots__/comment.spec.jsx.snap

@@ -12,7 +12,11 @@ exports[`Comment component > renders an ORCID user comment 1`] = `
           class="row comment-header"
         >
           By 
-          Example Exampler
+          <a
+            href="/user/1234-5678-9101"
+          >
+            Example Exampler
+          </a>
 
           <a
             href="https://sandbox.orcid.org/1234-5678-9101"
@@ -86,7 +90,11 @@ exports[`Comment component > renders an ORCID user comment 1`] = `
         class="row comment-header"
       >
         By 
-        Example Exampler
+        <a
+          href="/user/1234-5678-9101"
+        >
+          Example Exampler
+        </a>
 
         <a
           href="https://sandbox.orcid.org/1234-5678-9101"

packages/openneuro-app/src/scripts/dataset/comments/__tests__/comment.spec.jsx

@@ -1,5 +1,6 @@
 import React from "react"
 import { render } from "@testing-library/react"
+import { MemoryRouter } from "react-router-dom"
 import Comment from "../comment.jsx"
 import formatDistanceToNow from "date-fns/formatDistanceToNow"
 
@@ -14,38 +15,42 @@ describe("Comment component", () => {
     formatDistanceToNow.mockReturnValueOnce("almost 2 years")
 
     const wrapper = render(
-      <Comment
-        data={{
-          id: "9001",
-          text: emptyState,
-          user: {
-            id: "1234",
-            email: "[email protected]",
-            name: "Example Exampler",
-          },
-          createDate: new Date("2019-04-02T19:56:41.222Z").toISOString(),
-        }}
-      />,
+      <MemoryRouter>
+        <Comment
+          data={{
+            id: "9001",
+            text: emptyState,
+            user: {
+              id: "1234",
+              email: "[email protected]",
+              name: "Example Exampler",
+            },
+            createDate: new Date("2019-04-02T19:56:41.222Z").toISOString(),
+          }}
+        />
+      </MemoryRouter>,
     )
     expect(wrapper).toMatchSnapshot()
   })
   it("renders an ORCID user comment", () => {
     formatDistanceToNow.mockReturnValueOnce("almost 2 years")
 
     const wrapper = render(
-      <Comment
-        data={{
-          id: "9001",
-          text: emptyState,
-          user: {
-            id: "1234",
-            email: "[email protected]",
-            name: "Example Exampler",
-            orcid: "1234-5678-9101",
-          },
-          createDate: new Date("2019-04-02T19:56:41.222Z").toISOString(),
-        }}
-      />,
+      <MemoryRouter>
+        <Comment
+          data={{
+            id: "9001",
+            text: emptyState,
+            user: {
+              id: "1234",
+              email: "[email protected]",
+              name: "Example Exampler",
+              orcid: "1234-5678-9101",
+            },
+            createDate: new Date("2019-04-02T19:56:41.222Z").toISOString(),
+          }}
+        />
+      </MemoryRouter>,
     )
     expect(wrapper).toMatchSnapshot()
   })

packages/openneuro-app/src/scripts/dataset/components/dataset-event-admin-note.tsx

@@ -0,0 +1,28 @@
+import React from "react"
+import styles from "./scss/dataset-events.module.scss"
+
+interface AdminNoteFormProps {
+  newEvent: { note: string }
+  setNewEvent: (event: React.ChangeEvent<HTMLTextAreaElement>) => void
+  handleAddEvent: () => void
+}
+
+export const AdminNoteForm: React.FC<AdminNoteFormProps> = ({
+  newEvent,
+  setNewEvent,
+  handleAddEvent,
+}) => (
+  <div className={styles.addEventForm}>
+    <textarea
+      placeholder="Admin note"
+      value={newEvent.note}
+      onChange={setNewEvent}
+    />
+    <button
+      className="on-button on-button--small on-button--primary"
+      onClick={handleAddEvent}
+    >
+      Save Admin Note
+    </button>
+  </div>
+)