satis 1.0.67 → 1.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e05287afa653b87170ae0c2ebccac7548323106ff6fb631a6126ada2b84a554
-  data.tar.gz: 9e6c4450b2d7b7e0cca1ef42e2076eec116be0b871e0697c8fcf544c9adcb8a9
+  metadata.gz: 4d67068f1fbf018ab9c608056352d81b6dac55a162f7d81da49ea7053ae46fbc
+  data.tar.gz: 91f4663daf88672d435d705d6452316309fcb8bebc3f32f0560a41f9c372973f
 SHA512:
-  metadata.gz: 4a3d17b84eb5dd0fdc1b84bcc316a771355041a3d6de1463ce420bb4b757e0bc8b97c2f476fa416aff09d999e1a73fc0d4eda12c200b0a4905dc2a5b40dba9d9
-  data.tar.gz: d67f4cafd6e6b07c92cb626c3c95d843c1e02f8b4af4136c1cf462a1a3ff3fd15bb54340caa060750ff47ca2351c4cb64443b18cac61cd17e9cde5183de77b89
+  metadata.gz: 1e5a801b78f3494ac01c060ddb06f1abeb99c1c3facd288e04fb39f13e56f34126182778bd0fc91d986bbd7ea90a6a7e565cd3a584395928641cf8769ba49c8d
+  data.tar.gz: db160debfab9a8036df9b6522abbe047c61a48a1e57dbc3fc139d96c539786d5e293f21cab71311bdc90f0022db1c4b46f561d04ec8a0e26169ca16ba4cb5eca

data/app/components/satis/application_component.rb

@@ -7,6 +7,9 @@ module Satis
 
     attr_accessor :original_view_context
 
+    delegate :add_helper, to: :class
+
+
     #
     # This provides us with a translation helper which scopes into the original view
     # and thereby conveniently scopes the translations.
@@ -46,5 +49,29 @@ module Satis
     def i18n_scope
       self.class.name.split('::').second.underscore.to_sym
     end
+
+    def component_name
+      self.class.name.sub(/::Component$/, "").sub(/^Satis::/, "").underscore
+    end
+
+    def self.add_helper(name, component)
+      if respond_to?(name)
+        Satis.config.logger.warn("Helper #{name} already defined, skipping.")
+        return
+      end
+      define_method(name) do |*args, **kwargs, &block|
+        original_args = args.dup
+        options = args.extract_options!
+        instance = if options.key? :variant
+          variant_component = component.to_s.sub(/::Component$/, "::#{options[:variant].to_s.camelize}::Component").safe_constantize
+          (variant_component || component).new(*original_args, **kwargs)
+        else
+          kwargs[component_name.to_sym] = self
+          component.new(*original_args, **kwargs)
+        end
+        original_view_context.render(instance, &block)
+      end
+    end
+
   end
 end

data/app/components/satis/card/component.html.slim

@@ -1,4 +1,4 @@
-.sts-card.sts-tabs data-controller="satis-tabs" data-satis-tabs-persist-value="false"
+.sts-card.sts-tabs data-controller="satis-tabs" data-satis-tabs-persist-value="false" data-satis-tabs-key-value="#{key}"
   - if header?
     .sts-card__header class="#{tabs? ? '' : 'border-b border-gray-200'} #{header_background_color[:light]} dark:#{header_background_color[:dark]}"
       .-ml-4.-mt-4.flex.justify-between.items-center.flex-wrap.sm:flex-nowrap
@@ -33,19 +33,27 @@
             option selected=tab.selected? = t(tab.name, scope: [:tabs])
       .hidden.sm:block
         nav.-mb-px.flex.space-x-8.overflow-x-auto aria-label="Tabs"
-          - tabs.each do |tab|
-              a.tab id="#{tab.name}" href="#" aria-current="#{tab.selected? ? "page" : ''}" data-satis-tabs-target="tab" data-action="click->satis-tabs#select"
+          - tabs.each_with_index do |tab, index|
+            - id = tab.id.present? ? tab.id : tab.name
+            .flex
+              a.tab id="#{id}" class="#{index == (tab.selected_tab_index) ? 'selected' : ''}" href="#" aria-current="#{tab.selected? ? "page" : ''}" data-satis-tabs-target="tab" data-action="click->satis-tabs#select"
                 - if tab.icon
                   i.mr-2 class=tab.icon
