promethee 1.11.29 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87015a529d4f152f57fd5da02b5bf817e8cfb8420efabaf1714489b3d822f01d
-  data.tar.gz: 3c947c382a7ebd8b3a66668708a4503197f1178a58414af19e608708db594b1e
+  metadata.gz: b24d3197b6a9f29120ec8849dffae52cb78cf47b309200bd6b1d228dbd930170
+  data.tar.gz: 4c47e50f8ea5ec4c239d9adeba78c17e41fa02801631e1896032f64016e57104
 SHA512:
-  metadata.gz: 48fafc37b97d5dd355f11dbac04cdc00a2e526786390b7969980b915060196efbda9a75ffcf2a4d2efc56275f0d834323a5defadfc4dc0285c29ead194c0a633
-  data.tar.gz: 8c5728fdab8c70aa73a5ebcc46aabb2ae81e3df8b1f7bf8bab350e38e5da8ab66a5ad439456e17cf494942ba4f4fd290758b098ec38a3b979124d60337885563
+  metadata.gz: 60837d5bb49e78e27cd9816bc78794ec2ebc74a8a25d2ed3074926ba884e80fa140e463daad482eabeb9fc9cab278e80dd569bbc21cdef16b116ccddd09086de
+  data.tar.gz: a36840b631435a45a53e26c40148a2e4baf2cab78d28d3938fef818391072988540dfac3cddb2523f1d7f79a0b8f1a98e02288025ce96ca791531d1e898e01cf

data/UPGRADING

@@ -0,0 +1,10 @@
+##########################################
+#  NOTE FOR UPGRADING TO 2.0.0 OR LATER  #
+##########################################
+
+Prométhée 2.0 brings:
+- [BREAKING CHANGE]   New structure for table component. A rake task is available to update them in your master models. Localization has to be manual.
+- [TOOL TO FIX ISSUE] A rake task to clean your localization models.
+
+For more details, check the documentation:
+https://github.com/lespoupeesrusses/promethee/tree/dev-2.0/doc

data/app/assets/stylesheets/promethee.sass

@@ -1,127 +1,135 @@
 @import "@fancyapps/fancybox/dist/jquery.fancybox.min"
 
+//  aside
+//  blockquote
+//  collection
+//  cover
+//  faq
+//  image
+//  slider
+
 .promethee
-  &__component
-    &__cover
-      min-height: 300px
-      padding: 150px 30px
-      text-align: center
-      display: flex
-      justify-content: center
-      flex-direction: column
-      background-repeat: no-repeat
-      background-position: center center
-      background-size: cover
-      margin-bottom: 50px
-
-    &__page > &__aside,
-    &__page > &__blockquote,
-    &__page > &__faq,
-    &__page > &__table,
-    &__page > &__text,
-    &__page > &__video
-      @extend .container
-      margin-bottom: 50px
-      padding-left: $grid-gutter-width/2
-      padding-right: $grid-gutter-width/2
-
-    &__page > &__collection,
-    &__page > &__row
-      @extend .container
-      padding-right: 0
-      padding-left: 0
-      margin-bottom: 50px
-
-    &__slider
-      .promethee__component
-        margin-bottom: 0
-      .fontawesome-carousel-control .fa
-        top: 50%
-        position: absolute
-        transform: translateY(-50%)
-        font-size: 30px
-
-    &__collection
-      margin-top: 20px
-      margin-bottom: 20px
-      .clearfix
-        margin: 40px 0
-
-    &__faq
-      h4
-        cursor: pointer
-        position: relative
-        &::after
-          content: ""
-          display: block
-          width: 8px
-          height: 8px
-          border-right: 2px solid #000
-          border-top: 2px solid #000
-          transform: rotate(135deg)
-          position: absolute
-          right: 10px
-          top: 5px
-          transition: transform .4s ease
-        &[aria-expanded="true"]
-          &::after
-            transform: rotate(315deg)
-      img
-        margin-bottom: 30px
-
-    &__aside
-      .aside__button
-        padding-top: 30px
-        a
-          display: inline-block
-        &--center
-          text-align: center
-        &--left
-          text-align: left
-        &--right
-          text-align: right
-
-    &__blockquote
-      .blockquote
-        font-size: 30px
-        border: none
-
-        p
-          display: inline
-
-        &::before, &::after
-          display: inline-block
-
-        &::before
-          content: '« '
-
-        &::after
-          content: ' »'
-
-      .author
-        font-size: 14px
-        font-style: italic
-
-    &__collection
-      .collection-item__content
-        margin-bottom: $grid-gutter-width
-
-    &__slider
-      .carousel-item__content
-        text-align: center
+    &__component
+        &__page > div:not(&__cover):not(&__slider),
+        &__page > aside
+            @extend .container
+            margin-bottom: 50px
+            padding-left: $grid-gutter-width/2
+            padding-right: $grid-gutter-width/2
+
+        &__page > &__collection,
+        &__page > &__row
+            padding-left: 0
+            padding-right: 0
+
+        &__aside
+            .aside__button
+                padding-top: $grid-gutter-width
+                a
+                    display: inline-block
+                &--center
+                    text-align: center
+                &--left
+                    text-align: left
+                &--right
+                    text-align: right
+
+        &__blockquote
+            .blockquote
+                border: none
+                font-size: 30px
+
+                p
+                    display: inline
+
+                &::before, &::after
+                    display: inline-block
+
+                &::before
+                    content: '« '
+
+                &::after
+                    content: ' »'
+
+            .author
+                font-size: 14px
+                font-style: italic
+
+        &__collection
+            margin-bottom: 20px
+            margin-top: 20px
+            .clearfix
+                margin: 40px 0
+            .collection-item__content
+                margin-bottom: $grid-gutter-width
+                a + p
+                    margin-top: 10px
+
+        &__cover
+            background-position: center center
+            background-repeat: no-repeat
+            background-size: cover
+            display: flex
+            flex-direction: column
+            justify-content: center
+            margin-bottom: 50px
+            min-height: 300px
+            padding: 150px 30px
+            text-align: center
+
+            p:last-of-type
+                margin-bottom: 0
+
+        &__image
+            margin-bottom: $grid-gutter-width
+            figcaption
+                margin-top: 10px
+
+        &__faq
+            &_item:not(:last-of-type)
+                padding-bottom: 10px
+            h4
+                cursor: pointer
+                position: relative
+                &::after
+                    border-right: 2px solid #000
+                    border-top: 2px solid #000
+                    content: ''
+                    display: block
+                    height: 8px
+                    position: absolute
+                    right: 10px
+                    top: 5px
+                    transform: rotate(135deg)
+                    transition: transform .4s ease
+                    width: 8px
+                &[aria-expanded="true"]
+                    &::after
+                        transform: rotate(315deg)
+            img
+                margin-bottom: $grid-gutter-width
+
+        &__slider
+            .promethee__component
+                margin-bottom: 0
+            .fontawesome-carousel-control .fa
+                font-size: 30px
+                position: absolute
+                top: 50%
+                transform: translateY(-50%)
+            .carousel-item
+                &__content
+                    text-align: center
+                    p:last-of-type
+                        margin-bottom: 0
+                        margin-top: 10px
 
 @media print
-  body
-    font-size: 125%
-  .promethee
-    &__component
-      &__page > &__aside,
-      &__page > &__text,
-      &__page > &__faq,
-      &__page > &__table,
-      &__page > &__video,
-      &__page > &__collection,
-      &__page > &__row
-        max-width: 90% !important
-  .container
-    max-width: 90% !important
+    body
+        font-size: 125%
+    .promethee
+        &__component
+            &__page > div:not(&__cover):not(&__slider)
+                max-width: 90%
+    .container
+        max-width: 90%

data/app/models/concerns/promethee_data.rb

@@ -72,6 +72,8 @@ module PrometheeData
       if key.starts_with? 'searchable_'
         clean_value = strip_tags value
         searchable += "#{clean_value} "
+      elsif value.class == Hash
+        searchable += promethee_extract_searchable_attributes(value)
       end
     end
     searchable

data/app/services/promethee/localize_clean_service.rb

@@ -0,0 +1,77 @@
+module Promethee
+  class LocalizeCleanService
+    DEFAULT_WHITELIST = {
+      "aside"            => ["searchable_visible_content", "searchable_collapsed_content", "searchable_open_label"],
+      "blockquote"       => ["searchable_body", "searchable_author"],
+      "collection"       => [],
+      "collection_item"  => ["searchable_caption", "video"],
+      "column"           => [],
+      "cover"            => ["searchable_surtitle", "searchable_title", "searchable_subtitle"],
+      "faq"              => [],
+      "faq_item"         => ["searchable_title", "searchable_body"],
+      "image"            => ["searchable_alt", "searchable_caption"],
+      "page"             => ["searchable_title", "searchable_description"],
+      "row"              => [],
+      "slider"           => [],
+      "slider_item"      => ["searchable_caption", "video"],
+      "table"            => ["cols", "cols_data", "rows", "rows_data"],
+      "text"             => ["searchable_body"],
+      "video"            => ["url"]
+    }
+
+    attr_accessor :objects
+
+    def initialize(model_name, whitelist = {})
+      begin
+        model_class = model_name.constantize
+        objects = model_class.all
+      rescue
+        puts 'Please provide a valid model name (e.g. `rake promethee:clean_localizations[Page]`)'
+        exit
+      end
+      @objects = objects
+      @whitelist = DEFAULT_WHITELIST.merge(whitelist)
+    end
+
+    def add_rule(type, attributes = [])
+      @whitelist[type] = attributes
+    end
+
+    def start
+      puts '= START LOCALIZE CLEAN ='
+      puts "Number of objects: #{objects.count}"
+      i = 0
+      objects.each do |object|
+        next unless can_process?(object.data)
+
+        i += 1
+        puts "Processing object ##{object.id}"
+
+        object.data = clean(object.data)
+        object.save
+        puts "End processing object ##{object.id}"
+      end
+      puts "Number of processed objects: #{i}"
+      puts '====== END CLEANER ========'
+    end
+
+    private
+
+    def clean(data)
+      i = 0
+      data["components"].each do |component|
+        component_whitelist = @whitelist[component["type"]]
+        next if component_whitelist.nil? # Process only types in whitelist
+
+        i += 1
+        component["attributes"]&.slice!(*component_whitelist)
+      end
+      puts "- #{i} components were processed"
+      data
+    end
+
+    def can_process?(data)
+      data.is_a?(Hash) && data.has_key?("components")
+    end
+  end
+end

data/app/services/promethee/table_upgrade_service.rb

@@ -0,0 +1,69 @@
+module Promethee
+  class TableUpgradeService
+    attr_accessor :objects
+
+    def initialize(model_name)
+      begin
+        model_class = model_name.constantize
+        objects = model_class.all.select { |page| page.data&.to_json&.include? '"type":"table"' }
+      rescue
+        puts 'Please provide a valid model name (e.g. `rake promethee:clean_localizations[Page]`)'
+        exit
+      end
+      @objects = objects
+    end
+
+    def start
+      puts '= START TABLE UPGRADE ='
+      puts "Number of objects: #{objects.count}"
+      objects.each do |object|
+        puts "Processing object ##{object.id}"
+
+        object.data = process_component(object.data)
+        object.save
+        puts "End processing object ##{object.id}"
+      end
+      puts '====== END CLEANER ========'
+    end
+
+    private
+
+    def process_component(component)
+      component = upgrade(component) if component["type"] == "table"
+      component["children"].map do |child|
+        process_component(child)
+      end if component["children"]&.any?
+      component
+    end
+
+    def upgrade(component)
+      return component unless component.has_key? "attributes"
+
+      head = component["attributes"]["head"]
+      body = component["attributes"]["body"]
+      return component if head.nil? || body.nil?
+
+      cols = create_uids(head)
+      rows = create_uids(body)
+
+      cols_data = head.map.with_index { |col_data, i| [cols[i], col_data] }.to_h
+      rows_data = body.map.with_index { |row_data, i|
+        new_row_data = row_data.map.with_index { |cell_data, j| [cols[j], cell_data] }.to_h
+        [rows[i], new_row_data]
+      }.to_h
+
+      component["attributes"].except!("head", "body")
+
+      component["attributes"]["cols"] = cols
+      component["attributes"]["cols_data"] = cols_data
+      component["attributes"]["rows"] = rows
+      component["attributes"]["rows_data"] = rows_data
+
+      component
+    end
+
+    def create_uids(array)
+      (0...array.size).map { |_| SecureRandom.hex(5) }
+    end
+  end
+end

