Merge branch 'main' of https://github.com/UoA-eResearch/mytardis

UoA-eResearch · Feb 21, 2024 · 01c89aa · 01c89aa
2 parents a96851c + 6e7199c
commit 01c89aa
Show file tree

Hide file tree

Showing 10 changed files with 775 additions and 810 deletions.
diff --git a/assets/js/apps/badges/components/DatasetSizeBadge.jsx b/assets/js/apps/badges/components/DatasetSizeBadge.jsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useState } from 'react';
-import fileSize from 'filesize';
+import { filesize } from 'filesize';
 import Badge from 'react-bootstrap/Badge';
 import PropTypes from 'prop-types';
 
@@ -9,7 +9,7 @@ const DatasetSizeBadge = ({ datasetData }) => {
 
   React.useEffect(() => {
     let size = datasetData.dataset_size;
-    size = fileSize(size, { base: 2 });
+    size = filesize(size, { base: 2 });
     setDatasetSize(size);
     setTitle('Dataset size is');
   });

diff --git a/assets/js/apps/badges/components/ExperimentSizeBadge.jsx b/assets/js/apps/badges/components/ExperimentSizeBadge.jsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useState } from 'react';
-import fileSize from 'filesize';
+import { filesize } from 'filesize';
 import Badge from 'react-bootstrap/Badge';
 import PropTypes from 'prop-types';
 
@@ -9,7 +9,7 @@ const ExperimentSizeBadge = ({ experimentData }) => {
 
   React.useEffect(() => {
     let size = experimentData.experiment_size;
-    size = fileSize(size, { base: 2 });
+    size = filesize(size, { base: 2 });
     setExperimentSize(size);
     setTitle(`Experiment size is ~ ${size}`);
   }, []);

diff --git a/assets/js/tardis_portal/view_dataset/file-upload.js b/assets/js/tardis_portal/view_dataset/file-upload.js
@@ -4,9 +4,9 @@ import React from "react";
 import ReactDOM from "react-dom";
 import TreeView from "../../apps/tree_view/components/TreeView";
 
-require("imports-loader?define=>false&exports=>false!blueimp-file-upload/js/vendor/jquery.ui.widget");
-require("imports-loader?define=>false&exports=>false!blueimp-file-upload/js/jquery.fileupload");
-require("imports-loader?define=>false&exports=>false!blueimp-file-upload/js/jquery.iframe-transport");
+require("imports-loader?imports=default|jquery|$!blueimp-file-upload/js/vendor/jquery.ui.widget");
+require("imports-loader?imports=default|jquery|$!blueimp-file-upload/js/jquery.fileupload");
+require("imports-loader?imports=default|jquery|$!blueimp-file-upload/js/jquery.iframe-transport");
 
 // https://docs.djangoproject.com/en/3.1/ref/csrf/
 function getCookie(name) {

diff --git a/assets/js/tardis_portal/view_experiment/share/share.js b/assets/js/tardis_portal/view_experiment/share/share.js
@@ -119,7 +119,7 @@ const userSharingModalLoaded = function() {
         }
 
         permissions = "/?authMethod=" + authMethod + "&canRead=" + canRead +
-                      "&canDownload=" + canDownload +"&canWrite=" + canWrite +
+                      "&canDownload=" + canDownload + "&canWrite=" + canWrite +
                       "&canDelete=" + canDelete + "&canSensitive=" + canSensitive +
                       "&isOwner=" + isOwner;
         var action = "/experiment/control_panel/" + $("#experiment-id").val() +