ecom_core 1.2.36 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f37ff631e9f8965a0935b6ccd8ca9d28ee8e18c5a81eb9898941bb571a853e2
-  data.tar.gz: 3d7b428a2722a3b2fc1207ea648d6b8032d63b5402af7d8a9ce2297a3acf4230
+  metadata.gz: 8e7a318b5876bb64228f9ea5af19d4a6bebe8ec005fc307beff0711ecdb5ca70
+  data.tar.gz: edb05a7dc9c1bf6e43dfc8c0259cf79adf88cfc3a44b0bfcc377976a322745ac
 SHA512:
-  metadata.gz: 06030361db29cd37a37f43f8f16fb51c9b460c5c6be78e94e2ef21a75f2d23e0bacc3561c52dd732d4d1b8b16ddcac8d39baa83c3ef37fc5ca25a08e347d9557
-  data.tar.gz: 5f4f94583ae5519a0bdc78a4a5183595aa0df0901f0f4e339d5e797756c8b3b40254d89aeb6a30f36d52f7bf197b8961d085d08b97b6515e4de41ddc1bbd5c97
+  metadata.gz: 12240a5cf8319227d7486e79778499aa71340073831b6544a2d1ce77b0ffb2bc0c870184e381ea6fddc6fc41c28298dccea2ffadf36fc2828b9bbb88e07bd4fe
+  data.tar.gz: 1c4fafd9e859327c82ca0701a9484a724aa703fe67de1e873aec4e365f612eee9e9f3cedc65331e77936bc595c40a6dba92ca73de60b4aa94b5a08ccfd7726eb

data/app/models/ecom/core/project_template.rb

@@ -6,6 +6,8 @@ module Ecom
 
       validates :code, :name, presence: true
       validates_uniqueness_of :code
+
+      delegate(:name, to: :task_template_type, prefix: true)
     end
   end
 end

data/app/models/ecom/core/stakeholder.rb

@@ -5,7 +5,7 @@ module Ecom
 
       validates :name, presence: true, uniqueness: true
 
-      delegate :name, to: :stakeholder_type, prefix: true
+      delegate(:name, to: :stakeholder_type, prefix: true)
     end
   end
 end

data/app/models/ecom/core/task_template.rb

@@ -4,7 +4,6 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
-      belongs_to :unit_of_measure
 
       has_many :task_template_inspection_checklists
       has_many :inspection_checklists, through: :task_template_inspection_checklists

data/app/services/ecom/core/menu_service.rb

@@ -9,12 +9,12 @@ module Ecom
         SQL
         menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).order(:id).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-          list << { id: item.id, text: item.label, iconCss: item.icon, items: [] }
+          list << { id: item.id, label: item.label, icon: item.icon, items: [] }
         end
 
         menu_list.each do |ml|
           ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-            list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route } if item.parent_id == ml[:id]
+            list << { id: item.id, label: item.label, icon: item.icon, url: item.route } if item.parent_id == ml[:id]
           end
         end
         { success: true, data: menu_list }

data/config/initializers/carrierwave.rb

@@ -1,5 +1,4 @@
 CarrierWave.configure do |config|
-    config.fog_provider = 'fog/google'
     config.fog_credentials = {
       provider:                         'Google',
       google_storage_access_key_id:     ENV["GOOGLE_STORAGE_ACCESS_KEY"],

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -8,13 +8,9 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'tt_on_ttt_indx' },
                    foreign_key: { to_table: :ecom_core_task_template_types }
-      t.references :unit_of_measure,
-                   null: false,
-                   index: { name: 'tt_on_uof_indx' },
-                   foreign_key: { to_table: :ecom_core_unit_of_measures }
       t.string :ancestry, index: true
-      t.boolean :has_takeoff_fields, null:false, default: false
-      t.jsonb :takeoff_fields, null: false, default: {}
+      t.boolean :has_takeoff_fields, null: false, default: false
+      t.jsonb :takeoff_fields, null: true
       t.integer :percentage_contribution
       t.integer :task_sequence
       t.boolean :has_inspection, null: false, default: false

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.36'.freeze
+    VERSION = '1.3.4'.freeze
   end
 end

data/spec/factories/ecom/core/task_templates.rb

@@ -6,7 +6,6 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :task_template_type
-    association :unit_of_measure
     has_takeoff_fields { false }
     takeoff_fields { [{ name: 'length', label: 'Length' }] }
     percentage_contribution { nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.36
+  version: 1.3.4
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -160,50 +160,16 @@ dependencies:
   name: fog-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: google-api-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement