Handle optional plugins and plugin order.

DigitalSlideArchive · Nov 7, 2023 · 106b714 · 106b714
1 parent b5664aa
commit 106b714
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/import_tracker/__init__.py b/import_tracker/__init__.py
@@ -251,6 +251,11 @@ class GirderPlugin(plugin.GirderPlugin):
 
     def load(self, info):
         plugin.getPlugin('jobs').load(info)
+        try:
+            import large_image_source_dicom  # noqa
+            plugin.getPlugin('dicomweb').load(info)
+        except ImportError:
+            pass
         ModelImporter.registerModel(
             'assetstoreImport', AssetstoreImport, 'import_tracker'
         )

diff --git a/import_tracker/web_client/main.js b/import_tracker/web_client/main.js
@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 import AssetstoreView from '@girder/core/views/body/AssetstoresView';
 import FilesystemImportView from '@girder/core/views/body/FilesystemImportView';
 import S3ImportView from '@girder/core/views/body/S3ImportView';
@@ -22,16 +24,23 @@ import './JobStatus';
 wrap(AssetstoreView, 'render', function (render) {
     // Call the underlying render function that we are wrapping
     render.call(this);
-
-    this.$el.find('.g-current-assetstores-container .g-body-title').after(
-        '<a class="g-view-imports btn btn-sm btn-primary" href="#assetstore/all_imports"><i class="icon-link-ext"></i>View all past Imports</a>'
-    );
-
-    // Inject new button into each assetstore
-    const assetstores = this.collection.toArray();
-    this.$('.g-assetstore-import-button-container').after(
-        (i) => importDataButton({ importsPageLink: `#assetstore/${assetstores[i].id}/imports` })
-    );
+    // defer adding buttons so optional plugins can render first.
+    window.setTimeout(() => {
+        this.$el.find('.g-current-assetstores-container .g-body-title').after(
+            '<a class="g-view-imports btn btn-sm btn-primary" href="#assetstore/all_imports"><i class="icon-link-ext"></i>View all past Imports</a>'
+        );
+
+        // Inject new button into each assetstore
+        const assetstores = this.collection;
+        this.$('.g-assetstore-import-button-container').after(
+            function () {
+                // we can't just use the index of the after call, since not
+                // all assetstores will have import buttons.
+                var assetstore = assetstores.get($(this).closest('.g-assetstore-buttons').find('[cid]').attr('cid'));
+                return importDataButton({ importsPageLink: `#assetstore/${assetstore.id}/imports` });
+            }
+        );
+    }, 0);
 });
 
 // Add duplicate_files option to Import Asset form