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 24e6da59babfaa30f3e9e00a75d59ee7d02b79b4..ead2c951c3f8e5fdf41589e4366d96cdc891596e 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require "arvados/keep"
 
 class Collection < ArvadosBase
@@ -21,29 +25,33 @@ class Collection < ArvadosBase
   end
 
   def manifest
-    Keep::Manifest.new(manifest_text || "")
+    if @manifest.nil? or manifest_text_changed?
+      @manifest = Keep::Manifest.new(manifest_text || "")
+    end
+    @manifest
   end
 
   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.
-    if @files.nil? or manifest_text_changed?
-      @files = manifest.each_file.to_a
-    end
-    @files
+    manifest.files
   end
 
   def content_summary
-    ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+    if total_bytes > 0
+      ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+    else
+      super + " modified at " + modified_at.to_s
+    end
   end
 
   def total_bytes
-    manifest.each_file.inject(0) { |sum, filespec| sum + filespec.last }
+    manifest.files.inject(0) { |sum, filespec| sum + filespec.last }
   end
 
   def files_tree
-    tree = manifest.each_file.group_by do |file_spec|
+    tree = manifest.files.group_by do |file_spec|
       File.split(file_spec.first)
     end
     return [] if tree.empty?
@@ -60,22 +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
-    if %w(name description manifest_text).include? attr.to_s
-      true
-    else
-      super
-    end
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(name description manifest_text filename)
   end
 
   def provenance
@@ -86,28 +86,15 @@ class Collection < ArvadosBase
     arvados_api_client.api "collections/#{self.uuid}/", "used_by"
   end
 
-  def uuid
-    if self[:uuid].nil?
-      return self[:portable_data_hash]
-    else
-      super
-    end
+  def friendly_link_name lookup=nil
+    name || portable_data_hash
   end
 
-  def portable_data_hash
-    if self[:portable_data_hash].nil?
-      return self[:uuid]
-    else
-      super
-    end
+  def textile_attributes
+    [ 'description' ]
   end
 
-  def friendly_link_name
-    if self.respond_to? :name
-      self.name
-    else
-      self.portable_data_hash
-    end
+  def untrash
+    arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {"ensure_unique_name" => true})
   end
-
 end