@girder/core 3.2.9 → 5.0.0-a11

package/{templates → dist-lib/src/templates}/body/systemConfiguration.pug

@@ -1,40 +1,48 @@
 .g-body-title System configuration
+.g-body-subtitle
+  p
+    | Note: all settings other than those referencing data in the database should be set as
+    | environment variables in the execution environment.
 form.g-settings-form(role="form")
   .g-settings-form-container
     h4 Instance Branding
     .form-group
       label(for="g-core-brand-name") Brand Name
       input#g-core-brand-name.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.brand_name'] || '',
           title="The brand name of the application.")
     .form-group
       label(for="g-core-contact-email-address") Contact email address
       input#g-core-contact-email-address.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.contact_email_address'] || '',
           title="The contact email address for users to obtain support with this instance.")
     .form-group
       label(for="g-core-banner-color") Banner Color
       #g-core-banner-color-container
         input#g-core-banner-color.form-control.input-sm(
+            disabled=true,
             type="color", value=settings['core.banner_color'],
             title="The banner color of the application.")
-        button#g-core-banner-default-color.form-control.input-sm(
-            type="button", title="Default color") default
   .form-group
     label(for="g-core-privacy-notice") Privacy Notice Link
     input#g-core-privacy-notice.form-control.input-sm(
+        disabled=true,
         type="text", value=settings['core.privacy_notice'] || '',
         title="The privacy notice link.")
   .form-group
     label(for="g-core-cookie-lifetime") Cookie duration (days)
     input#g-core-cookie-lifetime.form-control.input-sm(
+        disabled=true,
         type="text", value=settings['core.cookie_lifetime'] || '',
         title="How long users will stay logged in.")
   .g-settings-form-container
     h4 Administrative Policy
     .form-group
       label(for="g-core-registration-policy") Registration policy
-      select#g-core-registration-policy.form-control.input-sm
+      select#g-core-registration-policy.form-control.input-sm(
+          disabled=true)
         option(value="open",
             selected=(settings['core.registration_policy'] === "open")) Open registration
         option(value="closed",
@@ -43,7 +51,8 @@ form.g-settings-form(role="form")
             selected=(settings['core.registration_policy'] === "approve")) Admin approval required
     .form-group
       label(for="g-core-email-verification") Email verification
-      select#g-core-email-verification.form-control.input-sm
+      select#g-core-email-verification.form-control.input-sm(
+          disabled=true)
         option(value="required",
             selected=(settings['core.email_verification'] === "required")) Required
         option(value="optional",
@@ -52,7 +61,8 @@ form.g-settings-form(role="form")
             selected=(settings['core.email_verification'] === "disabled")) Disabled
     .form-group
       label(for="g-core-add-to-group-policy") Allow members to be directly added to groups
-      select#g-core-add-to-group-policy.form-control.input-sm
+      select#g-core-add-to-group-policy.form-control.input-sm(
+          disabled=true)
         option(value="never",
             selected=(settings['core.add_to_group_policy'] === "never"))
           | No, members must be invited and accept invitations
@@ -79,7 +89,8 @@ form.g-settings-form(role="form")
         = JSON.stringify(settings['core.collection_create_policy'])
     .form-group
       label(for="g-core-user-default-folders") Create default folders for new users
-      select#g-core-user-default-folders.form-control.input-sm
+      select#g-core-user-default-folders.form-control.input-sm(
+          disabled=true)
         option(value="none",
             selected=(settings['core.user_default_folders'] === "none")) No
         option(value="public_private",
@@ -87,24 +98,28 @@ form.g-settings-form(role="form")
     .form-group
       .checkbox
         label(for="g-core-api-keys")
-          input#g-core-api-keys(type="checkbox", checked=settings['core.api_keys'])
+          input#g-core-api-keys(type="checkbox", checked=settings['core.api_keys'],
+              disabled=true)
           | Enable API keys
     .form-group
       .checkbox
         label(for="g-core-enable-password-login")
           input#g-core-enable-password-login(
-              type="checkbox", checked=settings['core.enable_password_login'])
+              type="checkbox", checked=settings['core.enable_password_login'],
+              disabled=true)
           | Enable password login
   .g-settings-form-container
     h4 Email Creation
     .form-group
       label(for="g-core-email-from-address") Email from address
       input#g-core-email-from-address.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.email_from_address'] || '',
           title="The email address the system will use when sending emails.")
     .form-group
       label(for="g-core-email-host") Email host
       input#g-core-email-host.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.email_host'] || '',
           title="The host email server that is shown as a link in the footer of emails.")
   .g-settings-form-container
