X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a7f12322bab34a27863d90de9ddb95f69697bf29..f8af0c6c331d5b52deab50abf7afa8c7881cddfb:/apps/workbench/app/controllers/projects_controller.rb

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 435e0cd5d6..a0bf262c96 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -30,19 +30,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def set_share_links
-    @user_is_manager = false
-    @share_links = []
-    if @object.uuid != current_user.uuid
-      begin
-        @share_links = Link.permissions_for(@object)
-        @user_is_manager = true
-      rescue ArvadosApiClient::AccessForbiddenException,
-        ArvadosApiClient::NotFoundException
-      end
-    end
-  end
-
   def index_pane_list
     %w(Projects)
   end
@@ -183,7 +170,13 @@ class ProjectsController < ApplicationController
       # page, and use the last item on this page as a filter for
       # retrieving the next page. Ideally the API would do this for
       # us, but it doesn't (yet).
-      nextpage_operator = /\bdesc$/i =~ @order[0] ? '<' : '>'
+
+      # To avoid losing items that have the same created_at as the
+      # last item on this page, we retrieve an overlapping page with a
+      # "created_at <= last_created_at" filter, then remove duplicates
+      # with a "uuid not in [...]" filter (see below).
+      nextpage_operator = /\bdesc$/i =~ @order[0] ? '<=' : '>='
+
       @objects = []
       @name_link_for = {}
       kind_filters.each do |attr,op,val|
@@ -192,7 +185,7 @@ class ProjectsController < ApplicationController
                                      limit: @limit,
                                      include_linked: true,
                                      filters: (@filters - kind_filters + [['uuid', 'is_a', type]]),
-                                     offset: @offset)
+                                    )
           objects.each do |object|
             @name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first
           end
@@ -200,16 +193,27 @@ class ProjectsController < ApplicationController
         end
       end
       @objects = @objects.to_a.sort_by(&:created_at)
-      @objects.reverse! if nextpage_operator == '<'
+      @objects.reverse! if nextpage_operator == '<='
       @objects = @objects[0..@limit-1]
       @next_page_filters = @filters.reject do |attr,op,val|
-        attr == 'created_at' and op == nextpage_operator
+        (attr == 'created_at' and op == nextpage_operator) or
+          (attr == 'uuid' and op == 'not in')
       end
+
       if @objects.any?
+        last_created_at = @objects.last.created_at
+
+        last_uuids = []
+        @objects.each do |obj|
+          last_uuids << obj.uuid if obj.created_at.eql?(last_created_at)
+        end
+
         @next_page_filters += [['created_at',
                                 nextpage_operator,
-                                @objects.last.created_at]]
+                                last_created_at]]
+        @next_page_filters += [['uuid', 'not in', last_uuids]]
         @next_page_href = url_for(partial: :contents_rows,
+                                  limit: @limit,
                                   filters: @next_page_filters.to_json)
       else
         @next_page_href = nil
@@ -220,7 +224,9 @@ class ProjectsController < ApplicationController
                                   include_linked: true,
                                   filters: @filters,
                                   offset: @offset)
-      @next_page_href = next_page_href(partial: :contents_rows)
+      @next_page_href = next_page_href(partial: :contents_rows,
+                                       filters: @filters.to_json,
+                                       order: @order.to_json)
     end
 
     preload_links_for_objects(@objects.to_a)
@@ -285,37 +291,4 @@ class ProjectsController < ApplicationController
     end
     objects_and_names
   end
-
-  def share_with
-    if not params[:uuids].andand.any?
-      @errors = ["No user/group UUIDs specified to share with."]
-      return render_error(status: 422)
-    end
-    results = {"success" => [], "errors" => []}
-    params[:uuids].each do |shared_uuid|
-      begin
-        Link.create(tail_uuid: shared_uuid, link_class: "permission",
-                    name: "can_read", head_uuid: @object.uuid)
-      rescue ArvadosApiClient::ApiError => error
-        error_list = error.api_response.andand[:errors]
-        if error_list.andand.any?
-          results["errors"] += error_list.map { |e| "#{shared_uuid}: #{e}" }
-        else
-          error_code = error.api_status || "Bad status"
-          results["errors"] << "#{shared_uuid}: #{error_code} response"
-        end
-      else
-        results["success"] << shared_uuid
-      end
-    end
-    if results["errors"].empty?
-      results.delete("errors")
-      status = 200
-    else
-      status = 422
-    end
-    respond_to do |f|
-      f.json { render(json: results, status: status) }
-    end
-  end
 end