Move max file size from inline to setting in config.js (#2525)

OSC · Jan 31, 2023 · 7c55e1b · 7c55e1b
1 parent b32c3ac
commit 7c55e1b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/apps/dashboard/app/javascript/packs/config.js b/apps/dashboard/app/javascript/packs/config.js
@@ -38,4 +38,11 @@ function navbarHighlight(theme, color) {
     }`;
 }
 
+function getConfigData() {
+  const cfgData = configData();
+
+  return cfgData;
+}
+
 export { setNavbarColor };
+export { getConfigData};
diff --git a/apps/dashboard/app/javascript/packs/files/uppy_ops.js b/apps/dashboard/app/javascript/packs/files/uppy_ops.js
@@ -4,6 +4,7 @@ import XHRUpload from '@uppy/xhr-upload'
 import _ from 'lodash';
 import {CONTENTID, EVENTNAME as DATATABLE_EVENTNAME} from './data_table.js';
 import { dupSafeName } from './utils.js';
+import { getConfigData } from '../config.js';
 
 let uppy = null;
 
@@ -67,7 +68,7 @@ jQuery(function() {
 
   uppy = new Uppy({
     restrictions: {
-      maxFileSize: maxFileSize,
+      maxFileSize: maxFileSize(),
     },
     onBeforeFileAdded: renameIfDuplicate,
     onBeforeUpload: updateEndpoint,
@@ -184,3 +185,17 @@ function updateEndpoint() {
 function reloadTable() {
   $(CONTENTID).trigger(DATATABLE_EVENTNAME.reloadTable,{});
 }
+
+function maxFileSize () {
+  const cfgData = getConfigData();
+
+  // Check if cfgData['maxFileSize'] is just empty string, 
+  // if so set default of maxFileUpload=10737420000 bytes.
+  if (cfgData['maxFileSize'].length == 0) {
+    return parseInt(10737420000, 10);
+  }
+  else {
+    const maxFileSize = cfgData['maxFileSize'];
+    return parseInt(maxFileSize, 10);
+  }
+}
diff --git a/apps/dashboard/app/views/files/_inline_js.html.erb b/apps/dashboard/app/views/files/_inline_js.html.erb
@@ -1,7 +1,6 @@
 <script>
 const csrf_token = document.querySelector('meta[name="csrf-token"]').content;
 const dashboard_files_directory_download_error_modal_title = '<%= t('dashboard.files_directory_download_error_modal_title') %>';
-const maxFileSize = '<%= Configuration.file_upload_max %>';
 const transfersPath = '<%= transfers_path(format: "json") %>';
 const alert = '<%= alert %>';
 history.replaceState({

diff --git a/apps/dashboard/app/views/layouts/application.html.erb b/apps/dashboard/app/views/layouts/application.html.erb
@@ -21,6 +21,7 @@
   <meta id="ood_config"
     data-bg-color="<%= @user_configuration.brand_bg_color %>"
     data-link-bg-color="<%= @user_configuration.brand_link_active_bg_color %>"
+    data-max-file-size="<%= Configuration.file_upload_max %>"
   />
 </head>
 <body>