tybo 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d93a3e02b0858c49f45215e8457294b3dbe7a70e66c9cdce463324a86cc65414
-  data.tar.gz: '09ca1b2fadff5a2bc2d8c0c32192bd506618916c9cb734341831b2e3478b1d37'
+  metadata.gz: daa02ecc2547566ac774ab1e182054ff7a9cfbaa7c45561338e2b706536eafe8
+  data.tar.gz: 8f506d40fe83c7856efceb1f1b5eb55ebdee15a5769ae4e59332850f2d18bfc7
 SHA512:
-  metadata.gz: 74f8a9aaafeeea63b8a26d8336a9d77d7d945e04c106b3e2703c1d4900e1d0a0f7a11398aa87b2ee0e948c86cd8c24959737d3263eff66360baca567a61a9ce0
-  data.tar.gz: 237dc58da09eee1ce80bd2295778acd88cc715089726e067755b9b6340530f58dda6c84b707fc7115b450a8f5a4e81733e22da099492470f4975b18b548c240f
+  metadata.gz: 0dfda4edfd7ed96a710117404e4247ab4a99b65af0da16b9ed71416e142c1c3ce01adff087dd463c474751d6d2aa07be437d02267ab2abc7d3af03df2ebbdb15
+  data.tar.gz: 5fef87ba89d3bb1deb46b6848239e4acfa717b60cbde1b714c75112cdb84546dd35913be7c349257e3c637a86bba5e86fe434b0a6c0fe25b134d147f32198dda

data/app/components/forms/has_many_form_component.html.erb

@@ -0,0 +1,5 @@
+  <!-- has_many Associations -->
+  <div class="my-5 select">
+    <label class="block text-sm font-medium text-gray-700 string optional text-sm font-medium text-gray-600" for="office_user_ids"><%= @title %></label>
+    <%= content %>
+  </div>

data/app/components/forms/has_many_form_component.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Forms
+  class HasManyFormComponent < ViewComponent::Base
+    def initialize(title:)
+      @title = title
+    end
+  end
+end

data/lib/generators/bo/bo_generator.rb

@@ -6,6 +6,7 @@ class BoGenerator < Rails::Generators::NamedBase
 
   check_class_collision suffix: 'bo'
   class_option :namespace, type: :string, default: 'administrators'
+
   def create_bo_file
     # Template method
     # First argument is the name of the template
@@ -21,12 +22,11 @@ class BoGenerator < Rails::Generators::NamedBase
     create_translations
   end
 
-  def bo_model
-    class_name.constantize
-  end
 
-  def plural_name
-    file_name.pluralize
+  def add_link_to_side_bar
+    inject_into_file "app/views/#{options[:namespace]}/layouts/_side_bar.html.erb", before: "  <%= sidebar.with_current_user_card(user: current_#{options[:namespace].singularize}) %>\n" do 
+      "  <%= sidebar.with_item(path: #{options[:namespace]}_#{plural_name}_path, icon: Icons::UsersComponent, label: I18n.t('bo.#{file_name}.others').capitalize) %>\n"
+    end
   end
 
   def create_routes
@@ -35,10 +35,24 @@ class BoGenerator < Rails::Generators::NamedBase
     end
   end
 
+  private
+
+  def bo_model
+    class_name.constantize
+  end
+
+  def plural_name
+    file_name.pluralize
+  end
+
   def model_columns
     bo_model.column_names.map(&:to_sym)
   end
 
+  def simple_form_conflict_keywords
+    %w[country country_code]
+  end
+
   def bo_model_title(model=nil)
     return unless model
 
@@ -61,6 +75,10 @@ class BoGenerator < Rails::Generators::NamedBase
     has_many_assoc&.map do |association|
        params["#{association.name.to_s.singularize}_ids".to_sym] = []
     end
+    has_one_assoc&.map do |association|
+       attributes = association.klass.column_names.map(&:to_sym).delete_if {|attr| excluded_columns.include?(attr)}
+       params["#{association.name.to_s.singularize}_attributes".to_sym] = attributes
+    end
     params
   end
 
@@ -80,9 +98,4 @@ class BoGenerator < Rails::Generators::NamedBase
     model_columns - excluded_columns
   end
 
-  def add_link_to_side_bar
-    inject_into_file "app/views/#{options[:namespace]}/layouts/_side_bar.html.erb", before: "  <%= sidebar.with_current_user_card(user: current_#{options[:namespace].singularize}) %>\n" do 
-      "  <%= sidebar.with_item(path: #{options[:namespace]}_#{plural_name}_path, icon: Icons::UsersComponent, label: I18n.t('bo.#{file_name}.others').capitalize) %>\n"
-    end
-  end
 end

data/lib/generators/bo/templates/_form.html.erb

@@ -17,24 +17,24 @@
     <%%= f.simple_fields_for :<%= association.name.to_s %> do |<%= association.name.to_s %>_form| %>
       <%- association.klass.column_names.each do |column| -%>
       <%- next if excluded_columns.include?(column.to_sym) || bo_model.reflect_on_all_associations.map(&:foreign_key).include?(column) -%>
