feat: user storage space

.env.development

@@ -33,3 +33,4 @@ DATA_CITE_DEVICE_PREFIX=DEVICE-
 DATA_CITE_RESEARCH_PLAN_PREFIX=RP-
 DATA_CITE_DEVICE_PUBLISHER=chemotion.net
 DATA_CITE_DEVICE_CREATOR=chemotion.net
+CRON_CONFIG_DISK_USAGE='0 0 * * *'

app/api/chemotion/admin_api.rb

@@ -20,6 +20,19 @@ class AdminAPI < Grape::API
         { percent_used: stat.percent_used.round(2), mb_available: mb_available }
       end
 
+      namespace :usersDefault do
+        get do
+          default = User.default_disk_space / 1024 / 1024
+          { allocated_user_space: default }
+        end
+        put do
+          params do
+            require :allocatedUserSpace, type: Integer, desc: 'users default allocated space'
+          end
+          User.default_disk_space = params[:allocatedUserSpace]
+        end
+      end
+
       namespace :listLocalCollector do
         desc 'List all local collectors'
         get 'all' do
@@ -103,14 +116,19 @@ class AdminAPI < Grape::API
               obj = Group.find(params[:id]) if %w[Group].include?(params[:rootType])
               obj = Device.find(params[:id]) if %w[Device].include?(params[:rootType])
               if %w[Person Group].include?(params[:actionType])
-                new_users = (params[:add_users] || []).map(&:to_i) - obj.users.pluck(:id)
+                new_user_ids = (params[:add_users] || []).map(&:to_i) - obj.users.pluck(:id)
+                new_user_ids.each do |uid|
+                  user = Person.find(uid)
+                  user.allocated_space = [user.allocated_space, obj.allocated_space].max
+                  user.save!
+                end
               end
               if %w[Device].include?(params[:actionType])
-                new_users = (params[:add_users] || []).map(&:to_i) - obj.devices.pluck(:id)
+                new_user_ids = (params[:add_users] || []).map(&:to_i) - obj.devices.pluck(:id)
               end
-              obj.users << Person.where(id: new_users) if %w[Person].include?(params[:actionType])
-              obj.users << Group.where(id: new_users) if %w[Group].include?(params[:actionType])
-              obj.devices << Device.where(id: new_users) if %w[Device].include?(params[:actionType])
+              obj.users << Person.where(id: new_user_ids) if %w[Person].include?(params[:actionType])
+              obj.users << Group.where(id: new_user_ids) if %w[Group].include?(params[:actionType])
+              obj.devices << Device.where(id: new_user_ids) if %w[Device].include?(params[:actionType])
               obj.save!
 
               if obj.is_a?(Device)
