@next_page_filters = @filters.reject do |attr,op,val|
attr == 'created_at' and op == nextpage_operator
end
+
+ # We are using created_at time slightly greater/lower than the last object created_at (see next block comment).
+ # This would mean that the server would now return the previous last item(s) with matching created_at again.
+ # Hence, we need to remove the previous last item (last_uuid) from results before displaying the rest of the
+ # results to prevent "infinite" infinite scrolling.
+ if params['last_uuid'] and @objects.any?
+ @objects.each do |obj|
+ @objects.delete obj if obj.uuid.eql?(params['last_uuid'])
+ end
+ end
+
if @objects.any?
+ last_created_at = @objects.last.created_at
+
+ # In order to prevent losing item(s) that have the same created_at time as the current page last item,
+ # next page should look for objects with created_at time slightly greater/lower than the current last.
+ if nextpage_operator == '<'
+ last_created_at += 1
+ else
+ last_created_at -= 1
+ end
+
@next_page_filters += [['created_at',
nextpage_operator,
- @objects.last.created_at]]
+ last_created_at]]
@next_page_href = url_for(partial: :contents_rows,
+ last_uuid: @objects.last.uuid,
filters: @next_page_filters.to_json)
else
@next_page_href = nil
<%= render_pane 'tab_contents', to_string: true, locals: {
+ limit: 200,
filters: [['uuid', 'is_a', ["arvados#human", "arvados#specimen", "arvados#trait"]]]
}.merge(local_assigns) %>
<col width="60%" style="width: 60%;" />
<col width="40%" style="width: 40%;" />
</colgroup>
- <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows %>" data-infinite-content-params-projecttab="<%= {filters: filters}.to_json %>">
+ <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows %>" data-infinite-content-params-projecttab="<%= {limit: limit, filters: filters}.to_json %>">
</tbody>
<thead>
<tr>
projects / arvados.git / commitdiff