-      <%- simple_form_alias = %w[country country_code].include?(column) ? ',as: :string' : nil -%>
+      <%- simple_form_alias = simple_form_conflict_keywords.include?(column) ? ',as: :string' : nil -%>
       <%%= <%= association.name.to_s %>_form.input :<%= column %> <%= simple_form_alias %> %>
       <%- end -%>
-    <%% end %>
+    <%% end %> 
   <%% end %>
+
   <%- end -%>
   <%- end -%>
-
   <!-- has_many Associations -->
   <%- has_many_assoc.each do |association| -%>
-  <div class="my-5 select">
-    <label class="block text-sm font-medium text-gray-700 string optional text-sm font-medium text-gray-600" for="<%= "#{class_name.underscore}_#{association.name.to_s.singularize}_ids" %>"><%= association.name.to_s.singularize%></label>
+  <%%= render(Forms::HasManyFormComponent.new(title: I18n.t('bo.<%= association.name.to_s.singularize%>.others') )) do %>
     <%%= f.select :<%= "#{association.name.to_s.singularize}_ids" %>,
-                  <%= association.klass.name %>.all.map { |item| [item.<%=bo_model_title(association.klass.name.constantize)%>, item.id] },
-                  { include_blank: true },
-                  multiple: true,
-                  data: { controller: 'ts--select' } %>
-  </div>
+                <%= association.klass.name %>.all.map { |item| [item.<%=bo_model_title(association.klass.name.constantize)%>, item.id] },
+                { include_blank: true },
+                multiple: true,
+                data: { controller: 'ts--select' } %>
+  <%% end %>
+
   <%- end -%>
   <%%= render(Forms::SubmitButtonComponent.new) %>
 <%% end %>

data/lib/generators/bo/templates/_search_bar.html.erb

@@ -1,4 +1,4 @@
-<div class="relative inline-block text-left" data-controller="dropdown">
+<div class="relative mt-3 inline-block text-left" data-controller="dropdown">
   <div>
     <button data-action="click->dropdown#toggle click@window->dropdown#hide" type="button" class="inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none " id="menu-button" aria-expanded="true" aria-haspopup="true">
       <%%= I18n.t('bo.filters') %>

data/lib/generators/bo/templates/controller.rb

@@ -9,26 +9,34 @@ module <%= options[:namespace].camelize %>
       @pagy, @<%= class_name.pluralize.underscore %> = pagy(@q.result(distinct: true))
     end
 
-    def show; end
+    def show
+    <%- has_one_assoc.each do |association| -%>
+    <%- next if association.options[:class_name] == "ActionText::RichText" -%>
+      @<%= class_name.underscore %>.build_<%= association.name %> if @<%= class_name.underscore %>.<%= association.name %>.nil?
+    <%- end -%>
+    end
 
     def new
       @<%= class_name.underscore %> = <%= class_name %>.new
+      <%- has_one_assoc.each do |association| -%>
+      <%- next if association.options[:class_name] == "ActionText::RichText" -%>
+      @<%= class_name.underscore %>.build_<%= association.name %>
+      <%- end -%>
     end
 
+    def edit; end
+
     def create
       @<%= class_name.underscore %> = <%= class_name %>.new(<%= class_name.underscore %>_params)
 
       if @<%= class_name.underscore %>.save
         flash[:success] = t('bo.record.created')
         redirect_to <%="#{options[:namespace]}_#{class_name.underscore.pluralize}_path"%>
-        
       else
         render :new, status: :unprocessable_entity
       end
     end
 
-    def edit; end
-
     def update
       if @<%= class_name.underscore %>.update(<%= class_name.underscore %>_params)
         flash[:success] = t('bo.record.updated')
@@ -44,7 +52,7 @@ module <%= options[:namespace].camelize %>
 
       redirect_to <%="#{options[:namespace]}_#{class_name.underscore.pluralize}_path"%>, status: :see_other
     end
-        
+
     private
 
     def set_<%= class_name.underscore %>
@@ -57,7 +65,7 @@ module <%= options[:namespace].camelize %>
         <%- if value.nil? -%>
         :<%= key %><%=permited_params.count == (index +1) ? '' : ',' %>
         <%- else -%>
-        <%= "#{key}: []" %><%=permited_params.count == (index +1) ? '' : ',' %>
+        <%= "#{key}: %i[#{value.join(" ")}]" %><%=permited_params.count == (index +1) ? '' : ',' %>
         <%- end -%>
         <%- end -%>
       )

data/lib/tybo/version.rb

@@ -1,3 +1,3 @@
 module Tybo
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tybo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Michel Delpierre
@@ -141,6 +141,8 @@ files:
 - app/components/forms/delete_button_component.rb
 - app/components/forms/divider_component.html.erb
 - app/components/forms/divider_component.rb
+- app/components/forms/has_many_form_component.html.erb
+- app/components/forms/has_many_form_component.rb
 - app/components/forms/has_one_form_component.html.erb
 - app/components/forms/has_one_form_component.rb
 - app/components/forms/submit_button_component.html.erb