diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js index 285f1cdcd1e2c4e9425d6644234ea565350a30a7..54e60dfef04f9ffa7a28864093f4eacbe9de39b7 100644 --- a/deploy/datasets/query.js +++ b/deploy/datasets/query.js @@ -59,7 +59,7 @@ const fetchDatasetFromKg = async ({ user } = {}) => { const { releasedOnly, option } = await getUserKGRequestParam({ user }) return await new Promise((resolve, reject) => { - request(`${KG_QUERY_DATASETS_URL}${releasedOnly ? '&databaseScope=RELEASED' : ''}`, option, (err, resp, body) => { + request(`${KG_QUERY_DATASETS_URL}${releasedOnly ? '&databaseScope=RELEASED' : '&databaseScope=INFERRED'}`, option, (err, resp, body) => { if (err) return reject(err) if (resp.statusCode >= 400) return reject(resp.statusCode) try { @@ -108,8 +108,11 @@ const getPublicDs = async () => { throw `cached Data not yet resolved, neither is get public ds defined` } - -const getDs = ({ user }) => (user +/** + * force get only public ds + * getting individual ds is too slow + */ +const getDs = ({ user }) => (false && user ? fetchDatasetFromKg({ user }).then(({ results }) => results) : getPublicDs() ).then(async datasets => { diff --git a/deploy/datasets/util.js b/deploy/datasets/util.js index c5487ed6dfd5458a46d28dd32845b87b6d68becf..229b03891d1c0b498d734d017655d6a7127ad892 100644 --- a/deploy/datasets/util.js +++ b/deploy/datasets/util.js @@ -21,8 +21,9 @@ const getUserKGRequestParam = async ({ user }) => { let publicAccessToken /** * n.b. ACCESS_TOKEN env var is usually only set during dev + * user.type any other than 'hbp-oidc' (v1 of oidc) will result in timeout/error */ - const accessToken = (user && user.tokenset && user.tokenset.access_token) || process.env.ACCESS_TOKEN + const accessToken = (user && user.type === 'hbp-oidc' && user.tokenset && user.tokenset.access_token) || process.env.ACCESS_TOKEN const releasedOnly = !accessToken if (!accessToken && getPublicAccessToken) { publicAccessToken = await getPublicAccessToken() diff --git a/docs/releases/v2.3.3.md b/docs/releases/v2.3.3.md new file mode 100644 index 0000000000000000000000000000000000000000..44895d21955db7a6edf5ea844114f825b4ad40d5 --- /dev/null +++ b/docs/releases/v2.3.3.md @@ -0,0 +1,5 @@ +# v2.3.3 + +## Bugfixes + +- fix bug where fetching of regional features does not complete for logged in users (#826). (the viewer will only fetch released datasets) \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 92408b0da9ad0e4e3025067d0fecf10fa48bc38e..7afc5fcad58f0eb98bcaf8114adbc1a9979135ba 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -40,6 +40,7 @@ pages: - Fetching datasets: 'advanced/datasets.md' - Display non-atlas volumes: 'advanced/otherVolumes.md' - Release notes: + - v2.3.3: 'releases/v2.3.3.md' - v2.3.2: 'releases/v2.3.2.md' - v2.3.1: 'releases/v2.3.1.md' - v2.3.0: 'releases/v2.3.0.md' diff --git a/package.json b/package.json index f6c13d3a2d61e9bd4de301b57d435134d9943dfd..128ee791f7b86d518f1ad40394a5cf86ed77815c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "interactive-viewer", - "version": "2.3.2", + "version": "2.3.3", "description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular.io", "scripts": { "dev-server-export": "webpack-dev-server --config webpack.export.js",