ditty 0.9.1 → 0.10.1

data/views/partials/pager.haml

@@ -1,26 +1,45 @@
 %nav{"aria-label" => "Page navigation"}
-  - if list.pagination_record_count > 0
-    %p.text-center Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
-    %ul.pagination.justify-content-center
-      - if list.first_page?
-        %li.page-item.disabled
-          %span.page-link First
-        %li.page-item.disabled
-          %span.page-link Previous
-      - else
-        %li.page-item
-          %a.page-link{href: first_link} First
-        %li.page-item
-          %a.page-link{href: prev_link} Previous
-      - if list.last_page?
-        %li.page-item.disabled
-          %span.page-link Next
-        %li.page-item.disabled
-          %span.page-link Last
-      - else
-        %li.page-item
-          %a.page-link{href: next_link} Next
-        %li.page-item
-          %a.page-link{href: last_link} Last
-  - else
-    %p.text-center No records to show
+  .row
+    .col-sm-12.col-md-6
+      %p.my-2
+        - if list.pagination_record_count > 0
+          Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
+        - else
+          %p.text-center No records to show
+    .col-sm-12.col-md-6
+      - if list.pagination_record_count > 0
+        %ul.pagination.justify-content-end
+          - if list.first_page?
+            %li.page-item.disabled
+              %span.page-link First
+            %li.page-item.disabled
+              %span.page-link Previous
+          - else
+            %li.page-item
+              %a.page-link{ href: first_link } First
+            %li.page-item
+              %a.page-link{ href: prev_link } Previous
+          %li.page-item
+            .dropdown
+              %button.page-link.dropdown-toggle{ type: 'button', id: 'dropdownMenuButton', 'data-toggle':  'dropdown', 'aria-haspopup': 'true', 'aria-expanded': 'false' }
+                = params[:count] || 10
+              .dropdown-menu
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 10)}" } 10
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 25)}" } 25
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 50)}" } 50
+                %a.dropdown-item{ href: "#{base_path}?#{query_string(count: 100)}" } 100
+          - if list.last_page?
+            %li.page-item.disabled
+              %span.page-link Next
+            %li.page-item.disabled
+              %span.page-link Last
+          - else
+            %li.page-item
+              %a.page-link{ href: next_link } Next
+            %li.page-item
+              %a.page-link{ href: last_link } Last
+          %li
+             
+          %li
+            %a.page-link{ href: "#{base_path}/.csv?#{URI.encode_www_form(params.merge(count: 'all'))}" }
+              Export

data/views/partials/search.haml

@@ -1,20 +1,25 @@
-- if self.class.const_defined?(:SEARCHABLE) || self.class.const_defined?(:FILTERS)
+- if self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive? || self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
   = form_tag(base_path, form_verb: :get, attributes: { class: '' }) do
-    - if self.class.const_defined?(:SEARCHABLE)
+    - if self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive?
       .form-group
         .input-group
           %input.form-control{ name: 'q', type: 'text', placeholder: 'Search...', value: params[:q] }
           .input-group-btn
             %button.btn.btn-primary{ type: 'submit' }
               %span.fa.fa-search
-          - if self.class.const_defined? :FILTERS
+          - if self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
             .input-group-btn
               %button.btn.btn-secondary{ type: 'button', :'data-toggle' => 'collapse', :'data-target' => '#filter-form', :'aria-expanded' => 'false', :'aria-controls' => '#filter-form'}
                 %span.fa.fa-arrow-down
 
-    - if self.class.const_defined?(:FILTERS)
-      #filter-form.row{ class: self.class.const_defined?(:SEARCHABLE) ? 'collapse' : '' }
-        - FILTERS.each do |filter|
-          = filter_control(filter, filters: FILTERS.count)
-        - unless self.class.const_defined?(:SEARCHABLE)
-          %button.btn.btn-secondary{ type: 'submit'} Go
+    - if self.class.const_defined?(:FILTERS) && FILTERS.count.positive?
+      #filter-form{ class: self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive? ? 'collapse' : '' }
+        .card.card-default.mb-2
+          .card-body
+            .row
+              - FILTERS.each do |filter|
+                = filter_control(filter, filters: FILTERS.count)
+              - unless self.class.const_defined?(:SEARCHABLE) && SEARCHABLE.count.positive?
+                .form-group
+                  %label
+                  %button.form-control.btn.btn-secondary{ type: 'submit'} Go

data/views/partials/sidebar.haml

@@ -3,12 +3,12 @@
   / Sidebar - Brand
   %a.sidebar-brand.d-flex.align-items-center.justify-content-center{ href: config('ditty.home_page', settings.map_path || '/') }
     .sidebar-brand-icon.rotate-n-15
-      %i.fas.fa-laugh-wink
+      %i.fas{ class: config('ditty.brand-icon', 'fa-laugh-wink') }
     .sidebar-brand-text.mx-3
       = config('ditty.title', 'Ditty')
 
-  / Divider
   %hr.sidebar-divider.my-0
+
   = haml :'partials/navitems'
 
   .text-center.d-none.d-md-inline

