thecore_ui_rails_admin 2.4.1 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f05a7912d450bd69a72d7f466be5af6da421fbedb33c5e77580689ef2a49793
-  data.tar.gz: 42a9db85419b19c0a2f2966235777a2e4a931fb1b2747a66c70731679239d6a0
+  metadata.gz: fbeec44a568d1280467c29b7f7aef455539cd54e3ac8c0dd370ef48f15284e57
+  data.tar.gz: 70cc9008ab5ed9074b6e41c6215a222933a4cf9108812cbe8c8fb44db5ad9d27
 SHA512:
-  metadata.gz: a574b1bf81b3a0f98f60d5a3ff7f6b23d009dbe9f6c40b36e1cbe0f974207cdb079ac8662055d54a1c19c906046ca0b3423a1b94350e86260ff4e82cef592a54
-  data.tar.gz: 7f1835a76ef33c5bf73d218311d78008715c8ca809a761a6f55f2faa059a77b80b9583ff8b556156281400188c238ea12de76302ac7b1a157c9d0584bf478948
+  metadata.gz: 9c1d7221a47b9b5ab4b40c5c24ca2c18439fefd26c5bfbcf929f72ec70e606f844a2a48603fe3ddcc915a7b3716f06220f15bf73cf5e4bba83a6003e1172e845
+  data.tar.gz: 103eb13868203ee8afaa40e8960231f08867374058a6fc8ac31a0315a497a184dc440f8a3a3f4048e7bb999a11b5bdf008c685b3ff74818d2a544eb160349cbf

data/app/assets/javascripts/rails_admin/custom/thecore.js

@@ -0,0 +1 @@
+/* Please Override in your application or in a wrapper gem */

data/app/assets/javascripts/rails_admin/custom/ui.js

@@ -0,0 +1,3 @@
+//= require selectize
+//= require thecore_ui_commons/thecore
+//= require rails_admin/custom/thecore

data/app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js

@@ -1,5 +1,4 @@
 //= require thecore_ui_commons/thecore
