workarea-product_additional_details 0.0.3 → 2.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e32fb4aa2ee62c3a078705fefaea2ef450045c1e0c1f5bc8a94a6b863b127d1
-  data.tar.gz: 0bfb0b25296d8e2a43344b8d25ff4ba8134b8d928848b1782aecd5cfbc7357ec
+  metadata.gz: 26c723178569ce439b259295548cbe20bf4c0c13dea20b058b2132f825d5de92
+  data.tar.gz: 8ae789c298f92276ae408920e6e5f9ecfedb4778fed861e5a4ff492bc74ab76a
 SHA512:
-  metadata.gz: cce05ae4d79ee4fb86dc6e5ce0c9a5926378f03b0c64b3e92fc4e64cfec4b4f10f8828ecd0276534a7e301bbf35e44d884cec5810743616bd9c3dcd58729e8c7
-  data.tar.gz: f5bc178e62b40e097e4897b50fc52415d628f883361fcba5106ccf1384bae3ecc3da8f8c79a6b46b7bff16afd8c489c93afa7dbe475f599ca72a1e5c11d6fbcc
+  metadata.gz: ef24d87da54b3a63764c4c6703479338c154c08fba6051a382a16389814d89f20eb677dcf81d5b654a1c515c7ecbc7c2c7f37e8e32a54784044e6020437bd561
+  data.tar.gz: 1e6bbc22dd47e583b5afaf5eabf7a18fe1cac40386e811302c1ba4604a8e8d8cf127cffa5ef117e4c1b6f3c0bbab9ca38f6980633ad8dfd11b3a8f90b193032e

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: @product.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 = "0.0.3".freeze
+    VERSION = "2.0.31".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: 0.0.3
+  version: 2.0.31
 platform: ruby
 authors:
 - Gunasekaran Raja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-11-25 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