headmin 0.2.5 → 0.2.6

data/docs/blocks.md

@@ -30,13 +30,6 @@ A hidden template form will be rendered for all types defined in `allow:`
 ```
 
 For each type of block you want to include, create a template in `views/admin/blocks`.
-Make sure to include a hidden field to store the name of the block.
-
-```erb
-# app/views/admin/blocks/_contact.html.erb
-<%= form.hidden_field :name, value: :contact %>
-...
-```
 
 ### Usage in frontend
 

data/lib/generators/headmin/blocks_generator.rb

@@ -4,8 +4,11 @@ module Headmin
 
     source_root File.expand_path('../../templates', __FILE__)
 
-    def blocks
+    def copy_models
       template 'models/block.rb', 'app/models/block.rb'
+    end
+
+    def copy_migrations
       migration_template 'migrations/create_blocks.rb', 'db/migrate/create_blocks.rb'
     end
 

data/lib/generators/headmin/devise_generator.rb

@@ -4,7 +4,11 @@ module Headmin
 
     source_root File.expand_path('../../templates', __FILE__)
 
-    def blocks
+    def copy_controllers
+      directory 'controllers/auth', 'app/controllers/auth'
+    end
+
+    def copy_views
       directory 'views/auth', 'app/views/auth'
       copy_file 'views/layouts/auth.html.erb', 'app/views/layouts/auth.html.erb'
     end

data/lib/generators/headmin/fields_generator.rb

@@ -4,8 +4,11 @@ module Headmin
 
     source_root File.expand_path('../../templates', __FILE__)
 
-    def blocks
+    def copy_models
       template 'models/field.rb', 'app/models/field.rb'
+    end
+
+    def copy_migrations
       migration_template 'migrations/create_fields.rb', 'db/migrate/create_fields.rb'
       migration_template 'migrations/create_field_hierarchies.rb', 'db/migrate/create_field_hierarchies.rb'
     end

data/lib/generators/templates/controllers/auth/confirmations_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Auth::ConfirmationsController < Devise::ConfirmationsController
+  layout 'auth'
+  # GET /resource/confirmation/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/confirmation
+  # def create
+  #   super
+  # end
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after resending confirmation instructions.
+  # def after_resending_confirmation_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+
+  # The path used after confirmation.
+  # def after_confirmation_path_for(resource_name, resource)
+  #   super(resource_name, resource)
+  # end
+end

data/lib/generators/templates/controllers/auth/omniauth_callbacks_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  layout 'auth'
+  # You should configure your model like this:
+  # devise :omniauthable, omniauth_providers: [:twitter]
+
+  # You should also create an action method in this controller like this:
+  # def twitter
+  # end
+
+  # More info at:
+  # https://github.com/heartcombo/devise#omniauth
+
+  # GET|POST /resource/auth/twitter
+  # def passthru
+  #   super
+  # end
+
+  # GET|POST /users/auth/twitter/callback
+  # def failure
+  #   super
+  # end
+
+  # protected
+
+  # The path used when OmniAuth fails
+  # def after_omniauth_failure_path_for(scope)
+  #   super(scope)
+  # end
+end

data/lib/generators/templates/controllers/auth/passwords_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Auth::PasswordsController < Devise::PasswordsController
+  layout 'auth'
+  # GET /resource/password/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/password
+  # def create
+  #   super
+  # end
+
+  # GET /resource/password/edit?reset_password_token=abcdef
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource/password
+  # def update
+  #   super
+  # end
+
+  # protected
+
+  # def after_resetting_password_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sending reset password instructions
+  # def after_sending_reset_password_instructions_path_for(resource_name)
+  #   super(resource_name)
+  # end
+end

data/lib/generators/templates/controllers/auth/registrations_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class Auth::RegistrationsController < Devise::RegistrationsController
+  layout 'auth'
+  # before_action :configure_sign_up_params, only: [:create]
+  # before_action :configure_account_update_params, only: [:update]
+
+  # GET /resource/sign_up
+  # def new
+  #   super
+  # end
+
+  # POST /resource
+  # def create
+  #   super
+  # end
+
+  # GET /resource/edit
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource
+  # def update
+  #   super
+  # end
+
+  # DELETE /resource
+  # def destroy
+  #   super
+  # end
+
+  # GET /resource/cancel
+  # Forces the session data which is usually expired after sign
+  # in to be expired now. This is useful if the user wants to
+  # cancel oauth signing in/up in the middle of the process,
+  # removing all OAuth session data.
+  # def cancel
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_up_params
+  #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
+  # end
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_account_update_params
+  #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
+  # end
+
+  # The path used after sign up.
+  # def after_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sign up for inactive accounts.
+  # def after_inactive_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+end

data/lib/generators/templates/controllers/auth/sessions_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Auth::SessionsController < Devise::SessionsController
+  layout 'auth'
+  # before_action :configure_sign_in_params, only: [:create]
+
+  # GET /resource/sign_in
+  # def new
+  #   super
+  # end
+
+  # POST /resource/sign_in
+  # def create
+  #   super
+  # end
+
+  # DELETE /resource/sign_out
+  # def destroy
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_in_params
+  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
+  # end
+end

data/lib/generators/templates/controllers/auth/unlocks_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Auth::UnlocksController < Devise::UnlocksController
+  layout 'auth'
+  # GET /resource/unlock/new
+  # def new
+  #   super
+  # end
+
+  # POST /resource/unlock
+  # def create
+  #   super
+  # end
+
+  # GET /resource/unlock?unlock_token=abcdef
+  # def show
+  #   super
+  # end
+
+  # protected
+
+  # The path used after sending unlock password instructions
+  # def after_sending_unlock_instructions_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after unlocking the resource
+  # def after_unlock_path_for(resource)
+  #   super(resource)
+  # end
+end

data/lib/headmin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Headmin
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/package.json

@@ -20,13 +20,14 @@
   },
   "homepage": "https://github.com/insiting/headmin#readme",
   "dependencies": {
+    "@hotwired/stimulus": "^3.0",
+    "@hotwired/stimulus-webpack-helpers": "^1.0",
     "@popperjs/core": "^2.9.3",
     "@rails/ujs": "^6.0.0",
     "bootstrap": "^5.1.1",
     "ckeditor5-build-classic-simple-upload-adapter-image-resize": "^1.0.4",
     "flatpickr": "^4.6.9",
     "sortablejs": "^1.13.0",
-    "stimulus": "^2.0.0",
     "tom-select": "^2.0.0-rc.4"
   },
   "devDependencies": {

data/src/js/headmin/controllers/blocks_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 import Sortable from "sortablejs";
 import { createPopper } from '@popperjs/core';
 

data/src/js/headmin/controllers/filter_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 
 export default class extends Controller {
     static get targets() {

data/src/js/headmin/controllers/filters_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 
 export default class extends Controller {
     static get targets() {

data/src/js/headmin/controllers/popup_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 import Sortable from "sortablejs";
 import {createPopper} from '@popperjs/core';
 

data/src/js/headmin/controllers/repeater_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 import Sortable from "sortablejs";
 
 export default class extends Controller {
@@ -52,8 +52,8 @@ export default class extends Controller {
         let rowIndex = button.dataset.rowIndex
 
         // Prepare html from template
-        let html = this.getTemplateHTML(templateName)
-        html = this.replaceIdsWithTimestamps(html)
+        const template = this.getTemplate(templateName)
+        const html = this.replaceIdsWithTimestamps(template)
 
         // Fallback to last row if no index is set
         if (rowIndex) {
@@ -92,16 +92,16 @@ export default class extends Controller {
         this.toggleEmpty()
     }
 
-    getTemplateHTML(name) {
-        const template = this.templateTargets.filter((template) => {
+    getTemplate(name) {
+        return this.templateTargets.filter((template) => {
             return template.dataset.templateName === name
         })[0]
-        return template.innerHTML
     }
 
-    replaceIdsWithTimestamps(html) {
-        const regex = new RegExp('template_id', "g");
-        return html.replace(regex, new Date().getTime())
+    replaceIdsWithTimestamps(template) {
+        console.log(template)
+        const regex = new RegExp(template.dataset.templateIdRegex, "g")
+        return template.innerHTML.replace(regex, new Date().getTime())
     }
 
     visibleRowsCount() {

data/src/js/headmin/controllers/table_actions_controller.js

@@ -1,33 +1,128 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 
 export default class extends Controller {
+    static get values() {
+        return {
+            count: {type: Number, default: 0}
+        }
+    }
+
     static get targets() {
-        return ["form", "select", "method", "button"]
+        return ["wrapper", "form", "select", "method", "button", "idInputTemplate", "id", "counter"]
     }
 
     connect() {
-        this.wrapperClass = "table-actions"
+        this.wrapperTarget.addEventListener('idSelectionChanged', (event) => {
+            const ids = event.detail.ids
+            this.updateIdFields(ids)
+            this.updateCountValueWithIds(ids)
+        })
+
     }
 
     update(event) {
         event.preventDefault()
-        const option = this.selectTarget.options[this.selectTarget.selectedIndex]
+        this.updateFormAction()
+        this.updateFormMethod()
+        this.updateButton()
+    }
+
+    updateIdFields(ids) {
+        this.removeIds()
+        if (ids instanceof Array) {
+            this.countValue = ids.length
+            ids.forEach((id) => {
+                this.addId(id)
+            })
+        } else {
+            this.countValue = Infinity
+            this.addId('')
+        }
+    }
 
-        // Replace form action
+    updateCounter() {
+        let htmlString = ''
+        switch (this.countValue) {
+            case 0:
+                htmlString = this.counterTarget.getAttribute('data-items-zero')
+                break;
+            case 1:
+                htmlString = this.counterTarget.getAttribute('data-items-one')
+                break;
+            case Infinity:
+                htmlString = this.counterTarget.getAttribute('data-items-other')
+                htmlString = htmlString.replace(/<b>[\s\S]*?<\/b>/, '<b>' + this.totalCount() + '<\/b>');
+                break;
+            default:
+                htmlString = this.counterTarget.getAttribute('data-items-other')
+                let count = this.countValue === Infinity ? this.totalCount() : this.countValue
+                htmlString = htmlString.replace(/<b>[\s\S]*?<\/b>/, `<b>${count}<\/b>`);
+        }
+        this.counterTarget.innerHTML = htmlString;
+    }
+
+    totalCount() {
+        return this.counterTarget.getAttribute('data-total-count')
+    }
+
+    updateCountValueWithIds(ids) {
+        if (ids instanceof Array) {
+            this.countValue = ids.length
+        } else {
+            this.countValue = Infinity
+        }
+    }
+
+    countValueChanged() {
+        this.updateCounter()
+        this.toggle()
+    }
+
+    toggle() {
+        if (this.countValue > 0) {
+            this.wrapperTarget.classList.remove('d-none')
+        } else {
+            this.wrapperTarget.classList.add('d-none')
+        }
+    }
+
+    updateFormAction() {
         this.formTarget.action = this.selectTarget.value
+    }
 
-        // Replace form method
+    updateFormMethod() {
+        const option = this.selectedOption()
         this.methodTarget.value = option.dataset.method
+    }
 
-        // Set confirm on form button
+    updateButton() {
+        const option = this.selectedOption()
         const confirm = option.dataset.confirm
-        if(confirm) {
+        if (confirm) {
             this.buttonTarget.dataset.confirm = confirm
         } else {
             this.buttonTarget.removeAttribute('data-confirm')
         }
+        this.enableButton()
+    }
+
+    selectedOption() {
+        return this.selectTarget.options[this.selectTarget.selectedIndex]
+    }
 
-        // Enable button
+    enableButton() {
         this.buttonTarget.removeAttribute('disabled')
     }
+
+    addId(id) {
+        const template = this.idInputTemplateTarget
+        const input = template.innerHTML.replace(/ID/g, id)
+        this.formTarget.insertAdjacentHTML('afterbegin', input)
+    }
+
+    removeIds() {
+        this.idTargets.forEach((input) => {
+            this.formTarget.removeChild(input)
+        });
+    }
 }

data/src/js/headmin/controllers/table_controller.js

@@ -1,4 +1,4 @@
-import {Controller} from "stimulus"
+import {Controller} from "@hotwired/stimulus"
 import Sortable from "sortablejs";
 import Rails from "@rails/ujs";
 
@@ -38,25 +38,43 @@ export default class extends Controller {
         const checkbox = event.target
         this.toggleIdsCheckboxes(checkbox.checked)
         this.toggleIdCheckboxes(checkbox.checked)
-        this.syncFields()
-        this.toggleActions()
+        this.updateActions()
     }
 
     toggleId(event) {
         this.toggleIdsCheckboxes(false)
-        this.syncFields()
-        this.toggleActions()
+        this.updateActions()
     }
 
-    toggleActions() {
-        const idFields = this.getIdFields()
-        if(idFields.length > 0) {
-            this.actionsTarget.classList.remove('d-none')
+    updateActions() {
+        this.actionsTarget.dispatchEvent(
+            new CustomEvent(
+                'idSelectionChanged',
+                {
+                    detail: {
+                        ids: this.ids()
+                    }
+                }
+            )
+        )
+    }
+
+    ids() {
+        if (this.idsCheckboxTarget.checked) {
+            return null
         } else {
-            this.actionsTarget.classList.add('d-none')
+            return this.selectedIdCheckboxes().map((checkbox) => {
+                return checkbox.value
+            })
         }
     }
 
+    selectedIdCheckboxes() {
+        return this.idCheckboxTargets.filter((checkbox) => {
+            return checkbox.checked
+        })
+    }
+
     toggleIdsCheckboxes(checked) {
         this.idsCheckboxTargets.forEach((checkbox) => {
             checkbox.checked = checked
@@ -69,51 +87,4 @@ export default class extends Controller {
         });
     }
 
-    syncFields() {
-        this.removeIds()
-        if(this.idsCheckboxTarget.checked) {
-            this.addId('')
-        } else {
-            this.idCheckboxTargets.forEach((checkbox) => {
-                if(checkbox.checked) {
-                    this.addId(checkbox.value)
-                }
-            });
-        }
-    }
-
-    addId(id) {
-        let field = this.getIdField(id)
-        if (!field) {
-            field = this.newIdField(id)
-            this.actionsTarget.querySelector('form').insertAdjacentHTML('afterbegin', field)
-        }
-    }
-
-    removeIds() {
-        const fields = this.getIdFields()
-        fields.forEach((field) => {
-            this.actionsTarget.querySelector('form').removeChild(field)
-        });
-    }
-
-    removeId(id) {
-        const field = this.getIdField(id)
-        if (field) {
-            this.actionsTarget.querySelector('form').removeChild(field)
-        }
-    }
-
-    newIdField(id) {
-        const template = this.actionsTarget.querySelector('[data-table-target="idFieldTemplate"]')
-        return template.innerHTML.replace(/ID/g, id)
-    }
-
-    getIdFields() {
-        return this.actionsTarget.querySelectorAll(`input[name="ids[]"]`);
-    }
-
-    getIdField(id) {
-        return this.actionsTarget.querySelector(`input[name="ids[]"][value="${id}"]`);
-    }
 }

data/src/js/headmin/headmin.js

@@ -4,8 +4,8 @@ import flatpickr from "flatpickr";
 import bootstrap from "bootstrap/dist/js/bootstrap.bundle";
 import Rails from "@rails/ujs";
 
-import {Application} from "stimulus";
-import {definitionsFromContext} from "stimulus/webpack-helpers";
+import {Application} from "@hotwired/stimulus"
+import {definitionsFromContext} from "@hotwired/stimulus-webpack-helpers"
 
 export class Headmin {
     static start() {

data/src/scss/headmin/table.scss

@@ -4,6 +4,7 @@
     color: $table-color;
     letter-spacing: 0.05em;
     font-size: $font-size-base * 0.85;
+    position: relative;
   }
 
   a {