Merge pull request #60 from KPMP/KPMP-2010_Workflow_Type_Filter

KPMP-2010: Add Workflow Type to filter and table
KPMP · Jul 28, 2020 · 742726c · 742726c
2 parents 785269f + e2793c2
commit 742726c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/data/schema.graphql b/data/schema.graphql
@@ -5252,6 +5252,9 @@ type FileNode implements Node {
   # keyword
   experimental_strategy: String
 
+  # keyword
+  workflow_type: String
+
   # keyword
   file_name: String
 
@@ -6359,6 +6362,7 @@ type FileAggregations {
   file_autocomplete: Aggregations
   average_insert_size: NumericAggregations
   sample_id: Aggregations
+  workflow_type: Aggregations
   protocol: Aggregations
 }
 

diff --git a/src/packages/@ncigdc/modern_components/FileAggregations/FileAggregations.js b/src/packages/@ncigdc/modern_components/FileAggregations/FileAggregations.js
@@ -50,6 +50,11 @@ const presetFacets = [
     full: 'experimental_strategy',
     type: 'keyword',
   },
+  {
+    field: 'workflow_type',
+    full: 'workflow_type',
+    type: 'keyword',
+  },
   {
     field: 'data_format',
     full: 'data_format',
@@ -105,6 +110,7 @@ export type TProps = {
     data_format: { buckets: [IBucket] },
     data_type: { buckets: [IBucket] },
     experimental_strategy: { buckets: [IBucket] },
+    workflow_type: { buckets: [IBucket] },
     platform: { buckets: [IBucket] },
   },
   theme: Object,

diff --git a/src/packages/@ncigdc/modern_components/FileAggregations/FileAggregations.relay.js b/src/packages/@ncigdc/modern_components/FileAggregations/FileAggregations.relay.js
@@ -75,6 +75,12 @@ export default (Component: ReactClass<*>) =>
                         key
                       }
                     }
+                    workflow_type {
+                      buckets {
+                        doc_count
+                        key
+                      }
+                    }                    
                     data_format {
                       buckets {
                         doc_count

diff --git a/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js b/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.model.js
@@ -181,6 +181,15 @@ const filesTableModel = [
     downloadable: true,
     hidden: true,
   },
+  {
+    name: 'Workflow Type',
+    id: 'workflow_type',
+    th: () => <Th>Workflow Type</Th>,
+    td: ({ node }) => <Td>{node.workflow_type || '--'}</Td>,
+    sortable: true,
+    downloadable: true,
+    hidden: true,
+  },
   {
     name: 'Platform',
     id: 'platform',

diff --git a/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.relay.js b/src/packages/@ncigdc/modern_components/FilesTable/FilesTable.relay.js
@@ -62,6 +62,7 @@ export default (Component: ReactClass<*>) =>
                         file_size
                         access
                         data_category
+                        workflow_type
                         data_format
                         data_type
                         experimental_strategy