infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0

data/lib/fiona7/verity_search_engine.rb

@@ -5,6 +5,9 @@ require "fiona7/custom_verity_accessor"
 require "fiona7/attribute_names_from_queries"
 require "fiona7/attribute_names_from_cms"
 
+require 'fiona7/referenced_id_finder'
+require 'fiona7/linked_id_finder'
+
 module Fiona7
   class VeritySearchEngine < SearchEngine
     def initialize(*args)
@@ -35,7 +38,7 @@ module Fiona7
       options[:sort_order] = [["score", "desc"], ["lastChanged", "desc"]]
       options[:limit] = @limit.to_i if @limit
       options[:offset] = @offset.to_i if @offset.to_i > 0
-      VeritySearchRequest.new(@query, options, @klass == Fiona7::ReleasedObj)
+      VeritySearchRequest.new(@query, options, @klass == Fiona7::ReleasedObj, @klass)
     end
 
     def fetch_results
@@ -51,12 +54,13 @@ module Fiona7
     end
 
     class VeritySearchRequest < ::RailsConnector::VeritySearchRequest
-      def initialize(query, options={}, use_released=false)
-        @query = query
+      def initialize(query, options={}, use_released=false, klass)
+        @klass        = klass
+        @query        = query
         @query_string = build_query_string(query)
+        @options      = default_search_options.merge(options)
+        @use_released = !!use_released
         Rails.logger.debug "VERITY QUERY:\n#{@query_string}"
-        @options = default_search_options.merge(options)
-        @use_released ||= use_released
       end
 
       def fetch_hits
@@ -118,6 +122,18 @@ module Fiona7
               values = values.map {|v| "#{v}*" }
               search_in(field, values)
             end
+          when :refers_to
+            fields    = q[:field] == '*' ? [] : Array(q[:field])
+            values    = Array(q[:value])
+            referring = Fiona7::ReferencedIdFinder.new(fields).find(@klass, values).map(&:to_s)
+            referring = referring.presence || ["1"]
+            search_in(:objId, referring)
+          when :links_to
+            fields    = q[:field] == '*' ? [] : Array(q[:field])
+            values    = Array(q[:value])
+            linking   = Fiona7::LinkedIdFinder.new(fields).find(@klass, values).map(&:to_s)
+            linking   = linking.presence || ["1"]
+            search_in(:objId, linking)
           when :__in__
             search_in(field, q[:value])
           when :__not_in__
@@ -142,7 +158,7 @@ module Fiona7
 
       def search_in(field, values)
         values = [values] unless values.kind_of?(Array)
-        if [:objClass, :obj_id, :permalink, :lastChanged, :name].include?(field)
+        if [:objClass, :objId, :permalink, :lastChanged, :name].include?(field)
           fields = [field.to_s]
         else
           fields = (Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes).presence || [field.to_s]
@@ -198,12 +214,9 @@ module Fiona7
       end
 
       def normalize_query(query)
-        query = query.map do |q|
-          q.symbolize_keys
-          q[:operator] = q[:operator].to_sym
-          q[:field] = q[:field].to_sym
-          q
-        end
+        # TODO: remove
+        # NOTE: already normalized in the controller
+        query
       end
 
       def as_values_array(values)

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.5.5.1"
+  VERSION = "1.6.1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.5.5.1
+  version: 1.6.1.1.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: infopark_reactor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.0
 - !ruby/object:Gem::Dependency
@@ -134,22 +134,19 @@ files:
 - app/assets/images/fiona7-logo.png
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
-- app/assets/javascripts/fiona7/task_list_command.js
 - app/assets/javascripts/fiona7/task_list_dialog.js
-- app/assets/javascripts/fiona7/task_list_menu_item.js
 - app/assets/javascripts/fiona7/templates.js
 - app/assets/javascripts/fiona7/translations.js
 - app/assets/javascripts/fiona7_ui.js
-- app/assets/javascripts/scrivito_patches/ajax.js
 - app/assets/javascripts/scrivito_patches/ajax_error_handling.js
-- app/assets/javascripts/scrivito_patches/attribute_serializer.js
 - app/assets/javascripts/scrivito_patches/base_obj_path.js
