marty 8.0.0 → 8.2.0

data/app/components/marty/notifications/window.rb

@@ -0,0 +1,23 @@
+require 'marty/notifications/grid_view'
+
+module Marty
+  module Notifications
+    class Window < Netzke::Window::Base
+      def configure(c)
+        super
+
+        c.title     = 'Notifications'
+        c.modal     = true
+        c.items     = [:grid_view]
+        c.lazy_loading = true
+        c.width = 800
+        c.height = 550
+      end
+
+      component :grid_view do |c|
+        c.klass = Marty::Notifications::GridView
+        c.rows_per_page = 30
+      end
+    end
+  end
+end

data/app/components/marty/promise_view.rb

@@ -50,7 +50,7 @@ class Marty::PromiseView < Netzke::Tree::Base
   end
 
   def bbar
-    [:clear, '->', :refresh, :download]
+    [:clear, :cancel_job, '->', :refresh, :download]
   end
 
   action :clear do |a|
@@ -60,6 +60,13 @@ class Marty::PromiseView < Netzke::Tree::Base
     a.hidden   = !self.class.has_perm?(:admin)
   end
 
+  action :cancel_job do |a|
+    a.text     = a.tooltip = 'Cancel Job'
+    a.disabled = false
+    a.icon_cls = 'fa fa-minus glyph'
+    a.hidden   = !self.class.has_perm?(:admin)
+  end
+
   action :download do |a|
     a.text     = a.tooltip = 'Download'
     a.disabled = true
@@ -77,6 +84,11 @@ class Marty::PromiseView < Netzke::Tree::Base
     client.netzke_on_refresh
   end
 
+  endpoint :cancel_job do |id|
+    Marty::Promises::Cancel.call(id)
+    client.netzke_on_refresh
+  end
+
   def get_records params
     search_scope = config[:live_search_scope] || :live_search
     Marty::VwPromise.children_for_id(params[:id], params[search_scope])

data/app/components/marty/promise_view/client/promise_view.js

@@ -64,5 +64,23 @@
   // extra request for every node expand event.
   netzkeOnNodeStateChange: function() {
     return;
+  },
+
+  netzkeOnCancelJob: function (params) {
+    var me = this;
+      var sel = this.getSelectionModel().getSelection();
+      if (sel.length != 1) {
+          return this.netzkeNotify('select one job to cancel')
+      }
+    Ext.Msg.show({
+      title: 'Cancel this Job?',
+      msg: 'Enter CANCEL and press OK to cancel the job',
+      width: 375,
+      buttons: Ext.Msg.OKCANCEL,
+      prompt: true,
+        fn: function (btn, value) {
+            (btn == "ok" && value == "CANCEL") && me.server.cancelJob(sel[0].getId());
+      }
+    });
   }
 }

data/app/components/marty/simple_app/client/simple_app.js

@@ -18,6 +18,7 @@
     });
 
     this.setRouting();
+    this.netzkeInitComponentCallback();
   },
 
   setRouting: function () {
@@ -54,5 +55,8 @@
 
   onToggleConfigMode: function (params) {
     this.toggleConfigMode();
-  }
+  },
+
+  netzkeInitComponentCallback: function() {
+  },
 }

data/app/components/marty/users/user_view.rb

