web47core 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f54ec070076d76e56d136ae5591375af7fef5de343ace173a968d960944b72
-  data.tar.gz: 0ad4b7661dabd9358bc09cbfbe2f61b83fec4f59eac5d98257363e42796a3b38
+  metadata.gz: 03eb842ad5444dd142207611058066153025ed42450633fd8bd8016214ccc298
+  data.tar.gz: 85da9686cff8dbae5982617475714889ce1585c631232f6d65fa627bba057b23
 SHA512:
-  metadata.gz: 812533c9e7612635e8646d144582388489cc34e91dd1682adcbc39ec698cec27f8788553d7a60eb18de139b6be5d7746b3525514152910ee382cd7942c35e9c8
-  data.tar.gz: b732ba4c2b1fd46e3e769aefb57ca346e8527049885ecf22988963df5b10c1c6379a4da1f01d0a2a70fa6ab38354d32f3ac10af2411e85572215e89d855dd6e3
+  metadata.gz: dfa486a0aa38f932402b77796a8b09d8a80454714bfbd67a7cfef9d0da86bb12b6dda705b3554f5814533ba3251bcc3c4192cd1fd1e8f3d538b988ba890777c9
+  data.tar.gz: c699bca4b6ae1839f33746301386e0b015673de416a804f01288a5a48de1e13bdf9a5b91b5f28a45af4cbc87b2a726711fd3642007d5a88aec35e81c4973f82a

data/app/helpers/core_form_helper.rb

@@ -160,7 +160,7 @@ module CoreFormHelper
                             value: option_value[:value],
                             selected: value.eql?(option_value[:key]) }
                         else
-                          { key: option_value[:_id],
+                          { key: option_value[:_id].to_s,
                             value: option_value[:display_name] || option_value[:name],
                             selected: value.eql?(option_value) }
                         end

data/app/helpers/core_link_helper.rb

@@ -17,8 +17,10 @@ module CoreLinkHelper
   # Setup the text as copy text
   #
   def copy_tag(copy_text, options = {})
+    secure = options[:secure] || false
+    display_text = secure ? mask_value(copy_text) : copy_text
     content_tag(:div, class: 'clipboard') do
-      concat(content_tag(:span) { copy_text })
+      concat(content_tag(:span) { display_text })
       concat(copy_text_tag(copy_text, options))
       concat(download_tag(options[:download_url], options)) if options[:download_url].present?
     end
@@ -97,7 +99,8 @@ module CoreLinkHelper
     return unless can? :edit, obj
 
     icon = options[:icon] || 'edit'
-    content_tag(:a, href: path) do
+    tooltip = options[:tooltip] || 'Edit'
+    content_tag(:a, href: path, class: 'tooltipped', data: {tooltip: tooltip}) do
       concat(content_tag(:i, class: 'material-icons') do
         icon
       end)

data/lib/app/jobs/cron/trim_notifications.rb

@@ -28,7 +28,7 @@ module Cron
       time = if item.is_a?(EmailNotification) && template?(item)
                5.years.ago.utc
              else
-               allowed_time
+               allowed_time_for_item(item)
              end
       item.updated_at < time
     end

data/lib/app/models/concerns/core_system_configuration.rb

@@ -68,8 +68,10 @@ module CoreSystemConfiguration
       field :switchboard_stack_id, type: String
       field :switchboard_stack_api_token, type: String
       field :switchboard_last_sync_at, type: Time
-      # Audit Logs TTL
+      # TTLs
       field :user_model_audit_log_ttl, type: Integer, default: 365
+      field :slack_notification_ttl, type: Integer, default: 5
+      field :email_notification_ttl, type: Integer, default: 180
       #
       # Validations
       #

data/lib/app/models/notification.rb

@@ -233,6 +233,15 @@ class Notification
     result
   end
 
+  #
+  # Titleize the type of this notification as its name
+  #
+  def name
+    _type.titleize
+  rescue StandardError
+    _type
+  end
+
   private
 
   #

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.0.13'
+  VERSION = '1.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement