projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
collections_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/collections_controller.rb
b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 7bc207f0226a5f247e0b2c14aa5870ee994e4bba..3803d37691132782e927e6e32cbb5fbee80657c7 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/collections_controller.rb
@@
-1,6
+1,23
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require "arvados/keep"
require "arvados/keep"
+require "trashable"
class Arvados::V1::CollectionsController < ApplicationController
class Arvados::V1::CollectionsController < ApplicationController
+ include DbCurrentTime
+ include TrashableController
+
+ def self._index_requires_parameters
+ (super rescue {}).
+ merge({
+ include_trash: {
+ type: 'boolean', required: false, description: "Include collections whose is_trashed attribute is true."
+ },
+ })
+ end
+
def create
if resource_attrs[:uuid] and (loc = Keep::Locator.parse(resource_attrs[:uuid]))
resource_attrs[:portable_data_hash] = loc.to_s
def create
if resource_attrs[:uuid] and (loc = Keep::Locator.parse(resource_attrs[:uuid]))
resource_attrs[:portable_data_hash] = loc.to_s
@@
-9,6
+26,13
@@
class Arvados::V1::CollectionsController < ApplicationController
super
end
super
end
+ def find_objects_for_index
+ if params[:include_trash] || ['destroy', 'trash', 'untrash'].include?(action_name)
+ @objects = Collection.readable_by(*@read_users, {include_trash: true, query_on: Collection.unscoped})
+ end
+ super
+ end
+
def find_object_by_uuid
if loc = Keep::Locator.parse(params[:id])
loc.strip_hints!
def find_object_by_uuid
if loc = Keep::Locator.parse(params[:id])
loc.strip_hints!
@@
-19,23
+43,22
@@
class Arvados::V1::CollectionsController < ApplicationController
manifest_text: c.signed_manifest_text,
}
end
manifest_text: c.signed_manifest_text,
}
end
+ true
else
super
end
else
super
end
- true
end
def show
if @object.is_a? Collection
end
def show
if @object.is_a? Collection
+ # Omit unsigned_manifest_text
+ @select ||= model_class.selectable_attributes - ["unsigned_manifest_text"]
super
else
super
else
-
render json:
@object
+
send_json
@object
end
end
end
end
- def index
- super
- end
def find_collections(visited, sp, &b)
case sp
def find_collections(visited, sp, &b)
case sp
@@
-54,7
+77,7
@@
class Arvados::V1::CollectionsController < ApplicationController
when String
if m = /[a-f0-9]{32}\+\d+/.match(sp)
yield m[0], nil
when String
if m = /[a-f0-9]{32}\+\d+/.match(sp)
yield m[0], nil
- elsif m =
/[0-9a-z]{5}-4zz18-[0-9a-z]{15}/
.match(sp)
+ elsif m =
Collection.uuid_regex
.match(sp)
yield nil, m[0]
end
end
yield nil, m[0]
end
end
@@
-125,9
+148,9
@@
class Arvados::V1::CollectionsController < ApplicationController
visited[uuid] = job.as_api_response
if direction == :search_up
# Follow upstream collections referenced in the script parameters
visited[uuid] = job.as_api_response
if direction == :search_up
# Follow upstream collections referenced in the script parameters
- find_collections(visited, job) do |hash, uuid|
+ find_collections(visited, job) do |hash,
col_
uuid|
search_edges(visited, hash, :search_up) if hash
search_edges(visited, hash, :search_up) if hash
- search_edges(visited,
uuid, :search_up) if
uuid
+ search_edges(visited,
col_uuid, :search_up) if col_
uuid
end
elsif direction == :search_down
# Follow downstream job output
end
elsif direction == :search_down
# Follow downstream job output
@@
-169,24
+192,23
@@
class Arvados::V1::CollectionsController < ApplicationController
visited = {}
search_edges(visited, @object[:portable_data_hash], :search_up)
search_edges(visited, @object[:uuid], :search_up)
visited = {}
search_edges(visited, @object[:portable_data_hash], :search_up)
search_edges(visited, @object[:uuid], :search_up)
-
render json:
visited
+
send_json
visited
end
def used_by
visited = {}
search_edges(visited, @object[:uuid], :search_down)
search_edges(visited, @object[:portable_data_hash], :search_down)
end
def used_by
visited = {}
search_edges(visited, @object[:uuid], :search_down)
search_edges(visited, @object[:portable_data_hash], :search_down)
-
render json:
visited
+
send_json
visited
end
protected
def load_limit_offset_order_params *args
end
protected
def load_limit_offset_order_params *args
+ super
if action_name == 'index'
if action_name == 'index'
- # Omit manifest_text from index results unless expressly selected.
- @select ||= model_class.api_accessible_attributes(:user).
- map { |attr_spec| attr_spec.first.to_s } - ["manifest_text"]
+ # Omit manifest_text and unsigned_manifest_text from index results unless expressly selected.
+ @select ||= model_class.selectable_attributes - ["manifest_text", "unsigned_manifest_text"]
end
end
- super
end
end
end
end