data/views/partials/sort_ui.haml

@@ -0,0 +1,2 @@
+%a{ href: "#{base_path}?#{sort_query(field)}" }
+  %i.fa{ class: sort_icon(field) }

data/views/partials/timespan_selector.haml

@@ -0,0 +1,64 @@
+- if defined?(context)
+  - if context.interval
+    %li.nav-item.dropdown.no-arrow
+      %a#intervalDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'aria-haspopup': 'true', 'area-expanded': 'false', 'data-toggle': 'dropdown' }
+        %span.mr-2.d-none.d-lg-inline.text-gray-600
+          Interval /
+          %strong
+            = context.interval
+      .dropdown-menu.dropdown-menu-right.shadow.animated--grow-in{ 'aria-labelledby': 'intervalDropdown' }
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1m'))}", class: context.interval == '1m' ? 'active' : '' }
+          1 Minute
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '5m'))}", class: context.interval == '5m' ? 'active' : '' }
+          5 Minutes
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '15m'))}", class: context.interval == '15m' ? 'active' : '' }
+          15 Minutes
+        .dropdown-divider
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1h'))}", class: context.interval == '1h' ? 'active' : '' }
+          1 Hour
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '3h'))}", class: context.interval == '3h' ? 'active' : '' }
+          3 Hours
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '6h'))}", class: context.interval == '6h' ? 'active' : '' }
+          6 Hours
+        .dropdown-divider
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1d'))}", class: context.interval == '1d' ? 'active' : '' }
+          1 Day
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '2d'))}", class: context.interval == '2d' ? 'active' : '' }
+          2 Days
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1w'))}", class: context.interval == '1w' ? 'active' : '' }
+          1 Week
+
+  - if context.timespan
+    %li.nav-item.dropdown.no-arrow
+      %a#timespanDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'aria-haspopup': 'true', 'area-expanded': 'false', 'data-toggle': 'dropdown' }
+        %span.mr-2.d-none.d-lg-inline.text-gray-600
+          Timespan /
+          %strong
+            = context.timespan.split('/').first
+      .dropdown-menu.dropdown-menu-right.shadow.animated--grow-in{ 'aria-labelledby': 'timespanDropdown' }
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1h', interval: ''))}", class: context.timespan == '1h' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          1 Hour
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1d', interval: ''))}", class: context.timespan == '1d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          1 Day
+        .dropdown-divider
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1w/d', interval: ''))}", class: context.timespan == '1w/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          1 Week
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '2w/d', interval: ''))}", class: context.timespan == '2w/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          2 Weeks
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1M/d', interval: ''))}", class: context.timespan == '1M/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          1 Month
+        .dropdown-divider
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '3M/d', interval: ''))}", class: context.timespan == '3M/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          3 Months
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '6M/d', interval: ''))}", class: context.timespan == '6M/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          6 Months
+        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1y/d', interval: ''))}", class: context.timespan == '1y/d' ? 'active' : '' }
+          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
+          1 Year

data/views/partials/topbar.haml

@@ -1,18 +1,3 @@
-/ Logout Modal
-#logoutModal.modal.fade{ tabindex: -1, role: 'dialog', 'aria-hidden': 'true' }
-  .modal-dialog{ role: 'document' }
-    .modal-content
-      .modal-header
-        %h5.modal-title Ready to Leave?
-        %button.close{ type: 'button', 'data-dismiss': 'modal', 'aria-label': 'Close' }
-          %span{ 'aria-hidden': 'true' } ×
-      .modal-body
-        Select "Logout" below if you are ready to end your current session.
-      .modal-footer
-        %button.btn.btn-secondary{ type: 'button', 'data-dismiss': 'modal' } Cancel
-        = delete_form_tag("#{settings.map_path}/auth") do
-          %button.btn.btn-primary{ type: 'submit' } Logout
-
 %nav.navbar.navbar-expand.navbar-light.bg-white.topbar.mb-4.static-top.shadow
   / Sidebar Toggle
   %button#sidebarToggleTop.btn.btn-link.d-md-none.rounded-circle.mr-3

data/views/partials/user_associations.haml

@@ -0,0 +1,32 @@
+- group = entity.class.to_s.demodulize.underscore
+%table.table.mb-0
+  %tbody
+    - if entity.users.count.positive?
+      - entity.users.each do |user|
+        %tr
+          %td
+            - if policy(user).read?
+              %a{ href: "#{settings.map_path}/users/#{user.id}" }
+                = user.username
+            - else
+              = user.username
+          %td.text-right
+            = delete_form_tag "#{base_path}/#{entity.display_id}/users/#{user.id}" do
+              %button.btn.btn-danger.btn-sm{ type: 'submit' } ×
+    - else
+      %tr
+        %td{ colspan: 2 } No Users Associated
+    %tr
+      %td{ colspan: 2 }
+        - users = user_options.select { |k, v| entity.users.map(&:id).include?(k) == false }
+        - if users && users.count.positive?
+          = new_form_tag "#{base_path}/#{entity.display_id}/users" do
+            .input-group
+              %select.form-control{ name: "#{group}[user_id]", id: 'user_id' }
+                %option{ value: '' } Select User
+                - users.each do |key, value|
+                  %option{ value: key }= value
+              %span.input-group-append
+                %button.btn.btn-primary{ type: 'submit' } Add User
+        - else
+          No Users available to link

