update 3d viewer, and json-dataset #138
Conversation
| megasetInfo.datasets = { | ||
| [id]: { | ||
| ...topLevelJson, | ||
| image: `${datasetdirpath}/${topLevelJson.image}`, |
There was a problem hiding this comment.
built-in assumption that the image file is local to the current dataset.json file
toloudis
requested review from
pgarrison,
interim17,
ShrimpCryptid,
SeanLeRoy,
frasercl,
ascibisz and
blairlyons
| public getAvailableDatasets = () => { | ||
| return axios | ||
| .get(`${this.listOfDatasetsDoc}`) | ||
| .then((metadata: AxiosResponse) => metadata.data); | ||
| //const megasets: Megaset[] = []; | ||
| return axios.get(`${this.listOfDatasetsDoc}`).then((metadata: AxiosResponse) => { | ||
| const datadir = this.listOfDatasetsDoc.substring( | ||
| 0, | ||
| this.listOfDatasetsDoc.lastIndexOf("/") | ||
| ); | ||
|
|
||
| return Promise.all( | ||
| (metadata.data as string[]).map((datasetdir) => { |
There was a problem hiding this comment.
Both the top-level function and the argument to map could become async. By no means necessary, but would save a couple indents.
There was a problem hiding this comment.
agreed, I went ahead and fixed that
| } else { | ||
| const topLevelJson = { ...megaset } as unknown as DatasetMetaData; | ||
| const megasetInfo = { ...megaset }; | ||
| megasetInfo.title = topLevelJson.title; | ||
| megasetInfo.publications = megaset.publications || []; | ||
| megasetInfo.extra = megaset.extra || ""; | ||
| const id = `${topLevelJson.name}_v${topLevelJson.version}`; | ||
| megasetInfo.name = id; |
There was a problem hiding this comment.
This block starts with three copies of the same object (megaset, megasetInfo, topLevelJson) and copies properties between them.
- I see
megasetInfois eventually returned from here, and it looks liketopLevelJsonis there to keep an unmodified copy around to copy intomegasetInfo.datasetsbelow. Couldmegasetbe copied in directly? - Looks like the title assignment on 121 may be redundant.
- Suggestion: some of the remaining property assignments which just apply defaults could happen at assignment of
megasetInfo, e.g.
const megasetInfo = {
publications: megaset.publications || [],
extra: megaset.extra || "",
// ...
...megaset
};There was a problem hiding this comment.
I believe this is now addressed. It is much simpler now.
| @@ -90,7 +90,7 @@ class FirebaseRequest implements ImageDataset { | |||
| }); | |||
| }; | |||
|
|
|||
| public setCollectionRef = (id: string) => { | |||
| private setCollectionRef = (id: string) => { | |||
There was a problem hiding this comment.
the only substantive change in this file is to change this from public to private. The rest of the file just got auto-formatted.
Problem
Internal scientists are again requesting to use onprem datasets. So we need to make sure the json-dataset code is working. Also discovered that the current 3d viewer was out of sync and was failing to load volume data.
Solution
Update the onprem datastore.
"http://dev-aics-dtp-001.corp.alleninstitute.org/cfedata/cell-feature-data/datasets.json" ( true location is //allen/aics/animated-cell/Allen-Cell-Explorer/cell-feature-data/datasets.json ) now must hold a list of subdirectories which have datasets in the format prescribed in allen-cell-animated/cell-feature-data repo.
Currently CFE is updated to only support the "single dataset" version and megasets are not yet being handled. Most of the interesting changes are in
json-dataset/index.ts.Also issued new 3d viewer releases and updated 3d viewer version to confirm that data still loads.
This is phase 1. Phase 2 would be to add support for megasets, but it is likely that for internal use the presentation of megasets is not yet important.
Steps to Verify:
http://dev-aics-dtp-001.corp.alleninstitute.org/cell-feature-explorer/dist/index.html
now points to this branch, which loads raw datasets from the above mentioned onprem directory (the 3d image data is still in cloud)