cm-admin 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef403882161b778959795eb4ee4b340a471913582710ed998d3d0c3c6d809eb
-  data.tar.gz: 4f083b865564092997f8a959c22b05675c07bd2973f959a357cf0ee132295fcc
+  metadata.gz: faecf51ddd1a7dd895ec281a4beb4b4a88e8efe63918b41cac512f72ec27c460
+  data.tar.gz: d1e94c3ec4bc95e8bc4bc3a42572d62606019dec522cc172135e2201ccd63f63
 SHA512:
-  metadata.gz: 444abf2ad421b1db1bdba4b506a7645e1d5e1653b78c6610c434f45999acc0b7b7ae11017df43f82f37058ec1cdff0aeb5b2a0a3ea0dc08e25c22b713d1cf6c0
-  data.tar.gz: b3475419d75358580b07914f988183071b95ad7a2f891811a8dce9a89aa2b1d90237a0b7b8340619142f90ab62de50e3b50f0ffa626a948a09f306c12601acc5
+  metadata.gz: 93f0cc6ef4e82a7aa47c776fcf1bc4ce9eba0f3f728eac78c9ee6f28d6cf887e8189cdb800bf67af8aa85a93ce0ace51d36cc65f243e0e946f59f061cf97656d
+  data.tar.gz: 9472785aa3b6c2648be151f9d188d2084748cd35fbdadab91a9d53045eea06129bb09ec3e28e63ba371829988c0307720821862d467d9d008d1056e6033300af

data/.github/workflows/linters.yml

@@ -23,8 +23,12 @@ jobs:
         uses: reviewdog/action-reek@v1
         with:
           reek_version: 6.1.1
-      - name: runner / stylelint
-        run: npx stylelint **/*.scss
+      - uses: actions/checkout@v3
+      - name: stylelint
+        uses: reviewdog/action-stylelint@v1
+        with:
+         reporter: github-pr-review # Change reporter.
+         stylelint_input: '**/*.scss'
       - name: coffeelint
         uses: reviewdog/action-coffeelint@v1
         with:

data/.gitignore

@@ -5,7 +5,7 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+tmp/
 node_modules/
 public/cm-admin-packs/
 # rspec failure tracking

data/.stylelintrc.json

@@ -0,0 +1,3 @@
+{
+"extends": "stylelint-config-standard-scss"
+}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.0.2)
+    cm-admin (1.0.5)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -87,7 +87,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
-    caxlsx (3.3.0)
+    caxlsx (3.4.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -106,8 +106,8 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
-    erubi (1.11.0)
-    globalid (1.0.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     htmlentities (4.3.4)
     i18n (1.11.0)
@@ -118,10 +118,10 @@ GEM
       railties (>= 6.0.0)
     json (2.6.2)
     local_time (2.1.0)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -130,7 +130,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.16.2)
-    net-imap (0.3.3)
+    net-imap (0.3.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -139,8 +139,8 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.10-arm64-darwin)
+    nio4r (2.5.9)
+    nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -148,11 +148,11 @@ GEM
       ast (~> 2.4.1)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.1)
-    rack (2.2.4)
-    rack-proxy (0.7.4)
+    racc (1.6.2)
+    rack (2.2.6.4)
+    rack-proxy (0.7.6)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.3.1)
       actioncable (= 7.0.3.1)
@@ -171,7 +171,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     railties (7.0.3.1)
       actionpack (= 7.0.3.1)
