workarea-product_additional_details 2.0.0 → 2.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d5a2326adecdbdfba7335c342d0a7340a144f1b1732b9b48d78500d9ee5e1f
-  data.tar.gz: 6355ff4b40b97decc47dfabd61ceb4f7ad007c4adf03615309352587ebed7a98
+  metadata.gz: 8cf388085dcce8abed17ce4c1dae2ddbb81c277bd24755323b70612c83159892
+  data.tar.gz: 56c3b49d63f0195293422da2c607f715c90c921ae8e9a6bdbea5322885342c04
 SHA512:
-  metadata.gz: 9d2e77d8bb5af3eccb55a86c8ecf971ffc9179accba55f7cc14b7304252f98962f25ad0006e73360befe9b350e7325d88a5d3c703fdc262e0e52991692b2107d
-  data.tar.gz: 22b6630b5687d72aee3faa1baad175767e1d0af69eca95ae55d129ba8c1aa0bb2de88fd95029169f5248bb499adb288ab43d204087493f10347790b4d148b349
+  metadata.gz: 157555f62295ca411375f2540073b19b20cc3c31eb6caa286f7c2ff611ab49366e4fba3f5b26158d15eec5b5f0eee833825a68c832f015c9cc294eadf55c8a36
+  data.tar.gz: fc268a0a385cc2892b3bc25bfe26cddcdb259a08f232b0730345877b2ae59cb6ed8f7a9b4055f24ddef7d12a25395a006c1307b1e2a8050c5b033dc3605a3f40

data/app/controllers/workarea/admin/catalog_products_controller.decorator

@@ -1,5 +1,5 @@
 module Workarea
-  decorate Admin::CatalogProductsController, with: :design_toscano do
+  decorate Admin::CatalogProductsController, with: :product_additional_details do
     decorated do
       # Place code to decorate here that would normally go on the class
       # level, e.g.:

data/app/controllers/workarea/admin/catalog_variants_controller.decorator

@@ -0,0 +1,27 @@
+module Workarea
+  decorate Admin::CatalogVariantsController, with: :product_additional_details do
+
+    def update
+      @variant = @product.variants.find(params[:id])
+      set_details
+      set_additional_details
+
+      if @variant.update_attributes(params[:variant])
+        flash[:success] = t('workarea.admin.catalog_variants.flash_messages.saved')
+        redirect_to catalog_product_variants_path(@product)
+      else
+        flash[:error] = t('workarea.admin.catalog_variants.flash_messages.changes_error')
+        render :edit
+      end
+    end
+
+    def set_additional_details
+      @variant.additional_details = HashUpdate.new(
+        original: @variant.additional_details,
+        adds: params[:new_additional_details],
+        updates: params[:additional_details],
+        removes: params[:additional_details_to_remove]
+      ).result_grouped
+    end
+  end
+end

data/app/controllers/workarea/admin/create_catalog_products_controller.decorator

@@ -1,5 +1,5 @@
 module Workarea
-  decorate Admin::CreateCatalogProductsController, with: :design_toscano do
+  decorate Admin::CreateCatalogProductsController, with: :product_additional_details do
     def save_details
       @product.additional_details = HashUpdate
         .new(original: @product.additional_details, updates: params[:additional_details])

data/app/models/workarea/catalog/product.decorator

@@ -1,5 +1,5 @@
 module Workarea
-  decorate Catalog::Product, with: :design_toscano do
+  decorate Catalog::Product, with: :product_additional_details do
     decorated do
       field :additional_details, type: Hash, default: {}, localize: true
     end

data/app/models/workarea/catalog/variant.decorator

@@ -0,0 +1,7 @@
+module Workarea
+  decorate Catalog::Variant, with: :product_additional_details do
+    decorated do
+      field :additional_details, type: Hash, default: {}, localize: true
+    end
+  end
+end

data/app/models/workarea/search/storefront/product/text.rb

@@ -0,0 +1,93 @@
+module Workarea
+  module Search
+    class Storefront
+      class Product
+        module Text
+          def catalog_content
+            [model.browser_title, model.meta_description, model.description]
+              .reject(&:blank?)
+              .join(' ')
+          end
+
+          # A list of category names to which this product belongs,
+          # allows finding products by category names in search.
+          #
+          # @return [String]
+          #
+          def category_names
+            categorization.to_models.map(&:name).join(', ')
+          end
+
+          # A textual version of the product's filters hash that
+          # will be stored and analyzed in the search index.
+          #
+          # @return [String]
+          #
+          def facets_content
+            HashText.new(model.filters).text
+          end
+
+          # A textual version of the product's filters hash that
+          # will be stored and analyzed in the search index.
+          #
+          # @return [String]
+          #
+          def details_content
+            "#{HashText.new(model.details).text} #{variant_details_text} #{additional_details_content}"
+          end
+
+          # Text from the product's details hash and it's variants' details
+          # hash. Allows finding a product by one of these values.
+          #
+          # @return [String]
+          #
+          def details
+            "#{HashText.new(model.details).text} #{variant_details_text} #{additional_details_content}"
+          end
+
+          # Text from additional details hash
+          def additional_details_content
+            if model.additional_details.present? && model.additional_details.any?
+              parse_addtional_details(model.additional_details)
+            end
+          end
+
+          # Content to put in the index for making search query suggestions.
+          # Includes all content for the product.
+          #
+          # @return [String]
+          #
+          def suggestion_content
+            [
+              model.name,
+              category_names,
+              facets_content,
+              details_content
+            ].join(' ')
+          end
+
+          def variant_details_text
+            @variant_details_text ||= model.variants.active.map do |variant|
+              "#{variant.name} #{HashText.new(variant.details).text}"
+            end.join(' ')
+          end
+
+          private
+          # extract text content from html content
+          def parse_addtional_details(details)
+            parsed_data = []
+            details.each do |key, value| 
+              data = Nokogiri::HTML.parse(value) if value.is_a?(String)
+              if data.present?
+                data.traverse do |node| 
+                  parsed_data.push(node.text)
+                end
+              end
+            end
+            parsed_data.flatten.compact.uniq.join(" ")
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/workarea/hash_update.decorator

