scrivito_content_browser 0.40.0.rc1 → 0.40.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec881923ddad4af7f21b938ec597f8072875dd2e
-  data.tar.gz: 42b4b6404a062a013e13b715c2bafc3876f54c3c
+  metadata.gz: 5789790d8ffabfe6cbf4e1f0cbb911e29e0d67d0
+  data.tar.gz: 99fa730ccb2d0c63f9f1a2bf0f8cfb7445b9a414
 SHA512:
-  metadata.gz: 71749d3caae6113c31d367a7483373b77107b94b21238ec4bc6591787569223aa0c1b9e92c74cb31fc5e7a1cc5732d517aba7d9d45da95cd7c70d8d72488deba
-  data.tar.gz: faeb6916314e6e0faf7d80d1599276c8c47984ae6224eb5adabc0bcef56d3717faa7cd56639c4eb0ff6b731a61990b8ba76a177cb54ff1c800b22d4c3fd1c941
+  metadata.gz: b4819017905720bffba4aaba92dc59ace969407cb4e327d42ca39afca2bbe6acf26b0e9b21c875656a5aa4416124bc0dd6256bc038a555d7dfa4a2f42b1a7ed5
+  data.tar.gz: 2c20fbd8d0d588a44cdeb2a15353eb146d7f38309bf9a3e5427fe76934a98025ad1fdbe9ac8d350318c2ff8c3b4db0e5d2741c879a440544e897f6dda1bf4d2a

data/app/assets/javascripts/dist/scrivito_content_browser_pkg.js

