cm-admin 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385e0f3031f66ab986a7c7e66837810ed8d49bca259cca0fb92bdc2e6bf4efc6
-  data.tar.gz: 909a15a2ee902c0241295cc26749f6d7715b938131cb8d9c42cadd6625813730
+  metadata.gz: 28ba47b6a7c02c8edad75f7407f3c6c65cb2f59b44aea6952c7abbc174595ecc
+  data.tar.gz: 7216647324f0791c1090ae0f0fd9f252b2c1d53939553dfb4c9c390d99dc68b3
 SHA512:
-  metadata.gz: 9ce3b5afcec601a5713f518d77733fd99bc0d4eb19736c1160aa5ee72b4699ca1d87ec5af1363ef4e039c1a26509ec8e444ab9b412117d396485da186cd2cdaf
-  data.tar.gz: 5cf1e60e56910ce4326cffe4f7aabebcc488821ec82bba2ee0e4b8b4d45293599d8e6a45dbbd81e1f74ed7ad84a9a166afa7d72e71fe13943653db0a8ddd9a46
+  metadata.gz: f2f58b8468437f6785010ba74c00210332eabc56de6167503c91ca9df6c07a3ef6709f8b943f2de156aeea897564e17564aa19e70638ca08d28fb1fe212803c3
+  data.tar.gz: 1847f6e693831247dee15f416e537c39f1a6f3725e934774dbed4f76bf879ebfba16fd69324280594232638ce559092fb09b45bf4d22442a2e1ffb608b87bf02

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,82 @@
+---
+name: 🐛 Bug report
+about: Report a reproducible bug and help us improve.
+title: '[Bug]: '
+labels: 'bug'
+assignees:
+  - anbublacky
+  - AdityaTiwari2102
+---
+
+<!-- Before creating a bug report, try disabling browser extensions to see if the bug is still present. -->
+
+<!-- If you have added and/or updated any DSL related code try restarting the server. -->
+
+### Describe the bug
+
+<!-- A clear and concise description of what the bug is. -->
+
+### Logs
+<details>
+  <summary>Error logs</summary>
+
+```
+Place your error logs here
+```
+</details>
+
+### To Reproduce
+
+Steps to reproduce the behavior:
+
+1. Add this configuration '...'
+2. Go to '...'
+3. Click on '....'
+4. Scroll down to '....'
+5. See error
+
+### Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Screenshots & recordings
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### System configuration
+You can help us to understand your problem if you will share some very
+useful information about your project environment (don't forget to
+remove any confidential data if it exists).
+
+**CM Admin version**:
+
+**Rails version**:
+<!-- Requirement is v6.0+ -->
+
+**Ruby version**:
+<!-- Requirement is v2.7+ -->
+
+**OS, version**:
+
+**Browser, version**:
+
+### Additional context
+
+<!-- Add any other context about the problem or helpful links here. -->
+
+#### Impact
+<!--
+  How much are you impacted by this issue?
+  Please set a level of Impact and Urgency
+  (Mark [x] inside the brackets)
+-->
+
+ - [ ] High impact
+ - [ ] Medium impact
+ - [ ] Low impact
+
+#### Urgency
+
+ - [ ] High urgency
+ - [ ] Medium urgency
+ - [ ] low urgency

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🚀 Discussions and Proposals
+    url: https://github.com/commutatus/cm-admin/discussions
+    about: Visit our GitHub Discussions page to suggest an idea to make CM Admin better.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: 💡 Feature request
+about: Request a feature that helps you built the platform better.
+title: ''
+labels: 'enhancement'
+assignees:
+  - anbublacky
+  - AdityaTiwari2102
+---
+
+### Feature
+<!-- A clear and concise description of what the feature is. -->
+
+### Current workarounds
+<!-- Is there a way to achieve this behavior at the moment through some hack? -->
+
+### Screenshots or screen recordings
+<!-- If applicable, add screenshots or recordings to help explain your problem. -->
+
+### Additional context
+<!-- Have you seen this behavior somewhere else where we can test it? -->

data/Gemfile.lock