@@ -112,16 +127,19 @@ form.g-settings-form(role="form")
     .form-group
       label(for="g-core-smtp-host") SMTP host
       input#g-core-smtp-host.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.smtp_host'] || '',
           title="The hostname of the SMTP server used to send emails.")
     .form-group
       label(for="g-core-smtp-port") SMTP port
       input#g-core-smtp-port.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.smtp.port'] || '',
           title="The port number of the SMTP server used to send emails.")
     .form-group
       label(for="g-core-smtp-encryption") SMTP encryption
-      select#g-core-smtp-encryption.form-control.input-sm
+      select#g-core-smtp-encryption.form-control.input-sm(
+          disabled=true)
         option(value="none",
             selected=(settings['core.smtp.encryption'] === "none")) None
         option(value="starttls",
@@ -131,36 +149,16 @@ form.g-settings-form(role="form")
     .form-group
       label(for="g-core-smtp-username") SMTP username
       input#g-core-smtp-username.form-control.input-sm(
+          disabled=true,
           type="text", value=settings['core.smtp.username'] || '',
           title="The username, if any, used to authenticate to the SMTP server used to send emails.")
     .form-group
       label(for="g-core-smtp-password") SMTP password
       input#g-core-smtp-password.form-control.input-sm(
+          disabled=true,
           type="password", value=settings['core.smtp.password'] || '',
           title="The password, if any, used to authenticate to the SMTP server used to send emails.")
 
-  .g-settings-form-container
-    h4 Routing
-    p.
-      Altering routes requires a restart of the Girder server to take effect.
-    .g-settings-form-container
-      h5 Core Routes
-      label core_girder
-      input.g-core-route-table.form-control.input-sm(
-          type="text",
-          value=routes['core_girder'] || '',
-          data-webroot-name="core_girder",
-          title="The path to place core_girder.")
-    if routeKeys.length > 2
-      .form-group
-        h5 Other Routes
-        each name in routeKeys.slice(2)
-          label= name
-          input.g-core-route-table.form-control.input-sm(
-              type="text",
-              value=routes[name] || '',
-              data-webroot-name=name,
-              title="The path to place ${name}.")
   #g-configuration-accordion.panel-group
     .panel.panel-default
       .panel-heading(data-toggle="collapse",
@@ -175,24 +173,17 @@ form.g-settings-form(role="form")
           .form-group
             label(for="g-core-server-root") Server root URL
             input#g-core-server-root.form-control.input-sm(
+                disabled=true,
                 type="text", value=settings['core.server_root'] || '',
                 placeholder='Detect automatically')
           .form-group
             label(for="g-core-upload-minimum-chunk-size") Upload minimum chunk size (bytes)
             br
-            span This applies to Filesystem and GridFS assetstores.
+            span This applies to Filesystem assetstores.
             input#g-core-upload-minimum-chunk-size.form-control.input-sm(
+                disabled=true,
                 type="text", value=settings['core.upload_minimum_chunk_size'] || '',
                 title="For large files, the minimum size of all but the last chunk.")
-          .form-group
-            label Server Notification Stream
-            br
-            span Disabling this may improve server performance with many concurrent web client users.
-            .checkbox
-              label(for="g-core-enable-notification-stream")
-                input#g-core-enable-notification-stream(
-                type="checkbox", checked=(settings['core.enable_notification_stream']))
-                | Enabled
           .g-settings-form-container
             h4 CORS
             p.
@@ -202,17 +193,20 @@ form.g-settings-form(role="form")
             .form-group
               label(for="g-core-cors-allow-origin") CORS Allowed Origins
               input#g-core-cors-allow-origin.form-control.input-sm(
+                  disabled=true,
                   type="text", value=settings['core.cors.allow_origin'] || '',
                   title="A comma-separated list of allowed base URLs that can make cross-site requests. This may include *.")
             .form-group
               label(for="g-core-cors-allow-methods") CORS Allowed Methods
               input#g-core-cors-allow-methods.form-control.input-sm(
+                  disabled=true,
                   type="text", value=settings['core.cors.allow_methods'] || '',
                   placeholder="Default: allow all methods",
                   title="A comma-separated list of allowed methods")
             .form-group
               label(for="g-core-cors-allow-headers") CORS Allowed Headers
               input#g-core-cors-allow-headers.form-control.input-sm(