-- app/assets/javascripts/scrivito_patches/binary_utils.js
-- app/assets/javascripts/scrivito_patches/cms_rest_api.js
-- app/assets/javascripts/scrivito_patches/models/api/basic_obj.js
-- app/assets/javascripts/scrivito_patches/models/binary_field_element.js
-- app/assets/javascripts/scrivito_patches/models/obj.js
-- app/assets/javascripts/scrivito_patches/obj_serializer.js
+- app/assets/javascripts/scrivito_patches/binary_request.js
+- app/assets/javascripts/scrivito_patches/client/ajax.js
+- app/assets/javascripts/scrivito_patches/client/basic_obj.js
+- app/assets/javascripts/scrivito_patches/client/cms_rest_api.js
+- app/assets/javascripts/scrivito_patches/components/sidebar/workspaces_panel.js
+- app/assets/javascripts/scrivito_patches/components/sidebar/workspaces_panel.js.jsx
+- app/assets/javascripts/scrivito_patches/models/legacy_obj.js
 - app/assets/stylesheets/fiona7-login.css.scss
 - app/assets/stylesheets/fiona7.css.scss
 - app/assets/stylesheets/fiona7_ui.css.scss
@@ -159,6 +156,7 @@ files:
 - app/controllers/fiona7/release_controller.rb
 - app/controllers/fiona7/sessions_controller.rb
 - app/controllers/fiona7/tasks_controller.rb
+- app/controllers/fiona7/uploads_controller.rb
 - app/controllers/fiona7/workflow_controller.rb
 - app/controllers/fiona7_login_page_controller.rb
 - app/controllers/scrivito/cms_dispatch_controller.rb
@@ -242,7 +240,9 @@ files:
 - lib/fiona7/attribute_writers/widgetlist_as_linklist.rb
 - lib/fiona7/blob_id_generator.rb
 - lib/fiona7/builder/batch_widget_writer.rb
+- lib/fiona7/builder/container_chain_builder.rb
 - lib/fiona7/builder/indirect_blob_builder.rb
+- lib/fiona7/builder/indirect_blob_builder_for_obj.rb
 - lib/fiona7/builder/lazy_blob_copier.rb
 - lib/fiona7/builder/obj_builder.rb
 - lib/fiona7/builder/obj_class_builder.rb
@@ -274,6 +274,7 @@ files:
 - lib/fiona7/json/widget_decorator.rb
 - lib/fiona7/link_converter/fiona_to_scrivito.rb
 - lib/fiona7/link_converter/scrivito_to_fiona.rb
+- lib/fiona7/linked_id_finder.rb
 - lib/fiona7/middleware/server_detection_middleware.rb
 - lib/fiona7/middleware/table_switching_middleware.rb
 - lib/fiona7/mode_switch.rb
@@ -285,6 +286,7 @@ files:
 - lib/fiona7/mode_switch/composite.rb
 - lib/fiona7/mode_switch/views.rb
 - lib/fiona7/naive_search_engine.rb
+- lib/fiona7/name_and_parent_from_path.rb
 - lib/fiona7/obj_class_name_demangler.rb
 - lib/fiona7/obj_class_name_mangler.rb
 - lib/fiona7/obj_classes_from_cms.rb
@@ -294,10 +296,11 @@ files:
 - lib/fiona7/prefetch/obj_prefetch.rb
 - lib/fiona7/prefetch/widget_resolver_prefetch.rb
 - lib/fiona7/recursive_object_finder.rb
+- lib/fiona7/referenced_id_finder.rb
+- lib/fiona7/release_collector.rb
 - lib/fiona7/routers/rest_api.rb
 - lib/fiona7/routing_monkey_patch.rb
 - lib/fiona7/scrivito_patches/attribute_content.rb
-- lib/fiona7/scrivito_patches/attribute_serializer.rb
 - lib/fiona7/scrivito_patches/basic_obj.rb
 - lib/fiona7/scrivito_patches/basic_widget.rb
 - lib/fiona7/scrivito_patches/binary.rb
@@ -310,8 +313,6 @@ files:
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/log_subscriber.rb
 - lib/fiona7/scrivito_patches/migrator.rb
-- lib/fiona7/scrivito_patches/model_library.rb
-- lib/fiona7/scrivito_patches/obj_params_parser.rb
 - lib/fiona7/scrivito_patches/page_config.rb
 - lib/fiona7/scrivito_patches/preset_routes.rb
 - lib/fiona7/scrivito_patches/routing_extensions.rb
@@ -320,14 +321,17 @@ files:
 - lib/fiona7/scrivito_user.rb
 - lib/fiona7/search_engine.rb
 - lib/fiona7/shadow_classes.rb
+- lib/fiona7/super_id_finder.rb
 - lib/fiona7/super_object_finder.rb
 - lib/fiona7/table_switcher.rb
 - lib/fiona7/tasks/loader.rb
 - lib/fiona7/tasks/task.rb
+- lib/fiona7/temporary_uploader.rb
 - lib/fiona7/tools/attribute_remover.rb
 - lib/fiona7/type_loader.rb
 - lib/fiona7/type_register.rb
 - lib/fiona7/type_synchronizer.rb
