Merge pull request #3546 from OpenNeuroOrg/feat/update-my-datasets-sub-filters

feat/update datasetStatus Filters to include all

Author: nellh

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/search/initial-search-params.tsx

@@ -8,6 +8,7 @@ const datasetType_available = [
 ]
 
 const datasetStatus_available = [
+  { label: "All", value: "All" },
   { label: "Public", value: "Public" },
   { label: "Shared with Me", value: "Shared with Me" },
   { label: "Invalid", value: "Invalid" },
@@ -172,7 +173,7 @@ const initialSearchParams: SearchParams = {
   datasetType_available,
   datasetType_selected: "All Public",
   datasetStatus_available,
-  datasetStatus_selected: null,
+  datasetStatus_selected: "All",
   modality_available,
   modality_selected: null,
   ageRange: [null, null],

packages/openneuro-server/src/graphql/resolvers/dataset-search.ts

@@ -164,29 +164,31 @@ const parseQuery = async (query, datasetType, datasetStatus, userId) => {
       },
     }
     addClause(query, "filter", termsClause)
-
-    if (datasetStatus === "Public") {
-      addClause(query, "filter", {
-        term: {
-          public: {
-            value: true,
+    // Add logic to explicitly check for the "All" status
+    if (datasetStatus && datasetStatus !== "All") {
+      if (datasetStatus === "Public") {
+        addClause(query, "filter", {
+          term: {
+            public: {
+              value: true,
+            },
           },
-        },
-      })
-    } else if (datasetStatus === "Shared with Me") {
-      addClause(query, "filter", {
-        terms: {
-          ["permissions.userPermissions.level"]: ["ro", "rw"],
-        },
-      })
-    } else if (datasetStatus === "Invalid") {
-      addClause(query, "filter", {
-        range: {
-          "latestSnapshot.validation.errors": {
-            gt: 0,
+        })
+      } else if (datasetStatus === "Shared with Me") {
+        addClause(query, "filter", {
+          terms: {
+            ["permissions.userPermissions.level"]: ["ro", "rw"],
           },
-        },
-      })
+        })
+      } else if (datasetStatus === "Invalid") {
+        addClause(query, "filter", {
+          range: {
+            "latestSnapshot.validation.errors": {
+              gt: 0,
+            },
+          },
+        })
+      }
     }
   }
   return query