-                = t(tab.name, scope: [:tabs], default: tab.title || tab.name)
+                span id="tab_label_#{tab.id}"
+                  = t(tab.name, scope: [:tabs], default: tab.title || tab.name)
                 i.fal.fa-triangle-exclamation.ml-2.hidden
                 - if tab.badge
-                  span.badge
+                  span.badge id="tab_badge_#{tab.id}"
                     = tab.badge
+              - if tab.tab_menu
+                = render(Satis::Menu::Component.new(tab.tab_menu, icon: 'fa-thin fa-square-chevron-down'))
+          - if custom_tabs_link_html.present?
+            = custom_tabs_link_html
 
-    - tabs.each do |tab|
-      div id="#{tab.name}-content" class="tab-content #{tab.options[:padding] == true ? 'px-6 py-6' : ''}" data-satis-tabs-target="content"
+    - tabs.each_with_index do |tab, index|
+      div id="#{tab.name}-content" class="tab-content #{tab.options[:padding] == true ? 'px-6 py-6' : ''} #{index == (tab.selected_tab_index) ? 'selected' : ''}" data-satis-tabs-target="content"
         = tab.to_s
+
   - else
     div class="#{content_padding ? 'px-6 py-6' : ''}"
       = content

data/app/components/satis/card/component.rb

@@ -7,7 +7,7 @@ module Satis
       renders_many :tabs, Tab::Component
       renders_one :footer
 
-      attr_reader :icon, :title, :description, :menu, :content_padding, :header_background_color, :initial_actions
+      attr_reader :icon, :title, :description, :menu, :content_padding, :header_background_color, :initial_actions, :key, :custom_tabs_link_html
 
       def initialize(icon: nil,
                      title: nil,
@@ -17,7 +17,8 @@ module Satis
                      header_background_color: {
                        dark: 'bg-gray-800', light: 'bg-white'
                      },
-                     actions: [])
+                     actions: [],
+                     key: nil)
         super
         @title = title
         @title = @title.reject(&:blank?).compact.join(' ') if @title.is_a?(Array)
@@ -27,6 +28,12 @@ module Satis
         @content_padding = content_padding
         @header_background_color = header_background_color
         @initial_actions = actions
+        @key = key
+      end
+
+      def custom_tabs_link(&block)
+        return unless block_given?
+        @custom_tabs_link_html = block.call.html_safe
       end
 
       def tabs?

data/app/components/satis/dropdown/component.rb

@@ -27,8 +27,8 @@ module Satis
           options[:input_html].delete(:autofocus)
         end
 
-        actions = [options[:input_html]['data-action'], 'change->satis-dropdown#display',
-                   'focus->satis-dropdown#focus'].join(' ')
+        actions =  [options[:input_html]['data-action'], 'change->satis-dropdown#display',
+                   'focus->satis-dropdown#focus'].join(' ') unless options[:input_html]['data-reflex']
 
         options[:input_html].merge!('data-satis-dropdown-target' => 'hiddenInput',
                                     'data-action' => actions)

data/app/components/satis/dropdown/component.scss

@@ -5,6 +5,16 @@
   }
 
   input {
-    @apply dark:text-gray-300
+    @apply dark:text-gray-300;
+    
+  }
+  
+  .warning
+  {
+    @apply border-orange-500;
+    input {
+      @apply text-gray-400;
+      
+    }
   }
 }

data/app/components/satis/dropdown/component_controller.js

@@ -184,6 +184,12 @@ export default class extends ApplicationController {
     } else {
       this.debouncedLocalResults(event)
     }
+
+    if (this.searchInputTarget.value) {
+      this.searchInputTarget.closest(".bg-white").classList.add("warning")
+    } else {
+      this.searchInputTarget.closest(".bg-white").classList.remove("warning")
+    }
   }
 
   // User presses reset button
@@ -211,6 +217,10 @@ export default class extends ApplicationController {
       event.preventDefault()
     }
 
+    if (this.searchInputTarget.closest(".bg-white").classList.contains("warning")) {
+      this.searchInputTarget.closest(".bg-white").classList.remove("warning")
+    }
+
     return false
   }
 