+- lib/fiona7/upload_path_selector.rb
 - lib/fiona7/verity_search_engine.rb
 - lib/fiona7/version.rb
 - lib/fiona7/version_helper.rb

data/app/assets/javascripts/fiona7/task_list_command.js

@@ -1,15 +0,0 @@
-(function() {
-  _.extend(scrivito, {
-    task_list_command: function() {
-      return scrivito.command.create_instance({
-        id: 'fiona7.task_list',
-        title: scrivito.t('commands.task_list.title'),
-        icon: '',
-
-        execute: function() {
-          scrivito.task_list_dialog.open();
-        }
-      });
-    }
-  });
-}());

data/app/assets/javascripts/fiona7/task_list_menu_item.js

@@ -1,30 +0,0 @@
-(function() {
-  /*
-  var template = function() {
-    return '<li id="fiona7_task_list" class="scrivito_menu_item fiona7_task_list"><span title="' + scrivito.t('commands.task_list.title') + '"><i class="scrivito_icon">&#xf06f;</i> ' + scrivito.t('commands.task_list.title') + '</span></li>';
-  };
-  */
-
-  _.extend(scrivito, {
-    task_list_menu_item: {
-      init: function() {
-        scrivito.menu_bar.register_item_renderer(function(menu_bar) {
-          var workspace_select = menu_bar.find('#scrivito_workspace_select');
-          var changes = menu_bar.find('#scrivito_sdk_workspace_changes');
-          var command = scrivito.task_list_command();
-
-          changes.after(scrivito.template.render('task_list_menu_item', {
-            title: command.title,
-            icon: command.icon
-          }));
-          workspace_select.on('click', '#fiona7_task_list', function() {
-            command.execute();
-          });
-
-
-        });
-
-      }
-    }
-  })
-}());

data/app/assets/javascripts/scrivito_patches/ajax.js

@@ -1,225 +0,0 @@
-(function() {
-  var handle_task = function(task) {
-    switch (task.status) {
-      case 'success':
-        return $.Deferred().resolve(task.result);
-      case 'error':
-        return $.Deferred().reject({
-          message: task.message,
-          code: task.code
-        });
-      case 'open':
-        return scrivito.wait(2).then(function() {
-          return single_ajax('GET', 'tasks/' + task.id).then(function(data) {
-            return handle_task(data);
-          });
-        });
-      default:
-        throw { message: "Invalid task (unknown status)", task: task };
-    }
-  };
-
-  // -- PATCH BEGINS HERE --
-  var ajax_with_form_data_required = function(params) {
-    var objParams = params && params.obj;
-    var result = false;
-    var k;
-
-    if (!objParams) {
-      return result;
-    }
-
-    for (k in objParams) {
-      if (objParams.hasOwnProperty(k)) {
-        result = objParams[k] && (scrivito.BinaryUtils.isFile(objParams[k]) ||
-            scrivito.BinaryUtils.isBlob(objParams[k]) ||
-            scrivito.BinaryUtils.isBlobWithName(objParams[k])
-            );
-        if (result) {
-          return result;
-        }
-      }
-    }
-    return result;
-  };
-
-  var params_to_form_data = function(params) {
-    var objParams = params && params.obj || {};
-    var fd = new FormData();
-
-    var k, attr, value, widgetId, widgetValue, widgetAttr, i, l, t;
-
-    for (k in objParams) {
-      if (objParams.hasOwnProperty(k)) {
-
-        attr = k;
-        value = objParams[k];
-
-        if (attr === '_widget_pool') {
-          for (w in value) {
-            if (value.hasOwnProperty(w)) {
-              for (widgetAttr in value[w]) {
-                if (value[w].hasOwnProperty(widgetAttr)) {
-                  widgetValue = value[w][widgetAttr];
-
-                  if (widgetValue.pop) {
-                    // value is an array
-                    for (i=0; i < widgetValue.length; ++i) {
-                      fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "][]", widgetValue[i]);
-                    }
-                  } else if (scrivito.BinaryUtils.isFile(widgetValue) || scrivito.BinaryUtils.isBlob(widgetValue)) {
-                    // upload
-                    fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "]", widgetValue);
-                  } else if (scrivito.BinaryUtils.isBlobWithName(widgetValue)) {
-                    fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "]", widgetValue.blob_to_upload, widgetValue.filename);
-                  } else if (value && typeof value === 'object') {
-                    // blob/copy rename
-                    for (l in widgetValue) {
-                      if (widgetValue.hasOwnProperty(l)) {
-                        fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "][" + l + "]", widgetValue[l]);
-                      }
-                    }
-                  } else if (typeof value !== 'undefined') {
-                    fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "]", widgetValue);
-                  }
-                }
-              }
-            }
-          }
-        } else if (value.pop) {
-          // value is an array
-          for (i=0; i < value.length; ++i) {
-            fd.append("obj[" + attr + "][]", value[i]);
-          }
-        } else if (scrivito.BinaryUtils.isFile(value) || scrivito.BinaryUtils.isBlob(value)) {
-          // upload
-          fd.append("obj[" + attr + "]", value);
-        } else if (scrivito.BinaryUtils.isBlobWithName(value)) {
-          fd.append("obj[" + attr + "]", value.blob_to_upload, value.filename);
-        } else if (value && typeof value === 'object') {
-          // blob/copy rename
-          for (l in value) {
-            if (value.hasOwnProperty(l)) {
-              fd.append("obj[" + attr + "][" + l + "]", value[l]);
-            }
-          }
-        } else if (typeof value !== 'undefined') {
-          fd.append("obj[" + attr + "]", value);
-        }
-      }
-    }
-
-    return fd;
-  };
-
-  var single_ajax_with_form_data = function(type, path, options) {
-    var base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
-    if (options && options.data) {
-      options.data = params_to_form_data(options.data);
-    }
-    return $.ajax(base_url + path, _.extend({
-      type: type,
-      contentType: false,
-      processData: false,
-      cache: false // Don't cache GET requests.
-    }, options || {})).then(
-      function(result, text_status, xhr) {
-        return $.Deferred().resolve(result);
-      }, function(xhr, text_status, xhr_error) {
-        try {
-          return $.Deferred().reject(JSON.parse(xhr.responseText));
-        } catch (SyntaxError) {
-          return $.Deferred().reject(xhr_error);
-        }
-      }
-    );
-  };
-  // -- PATCH ENDS HERE --
-
-  var single_ajax = function(type, path, options) {
-    // -- PATCH BEGINS HERE --
-    if (ajax_with_form_data_required(options && options.data || {})) {
-      return single_ajax_with_form_data(type, path, options);
-    }
-    // -- PATCH ENDS HERE --
-    var base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
-    if (options && options.data) {
-      options.data = JSON.stringify(options.data);
-    }
-    return $.ajax(base_url + path, _.extend({
-      type: type,
-      dataType: 'json',
-      contentType: 'application/json; charset=utf-8',
-      cache: false // Don't cache GET requests.
-    }, options || {})).then(
-      function(result, text_status, xhr) {
-        return $.Deferred().resolve(result);
-      }, function(xhr, text_status, xhr_error) {
-        try {
-          return $.Deferred().reject(JSON.parse(xhr.responseText));
-        } catch (SyntaxError) {
-          return $.Deferred().reject(xhr_error);
-        }
-      }
-    );
-  };
-
-  _.extend(scrivito, {
-    silent_ajax: function(type, path, options) {
-      var is_write_request = type === 'PUT' || type === 'POST' || type === 'DELETE';
-      var skip_write_monitor = options && options.skip_write_monitor;
-
-      if (is_write_request) {
-        options = options || {};
-        options.timeout = 120000; // miliseconds // <-- PATCH HERE
-
-        if (!skip_write_monitor) {
-          scrivito.write_monitor.start_write();
-        }
-      }
-
-      var ajax_promise = single_ajax(type, path, options).then(function(result) {
-        if (result && result.task && _.size(result) === 1) {
-          return handle_task(result.task);
-        } else {
-          return $.Deferred().resolve(result);
-        }
-      });
-
-      if (is_write_request && !skip_write_monitor) {
-        ajax_promise.always(function() {
-          scrivito.write_monitor.end_write();
-        });
-      }
-
-      return ajax_promise;
-    },
-
-    ajax: function(type, path, options) {
-      return scrivito.silent_ajax(type, path, options).fail(function(error) {
-        scrivito.display_ajax_error(error);
-      });
-    },
-
-    display_ajax_error: function(error) {
-      var message, message_for_editor;
-
-      // -- PATCH BEGINS HERE --
-      if (_.isObject(error)) {
-        if (error.message) {
-          return scrivito.alertDialog(error.message);
-        } else {
-          return scrivito.alertDialog(scrivito.t('ajax_error.communication'));
-        }
-      } else if (_.contains(['abort', 'parsererror', 'timeout'], error)) {
-        message = scrivito.t('ajax_error.communication');
-      } else {
-        message = scrivito.t('ajax_error', error);
-      }
-      scrivito.logError(message);
-      scrivito.errorDialog(message_for_editor || scrivito.t('ajax_error.message_for_editor'),
-          [error.timestamp, message]);
-      // -- PATCH ENDS HERE --
-    }
-  });
-}());