@@ -0,0 +1,177 @@
+module Marty
+  class Users
+    class UserView < Marty::Grid
+      has_marty_permissions create: [:admin, :user_manager],
+                            read:   :any,
+                            update: [:admin, :user_manager],
+                            delete: [:admin, :user_manager]
+
+      # list of columns to be displayed in the grid view
+      def self.user_columns
+        [
+          :login,
+          :firstname,
+          :lastname,
+          :active,
+          :user_roles,
+        ]
+      end
+
+      def configure(c)
+        super
+
+        c.attributes   ||= self.class.user_columns
+        c.title        ||= I18n.t('users', default: 'Users')
+        c.model          = 'Marty::User'
+        c.editing        = :in_form
+        c.paging         = :pagination
+        c.multi_select   = false
+        if c.attributes.include?(:login)
+          c.store_config[:sorters] = [{ property: :login,
+                                           direction: 'ASC', }]
+        end
+        c.scope = ->(arel) { arel.includes(:user_roles) }
+      end
+
+      def self.set_roles(roles, user)
+        roles = [] unless roles.present?
+
+        roles = ::Marty::RoleType.from_nice_names(roles)
+
+        roles_in_user = user.user_roles.map(&:role)
+        roles_to_delete = roles_in_user - roles
+        roles_to_add = roles - roles_in_user
+
+        Marty::User.transaction do
+          user.user_roles.where(role: roles_to_delete).map(&:destroy!)
+
+          roles_to_add.each do |role|
+            user.user_roles.create!(role: role)
+          end
+        end
+      end
+
+      def self.create_edit_user(data)
+        # Creates initial place-holder user object and validate
+        user = data['id'].nil? ? User.new : User.find(data['id'])
+
+        user_columns.each do |c|
+          user.send("#{c}=", data[c.to_s]) unless c == :user_roles
+        end
+
+        if user.valid?
+          user.save
+          set_roles(data['user_roles'], user)
+        end
+
+        user
+      end
+
+      # override the add_in_form and edit_in_form endpoint. User creation/update
+      # needs to use the create_edit_user method.
+
+      endpoint :add_window__add_form__submit do |params|
+        data = ActiveSupport::JSON.decode(params[:data])
+
+        data['id'] = nil
+
+        unless self.class.can_perform_action?(:create)
+          client.netzke_notify 'Permission Denied'
+          return
+        end
+
+        user = self.class.create_edit_user(data)
+        if user.valid?
+          client.success = true
+          client.netzke_on_submit_success
+        else
+          client.netzke_notify(model_adapter.errors_array(user).join("\n"))
+        end
+      end
+
+      endpoint :edit_window__edit_form__submit do |params|
+        data = ActiveSupport::JSON.decode(params[:data])
+        unless self.class.can_perform_action?(:update)
+          client.netzke_notify 'Permission Denied'
+          return
+        end
+
+        user = self.class.create_edit_user(data)
+        if user.valid?
+          client.success = true
+          client.netzke_on_submit_success
+        else
+          client.netzke_notify(model_adapter.errors_array(user).join("\n"))
+        end
+      end
+
+      action :add do |a|
+        super(a)
+        a.text     = I18n.t('user_grid.new')
+        a.tooltip  = I18n.t('user_grid.new')
+        a.icon_cls = 'fa fa-user-plus glyph'
+      end
+
+      action :edit do |a|
+        super(a)
+        a.icon_cls = 'fa fa-user-cog glyph'
+      end
+
+      action :delete do |a|
+        super(a)
+        a.icon_cls = 'fa fa-user-minus glyph'
+      end
+
+      def default_context_menu
+        []
+      end
+
+      attribute :login do |c|
+        c.width   = 100
+        c.label   = I18n.t('user_grid.login')
+      end
+
+      attribute :firstname do |c|
+        c.width   = 100
+        c.label   = I18n.t('user_grid.firstname')
+      end
+
+      attribute :lastname do |c|
+        c.width   = 100
+        c.label   = I18n.t('user_grid.lastname')
+      end
+
+      attribute :active do |c|
+        c.width   = 60
+        c.label   = I18n.t('user_grid.active')
+      end
+
+      attribute :user_roles do |c|
+        c.width   = 100
+        c.flex    = 1
+        c.label   = I18n.t('user_grid.roles')
+        c.type    = :string
+
+        c.getter = lambda do |r|
+          Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
+        end
+
+        store = ::Marty::RoleType.to_nice_names(::Marty::RoleType::VALUES.sort)
+
+        c.editor_config = {
+          multi_select: true,
+          empty_text:   I18n.t('user_grid.select_roles'),
+          store:        store,
+          type:         :string,
+          xtype:        :combo,
+        }
+      end
+
+      attribute :created_dt do |c|
+        c.label     = I18n.t('user_grid.created_dt')
+        c.format    = 'Y-m-d H:i'
+        c.read_only = true
+      end
+    end
+  end
+end

data/app/controllers/marty/application_controller.rb

@@ -22,6 +22,7 @@ class Marty::ApplicationController < ActionController::Base
     if session[:user_id]
       if session_expired? && !try_to_autologin
         reset_session
+        reset_signed_cookies
       else
         session[:atime] = Time.now.utc.to_i
       end
