labimotion 2.0.0.rc5 → 2.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a48b13c9036bfeb9b2a827cfa78179cf2244e9dc839aa2102d6811113f5274a7
-  data.tar.gz: 7425f00a429413c91f26bfd9c75dbb66dbfd30cacbbe58e361a985e1d17ae85b
+  metadata.gz: 4939f188635fe8994339ee41af70efde1ff991c04fdcf3e5b7655502679db2d6
+  data.tar.gz: de30c9da40f6f8baf061212ae8b13cd8c21bacf4d353a04b27668854b02f464a
 SHA512:
-  metadata.gz: 59781f646145406ab451be32166cf03a32707456c3896754db074d853bbfe31f3a60cc0e69f59fbda2344863a98b2e8f41fe2bcdb79513924935a70bbda4ded0
-  data.tar.gz: c7efaf38bcb81bebf9c61111e63fca0c935723ac15064c58018ad26510608de3e9c4fdbc3cd3b52a645b153485e0c04fb9e080bfa2eaa50ffa4492505887124a
+  metadata.gz: 2985f972026f5ab556ab37fd8dd9226b0728369d8cdc0f8fa5efbb4b35b2cf48e2961e114ef0793fc7c12e1d7cad46b5025ec9f8128ac8e839c7c9e291f1aff8
+  data.tar.gz: d1f5d637746cca7208a50c4a928e512026abc55fd8242252ac87d4e43b6dc72654bc82e5698ecc9f529317f0b3c049a2a5a07f781237e7da0bbebc6374a88cd9

data/lib/labimotion/apis/vocabulary_api.rb

@@ -31,7 +31,7 @@ module Labimotion
             source_id: params[:source_id],
             layer_id: params[:layer_id],
             field_id: params[:name],
-            identifier: params[:source_id],
+            identifier: SecureRandom.uuid,
             created_by: current_user.id,
             properties: declared(params, include_missing: false),
           }

data/lib/labimotion/entities/vocabulary_entity.rb

@@ -11,9 +11,10 @@ module Labimotion
 
       case voc['source']
       when Labimotion::Prop::ELEMENT
-        if voc['identifier'] == 'element.name'
+        voc['source_name'] = ElementKlass.find_by(identifier: voc['source_id'])&.label
+        # if voc['identifier'] == 'element.name'
           # voc['source_name'] = ElementKlass.find_by(identifier: voc['source_id'])&.name
-        end
+        # end
       when Labimotion::Prop::SEGMENT
         voc['source_name'] = SegmentKlass.find_by(identifier: voc['source_id'])&.label
       when Labimotion::Prop::DATASET

data/lib/labimotion/helpers/element_helpers.rb

@@ -127,11 +127,12 @@ module Labimotion
         attributes['properties']['uuid'] = uuid
         attributes['uuid'] = uuid
         attributes['klass_uuid'] = properties['klass_uuid']
-        element.update(attributes)
+        element.update_columns(attributes)
       end
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element.reload
       element.properties = update_vocabularies(element.properties, current_user, element)
+      ## element.user_for_revision = current_user
       element.save!
       element
     rescue StandardError => e

data/lib/labimotion/libs/data/vocab/System.json

@@ -55,7 +55,7 @@
     "id": 4,
     "identifier": "user-name",
     "name": "creator",
-    "label": "creator",
+    "label": "Creator",
     "field_type": "text",
     "opid": 9,
     "term_id": "NCIT_C42628",

data/lib/labimotion/models/concerns/generic_klass_revisions.rb

@@ -43,6 +43,7 @@ module Labimotion
         released_by: released_by,
         uuid: uuid,
         version: version,
+        created_by: updated_by,
         properties_release: properties_release,
         released_at: released_at
       }

data/lib/labimotion/models/concerns/generic_revisions.rb

@@ -8,6 +8,8 @@ module Labimotion
       after_create :create_vault
       after_update :save_to_vault
       before_destroy :delete_attachments
+
+      ## attr_accessor :user_for_revision
     end
 
     def create_vault
@@ -19,6 +21,7 @@ module Labimotion
         uuid: uuid,
         klass_uuid: klass_uuid,
         properties: properties,
+        ## created_by: user_for_revision&.id,
         properties_release: properties_release
       }
       attributes["#{Labimotion::Utils.element_name_dc(self.class.name)}_id"] = id

data/lib/labimotion/models/element.rb

@@ -58,6 +58,9 @@ module Labimotion
     after_create :update_counter
     before_destroy :delete_attachment
 
+    def user_labels
+      tag&.taggable_data&.fetch('user_labels', nil)
+    end
 
     def attachments
       Attachment.where(attachable_id: self.id, attachable_type: self.class.name)

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.0.0.rc5'
+  VERSION = '2.0.0.rc7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0.rc7
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails