feat: user storage space #2274

headri · 2024-12-20T14:06:53Z

Backend

user space accounting/quota

Add new columns to user (used-space, available-space) migration script

calculation tools as sql functions

for a dataset: a dataset has many attachments
for [element].attachments where Element is a Sample, Reaction, Wellplate, ResearchPlan, Screen ....
and for [element].analyses
for a collection (useful for export, validation of collection ownership transfer, but not working for the total user's usage since element can be in multiple collections at once)
for a type of elements owned by a user
user ➡️ collections ➡️ unique elements of a type (eg: sample) ➡️ elements-attachments + elements-analyses
for user reports

cronJob to update user used-space

Add Job
Enqueue Job

Frontend

prevent upload if quota exceeded and show message

Inbox upload
Dataset on Element save
Dataset before "Keep Changes" (Show warning only)
Research Plan on save
Research Plan before save (Show warning only)
Report on Generate

Admin interface

Set default for all users
Set value for group
Set value for user
Show current usage (in percent/absolut)

app/api/chemotion/admin_api.rb

github-actions · 2025-01-07T09:08:29Z

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')


Metrics/ClassLength: Class has too many lines. [237/200]

github-actions · 2025-01-08T13:18:05Z

LCOV of commit `4983883` during Continuous Integration #4284

Summary coverage rate:
  lines......: 66.7% (14363 of 21527 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

JanCBrammer

Finished the first pass of my review.
Next I'll try the new features in the UI.

app/api/chemotion/admin_api.rb

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

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

...rc/apps/mydb/elements/details/researchPlans/attachmentsTab/ResearchPlanDetailsAttachments.js

app/javascript/src/components/container/ContainerDatasetModalContent.js

app/models/attachment.rb

db/functions/calculate_collection_space_v01.sql

Squashed commit of the following: commit ea193ee Author: Adrian Herrmann <[email protected]> Date: Mon Jan 20 09:44:50 2025 +0000 Renamed users_available and changed set and show to MB commit 4983883 Author: Adrian Herrmann <[email protected]> Date: Tue Jan 7 13:11:10 2025 +0000 rebase fix commit d5f3651 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 16 15:08:40 2024 +0000 feat: set available_space in admin interface commit 334a83c Author: Adrian Herrmann <[email protected]> Date: Wed Dec 11 16:07:43 2024 +0000 added usage job commit 5646024 Author: Adrian Herrmann <[email protected]> Date: Fri Dec 6 08:22:50 2024 +0000 added error handling for reports commit 6242df9 Author: Adrian Herrmann <[email protected]> Date: Thu Dec 5 08:43:57 2024 +0000 fix: attachment space calculation commit 139210e Author: Adrian Herrmann <[email protected]> Date: Wed Dec 4 09:34:17 2024 +0000 added warning before saving research plan when adding attachments commit c1ebe4c Author: Adrian Herrmann <[email protected]> Date: Tue Dec 3 14:02:29 2024 +0000 added warning before 'keep changes' in dataset commit f8a3887 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 2 14:35:26 2024 +0000 fix: error messages from attachment save commit 73befa5 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 2 09:48:25 2024 +0000 refactor: rm commented out code commit 72ad19a Author: Adrian Herrmann <[email protected]> Date: Fri Nov 29 15:45:48 2024 +0000 Added inbox upload check commit 7f9b306 Author: Adrian Herrmann <[email protected]> Date: Mon Nov 4 13:32:00 2024 +0000 feat: added migration for new user cols and calculation for used space per user and element

and calculation for used space per user and element

github-actions · 2025-01-22T09:17:57Z

LCOV of commit `f83522d` during Continuous Integration #4340

Summary coverage rate:
  lines......: 66.9% (14463 of 21609 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

github-actions · 2025-01-22T09:31:14Z

LCOV of commit `457f2cf` during Continuous Integration #4341

Summary coverage rate:
  lines......: 66.9% (14447 of 21609 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

app/models/attachment.rb

github-actions · 2025-01-24T10:08:53Z

LCOV of commit `d32e068` during Continuous Integration #4356

Summary coverage rate:
  lines......: 66.9% (14447 of 21609 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

JanCBrammer

Do we have documentation for this feature?

I tried the feature in the UI and have a few comments (see below).

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

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

app/javascript/src/components/container/ContainerDatasetModalContent.js

github-actions · 2025-01-29T16:31:40Z

LCOV of commit `4a36abe` during Continuous Integration #4374

Summary coverage rate:
  lines......: 66.9% (14448 of 21607 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

github-actions · 2025-01-30T09:24:13Z

LCOV of commit `430d265` during Continuous Integration #4377

Summary coverage rate:
  lines......: 66.9% (14449 of 21606 lines)
  functions..: no data found
  branches...: no data found

Files changed coverage rate: n/a

Squashed commit of the following: commit ea193ee Author: Adrian Herrmann <[email protected]> Date: Mon Jan 20 09:44:50 2025 +0000 Renamed users_available and changed set and show to MB commit 4983883 Author: Adrian Herrmann <[email protected]> Date: Tue Jan 7 13:11:10 2025 +0000 rebase fix commit d5f3651 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 16 15:08:40 2024 +0000 feat: set available_space in admin interface commit 334a83c Author: Adrian Herrmann <[email protected]> Date: Wed Dec 11 16:07:43 2024 +0000 added usage job commit 5646024 Author: Adrian Herrmann <[email protected]> Date: Fri Dec 6 08:22:50 2024 +0000 added error handling for reports commit 6242df9 Author: Adrian Herrmann <[email protected]> Date: Thu Dec 5 08:43:57 2024 +0000 fix: attachment space calculation commit 139210e Author: Adrian Herrmann <[email protected]> Date: Wed Dec 4 09:34:17 2024 +0000 added warning before saving research plan when adding attachments commit c1ebe4c Author: Adrian Herrmann <[email protected]> Date: Tue Dec 3 14:02:29 2024 +0000 added warning before 'keep changes' in dataset commit f8a3887 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 2 14:35:26 2024 +0000 fix: error messages from attachment save commit 73befa5 Author: Adrian Herrmann <[email protected]> Date: Mon Dec 2 09:48:25 2024 +0000 refactor: rm commented out code commit 72ad19a Author: Adrian Herrmann <[email protected]> Date: Fri Nov 29 15:45:48 2024 +0000 Added inbox upload check commit 7f9b306 Author: Adrian Herrmann <[email protected]> Date: Mon Nov 4 13:32:00 2024 +0000 feat: added migration for new user cols and calculation for used space per user and element

headri requested review from PiTrem and JanCBrammer December 20, 2024 14:06

headri force-pushed the user-storage-space branch from cb78ec5 to d5f3651 Compare January 7, 2025 09:06

github-actions bot reviewed Jan 7, 2025

View reviewed changes

PiTrem linked an issue Jan 8, 2025 that may be closed by this pull request

Disk quota in Chemotion ELN #1242

Open

headri force-pushed the user-storage-space branch 2 times, most recently from cb3e56b to e7a1011 Compare January 8, 2025 12:13

PiTrem changed the title ~~User storage space~~ feat: user storage space Jan 8, 2025

headri force-pushed the user-storage-space branch 2 times, most recently from bf1e72d to 4983883 Compare January 8, 2025 12:56

JanCBrammer reviewed Jan 16, 2025

View reviewed changes

PiTrem added this to the v2.0.0 milestone Jan 21, 2025

Adrian Herrmann added 10 commits January 22, 2025 08:55

feat: added migration for new user cols

9e6f74e

and calculation for used space per user and element

Added inbox upload check

176f0f6

refactor: rm commented out code

0fb904f

fix: error messages from attachment save

547c71a

added warning before 'keep changes' in dataset

0106aef

added warning before saving research plan when adding attachments

886726f

fix: attachment space calculation

5d3ce10

added error handling for reports

cc9d228

added usage job

d02f424

feat: set available_space in admin interface

8d6f98f

headri force-pushed the user-storage-space branch 2 times, most recently from f83522d to 457f2cf Compare January 22, 2025 09:10

headri requested a review from JanCBrammer January 22, 2025 09:47

JanCBrammer reviewed Jan 23, 2025

View reviewed changes

app/models/attachment.rb Outdated Show resolved Hide resolved

Refactoring and changed set and show space to MB

612bcbd

headri force-pushed the user-storage-space branch 2 times, most recently from 860f049 to 894c452 Compare January 24, 2025 11:58

headri requested a review from JanCBrammer January 24, 2025 13:48

Adrian Herrmann added 3 commits January 27, 2025 14:18

changed layout

611b5b2

refactor default and group quota

63ea003

refactor: move quota check to user store

17584ed

headri force-pushed the user-storage-space branch from 7c3aec6 to 17584ed Compare January 27, 2025 14:19

JanCBrammer reviewed Jan 29, 2025

View reviewed changes

app/javascript/src/apps/admin/UserManagement.js Outdated Show resolved Hide resolved

app/javascript/src/apps/admin/AdminDashboard.js Show resolved Hide resolved

app/javascript/src/components/container/ContainerDatasetModalContent.js Outdated Show resolved Hide resolved

headri force-pushed the user-storage-space branch 3 times, most recently from 0cacbdd to 4a36abe Compare January 29, 2025 16:09

headri force-pushed the user-storage-space branch from 4a36abe to 5ad9247 Compare January 30, 2025 09:00

Adrian Herrmann added 2 commits January 30, 2025 09:02

refactor: fix: Review findings

2ab04bb

feat: added quota display to settings

430d265

headri force-pushed the user-storage-space branch from 5ad9247 to 430d265 Compare January 30, 2025 09:03

headri requested a review from JanCBrammer January 31, 2025 09:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: user storage space #2274

feat: user storage space #2274

headri commented Dec 20, 2024 •

edited by PiTrem

Loading

github-actions bot Jan 7, 2025

github-actions bot commented Jan 8, 2025

JanCBrammer left a comment

github-actions bot commented Jan 22, 2025

github-actions bot commented Jan 22, 2025

github-actions bot commented Jan 24, 2025

JanCBrammer left a comment

github-actions bot commented Jan 29, 2025

github-actions bot commented Jan 30, 2025

feat: user storage space #2274

Are you sure you want to change the base?

feat: user storage space #2274

Conversation

headri commented Dec 20, 2024 • edited by PiTrem Loading

Backend

user space accounting/quota

calculation tools as sql functions

cronJob to update user used-space

Frontend

prevent upload if quota exceeded and show message

Admin interface

github-actions bot Jan 7, 2025

Choose a reason for hiding this comment

github-actions bot commented Jan 8, 2025

LCOV of commit 4983883 during Continuous Integration #4284

JanCBrammer left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 22, 2025

LCOV of commit f83522d during Continuous Integration #4340

github-actions bot commented Jan 22, 2025

LCOV of commit 457f2cf during Continuous Integration #4341

github-actions bot commented Jan 24, 2025

LCOV of commit d32e068 during Continuous Integration #4356

JanCBrammer left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 29, 2025

LCOV of commit 4a36abe during Continuous Integration #4374

github-actions bot commented Jan 30, 2025

LCOV of commit 430d265 during Continuous Integration #4377

headri commented Dec 20, 2024 •

edited by PiTrem

Loading

LCOV of commit `4983883` during Continuous Integration #4284

LCOV of commit `f83522d` during Continuous Integration #4340

LCOV of commit `457f2cf` during Continuous Integration #4341

LCOV of commit `d32e068` during Continuous Integration #4356

LCOV of commit `4a36abe` during Continuous Integration #4374

LCOV of commit `430d265` during Continuous Integration #4377