@@ -18,8 +18,10 @@
   scrivito.content_browser = (function() {
     return {
       filters: {},
+      base_preset: {},
       components: {},
       models: {},
+      base_query: null,
       _center: function(domElement) {
         if (domElement) {
           domElement = $(domElement);
@@ -44,11 +46,13 @@
         return new models.Filter(filter_definition);
       },
       _startReact: function() {
-        var filter, filterConfig;
+        var baseQuery, filter, filterConfig;
         filterConfig = this.options.filters || this.filters;
+        baseQuery = this.options.base_query || this.base_query;
         filter = this._buildFilter(filterConfig);
         return this._reactApp = React.render(React.createElement(ui.App, {
           "initialFilter": filter,
+          "baseQuery": baseQuery,
           "container": this
         }), document.getElementById('scrivito-content-browser'));
       },
@@ -60,6 +64,9 @@
         if (options == null) {
           options = {};
         }
+        if (!options.hasOwnProperty('base_preset')) {
+          options.base_preset = this.base_preset;
+        }
         this.options = options;
         this._loadModal();
         this._startReact();
@@ -141,10 +148,10 @@
   };
 
   models.FilterNode = (function() {
-    function FilterNode(filter, name, filter_definition) {
+    function FilterNode(filter, name, filterDefinition) {
       this.filter = filter;
       this.name = name;
-      this.title = filter_definition.title;
+      this.title = filterDefinition.title;
       this.title || (this.title = this._fallbackTitle());
     }
 
@@ -160,6 +167,34 @@
 
   })();
 
+  models.FilterCollectionNode = (function(_super) {
+    __extends(FilterCollectionNode, _super);
+
+    function FilterCollectionNode(filter, name, filterDefinition) {
+      FilterCollectionNode.__super__.constructor.call(this, filter, name, filterDefinition);
+      this.children = [];
+    }
+
+    FilterCollectionNode.prototype.deselect = function() {
+      return _.each(this.children, function(child) {
+        return child.active = false;
+      });
+    };
+
+    FilterCollectionNode.prototype.isExpanded = function() {
+      return !!this.expanded;
+    };
+
+    FilterCollectionNode.prototype.hasActiveChildren = function() {
+      return _.some(this.children, function(child) {
+        return child.isActive();
+      });
+    };
+
+    return FilterCollectionNode;
+
+  })(models.FilterNode);
+
   models.Listenable = (function() {
     function Listenable() {
       this._callbacks = {};
@@ -221,7 +256,7 @@
 
     return CheckboxFilter;
 
-  })(models.FilterNode);
+  })(models.FilterCollectionNode);
 
   models.CheckboxOption = (function(_super) {
     __extends(CheckboxOption, _super);
@@ -264,11 +299,20 @@
       return this.changed();
     };
 
-    Filter.prototype.deselectAllFilters = function() {
+    Filter.prototype.deactivateAllFilters = function() {
       this.deselectHierarchicalFilters();
+      this._deselectAdditionalFilters();
       return this.changed();
     };
 
+    Filter.prototype._deselectAdditionalFilters = function() {
+      if (this.hasAdditionalFilters()) {
+        return _.each(this.additionalFilters, function(filter) {
+          return filter.deselect();
+        });
+      }
+    };
+
     Filter.prototype.hasActiveChildren = function() {
       return _.some(_.union(this.getHierarchicalFilters(), this.additionalFilters), function(subFilter) {
         return subFilter.hasActiveChildren();
@@ -331,17 +375,14 @@
     }
 
     Inspector.prototype.fileDetail = function() {
-      var fileDetail;
-      fileDetail = "(No description)";
       if (this._inpsectedObj != null) {
-        fileDetail = this._inpsectedObj.title || fileDetail;
+        return this._inpsectedObj.title();
       }
-      return fileDetail;
     };
 
     Inspector.prototype.inspectorUrl = function() {
       if (this._inpsectedObj != null) {
-        return scrivito.details_url_for_obj_id(this._inpsectedObj.id);
+        return scrivito.details_url_for_obj_id(this._inpsectedObj.id());
       }
     };
 
@@ -358,13 +399,42 @@
 
   })(models.Listenable);
 
+  models.Obj = (function() {
+    function Obj(attributes) {
+      this._attr = attributes;
+    }
+
+    Obj.prototype.title = function() {
+      return this._attr['title'] || '(No description)';
+    };
+
+    Obj.prototype.id = function() {
+      return this._attr['id'];
+    };
+
+    Obj.prototype.hasPreview = function() {
+      return !!this._attr['preview'];
+    };
+
+    Obj.prototype.previewUrl = function() {
+      return this._attr['preview'];
+    };
+
+    Obj.prototype.hasDetailsView = function() {
+      return this._attr['has_details_view'];
+    };
+
+    return Obj;
+
+  })();
+
   models.ObjCollection = (function(_super) {
     __extends(ObjCollection, _super);
 
     function ObjCollection(selectedObjs, _selectionMode) {
       this._selectionMode = _selectionMode;
       ObjCollection.__super__.constructor.call(this);
-      this._selectionMode || (this._selectionMode = 'single');
+      this._selectionMode || (this._selectionMode = 'multi');
       this._selectedObjs = selectedObjs || [];
       this._objs = [];
       this._curQueryNumber = 0;
@@ -458,8 +528,12 @@
     };
 
     ObjCollection.prototype._setAndLoadObjs = function(results, next, queryNumber) {
+      var curObjs;
       if (queryNumber === this._curQueryNumber) {
-        this._objs = this._objs.concat(results.hits);
+        curObjs = _.map(results.hits, function(attr) {
+          return new models.Obj(attr);
+        });
+        this._objs = this._objs.concat(curObjs);
         this.changed();
         if (next) {
           return next.load_batch().then((function(_this) {
@@ -480,17 +554,22 @@
   })(models.Listenable);
 
   models.ObjUpload = (function() {
-    function ObjUpload(uploadSet, file) {
-      var objClass;
+    function ObjUpload(uploadSet, file, presetAttributes) {
+      var objAttributes, objClass;
       this.uploadSet = uploadSet;
+      if (presetAttributes == null) {
+        presetAttributes = {};
+      }
       this._status = 'active';
       this._fileName = file.name;
       objClass = scrivito.default_obj_class_for_content_type(file.type);
-      scrivito.create_obj({
+      objAttributes = {
         blob: file,
         _obj_class: objClass,
         _path: this._path()
-      }).done((function(_this) {
+      };
+      objAttributes = _.extend(objAttributes, presetAttributes);
+      scrivito.create_obj(objAttributes).done((function(_this) {
         return function(objData) {
           _this._obj = objData;
           return _this._setStatus('completed');
@@ -557,20 +636,24 @@
   })();
 
   models.QueryBuilder = (function() {
-    function QueryBuilder(filter) {
+    function QueryBuilder(filter, baseQuery) {
       this.filter = filter;
+      if (baseQuery) {
+        this._baseQuery = models.QueryBuilder.prepareQuery(baseQuery);
+      }
     }
 
     QueryBuilder.prototype.searchRequest = function() {
       var query;
-      query = this._buildTreeFilterQuery() || null;
+      query = this._baseQuery;
+      query = this._addTreeFilterQuery(query);
       query = this._addSearchTerm(query);
       return this._addAdditionalFilters(query);
     };
 
     QueryBuilder.prototype._addAdditionalFilters = function(query) {
-      var activeChildren, baseQuery, filter, searchQuery, _i, _len, _ref;
-      baseQuery = query;
+      var activeChildren, combinedQuery, filter, searchQuery, _i, _len, _ref;
+      combinedQuery = query;
       _ref = this.filter.additionalFilters;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         filter = _ref[_i];
@@ -580,11 +663,11 @@
         if (activeChildren.length > 0) {
           searchQuery = this._buildActiveChildrenSearchQuery(activeChildren, filter);
           if (searchQuery != null) {
-            baseQuery = this._addOrCreateQuery(baseQuery, searchQuery);
+            combinedQuery = this._addOrCreateQuery(combinedQuery, searchQuery);
           }
         }
       }
-      return baseQuery;
+      return combinedQuery;
     };
 
     QueryBuilder.prototype._buildActiveChildrenSearchQuery = function(activeChildren, filter) {
@@ -622,23 +705,32 @@
       }
     };
 
-    QueryBuilder.prototype._buildTreeFilterQuery = function() {
-      var activeConfig, field, operator, query;
+    QueryBuilder.prototype._createQueryByActiveConfig = function(activeConfig) {
+      var field, operator;
+      if (activeConfig.node.query) {
+        return activeConfig.node.query;
+      } else {
+        field = this._findField(activeConfig);
+        if (field) {
+          operator = this._findOperator(activeConfig);
+          return this._buildFOVQuery({
+            field: field,
+            operator: operator
+          }, [activeConfig.node]);
+        }
+      }
+    };
+
+    QueryBuilder.prototype._addTreeFilterQuery = function(baseQuery) {
+      var activeConfig, configuredQuery;
       activeConfig = this._findActiveTreeFilterItem();
       if (activeConfig) {
-        if (activeConfig.node.query) {
-          return models.QueryBuilder.prepareQuery(activeConfig.node.query);
-        } else {
-          field = this._findField(activeConfig);
-          if (field) {
-            operator = this._findOperator(activeConfig);
-            query = this._buildFOVQuery({
-              field: field,
-              operator: operator
-            }, [activeConfig.node]);
-            return models.QueryBuilder.prepareQuery(query);
-          }
+        configuredQuery = this._createQueryByActiveConfig(activeConfig);
+        if (configuredQuery) {
+          return this._addOrCreateQuery(baseQuery, configuredQuery);
         }
+      } else {
+        return baseQuery;
       }
     };
 
@@ -715,7 +807,7 @@
     return query.clone().format('content_browser').order('_last_changed').reverse_order();
   };
 
-  models.QueryBuilder.by_id = function(ids) {
+  models.QueryBuilder.byId = function(ids) {
     return models.QueryBuilder.prepareQuery(scrivito.obj_where('id', 'equals', ids));
   };
 
@@ -733,16 +825,6 @@
       })(this));
     }
 
-    RadioFilter.prototype.isExpanded = function() {
-      return !!this.expanded;
-    };
-
-    RadioFilter.prototype.hasActiveChildren = function() {
-      return _.some(this.children, function(child) {
-        return child.isActive();
-      });
-    };
-
     RadioFilter.prototype.activate = function(radioOption) {
       _.each(this.children, function(child) {
         return child.active = child === radioOption;
@@ -751,24 +833,22 @@
     };
 
     RadioFilter.prototype.deactivateAll = function() {
-      _.each(this.children, function(child) {
-        return child.active = false;
-      });
+      this.deselect();
       return this.filter.changed();
     };
 
     return RadioFilter;
 
-  })(models.FilterNode);
+  })(models.FilterCollectionNode);
 
   models.RadioOption = (function(_super) {
     __extends(RadioOption, _super);
 
-    function RadioOption(group, name, definition) {
+    function RadioOption(group, name, filterDefinition) {
       this.group = group;
-      RadioOption.__super__.constructor.call(this, this.group.filter, name, definition);
-      this.value = definition.value, this.query = definition.query;
-      this.active = definition.selected;
+      RadioOption.__super__.constructor.call(this, this.group.filter, name, filterDefinition);
+      this.value = filterDefinition.value, this.query = filterDefinition.query;
+      this.active = filterDefinition.selected;
     }
 
     RadioOption.prototype.setActive = function() {
@@ -840,8 +920,12 @@
   models.UploadSet = (function(_super) {
     __extends(UploadSet, _super);
 
-    function UploadSet() {
+    function UploadSet(preset) {
+      if (preset == null) {
+        preset = {};
+      }
       UploadSet.__super__.constructor.call(this);
+      this._preset = preset;
       this._uploads = [];
     }
 
@@ -852,7 +936,7 @@
     UploadSet.prototype.addFiles = function(files) {
       _.each(files, (function(_this) {
         return function(file) {
-          return _this._uploads.unshift(new models.ObjUpload(_this, file));
+          return _this._uploads.unshift(new models.ObjUpload(_this, file, _this._preset));
         };
       })(this));
       return this.changed();
@@ -943,14 +1027,15 @@
       return this.state.inspector.onChange(this.updateInspector);
     },
     getInitialState: function() {
-      var initialSelection, selectionMode;
+      var basePreset, initialSelection, selectionMode;
       initialSelection = this.props.container.options.selection || [];
-      selectionMode = this.props.container.options.selectionMode;
+      selectionMode = this.props.container.options.selection_mode;
+      basePreset = this.props.container.options.base_preset;
       return {
         filter: this.props.initialFilter,
         objs: [],
         viewMode: new models.ViewMode(),
-        uploadSet: new models.UploadSet(),
+        uploadSet: new models.UploadSet(basePreset),
         objCollection: new models.ObjCollection(initialSelection, selectionMode),
         inspector: new models.Inspector()
       };
@@ -967,6 +1052,7 @@
         "viewMode": this.state.viewMode
       }), React.createElement(ui.Filter, {
         "filter": this.state.filter,
+        "baseQuery": this.props.baseQuery,
         "objCollection": this.state.objCollection
       }), React.createElement(ui.Items, {
         "ref": "itemView",
@@ -987,7 +1073,7 @@
     displayName: 'Filter',
     mixins: [FilterMixin],
     handleDeselectAllFilters: function() {
-      return this.props.filter.deselectAllFilters();
+      return this.props.filter.deactivateAllFilters();
     },
     renderAdditionalFilters: function() {
       var subFilters;
@@ -1003,7 +1089,7 @@
       this.setState({
         selectedFilter: false
       });
-      queryBuilder = new models.QueryBuilder(filter);
+      queryBuilder = new models.QueryBuilder(filter, this.props.baseQuery);
       query = queryBuilder.searchRequest();
       return this.props.objCollection.loadFromBackend(query);
     },
@@ -1024,7 +1110,7 @@
       this.setState({
         selectedFilter: true
       });
-      query = models.QueryBuilder.by_id(this.props.objCollection.selectedObjs());
+      query = models.QueryBuilder.byId(this.props.objCollection.selectedObjs());
       return this.props.objCollection.loadFromBackend(query);
     },
     getInitialState: function() {
@@ -1123,19 +1209,6 @@
     }
   });
 
-  ui.Filter.DeselectFilter = React.createClass({
-    displayName: 'DeselectFilter',
-    handleDeselect: function() {
-      return this.props.onDeselectAllFilters();
-    },
-    render: function() {
-      return React.createElement("div", {
-        "className": "scrivito_button",
-        "onClick": this.handleDeselect
-      }, "deselect all");
-    }
-  });
-
   ui.Filter.DeselectAllRadioOptionFilter = React.createClass({
     displayName: 'DeselectAllRadioOptionFilter',
     mixins: [OptionFilterLabelRenderMixin],
@@ -1159,6 +1232,19 @@
     }
   });
 
+  ui.Filter.DeselectFilter = React.createClass({
+    displayName: 'DeselectFilter',
+    handleDeselect: function() {
+      return this.props.onDeselectAllFilters();
+    },
+    render: function() {
+      return React.createElement("div", {
+        "className": "scrivito_button",
+        "onClick": this.handleDeselect
+      }, "deselect all");
+    }
+  });
+
   ui.Filter.RadioOptionFilter = React.createClass({
     displayName: 'RadioOptionFilter',
     mixins: [OptionFilterMixin],
@@ -1296,6 +1382,15 @@
     getDetailsClassName: function() {
       return "scrivito-content-browser-icon scrivito-content-browser-icon-eye";
     },
+    getEmptyPlaceholder: function() {
+      return React.createElement("div", {
+        "className": "details-view"
+      }, React.createElement("p", {
+        "className": "no-editing-available"
+      }, React.createElement("span", {
+        "className": "scrivito-content-browser-icon scrivito-content-browser-icon-generic"
+      }), "No edit view available."));
+    },
     render: function() {
       return React.createElement("div", {
         "className": "scrivito-content-browser-inspector"
@@ -1306,9 +1401,9 @@
         "className": "title"
       }, this.props.inspector.fileDetail())), React.createElement("div", {
         "className": "inspector-content"
-      }, React.createElement("iframe", {
+      }, (this.props.inspector.getInspectedObj().hasDetailsView() ? React.createElement("iframe", {
         "src": this.props.inspector.inspectorUrl()
-      }))) : void 0));
+      }) : this.getEmptyPlaceholder()))) : void 0));
     }
   });
 
@@ -1441,20 +1536,20 @@
   ui.ThumbnailItem = React.createClass({
     displayName: 'ThumbnailItem',
     title: function() {
-      return this.props.obj.title || "(No description)";
+      return this.props.obj.title();
     },
     selectClass: function() {
       var className;
       className = 'scrivito-content-browser-thumbnails-select select-item';
-      if (this.props.objCollection.isSelected(this.props.obj.id)) {
+      if (this.props.objCollection.isSelected(this.props.obj.id())) {
         className += ' active';
       }
       return className;
     },
     previewImage: function() {
-      if (this.props.obj.preview) {
+      if (this.props.obj.hasPreview()) {
         return React.createElement("img", {
-          "src": this.props.obj.preview
+          "src": this.props.obj.previewUrl()
         });
       } else {
         return React.createElement("span", {
@@ -1463,7 +1558,7 @@
       }
     },
     handleSelectClick: function() {
-      return this.props.objCollection.toggleSelected(this.props.obj.id);
+      return this.props.objCollection.toggleSelected(this.props.obj.id());
     },
     changeInspectObj: function() {
       return this.props.inspector.setInspectedObj(this.props.obj);
@@ -1505,7 +1600,7 @@
       items = _.map(this.props.objCollection.objs(), (function(_this) {
         return function(obj) {
           return React.createElement(ui.ThumbnailItem, {
-            "key": obj.id,
+            "key": obj.id(),
             "obj": obj,
             "objCollection": _this.props.objCollection,
             "inspector": _this.props.inspector

data/app/assets/stylesheets/scrivito_content_browser/content_browser.css

@@ -1553,7 +1553,9 @@ a.scrivito_button, a.scrivito_button:hover, a.scrivito_button:focus, a.scrivito_
 .scrivito-content-browser .scrivito-content-browser-inspector .inspector-content {
   position: absolute;
   top: 46px;
-  bottom: 2px; }
+  bottom: 2px;
+  left: 10px;
+  right: 10px; }
 
 .scrivito-content-browser .scrivito-content-browser-inspector .inspector-content iframe {
   height: 100%;

data/config/initializers/scrivito_content_browser.rb

@@ -1,8 +1,11 @@
 # Register a JavaScript search API result format used by the content browser.
-Scrivito::Configuration.register_obj_format('content_browser') do |obj|
+Scrivito::Configuration.register_obj_format('content_browser') do |obj, _, view_context|
+  has_details_view = view_context.lookup_context.exists?(obj.details_view_path)
+
   format = {
     id: obj.id,
     title: obj.description_for_editor.presence || obj.binary.try(:filename),
+    has_details_view: has_details_view
   }
 
   if obj.binary_content_type && obj.binary_content_type.start_with?('image/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_content_browser
 version: !ruby/object:Gem::Version
-  version: 0.40.0.rc1
+  version: 0.40.0.rc2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.40.0.rc1
+        version: 0.40.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.40.0.rc1
+        version: 0.40.0.rc2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement