Feature/versioning enhanced

.eslintrc

@@ -17,6 +17,7 @@
     "comma-dangle": [1,"only-multiline"],
     "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
     "prefer-destructuring": ["error", {"object": true, "array": false}],
+    "react/forbid-prop-types": ["off"],
     "no-relative-import-paths/no-relative-import-paths": [
       "error",
       { "allowSameFolder": false, "rootDir": "app/packs" }

Gemfile

@@ -119,6 +119,8 @@ gem 'whenever', require: false
 
 gem 'yaml_db'
 
+gem 'logidze'
+
 group :development do
   gem 'better_errors' # allows to debug exception on backend from browser
 

Gemfile.lock

@@ -283,7 +283,6 @@ GEM
       sixarm_ruby_unaccent (~> 1.1)
     crack (0.4.5)
       rexml
-    crass (1.0.6)
     css_parser (1.12.0)
       addressable
     daemons (1.4.1)
@@ -457,9 +456,11 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logidze (1.2.2)
+      activerecord (>= 5.0)
+      railties (>= 5.0)
+      ruby-next-core (~> 0.9)
     loofah (2.19.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -699,6 +700,7 @@ GEM
       activesupport
       memoist
     ruby-mailchecker (5.0.3)
+    ruby-next-core (0.15.3)
     ruby-ole (1.2.12.2)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
@@ -912,6 +914,7 @@ DEPENDENCIES
   ketcherails!
   launchy
   listen
+  logidze
   memory_profiler
   meta_request
   mimemagic (= 0.3.10)

app/api/api.rb

@@ -5,6 +5,8 @@
 require 'grape-swagger'
 
 class API < Grape::API
+  include LogidzeModule
+
   format :json
   prefix :api
   version 'v1'
@@ -180,6 +182,7 @@ def to_json_camel_case(val)
   mount Chemotion::ConverterAPI
   mount Chemotion::AttachableAPI
   mount Chemotion::SampleTaskAPI
+  mount Chemotion::VersionAPI
 
   add_swagger_documentation(info: {
     "title": "Chemotion ELN",

app/api/chemotion/version_api.rb

@@ -0,0 +1,98 @@
+require 'open-uri'
+
+module Chemotion
+  class VersionAPI < Grape::API
+    include Grape::Kaminari
+    helpers ParamsHelpers
+
+    namespace :versions do
+      resource :samples do
+        desc 'Return versions of the given sample'
+
+        params do
+          requires :id, type: Integer, desc: 'Sample id'
+        end
+
+        paginate per_page: 10, offset: 0, max_per_page: 100
+
+        route_param :id do
+          get do
+            sample = Sample.with_log_data.find(params[:id])
+            versions = Versioning::Fetcher.call(sample)
+
+            { versions: paginate(Kaminari.paginate_array(versions)) }
+          end
+        end
+      end
+
+      resource :reactions do
+        desc 'Return versions of the given reaction'
+
+        params do
+          requires :id, type: Integer, desc: 'Reaction id'
+        end
+
+        paginate per_page: 10, offset: 0, max_per_page: 100
+
+        route_param :id do
+          get do
+            reaction = Reaction.with_log_data.find(params[:id])
+            versions = Versioning::Fetcher.call(reaction)
+
+            { versions: paginate(Kaminari.paginate_array(versions)) }
+          end
+        end
+      end
+
+      resource :research_plans do
+        desc 'Return versions of the given research plan'
+
+        params do
+          requires :id, type: Integer, desc: 'Research plan id'
+        end
+
+        paginate per_page: 10, offset: 0, max_per_page: 100
+
+        route_param :id do
+          get do
+            research_plan = ResearchPlan.with_log_data.find(params[:id])
+            versions = Versioning::Fetcher.call(research_plan)
+
+            { versions: paginate(Kaminari.paginate_array(versions)) }
+          end
+        end
+      end
+
+      resource :screens do
+        desc 'Return versions of the given screen'
+
+        params do
+          requires :id, type: Integer, desc: 'Screen id'
+        end
+
+        paginate per_page: 10, offset: 0, max_per_page: 100
+
+        route_param :id do
+          get do
+            screen = Screen.with_log_data.find(params[:id])
+            versions = Versioning::Fetcher.call(screen)
+
+            { versions: paginate(Kaminari.paginate_array(versions)) }
+          end
+        end
+      end
+
+      resource :revert do
+        desc 'Revert selected changes'
+
+        params do
+          requires :changes, type: JSON, desc: 'Changes hash'
+        end
+
+        post do
+          Versioning::Reverter.call(params[:changes])
+        end
+      end
+    end
+  end
+end

app/api/modules/logidze_module.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# A helper to help logidize track current_user
+module LogidzeModule
+  extend ActiveSupport::Concern
+
+  included do
+    before do
+      if current_user.present? && request.request_method.in?(%w[PATCH POST PUT DELETE])
+        @logidze_meta_set ||= begin
+          Logidze.with_responsible!(current_user.id)
+          true
+        end
+      end
+    end
+
+    after do
+      Logidze.clear_responsible! if @logidze_meta_set.present?
+    end
+  end
+end

app/assets/stylesheets/components/svg_with_popver.scss

@@ -0,0 +1,3 @@
+.image-with-full-width {
+  width: 100%;
+}

app/assets/stylesheets/history.scss

@@ -0,0 +1,126 @@
+.history-legend {
+  display: flex;
+  justify-content: flex-end;
+  list-style: none;
+  padding: 0;
+  margin: 2px 2px 10px 0;
+
+  &__item {
+    font-size: 10px;
+    padding-left: .5em;
+
+    &::before {
+      content: "\f0c8";
+      font-family: FontAwesome;
+      display: inline-block;
+      padding: 0 0.2em;
+    }
+
+    &--old {
+      &::before {
+        color: #f2dede;
+      }
+    }
+
+    &--new {
+      &::before {
+        color: #dff0d8;
+      }
+    }
+
+    &--current {
+      &::before {
+        color: #f5f5f5;
+      }
+    }
+  }
+}
+
+.history-modal .modal-dialog {
+  top: 0;
+  transform: translate(-50%, 0) !important;
+}
+
+.history-alert {
+  margin-bottom: 0;
+  margin-top: 20px;
+}
+
+.history-checkbox-label {
+  margin-bottom: 0;
+  display: flex;
+  gap: 5px;
+  cursor: pointer;
+
+  input {
+    margin-top: 0 !important;
+  }
+}
+
+.history-table {
+  &__caret {
+    transition: transform .1s ease-out;
+  }
+
+  &__row {
+    cursor: pointer;
+
+    &.active {
+      .history-table__caret {
+        transform: rotate(90deg);
+      }
+    }
+  }
+
+  &-breadcrumb {
+    font-size: 13px;
+    padding: 8px 15px;
+    margin: 0;
+    list-style: none;
+    background-color: #f5f5f5;
+    border-radius: 4px;
+
+    &:not(:first-child) {
+      margin-top: 10px;
+    }
+
+    &__element {
+      display: inline-block;
+    }
+
+    &__element + &__element:before {
+      padding: 0 5px;
+      color: #ccc;
+      content: "/ ";
+    }
+  }
+
+  .bg-current {
+    background-color: #f5f5f5;
+  }
+
+  .row-change {
+    display: flex;
+    flex-wrap: wrap;
+    font-size: 10px;
+    margin: 10px 0 0;
+    word-break: break-all;
+
+    & > [class*="col-"] {
+      padding: 6px;
+    }
+
+    .ql-container {
+      font-size: 10px;
+    }
+
+    .ql-editor {
+      padding: 0;
+    }
+
+    .ql-tooltip.ql-hidden {
+      height: 0;
+      padding-top: 10px;
+    }
+  }
+}

app/models/attachment.rb

@@ -32,6 +32,7 @@
 #
 
 class Attachment < ApplicationRecord # rubocop:disable Metrics/ClassLength
+  has_logidze
   include AttachmentJcampAasm
   include AttachmentJcampProcess
   include AttachmentConverter

app/models/container.rb

@@ -20,6 +20,8 @@
 #
 
 class Container < ApplicationRecord
+  has_logidze
+  acts_as_paranoid
   include ElementCodes
   include Datasetable
 

app/models/container_hierarchy.rb

@@ -0,0 +1,2 @@
+class ContainerHierarchy < ApplicationRecord
+end

app/models/elemental_composition.rb

@@ -16,6 +16,8 @@
 #
 
 class ElementalComposition < ApplicationRecord
+  has_logidze
+
   belongs_to :sample
 
   TYPES = {

app/models/reaction.rb

@@ -42,6 +42,7 @@
 #
 
 class Reaction < ApplicationRecord
+  has_logidze
   acts_as_paranoid
   include ElementUIStateScopes
   include PgSearch::Model

app/models/reactions_product_sample.rb

@@ -13,6 +13,8 @@
 #  waste       :boolean          default(FALSE)
 #  coefficient :float            default(1.0)
 #  show_label  :boolean          default(FALSE), not null
+#  created_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
+#  updated_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
 #
 # Indexes
 #

app/models/reactions_purification_solvent_sample.rb

@@ -13,6 +13,8 @@
 #  waste       :boolean          default(FALSE)
 #  coefficient :float            default(1.0)
 #  show_label  :boolean          default(FALSE), not null
+#  created_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
+#  updated_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
 #
 # Indexes
 #

app/models/reactions_reactant_sample.rb

@@ -13,6 +13,8 @@
 #  waste       :boolean          default(FALSE)
 #  coefficient :float            default(1.0)
 #  show_label  :boolean          default(FALSE), not null
+#  created_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
+#  updated_at  :datetime         default(Fri, 01 Oct 2021 00:00:00 UTC +00:00), not null
 #
 # Indexes
 #