maquina 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253e32217b0c2f5e0a8a352ff4ac26a1e0d904184293205135f1d60fd43392d2
-  data.tar.gz: a347016c5e76c08fc3165662b47684ff181667a4bea70c25e340bc71e760b1cc
+  metadata.gz: b7ab60b2cea0b2831706a45cfc1978c870cd116e8cbffa0b7e1c2571c07f2f00
+  data.tar.gz: 1dc50dfe21922c104bcf39dafb4d9c48c56005b8ac699c2539182cb4bc1460ed
 SHA512:
-  metadata.gz: 77c5d7eb9e6927194b0ea5635f8a535b898010b755e42e254258e2af675c6c4ba08c70372141056e2fd296008d7a120d938019f5fa55966d3d3314cc61744621
-  data.tar.gz: 1013008ff3b86923b4d055c894d62e01ba23e84c4cad7d029454d1d8f9e80865ac038be1f5693c39a9828cebec1fc57c0a6591d6b16c4c7d134a83d321ef4acd
+  metadata.gz: b6c5e01ae51066b823f75a917cd7241175f339c80e490a1279b1cfc2ff590ee3bbd065eb080e0113ac539e84802b43eb81c60a2cfd56271e94222dc5f94f725d
+  data.tar.gz: 40bb78e88253d90fcc01af052e767a8b1d44dfdb05b14c360d099bfa5dd9a134f13b03c04ae8b29bb588407c0cb64ed04963a655f2058edac131ed3987ffb95d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maquina (0.2.1)
+    maquina (0.2.3)
       action_policy (~> 0.6.3)
       bcrypt (~> 3.1.7)
       importmap-rails (~> 1.2.0)

data/app/assets/javascripts/maquina/controllers/backdrop_controller.js

@@ -0,0 +1,10 @@
+import { Controller } from "@hotwired/stimulus"
+import { useTransition } from "stimulus-use";
+
+export default class extends Controller {
+  static targets = ["backdrop"]
+
+  connect() {
+    useTransition(this, { element: this.backdropTarget })
+  }
+}

data/app/assets/javascripts/maquina/controllers/modal_controller.js

@@ -2,38 +2,92 @@ import { Controller } from "@hotwired/stimulus"
 import { useTransition } from "stimulus-use"
 
 export default class extends Controller {
-  static targets = ["content", "container", "frame"]
+  static targets = ["modal", "container", "frame", "form", "submit"]
+  static outlets = ["backdrop"]
 
   connect() {
-    useTransition(this, { element: this.contentTarget })
+    this.timeouts = []
+    this.root = document.querySelector("html")
 
-    this.resultCallback = this.modalResult.bind(this)
-    addEventListener("turbo:submit-end", this.resultCallback)
+    useTransition(this, { element: this.modalTarget })
+
+    if (this.hasFormTarget) addEventListener("turbo:submit-end", this.submitResult.bind(this))
   }
 
   disconnect() {
-    removeEventListener("turbo:submit-end", this.resultCallback)
+    this.timeouts.forEach(t => clearTimeout(t))
+
+    if (this.hasFormTarget) removeEventListener("turbo:submit-end", this.submitResult.bind(this))
   }
 
-  modalResult(event) {
-    if (event.detail.fetchResponse.response.status == 202) {
-      this.toggleModal(event)
+  submitResult(event) {
+    if (this.hasFormTarget) this.submitTarget.removeAttribute("disabled")
+
+    const status = event.detail.fetchResponse.response.status
+    if (status == 201 || status == 202) {
+      this.close(event)
     }
   }
 
-  toggleModal(event) {
+  submit(event) {
     event.preventDefault()
 
-    if (this.hasFrameTarget && this.contentTarget.classList.contains("hidden")) {
-      let url = event.target.getAttribute("href") || this.element.dataset["frameSrc"]
-      this.frameTarget.setAttribute("src", url)
-    } else if (!this.contentTarget.classList.contains("hidden")) {
-      this.frameTarget.setAttribute("src", "")
-      this.frameTarget.innerText = ""
+    if (!this.hasFormTarget) {
+      return
     }
 
-    document.documentElement.classList.toggle("overflow-hidden")
-    this.containerTarget.classList.toggle("hidden")
+    this.submitTarget.setAttribute("disabled", "true")
+    this.formTarget.requestSubmit()
+  }
+
+  open(event) {
+    event.preventDefault()
+
+    this.configureModal(event.target)
+    this.root.classList.toggle("overflow-hidden")
+
+    this.toggleBackdrop()
+    this.toggleTransition()
+  }
+
+  close(event) {
+    event.preventDefault()
+
+    this.timeouts.forEach(t => clearTimeout(t))
+
+    this.root.classList.toggle("overflow-hidden")
     this.toggleTransition()
+    this.toggleBackdrop()
+
+
+    this.timeouts.push(
+      setTimeout(() => this.restoreModal(), 500)
+    )
+  }
+
+  configureModal(target) {
+    if (this.hasSubmitTarget) {
+      const label = target.dataset["submit-label"]
+      this.submitTarget.innerText = label
+    }
+
+    const url = target.getAttribute("href")
+    this.frameTarget.setAttribute("src", url)
+
+    this.containerTarget.classList.toggle("hidden")
+  }
+
+  restoreModal() {
+    this.containerTarget.classList.toggle("hidden")
+
+    if (this.hasSubmitTarget) {
+      this.submitTarget.innerText = ""
+      this.submitTarget.removeAttribute("disabled")
+    }
+    this.frameTarget.setAttribute("src", "")
+  }
+
+  toggleBackdrop() {
+    this.backdropOutlets.forEach(backdrop => backdrop.toggleTransition())
   }
 }

data/app/assets/javascripts/maquina/controllers/modal_open_controller.js

@@ -5,6 +5,6 @@ export default class extends Controller {
 
   open(event) {
     event.preventDefault()
-    this.modalOutlets.forEach(modal => modal.toggleModal(event))
+    this.modalOutlets.forEach(modal => modal.open(event))
   }
 }

data/app/controllers/concerns/maquina/create.rb

@@ -16,6 +16,7 @@ module Maquina
         end
 
         @status = @resource.errors.empty? ? :created : :unprocessable_entity
+        Rails.logger.debug "CREATE validation: #{@resource.errors.inspect}" if status == :unprocessable_entity
         response.status = @status
         set_flash_message(@status)
 

data/app/controllers/concerns/maquina/destroy.rb

@@ -8,10 +8,11 @@ module Maquina
       def destroy(&block)
         @resource ||= begin
           scope = resource_class
-          # TODO: Implement policy authorization (ActionPolicy)
-          # scope = scope.where(organization)
-          # TODO: Implement filtering by organization
+          scope = authorized_scope(scope) if policy_class.present?
+
           scope.find_by!(find_by_param => params[:id])
+
+          authorize! resource, with: policy_class if policy_class.present?
         end
 
         @resource.destroy

data/app/controllers/concerns/maquina/edit.rb

@@ -8,8 +8,7 @@ module Maquina
       def edit(&block)
         @resource ||= begin
           scope = resource_class
-          # TODO: Implement filtering by organization
-          # scope = scope.where(organization)
+          scope = authorized_scope(scope) if policy_class.present?
           scope = yield(scope) if block.present?
 
           resource = scope.find_by!(find_by_param => params[:id])

data/app/controllers/concerns/maquina/index.rb

@@ -14,7 +14,7 @@ module Maquina
           scope = authorized_scope(scope) if policy_class.present?
 
           search_value = params[:q]&.strip
-          scope = scope.search_full(search_value) if search_value.present?
+          scope = scope.search_full(search_value) if search_value.present? && resource_class.searchable?
 
           scope = yield(scope) if block.present?
 

data/app/controllers/concerns/maquina/update.rb

@@ -8,8 +8,8 @@ module Maquina
       def update(&block)
         @resource ||= begin
           scope = resource_class
-          # scope = scope.where(organization)
-          # TODO: Implement filtering by organization
+          scope = authorized_scope(scope) if policy_class.present?
+
           resource = scope.find_by!(find_by_param => params[:id])
 
           authorize! resource, with: policy_class if policy_class.present?
@@ -20,6 +20,7 @@ module Maquina
         saved = @resource.update(resource_secure_params)
 
         status = saved ? :accepted : :unprocessable_entity
+        Rails.logger.debug "UPDATE validation: #{@resource.errors.inspect}" if status == :unprocessable_entity
         response.status = status
         set_flash_message(status)
 

data/app/views/maquina/application/form.rb

@@ -30,7 +30,7 @@ module Maquina
 
             div(class: "pt-5") do
               div(class: "flex justify-end") do
-                link_to t("helpers.cancel"), collection_path, class: "button", data: @modal ? {action: "modal#toggleModal"} : {turbo_frame: :_top}
+                link_to t("helpers.cancel"), collection_path, class: "button", data: @modal ? {action: "modal#close"} : {turbo_frame: :_top}
                 form.submit class: "ml-3 button button-accented"
               end
             end

data/app/views/maquina/application/index_modal.rb

@@ -7,11 +7,13 @@ module Maquina
       register_element :turbo_frame
 
       def template
-        div(data_controller: "modal", class: "modal", data_frame_src: "") do
-          div(class: "fixed inset-0 z-30 hidden overflow-y-auto", aria_labelledby: "modal-title", role: "dialog",
+        div(data_controller: "modal", class: "modal", data_modal_backdrop_outlet: ".modal-backdrop") do
+          div(class: "hidden fixed inset-0 z-30 overflow-y-auto", aria_labelledby: "modal-title", role: "dialog",
             aria_modal: "true", data_modal_target: "container") do
             div(class: "flex items-end justify-center min-h-screen px-4 pt-4 pb-20 text-center sm:block sm:p-0") do
-              div(class: "fixed inset-0 transition-opacity",
+              div(class: "hidden fixed inset-0 transition-opacity modal-backdrop",
+                data_controller: "backdrop",
+                data_backdrop_target: "backdrop",
                 data_transition_enter: "ease-out duration-300",
                 data_transition_enter_active: "opacity-0",
                 data_transition_enter_to: "opacity-100",
@@ -22,8 +24,8 @@ module Maquina
                 div(class: "fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity", aria_hidden: "true")
               end
               span(class: "hidden sm:inline-block sm:align-middle sm:h-screen", aria_hidden: "true") { "​" }
-              div(class: "inline-block align-bottom bg-white rounded-lg px-4 pt-5 pb-4 text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6",
-                data_modal_target: "content",
+              div(class: "hidden inline-block align-bottom bg-white rounded-lg px-4 pt-5 pb-4 text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6",
+                data_modal_target: "modal",
                 data_transition_enter: "ease-out duration-300",
                 data_transition_enter_active: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
                 data_transition_enter_to: "opacity-100 translate-y-0 sm:scale-100",

data/app/views/maquina/sessions/form.rb

@@ -47,8 +47,8 @@ module Maquina
       def field_attributes(field_name, scope = nil)
         scope ||= "sessions"
         {
-          maxlength: t("maxlength.#{scope}.#{field_name}", default: t("maxlength.default")),
-          placeholder: t("placeholder.#{scope}.#{field_name}", default: "")
+          maxlength: t("helpers.maxlength.#{scope}.#{field_name}", default: t("helpers.maxlength.default")),
+          placeholder: t("helpers.placeholder.#{scope}.#{field_name}", default: "")
         }
       end
     end

data/config/locales/forms.en.yml

@@ -3,7 +3,8 @@ en:
     maquina/plan:
       title: Configure a plan for your customers
     maquina/invitation:
-      title: User will receive an invitation to join this application in the provided email.
+      title: Invite user to collaborate
+      description: User will receive an invitation to join this application in the provided email.
 
   form:
     sessions:
@@ -26,18 +27,6 @@ en:
     maquina/invitation:
       email: Enter user's email
 
-  maxlength:
-    default: 30
-
-    maquina/plan:
-      name: 60
-      trial: 3
-      price: 9
-
-    sessions:
-      email: 60
-      password: 60
-
   help:
     maquina/plan:
       name: Descriptive plan name
@@ -56,3 +45,14 @@ en:
       maquina/invitation:
         create: Send invitation
 
+    maxlength:
+      default: 30
+
+      maquina/plan:
+        name: 60
+        trial: 3
+        price: 9
+
+      sessions:
+        email: 60
+        password: 60

data/lib/maquina/version.rb

@@ -1,3 +1,3 @@
 module Maquina
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maquina
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Mario Alberto Chávez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -307,6 +307,7 @@ files:
 - app/assets/javascripts/maquina/application.js
 - app/assets/javascripts/maquina/controllers/alert_controller.js
 - app/assets/javascripts/maquina/controllers/application.js
+- app/assets/javascripts/maquina/controllers/backdrop_controller.js
 - app/assets/javascripts/maquina/controllers/file_controller.js
 - app/assets/javascripts/maquina/controllers/index.js
 - app/assets/javascripts/maquina/controllers/mobile_menu_controller.js