feat: Incorporate "Gas Scheme" feature in reaction variations table

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Chemotion_ELN Changelog
 ## Latest
 
+* Features and enhancements
+  * Reaction variations table can now represent gaseous materials
+
 ## [v1.10.5]
 > (2024-12-16)
 

app/api/entities/reaction_variation_entity.rb

@@ -20,28 +20,28 @@ def properties
       end
     end
 
-    def materials(material_type)
+    def materials(material_type, entity)
       {}.tap do |materials|
         object[material_type]&.each do |k, v|
-          materials[k] = ReactionVariationMaterialEntity.represent(v)
+          materials[k] = entity.represent(v)
         end
       end
     end
 
     def starting_materials
-      materials(:startingMaterials)
+      materials(:startingMaterials, StartingMaterialEntity)
     end
 
     def reactants
-      materials(:reactants)
+      materials(:reactants, StartingMaterialEntity)
     end
 
     def products
-      materials(:products)
+      materials(:products, ProductMaterialEntity)
     end
 
     def solvents
-      materials(:solvents)
+      materials(:solvents, SolventMaterialEntity)
     end
   end
 
@@ -52,10 +52,37 @@ class ReactionVariationPropertyEntity < ApplicationEntity
     )
   end
 
-  class ReactionVariationMaterialEntity < ApplicationEntity
+  class SolventMaterialEntity < ApplicationEntity
+    expose :volume, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
+  end
+
+  class ProductMaterialEntity < ApplicationEntity
+    IS_GAS = ->(object, _) { (object[:aux][:gasType] == 'gas') }.freeze
+
     expose :mass, using: 'Entities::ReactionVariationMaterialEntryEntity'
     expose :amount, using: 'Entities::ReactionVariationMaterialEntryEntity'
-    expose :volume, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :yield, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :duration, if: IS_GAS, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :temperature, if: IS_GAS, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :concentration, if: IS_GAS, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :turnoverNumber, if: IS_GAS, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :turnoverFrequency, if: IS_GAS, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
+  end
+
+  class StartingMaterialEntity < ApplicationEntity
+    IS_FEEDSTOCK = ->(object, _) { (object[:aux][:gasType] == 'feedstock') }.freeze
+
+    expose :mass, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :amount, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :equivalent, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :volume, if: IS_FEEDSTOCK, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
     expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
   end
 
@@ -68,8 +95,9 @@ class ReactionVariationMaterialAuxEntity < ApplicationEntity
       :molarity,
       :molecularWeight,
       :sumFormula,
-      :yield,
-      :equivalent,
+      :gasType,
+      :vesselVolume,
+      :materialType,
     )
   end
 

app/javascript/src/apps/mydb/elements/details/reactions/ReactionDetails.js

@@ -15,6 +15,9 @@ import ElementActions from 'src/stores/alt/actions/ElementActions';
 import DetailActions from 'src/stores/alt/actions/DetailActions';
 import LoadingActions from 'src/stores/alt/actions/LoadingActions';
 import ReactionVariations from 'src/apps/mydb/elements/details/reactions/variationsTab/ReactionVariations';
+import {
+  REACTION_VARIATIONS_TAB_KEY
+} from 'src/apps/mydb/elements/details/reactions/variationsTab/ReactionVariationsUtils';
 import DetailsTabLiteratures from 'src/apps/mydb/elements/details/literature/DetailsTabLiteratures';
 import ReactionDetailsContainers from 'src/apps/mydb/elements/details/reactions/analysesTab/ReactionDetailsContainers';
 import SampleDetailsContainers from 'src/apps/mydb/elements/details/samples/analysesTab/SampleDetailsContainers';
@@ -585,10 +588,16 @@ export default class ReactionDetails extends Component {
         </Tab>
       ),
       variations: (
-        <Tab eventKey="variations" title="Variations" key={`variations_${reaction.id}`} unmountOnExit={false}>
+        <Tab
+          eventKey={REACTION_VARIATIONS_TAB_KEY}
+          title="Variations"
+          key={`variations_${reaction.id}`}
+          unmountOnExit={false}
+        >
           <ReactionVariations
             reaction={reaction}
             onReactionChange={this.handleReactionChange}
+            isActive={activeTab === REACTION_VARIATIONS_TAB_KEY}
           />
         </Tab>
       )