@@ -1,19 +1,46 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.9.0)
+    cm-admin (7.0.2)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
+      importmap-rails
       local_time (~> 2.1.0)
       pagy (~> 4.11.0)
       pundit (~> 2.2.0)
+      rails (>= 6.0)
       slim (~> 4.1.0)
       webpacker (~> 5.4.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
     actionpack (7.0.3.1)
       actionview (= 7.0.3.1)
       activesupport (= 7.0.3.1)
@@ -21,12 +48,34 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
     actionview (7.0.3.1)
       activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.3.6)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
     activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -53,25 +102,45 @@ GEM
     crass (1.0.6)
     csv-importer (0.8.2)
       virtus
+    date (3.3.3)
     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)
+      activesupport (>= 5.0)
     htmlentities (4.3.4)
     i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
+    importmap-rails (1.1.5)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     json (2.6.2)
     local_time (2.1.0)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mail (2.8.0)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
+    mini_mime (1.1.2)
     minitest (5.16.2)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    net-imap (0.3.3)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -79,17 +148,31 @@ GEM
       ast (~> 2.4.1)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-proxy (0.7.4)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      bundler (>= 1.15.0)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (7.0.3.1)
       actionpack (= 7.0.3.1)
       activesupport (= 7.0.3.1)
@@ -143,6 +226,7 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
+    timeout (0.3.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
@@ -155,7 +239,10 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.6.4)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/app/assets/config/cm_admin_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../javascripts/cm_admin

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

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

data/app/{javascript/packs → assets/javascripts}/cm_admin/filters.js

@@ -1,5 +1,21 @@
 var currentRequest = null;
 