-//= require rails_admin/rails_admin
 //= require selectize
 
 $(document).on('ready pjax:success', function(e) {

data/app/assets/stylesheets/rails_admin/custom/theming.scss

@@ -0,0 +1,7 @@
+@import 'selectize';
+@import 'selectize.bootstrap3';
+@import 'thecore_ui_commons/thecore';
+
+.form-control.selectize-control {
+    width: 62%;
+}

data/app/assets/stylesheets/thecore_ui_rails_admin/thecore.scss

@@ -16,8 +16,9 @@
  *= require rails_admin_selectize/index
  *= require_self
 */
-@import 'overrides';
-@import 'colors';
+@import 'rails_admin/custom/variables';
+@import 'rails_admin/custom/theming';
+@import 'rails_admin/custom/mixins';
 @import "jquery-ui";
 @import "jquery-ui/dialog";
 @import 'bootstrap-sprockets';

data/app/assets/stylesheets/thecore_ui_rails_admin/togglable-sidebar.scss

@@ -41,14 +41,14 @@
 }
 /* Sidebar Styles */
 
-.sidebar-nav {
-  position: absolute;
-  top: 0;
-  width: 250px;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
+// .sidebar-nav {
+//   position: absolute;
+//   top: 0;
+//   width: 250px;
+//   margin: 0;
+//   padding: 0;
+//   list-style: none;
+// }
 .sidebar-nav li {
   text-indent: 20px;
   line-height: 40px;
@@ -80,9 +80,9 @@
   background: none;
 }
 
-body.rails_admin .sidebar-nav {
-  top: 0px;
-}
+// body.rails_admin .sidebar-nav {
+//   top: 0px;
+// }
 
 .sub-menu a {
   padding-left: 20px;

data/app/views/{layouts → layouts.old}/rails_admin/application.html.haml

@@ -2,17 +2,15 @@
 %html{lang: I18n.locale}
   %head
     %title= Settings.app_name rescue "Thecore"
-    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}
-    %meta{content: "NONE,NOARCHIVE", name: "robots"}
-    = csrf_meta_tag
+
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload'
+    = javascript_pack_tag 'application', 'data-turbolinks-track' => 'reload'
+
+    = render "layouts/rails_admin/head"
 
     = render "layouts/rails_admin/style_common"
     = render "layouts/rails_admin/style_override"
 
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload'
-    = javascript_pack_tag 'application', 'data-turbolinks-track' => 'reload'
     / Getting all the assets needed by thecore_ui_rails_admin from all the gems and the application level
     = get_asset_tags_for("thecore_rails_admin")
 
@@ -23,8 +21,8 @@
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     -# Initialize JS simple i18n
-    :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
+    -# :javascript
+    -#   RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     -# %nav.navbar.navbar-default.navbar-fixed-top
     -#   = render "layouts/rails_admin/navigation"

data/app/views/{layouts → layouts.old}/rails_admin/pjax.html.haml

@@ -3,7 +3,7 @@
   $('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
   $(window).off('keydown');
 
-- # Integration of the rails_admin_settings gem, if not available, it rescues to the normal naming
+- # Integration of the thecore_settings gem, if not available, it rescues to the normal naming
 %title= "#{(@abstract_model.try(:pretty_name) || @page_name)} | #{Settings.app_name rescue ([_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' '))}"
 .page-header
   %h1= @page_name

data/config/initializers/rails_admin.rb

@@ -2,6 +2,7 @@ require 'rails_admin'
 require 'nested_form/builder_mixin'
 
 RailsAdmin.config do |config|
+  config.main_app_name = Proc.new { |controller| [ ((ENV["APP_NAME"].presence || Settings.app_name.presence) rescue "Thecore"), "" ] }
   # Link for background Job
   (config.navigation_static_links ||= {}).merge! "Background Monitor" => "#{ENV['RAILS_RELATIVE_URL_ROOT']}/app/sidekiq"
 

data/config/initializers/thecore_concern.rb

@@ -33,16 +33,16 @@ module ThecoreConcern
       action = root_actions.collect(&:action_name).first
       # REDIRECT TO THAT ACTION
 
-      Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
+      # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
       stored_location = stored_location_for(resource)
       if !stored_location.blank? && can?(resource, :all)
-        Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the IF stored_location_for(resource): #{stored_location}"
+        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the IF stored_location_for(resource): #{stored_location}"
         return stored_location
       elsif action
-        Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSIF with action name: #{action}"
+        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSIF with action name: #{action}"
         return rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
       else
-        Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSE with root_path: #{root_path}"
+        # Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSE with root_path: #{root_path}"
         sign_out current_user
         user_session = nil
         current_user = nil
@@ -105,9 +105,9 @@ module ThecoreConcern
     
     # Auto-sign out locked users
     def reject_locked!
-      Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB reject_locked"
+      # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB reject_locked"
       if !current_user.blank? && current_user.locked?
-        Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is locked"
+        # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is locked"
         sign_out current_user
         user_session = nil
         current_user = nil
@@ -115,7 +115,7 @@ module ThecoreConcern
         flash[:notice] = nil
         redirect_to root_url
       end
-      Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
+      # Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
     end
 
     

data/config/initializers/thecore_ui_rails_admin_app_configs.rb

@@ -9,7 +9,7 @@ Rails.application.configure do
     config.after_initialize do
         RailsAdmin::Config::Actions::Export.send(:include, ExportConcern)
         RailsAdmin::Config::Actions::BulkDelete.send(:include, BulkDeleteConcern)
-        RailsAdminSettings::Setting.send(:include, RailsAdminSettings::RailsAdminExtensionConfig)
+        ThecoreSettings::Setting.send(:include, ThecoreSettings::RailsAdminExtensionConfig)
         User.send(:include, ThecoreUiRailsAdminUser)
         UsedToken.send(:include, ThecoreUiRailsAdminUsedToken)
         Role.send(:include, ThecoreUiRailsAdminRole)

data/lib/abilities/thecore_ui_rails_admin.rb

@@ -4,9 +4,9 @@ module Abilities
         def initialize user
             # No one is allowed to add or destroy settings
             # just list or edit existing
-            cannot :create, RailsAdminSettings::Setting
-            cannot :destroy, RailsAdminSettings::Setting
-            cannot :show, RailsAdminSettings::Setting
+            cannot :create, ThecoreSettings::Setting
+            cannot :destroy, ThecoreSettings::Setting
+            cannot :show, ThecoreSettings::Setting
         end
     end
 end

data/lib/concerns/rails_admin_requirements.rb

@@ -1,4 +1,4 @@
-module RailsAdminSettings
+module ThecoreSettings
   module RailsAdminExtensionConfig
     def self.included(base)
       # IMPORTANT: To extend rails admin section in model, directly, instead of using concerns, I can

data/lib/thecore_ui_rails_admin.rb

@@ -1,7 +1,7 @@
 require 'thecore_ui_commons'
 # Rails Admin
-ENV['RAILS_ADMIN_THEME'] ||= 'rollincode'
-require 'rails_admin_rollincode'
+# ENV['RAILS_ADMIN_THEME'] ||= 'rollincode'
+# require 'rails_admin_rollincode'
 require 'rails_admin'
 require 'rails_admin-i18n'
 require 'safe_yaml'
@@ -11,7 +11,7 @@ require 'concerns/rails_admin_requirements'
 # Abilities
 require 'abilities/thecore_ui_rails_admin'
 # Rails Admin Buildups
-require 'jquery-ui-rails'
+# require 'jquery-ui-rails'
 require 'bootstrap-sass'
 
 require 'concerns/thecore_ui_rails_admin_user'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.5
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rails_admin_rollincode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 description: Holds all base dependencies and configurations to have a thecore integrated
   with Rails Admin.
 email:
@@ -162,11 +134,14 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/thecore_ui_rails_admin_manifest.js
+- app/assets/javascripts/rails_admin/custom/thecore.js
+- app/assets/javascripts/rails_admin/custom/ui.js
 - app/assets/javascripts/rails_admin/ra.widgets.coffee
 - app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js
+- app/assets/stylesheets/rails_admin/custom/theming.scss
+- app/assets/stylesheets/rails_admin/custom/variables.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/animate.css
 - app/assets/stylesheets/thecore_ui_rails_admin/apexcharts.scss
-- app/assets/stylesheets/thecore_ui_rails_admin/colors.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/common.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/devise.scss
 - app/assets/stylesheets/thecore_ui_rails_admin/flashing.scss
@@ -177,19 +152,19 @@ files:
 - app/controllers/pages_controller.rb
 - app/helpers/devise_bootstrap_errors_helper.rb
 - app/helpers/thecore_helper.rb
-- app/views/layouts/rails_admin/_navigation.html.haml
-- app/views/layouts/rails_admin/_secondary_navigation.html.haml
-- app/views/layouts/rails_admin/_sidebar_navigation.html.haml
-- app/views/layouts/rails_admin/_style_common.html.haml
-- app/views/layouts/rails_admin/_style_override.html.haml
-- app/views/layouts/rails_admin/_user_navigation.html.haml
-- app/views/layouts/rails_admin/application.html.haml
-- app/views/layouts/rails_admin/pjax.html.haml
-- app/views/rails_admin/main/_card.html.haml
-- app/views/rails_admin/main/_dashboard_block.html.haml
-- app/views/rails_admin/main/_modal_interaction.html.erb
-- app/views/rails_admin/main/dashboard.html.haml
-- app/views/rails_admin/main/index.html.haml
+- app/views/layouts.old/rails_admin/_navigation.html.haml
+- app/views/layouts.old/rails_admin/_secondary_navigation.html.haml
+- app/views/layouts.old/rails_admin/_sidebar_navigation.html.haml
+- app/views/layouts.old/rails_admin/_style_common.html.haml
+- app/views/layouts.old/rails_admin/_style_override.html.haml
+- app/views/layouts.old/rails_admin/_user_navigation.html.haml
+- app/views/layouts.old/rails_admin/application.html.haml
+- app/views/layouts.old/rails_admin/pjax.html.haml
+- app/views/rails_admin.old/main/_card.html.haml
+- app/views/rails_admin.old/main/_dashboard_block.html.haml
+- app/views/rails_admin.old/main/_modal_interaction.html.erb
+- app/views/rails_admin.old/main/dashboard.html.haml
+- app/views/rails_admin.old/main/index.html.haml
 - app/views/shared/_flash.html.erb
 - config/initializers/rails_admin.rb
 - config/initializers/thecore_concern.rb
@@ -202,8 +177,6 @@ files:
 - config/locales/it.main.yml
 - config/locales/it.rails_admin.yml
 - config/locales/it.rollincode.yml
-- config/locales/thecore_settings.en.yml
-- config/locales/thecore_settings.it.yml
 - config/routes.rb
 - lib/abilities/thecore_ui_rails_admin.rb
 - lib/concerns/rails_admin_requirements.rb

data/config/locales/thecore_settings.en.yml

@@ -1,31 +0,0 @@
-en:
-  settings:
-    namespaces:
-      main: Main
-    names:
-      app_name: Application Name
-  admin:
-    settings:
-      label: Settings
-      phone_invalid: Invalid Telephone
-      phones_invalid: "Invalid Telephones: %{phones}"
-      email_invalid: Invalid Email
-      yaml_invalid: Invalid Email
-      color_invalid: Invalid Color
-  mongoid: &mongoid
-    models:
-      rails_admin_settings/setting: Configurations
-    attributes:
-      rails_admin_settings/setting:
-        c_at: Created
-        u_at: Modified
-        enabled: Enabled
-        ns: Group
-        name: Name
-        key: Key
-        raw: Value
-        type: Type
-        kind: Type
-        label: Label
-  activerecord:
-    <<: *mongoid

data/config/locales/thecore_settings.it.yml

@@ -1,31 +0,0 @@
-it:
-  settings:
-    namespaces:
-      main: Principale
-    names:
-      app_name: Nome dell'applicazione
-  admin:
-    settings:
-      label: 'Impostazioni'
-      phone_invalid: Telefono non valido
-      phones_invalid: "Telefono non valido: %{phones}"
-      email_invalid: Email non valida
-      yaml_invalid: YAML non valido
-      color_invalid: Colore non valido
-  mongoid: &mongoid
-    models:
-      rails_admin_settings/setting: Configurazioni
-    attributes:
-      rails_admin_settings/setting:
-        c_at: Creato
-        u_at: Modificato
-        enabled: Abilitato
-        ns: Gruppo
-        name: Nome
-        key: Chiave
-        raw: Valore
-        type: Tipo
-        kind: Tipo
-        label: Etichetta
-  activerecord:
-    <<: *mongoid