Update imports

Author: bnmajor

wsi_superpixel_guided_labeling/web_client/main.js

@@ -1,7 +1,6 @@
-import router from '@girder/histomicsui/router';
-import { registerPluginNamespace } from '@girder/core/pluginUtils';
-import { exposePluginConfig } from '@girder/core/utilities/PluginUtils';
-import girderEvents from '@girder/core/events';
+const events = girder.events;
+const { registerPluginNamespace } = girder.pluginUtils;
+const { exposePluginConfig } = girder.utilities.PluginUtils;
 
 import ActiveLearningView from './views/body/ActiveLearningView';
 import './views/itemAndFolderList';
@@ -15,6 +14,11 @@ const configRoute = `plugins/${pluginName}/config`;
 registerPluginNamespace(pluginName, WSISuperpixelGuidedLabeling);
 exposePluginConfig(pluginName, configRoute);
 
-router.route('active-learning', 'active-learning', function () {
-    girderEvents.trigger('g:navigateTo', ActiveLearningView, {});
+// g:appload.before runs after all plugin static files have been loaded
+events.on('g:appload.before', () => {
+    console.log("g:appload.before event triggered", girder);
+    const router = girder.plugins.histomicsui.router;
+    router.route('active-learning', 'active-learning', function () {
+        events.trigger('g:navigateTo', ActiveLearningView, {});
+    });
 });

wsi_superpixel_guided_labeling/web_client/views/HeaderImageView.js

@@ -1,5 +1,5 @@
-import { wrap } from '@girder/core/utilities/PluginUtils';
-import HeaderImageView from '@girder/histomicsui/views/layout/HeaderImageView.js';
+const { wrap } = girder.utilities.PluginUtils;
+const HeaderImageView = girder.plugins.histomicsui.views.layout.HeaderImageView;
 
 wrap(HeaderImageView, 'render', function (render) {
     render.call(this);

wsi_superpixel_guided_labeling/web_client/views/HeaderView.js

@@ -1,5 +1,5 @@
-import { wrap } from '@girder/core/utilities/PluginUtils';
-import HeaderView from '@girder/histomicsui/views/layout/HeaderView';
+const { wrap } = girder.utilities.PluginUtils;
+const HeaderView = girder.plugins.histomicsui.views.layout.HeaderView;
 
 wrap(HeaderView, 'render', function (render) {
     const isActiveLearning = window.location.href.includes('active-learning');

wsi_superpixel_guided_labeling/web_client/views/body/ActiveLearningView.js

@@ -1,15 +1,15 @@
-/* global $, __webpack_public_path__ */
-import View from '@girder/core/views/View';
-import { restRequest, getApiRoot } from '@girder/core/rest';
-import { confirm } from '@girder/core/dialog';
-import _ from 'underscore';
-
-import router from '@girder/histomicsui/router';
-import FolderCollection from '@girder/core/collections/FolderCollection';
-import AnnotationModel from '@girder/large_image_annotation/models/AnnotationModel';
-import ItemCollection from '@girder/core/collections/ItemCollection';
-import JobStatus from '@girder/jobs/JobStatus.js';
-import { parse } from '@girder/slicer_cli_web/parser';
+const $ = girder.$;
+const View = girder.views.View;
+const { restRequest, getApiRoot } = girder.rest;
+const { confirm } = girder.dialog;
+const _ = girder._;
+
+const router = girder.plugins.histomicsui.router;
+const FolderCollection = girder.collections.FolderCollection;
+const AnnotationModel = girder.plugins.large_image_annotation.models.AnnotationModel;
+const ItemCollection = girder.collections.ItemCollection;
+const JobStatus = girder.plugins.jobs.JobStatus;
+const { parse } = girder.plugins.slicer_cli_web.parser;
 
 import learningTemplate from '../../templates/body/activeLearningView.pug';
 import ActiveLearningGlobalContainer from '../vue/components/ActiveLearningGlobalContainer.vue';
@@ -20,10 +20,9 @@ import { debounce, isValidNumber } from '../vue/components/utils.js';
 
 import '../../stylesheets/body/learning.styl';
 
-const yaml = require('js-yaml');
+import * as yaml from 'js-yaml';
 // Only necessary until we have native support for Promises with es6.
 // Used for Promise.all() and Promise.resolve() support.
-const Promise = require('bluebird');
 
 const epochRegex = /epoch (\d+)/i;
 
@@ -269,33 +268,23 @@ const ActiveLearningView = View.extend({
             this.vueApp.$destroy();
         }
         const el = this.$('.h-active-learning-container').get(0);
-        // eslint-disable-next-line
-        const root = (__webpack_public_path__ || '/status/built').replace(/\/$/, '');
-        const geojsUrl = root + '/plugins/large_image/extra/geojs.js';
-        // Make sure geojs is available, as it required by the image viewer widgets
-        $.ajax({
-            url: geojsUrl,
-            dataType: 'script',
-            cache: true
-        }).done(() => {
-            const imageNamesById = {};
-            _.forEach(Object.keys(this.imageItemsById), (imageId) => {
-                imageNamesById[imageId] = this.imageItemsById[imageId].name;
-            });
-            this.vueApp = new ActiveLearningGlobalContainer({
-                el,
-                propsData: {
-                    backboneParent: this,
-                    imageNamesById,
-                    annotationsByImageId: this.annotationsByImageId,
-                    certaintyMetrics: this.certaintyMetrics,
-                    featureShapes: this.featureShapes,
-                    apiRoot: getApiRoot(),
-                    currentAverageCertainty: this.currentAverageCertainty,
-                    availableImages: this.availableImages,
-                    categoryMap: this.categoryMap
-                }
-            });
+        const imageNamesById = {};
+        _.forEach(Object.keys(this.imageItemsById), (imageId) => {
+            imageNamesById[imageId] = this.imageItemsById[imageId].name;
+        });
+        this.vueApp = new ActiveLearningGlobalContainer({
+            el,
+            propsData: {
+                backboneParent: this,
+                imageNamesById,
+                annotationsByImageId: this.annotationsByImageId,
+                certaintyMetrics: this.certaintyMetrics,
+                featureShapes: this.featureShapes,
+                apiRoot: getApiRoot(),
+                currentAverageCertainty: this.currentAverageCertainty,
+                availableImages: this.availableImages,
+                categoryMap: this.categoryMap
+            }
         });
     },
 

wsi_superpixel_guided_labeling/web_client/views/itemAndFolderList.js

@@ -1,8 +1,9 @@
-import { wrap } from '@girder/core/utilities/PluginUtils';
-import ItemListWidget from '@girder/core/views/widgets/ItemListWidget';
-import FolderListWidget from '@girder/core/views/widgets/FolderListWidget';
-import _ from 'underscore';
-import { restRequest } from '@girder/core/rest';
+const {wrap} = girder.utilities.PluginUtils;
+const ItemListWidget = girder.views.widgets.ItemListWidget;
+const FolderListWidget = girder.views.widgets.FolderListWidget;
+const {restRequest} = girder.rest;
+
+const _ = girder._;
 
 const specialFolders = ['Annotations', 'Models', 'Features'];
 

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearning/ActiveLearningFilmStrip.vue

@@ -1,5 +1,5 @@
 <script>
-import _ from 'underscore';
+const _ = girder._;
 
 import ActiveLearningFilmStripCard from './ActiveLearningFilmStripCard.vue';
 import ActiveLearningStats from './ActiveLearningStats.vue';

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearning/ActiveLearningFilmStripCard.vue

@@ -1,6 +1,6 @@
 <script>
 import Vue from 'vue';
-import _ from 'underscore';
+const _ = girder._;
 
 import { store, nextCard } from '../store';
 import { isValidNumber, updateMetadata } from '../utils';

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearningLabeling.vue

@@ -1,9 +1,9 @@
 <script>
 import Vue from 'vue';
-import _ from 'underscore';
+const _ = girder._;
 
-import { confirm } from '@girder/core/dialog';
-import ColorPickerInput from '@girder/histomicsui/vue/components/ColorPickerInput.vue';
+const { confirm } = girder.dialog;
+const ColorPickerInput = girder.plugins.histomicsui.vue.ColorPickerInput;
 
 import { store, assignHotkey, nextCard, previousCard, updatePixelmapLayerStyle } from './store.js';
 import { boundaryColor, comboHotkeys, viewMode, activeLearningSteps } from './constants.js';

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearningReview/ActiveLearningReviewCard.vue

@@ -1,6 +1,6 @@
 <script>
 import Vue from 'vue';
-import _ from 'underscore';
+const _ = girder._;
 
 import { store } from '../store';
 import { isValidNumber, updateMetadata } from '../utils';

wsi_superpixel_guided_labeling/web_client/views/vue/components/ActiveLearningReview/ActiveLearningReviewContainer.vue

@@ -1,6 +1,6 @@
 <script>
 import Vue from 'vue';
-import _ from 'underscore';
+const _ = girder._;
 
 import ActiveLearningReviewCard from './ActiveLearningReviewCard.vue';
 import ActiveLearningLabeling from '../ActiveLearningLabeling.vue';