Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
REACT_APP_CONFIG='local'
REACT_APP_CONFIG='preview'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ public/config/*
npm-debug.log*
yarn-debug.log*
yarn-error.log*

*code-workspace
4 changes: 2 additions & 2 deletions craco.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module.exports = {
*/
alias: {
'dicom-microscopy-viewer':
'dicom-microscopy-viewer/dist/dynamic-import/dicomMicroscopyViewer.min.js'
'dicom-microscopy-viewer/dynamic-import'
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the current way of writing exports in ECMAscript, so I think we should use this setup.

}
}
config.plugins.push(
Expand All @@ -48,7 +48,7 @@ module.exports = {
patterns: [
{
from: './node_modules/dicom-microscopy-viewer/dist/dynamic-import',
to: './static/js'
to: './'
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can create settings to specify the sub-path for dicom-microscopy-viewer so that this gets the right sub-path. My preference is still to use a dicom-microscopy-viewer sub path, eg
./static/js/dicom-microscopy-viewer/...
to ensure isolation between any other modules and htis one.

}
]
})
Expand Down
12 changes: 6 additions & 6 deletions public/config/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ window.config = {
write: false
}
],
oidc: {
authority: 'https://accounts.google.com',
clientId: '293449031882-k4um45hl4g94fsgbnviel0lh38836i9v.apps.googleusercontent.com',
scope: 'email profile openid https://www.googleapis.com/auth/cloud-healthcare',
grantType: 'implicit'
},
// oidc: {
// authority: 'https://accounts.google.com',
// clientId: '293449031882-k4um45hl4g94fsgbnviel0lh38836i9v.apps.googleusercontent.com',
// scope: 'email profile openid https://www.googleapis.com/auth/cloud-healthcare',
// grantType: 'implicit'
// },
disableWorklist: false,
disableAnnotationTools: false,
enableServerSelection: true,
Expand Down
Loading