tybo 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9adcf1453a167d928120910dee95eb19b31e018593b09cff193c5fea7f1148e1
-  data.tar.gz: 45d9027230f376f2634e42b0c9584d0e772792f36444f30b9d594200d8cbd6b1
+  metadata.gz: daa02ecc2547566ac774ab1e182054ff7a9cfbaa7c45561338e2b706536eafe8
+  data.tar.gz: 8f506d40fe83c7856efceb1f1b5eb55ebdee15a5769ae4e59332850f2d18bfc7
 SHA512:
-  metadata.gz: c1fd62b3a41a0638c9da59f555198aac3d0349031095210167ecd4267255b999ad0715b57c821e96e0e7b943e85af6071dd8862c01fec8129c9a8c84cc4bd20a
-  data.tar.gz: 9be1f03398c851dcf2c31b29e0ddebaa4d26911118c61b5d4cf214ac413cc3b7276d82332b26a5b60778ac3120e405733879934fae05844f7b571a13f71e88e7
+  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/app/components/forms/has_one_form_component.html.erb

@@ -0,0 +1,10 @@
+<div class="space-y-6 sm:space-y-5">
+  <div>
+    <h3 class="text-lg font-medium leading-6 text-gray-900"><%= @title %></h3>
+  </div>
+  <div class="space-y-6 sm:space-y-5">
+    <div class="sm:items-start sm:gap-4 sm:border-t sm:border-gray-200 sm:pt-5">
+      <%= content %>
+    </div>
+  </div>
+</div>

data/app/components/forms/has_one_form_component.rb

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

data/app/components/icons/collection_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+<svg class="mr-3 flex-shrink-0 text-white h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
   <path stroke-linecap="round" stroke-linejoin="round" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
 </svg>

data/app/components/icons/home_component.html.erb

@@ -1,3 +1,4 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
   <path stroke-linecap="round" stroke-linejoin="round" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
 </svg>
+

data/app/components/icons/mic_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
   <path stroke-linecap="round" stroke-linejoin="round" d="M11 5.882V19.24a1.76 1.76 0 01-3.417.592l-2.147-6.15M18 13a3 3 0 100-6M5.436 13.683A4.001 4.001 0 017 6h1.832c4.1 0 7.625-1.234 9.168-3v14c-1.543-1.766-5.067-3-9.168-3H7a3.988 3.988 0 01-1.564-.317z" />
 </svg>

data/app/components/icons/news_paper_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
   <path stroke-linecap="round" stroke-linejoin="round" d="M12 7.5h1.5m-1.5 3h1.5m-7.5 3h7.5m-7.5 3h7.5m3-9h3.375c.621 0 1.125.504 1.125 1.125V18a2.25 2.25 0 01-2.25 2.25M16.5 7.5V18a2.25 2.25 0 002.25 2.25M16.5 7.5V4.875c0-.621-.504-1.125-1.125-1.125H4.125C3.504 3.75 3 4.254 3 4.875V18a2.25 2.25 0 002.25 2.25h13.5M6 7.5h3v3H6v-3z" />
 </svg>

data/app/components/icons/office_building_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
   <path stroke-linecap="round" stroke-linejoin="round" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" />
 </svg>

data/app/components/icons/question_mark_circle_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
   <path stroke-linecap="round" stroke-linejoin="round" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
 </svg>

data/app/components/icons/trash_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6" xmlns="http://www.w3.org/2000/svg" className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white" xmlns="http://www.w3.org/2000/svg" className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
   <path strokeLinecap="round" strokeLinejoin="round" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
 </svg>

data/app/components/icons/users_component.html.erb

@@ -1,3 +1,3 @@
-<svg class="mr-3 flex-shrink-0 h-6 w-6 text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
+<svg class="mr-3 flex-shrink-0 h-6 w-6 text-white text-sidebar-50" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true">
   <path stroke-linecap="round" stroke-linejoin="round" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"/>
 </svg>

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

@@ -13,20 +13,28 @@
   <%- if association.options[:class_name] == "ActionText::RichText" -%>
   <%%= f.rich_text_area :<%= association.name.to_s.singularize.to_s.remove('rich_text_' )%> %>
   <%- else -%>
-  <%%= f.input :<%= association.foreign_key %>, collection: <%= association.klass.name %>.all.map { |item| [item.<%=bo_model_title(association.klass.name.constantize)%>, item.id] } %>
+  <%%= render(Forms::HasOneFormComponent.new(title: I18n.t('bo.<%= association.name %>.one') )) do %>
+    <%%= 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 = simple_form_conflict_keywords.include?(column) ? ',as: :string' : nil -%>
+      <%%= <%= association.name.to_s %>_form.input :<%= column %> <%= simple_form_alias %> %>
+      <%- 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.7'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tybo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Michel Delpierre
 - Julien Camblan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,10 @@ 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
 - app/components/forms/submit_button_component.rb
 - app/components/forms/subtitle_component.html.erb
@@ -258,7 +262,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubygems.org/gems/tybo
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -273,8 +277,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A tailwind custom admin engine for Ruby on Rails
 test_files: []