@@ -50,6 +51,8 @@ class Marty::ApplicationController < ActionController::Base
     session[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
+
+    set_signed_cookies
   end
 
   def user_setup
@@ -78,6 +81,7 @@ class Marty::ApplicationController < ActionController::Base
       user = Marty::User.try_to_autologin(cookies[:autologin])
       if user
         reset_session
+        reset_signed_cookies
         start_user_session(user)
       end
       user
@@ -87,6 +91,7 @@ class Marty::ApplicationController < ActionController::Base
   # Sets the logged in user
   def set_user(user)
     reset_session
+    reset_signed_cookies
     if user && user.is_a?(Marty::User)
       Marty::User.current = user
       start_user_session(user)
@@ -123,6 +128,14 @@ class Marty::ApplicationController < ActionController::Base
     set_user(user)
   end
 
+  def set_signed_cookies
+    cookies.signed[:user_id] = session[:user_id]
+  end
+
+  def reset_signed_cookies
+    cookies.signed[:user_id] = nil
+  end
+
   def toggle_dark_mode
     cookies[:dark_mode] = cookies[:dark_mode] != 'true'
   end

data/app/models/marty/data_grid.rb

@@ -249,7 +249,7 @@ class Marty::DataGrid < Marty::Base
 
   # private method used to cache lookup_grid_distinct_entry_h result
   delorean_fn :lookup_grid_h_priv,
-              private: true, cache: true, sig: 4 do |pt, dgh, h, distinct|
+              to_hash: false, private: true, cache: true, sig: 4 do |pt, dgh, h, distinct|
     lookup_grid_distinct_entry_h(
       pt, h, dgh, nil, true, false, distinct)['result']
   end

data/app/models/marty/notifications.rb

@@ -0,0 +1,4 @@
+module Marty
+  module Notifications
+  end
+end

data/app/models/marty/notifications/config.rb

@@ -0,0 +1,25 @@
+module Marty
+  module Notifications
+    class Config < Marty::Base
+      self.table_name = 'marty_notifications_configs'
+
+      AVAILABLE_TYPES = ::Marty::Notifications::Delivery.
+        state_machines[:delivery_type].states.map(&:value)
+
+      belongs_to :recipient, class_name: '::Marty::User'
+
+      validates :recipient, presence: true
+
+      validates :delivery_type, presence: true, inclusion: { in: AVAILABLE_TYPES }
+
+      validates :delivery_type,
+                presence: true,
+                uniqueness: { scope: [:event_type, :recipient_id] }
+
+      state_machine :state, initial: :on do
+        state :off
+        state :on
+      end
+    end
+  end
+end

data/app/models/marty/notifications/delivery.rb

@@ -0,0 +1,56 @@
+module Marty
+  module Notifications
+    class Delivery < Marty::Base
+      self.table_name = 'marty_notifications_deliveries'
+
+      belongs_to :notification, class_name: '::Marty::Notifications::Notification'
+      belongs_to :recipient, class_name: '::Marty::User'
+
+      validates :state, presence: true
+
+      # One delivery per type per notification for user
+      validates :delivery_type,
+                presence: true,
+                uniqueness: { scope: [:notification_id, :recipient_id] }
+
+      state_machine :delivery_type, initial: :web do
+        state :web do
+          def processor
+            Marty::Notifications::Processors::Web
+          end
+        end
+
+        # state :email do
+        # def processor
+        # Marty::Notifications::Processors::Email
+        # end
+        # end
+        #
+        # state :sms do
+        # def processor
+        # Marty::Notifications::Processors::Sms
+        # end
+        # end
+      end
+
+      state_machine :state, initial: :pending do
+        state :pending
+        state :sent
+        state :delivered
+        state :failed
+
+        event :set_sent do
+          transition [:pending, :failed] => :sent, sent: same
+        end
+
+        event :set_failed do
+          transition [:pending, :sent] => :failed, failed: same
+        end
+
+        event :set_delivered do
+          transition all => :delivered
+        end
+      end
+    end
+  end
+end

data/app/models/marty/notifications/event_type.rb

@@ -0,0 +1,11 @@
+module Marty
+  module Notifications
+    class EventType < Marty::Base
+      extend Marty::PgEnum
+
+      VALUES = Set[
+        'API reached the limit'
+      ]
+    end
+  end
+end

data/app/models/marty/notifications/notification.rb

@@ -0,0 +1,25 @@
+module Marty
+  module Notifications
+    class Notification < Marty::Base
+      self.table_name = 'marty_notifications'
+
+      validates :state, :event_type, presence: true
+
+      has_many(
+        :deliveries,
+        class_name: '::Marty::Notifications::Delivery',
+        dependent: :destroy,
+        foreign_key: :notification_id
+      )
+
+      state_machine :state, initial: :pending do
+        state :pending
+        state :processed
+
+        event :set_processed do
+          transition processed: same, pending: :processed
+        end
+      end
+    end
+  end
+end