hyrax 1.1.1 → 2.0.0.beta1

data/app/assets/stylesheets/typeahead.css

@@ -0,0 +1,64 @@
+/* This is for the twitter typeahead script used on for linked data terms */
+.typeahead,
+.tt-query,
+.tt-hint {
+  width: 396px;
+  height: 30px;
+  padding: 8px 12px;
+  font-size: 24px;
+  line-height: 30px;
+  border: 2px solid #ccc;
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+  outline: none;
+}
+
+.typeahead {
+  background-color: #fff;
+}
+
+.typeahead:focus {
+  border: 2px solid #0097cf;
+}
+
+.tt-query {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.tt-hint {
+  color: #999
+}
+
+.tt-dropdown-menu {
+  width: 422px;
+  margin-top: 12px;
+  padding: 8px 0;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+          box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-suggestion {
+  padding: 3px 20px;
+  font-size: 18px;
+  line-height: 24px;
+}
+
+.tt-suggestion.tt-cursor {
+  color: #fff;
+  background-color: #0097cf;
+
+}
+
+.tt-suggestion p {
+  margin: 0;
+}

data/app/authorities/qa/authorities/find_works.rb

@@ -1,10 +1,13 @@
 module Qa::Authorities
   class FindWorks < Qa::Authorities::Base
+    class_attribute :search_builder_class
+    self.search_builder_class = Hyrax::My::FindWorksSearchBuilder
+
     def search(_q, controller)
-      # The FindWorksSearchBuilder expects a current_user
+      # The My::FindWorksSearchBuilder expects a current_user
       return [] unless controller.current_user
       repo = CatalogController.new.repository
-      builder = Hyrax::FindWorksSearchBuilder.new(controller)
+      builder = search_builder(controller)
       response = repo.search(builder)
       docs = response.documents
       docs.map do |doc|
@@ -13,5 +16,11 @@ module Qa::Authorities
         { id: id, label: title, value: id }
       end
     end
+
+    private
+
+      def search_builder(controller)
+        search_builder_class.new(controller)
+      end
   end
 end

data/app/controlled_vocabularies/hyrax/controlled_vocabularies/location.rb

@@ -0,0 +1,13 @@
+module Hyrax
+  module ControlledVocabularies
+    class Location < ActiveTriples::Resource
+      configure rdf_label: ::RDF::Vocab::GEONAMES.name
+
+      # Return a tuple of url & label
+      def solrize
+        return [rdf_subject.to_s] if rdf_label.first.to_s.blank? || rdf_label.first.to_s == rdf_subject.to_s
+        [rdf_subject.to_s, { label: "#{rdf_label.first}$#{rdf_subject}" }]
+      end
+    end
+  end
+end

data/app/controllers/concerns/hyrax/admin/stats_behavior.rb

@@ -3,7 +3,7 @@ module Hyrax
     module StatsBehavior
       extend ActiveSupport::Concern
       included do
-        layout 'admin'
+        layout 'dashboard'
       end
 
       def show
@@ -12,7 +12,7 @@ module Hyrax
         limit = params.fetch(:limit, "5").to_i
         @presenter = AdminStatsPresenter.new(stats_filters, limit)
         add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.sidebar.statistics'), hyrax.admin_stats_path
       end
     end

data/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb

@@ -3,14 +3,24 @@ module Hyrax
     module UsersControllerBehavior
       extend ActiveSupport::Concern
       include Blacklight::SearchContext
+      included do
+        before_action :ensure_admin!
+        layout 'dashboard'
+      end
 
       # Display admin menu list of users
       def index
         add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.users.index.title'), hyrax.admin_users_path
         @presenter = Hyrax::Admin::UsersPresenter.new
       end
+
+      private
+
+        def ensure_admin!
+          authorize! :read, :admin_dashboard
+        end
     end
   end
 end

data/app/controllers/concerns/hyrax/breadcrumbs.rb

@@ -11,7 +11,7 @@ module Hyrax
     end
 
     def default_trail
-      add_breadcrumb I18n.t('hyrax.dashboard.title'), hyrax.dashboard_index_path if user_signed_in?
+      add_breadcrumb I18n.t('hyrax.dashboard.title'), hyrax.dashboard_path if user_signed_in?
     end
 
     def trail_from_referer

data/app/controllers/concerns/hyrax/breadcrumbs_for_collections.rb

@@ -8,7 +8,7 @@ module Hyrax
     end
 
     def add_breadcrumb_for_controller
-      add_breadcrumb I18n.t('hyrax.dashboard.my.collections'), hyrax.dashboard_collections_path
+      add_breadcrumb I18n.t('hyrax.dashboard.my.collections'), hyrax.my_collections_path
     end
 
     def add_breadcrumb_for_action

data/app/controllers/concerns/hyrax/breadcrumbs_for_works.rb

@@ -3,28 +3,40 @@ module Hyrax
     extend ActiveSupport::Concern
     include Hyrax::Breadcrumbs
 
-    module ClassMethods
+    class_methods do
       # We don't want the breadcrumb action to occur until after the concern has
       # been loaded and authorized
       def curation_concern_type=(curation_concern_type)
         super
-        before_action :build_breadcrumbs, only: [:edit, :show]
-        before_action :save_permissions, only: :update
+        before_action :build_breadcrumbs, only: [:edit, :show, :new]
       end
     end
 
-    def add_breadcrumb_for_controller
-      add_breadcrumb I18n.t('hyrax.dashboard.my.works'), hyrax.dashboard_works_path
-    end
+    private
 
-    def add_breadcrumb_for_action
-      case action_name
-      when 'edit'.freeze
-        add_breadcrumb curation_concern.to_s, main_app.polymorphic_path(curation_concern)
-        add_breadcrumb t('hyrax.works.edit.breadcrumb'), request.path
-      when 'show'.freeze
-        add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
+      def build_breadcrumbs
+        return super if action_name == 'show'
+        # These breadcrumbs are for the edit/create actions
+        add_breadcrumb t(:'hyrax.controls.home'), root_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+        add_breadcrumb_for_controller
+        add_breadcrumb_for_action
+      end
+
+      def add_breadcrumb_for_controller
+        add_breadcrumb I18n.t(:'hyrax.dashboard.my.works'), hyrax.my_works_path
+      end
+
+      def add_breadcrumb_for_action
+        case action_name
+        when 'edit'.freeze
+          add_breadcrumb curation_concern.to_s, main_app.polymorphic_path(curation_concern)
+          add_breadcrumb t(:'hyrax.works.edit.breadcrumb'), request.path
+        when 'new'.freeze
+          add_breadcrumb t(:'hyrax.works.create.breadcrumb'), request.path
+        when 'show'.freeze
+          add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
+        end
       end
-    end
   end
 end

data/app/controllers/concerns/hyrax/collections.rb

@@ -0,0 +1,4 @@
+module Hyrax
+  module Collections
+  end
+end

data/{lib → app/controllers/concerns}/hyrax/collections/accepts_batches.rb

@@ -14,7 +14,7 @@ module Hyrax
         batch.empty?
       end
 
-      protected
+      private
 
         def batch_ids_from_params
           if params['batch_document_ids'].blank?

data/app/controllers/concerns/hyrax/collections_controller_behavior.rb

@@ -6,187 +6,47 @@ module Hyrax
 
     included do
       before_action :filter_docs_with_read_access!, except: :show
-      before_action :remove_select_something_first_flash, except: :show
 
       include Hyrax::Collections::AcceptsBatches
 
       # include the render_check_all view helper method
-      helper ::BatchEditsHelper
+      helper Hyrax::BatchEditsHelper
       # include the display_trophy_link view helper method
       helper Hyrax::TrophyHelper
-      # include the present_terms view helper method
-      helper ::FileSetHelper
 
       # This is needed as of BL 3.7
       copy_blacklight_config_from(::CatalogController)
 
-      # Catch permission errors
-      rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_collection_access
-
-      # actions: audit, index, create, new, edit, show, update, destroy, permissions, citation
-      before_action :authenticate_user!, except: [:show, :index]
-      load_and_authorize_resource except: [:index, :show], instance_name: :collection
-
       class_attribute :presenter_class,
                       :form_class,
-                      :list_search_builder_class,
                       :single_item_search_builder_class,
                       :member_search_builder_class
 
       alias_method :collection_search_builder_class, :single_item_search_builder_class
       deprecation_deprecate collection_search_builder_class: "use single_item_search_builder_class instead"
 
-      alias_method :collections_search_builder_class, :list_search_builder_class
-      deprecation_deprecate collections_search_builder_class: "use list_search_builder_class instead"
-
       alias_method :collection_member_search_builder_class, :member_search_builder_class
       deprecation_deprecate collection_member_search_builder_class: "use member_search_builder_class instead"
 
       self.presenter_class = Hyrax::CollectionPresenter
 
-      self.form_class = Hyrax::Forms::CollectionForm
-
-      # To build a query to find a list of collections
-      self.list_search_builder_class = Hyrax::CollectionSearchBuilder
       # The search builder to find the collection
       self.single_item_search_builder_class = SingleCollectionSearchBuilder
       # The search builder to find the collections' members
       self.member_search_builder_class = Hyrax::CollectionMemberSearchBuilder
     end
 
-    def deny_collection_access(exception)
-      if exception.action == :edit
-        redirect_to(url_for(action: 'show'), alert: 'You do not have sufficient privileges to edit this document')
-      elsif current_user && current_user.persisted?
-        redirect_to root_url, alert: exception.message
-      else
-        session['user_return_to'] = request.url
-        redirect_to main_app.new_user_session_url, alert: exception.message
-      end
-    end
-
-    def index
-      # run the solr query to find the collections
-      query = list_search_builder.with(params).query
-      @response = repository.search(query)
-      @document_list = @response.documents
-    end
-
-    def new
-      form
-    end
-
     def show
       presenter
       query_collection_members
     end
 
-    def edit
-      query_collection_members
-      # this is used to populate the "add to a collection" action for the members
-      @user_collections = find_collections_for_form
-      form
-    end
-
-    def after_create
-      form
-      respond_to do |format|
-        ActiveFedora::SolrService.instance.conn.commit
-        format.html { redirect_to collection_path(@collection), notice: 'Collection was successfully created.' }
-        format.json { render json: @collection, status: :created, location: @collection }
-      end
-    end
-
-    def after_create_error
-      form
-      respond_to do |format|
-        format.html { render action: 'new' }
-        format.json { render json: @collection.errors, status: :unprocessable_entity }
-      end
-    end
-
-    def create
-      @collection.apply_depositor_metadata(current_user.user_key)
-      add_members_to_collection unless batch.empty?
-      if @collection.save
-        after_create
-      else
-        after_create_error
-      end
-    end
-
-    def after_update
-      if flash[:notice].nil?
-        flash[:notice] = 'Collection was successfully updated.'
-      end
-      respond_to do |format|
-        format.html { redirect_to collection_path(@collection) }
-        format.json { render json: @collection, status: :updated, location: @collection }
-      end
-    end
-
-    def after_update_error
-      form
-      query_collection_members
-      respond_to do |format|
-        format.html { render action: 'edit' }
-        format.json { render json: @collection.errors, status: :unprocessable_entity }
-      end
-    end
-
-    def update
-      process_member_changes
-      if @collection.update(collection_params.except(:members))
-        after_update
-      else
-        after_update_error
-      end
-    end
-
-    def after_destroy(id)
-      respond_to do |format|
-        format.html do
-          redirect_to dashboard_collections_path,
-                      notice: "Collection #{id} was successfully deleted"
-        end
-        format.json { head :no_content, location: @collection }
-      end
-    end
-
-    def after_destroy_error(id)
-      respond_to do |format|
-        format.html do
-          flash[:notice] = "Collection #{id} could not be deleted"
-          render :edit, status: :unprocessable_entity
-        end
-        format.json { render json: { id: id }, status: :unprocessable_entity, location: @collection }
-      end
-    end
-
-    def destroy
-      if @collection.destroy
-        after_destroy(params[:id])
-      else
-        after_destroy_error(params[:id])
-      end
-    end
-
     def collection
       action_name == 'show' ? @presenter : @collection
     end
 
     private
 
-      # run a solr query to get the collections the user has access to edit
-      # @return [Array] a list of the user's collections
-      def find_collections_for_form
-        Hyrax::CollectionsService.new(self).search_results(:edit)
-      end
-
-      def remove_select_something_first_flash
-        flash.delete(:notice) if flash.notice == 'Select something first'
-      end
-
       def presenter
         @presenter ||= begin
           # Query Solr for the collection.
@@ -216,21 +76,10 @@ module Hyrax
       alias collection_member_search_builder member_search_builder
       deprecation_deprecate collection_member_search_builder: "use member_search_builder instead"
 
-      def list_search_builder
-        list_search_builder_class.new(self)
-      end
-
-      alias collections_search_builder list_search_builder
-      deprecation_deprecate collections_search_builder: "use list_search_builder instead"
-
       def collection_params
         form_class.model_attributes(params[:collection])
       end
 
-      def form
-        @form ||= form_class.new(@collection)
-      end
-
       # Queries Solr for members of the collection.
       # Populates @response and @member_docs similar to Blacklight Catalog#index populating @response and @documents
       def query_collection_members
@@ -252,44 +101,6 @@ module Hyrax
         params.merge(q: params[:cq])
       end
 
-      def process_member_changes
-        case params[:collection][:members]
-        when 'add' then add_members_to_collection
-        when 'remove' then remove_members_from_collection
-        when 'move' then move_members_between_collections
-        when Array then assign_batch_to_collection
-        end
-      end
-
-      def add_members_to_collection(collection = nil)
-        collection ||= @collection
-        collection.add_member_objects batch
-      end
-
-      def remove_members_from_collection
-        batch.each do |pid|
-          work = ActiveFedora::Base.find(pid)
-          work.member_of_collections.delete @collection
-          work.save!
-        end
-      end
-
-      def assign_batch_to_collection
-        @collection.members(true) # Force the members to get cached before (maybe) removing some of them
-        @collection.member_ids = batch
-      end
-
-      def move_members_between_collections
-        destination_collection = ::Collection.find(params[:destination_collection_id])
-        remove_members_from_collection
-        add_members_to_collection(destination_collection)
-        if destination_collection.save
-          flash[:notice] = "Successfully moved #{batch.count} files to #{destination_collection.title} Collection."
-        else
-          flash[:error] = "An error occured. Files were not moved to #{destination_collection.title} Collection."
-        end
-      end
-
       # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
       # our local paths. Thus we are unable to just override `self.local_prefixes`
       def _prefixes