@@ -1,5 +1,5 @@
 module Workarea
-  decorate HashUpdate, with: :design_toscano do
+  decorate HashUpdate, with: :product_additional_details do
     decorated do
       # Place code to decorate here that would normally go on the class
       # level, e.g.:

data/app/views/workarea/admin/catalog_variants/_additional_details.html.haml

@@ -0,0 +1,31 @@
+.section.section--additional-details
+  %h2= "Additional Details"
+
+  %table
+    %thead
+      %tr
+        %th= t('workarea.admin.catalog_products.edit.details.name')
+        %th= "Content"
+        %th.align-center= t('workarea.admin.actions.delete')
+    %tbody.bottom-align
+      - variant.additional_details.each do |name, value|
+        %tr
+          %td
+            .property
+              = label_tag "details_#{name}" do
+                #{name}
+          %td
+            .property
+              = hidden_field_tag 'additional_details[]', name, id: nil
+              = text_area_tag 'additional_details[]', value, class: 'text-box text-box--i18n', id: nil
+          %td.align-center= check_box_tag 'additional_details_to_remove[]', name, false, id: nil, title: "#{t('workarea.admin.actions.delete')}: #{name} #{value}"
+      %tr{ data: { cloneable_row: '' } }
+        %td
+          .property
+            = text_field_tag 'new_additional_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_products.edit.details.new_attribute_name'), placeholder: t('workarea.admin.catalog_products.edit.details.new_attribute_name_placeholder')
+            %span.property__note= "Example: User Manual"
+        %td
+          .property
+            = text_area_tag 'new_additional_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_products.edit.details.new_attribute_value'), placeholder: t('workarea.admin.catalog_products.edit.details.new_attribute_value_placeholder')
+            %span.property__note= "Example: <a href='/manuals'>Download Manuals</a>"
+        %td.align-center -

data/app/views/workarea/admin/create_catalog_products/details.html.haml

@@ -75,7 +75,7 @@
                         = text_field_tag 'additional_details[]', name, class: 'text-box text-box--i18n', title: 'Name', placeholder: 'Name', id: nil
                     %td
                       .property
-                        = text_area_tag 'additional_details[]', hash_editing_value(value), class: 'text-box text-box--i18n', title: 'Value', placeholder: 'Value', id: nil
+                        = text_area_tag 'additional_details[]', value, class: 'text-box text-box--i18n', title: 'Value', placeholder: 'Value', id: nil
                 %tr{ data: { cloneable_row: '' } }
                   %td
                     .property

data/config/initializers/appends.rb

@@ -2,3 +2,7 @@ Workarea.append_partials(
   'admin.additional_product_details_information',
   'workarea/admin/catalog_products/additional_details'
 )
+Workarea.append_partials(
+  'admin.additional_variant_information_fields',
+  'workarea/admin/catalog_variants/additional_details'
+)

data/lib/workarea/product_additional_details/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module ProductAdditionalDetails
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.32".freeze
   end
 end

data/test/models/workarea/catalog/product_test.decorator

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Workarea
-  decorate Catalog::ProductTest, with: :design_toscano do
+  decorate Catalog::ProductTest, with: :product_additional_details do
     # Define additional tests based on new functionality or
     # override tests originally defined in the decorated class for
     # changes that alter default behavior.

data/test/models/workarea/user_test.decorator

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Workarea
-  decorate UserTest, with: :design_toscano do
+  decorate UserTest, with: :product_additional_details do
     # Define additional tests based on new functionality or
     # override tests originally defined in the decorated class for
     # changes that alter default behavior.

data/test/workarea/hash_update_test.decorator

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Workarea
-  decorate HashUpdateTest, with: :design_toscano do
+  decorate HashUpdateTest, with: :product_additional_details do
     # Define additional tests based on new functionality or
     # override tests originally defined in the decorated class for
     # changes that alter default behavior.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-product_additional_details
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.32
 platform: ruby
 authors:
 - Gunasekaran Raja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -46,14 +46,18 @@ files:
 - app/assets/stylesheets/workarea/storefront/product_additional_details/.keep
 - app/controllers/.keep
 - app/controllers/workarea/admin/catalog_products_controller.decorator
+- app/controllers/workarea/admin/catalog_variants_controller.decorator
 - app/controllers/workarea/admin/create_catalog_products_controller.decorator
 - app/helpers/.keep
 - app/mailers/.keep
 - app/models/.keep
 - app/models/workarea/catalog/product.decorator
+- app/models/workarea/catalog/variant.decorator
+- app/models/workarea/search/storefront/product/text.rb
 - app/services/workarea/hash_update.decorator
 - app/views/.keep
 - app/views/workarea/admin/catalog_products/_additional_details.html.haml
+- app/views/workarea/admin/catalog_variants/_additional_details.html.haml
 - app/views/workarea/admin/create_catalog_products/details.html.haml
 - bin/rails
 - config/initializers/appends.rb