@@ -245,6 +255,10 @@ export default class extends ApplicationController {
     this.lastSearch = this.searchInputTarget.value
 
     this.hiddenInputTarget.dispatchEvent(new Event("change"))
+
+    if (this.searchInputTarget.closest(".bg-white").classList.contains("warning")) {
+      this.searchInputTarget.closest(".bg-white").classList.remove("warning")
+    }
   }
 
   // --- Helpers
@@ -257,11 +271,17 @@ export default class extends ApplicationController {
       this.searchInputTarget.value = currentItem.getAttribute("data-satis-dropdown-item-text")
 
       Array.prototype.slice.call(currentItem.attributes).forEach((attr) => {
-        if (attr.name.startsWith("data") && !attr.name.startsWith("data-satis") && !attr.name.startsWith("data-action")) {
+        if (
+          attr.name.startsWith("data") &&
+          !attr.name.startsWith("data-satis") &&
+          !attr.name.startsWith("data-action")
+        ) {
           this.hiddenInputTarget.setAttribute(attr.name, attr.value)
         }
       })
-      this.hiddenInputTarget.dispatchEvent(new CustomEvent("change", { detail: { src: "satis-dropdown" } }))
+      if (!this.hiddenInputTarget.getAttribute("data-reflex")) {
+        this.hiddenInputTarget.dispatchEvent(new CustomEvent("change", { detail: { src: "satis-dropdown" } }))
+      }
     }
   }
 
@@ -362,7 +382,10 @@ export default class extends ApplicationController {
       this.hiddenInputTarget.value = this.lastSearch
     }
 
-    if (matches.length == 1 && matches[0].getAttribute("data-satis-dropdown-item-text").toLowerCase().indexOf(this.lastSearch.toLowerCase()) >= 0) {
+    if (
+      matches.length == 1 &&
+      matches[0].getAttribute("data-satis-dropdown-item-text").toLowerCase().indexOf(this.lastSearch.toLowerCase()) >= 0
+    ) {
       this.selectItem(matches[0].closest('[data-satis-dropdown-target="item"]'))
     } else if (matches.length > 1) {
       this.showResultsList(event)
@@ -372,7 +395,11 @@ export default class extends ApplicationController {
   // Remote search
   fetchResults(event) {
     const promise = new Promise((resolve, reject) => {
-      if ((this.searchInputTarget.value == this.lastSearch && (this.currentPage == this.lastPage || this.currentPage == this.endPage)) || !this.hasUrlValue) {
+      if (
+        (this.searchInputTarget.value == this.lastSearch &&
+          (this.currentPage == this.lastPage || this.currentPage == this.endPage)) ||
+        !this.hasUrlValue
+      ) {
         return
       }
 
@@ -401,7 +428,13 @@ export default class extends ApplicationController {
           this.highLightSelected()
           this.showResultsList()
 
-          if (this.nrOfItems == 1 && this.itemTargets[0].getAttribute("data-satis-dropdown-item-text").toLowerCase().indexOf(this.searchInputTarget.value.toLowerCase()) >= 0) {
+          if (
+            this.nrOfItems == 1 &&
+            this.itemTargets[0]
+              .getAttribute("data-satis-dropdown-item-text")
+              .toLowerCase()
+              .indexOf(this.searchInputTarget.value.toLowerCase()) >= 0
+          ) {
             this.selectItem(this.itemTargets[0].closest('[data-satis-dropdown-target="item"]'))
           } else if (this.nrOfItems == 1) {
             this.moveDown()

data/app/components/satis/input/component.rb

@@ -6,8 +6,8 @@ module Satis
       attr_reader :classes
 
       def initialize(classes: nil, colored: true)
-        @classes = classes || ''
-        @classes += ' colored' if colored
+        @classes = classes || ""
+        @classes += " colored" if colored
       end
     end
 
@@ -27,11 +27,11 @@ module Satis
       end
 
       def input_class
-        [@options.fetch(:input_html, {}).fetch(:class, ''), 'sts-input__input', form.has_error?(attribute) && 'is-invalid'].join(' ')
+        [@options.fetch(:input_html, {}).fetch(:class, ""), "sts-input__input", form.has_error?(attribute) ? "is-invalid" : ""].join(" ")
       end
 
       def input_container_class
-        form.has_error?(attribute) && 'is-invalid'
+        form.has_error?(attribute) && "is-invalid"
       end
     end
   end

data/app/components/satis/input/component.scss

@@ -20,6 +20,14 @@
     &:focus {
       box-shadow: none;
     }
+
+    &.white {
+      background: rgb(255, 255, 255);
+
+      .dark & {
+        background: rgba(255, 255, 255, 0.1);
+      }
+    }
   }
 
   &__element {
@@ -33,6 +41,14 @@
       }
     }
 
+    &.white {
+      background: rgb(255, 255, 255);
+
+      .dark & {
+        background: rgba(255, 255, 255, 0.1);
+      }
+    }
+
     input {
       @apply -ml-3 -mr-3 -mt-2 -mb-2 w-full;
 

data/app/components/satis/menu/component.html.slim

@@ -1,9 +1,9 @@
-div data-controller="satis-menu" data-action="mouseover->satis-menu#show mouseleave->satis-menu#hide"
+div data-controller="satis-menu" data-action="#{menu.event}->satis-menu#show mouseleave->satis-menu#hide"
   - if content
     = content
   - else
     button.inline-flex.items-center.justify-center.h-8.w-8.rounded-full.focus:outline-none.focus:ring-2.focus:ring-offset-2.focus:ring-primary-500.dark:text-gray-500 aria-expanded="false" aria-haspopup="true" type="button"
-      span.font-semibold.flex-1 class="#{menu.items.present? ? '' : 'text-gray-200'}"
+      span.font-semibold.flex-1 id="#{icon_id}" class="#{menu.items.present? ? '' : 'text-gray-200'}"
         i class=icon
 
   - if menu.items.present?

data/app/components/satis/menu/component.rb

@@ -4,12 +4,13 @@ module Satis
   module Menu
     class Component < Satis::ApplicationComponent
       # renders_many :tabs, Tab::Component
-      attr_reader :menu, :icon
+      attr_reader :menu, :icon, :icon_id
 
-      def initialize(menu, icon: nil)
+      def initialize(menu, icon: nil, icon_id: nil)
         super
         @menu = menu
         @icon = icon || 'fa-solid fa-ellipsis-vertical'
+        @icon_id = icon_id
       end
     end
   end

data/app/components/satis/menu_item/component.html.slim

@@ -1,9 +1,13 @@
 li.rounded-sm.px-3.py-1.hover:bg-gray-100.dark:hover:bg-gray-200.flex.items-center data-controller="satis-menu" data-action="mouseover->satis-menu#show mouseleave->satis-menu#hide"
   a.cursor-pointer.py-1.w-full.text-left.flex.items-center.outline-none.focus:outline-none href=item.link *item.link_attributes
+    - if item.type == :custom
+      = render(partial: item.link_attributes[:data][:path], locals: item.link_attributes[:data][:parameters])
     span.pr-1.flex-shrink-0.w-6
       - if item.icon.present?
         i class=item.icon
-    span.pr-1.flex-1 = item.label
+    span.pr-1.flex-1
+      - unless item.type == :custom
+        = item.label
     span.pr-1.flex-shrink-0.w-6
       - if item.type == :toggle
         i.fal.fa-check.hidden data-satis-menu-target="toggle" id="#{item.id}"

data/app/components/satis/tab/component.rb

@@ -3,7 +3,7 @@
 module Satis
   module Tab
     class Component < Satis::ApplicationComponent
-      attr_reader :options, :name, :icon, :badge
+      attr_reader :options, :name, :icon, :badge, :id, :tab_menu, :selected_tab_index
 
       def initialize(name, *args, &block)
         super
@@ -11,8 +11,11 @@ module Satis
         @options = args.extract_options!
         @args = args
         @icon = options[:icon]
+        @id = options[:id]
         @badge = options[:badge]
+        @tab_menu = options[:tab_menu]
         @block = block
+        @selected_tab_index = options[:selected_tab_index]
       end
 
       def responsive?

data/app/components/satis/tabs/component.html.slim

@@ -1,4 +1,4 @@
-.sts-tabs id="#{group}" data-controller="satis-tabs" data-satis-tabs-persist-value="#{persist}"
+.sts-tabs id="#{group}" data-controller="satis-tabs" data-satis-tabs-persist-value="#{persist}" data-satis-tabs-key-value="#{key}"
   .sm:hidden
     label.sr-only for="tabs" Select a tab
     select#tabs.block.w-full.pl-3.pr-10.py-2.text-base.border-gray-300.focus:outline-none.focus:ring-primary-500.focus:border-primary-500.sm:text-sm.rounded-md name="tabs" data-action="change->satis-tabs#select" data-satis-tabs-target="select"
@@ -20,4 +20,4 @@
   div
     - tabs.each do |tab|
       div id="#{tab.name}-content" class="tab-content #{tab.options[:padding] == false ? '' : 'mt-4'}" data-satis-tabs-target="content"
-        = tab.to_s
+        = tab.to_s

data/app/components/satis/tabs/component.rb

@@ -4,12 +4,13 @@ module Satis
   module Tabs
     class Component < Satis::ApplicationComponent
       renders_many :tabs, Tab::Component
-      attr_reader :group, :persist
+      attr_reader :group, :persist, :key
 
-      def initialize(group: :main, persist: false)
+      def initialize(group: :main, persist: false, key: nil)
         super
         @group = group
         @persist = persist
+        @key = key
       end
     end
   end

data/app/components/satis/tabs/component_controller.js

@@ -5,7 +5,7 @@ import ApplicationController from "../../../../frontend/controllers/application_
  */
 export default class extends ApplicationController {
   static targets = ["tab", "content", "select"]
-  static values = { persist: Boolean }
+  static values = { persist: Boolean, key: String }
 
   static keyBindings = [
     {
@@ -23,9 +23,6 @@ export default class extends ApplicationController {
   connect() {
     super.connect()
 
-    const ourUrl = new URL(window.location.href)
-    this.keyBase = ourUrl.pathname.substring(1, ourUrl.pathname.length).replace(/\//, "_") + "_tabs_" + this.context.scope.element.id
-
     let firstErrorIndex
     this.tabTargets.forEach((tab, index) => {
       let hasErrors = this.contentTargets[index].querySelectorAll(".is-invalid")
@@ -37,7 +34,13 @@ export default class extends ApplicationController {
       }
     })
 
-    this.open(firstErrorIndex || this.tabToOpen())
+    if (this.keyValue) {
+      this.getUserData(this.keyValue).then((data) => {
+        this.open(firstErrorIndex || data?.tab_index || 0)
+      })
+    } else {
+      this.open(firstErrorIndex || 0)
+    }
   }
 
   select(event) {
@@ -51,7 +54,12 @@ export default class extends ApplicationController {
       })
     }
     this.open(index)
-    this.storeValue("openTab", index)
+
+    if (this.keyValue) {
+      this.setUserData(this.keyValue, { tab_index: index }).then((data) => {
+        //console.log(data)
+      })
+    }
 
     // Cancel the this event (dont show the browser context menu)
     event.preventDefault()
@@ -75,49 +83,5 @@ export default class extends ApplicationController {
     this.selectTarget.selectedIndex = index
   }
 
-  storeValue(key, value) {
-    if (!this.persistValue) {
-      return
-    }
-
-    if (typeof Storage !== "undefined") {
-      sessionStorage.setItem(this.keyBase + "_" + key, value)
-    }
-  }
-
-  getValue(key) {
-    if (!this.persistValue) {
-      return
-    }
-
-    if (typeof Storage !== "undefined") {
-      return sessionStorage.getItem(this.keyBase + "_" + key)
-    }
-  }
-
   disconnect() {}
-
-  tabToOpen() {
-    let urlValue = this.getUrlVar(this.context.scope.element.id + "Tab")
-
-    if (typeof urlValue !== "undefined") {
-      return urlValue
-    }
-
-    return this.getValue("openTab") || 0
-  }
-
-  getUrlVar(name) {
-    return this.getUrlVars()[name]
-  }
-
-  getUrlVars() {
-    let vars = {}
-
-    window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
-      vars[key] = value
-    })
-
-    return vars
-  }
 }

data/app/controllers/satis/user_data_controller.rb

@@ -0,0 +1,30 @@
+module Satis
+  class UserDataController < ApplicationController
+    def show
+      key = request.url.split('/user_data/').last
+      data = Satis.config.current_user.user_data.keyed(key)
+
+      if data.id.present?
+        render json: data.data, status: 200
+      else
+        render json: {}, status: 404
+      end
+    end
+
+    def update
+      key = request.url.split('/user_data/').last
+      data = Satis.config.current_user.user_data.keyed(key)
+
+      data.data = user_data_update_params.as_json
+      data.save!
+
+      render json: data.data, status: 200
+    end
+
+    private
+
+    def user_data_update_params
+      params.require(:user_datum)
+    end
+  end
+end

data/app/models/satis/user_data.rb

@@ -0,0 +1,11 @@
+module Satis
+  class UserData < ApplicationRecord
+    belongs_to :user, optional: true
+
+    validates :key, presence: true, uniqueness: { scope: :user_id, allow_nil: true }
+
+    def self.keyed(key)
+      find_or_create_by(key: key)
+    end
+  end
+end

data/app/views/shared/_fields_for.html.slim

@@ -13,11 +13,11 @@
             = yield(nested_form)
           .col-span-1.flex.justify-center.items-center.association
             .h-full.w-1.border-r.border-dashed
-            a.text-primary-600.bg-white.dark:bg-gray-800 href="#" data-action='click->satis-fields-for#addAssociation' style="margin-left: -7px;"
+            a.text-primary-600.nested-fields_action href="#" data-action='click->satis-fields-for#addAssociation'
               i.fal.fa-plus
           .hidden.col-span-1.flex.justify-center.items-center.association
             .h-full.w-1.border-r.border-dashed
-            a.text-primary-600.bg-white.dark:bg-gray-800 href="#" data-action='click->satis-fields-for#removeAssociation'  style="margin-left: -7px;"
+            a.text-primary-600.nested-fields_action href="#" data-action='click->satis-fields-for#removeAssociation'
               i.fal.fa-trash
 
 = form.rails_fields_for collection do |nested_form|
@@ -29,7 +29,7 @@
         = yield(nested_form)
       .col-span-1.flex.justify-center.items-center
         .h-full.w-1.border-r.border-dashed
-        a.text-primary-600.bg-white.dark:bg-gray-800 href="#" data-action='click->satis-fields-for#removeAssociation' style="margin-left: -7px;"
+        a.text-primary-600.nested-fields_action href="#" data-action='click->satis-fields-for#removeAssociation'
           i.fal.fa-trash
 
 span data-satis-fields-for-target='insertionPoint'

data/config/routes.rb

@@ -1,5 +1,3 @@
 Satis::Engine.routes.draw do
-  resources :tables, param: :table_name do
-    get 'filter_collection', on: :collection
-  end
+  resources :user_data, only: %i[show update]
 end

data/db/migrate/20220929142147_create_satis_user_data.rb

@@ -0,0 +1,13 @@
+class CreateSatisUserData < ActiveRecord::Migration[6.1]
+  def change
+    create_table :satis_user_data, id: :uuid do |t|
+      t.string :key, null: false
+      t.jsonb :data, null: false, default: {}
+      t.belongs_to :user, null: false, foreign_key: true, type: :uuid
+
+      t.timestamps
+    end
+    add_index :satis_user_data, :key, unique: true
+    add_index :satis_user_data, :data, using: :gin
+  end
+end

data/db/migrate/20221212083110_change_satis_user_data.rb

@@ -0,0 +1,10 @@
+class ChangeSatisUserData < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+  def change
+    safety_assured { change_column :satis_user_data, :data, :jsonb, null: true, default: {} }
+    safety_assured { change_column :satis_user_data, :user_id, :uuid, null: true, foreign_key: true }
+
+    remove_index :satis_user_data, [:key]
+    add_index :satis_user_data, [:user_id, :key], unique: true, algorithm: :concurrently
+  end
+end

data/lib/satis/active_record_helpers.rb

@@ -0,0 +1,20 @@
+require_relative 'satisfied'
+
+module Satis::ActiveRecordHelpers
+  extend ActiveSupport::Concern
+
+  included do
+    delegate :satisfied?, to: :class
+  end
+
+  class_methods do
+    def satisfied(options = {})
+      @_satis_satisfied_options = options
+      include Satis::Satisfied
+    end
+
+    def satisfied?
+      included_modules.include?(Satis::Satisfied)
+    end
+  end
+end

data/lib/satis/configuration.rb

@@ -3,13 +3,14 @@
 module Satis
   class Configuration
     attr_accessor :submit_on_enter, :confirm_before_leave
-    attr_writer :default_help_text
+    attr_writer :default_help_text, :current_user
     attr_writer :logger
 
     def initialize
       @logger = Logger.new(STDOUT)
       @submit_on_enter = true
       @confirm_before_leave = false
+      @current_user = -> {}
 
       @default_help_text = lambda do |_template, _object, key, _additional_scope|
         scope = help_scope(template, object, additional_scope)
@@ -57,5 +58,11 @@ module Satis
 
       actions.map { |action| help_scope(template, object, additional_scope, action: action) }
     end
+
+    def current_user
+      raise 'current_user should be a Proc' unless @current_user.is_a? Proc
+
+      instance_exec(&@current_user)
+    end
   end
 end

data/lib/satis/engine.rb

@@ -23,5 +23,13 @@ module Satis
         end
       end
     end
+
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match? root.to_s
+        config.paths['db/migrate'].expanded.each do |expanded_path|
+          app.config.paths['db/migrate'] << expanded_path
+        end
+      end
+    end
   end
 end

data/lib/satis/menus/menu.rb

@@ -3,13 +3,13 @@
 module Satis
   module Menus
     class Menu
-      attr_reader :items, :level
-
+      attr_reader :items, :level, :event
       def initialize(*args, **kwargs)
         @options = args.extract_options!
         @items = []
         @scope = Array.wrap(args.first)
         @level = kwargs[:level] || 0
+        @event = kwargs[:event] || 'mouseover'
         yield self if block_given?
       end
 

data/lib/satis/satisfied.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Satis
+  module Satisfied
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def satisfied_options
+        @_satis_satisfied_options || {}
+      end
+    end
+
+    included do
+      has_many :user_data, class_name: 'Satis::UserData'
+    end
+  end
+end

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "1.0.67"
+  VERSION = "1.0.69"
 end

data/lib/satis.rb

@@ -1,6 +1,7 @@
 require 'satis/version'
 require 'satis/engine'
 require 'satis/configuration'
+require 'satis/active_record_helpers'
 
 require 'view_component'
 require 'browser'
@@ -32,5 +33,16 @@ module Satis
     def add_helper(name, component)
       Satis::Helpers::Container.add_helper(name, component)
     end
+
+    def add_component_helper(component_name, name, component)
+      klass = "Satis::#{component_name.to_s.classify}::Component".safe_constantize
+      return if klass.blank?
+      klass.add_helper name, component
+    end
+  end
+
+  # Include helpers
+  ActiveSupport.on_load(:active_record) do
+    include Satis::ActiveRecordHelpers
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satis
 version: !ruby/object:Gem::Version
-  version: 1.0.67
+  version: 1.0.69
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser
@@ -164,14 +164,19 @@ files:
 - app/components/satis/tabs/component.scss
 - app/components/satis/tabs/component_controller.js
 - app/controllers/satis/application_controller.rb
+- app/controllers/satis/user_data_controller.rb
 - app/helpers/satis/application_helper.rb
 - app/jobs/satis/application_job.rb
 - app/mailers/satis/application_mailer.rb
 - app/models/satis/application_record.rb
+- app/models/satis/user_data.rb
 - app/views/shared/_fields_for.html.slim
 - config/routes.rb
+- db/migrate/20220929142147_create_satis_user_data.rb
+- db/migrate/20221212083110_change_satis_user_data.rb
 - lib/satis.rb
 - lib/satis/action_controller_helpers.rb
+- lib/satis/active_record_helpers.rb
 - lib/satis/configuration.rb
 - lib/satis/engine.rb
 - lib/satis/forms/builder.rb
@@ -184,6 +189,7 @@ files:
 - lib/satis/menus/builder.rb
 - lib/satis/menus/item.rb
 - lib/satis/menus/menu.rb
+- lib/satis/satisfied.rb
 - lib/satis/version.rb
 - lib/tasks/satis_tasks.rake
 homepage: https://github.com/entdec/satis