workarea-product_additional_details 2.0.2 → 2.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e235f8b30c8067b9fd6366c84544be6548d3b000b4eaf58bee51bcb6da0b54f
-  data.tar.gz: b87b4d155c5b13e678fbeb7f2b6a9b4cf6e09aa2e067bb2335d48ac5834a75ff
+  metadata.gz: 8e1a01ada470f9f04e0f68d83cd2ef351aab45213d4dd93bc13ec1e02257e6df
+  data.tar.gz: 3925c6fbd29514cae631751efd379b2dd66609085824ba70dbe39a771986f9b1
 SHA512:
-  metadata.gz: 5ce7b2aba4e97048e000dedf1d4b73f5860a550813dca02e8a54cb84bb441d81e7158de8a1a40382629a928ade5bde90706a1032e5acd065dd13ff9fe8e2d112
-  data.tar.gz: f58b83155832027b07b3c1f94f494507e4ab28718ca101e46cdcf2c279e279ca62ba7708ededc87344a4afb9ff03816f1ede02c1a19d6eb6b2531d9cda608f24
+  metadata.gz: e454aa115822134543bd69d9d7812cd8ffc1177919d6cfb2aa91493c34f237d3bf560625f79a3b931d11a913dbc57ad77bf984d89d1335746d287e07f568bc85
+  data.tar.gz: ecbaa85a35f636881cd63c1308807daa29036150416628ad3bb6844b79d2e3cb7c94f2ee23ec1a6ad874d4464af45fc6174334fe052018b4df58129e0279f8f1

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

@@ -17,7 +17,7 @@ module Workarea
 
     def set_additional_details
       @variant.additional_details = HashUpdate.new(
-        original: @product.additional_details,
+        original: @variant.additional_details,
         adds: params[:new_additional_details],
         updates: params[:additional_details],
         removes: params[:additional_details_to_remove]

data/app/helpers/workarea/admin/details_parse_helper.rb

@@ -0,0 +1,9 @@
+module Workarea
+  module Admin
+    module DetailsParseHelper
+      def parse_details_text(text)
+        JSON.parse(text).join(' ') rescue text
+      end
+    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/views/workarea/admin/catalog_products/_additional_details.html.haml

@@ -17,7 +17,7 @@
           %td
             .property
               = hidden_field_tag 'additional_details[]', name, id: nil
-              = text_area_tag 'additional_details[]', value, class: 'text-box text-box--i18n', id: nil
+              = text_area_tag 'additional_details[]', parse_details_text(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

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/workarea.rb

@@ -1,3 +1,6 @@
 Workarea.configure do |config|
   # Add custom configuration here
+  config.to_prepare do
+    Workarea::Admin::ApplicationController.helper(Workarea::Admin::DetailsParseHelper)
+  end
 end

data/lib/workarea/product_additional_details/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module ProductAdditionalDetails
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.34"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-product_additional_details
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.34
 platform: ruby
 authors:
 - Gunasekaran Raja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -49,10 +49,12 @@ files:
 - app/controllers/workarea/admin/catalog_variants_controller.decorator
 - app/controllers/workarea/admin/create_catalog_products_controller.decorator
 - app/helpers/.keep
+- app/helpers/workarea/admin/details_parse_helper.rb
 - 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