data/views/quick_start.haml

@@ -0,0 +1,23 @@
+%link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/themes/prism-okaidia.min.css' }
+
+.row.mb-4
+  .col-2
+  .col-8
+    .card.card-default.border-left-dark.shadow.h-100
+      %h4.card-header Run on a folder
+      .card-body
+        %pre
+          %code.lang-shell
+            :preserve
+              docker run -d -e ELASTICSEARCH_HOSTS=192.168.1.200:9200 \
+                --volume=/var/log/nginx/:/usr/share/incoming/ \
+                hackerplanet/requestd-filebeat:latest
+    .card.card-default.border-left-dark.shadow.h-100
+      %h4.card-header Run on a single file
+      .card-body
+        %pre
+          %code.lang-shell
+            :preserve
+              docker run -d -e ELASTICSEARCH_HOSTS=elastic.hackerpla.net:9200 \
+                --volume=/var/log/nginx/access.log:/usr/share/incoming/access.log \
+                hackerplanet/requestd-filebeat:latest

data/views/roles/display.haml

@@ -1,7 +1,7 @@
 .row.mb-4
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         %p.description
           %label Name:
@@ -22,10 +22,10 @@
 .row
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         %h4.card-title Included Roles
-      %table.table.table-striped
+      %table.table.table-striped.mb-0
         %tbody
           - if entity.descendants.count > 0
             - entity.descendants.each do |role|

data/views/roles/edit.haml

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card
+    .card.card-default.shadow
       .card-body
         = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'roles/form', locals: { entity: entity }

data/views/roles/index.haml

@@ -4,7 +4,7 @@
     %table.table.table-striped.table-bordered.table-hover
       %thead.thead-dark
         %tr
-          %th Name
+          %th= "Name#{sort_ui(:name)}"
           %th Parent
           %th
       %tbody
@@ -24,4 +24,4 @@
             %td.text-center{ colspan: 3 } No Roles
 
 - if list.count > 0
-  =pagination(list, base_path)
+  = pagination(list, base_path)

data/views/roles/new.haml

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         = new_form_tag base_path do
           = haml :'roles/form', locals: { entity: entity }

data/views/user_login_traits/display.haml

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         %p.description
           %label User:

data/views/user_login_traits/edit.haml

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'user_login_traits/form', locals: { entity: entity }

data/views/user_login_traits/index.haml

@@ -1,30 +1,28 @@
 .row
   .col-md-12
-    .card.card-default
-      .card-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead.thead-dark
-          %tr
-            %th User
-            %th IP Address
-            %th Device
-            %th Platform
-            %th Browser
-            %th Last Seen
-        %tbody
-          - if list.count.positive?
-            - list.all.each do |entity|
-              %tr
-                %td= entity.user&.email || 'Unknown'
-                %td
-                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
-                %td= entity.device || 'Unknown'
-                %td= entity.platform || 'Unknown'
-                %td= entity.browser || 'Unknown'
-                %td= entity.updated_at
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "User #{sort_ui(:user_id)}"
+          %th= "IP Address #{sort_ui(:ip_address)}"
+          %th= "Device #{sort_ui(:device)}"
+          %th= "Platform #{sort_ui(:platform)}"
+          %th= "Browser #{sort_ui(:browser)}"
+          %th= "Last Seen #{sort_ui(:updated_at)}"
+      %tbody
+        - if list.count.positive?
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 6 } No records
+              %td= entity.user&.email || 'Unknown'
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
+              %td= entity.device || 'Unknown'
+              %td= entity.platform || 'Unknown'
+              %td= entity.browser || 'Unknown'
+              %td= entity.updated_at
+        - else
+          %tr
+            %td.text-center{ colspan: 6 } No records
 
 =pagination(list, base_path)

data/views/user_login_traits/new.haml

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         = new_form_tag base_path do
           = haml :'user_login_traits/form', locals: { entity: entity }

data/views/users/display.haml

@@ -1,19 +1,19 @@
 .row.mb-4
   .col-md-2
   .col-md-8
-    .card.card-default
+    .card.card-default.shadow
       .card-body
         .author
           %img.float-right.img-thumbnail{ src: entity.gravatar }
-          %h4= entity.email
+          %h4= entity.display_name
 
         %hr
         %p.description
           %label Name:
-          = entity.name
+          = entity.name || '(None)'
         %p.description
           %label Surname:
-          = entity.surname
+          = entity.surname || '(None)'
         %p.description
           %label Roles:
           = entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
@@ -35,7 +35,7 @@
   .row.mb-4
     .col-md-2
     .col-md-8
-      .card.card-default
+      .card.card-default.shadow
         .card-body
           %h4.card-title Change Password
           = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do