loggable_activity 0.1.51 → 0.1.53

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_destroy.html.erb

@@ -0,0 +1,18 @@
+<tr>
+  <td>
+    <%= render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity } %>
+  </td>
+  <td>
+    <% update_activity_attrs = activity.update_activity_attrs %>
+    <% if update_attrs = update_activity_attrs[:update_attrs] %>
+      <%= render partial: 'loggable_activity/templates/shared/update_attrs', locals: { update_attrs: update_attrs } %>
+    <% end %>
+    <% if updated_relations = update_activity_attrs[:updated_relations_attrs] %>
+      <br>
+      <%= render partial: 'loggable_activity/templates/shared/updated_relations', locals: { updated_relations: updated_relations } %>
+    <% end %>
+  </td>
+  <td>
+    <%= link_to 'Delete', demo_activity_log_path(activity), data: { turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm' %>
+  </td>
+</tr>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_destroy.html.slim

@@ -0,0 +1,17 @@
+tr 
+  td
+    = render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity }
+  td 
+    b.text-secondary = primary_type(activity)
+    br/
+    - activity.primary_payload_attrs.each do |k, v|
+      = "<i>#{k}:</i> #{v.blank? ? t('loggable.activity.deleted') : v}".html_safe
+      br/
+    br/
+    - activity.relations_attrs.each do |relation_attrs|
+      b.text-secondary = relation_type(relation_attrs)
+      br/
+      = render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation_attrs[:attrs] }
+      br/
+  td 
+    =< link_to 'Delete', demo_activity_log_path(activity), data: {  turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm'

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_show.html.erb

@@ -0,0 +1,18 @@
+<tr>
+  <td>
+    <%= render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity } %>
+  </td>
+  <td>
+    <b class="text-secondary"><%= primary_type(activity) %></b><br/>
+    <% activity.primary_payload_attrs.each do |k, v| %>
+      <%= "<i>#{k}:</i> #{v.blank? ? t('loggable.activity.deleted') : v}".html_safe %><br/>
+    <% end %><br/>
+    <% activity.relations_attrs.each do |relation_attrs| %>
+      <b class="text-secondary"><%= relation_type(relation_attrs) %></b><br/>
+      <%= render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation_attrs[:attrs] } %><br/>
+    <% end %>
+  </td>
+  <td>
+    <%= link_to 'Delete', demo_activity_log_path(activity), data: { turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm' %>
+  </td>
+</tr>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_show.html.slim

@@ -0,0 +1,17 @@
+tr
+  td
+    = render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity }
+  td 
+    b.text-secondary = primary_type(activity)
+    br/
+    - activity.primary_payload_attrs.each do |k, v|
+      = "<i>#{k}:</i> #{v.blank? ? t('loggable.activity.deleted') : v}".html_safe
+      br/
+    br/
+    - activity.relations_attrs.each do |relation_attrs|
+      b.text-secondary = relation_type(relation_attrs)
+      br/
+      = render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation_attrs[:attrs] }
+      br/
+  td 
+    =< link_to 'Delete', demo_activity_log_path(activity), data: {  turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm'

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_update.html.erb

@@ -0,0 +1,18 @@
+<tr>
+  <td>
+    <%= render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity } %>
+  </td>
+  <td>
+    <% update_activity_attrs = activity.update_activity_attrs %>
+    <% if update_attrs = update_activity_attrs[:update_attrs] %>
+      <%= render partial: 'loggable_activity/templates/shared/update_attrs', locals: { update_attrs: update_attrs } %>
+    <% end %>
+    <% if updated_relations = update_activity_attrs[:updated_relations_attrs] %>
+      <br>
+      <%= render partial: 'loggable_activity/templates/shared/updated_relations', locals: { updated_relations: updated_relations } %>
+    <% end %>
+  </td>
+  <td>
+    <%= link_to 'Delete', demo_activity_log_path(activity), data: { turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm' %>
+  </td>
+</tr>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_update.html.slim

@@ -0,0 +1,12 @@
+tr
+  td
+    = render partial: 'loggable_activity/templates/shared/activity_info', locals: { activity: activity }
+  td
+    - update_activity_attrs = activity.update_activity_attrs
+    - if update_attrs = update_activity_attrs[:update_attrs]
+      = render partial: 'loggable_activity/templates/shared/update_attrs', locals: { update_attrs: update_attrs }
+    - if updated_relations = update_activity_attrs[:updated_relations_attrs]
+      br/
+      = render partial: 'loggable_activity/templates/shared/updated_relations', locals: { updated_relations: updated_relations }
+  td 
+    =< link_to 'Delete', demo_activity_log_path(activity), data: {  turbo_method: :delete, confirm: 'Are you sure?' }, class: 'btn btn-danger btn-sm'

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_activity_info.html.erb

@@ -0,0 +1,12 @@
+<div class="px-4">
+  <h5><%= t("loggable.activity.#{activity.action}", name: "") %></h5>
+  <b><%= activity.record_display_name %></b>
+  <br>
+  <i>Actor:&nbsp;</i>
+  <br>
+  <%= activity.actor_display_name %>
+  <br>
+  <i>When:&nbsp;</i>
+  <br>
+  <%= I18n.l(activity.created_at, format: :long) %>
+</div>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_activity_info.html.slim

@@ -0,0 +1,11 @@
+.px-4
+  .h5 = t("loggable.activity.#{activity.action}", name: "")
+  b = activity.record_display_name
+  br
+  i Actor: 
+  br
+  = activity.actor_display_name
+  br
+  i When: 
+  br
+  = I18n.l(activity.created_at, format: :long)

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_list_attrs.html.erb

@@ -0,0 +1,8 @@
+<% if attrs == :deleted %>
+  <%= t('loggable.activity.deleted') %>
+<% elsif attrs.is_a?(Hash) %>
+  <% attrs.each do |k, v| %>
+    <%= "<i>#{k}:</i> #{v.blank? ? t('loggable.activity.deleted') : v}".html_safe %>
+    <br>
+  <% end %>
+<% end %>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_list_attrs.html.slim

@@ -0,0 +1,6 @@
+- if attrs == :deleted
+  = t('loggable.activity.deleted')
+- elsif attrs.is_a?(Hash)
+  - attrs.each do |k, v|
+    = "<i>#{k}:</i> #{v.blank? ? t('loggable.activity.deleted') : v}".html_safe
+    br/

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_update_attrs.html.erb

@@ -0,0 +1,17 @@
+<b class="text-secondary"><%= update_relation_class(update_attrs) %></b>
+<br>
+<% if update_attrs[:attrs] == :deleted %>
+  <%= t('loggable.activity.deleted') %>
+<% else %>
+  <% update_attrs[:attrs].each do |attr| %>
+    <% attr.each do |key, from_to| %>
+      <% next if from_to.nil? %>
+      <i><%= key %></i>
+      <br>
+      <%= "from: #{from_to[:from].nil? ? 'Empty' : from_to[:from]}" %>
+      <br>
+      <%= "to: #{from_to[:to].nil? ? 'Empty' : from_to[:to]}" %>
+      <br>
+    <% end %>
+  <% end %>
+<% end %>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_update_attrs.html.slim

@@ -0,0 +1,14 @@
+b.text-secondary = update_relation_class(update_attrs)
+br/
+- if update_attrs[:attrs] == :deleted
+  = t('loggable.activity.deleted') 
+- else
+  - update_attrs[:attrs].each do |attr|
+    - attr.each do |key, from_to|
+      - next if from_to.nil?
+      i = key
+      br/
+      = "from: #{from_to[:from].nil? ? "Empty" : from_to[:from]}"
+      br/
+      = "to: #{from_to[:to].nil? ? "Empty" : from_to[:to]}"
+      br/

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_updated_relations.html.erb

@@ -0,0 +1,23 @@
+<% updated_relations.each do |relation| %>
+  <b class="text-secondary"><%= update_relation_class(relation) %></b>
+  <br>
+  <% if relation[:previous_attrs].present? %>
+    <i>From:</i>
+    <br>
+    <%= render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation[:previous_attrs][:attrs] } %>
+  <% else %>
+    <i>From:</i>
+    <br>
+    Empty
+    <br>
+  <% end %>
+  <% if relation[:current_attrs].present? %>
+    <i>To:</i>
+    <br>
+    <%= render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation[:current_attrs][:attrs] } %>
+  <% else %>
+    <i>To:</i>
+    <br>
+    Empty
+  <% end %>
+<% end %>

data/lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_updated_relations.html.slim

@@ -0,0 +1,21 @@
+- updated_relations.each do |relation|
+  b.text-secondary = update_relation_class(relation)
+  br/
+  - if relation[:previous_attrs].present?
+    i From:
+    br/
+    = render partial:'loggable_activity/templates/shared/list_attrs', locals: {attrs: relation[:previous_attrs][:attrs] }
+  - else 
+    i From: 
+    br/ 
+    |Empty
+    br
+  - if relation[:current_attrs].present?
+    i To:
+    br/
+    = render partial: 'loggable_activity/templates/shared/list_attrs', locals: { attrs: relation[:current_attrs][:attrs] }
+  - else 
+    i To: 
+    br/
+    |Empty
+  

data/lib/loggable_activity/payloads_builder.rb

@@ -56,7 +56,7 @@ module LoggableActivity
       )
     end
 
-    # Builds payloads for related records.
+    # Builds payloads for relations
     #
     # @param relation_config [Hash] The configuration of the relation.
     def build_relation_payload(relation_config)
@@ -66,6 +66,8 @@ module LoggableActivity
           build_payload(relation_config, 'belongs_to')
         when 'has_one'
           build_payload(relation_config, 'has_one')
+        when 'has_many'
+          build_has_many_payloads(relation_config, 'has_many')
         end
       end
     end
@@ -78,10 +80,23 @@ module LoggableActivity
       associated_record = send(relation_config[relation_type])
       return nil if associated_record.nil?
 
-      associated_loggable_attrs = relation_config['loggable_attrs']
+      build_associated_payload(associated_record, relation_config)
+    end
 
-      encryption_key = associated_record_encryption_key(associated_record, relation_config['data_owner'])
+    # Builds payloads for has_many relations.
+    def build_has_many_payloads(relation_config, relation_type)
+      associated_records = send(relation_config[relation_type])
+      return nil if associated_records.empty?
+
+      associated_records.each do |associated_record|
+        build_associated_payload(associated_record, relation_config)
+      end
+    end
 
+    # Builds the payload for an associated record.
+    def build_associated_payload(associated_record, relation_config)
+      associated_loggable_attrs = relation_config['loggable_attrs']
+      encryption_key = associated_record_encryption_key(associated_record, relation_config['data_owner'])
       encrypted_attrs =
         encrypt_attrs(
           associated_record.attributes,

data/lib/loggable_activity/update_payloads_builder.rb

@@ -4,66 +4,6 @@ module LoggableActivity
   # This module is responsible for building update payloads used in loggable activities.
   module UpdatePayloadsBuilder
     # Builds payloads for an activity update event.
-    #
-    #  Example:
-    #    build_update_payloads
-    #
-    #   Returns:
-    #   [
-    #     [0] #<LoggableActivity::Payload:0x00000001047d31d8> {
-    #       :id => nil,
-    #       :record_type => "Demo::Club",
-    #       :record_id => 7,
-    #       :encrypted_attrs => {
-    #         "changes" => [
-    #           [0] {
-    #             "name" => {
-    #               "from" => "+aQznZK64KLQ8wsyZlSOGQbqm+J8gDX93rNFeF+wY68=\n",
-    #               "to" => "OdS834ZDS06+AYxmz4cUjhtgk7Jc8NoOVAAqR81Is7w=\n"
-    #             }
-    #           }
-    #         ]
-    #       },
-    #       :payload_type => "update_payload",
-    #       :data_owner => false,
-    #       :activity_id => nil,
-    #       :created_at => nil,
-    #       :updated_at => nil
-    #     },
-    #     [1] #<LoggableActivity::Payload:0x0000000107847f80> {
-    #       :id => nil,
-    #       :record_type => "Demo::Address",
-    #       :record_id => 7,
-    #       :encrypted_attrs => {
-    #         "street" => "W7cmT22Bb5TKVmtxTYJt1w==\n",
-    #         "city" => "AAwdTI7Xo86cMbFBAMsMIw==\n",
-    #         "country" => "7gu5wdu6O9tD7Q7+EDOqAg==\n",
-    #         "postal_code" => "ljjfT6MXGNK33/PUyi6Nmw==\n"
-    #       },
-    #       :payload_type => "previous_association",
-    #       :data_owner => false,
-    #       :activity_id => nil,
-    #       :created_at => nil,
-    #       :updated_at => nil
-    #     },
-    #     [2] #<LoggableActivity::Payload:0x0000000107802a98> {
-    #       :id => nil,
-    #       :record_type => "Demo::Address",
-    #       :record_id => 8,
-    #       :encrypted_attrs => {
-    #         "street" => "CuULVgIEgrOcWBxegKEvSg==\n",
-    #         "city" => "QbvodOYMvNFpkvsCprqGqg==\n",
-    #         "country" => "/N03d1OL3TY+aaiPUQ5N1A==\n",
-    #         "postal_code" => "ZZu3S5tnaTeq+wBu0dPKBw==\n"
-    #       },
-    #       :payload_type => "current_association",
-    #       :data_owner => false,
-    #       :activity_id => nil,
-    #       :created_at => nil,
-    #       :updated_at => nil
-    #     }
-    #   ]
-    #
     def build_update_payloads
       @update_payloads = []
 
@@ -113,10 +53,28 @@ module LoggableActivity
         case key
         when 'belongs_to'
           build_relation_update_for_belongs_to(relation_config)
+        when 'has_one'
+          build_relation_update_for_has_one(relation_config)
+        when 'has_many'
+          build_relation_update_for_has_many(relation_config)
         end
       end
     end
 
+    def build_relation_update_for_has_many(relation_config)
+      # NOTE: This method is not implemented yet.
+      # It requires that there is a form where it is possible to change
+      # the related records. This is not implemented yet. in the Demo app
+      # puts relation_config['has_many']
+    end
+
+    def build_relation_update_for_has_one(relation_config)
+      # NOTE: This method is not implemented yet.
+      # It requires that there is a form where it is possible to change
+      # the related records. This is not implemented yet. in the Demo app
+      # puts relation_config['has_many']
+    end
+
     def build_relation_update_for_belongs_to(relation_config)
       relation_id = "#{relation_config['belongs_to']}_id"
       model_class_name = relation_config['model']

data/lib/loggable_activity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LoggableActivity
-  VERSION = '0.1.51'
+  VERSION = '0.1.53'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggable_activity
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.53
 platform: ruby
 authors:
 - "Max \nGroenlund"
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,44 +28,50 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.2
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.10.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +211,33 @@ files:
 - lib/generators/.DS_Store
 - lib/generators/loggable_activity/.DS_Store
 - lib/generators/loggable_activity/install_generator.rb
+- lib/generators/loggable_activity/install_templates_generator.rb
 - lib/generators/loggable_activity/templates/.DS_Store
+- lib/generators/loggable_activity/templates/config/locales/loggable_activity.en.yml
+- lib/generators/loggable_activity/templates/config/loggable_activity.yml
 - lib/generators/loggable_activity/templates/create_loggable_activities.rb
 - lib/generators/loggable_activity/templates/create_loggable_encryption_keys.rb
 - lib/generators/loggable_activity/templates/create_loggable_payloads.rb
 - lib/generators/loggable_activity/templates/current_user.rb
+- lib/generators/loggable_activity/templates/helpers/loggable_activity_helper.rb
 - lib/generators/loggable_activity/templates/loggable_activity.en.yml
-- lib/generators/loggable_activity/templates/loggable_activity.yml
 - lib/generators/loggable_activity/templates/loggable_activity_helper.rb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_create.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_create.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_destroy.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_destroy.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_show.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_show.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_update.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_update.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_activity_info.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_activity_info.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_list_attrs.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_list_attrs.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_update_attrs.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_update_attrs.html.slim
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_updated_relations.html.erb
+- lib/generators/loggable_activity/templates/views/loggable_activity/templates/shared/_updated_relations.html.slim
 - lib/loggable_activity.rb
 - lib/loggable_activity/.DS_Store
 - lib/loggable_activity/activity.rb