+                  disabled=true,
                   type="text", value=settings['core.cors.allow_headers'] || '',
                   title="A comma-separated list of allowed headers.")
   p

package/{templates → dist-lib/src/templates}/widgets/editAssetstoreWidget.pug

@@ -17,18 +17,6 @@
             .form-group
               label.control-label(for="g-edit-fs-perms") File creation permissions (octal)
               input#g-edit-fs-perms.input-sm.form-control(type="text", placeholder="600")
-          if assetstore.get('type') === types.GRIDFS
-            .form-group
-              label.control-label(for="g-edit-gridfs-db") Database name
-              input#g-edit-gridfs-db.input-sm.form-control(type="text", placeholder="Database name")
-            .form-group
-              label.control-label(for="g-edit-gridfs-mongohost") Mongo Host URI
-              input#g-edit-gridfs-mongohost.input-sm.form-control(
-                  type="text", placeholder="Mongo host uri (defaults to the main Girder database)",
-                  title="The URI is of the form mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]")
-            .form-group
-              label.control-label(for="g-edit-gridfs-replicaset") Replica Set
-              input#g-edit-gridfs-replicaset.input-sm.form-control(type="text", placeholder="Replica set name (blank if not using a replica set)")
           if assetstore.get('type') === types.S3
             .form-group
               label.control-label(for="g-edit-s3-bucket") S3 bucket name

package/{templates → dist-lib/src/templates}/widgets/newAssetstore.pug

@@ -28,41 +28,6 @@
           p#g-new-fs-error.g-validation-failed-message
           input.g-new-assetstore-submit.btn.btn-sm.btn-primary(type="submit", value="Create")
 
-  .panel.panel-default
-    .panel-heading(data-toggle="collapse",
-        data-parent="#g-assetstore-accordion",
-        data-target="#g-create-gridfs-tab")
-      .panel-title
-        a
-          i.icon-leaf
-          span Create new #[b GridFS] assetstore
-    #g-create-gridfs-tab.panel-collapse.collapse
-      .panel-body
-        p.
-          This type of assetstore uses
-          MongoDB's #[a(target="_blank", href="http://docs.mongodb.org/manual/core/gridfs/") GridFS]
-          storage engine. The files should be stored in a separate database
-          from the rest of the server's information to avoid locking issues.
-        form#g-new-gridfs-form(role="form")
-          .form-group
-            label.control-label(for="g-new-gridfs-name") Assetstore name
-            input#g-new-gridfs-name.input-sm.form-control(type="text", placeholder="Name")
-          .form-group
-            label.control-label(for="g-new-gridfs-db") Database name
-            input#g-new-gridfs-db.input-sm.form-control(
-              type="text", placeholder="Database name")
-          .form-group
-            label.control-label(for="g-new-gridfs-mongohost") Mongo Host URI
-            input#g-new-gridfs-mongohost.input-sm.form-control(
-                type="text", placeholder="Mongo host uri (defaults to the main Girder database)",
-                title="The URI is of the form mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]")
-          .form-group
-            label.control-label(for="g-new-gridfs-replicaset") Replica Set
-            input#g-new-gridfs-replicaset.input-sm.form-control(
-                type="text", placeholder="Replica set name (blank if not using a replica set)")
-          p#g-new-gridfs-error.g-validation-failed-message
-          input.g-new-assetstore-submit.btn.btn-sm.btn-primary(type="submit", value="Create")
-
   .panel.panel-default
     .panel-heading(data-toggle="collapse",
         data-parent="#g-assetstore-accordion",

package/dist-lib/src/utilities/EventStream.js

@@ -0,0 +1,119 @@
+import _ from 'underscore';
+import Backbone from 'backbone';
+
+import { getCurrentToken } from '@girder/core/auth';
+
+const appElement = document.getElementById('app');
+let apiRoot = (appElement && appElement.getAttribute('root')) || '';
+apiRoot += (apiRoot.endsWith('/') ? '' : '/') + 'api/v1';
+if (!apiRoot.startsWith('/') && apiRoot.indexOf(':') < 0) {
+    apiRoot = '/' + apiRoot;
+}
+let notifyRoot = apiRoot.endsWith('/api/v1') ? apiRoot.slice(0, -6) : apiRoot;
+notifyRoot = notifyRoot.endsWith('/') ? notifyRoot.slice(0, -1) : notifyRoot;
+
+/**
+ * The EventStream is an abstraction for server-sent events / long-polling via a
+ * per-user event channel endpoint using a WebSocket. When events are
+ * received on the websocket channel, this triggers a Backbone event of the form
+ * 'g:event.<type>' where <type> is the value of the event type field.
+ * Listeners can bind to specific event types on the channel.
+ */
+function EventStream(settings) {
+    // Possible states are 'closed', 'stopped', 'started'
+    this._state = 'closed';
+
+    // Create context bindings only once, so they can be referenced when unbinding events
+    this._onVisibilityStateChange = _.bind(this._onVisibilityStateChange, this);
+    this._onMessage = _.bind(this._onMessage, this);
+    this._onError = _.bind(this._onError, this);
+
+    return _.extend(this, Backbone.Events);
+}
+
+EventStream.prototype._onVisibilityStateChange = function () {
+    if (document.visibilityState === 'visible' && this._state === 'stopped') {
+        this._start();
+    } else if (document.visibilityState === 'hidden' && this._state === 'started') {
+        this._stop();
+    }
+};
+
+EventStream.prototype._onMessage = function (e) {
+    let obj;
+    try {
+        obj = window.JSON.parse(e.data);
+    } catch (err) {
+        console.error('Invalid JSON from notification stream: ' + e.data + ',' + err);
+        this.trigger('g:error', e);
+        return;
+    }
+    this.trigger('g:event.' + obj.type, obj);
+};
+
+EventStream.prototype._onError = function () {
+    // TODO: Handle error
+};
+
+EventStream.prototype.open = function () {
+    if (!window.EventSource) {
+        console.error('EventSource is not supported on this platform.');
+        this.trigger('g:eventStream.disable');
+        return;
+    }
+    if (this._state !== 'closed') {
+        console.warn('EventStream should be closed.');
+        return;
+    }
+
+    this._state = 'stopped';
+    this._start();
+
+    document.addEventListener('visibilitychange', this._onVisibilityStateChange);
+};
+
+EventStream.prototype._start = function () {
+    if (this._state !== 'stopped') {
+        console.warn('EventStream should be stopped');
+        return;
+    }
+    this._websocket = new WebSocket(`${notifyRoot}/notifications/me?token=${getCurrentToken()}`);
+    this._websocket.onmessage = this._onMessage;
+    this._websocket.onerror = this._onError;
+
+    this._state = 'started';
+    this.trigger('g:eventStream.start');
+};
+
+EventStream.prototype._stop = function () {
+    if (this._state !== 'started') {
+        console.warn('EventStream should be started');
+        return;
+    }
+
+    this._websocket.close();
+    this._websocket = null;
+
+    this._state = 'stopped';
+    this.trigger('g:eventStream.stop');
+};
+
+EventStream.prototype.close = function () {
+    if (this._state === 'closed') {
+        console.warn('EventStream should not be closed');
+        return;
+    }
+
+    document.removeEventListener('visibilitychange', this._onVisibilityStateChange);
+
+    if (this._state === 'started') {
+        this._stop();
+    }
+
+    this._state = 'closed';
+    this.trigger('g:eventStream.close');
+};
+
+const eventStream = new EventStream();
+
+export default eventStream;

package/{utilities → dist-lib/src/utilities}/S3UploadHandler.js

@@ -251,51 +251,11 @@ prototype._finalizeMultiChunkUpload = function () {
         },
         error: null
     }).done((resp) => {
-        // Create the XML document that will be the request body to S3
-        var doc = document.implementation.createDocument(null, null, null);
-        var root = doc.createElement('CompleteMultipartUpload');
-
-        _.each(this.eTagList, (etag, partNumber) => {
-            var partEl = doc.createElement('Part');
-            var partNumberEl = doc.createElement('PartNumber');
-            var etagEl = doc.createElement('ETag');
-
-            partNumberEl.appendChild(doc.createTextNode(partNumber));
-            etagEl.appendChild(doc.createTextNode(etag));
-            partEl.appendChild(partNumberEl);
-            partEl.appendChild(etagEl);
-            root.appendChild(partEl);
-        });
-
-        var req = resp.s3FinalizeRequest;
-        var xhr = new XMLHttpRequest();
-
-        xhr.open(req.method, req.url);
-
-        _.each(req.headers, (v, k) => {
-            xhr.setRequestHeader(k, v);
-        });
-
-        xhr.onload = () => {
-            if (xhr.status === 200) {
-                delete resp.s3FinalizeRequest;
-                this.trigger('g:upload.complete', resp);
-            } else {
-                this.trigger('g:upload.error', {
-                    message: 'Error occurred uploading to S3 (' + xhr.status + ').'
-                });
-            }
-        };
-
-        xhr.send(new window.XMLSerializer().serializeToString(root));
+        this.trigger('g:upload.complete', resp);
     }).fail((resp) => {
-        var msg;
-
-        if (resp.status === 0) {
-            msg = 'Could not connect to the server.';
-        } else {
-            msg = 'Upload error during finalize, check console.';
-        }
+        const msg = resp.status === 0
+            ? 'Could not connect to the server.'
+            : 'Upload error during finalize, check console.';
         this.trigger('g:upload.error', {
             message: msg
         });

package/dist-lib/src/version.js

@@ -0,0 +1,6 @@
+const versionRaw = import.meta.env.GIRDER_VERSION || null;
+
+// Enforce that it's a string or null to make TypeScript happy
+const version = versionRaw === null ? null : `${versionRaw}`;
+
+export default version;

package/{views → dist-lib/src/views}/View.js

@@ -5,7 +5,8 @@ import events from '@girder/core/events';
 import eventStream from '@girder/core/utilities/EventStream';
 
 var View = Backbone.View.extend({
-    constructor: function (opts) { // eslint-disable-line backbone/no-constructor
+    // eslint-disable-next-line backbone/no-constructor
+    constructor: function (opts) {
         if (opts && _.has(opts, 'parentView')) {
             if (opts.parentView) {
                 opts.parentView.registerChildView(this);

package/{views → dist-lib/src/views}/body/AssetstoresView.js

@@ -17,9 +17,7 @@ import AssetstoresTemplate from '@girder/core/templates/body/assetstores.pug';
 
 import '@girder/core/stylesheets/body/assetstores.styl';
 
-import 'as-jqplot/dist/jquery.jqplot.js';
-import 'as-jqplot/dist/jquery.jqplot.css'; // jquery.jqplot.min.css
-import 'as-jqplot/dist/plugins/jqplot.pieRenderer.js';
+import ApexCharts from 'apexcharts';
 
 /**
  * This private data structure is a dynamic way to map assetstore types to the views
@@ -68,7 +66,7 @@ var AssetstoresView = View.extend({
 
     _destroyPlots: function () {
         for (const plot of this.plots) {
-            plot.data('jqplot').destroy();
+            plot.destroy();
         }
         this.plots = [];
     },
@@ -116,32 +114,32 @@ var AssetstoresView = View.extend({
             ['Used (' + formatSize(used) + ')', used],
             ['Free (' + formatSize(capacity.free) + ')', capacity.free]
         ];
-        var plot = $(el).jqplot([data], {
-            seriesDefaults: {
-                renderer: $.jqplot.PieRenderer,
-                rendererOptions: {
-                    sliceMargin: 2,
-                    shadow: false,
-                    highlightMouseOver: false,
-                    showDataLabels: true,
-                    padding: 5,
-                    startAngle: 180
-                }
+        var plot = new ApexCharts(el, {
+            series: data.map(d => d[1]),
+            chart: {
+                type: 'pie',
+                animations: { enabled: false }
             },
-            legend: {
-                show: true,
-                location: 'e',
-                background: 'transparent',
-                border: 'none'
+            labels: data.map(d => d[0]),
+            plotOptions: {
+                pie: {
+                    startAngle: -90,
+                    endAngle: 270,
+                    expandOnClick: false,
+                    dataLabels: {
+                        enabled: true
+                    }
+                }
             },
-            grid: {
-                background: 'transparent',
-                border: 'none',
-                borderWidth: 0,
-                shadow: false
+            dataLabels: {
+                style: {
+                  colors: ['#000', '#000']
+                },
+                dropShadow: {enabled: false},
             },
-            gridPadding: { top: 10, right: 10, bottom: 10, left: 10 }
+            legend: { position: 'right' }
         });
+        plot.render();
         this.plots.push(plot);
     },
 

package/{views → dist-lib/src/views}/body/SystemConfigurationView.js

@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import _ from 'underscore';
 
 import AccessWidget from '@girder/core/views/widgets/AccessWidget';
@@ -30,18 +29,10 @@ var SystemConfigurationView = View.extend({
             var settings = _.map(this.settingsKeys, (key) => {
                 const element = this.$('#g-' + key.replace(/[_.]/g, '-'));
 
-                if (key === 'core.route_table') {
-                    return {
-                        key,
-                        value: _.object(_.map($('.g-core-route-table'), function (el) {
-                            return [$(el).data('webrootName'), $(el).val()];
-                        }))
-                    };
-                } else if (_.contains(
+                if (_.contains(
                     [
                         'core.api_keys',
                         'core.enable_password_login',
-                        'core.enable_notification_stream'
                     ],
                     key
                 )) { // booleans via checkboxes
@@ -77,9 +68,6 @@ var SystemConfigurationView = View.extend({
                 this.$('#g-settings-error-message').text(resp.responseJSON.message);
             });
         },
-        'click #g-core-banner-default-color': function () {
-            this.$('#g-core-banner-color').val(this.defaults['core.banner_color']);
-        }
     },
 
     initialize: function () {
@@ -104,14 +92,12 @@ var SystemConfigurationView = View.extend({
             'core.smtp.username',
             'core.smtp.password',
             'core.upload_minimum_chunk_size',
-            'core.enable_notification_stream',
             'core.cors.allow_origin',
             'core.cors.allow_methods',
             'core.cors.allow_headers',
             'core.add_to_group_policy',
             'core.collection_create_policy',
             'core.user_default_folders',
-            'core.route_table'
         ];
         this.settingsKeys = keys;
         restRequest({
@@ -129,11 +115,6 @@ var SystemConfigurationView = View.extend({
     render: function () {
         this.$el.html(SystemConfigurationTemplate({
             settings: this.settings,
-            routes: this.settings['core.route_table'],
-            routeKeys: _.sortBy(
-                _.keys(this.settings['core.route_table']),
-                (a) => a.indexOf('core_') === 0 ? -1 : 0
-            ),
             JSON: window.JSON
         }));
 
@@ -179,7 +160,7 @@ var SystemConfigurationView = View.extend({
     _covertCollectionCreationPolicy: function () {
         // get collection creation policy from AccessWidget and format the result properly
         var settingValue = null;
-        if (this.$('.g-setting-switch').bootstrapSwitch('state')) {
+        if (this.$('.g-setting-switch').bootstrapSwitch('state') && this.accessWidget) {
             settingValue = { open: this.$('.g-setting-switch').bootstrapSwitch('state') };
             var accessList = this.accessWidget.getAccessList();
             _.each(_.keys(accessList), (key) => {

package/{views → dist-lib/src/views}/body/index.js

@@ -1,5 +1,5 @@
 import AdminView from './AdminView';
-import AssetstoresView from './AssetstoresView';
+import AssetstoresView, { assetstoreImportViewMap } from './AssetstoresView';
 import CollectionView from './CollectionView';
 import CollectionsView from './CollectionsView';
 import FilesystemImportView from './FilesystemImportView';
@@ -19,6 +19,7 @@ import UsersView from './UsersView';
 export {
     AdminView,
     AssetstoresView,
+    assetstoreImportViewMap,
     CollectionView,
     CollectionsView,
     FilesystemImportView,

package/{views → dist-lib/src/views}/layout/LoginView.js

@@ -26,7 +26,7 @@ var LoginView = View.extend({
             const loginName = this.$('#g-login').val();
             const password = this.$('#g-password').val();
             const otpToken = this.$('#g-login-otp-group').hasClass('hidden') ? null : this.$('#g-login-otp').val();
-            login(loginName, password, undefined, otpToken)
+            login(loginName, password, otpToken)
                 .done(() => {
                     this.$el.modal('hide');
                 })

package/{views → dist-lib/src/views}/widgets/ApiKeyListWidget.js

@@ -38,7 +38,7 @@ var ApiKeyListWidget = View.extend({
             }
         },
 
-        'click .g-api-key-new': function (e) {
+        'click .g-api-key-new': function () {
             this._renderEditWidget();
         },
 

package/{views → dist-lib/src/views}/widgets/DateTimeRangeWidget.js

@@ -5,7 +5,8 @@ import View from '@girder/core/views/View';
 
 import dateTimeRangeWidgetTemplate from '@girder/core/templates/widgets/dateTimeRangeWidget.pug';
 
-import 'eonasdan-bootstrap-datetimepicker'; // /src/js/bootstrap-datetimepicker.js'
+// Momentjs is not require()'d in the way this library expects
+// import 'eonasdan-bootstrap-datetimepicker'; // /src/js/bootstrap-datetimepicker.js'
 import 'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css';
 
 /**