data/app/views/promethee/_edit.html.erb

@@ -8,9 +8,31 @@ back_url ||= nil
 logo = File.read "#{__dir__}/../../assets/images/icon-promethee.svg"
 %>
 
+<script type="text/javascript">
+  angular
+  .module('uid', [])
+  .factory('uidService', function () {
+    // Option 3 : https://stackoverflow.com/a/27747377
+    return {
+      generate: function () {
+        var arr = new Uint8Array(10 / 2),
+        hexArr = [],
+        i;
+
+        (window.crypto || window.msCrypto).getRandomValues(arr);
+        for (i = 0; i < arr.length; i += 1) {
+          hexArr[i] = ('0' + arr[i].toString(16)).substr(-2);
+        }
+
+        return hexArr.join('');
+      }
+    };
+  });
+</script>
+
 <script type="text/javascript">
 var promethee = angular
-  .module('Promethee', ['summernote', 'ngAnimate', 'ngFileUpload', 'ui.sortable', 'colorpicker.module'], ['$rootScopeProvider', function($rootScopeProvider) {
+  .module('Promethee', ['summernote', 'ngAnimate', 'ngFileUpload', 'ui.sortable', 'colorpicker.module', 'uid'], ['$rootScopeProvider', function($rootScopeProvider) {
     $rootScopeProvider.digestTtl(30);
   }])
   .value('definitions', [])
@@ -92,16 +114,6 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
   $scope.inspect = function(component, event) {
     if(event.target.closest('.promethee-edit__component') === event.currentTarget) {
       $scope.promethee.inspected = component;
-      $scope.refreshInspect(component.type);
-    }
-  }
-
-  $scope.refreshInspect = function (componentType) {
-    var inspectContainer = document.querySelector(".promethee-edit__inspect-content--"+componentType);
-    var summernoteToolbars = inspectContainer.querySelectorAll('.note-toolbar-wrapper');
-    var i;
-    for (i = 0 ; i < summernoteToolbars.length ; i += 1) {
-      summernoteToolbars[i].removeAttribute('style');
     }
   }
 

data/app/views/promethee/components/collection_item/_localize.html.erb

@@ -1,7 +1,8 @@
 <script type="text/ng-template" id="promethee/components/collection_item/localize">
-  <div ng-show="master.attributes.searchable_caption !== ''">
+  <div ng-show="master.attributes.searchable_caption !== '' || master.attributes.media_type == 'video'">
     <hr>
-    <div class="row">
+
+    <div class="row" ng-show="master.attributes.searchable_caption !== ''">
       <div class="col-md-6">
         <b>Collection Item Caption</b>
         <div class="promethee-edit__wrapper" ng-bind-html="master.attributes.searchable_caption | htmlSafe"></div>
@@ -11,5 +12,16 @@
         <summernote config="summernoteConfig" ng-model="component.attributes.searchable_caption"></summernote>
       </div>
     </div>
+
+    <div class="row" ng-show="master.attributes.media_type == 'video'">
+      <div class="col-md-6">
+        <b>Video URL</b>
+        <div ng-bind-html="master.attributes.video.url | htmlSafe"></div>
+      </div>
+      <div class="col-md-6">
+        <label class="label-control">Video URL</label>
+        <input class="form-control" ng-model="component.attributes.video.url" type="text">
+      </div>
+    </div>
   </div>
 </script>

data/app/views/promethee/components/cover/_localize.html.erb

@@ -4,7 +4,7 @@
 
     <div class="row">
       <div class="col-md-6">
-        <img ng-src="/promethee/blob/{{component.attributes.image.id}}" class="img-fluid img-responsive">
+        <img ng-src="/promethee/blob/{{master.attributes.image.id}}" class="img-fluid img-responsive">
       </div>
     </div>
 

data/app/views/promethee/components/slider_item/_localize.html.erb

@@ -1,7 +1,8 @@
 <script type="text/ng-template" id="promethee/components/slider_item/localize">
-  <div ng-show="master.attributes.text !== ''">
+  <div ng-show="master.attributes.searchable_caption !== '' || master.attributes.media_type == 'video'">
     <hr>
-    <div class="row">
+
+    <div class="row" ng-show="master.attributes.searchable_caption !== ''">
       <div class="col-md-6">
         <b>Slider Item Caption</b>
         <div class="promethee-edit__wrapper" ng-bind-html="master.attributes.searchable_caption | htmlSafe"></div>
@@ -11,5 +12,16 @@
         <summernote config="summernoteConfig" ng-model="component.attributes.searchable_caption"></summernote>
       </div>
     </div>
+
+    <div class="row" ng-show="master.attributes.media_type == 'video'">
+      <div class="col-md-6">
+        <b>Video URL</b>
+        <div ng-bind-html="master.attributes.video.url | htmlSafe"></div>
+      </div>
+      <div class="col-md-6">
+        <label class="label-control">Video URL</label>
+        <input class="form-control" ng-model="component.attributes.video.url" type="text">
+      </div>
+    </div>
   </div>
 </script>

data/app/views/promethee/components/table/_edit.define.html.erb

@@ -8,30 +8,10 @@
       data: {
         type: 'table',
         attributes: {
-          head: [
-            {
-              searchable_text: 'Column 1'
-            },
-            {
-              searchable_text: 'Column 2'
-            },
-            {
-              searchable_text: 'Column 3'
-            }
-          ],
-          body: [
-            [
-              {
-                searchable_text: 'Text 1'
-              },
-              {
-                searchable_text: 'Text 2'
-              },
-              {
-                searchable_text: 'Text 3'
-              }
-            ]
-          ]
+          cols: [],
+          cols_data: {},
+          rows: [],
+          rows_data: {}
         }
       }
     })

data/app/views/promethee/components/table/_edit.inspect.html.erb

@@ -1,42 +1,102 @@
 <script type="text/ng-template" id="promethee/components/table/edit/inspect">
-  <div class="form-group">
-    <label class="label-control">Head</label><br/>
-    <div  class="btn btn-default btn-light btn-sm"
-          ng-click="promethee.inspected.attributes.head.push({searchable_text: 'Column'})">
-      Add column
-    </div><br/><br/>
-    <div ng-repeat="th in promethee.inspected.attributes.head track by $index">
-      <div class="form-row">
-        <div class="col-10">
-          <input type="text" ng-model="th.searchable_text" class="form-control" />
+  <div ng-controller="TableInspectController" ng-init="component = promethee.inspected">
+    <div class="form-group">
+      <label class="label-control">Columns</label><br/>
+      <div  class="btn btn-default btn-light btn-sm"
+            ng-click="addColumn()">
+        Add column
+      </div><br/><br/>
+      <div ui-sortable ng-model="component.attributes.cols">
+        <div ng-repeat="colUid in component.attributes.cols">
+          <div class="form-group row align-items-center">
+            <div class="col-1" style="line-height: 38px">
+              <i class="fas fa-bars"></i>
+            </div>
+            <div class="col-9">
+              <input  type="text"
+                      ng-model="component.attributes.cols_data[colUid].searchable_text"
+                      class="form-control" />
+            </div>
+            <div class="col-2">
+              <a  class="btn btn-default btn-light btn-sm"
+                  ng-click="removeColumn(colUid)">
+                <%= icon('fa', 'close') %>
+              </a>
+            </div>
+          </div>
         </div>
-        <div class="col-2">
-          <a  class="btn btn-default btn-light btn-sm"
-              ng-click="promethee.inspected.attributes.head.splice($index, 1)">
+      </div>
+    </div>
+    <hr>
+    <div class="form-group">
+      <label class="label-control">Rows</label><br/>
+      <div  class="btn btn-default btn-light btn-sm"
+            ng-click="addRow()">
+        Add row
+      </div><br/><br/>
+      <div ng-repeat="rowUid in component.attributes.rows track by $index">
+        <span class="small">
+          <b>Row {{$index+1}}</b>
+          <a  class="btn btn-default btn-light btn-sm float-right"
+              ng-click="removeRow(rowUid)">
             <%= icon('fa', 'close') %>
           </a>
+        </span><br/>
+        <div ng-repeat="colUid in component.attributes.cols">
+          <span class="small">
+            {{component.attributes.cols_data[colUid].searchable_text}}
+          </span>
+          <br/>
+          <input  type="text"
+                  ng-model="component.attributes.rows_data[rowUid][colUid].searchable_text"
+                  class="form-control" />
         </div>
+        <hr/>
       </div>
     </div>
-  </div>
-  <div class="form-group">
-    <label class="label-control">Body</label><br/>
-    <div  class="btn btn-default btn-light btn-sm"
-          ng-click="promethee.inspected.attributes.body.push([{searchable_text: 'Text'}])">
-      Add row
-    </div><br/><br/>
-    <div ng-repeat="tr in promethee.inspected.attributes.body track by $index">
-      <span class="small"><b>Row {{$index+1}}</b>
-        <a  class="btn btn-default btn-light btn-sm float-right"
-            ng-click="promethee.inspected.attributes.body.splice($index, 1)">
-          <%= icon('fa', 'close') %>
-        </a>
-      </span><br/>
-      <div ng-repeat="th in promethee.inspected.attributes.head track by $index">
-        <span class="small">{{th.searchable_text}}</span><br/>
-        <input type="text" ng-model="tr[$index].searchable_text" class="form-control" />
-      </div>
-      <hr/>
+    <div class="form-group" ng-show="component.attributes.rows.length > 1">
+      <label class="label-control">Drag the rows below to reorder them:</label>
+      <ul ui-sortable
+          ng-model="component.attributes.rows"
+          class="list-unstyled">
+        <li ng-repeat="_ in component.attributes.rows track by $index">
+          <%= icon('fa', 'bars') %> Row {{$index + 1}}
+        </li>
+      </ul>
     </div>
   </div>
 </script>
+
+<script>
+  promethee.controller('TableInspectController', ['$scope', 'uidService', function($scope, uidService) {
+    $scope.addColumn = function () {
+      var uid = uidService.generate();
+      $scope.component.attributes.cols.push(uid);
+      $scope.component.attributes.cols_data[uid] = { searchable_text: 'New column' };
+    }
+
+    $scope.addRow = function () {
+      var uid = uidService.generate();
+      $scope.component.attributes.rows.push(uid);
+
+      console.log($scope.component.attributes);
+    }
+
+    $scope.removeItem = function (uid, arrayKey) {
+      var dataKey = arrayKey + '_data';
+      var index = $scope.component.attributes[arrayKey].indexOf(uid);
+      if (index !== -1) {
+        $scope.component.attributes[arrayKey].splice(index, 1);
+        delete $scope.component.attributes[dataKey][uid];
+      }
+    }
+
+    $scope.removeColumn = function (uid) {
+      $scope.removeItem(uid, 'cols');
+    }
+
+    $scope.removeRow = function (uid) {
+      $scope.removeItem(uid, 'rows');
+    }
+  }]);
+</script>

data/app/views/promethee/components/table/_edit.move.html.erb

@@ -4,12 +4,16 @@
         <table class="table">
           <thead>
             <tr>
-              <th ng-repeat="th in component.attributes.head track by $index">{{th.searchable_text}}</th>
+              <th ng-repeat="colUid in component.attributes.cols">
+                {{component.attributes.cols_data[colUid].searchable_text}}
+              </th>
             </tr>
           </thead>
           <tbody>
-            <tr ng-repeat="tr in component.attributes.body track by $index">
-              <td ng-repeat="td in tr track by $index">{{td.searchable_text}}</td>
+            <tr ng-repeat="rowUid in component.attributes.rows">
+              <td ng-repeat="colUid in component.attributes.cols">
+                {{component.attributes.rows_data[rowUid][colUid].searchable_text}}
+              </td>
             </tr>
           </tbody>
         </table>

data/app/views/promethee/components/table/_localize.html.erb

@@ -6,12 +6,16 @@
       <table class="table">
         <thead>
           <tr>
-            <th ng-repeat="th in master.attributes.head track by $index">{{th.searchable_text}}</th>
+            <th ng-repeat="colUid in master.attributes.cols track by $index">
+              {{ master.attributes.cols_data[colUid].searchable_text }}
+            </th>
           </tr>
         </thead>
         <tbody>
-          <tr ng-repeat="tr in master.attributes.body track by $index">
-            <td ng-repeat="td in tr track by $index">{{td.searchable_text}}</td>
+          <tr ng-repeat="rowUid in master.attributes.rows">
+            <td ng-repeat="colUid in master.attributes.cols">
+              {{ master.attributes.rows_data[rowUid][colUid].searchable_text }}
+            </td>
           </tr>
         </tbody>
       </table>
@@ -20,15 +24,19 @@
       <table class="table">
         <thead>
           <tr>
-            <th ng-repeat="th in component.attributes.head track by $index">
-              <input class="form-control" ng-model="th.searchable_text" type="text">
+            <th ng-repeat="colUid in master.attributes.cols track by $index">
+              <input  type="text"
+                      ng-model="component.attributes.cols_data[colUid].searchable_text"
+                      class="form-control">
             </th>
           </tr>
         </thead>
         <tbody>
-          <tr ng-repeat="tr in component.attributes.body track by $index">
-            <td ng-repeat="td in tr track by $index">
-              <input class="form-control" ng-model="td.searchable_text" type="text">
+          <tr ng-repeat="rowUid in master.attributes.rows">
+            <td ng-repeat="colUid in master.attributes.cols">
+              <input  class="form-control"
+                      ng-model="component.attributes.rows_data[rowUid][colUid].searchable_text"
+                      type="text">
             </td>
           </tr>
         </tbody>

data/app/views/promethee/components/table/_show.html.erb

@@ -1,24 +1,37 @@
+<%
+  return unless ([:cols, :cols_data, :rows, :rows_data] - component[:attributes].keys).empty?
+  columns = component[:attributes][:cols].map { |colUid|
+    colData = component[:attributes][:cols_data][colUid.to_sym] || {}
+    { uid: colUid, searchable_text: colData[:searchable_text] }
+  }
+
+  rows = component[:attributes][:rows].map { |rowUid|
+    rowData = component[:attributes][:rows_data][rowUid.to_sym] || {}
+    { uid: rowUid, data: rowData }
+  }
+%>
+
 <div id="component-<%= component[:id] %>" class="<%= promethee_class_for(component) %>">
   <div class="table-responsive">
     <table class="table">
       <thead>
         <tr>
-          <% component[:attributes][:head].each do |th| %>
-            <th><%= th[:searchable_text] if th.has_key? :searchable_text %></th>
+          <% columns.each do |col| %>
+            <th><%= col[:searchable_text] %></th>
           <% end %>
         </tr>
       </thead>
       <tbody>
-        <% component[:attributes][:body].each do |tr| %>
-          <% if tr.select { |td| td[:searchable_text]&.present? }.count == 0 %>
-            <tr></tr>
-          <% else %>
-            <tr>
-              <% tr.each do |td| %>
-                <td><%= td[:searchable_text] if td.has_key? :searchable_text %></td>
-              <% end %>
-            </tr>
-          <% end %>
+        <% rows.each do |row| %>
+          <tr>
+            <% columns.each do |col| %>
+              <%
+                cell = row[:data][col[:uid].to_sym]
+                next if cell.nil?
+              %>
+              <td><%= cell[:searchable_text] %></td>
+            <% end %>
+          </tr>
         <% end %>
       </tbody>
     </table>

data/app/views/promethee/edit/_move.html.erb

@@ -108,8 +108,7 @@ promethee
             // console.log('dropped', component, droppedToList, droppedToIndex);
             droppedToList.splice(droppedToIndex, 0, component);
 
-            scope.promethee.inspected = component
-            scope.refreshInspect(component.type);
+            scope.promethee.inspected = component;
 
             scope.$apply();
           }
@@ -155,7 +154,7 @@ promethee
     <div class="promethee-edit__inspect-content">
       <div ng-repeat="definition in promethee.definitions | orderBy:'position'">
         <ng-include src="'promethee/components/' + definition.data.type + '/edit/inspect'"
-                    ng-show="promethee.inspected.type == definition.data.type"
+                    ng-if="promethee.inspected.type == definition.data.type"
                     class="promethee-edit__inspect-content--{{ definition.data.type }}"></ng-include>
       </div>
     </div>

data/app/views/promethee/presets/_image-with-text.html.erb

@@ -27,7 +27,7 @@
             "children": [
               {
                 "type": "text",
-                "attributes": {"body": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. A dicta, est quos distinctio culpa! Quasi cupiditate, totam nulla reprehenderit animi iusto qui cumque culpa repellat eum sit? Debitis, laboriosam reiciendis!</p>"}
+                "attributes": {"searchable_body": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. A dicta, est quos distinctio culpa! Quasi cupiditate, totam nulla reprehenderit animi iusto qui cumque culpa repellat eum sit? Debitis, laboriosam reiciendis!</p>"}
               }
             ]
           }

data/lib/promethee/data/localization.rb

@@ -25,7 +25,8 @@ class Promethee::Data::Localization < Promethee::Data
     @master_data.flat.each do |master_component|
       localized_component = find_localized_component master_component[:id]
       # We take the localized component if it exists, the master component otherwise
-      component = localized_component || master_component
+      component = localized_component || master_component.except(:attributes)
+      component[:attributes] ||= {}
       # We add it to the list of localized components
       @data[:components] << component
     end

data/lib/promethee/data/master_localized.rb

@@ -18,9 +18,11 @@ class Promethee::Data::MasterLocalized < Promethee::Data
   def localize_component_attributes(component)
     localized_component = find_localized_component component[:id]
     return if (localized_component.nil? || !localized_component.include?(:attributes))
-    component[:attributes].merge! localized_component[:attributes]
+    component[:attributes].deep_merge_existing_keys! localized_component[:attributes]
   end
 
+
+
   def localize_component_children(component)
     component[:children].each { |child| localize_component child }
   end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.11.29'
+    VERSION = '2.0.0'
   end
 end

data/lib/promethee.rb

@@ -3,6 +3,7 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'angularjs-rails'
 require 'summernote-rails'
+require 'deep_merge_existing_keys'
 
 module Promethee
   def self.root

data/lib/tasks/promethee/promethee.rake

@@ -1,4 +1,15 @@
-# desc "Explaining what the task does"
-# task :promethee do
-#   # Task goes here
-# end
+namespace :promethee do
+
+  desc "Remove useless attributes from localizations' data"
+  task :clean_localizations, [:model_name] => :environment do |task, args|
+    service = Promethee::LocalizeCleanService.new(args[:model_name])
+    service.start
+  end
+
+  desc "Upgrade your table components' to 2.x structure"
+  task :upgrade_table, [:model_name] => :environment do |task, args|
+    service = Promethee::TableUpgradeService.new(args[:model_name])
+    service.start
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.11.29
+  version: 2.0.0
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.10.0
+- !ruby/object:Gem::Dependency
+  name: deep_merge_existing_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +171,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- UPGRADING
 - app/assets/images/icon-promethee.png
 - app/assets/images/icon-promethee.svg
 - app/assets/images/loader.gif
@@ -176,6 +191,8 @@ files:
 - app/assets/stylesheets/promethee.sass
 - app/controllers/promethee_controller.rb
 - app/models/concerns/promethee_data.rb
+- app/services/promethee/localize_clean_service.rb
+- app/services/promethee/table_upgrade_service.rb
 - app/views/promethee/_edit.html.erb
 - app/views/promethee/_localize.html.erb
 - app/views/promethee/_show.html.erb
@@ -430,7 +447,17 @@ homepage: https://github.com/lespoupeesrusses/promethee
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  ##########################################
+  #  NOTE FOR UPGRADING TO 2.0.0 OR LATER  #
+  ##########################################
+
+  Prométhée 2.0 brings:
+  - [BREAKING CHANGE]   New structure for table component. A rake task is available to update them in your master models. Localization has to be manual.
+  - [TOOL TO FIX ISSUE] A rake task to clean your localization models.
+
+  For more details, check the documentation:
+  https://github.com/lespoupeesrusses/promethee/tree/dev-2.0/doc
 rdoc_options: []
 require_paths:
 - lib