Merge pull request #236 from dbmi-bgm/pedpane-fileupload-fix-ui-1

fix for disappearing pedigree pane file upload bug
dbmi-bgm · Nov 4, 2020 · b572964 · b572964
2 parents 4f70e75 + 0a9efce
commit b572964
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "cgap-portal".
 name = "encoded"
-version = "4.1.1"
+version = "4.1.2"
 description = "Clinical Genomics Analysis Platform"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"

diff --git a/src/encoded/static/components/item-pages/CaseView/PedigreeTabView.js b/src/encoded/static/components/item-pages/CaseView/PedigreeTabView.js
@@ -212,7 +212,7 @@ export const PedigreeTabView = React.memo(function PedigreeTabView(props){
                 </h3>
             </div>
             <hr className="tab-section-title-horiz-divider"/>
-            <PedigreeTabViewBody {...pedigreeTabViewBodyProps} />
+            <PedigreeTabViewBody {...pedigreeTabViewBodyProps} {...{ schemas }} />
         </div>
     );
 });

diff --git a/src/encoded/static/components/item-pages/CaseView/PedigreeTabViewBody.js b/src/encoded/static/components/item-pages/CaseView/PedigreeTabViewBody.js
@@ -155,8 +155,9 @@ export class PedigreeTabViewBody extends React.PureComponent {
     }
 
     renderDetailPane(pedigreeVizProps){
-        const { session, href, context } = this.props;
-        return <PedigreeDetailPane {...pedigreeVizProps} {...{ session, href, context }} />;
+        const { session, href, context, schemas } = this.props;
+        const { Individual : indvSchema = null, Document: docSchema = null, Image: imageSchema = null } = schemas || {};
+        return <PedigreeDetailPane {...pedigreeVizProps} {...{ session, href, context, indvSchema, docSchema, imageSchema }} />;
     }
 
     render(){

diff --git a/src/encoded/static/components/item-pages/components/PedigreeDetailPane/Files.js b/src/encoded/static/components/item-pages/components/PedigreeDetailPane/Files.js
@@ -20,7 +20,7 @@ export class FileWrapper extends React.PureComponent {
         const { properties = {} } = indvSchema || {};
         // Isolate the field/property names of linkTos with type Document or Image
         const allProperties = _.keys(properties);
-        const relevantFields = [];
+        const relevantFields = []; // If need to bundle more properties, see https://github.com/dbmi-bgm/cgap-portal/pull/236 for potential implementation notes
 
         allProperties.forEach(function(property){
             const propertyFields = properties[property];
@@ -39,7 +39,6 @@ export class FileWrapper extends React.PureComponent {
                 relevantFields.push({ [property]: items["linkTo"] });
             }
         });
-        console.log("relevantFields", relevantFields);
         return relevantFields;
     }