From 8b63b4440a715fbaf2d603314b5455e05f45a810 Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Mon, 28 Sep 2020 09:59:07 -0400
Subject: [PATCH] Export itemViewWidget.

---
 CHANGELOG.md                                  |  2 ++
 .../web_client/views/index.js                 |  4 ++-
 .../web_client/views/itemView.js              | 26 ++----------------
 .../web_client/views/itemViewWidget.js        | 27 +++++++++++++++++++
 tox.ini                                       |  2 +-
 5 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 girder/girder_large_image/web_client/views/itemViewWidget.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e65c63422..282c75aef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,14 @@
 
 ### Features
 - Added bioformats tile source (#463)
+- Handle OME Tiff files with sub-ifd images (#469)
 
 ### Improvements
 - Expose more internal metadata (#479)
 - Improve how Philips XML internal metadata is reported (#475)
 - Show aperio version in internal metadata (#474)
 - Add css classes to metadata on the item page (#472)
+- The Girder web client exports the ItemViewWidget
 
 ### Bug Fixes
 - Add a reference to updated time to avoid overcaching associated images (#477)
diff --git a/girder/girder_large_image/web_client/views/index.js b/girder/girder_large_image/web_client/views/index.js
index 307ab8c43..7dd0a17d7 100644
--- a/girder/girder_large_image/web_client/views/index.js
+++ b/girder/girder_large_image/web_client/views/index.js
@@ -1,9 +1,11 @@
 import ConfigView from './configView';
 import ImageViewerSelectWidget from './imageViewerSelectWidget';
 import * as imageViewerWidget from './imageViewerWidget';
+import ItemViewWidget from './itemViewWidget';
 
 export {
     ConfigView,
     ImageViewerSelectWidget,
-    imageViewerWidget
+    imageViewerWidget,
+    ItemViewWidget
 };
diff --git a/girder/girder_large_image/web_client/views/itemView.js b/girder/girder_large_image/web_client/views/itemView.js
index 45ee9933f..ecc96b721 100644
--- a/girder/girder_large_image/web_client/views/itemView.js
+++ b/girder/girder_large_image/web_client/views/itemView.js
@@ -1,13 +1,11 @@
 import $ from 'jquery';
-import yaml from 'js-yaml';
 import { AccessType } from '@girder/core/constants';
-import { restRequest, getApiRoot } from '@girder/core/rest';
+import { restRequest } from '@girder/core/rest';
 import { wrap } from '@girder/core/utilities/PluginUtils';
 import ItemView from '@girder/core/views/body/ItemView';
-import View from '@girder/core/views/View';
 
 import largeImageConfig from './configView';
-import itemViewWidget from '../templates/itemView.pug';
+import ItemViewWidget from './itemViewWidget';
 import '../stylesheets/itemView.styl';
 
 wrap(ItemView, 'render', function (render) {
@@ -53,23 +51,3 @@ wrap(ItemView, 'render', function (render) {
     }, this);
     render.call(this);
 });
-
-var ItemViewWidget = View.extend({
-    initialize: function (settings) {
-        this.itemId = settings.imageModel.id;
-        this.model = settings.imageModel;
-        this.extra = settings.extra;
-        this.metadata = settings.metadata;
-    },
-
-    render: function () {
-        this.$el.html(itemViewWidget({
-            extra: this.extra,
-            updated: this.model.get('updated'),
-            largeImageMetadata: this.metadata,
-            yaml: yaml,
-            imageUrl: `${getApiRoot()}/item/${this.itemId}/tiles/images/`
-        }));
-        return this;
-    }
-});
diff --git a/girder/girder_large_image/web_client/views/itemViewWidget.js b/girder/girder_large_image/web_client/views/itemViewWidget.js
new file mode 100644
index 000000000..faad17d9c
--- /dev/null
+++ b/girder/girder_large_image/web_client/views/itemViewWidget.js
@@ -0,0 +1,27 @@
+import yaml from 'js-yaml';
+import { getApiRoot } from '@girder/core/rest';
+import View from '@girder/core/views/View';
+
+import itemViewWidgetTemplate from '../templates/itemView.pug';
+
+var ItemViewWidget = View.extend({
+    initialize: function (settings) {
+        this.itemId = settings.imageModel.id;
+        this.model = settings.imageModel;
+        this.extra = settings.extra;
+        this.metadata = settings.metadata;
+    },
+
+    render: function () {
+        this.$el.html(itemViewWidgetTemplate({
+            extra: this.extra,
+            updated: this.model.get('updated'),
+            largeImageMetadata: this.metadata,
+            yaml: yaml,
+            imageUrl: `${getApiRoot()}/item/${this.itemId}/tiles/images/`
+        }));
+        return this;
+    }
+});
+
+export default ItemViewWidget;
diff --git a/tox.ini b/tox.ini
index c18dc4852..068b71714 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ deps =
   pytest-girder>=3.0.4; python_version >= '3.6'
   pytest-girder>=3.0.4,<3.1; python_version < '3.6'
   pytest-xdist
-  celery!=4.4.4
+  celery!=4.4.4,<5
 # celery 4.4.4 is broken; avoid it until a new version is released
 whitelist_externals =
   rm