14287: Don't send reader_tokens="[false]".

[arvados.git] / apps / workbench / app / models / collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 764817509ac98ccb936a9d1d162758ef7da7cef4..ead2c951c3f8e5fdf41589e4366d96cdc891596e 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -1,3 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+require "arvados/keep"
+
 class Collection < ArvadosBase
   MD5_EMPTY = 'd41d8cd98f00b204e9800998ecf8427e'
 
@@ -18,25 +24,37 @@ class Collection < ArvadosBase
     true
   end
 
-  def content_summary
-    ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+  def manifest
+    if @manifest.nil? or manifest_text_changed?
+      @manifest = Keep::Manifest.new(manifest_text || "")
+    end
+    @manifest
   end
 
-  def total_bytes
-    if files
-      tot = 0
-      files.each do |file|
-        tot += file[2]
-      end
-      tot
+  def files
+    # This method provides backwards compatibility for code that relied on
+    # the old files field in API results.  New code should use manifest
+    # methods directly.
+    manifest.files
+  end
+
+  def content_summary
+    if total_bytes > 0
+      ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
     else
-      0
+      super + " modified at " + modified_at.to_s
     end
   end
 
+  def total_bytes
+    manifest.files.inject(0) { |sum, filespec| sum + filespec.last }
+  end
+
   def files_tree
-    return [] if files.empty?
-    tree = files.group_by { |file_spec| File.split(file_spec.first) }
+    tree = manifest.files.group_by do |file_spec|
+      File.split(file_spec.first)
+    end
+    return [] if tree.empty?
     # Fill in entries for empty directories.
     tree.keys.map { |basedir, _| File.split(basedir) }.each do |splitdir|
       until tree.include?(splitdir)
@@ -50,18 +68,14 @@ class Collection < ArvadosBase
         .sort.flat_map do |parts|
         [parts + [nil]] + dir_to_tree.call(File.join(parts))
       end
-      # Then extend that list with files in this directory.
-      subnodes + tree[File.split(dirname)]
+      # Then extend that list with files in this directory, except the empty dir placeholders (0:0:. files).
+      subnodes + tree[File.split(dirname)].reject { |_, basename, size| (basename == '.') and (size == 0) }
     end
     dir_to_tree.call('.')
   end
 
-  def attribute_editable? attr, *args
-    false
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(name description manifest_text filename)
   end
 
   def provenance
@@ -72,4 +86,15 @@ class Collection < ArvadosBase
     arvados_api_client.api "collections/#{self.uuid}/", "used_by"
   end
 
+  def friendly_link_name lookup=nil
+    name || portable_data_hash
+  end
+
+  def textile_attributes
+    [ 'description' ]
+  end
+
+  def untrash
+    arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {"ensure_unique_name" => true})
+  end
 end