chore(release): publish [skip ci]

- @ohif/viewer@4.1.0
feat: expose some app internals as window.app (#1735 )
2020-05-15 18:59:23 +00:00 · 2020-05-15 14:55:54 -04:00 · 2020-05-14 14:24:17 +00:00 · 2020-05-14 16:20:23 +02:00
7 changed files with 57 additions and 16 deletions
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [4.1.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.0.0...@ohif/viewer@4.1.0) (2020-05-15)
+
+
+### Features
+
+* expose some app internals as window.app ([#1735](https://github.com/OHIF/Viewers/issues/1735)) ([63fd656](https://github.com/OHIF/Viewers/commit/63fd65690cba450721870a6222e0fb3ad71bb291))
+
+
+
+
+
+# [4.0.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.11.11...@ohif/viewer@4.0.0) (2020-05-14)
+
+
+### Bug Fixes
+
+* 🐛 Fix race condition when loading derived display sets ([#1718](https://github.com/OHIF/Viewers/issues/1718)) ([b1678ce](https://github.com/OHIF/Viewers/commit/b1678ce6399dde37a9878f45ccc7c63286d93fab)), closes [#1715](https://github.com/OHIF/Viewers/issues/1715)
+
+
+### BREAKING CHANGES
+
+* 🧨 However we start to load once the first set of metadata arrives. We need
+to wait until all series metadata is fetched.
+
+
+
+
+
 ## [3.11.11](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.11.10...@ohif/viewer@3.11.11) (2020-05-14)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.11.11",
+  "version": "4.1.0",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -71,6 +71,14 @@ let extensionManager;
 // TODO[react] Use a provider when the whole tree is React
 window.store = store;

+window.ohif = window.ohif || {};
+window.ohif.app = {
+  commandsManager,
+  hotkeysManager,
+  servicesManager,
+  extensionManager,
+};
+
 class App extends Component {
  static propTypes = {
    config: PropTypes.oneOfType([
@@ -12,7 +12,7 @@ import EmptyViewport from './EmptyViewport.js';

 const { loadAndCacheDerivedDisplaySets } = utils;

-const ViewportGrid = function(props) {
+const ViewportGrid = function (props) {
  const {
    activeViewportIndex,
    availablePlugins,
@@ -24,6 +24,7 @@ const ViewportGrid = function(props) {
    studies,
    viewportData,
    children,
+    isStudyLoaded
  } = props;

  const rowSize = 100 / numRows;
@@ -37,21 +38,23 @@ const ViewportGrid = function(props) {
  const snackbar = useSnackbarContext();

  useEffect(() => {
-    viewportData.forEach(displaySet => {
-      const promises = loadAndCacheDerivedDisplaySets(displaySet, studies);
+    if (isStudyLoaded) {
+      viewportData.forEach(displaySet => {
+        const promises = loadAndCacheDerivedDisplaySets(displaySet, studies);

-      promises.forEach(promise => {
-        promise.catch(error => {
-          snackbar.show({
-            title: 'Error loading derived display set:',
-            message: error.message,
-            type: 'error',
-            autoClose: false,
+        promises.forEach(promise => {
+          promise.catch(error => {
+            snackbar.show({
+              title: 'Error loading derived display set:',
+              message: error.message,
+              type: 'error',
+              autoClose: false,
+            });
          });
        });
      });
-    });
-  }, [studies, viewportData]);
+    }
+  }, [studies, viewportData, isStudyLoaded]);

  const getViewportPanes = () =>
    layout.viewports.map((layout, viewportIndex) => {
@@ -316,7 +316,7 @@ class Viewer extends Component {

          {/* MAIN */}
          <div className={classNames('main-content')}>
-            <ConnectedViewerMain studies={this.props.studies} />
+            <ConnectedViewerMain studies={this.props.studies} isStudyLoaded={this.props.isStudyLoaded} />
          </div>

          {/* RIGHT */}
@@ -150,6 +150,7 @@ class ViewerMain extends Component {
      <div className="ViewerMain">
        {this.state.displaySets.length && (
          <ConnectedViewportGrid
+            isStudyLoaded={this.props.isStudyLoaded}
            studies={this.props.studies}
            viewportData={viewportData}
            setViewportData={this.setViewportData}
@@ -105,7 +105,7 @@ const _showUserMessage = (queryParamApplied, message, dialog = {}) => {
    return;
  }

-  const { show: showUserMessage = () => {} } = dialog;
+  const { show: showUserMessage = () => { } } = dialog;
  showUserMessage({
    message,
  });
@@ -269,7 +269,8 @@ function ViewerRetrieveStudyData({
    const promises = Array(concurrentRequestsAllowed)
      .fill(null)
      .map(loadNextSeries);
-    await Promise.all(promises);
+
+    return await Promise.all(promises);
  };

  const loadStudies = async () => {
Author	SHA1	Message	Date
ohif-bot	f01640d009	chore(release): publish [skip ci] - @ohif/viewer@4.1.0	2020-05-15 18:59:23 +00:00
Steve Pieperanddannyrb	63fd65690c	feat: expose some app internals as window.app (#1735 ) * feat: expose some app internals as window.app This can help developers explore and access some internal functionaltiy for debugging in the console. For example, this command can download the currently viewed study: ohif.app.commandsManager.runCommand("downloadAndZip", {listOfUIDs: [window.location.href.split("/").pop()]}) TODO: collect this example and other handy functions on a wiki page Co-authored-by: dannyrb <danny.ri.brown@gmail.com> * fix: typo in window.ohif.app assignment Co-authored-by: dannyrb <danny.ri.brown@gmail.com>	2020-05-15 14:55:54 -04:00
ohif-bot	944afe4a3e	chore(release): publish [skip ci] - @ohif/viewer@4.0.0	2020-05-14 14:24:17 +00:00
Igor OctavianoandJames Petts	b1678ce639	fix: 🐛 Fix race condition when loading derived display sets (#1718 ) When we have multiple SEGs/RTSTRUCTs we intend to load the most recent by default. BREAKING CHANGE: 🧨 However we start to load once the first set of metadata arrives. We need to wait until all series metadata is fetched. ✅ Closes: #1715 Co-authored-by: James Petts <jamesapetts@gmail.com>	2020-05-14 16:20:23 +02:00