Merge pull request #10 from smaht-dac/bm-node18-upgrade

Bm node18 upgrade

Author: Bianca-Morris

CHANGELOG.rst

@@ -7,6 +7,16 @@ smaht-portal
 Change Log
 ----------
 
+0.1.0
+=====
+`PR 10: Bm-node18-upgrade <https://github.com/smaht-dac/smaht-portal/pull/10>`_
+
+* Update Docker's MakeFile to use Node version 18.17.0
+* Update SPC to 0.1.69
+* Fix for search view error
+* Fix for auth0 bug when SPC symlinking
+
+
 0.0.9
 =====
 

Dockerfile

@@ -21,7 +21,7 @@ ENV NGINX_USER=nginx \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_DEFAULT_TIMEOUT=100 \
     NVM_VERSION=v0.39.1 \
-    NODE_VERSION=16.14.0
+    NODE_VERSION=18.17.0
 
 # Configure Python3.9 venv
 ENV VIRTUAL_ENV=/opt/venv

package-lock.json

@@ -61,7 +61,7 @@
     "@hms-dbmi-bgm/react-workflow-viz": "0.1.5",
     "@gmod/tabix": "^1.5.3",
     "@gmod/vcf": "^5.0.6",
-    "@hms-dbmi-bgm/shared-portal-components": "git+https://github.com/4dn-dcic/shared-portal-components#0.1.66",
+    "@hms-dbmi-bgm/shared-portal-components": "git+https://github.com/4dn-dcic/shared-portal-components#0.1.69",
     "auth0-lock": "^11.33.0",
     "d3": "^5.16.0",
     "date-fns": "^2.28.0",

package.json

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "encoded"
-version = "0.0.9"
+version = "0.1.0"
 description = "SMaHT Data Analysis Portal"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

pyproject.toml

@@ -139,7 +139,7 @@ export class SearchViewBody extends React.PureComponent {
 
         return (
             <div className="container-wide search-page-outer-container" id="content">
-                <CommonSearchView {...passProps} {...{ columnExtensionMap, tableColumnClassName, facetColumnClassName, facets, aboveTableComponent }}
+                <CommonSearchView {...passProps} {...{ columnExtensionMap, tableColumnClassName, facetColumnClassName, facets }}
                     renderDetailPane={null} termTransformFxn={Schemas.Term.toName} separateSingleTermFacets={false} rowHeight={90} openRowHeight={90} />
             </div>
         );

src/encoded/static/components/browse/SearchView.js

@@ -81,7 +81,10 @@ const resolve = {
 spcPackageJson = require("@hms-dbmi-bgm/shared-portal-components/package.json");
 spcPeerDependencies = spcPackageJson.peerDependencies || {};
 Object.keys(spcPeerDependencies).forEach(function(packageName) {
-    resolve.alias[packageName] = path.resolve("./node_modules/" + packageName);
+    // Make exception for auth0-lock, which seems to break in Webpack 5 if loaded from SPC peer deps
+    if (packageName !== 'auth0-lock') {
+        resolve.alias[packageName] = path.resolve("./node_modules/" + packageName);
+    }
 });
 
 // Exclusion -- higlass needs react-bootstrap 0.x but we want 1.x; can remove this line below