+var CmFilter = {
+  // Generate or remove elements of the dropdown based on the search value.
+  dropdown_search: function(element) {
+    var filter = element.val().toUpperCase();
+    var dropdownElements = element.parents(':nth(1)').find('.list-area').children();
+    for (var i = 0; i < dropdownElements.length; i++) {
+      var txtValue = $(dropdownElements[i]).children().text();
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        $(dropdownElements[i]).css('display', 'flex');
+      } else {
+        $(dropdownElements[i]).css('display', 'none');
+      }
+    }
+  }
+}
+
 // Main method which will structure the existing filter values with the newly
 // applied filter. Send and receive the value from the backend.
 var getFilteredData = function(filterType, filterValue, filterColumn=null) {
@@ -40,7 +56,7 @@ var getFilteredData = function(filterType, filterValue, filterColumn=null) {
     }
     filterParams = jQuery.param(queryString)
     var availableParams = searchParams + '&' + filterParams
-    queryString = getParamsAsObject(availableParams)
+    var queryString = getParamsAsObject(availableParams)
   }
 
   return currentRequest = $.ajax(url, {
@@ -259,7 +275,7 @@ $(document).on('click', '.apply-area', function(e) {
       filterValueText.push($(checkedElements[i]).parent().text())
     }
 
-    truncatedFilterValue = filterValueText[0]
+    var truncatedFilterValue = filterValueText[0]
     if (filterValue.length > 1) {
       truncatedFilterValue += ' + ' + (filterValue.length - 1) + ' more'
     }
@@ -286,7 +302,7 @@ $(document).on('click', '.filter-chip-remove', function(e) {
 
   var searchParams = window.location.search
   if (searchParams.length > 0) {
-    queryString = getParamsAsObject(searchParams)
+    var queryString = getParamsAsObject(searchParams)
     if (queryString['filters'][filterType] != undefined) {
       delete(queryString['filters'][filterType][filterColumn])
       var queryParam = jQuery.param(queryString)
@@ -317,31 +333,4 @@ $(document).on('click', '[data-behaviour="selected-chip"]', function(e) {
     $(selectElement).parent().siblings(':first').addClass('search-area').removeClass('search-with-chips')
     $(selectElement).parent().siblings(':last').removeClass('active')
   }
-})
-
-CmFilter = {
-  // Generate or remove elements of the dropdown based on the search value.
-  dropdown_search: function(element) {
-    var filter = element.val().toUpperCase();
-    var dropdownElements = element.parents(':nth(1)').find('.list-area').children();
-    for (var i = 0; i < dropdownElements.length; i++) {
-      txtValue = $(dropdownElements[i]).children().text();
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        $(dropdownElements[i]).css('display', 'flex');
-      } else {
-        $(dropdownElements[i]).css('display', 'none');
-      }
-    }
-  },
-  quick_input_search: function(element) {
-    var filter = element.val().toUpperCase();
-    var searchElements = element.parents(':nth(3)').find('.list-area').children();
-    searchElements.removeClass('visible').addClass('hidden')
-    for (var i = 0; i < searchElements.length; i++) {
-      txtValue = $(searchElements[i]).children().text();
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        $(searchElements[i]).removeClass('hidden').addClass('visible');
-      }
-    }
-  }
-}
+})

data/app/{javascript/packs → assets/javascripts}/cm_admin/quick_search.js

@@ -1,3 +1,17 @@
+var CmFilter = {
+  quick_input_search: function(element) {
+    var filter = element.val().toUpperCase();
+    var searchElements = element.parents(':nth(3)').find('.list-area').children();
+    searchElements.removeClass('visible').addClass('hidden')
+    for (var i = 0; i < searchElements.length; i++) {
+      var txtValue = $(searchElements[i]).children().text();
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        $(searchElements[i]).removeClass('hidden').addClass('visible');
+      }
+    }
+  }
+}
+
 $(document).on("keydown", function(e) {
   if (e.keyCode == 75 && e.metaKey) {
     $('#quickSearchModal').modal('show')
@@ -12,7 +26,7 @@ $(document).on('keydown', function(e){
     if(e.which === 40){
       if(liSelected){
         liSelected.removeClass('active-item');
-        next = liSelected.next();
+        var next = liSelected.next();
         if(next.length > 0){
           liSelected = next.addClass('active-item');
           selected = next.text();
@@ -44,8 +58,7 @@ $(document).on('keydown', function(e){
       }
     }
     if(liSelected && e.which === 13) {
-      console.log("Selected item id ", liSelected)
-      href = liSelected.attr('href')
+      var href = liSelected.attr('href')
       window.location = href
     }
   }

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

@@ -0,0 +1,44 @@
+import jQuery from 'jquery';
+window.jQuery = jQuery // <- "select2" will check this
+window.$ = jQuery
+
+// This is a hack to fix 'process is not defined'
+// Ref article: https://adambien.blog/roller/abien/entry/uncaught_referenceerror_process_is_not
+// Based on this filter dropdown works.
+window.process = {
+  env: {
+      NODE_ENV: 'development'
+  }
+} 
+
+import 'moment'
+import 'bootstrap'
+import '@popperjs/core'
+import 'flatpickr'
+import 'jgrowl'
+jqueryJgrowl()
+import Select2 from "select2"
+Select2()
+
+// import '@nathanvda/cocoon'
+import 'daterangepicker'
+import '@fortawesome/fontawesome-free'
+import jqueryJgrowl from 'jgrowl';
+
+
+flatpickr("[data-behaviour='date-only']", {
+  dateFormat: "d-m-Y"
+})
+flatpickr("[data-behaviour='date-time']", {
+  enableTime: true
+})
+flatpickr("[data-behaviour='filter'][data-filter-type='date']", {
+  mode: 'range'
+})
+$('.select-2').select2();
+$(document).on('turbolinks:load', function () {
+  $('.select-2').select2();
+  flatpickr("[data-behaviour='date-only']", {
+    dateFormat: "d-m-Y"
+  })
+})

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

@@ -33,6 +33,121 @@
   }
 }
 
+//cocoon field styles
+.fields-group {
+  display: flex;
+  align-items: center;
+  margin: 16px 0;
+  .field-item {
+    margin: 0 5px;
+    label {
+      @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
+      margin-bottom: 4px;
+    }
+    input {
+      width: 100%;
+      padding: 5px 10px;
+      border: 1px solid #c1c7d0;
+      border-radius: $radius-2;
+      &:focus {
+        border-color: #66afe9 !important;
+        outline: 0 !important;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6) !important;
+      }
+    }
+  }
+  .field-remove {
+    margin-top: 25px;
+    a {
+      @include font($size: $t1-text, $color: #ff5656);
+      @include transition-linear;
+      &:hover {
+        transform: scale(1.1);
+      }
+    }
+  }
+}
+
+.add-field-btn {
+  font-size: $t4-text;
+  margin: 10px 0;
+}
+
+// Nested form styles
+.nested-field-wrapper {
+  .nested-field-label {
+    @include font($size: $t4-text, $color: $primary-text-clr);
+    line-height: 22px;
+    margin: 0 0 4px;
+    span {
+      color: $ink-lightest-clr;
+      margin-left: 4px;
+    }
+  }
+  .nested-single-field {
+    display: grid;
+    grid-template-columns: 1fr 32px;
+    align-items: center;
+    width: 352px;
+    margin-bottom: 8px;
+    .field-remove-action {
+      font-size: $t3-text;
+      text-align: center;
+      a {
+        color: $primary-text-clr;
+        &:hover {
+          color: $primary-text-clr;
+        }
+      }
+    }
+  }
+}
+
+// Nested form Accordion styles
+.nested-form-accordion {
+  .accordion-item {
+    margin-bottom: 8px;
+    border: 1px solid $grey-light-clr;
+    border-radius: $radius-4;
+  }
+  .accordion-item:not(:first-of-type) {
+    border-top: 1px solid $grey-light-clr;
+  }
+  .accordion-item:first-of-type {
+    margin-top: 4px;
+    border-radius: $radius-4;
+  }
+  .accordion-item:last-of-type {
+    margin-bottom: 0;
+    border-radius: $radius-4;
+  }
+  .accordion-header {
+    position: relative;
+    display: flex;
+    .accordion-delete-btn {
+      position: absolute;
+      top: 14px;
+      right: 48px;
+      z-index: 9;
+    }
+  }
+  .accordion-button {
+    border-radius: $radius-4;
+    &:focus {
+      border-color: transparent;
+      box-shadow: none;
+    }
+    &:not(.collapsed) {
+      color: inherit;
+      background-color: transparent;
+      box-shadow: none;
+    }
+    &:not(.collapsed)::after {
+      background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+    }
+  }
+}
+
 //Old form code
 .form-wrapper {
   // margin-top: 60px;
@@ -148,43 +263,3 @@
     }
   }
 }
-
-//cocoon field styles
-.fields-group {
-  display: flex;
-  align-items: center;
-  margin: 16px 0;
-  .field-item {
-    margin: 0 5px;
-    label {
-      @include font($size: $t4-text, $color: $primary-text-clr, $weight: bold);
-      margin-bottom: 4px;
-    }
-    input {
-      width: 100%;
-      padding: 5px 10px;
-      border: 1px solid #c1c7d0;
-      border-radius: $radius-2;
-      &:focus {
-        border-color: #66afe9 !important;
-        outline: 0 !important;
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6) !important;
-      }
-    }
-  }
-  .field-remove {
-    margin-top: 25px;
-    a {
-      @include font($size: $t1-text, $color: #ff5656);
-      @include transition-linear;
-      &:hover {
-        transform: scale(1.1);
-      }
-    }
-  }
-}
-
-.add-field-btn {
-  font-size: $t4-text;
-  margin: 10px 0;
-}

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

@@ -88,6 +88,7 @@ a {
     width: 480px;
   }
 }
+
 .input-wrapper.disabled {
   input:disabled {
     background-color: $grey-lightest-clr;
@@ -96,6 +97,7 @@ a {
     color: $ink-lightest-clr;
   }
 }
+
 .nested-fields .select2 {
   width: 320px !important;
 }

data/app/assets/stylesheets/cm_admin/components/_input.scss

@@ -182,6 +182,18 @@ input.cm-checkbox[type="checkbox"] {
 }
 
 //Radio button styles
+.cm-radio-section {
+  width: 100%;
+  float: left;
+  .cm-radio-label {
+    float: left;
+    padding-left: 10px;
+  }
+  .cm-radio-tag {
+    float: left;
+  }
+}
+
 input.cm-radio[type="radio"] {
   position: relative;
   display: inline-block;