@@ -226,7 +226,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timeout (0.3.1)
+    timeout (0.3.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
@@ -234,7 +234,7 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    webpacker (5.4.3)
+    webpacker (5.4.4)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -242,10 +242,11 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   cm-admin!

data/app/assets/javascripts/cm_admin/application.js

@@ -1,4 +1,5 @@
 import './scaffolds.js';
+import './shared_scaffolds.js';
 import './form_validation.js'
 import './quick_search.js'
 import './filters.js'

data/app/assets/javascripts/cm_admin/exports.js

@@ -1,5 +1,5 @@
 $(document).on('click', '.export-to-file-btn', function(e) {
   e.preventDefault();
-  query_param = window.location.href.split("?")[1]
+  var query_param = window.location.href.split("?")[1]
   $("#export-to-file-form").submit();
 });

data/app/assets/javascripts/cm_admin/scaffolds.js

@@ -41,4 +41,8 @@ $(document).on('turbolinks:load', function () {
   flatpickr("[data-behaviour='date-only']", {
     dateFormat: "d-m-Y"
   })
-})
+})
+
+$(document).on('click', '.menu-item', function(e) {
+  $('.profile-popup').toggleClass('hidden');
+});

data/app/assets/javascripts/cm_admin/shared_scaffolds.js

@@ -0,0 +1,132 @@
+// This file is shared between rails 6 and 7 version
+
+$(document).on("keypress keyup blur", "[data-behaviour='decimal-only'], [data-behaviour='filter'][data-filter-type='range']", function (e) {
+  var charCode = (e.which) ? e.which : e.keyCode
+  if (charCode > 31 && (charCode != 46 &&(charCode < 48 || charCode > 57)))
+    return false;
+  return true;
+});
+
+$(document).on("keypress keyup blur", "[data-behaviour='integer-only']", function (event) {
+ $(this).val($(this).val().replace(/[^\d].+/, ""));
+  if ((event.which < 48 || event.which > 57)) {
+      event.preventDefault();
+  }
+});
+
+$(document).on('click', '.row-action-cell', function(e) {
+  e.stopPropagation();
+  if ($(this).hasClass('opacity-1')) {
+    $('.row-action-cell').removeClass('opacity-1')
+  } else {
+    $('.row-action-cell').removeClass('opacity-1')
+    $(this).addClass('opacity-1');
+  }
+  $(this).find('.table-export-popup').toggle('hidden')
+});
+
+
+$(document).on('click', '.drawer-btn', function(e) {
+  e.stopPropagation();
+  var drawer_el = $(this).parent().closest('.drawer').find('.cm-drawer')
+  if (drawer_el.hasClass('hidden')) {
+     drawer_el.removeClass('hidden');
+     drawer_container = drawer_el.find('.drawer-container')
+     if (drawer_container.hasClass('drawer-slide-out')) {
+        drawer_container.removeClass('drawer-slide-out');
+     }
+     drawer_container.addClass('drawer-slide-in');
+  } else {
+    return drawer_el.addClass('hidden');
+  }
+});
+
+$(document).on('click', '.drawer-close', function(e) {
+  e.stopPropagation();
+  $('.drawer-container').removeClass('drawer-slide-in');
+  $('.drawer-container').addClass('drawer-slide-out');
+  setTimeout(() => {
+    $('.cm-drawer').addClass('hidden');
+  }, 300);
+});
+
+$(document).on('change', '[data-field-type="linked-field"]', function(e) {
+  e.stopPropagation();
+  var params = {}
+  params[$(this).data('field-name')] = $(this).val()
+  var request_url = $(this).data('target-url') + '?' + $.param(params);
+  console.log(request_url)
+  $.ajax(request_url, {
+    type: 'GET',
+    success: function(data) {
+      apply_response_to_field(data)
+    },
+    error: function(jqxhr, textStatus, errorThrown) {
+      alert('Something went wrong. Please try again later.\n' + errorThrown);
+    }
+  });
+});
+
+function apply_response_to_field(response) {
+  $.each(response['fields'], function(key, value) {
+    switch(value['target_type']) {
+      case 'select':
+        update_options_in_select(value['target_value'])
+        break;
+      case 'input':
+        update_options_input_value(value['target_value'])
+        break;
+      case 'toggle_visibility':
+        toggle_field_visibility(value['target_value'])
+    }
+  })
+}
+
+function update_options_input_value(field_obj) {
+  var input_tag = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  input_tag.val(field_obj['field_value'])
+}
+
+function update_options_in_select(field_obj) {
+  var select_tag = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  select_tag.empty();
+  $.each(field_obj['field_value'], function(key, value) {
+    select_tag.append($("<option></option>")
+      .attr("value", value[1]).text(value[0]));
+  });
+}
+
+function toggle_field_visibility(field_obj) {
+  var element = $('#' + field_obj['table'] + '_' + field_obj['field_name'])
+  element.closest('.input-wrapper').toggleClass('hidden')
+}
+
+$(document).on('cocoon:after-insert', '.nested-field-wrapper', function(e) {
+  e.stopPropagation();
+  replaceAccordionTitle($(this))
+});
+
+$(document).on('cocoon:after-remove', '.nested-field-wrapper', function(e) {
+  e.stopPropagation();
+  replaceAccordionTitle($(this))
+});
+
+$(document).ready( function () {
+  $('.nested-field-wrapper').each(function() {
+    replaceAccordionTitle($(this))
+  })
+});
+
+var replaceAccordionTitle = function(element) {
+  var i = 0;
+  var table_name = $(element).data('table-name')
+  var model_name = $(element).data('model-name')
+  $(element).find('.accordion-item:visible').each(function() {
+    i++;
+    var accordion_title = model_name + ' ' + i
+    var accordion_id = table_name + '-' + i
+    $(this).find('.accordion-button').text(accordion_title);
+    $(this).find('.accordion-button').attr('data-bs-target', '#' + accordion_id);
+    $(this).find('.accordion-collapse').attr('id', accordion_id);
+  });
+}

data/app/assets/stylesheets/cm_admin/base/auth.scss

@@ -71,3 +71,116 @@
     }
   }
 }
+
+.sidebar__footer {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  padding: 16px 0;
+  box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.15);
+  .menu-item {
+    @include font($size: $t4-text, $color: $ink-lightest-clr);
+    padding: 8px 24px;
+    @include transition-linear();
+    cursor: pointer;
+    &:hover {
+      color: $white;
+      background: rgba(255, 255, 255, 0.1);
+    }
+  }
+  .profile-name {
+    @include flex($align: center);
+    position: relative;
+    line-height: 22px;
+    @include font($size: $t4-text, $color: $ink-lightest-clr);
+    cursor: pointer;
+    .profile-avatar {
+      @include flex($justify: center, $align: center);
+      width: 22px;
+      height: 22px;
+      margin-right: 8px;
+      @include font($size: 10px, $color: $white, $weight: 900);
+      background-color: $brand-color;
+      vertical-align: middle; 
+      border-radius: 50%;
+      img {
+        width: 22px;
+        border-radius: $circle;
+      }
+    }
+  }
+  .profile-popup {
+    position: absolute;
+    left: 228px;
+    bottom: 10px;
+    width: 268px;
+    min-height: 100px;
+    overflow: hidden;
+    background-color: $white;
+    box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.16);
+    border-radius: $radius-4;
+    animation: fadeIn 0.2s linear;
+    .profile-info {
+      display: grid;
+      grid-template-columns: 1fr 32px;
+      grid-gap: 9px;
+      padding: 8px 16px;
+      box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
+      &__left {
+        .name-text {
+          @include font($size: $t4-text);
+          line-height: 22px;
+          margin: 0;
+        }
+        .email-text {
+          @include font($size: $t4-text, $color: $ink-lightest-clr);
+          line-height: 22px;
+          margin: 0;
+          width: 200px;
+        }
+      }
+      &__right {
+        @include flex($justify: center, $align: center);
+        width: 32px;
+        height: 32px;
+        @include font($color: $white, $weight: 600);
+        background-color: $brand-color;
+        vertical-align: middle;
+        border-radius: 50%;
+        img {
+          width: 32px;
+          border-radius: $circle;
+        }
+      }
+    }
+    .page-options {
+      padding: 8px 0;
+      box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
+      .page-link {
+        display: block;
+        @include font($size: $t4-text);
+        line-height: 22px;
+        padding: 4px 16px;
+        border: none;
+        @include transition-linear();
+        &:hover {
+          background-color: $grey-lighter-clr;
+        }
+      }
+    }
+    .auth-option {
+      padding: 8px 0;
+      .auth-link {
+        display: block;
+        @include font($size: $t4-text);
+        line-height: 22px;
+        padding: 4px 16px;
+        @include transition-linear();
+        &:hover {
+          background-color: $grey-lighter-clr;
+        }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/cm_admin/base/common.scss

@@ -16,8 +16,8 @@
   border-radius: $radius-4;
   z-index: 1;
   &.table-export-popup {
-    top: 50px;
-    right: 10px;
+    top: 40px;
+    right: 30px;
     width: 156px;
     padding: 8px 0;
     animation: fadeIn .2s ease-in-out;

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -16,6 +16,10 @@
   }
   .form-wrapper {
     .form-container {
+      margin-top: 32px;
+      &:nth-child(1) {
+        margin-top: 0;
+      }
       .form-title {
         @include font($size: $t3-text, $color: $primary-text-clr, $weight: bold);
         line-height: 24px;

data/app/assets/stylesheets/cm_admin/base/table.scss

@@ -149,6 +149,7 @@
             background: $gradient-one;
             display: none;
             transition: all 0.1s linear;
+            z-index: 3;
             .row-action-tool {
               display: flex;
               align-items: center;
@@ -175,7 +176,7 @@
       position: sticky;
       top: 0;
       background-color: $white;
-      z-index: 3;
+      z-index: 4;
     }
   }
 

data/app/assets/stylesheets/cm_admin/cm_admin.css.scss

@@ -11,6 +11,7 @@
  * It is generally better to create a new file per style scope.
  *
  *= require 'cm_admin/pages/import_page'
+ *= require 'cm_admin/pages/history_page'
  *= require 'cm_admin/base/table'
  *= require 'cm_admin/base/navbar'
  *= require 'cm_admin/base/sidebar'
@@ -23,6 +24,7 @@
  *= require 'cm_admin/base/common'
  *= require 'cm_admin/components/index'
  *= require 'cm_admin/dependency/bootstrap.min'
+ *= require 'cm_admin/dependency/flatpickr.min'
  *= require 'cm_admin/scaffold'
  *= require_self
  */

data/app/assets/stylesheets/cm_admin/dependency/flatpickr.min.css

@@ -0,0 +1,13 @@
+.flatpickr-calendar{background:transparent;opacity:0;display:none;text-align:center;visibility:hidden;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08)}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;max-height:640px;visibility:visible}.flatpickr-calendar.open{display:inline-block;z-index:99999}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1);animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.inline{display:block;position:relative;top:2px}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px)}.flatpickr-calendar.static.open{z-index:999;display:block}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7){-webkit-box-shadow:none !important;box-shadow:none !important}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1){-webkit-box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0}.flatpickr-calendar.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.arrowRight:before,.flatpickr-calendar.rightMost:after,.flatpickr-calendar.arrowRight:after{left:auto;right:22px}.flatpickr-calendar.arrowCenter:before,.flatpickr-calendar.arrowCenter:after{left:50%;right:50%}.flatpickr-calendar:before{border-width:5px;margin:0 -5px}.flatpickr-calendar:after{border-width:4px;margin:0 -4px}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff}.flatpickr-calendar:focus{outline:0}.flatpickr-wrapper{position:relative;display:inline-block}.flatpickr-months{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.flatpickr-months .flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:34px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.flatpickr-months .flatpickr-prev-month,.flatpickr-months .flatpickr-next-month{text-decoration:none;cursor:pointer;position:absolute;top:0;height:34px;padding:10px;z-index:3;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9)}.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,.flatpickr-months .flatpickr-next-month.flatpickr-disabled{display:none}.flatpickr-months .flatpickr-prev-month i,.flatpickr-months .flatpickr-next-month i{position:relative}.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,.flatpickr-months .flatpickr-next-month.flatpickr-prev-month{/*
+      /*rtl:begin:ignore*/left:0/*
+      /*rtl:end:ignore*/}/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,.flatpickr-months .flatpickr-next-month.flatpickr-next-month{/*
+      /*rtl:begin:ignore*/right:0/*
+      /*rtl:end:ignore*/}/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month:hover,.flatpickr-months .flatpickr-next-month:hover{color:#959ea9}.flatpickr-months .flatpickr-prev-month:hover svg,.flatpickr-months .flatpickr-next-month:hover svg{fill:#f64747}.flatpickr-months .flatpickr-prev-month svg,.flatpickr-months .flatpickr-next-month svg{width:14px;height:14px}.flatpickr-months .flatpickr-prev-month svg path,.flatpickr-months .flatpickr-next-month svg path{-webkit-transition:fill .1s;transition:fill .1s;fill:inherit}.numInputWrapper{position:relative;height:auto}.numInputWrapper input,.numInputWrapper span{display:inline-block}.numInputWrapper input{width:100%}.numInputWrapper input::-ms-clear{display:none}.numInputWrapper input::-webkit-outer-spin-button,.numInputWrapper input::-webkit-inner-spin-button{margin:0;-webkit-appearance:none}.numInputWrapper span{position:absolute;right:0;width:14px;padding:0 4px 0 2px;height:50%;line-height:50%;opacity:0;cursor:pointer;border:1px solid rgba(57,57,57,0.15);-webkit-box-sizing:border-box;box-sizing:border-box}.numInputWrapper span:hover{background:rgba(0,0,0,0.1)}.numInputWrapper span:active{background:rgba(0,0,0,0.2)}.numInputWrapper span:after{display:block;content:"";position:absolute}.numInputWrapper span.arrowUp{top:0;border-bottom:0}.numInputWrapper span.arrowUp:after{border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid rgba(57,57,57,0.6);top:26%}.numInputWrapper span.arrowDown{top:50%}.numInputWrapper span.arrowDown:after{border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(57,57,57,0.6);top:40%}.numInputWrapper span svg{width:inherit;height:auto}.numInputWrapper span svg path{fill:rgba(0,0,0,0.5)}.numInputWrapper:hover{background:rgba(0,0,0,0.05)}.numInputWrapper:hover span{opacity:1}.flatpickr-current-month{font-size:135%;line-height:inherit;font-weight:300;color:inherit;position:absolute;width:75%;left:12.5%;padding:7.48px 0 0 0;line-height:1;height:34px;display:inline-block;text-align:center;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.flatpickr-current-month span.cur-month{font-family:inherit;font-weight:700;color:inherit;display:inline-block;margin-left:.5ch;padding:0}.flatpickr-current-month span.cur-month:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .numInputWrapper{width:6ch;width:7ch\0;display:inline-block}.flatpickr-current-month .numInputWrapper span.arrowUp:after{border-bottom-color:rgba(0,0,0,0.9)}.flatpickr-current-month .numInputWrapper span.arrowDown:after{border-top-color:rgba(0,0,0,0.9)}.flatpickr-current-month input.cur-year{background:transparent;-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;cursor:text;padding:0 0 0 .5ch;margin:0;display:inline-block;font-size:inherit;font-family:inherit;font-weight:300;line-height:inherit;height:auto;border:0;border-radius:0;vertical-align:initial;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield}.flatpickr-current-month input.cur-year:focus{outline:0}.flatpickr-current-month input.cur-year[disabled],.flatpickr-current-month input.cur-year[disabled]:hover{font-size:100%;color:rgba(0,0,0,0.5);background:transparent;pointer-events:none}.flatpickr-current-month .flatpickr-monthDropdown-months{appearance:menulist;background:transparent;border:none;border-radius:0;box-sizing:border-box;color:inherit;cursor:pointer;font-size:inherit;font-family:inherit;font-weight:300;height:auto;line-height:inherit;margin:-1px 0 0 0;outline:none;padding:0 0 0 .5ch;position:relative;vertical-align:initial;-webkit-box-sizing:border-box;-webkit-appearance:menulist;-moz-appearance:menulist;width:auto}.flatpickr-current-month .flatpickr-monthDropdown-months:focus,.flatpickr-current-month .flatpickr-monthDropdown-months:active{outline:none}.flatpickr-current-month .flatpickr-monthDropdown-months:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month{background-color:transparent;outline:none;padding:0}.flatpickr-weekdays{background:transparent;text-align:center;overflow:hidden;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:28px}.flatpickr-weekdays .flatpickr-weekdaycontainer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}span.flatpickr-weekday{cursor:default;font-size:90%;background:transparent;color:rgba(0,0,0,0.54);line-height:1;margin:0;text-align:center;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;font-weight:bolder}.dayContainer,.flatpickr-weeks{padding:1px 0 0 0}.flatpickr-days{position:relative;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;width:307.875px}.flatpickr-days:focus{outline:0}.dayContainer{padding:0;outline:0;text-align:left;width:307.875px;min-width:307.875px;max-width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;display:inline-block;display:-ms-flexbox;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-wrap:wrap;-ms-flex-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);opacity:1}.dayContainer + .dayContainer{-webkit-box-shadow:-1px 0 0 #e6e6e6;box-shadow:-1px 0 0 #e6e6e6}.flatpickr-day{background:none;border:1px solid transparent;border-radius:150px;-webkit-box-sizing:border-box;box-sizing:border-box;color:#393939;cursor:pointer;font-weight:400;width:14.2857143%;-webkit-flex-basis:14.2857143%;-ms-flex-preferred-size:14.2857143%;flex-basis:14.2857143%;max-width:39px;height:39px;line-height:39px;margin:0;display:inline-block;position:relative;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;text-align:center}.flatpickr-day.inRange,.flatpickr-day.prevMonthDay.inRange,.flatpickr-day.nextMonthDay.inRange,.flatpickr-day.today.inRange,.flatpickr-day.prevMonthDay.today.inRange,.flatpickr-day.nextMonthDay.today.inRange,.flatpickr-day:hover,.flatpickr-day.prevMonthDay:hover,.flatpickr-day.nextMonthDay:hover,.flatpickr-day:focus,.flatpickr-day.prevMonthDay:focus,.flatpickr-day.nextMonthDay:focus{cursor:pointer;outline:0;background:#e6e6e6;border-color:#e6e6e6}.flatpickr-day.today{border-color:#959ea9}.flatpickr-day.today:hover,.flatpickr-day.today:focus{border-color:#959ea9;background:#959ea9;color:#fff}.flatpickr-day.selected,.flatpickr-day.startRange,.flatpickr-day.endRange,.flatpickr-day.selected.inRange,.flatpickr-day.startRange.inRange,.flatpickr-day.endRange.inRange,.flatpickr-day.selected:focus,.flatpickr-day.startRange:focus,.flatpickr-day.endRange:focus,.flatpickr-day.selected:hover,.flatpickr-day.startRange:hover,.flatpickr-day.endRange:hover,.flatpickr-day.selected.prevMonthDay,.flatpickr-day.startRange.prevMonthDay,.flatpickr-day.endRange.prevMonthDay,.flatpickr-day.selected.nextMonthDay,.flatpickr-day.startRange.nextMonthDay,.flatpickr-day.endRange.nextMonthDay{background:#569ff7;-webkit-box-shadow:none;box-shadow:none;color:#fff;border-color:#569ff7}.flatpickr-day.selected.startRange,.flatpickr-day.startRange.startRange,.flatpickr-day.endRange.startRange{border-radius:50px 0 0 50px}.flatpickr-day.selected.endRange,.flatpickr-day.startRange.endRange,.flatpickr-day.endRange.endRange{border-radius:0 50px 50px 0}.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n+1)),.flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n+1)),.flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n+1)){-webkit-box-shadow:-10px 0 0 #569ff7;box-shadow:-10px 0 0 #569ff7}.flatpickr-day.selected.startRange.endRange,.flatpickr-day.startRange.startRange.endRange,.flatpickr-day.endRange.startRange.endRange{border-radius:50px}.flatpickr-day.inRange{border-radius:0;-webkit-box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-day.flatpickr-disabled,.flatpickr-day.flatpickr-disabled:hover,.flatpickr-day.prevMonthDay,.flatpickr-day.nextMonthDay,.flatpickr-day.notAllowed,.flatpickr-day.notAllowed.prevMonthDay,.flatpickr-day.notAllowed.nextMonthDay{color:rgba(57,57,57,0.3);background:transparent;border-color:transparent;cursor:default}.flatpickr-day.flatpickr-disabled,.flatpickr-day.flatpickr-disabled:hover{cursor:not-allowed;color:rgba(57,57,57,0.1)}.flatpickr-day.week.selected{border-radius:0;-webkit-box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7;box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7}.flatpickr-day.hidden{visibility:hidden}.rangeMode .flatpickr-day{margin-top:1px}.flatpickr-weekwrapper{float:left}.flatpickr-weekwrapper .flatpickr-weeks{padding:0 12px;-webkit-box-shadow:1px 0 0 #e6e6e6;box-shadow:1px 0 0 #e6e6e6}.flatpickr-weekwrapper .flatpickr-weekday{float:none;width:100%;line-height:28px}.flatpickr-weekwrapper span.flatpickr-day,.flatpickr-weekwrapper span.flatpickr-day:hover{display:block;width:100%;max-width:none;color:rgba(57,57,57,0.3);background:transparent;cursor:default;border:none}.flatpickr-innerContainer{display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}.flatpickr-rContainer{display:inline-block;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box}.flatpickr-time{text-align:center;outline:0;display:block;height:0;line-height:40px;max-height:40px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.flatpickr-time:after{content:"";display:table;clear:both}.flatpickr-time .numInputWrapper{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;width:40%;height:40px;float:left}.flatpickr-time .numInputWrapper span.arrowUp:after{border-bottom-color:#393939}.flatpickr-time .numInputWrapper span.arrowDown:after{border-top-color:#393939}.flatpickr-time.hasSeconds .numInputWrapper{width:26%}.flatpickr-time.time24hr .numInputWrapper{width:49%}.flatpickr-time input{background:transparent;-webkit-box-shadow:none;box-shadow:none;border:0;border-radius:0;text-align:center;margin:0;padding:0;height:inherit;line-height:inherit;color:#393939;font-size:14px;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield}.flatpickr-time input.flatpickr-hour{font-weight:bold}.flatpickr-time input.flatpickr-minute,.flatpickr-time input.flatpickr-second{font-weight:400}.flatpickr-time input:focus{outline:0;border:0}.flatpickr-time .flatpickr-time-separator,.flatpickr-time .flatpickr-am-pm{height:inherit;float:left;line-height:inherit;color:#393939;font-weight:bold;width:2%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.flatpickr-time .flatpickr-am-pm{outline:0;width:18%;cursor:pointer;text-align:center;font-weight:400}.flatpickr-time input:hover,.flatpickr-time .flatpickr-am-pm:hover,.flatpickr-time input:focus,.flatpickr-time .flatpickr-am-pm:focus{background:#eee}.flatpickr-input[readonly]{cursor:pointer}@-webkit-keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}

data/app/assets/stylesheets/cm_admin/helpers/_mixins.scss

@@ -1,6 +1,6 @@
 @import "variable";
 
-@mixin flex($direction, $justify, $align, $wrap) {
+@mixin flex($direction: row, $justify: normal, $align: normal, $wrap: nowrap) {
   display: flex;
   flex-direction: $direction;
   justify-content: $justify;

data/app/assets/stylesheets/cm_admin/pages/history_page.scss

@@ -0,0 +1,49 @@
+@import "../helpers/index.scss";
+
+// History page styles
+.history-box {
+  width: 752px;
+  padding: 24px;
+  background: #ffffff;
+  border: 1px solid $grey-light-clr;
+  border-radius: 4px;
+  .history-item {
+    display: grid;
+    grid-template-columns: 32px 1fr;
+    grid-gap: 8px;
+    align-items: center;
+    margin-bottom: 32px;
+    &:nth-last-child(1) {
+      margin-bottom: 0;
+    }
+    .profile-pic {
+      img {
+        width: 32px;
+        height: 32px;
+        object-fit: cover;
+        border-radius: 50%;
+      }
+    }
+    .history-info {
+      display: inline-flex;
+      font-family: 'Open Sans', sans-serif;
+      font-size: 14px;
+      line-height: 22px;
+      .bold-text {
+        font-weight: 600;
+        color: #1d21d9;
+        margin-right: 4px;
+      }
+      .normal-text {
+        font-weight: 400;
+        color: #1d21d9;
+        margin-right: 4px;
+      }
+      .light-text {
+        font-weight: 400;
+        color: $ink-lighter-clr;
+        margin-right: 4px;
+      }
+    }
+  }
+}

data/app/controllers/cm_admin/resource_controller.rb

@@ -8,7 +8,9 @@ module CmAdmin
     def cm_index(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'index')
       # Based on the params the filter and pagination object to be set
-      @ar_object = filter_by(params, nil, @model.filter_params(params))
+      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      records = apply_scopes(records)
+      @ar_object = filter_by(params, records, @model.filter_params(params))
       # resource_identifier
       respond_to do |format|
         if request.xhr?
@@ -91,9 +93,23 @@ module CmAdmin
       end
     end
 
-    def cm_custom_method(params)
-      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+    def cm_history(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'history')
       resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/history' }
+      end
+    end
+
+    def cm_custom_method(params)
+      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      @current_action = @action
+      if  @action.parent == 'index'
+        records = apply_scopes(records)
+        @ar_object = filter_by(params, records, @model.filter_params(params))
+      else
+        resource_identifier
+      end
       respond_to do |format|
         if @action.action_type == :custom
           if @action.child_records
@@ -126,8 +142,8 @@ module CmAdmin
       authorize controller_name.classify.constantize, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
       aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
       @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
-      nested_tables = @model.available_fields[:new].except(:fields).keys
-      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten
+      nested_tables += @model.available_fields[:edit].map(&:nested_table_fields).map(&:keys).flatten
       @reflections = @model.ar_model.reflect_on_all_associations
       nested_tables.each do |table_name|
         reflection = @reflections.select {|x| x if x.name == table_name}.first
@@ -162,6 +178,7 @@ module CmAdmin
       return @ar_object unless @current_action.child_records
 
       child_records = @ar_object.send(@current_action.child_records)
+      child_records = apply_scopes(child_records)
       @reflection = @model.ar_model.reflect_on_association(@current_action.child_records)
       @associated_model = if @reflection.klass.column_names.include?('type')
                             CmAdmin::Model.find_by(name: @reflection.plural_name.classify)
@@ -176,6 +193,13 @@ module CmAdmin
       return @ar_object, @associated_model, @associated_ar_object
     end
 
+    def apply_scopes(records)
+      @current_action.scopes.each do |scope|
+        records = records.send(scope)
+      end
+      records
+    end
+
     def filter_by(params, records, filter_params={}, sort_params={})
       filtered_result = OpenStruct.new
       cm_model = @associated_model || @model
@@ -211,8 +235,8 @@ module CmAdmin
           Hash[x.name.to_s.gsub('_attachment', ''), []]
         end
       }.compact
-      nested_tables = @model.available_fields[:new].except(:fields).keys
-      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      nested_tables = @model.available_fields[:new].map(&:nested_table_fields).map(&:keys).flatten
+      nested_tables += @model.available_fields[:edit].map(&:nested_table_fields).map(&:keys).flatten
       nested_fields = nested_tables.uniq.map {|table|
         Hash[
           table.to_s + '_attributes',