@@ -164,7 +182,7 @@ class AdminAPI < Grape::API
           # rewrite edited json file
           result = Entities::OlsTermEntity.represent(
             OlsTerm.where(owl_name: params[:owl_name], is_enabled: true).select(
-              <<~SQL
+              <<~SQL.squish,
                 id, owl_name, term_id, label, synonym, synonyms, 'desc' as desc,
                 case when (ancestry is null) then null else
                   (select array_to_string(array(
@@ -248,7 +266,7 @@ class AdminAPI < Grape::API
           end
 
           put do
-            Delayed::Job.find(params[:id]).update_columns(run_at: 1.minutes.from_now, failed_at: nil)
+            Delayed::Job.find(params[:id]).update_columns(run_at: 1.minute.from_now, failed_at: nil)
 
             {} # FE does not use the result
           end

app/api/chemotion/admin_user_api.rb

@@ -110,6 +110,7 @@ class AdminUserAPI < Grape::API
             optional :last_name, type: String, desc: 'user last_name'
             optional :name_abbreviation, type: String, desc: 'user name name_abbreviation'
             optional :type, type: String, desc: 'user type'
+            optional :allocated_space, type: Integer, desc: 'user allocated_space'
             optional :account_active, type: Boolean, desc: '(in)activate or activate user account'
             # special params
             optional :enable, type: Boolean, desc: '(un)lock user account'
@@ -222,7 +223,7 @@ class AdminUserAPI < Grape::API
       resource :matrix do
         desc 'Find all matrices'
         get do
-          present Matrice.all.order('id'), with: Entities::MatriceEntity, root: 'matrices'
+          present Matrice.order('id'), with: Entities::MatriceEntity, root: 'matrices'
         end
 
         desc 'update matrice'

app/api/chemotion/attachable_api.rb

@@ -6,11 +6,11 @@ module Chemotion
   class AttachableAPI < Grape::API
     resource :attachable do
       params do
-        optional :files, type: Array[File], desc: 'files', default: []
+        optional :files, type: [File], desc: 'files', default: []
         optional :attachable_type, type: String, desc: 'attachable_type'
         optional :attachable_id, type: Integer, desc: 'attachable id'
-        optional :attfilesIdentifier, type: Array[String], desc: 'file identifier'
-        optional :del_files, type: Array[Integer], desc: 'del file id', default: []
+        optional :attfilesIdentifier, type: [String], desc: 'file identifier'
+        optional :del_files, type: [Integer], desc: 'del file id', default: []
       end
       after_validation do
         case params[:attachable_type]
@@ -51,6 +51,8 @@ class AttachableAPI < Grape::API
               if a.attachable_type.in?(%w[ResearchPlan Wellplate DeviceDescription Labimotion::Element])
                 rp_attach_ary.push(a.id)
               end
+            rescue StandardError
+              status 413
             ensure
               tempfile.close
               tempfile.unlink

app/api/chemotion/attachment_api.rb

@@ -258,7 +258,7 @@ def remove_duplicated(att)
       desc 'Upload files to Inbox as unsorted'
       post 'upload_to_inbox' do
         attach_ary = []
-        params.each do |_file_id, file|
+        params.each_value do |file|
           next unless tempfile = file[:tempfile] # rubocop:disable Lint/AssignmentInCondition
 
           attach = Attachment.new(
@@ -274,6 +274,8 @@ def remove_duplicated(att)
           begin
             attach.save!
             attach_ary.push(attach.id)
+          rescue StandardError
+            status 413
           ensure
             tempfile.close
             tempfile.unlink
@@ -417,7 +419,7 @@ def remove_duplicated(att)
 
       desc 'Return Base64 encoded thumbnails'
       params do
-        requires :ids, type: Array[Integer]
+        requires :ids, type: [Integer]
       end
       post 'thumbnails' do
         thumbnails = params[:ids].map do |a_id|
@@ -434,7 +436,7 @@ def remove_duplicated(att)
 
       desc 'Return Base64 encoded files'
       params do
-        requires :ids, type: Array[Integer]
+        requires :ids, type: [Integer]
       end
       post 'files' do
         files = params[:ids].map do |a_id|
@@ -451,8 +453,8 @@ def remove_duplicated(att)
 
       desc 'Regenerate spectra'
       params do
-        requires :original, type: Array[Integer]
-        requires :generated, type: Array[Integer]
+        requires :original, type: [Integer]
+        requires :generated, type: [Integer]
       end
       post 'regenerate_spectrum' do
         pm = to_rails_snake_case(params)
@@ -475,7 +477,7 @@ def remove_duplicated(att)
 
       desc 'Regenerate edited spectra'
       params do
-        requires :edited, type: Array[Integer]
+        requires :edited, type: [Integer]
         optional :molfile, type: String
       end
       post 'regenerate_edited_spectrum' do

app/api/chemotion/report_api.rb

@@ -16,7 +16,7 @@ def hashize(inputs)
       end
 
       def time_now
-        Time.now.strftime('%Y-%m-%dT%H-%M-%S')
+        Time.zone.now.strftime('%Y-%m-%dT%H-%M-%S')
       end
 
       def is_int?
@@ -36,7 +36,7 @@ def is_int?
         env['api.format'] = :binary
         header(
           'Content-Disposition',
-          "attachment; filename*=UTF-8''#{CGI.escape(filename)}"
+          "attachment; filename*=UTF-8''#{CGI.escape(filename)}",
         )
         docx
       end
@@ -107,8 +107,8 @@ def is_int?
 
         results = reaction_smiles_hash(
           real_coll_id,
-          p_t[:checkedAll] && p_t[:uncheckedIds] || p_t[:checkedIds],
-          p_t[:checkedAll]
+          (p_t[:checkedAll] && p_t[:uncheckedIds]) || p_t[:checkedIds],
+          p_t[:checkedAll],
         ) || {}
         smiles_construct = "r_smiles_#{params[:exportType]}"
         results.map { |_, v| send(smiles_construct, v) }.join("\r\n")
@@ -123,7 +123,7 @@ def is_int?
         header(
           'Content-Disposition',
           "attachment; filename*=UTF-8''#{CGI.escape("Wellplate_#{params[:id]}_\
-          Samples Excel.xlsx")}"
+          Samples Excel.xlsx")}",
         )
         export = Export::ExportExcel.new
         column_query = build_column_query(default_columns_wellplate, current_user.id)
@@ -145,7 +145,7 @@ def is_int?
         header(
           'Content-Disposition',
           "attachment; filename*=UTF-8''#{CGI.escape("Reaction_#{params[:id]}_\
-          Samples Excel.xlsx")}"
+          Samples Excel.xlsx")}",
         )
         export = Export::ExportExcel.new
         column_query = build_column_query(default_columns_reaction, current_user.id)
@@ -174,7 +174,7 @@ def is_int?
 
       desc 'return reports which can be downloaded now'
       params do
-        requires :ids, type: Array[Integer]
+        requires :ids, type: [Integer]
       end
       post :downloadable do
         reports = current_user.reports.where(id: params[:ids]).where.not(generated_at: nil)
@@ -198,15 +198,15 @@ def is_int?
 
     desc 'returns a created report'
     params do
-      requires :objTags, type: Array[Hash]
-      requires :splSettings, type: Array[Hash]
-      requires :rxnSettings, type: Array[Hash]
-      requires :siRxnSettings, type: Array[Hash]
-      requires :configs, type: Array[Hash]
-      requires :molSerials, type: Array[Hash]
-      requires :prdAtts, type: Array[Hash]
+      requires :objTags, type: [Hash]
+      requires :splSettings, type: [Hash]
+      requires :rxnSettings, type: [Hash]
+      requires :siRxnSettings, type: [Hash]
+      requires :configs, type: [Hash]
+      requires :molSerials, type: [Hash]
+      requires :prdAtts, type: [Hash]
       requires :imgFormat, type: String, default: 'png', values: %w[png eps emf]
-      requires :fileName, type: String, default: 'ELN_Report_' + Time.now.strftime('%Y-%m-%dT%H-%M-%S')
+      requires :fileName, type: String, default: "ELN_Report_#{Time.zone.now.strftime('%Y-%m-%dT%H-%M-%S')}"
       requires :templateId, type: String
       optional :templateType, type: String, default: 'standard', values: ReportTemplate::REPORT_TYPES
       optional :fileDescription
@@ -229,13 +229,17 @@ def is_int?
         objects: params[:objTags],
         img_format: params[:imgFormat],
         template: params[:templateType],
-        report_templates_id: !!/\A\d+\z/.match(params[:templateId]) ? params[:templateId].to_i : nil,
-        author_id: current_user.id
+        report_templates_id: /\A\d+\z/.match(params[:templateId]).nil? ? nil : params[:templateId].to_i,
+        author_id: current_user.id,
       }
 
       report = Report.create(attributes)
       current_user.reports << report
-      report.create_docx
+      begin
+        report.create_docx
+      rescue StandardError => e
+        report.file_description = "Report could not be generated: #{e.message}"
+      end
 
       present report, with: Entities::ReportEntity, root: :report
     end
@@ -249,7 +253,7 @@ def is_int?
       end
 
       get :file do
-        ext = params[:ext]
+        params[:ext]
         report = current_user.reports.find(params[:id])
 
         if report
@@ -262,7 +266,7 @@ def is_int?
           env['api.format'] = :binary
           header(
             'Content-Disposition',
-            "attachment; filename*=UTF-8''#{CGI.escape(att.filename)}"
+            "attachment; filename*=UTF-8''#{CGI.escape(att.filename)}",
           )
           att.read_file
         end

app/api/entities/user_entity.rb

@@ -7,6 +7,8 @@ class UserEntity < Grape::Entity
     expose :first_name, documentation: { type: 'String', desc: "User's name" }
     expose :last_name, documentation: { type: 'String', desc: "User's name" }
     expose :initials, documentation: { type: 'String', desc: 'initials' }
+    expose :used_space, documentation: { type: 'Integer', desc: "User's used storage space" }
+    expose :allocated_space, documentation: { type: 'Integer', desc: "User's allocated storage space (0=infinite)" }
     expose :samples_count, documentation: { type: 'Integer', desc: 'Sample count' }
     expose :reactions_count, documentation: { type: 'Integer', desc: 'Reactions count' }
     expose :cell_lines_count, documentation: { type: 'Integer', desc: 'Cellline Samples count' }

app/javascript/src/apps/admin/AdminDashboard.js

@@ -1,5 +1,7 @@
 import React from 'react';
-import { InputGroup, Card, Form } from 'react-bootstrap';
+import {
+  InputGroup, Card, Form, Button
+} from 'react-bootstrap';
 import AdminFetcher from 'src/fetchers/AdminFetcher';
 
 export default class AdminDashboard extends React.Component {
@@ -8,13 +10,16 @@ export default class AdminDashboard extends React.Component {
     this.state = {
       diskAvailable: 0,
       diskPercentUsed: 0,
+      allocatedUserSpace: 0,
       showDiskInfo: false,
     };
     this.handleDiskspace = this.handleDiskspace.bind(this);
+    this.handleSaveBtn = this.handleSaveBtn.bind(this);
   }
 
   componentDidMount() {
     this.handleDiskspace();
+    this.getAllocatedUserSpace();
   }
 
   handleDiskspace() {
@@ -28,30 +33,59 @@ export default class AdminDashboard extends React.Component {
       });
   }
 
+  handleSaveBtn() {
+    const { allocatedUserSpace } = this.state;
+    AdminFetcher.setAllocatedUserSpace(Math.round(allocatedUserSpace) * 1024 * 1024);
+  }
+
+  getAllocatedUserSpace() {
+    AdminFetcher.getAllocatedUserSpace()
+      .then((result) => {
+        this.setState({
+          allocatedUserSpace: result.allocated_user_space,
+        });
+      });
+  }
+
   renderDiskInfo() {
-    const { diskAvailable, diskPercentUsed } = this.state;
-    let className = diskPercentUsed > 80 ? 'text-danger' : '';
+    const {
+      diskAvailable, diskPercentUsed, allocatedUserSpace
+    } = this.state;
+    const className = diskPercentUsed > 80 ? 'text-danger' : '';
 
     return (
-        <Card>
-          <Card.Body className='p-0'>
-            <InputGroup >
-              <InputGroup.Text >Disk Available (MB)</InputGroup.Text>
-              <Form.Control
-                type="text"
-                defaultValue={diskAvailable || ''}
-                readOnly
-              />
-              <InputGroup.Text >Disk Percent Used (%)</InputGroup.Text>
-              <Form.Control
-                type="text"
-                className={className}
-                defaultValue={`${diskPercentUsed}%` || ''}
-                readOnly
-              />
-            </InputGroup>
-          </Card.Body>
-        </Card>
+      <Card style={{ width: '30rem' }}>
+        <Card.Body className="p-0">
+          <InputGroup.Text>Disk Available (MB)</InputGroup.Text>
+          <Form.Control
+            type="text"
+            defaultValue={diskAvailable || ''}
+            readOnly
+          />
+          <InputGroup.Text>Disk Percent Used (%)</InputGroup.Text>
+          <Form.Control
+            type="text"
+            className={className}
+            defaultValue={`${diskPercentUsed}%` || ''}
+            readOnly
+          />
+          <InputGroup.Text>Default User Allocated Space (MB)</InputGroup.Text>
+          <InputGroup>
+            <Form.Control
+              type="number"
+              min="0"
+              defaultValue={allocatedUserSpace || ''}
+              onChange={(event) => this.setState({ allocatedUserSpace: event.target.value })}
+            />
+            <Button
+              variant="warning"
+              onClick={() => this.handleSaveBtn()}
+            >
+              Save
+            </Button>
+          </InputGroup>
+        </Card.Body>
+      </Card>
     );
   }