Refining progress bar (#1095)

* updating dashboard presenter so quota usage has its own pending message

* calculating the quota usage percentage based on the raw bytes of used and allocated storage

* Update app/presenters/project_dashboard_presenter.rb

Co-authored-by: carolyncole <[email protected]>

---------

Co-authored-by: carolyncole <[email protected]>

app/models/mediaflux/asset_metadata_request.rb

@@ -30,17 +30,15 @@ def metadata
       if metadata[:collection]
         metadata[:total_file_count] = asset.xpath("./collection/accumulator/value/non-collections").text
         metadata[:size] = asset.xpath("./collection/accumulator/value/total/@h").text
-        metadata[:quota_allocation] = asset.xpath("./collection/quota/allocation/@h").text
         metadata[:accum_names] = asset.xpath("./collection/accumulator/@name")
-        metadata[:quota_used] = asset.xpath("./collection/quota/used/@h").text
         metadata[:ctime] = asset.xpath("./ctime")
-
       end
 
       parse_image(asset.xpath("./meta/mf-image"), metadata) # this does not do anything because mf-image is not a part of the meta xpath
 
       parse_note(asset.xpath("./meta/mf-note"), metadata) # this does not do anything because mf-note is not a part of the meta xpath
 
+      parse_quota(asset.xpath("./collection/quota"), metadata)
       metadata
     end
 
@@ -66,6 +64,13 @@ def parse_image(image, metadata)
         end
       end
 
+      def parse_quota(quota, metadata)
+        metadata[:quota_allocation] = quota.xpath("./allocation/@h").text
+        metadata[:quota_allocation_raw] = quota.xpath("./allocation").text.to_i
+        metadata[:quota_used] = quota.xpath("./used/@h").text
+        metadata[:quota_used_raw] = quota.xpath("./used").text.to_i
+      end
+
       # Update this to match full 0.6.1 schema
       def parse(asset)
         {

app/models/project.rb

@@ -217,10 +217,7 @@ def self.default_storage_usage
   end
 
   def storage_usage(session_id:)
-    return unless in_mediaflux?
-
     values = mediaflux_metadata(session_id:)
-    #value = values.fetch(:size, 0)
     quota_value = values.fetch(:quota_used, '')
 
     if quota_value.blank?
@@ -230,21 +227,32 @@ def storage_usage(session_id:)
     end
   end
 
+  def storage_usage_raw(session_id:)
+    values = mediaflux_metadata(session_id:)
+    quota_value = values.fetch(:quota_used_raw, 0)
+    quota_value
+  end
+
   def self.default_storage_capacity
     "0 GB"
   end
 
   def storage_capacity(session_id:)
     values = mediaflux_metadata(session_id:)
     quota_value = values.fetch(:quota_allocation, '') #if quota does not exist, set value to an empty string
-
     if quota_value.blank?
       return self.class.default_storage_capacity
     else
       return quota_value
     end
   end
 
+  def storage_capacity_raw(session_id:)
+    values = mediaflux_metadata(session_id:)
+    quota_value = values.fetch(:quota_allocation_raw, 0) #if quota does not exist, set value to 0
+    quota_value
+  end
+
   # Fetches the first n files
   def file_list(session_id:, size: 10)
     return { files: [] } if mediaflux_id.nil?

app/presenters/project_dashboard_presenter.rb

@@ -33,7 +33,7 @@ def last_activity
 
   def updated_at
     project.updated_at
-  end 
+  end
 
   def role(user)
     if data_sponsor == user.uid
@@ -46,11 +46,17 @@ def role(user)
   end
 
   def quota_usage(session_id:)
-    quota_usage = "#{project.storage_usage(session_id:)} out of #{project.storage_capacity(session_id:)} used"
+    if project.pending?
+      quota_usage = "0 KB out of 0 GB used"
+    else
+      quota_usage = "#{project.storage_usage(session_id:)} out of #{project.storage_capacity(session_id:)} used"
+    end
     quota_usage
   end
 
   def quota_percentage(session_id:)
-    # figure out how to calculate percentage of storage used with different and unpredictable units
+    return 0 if project.pending? || project.storage_capacity_raw(session_id:).zero?
+
+   (project.storage_usage_raw(session_id:).to_f / project.storage_capacity_raw(session_id:).to_f) * 100
   end
 end

app/views/welcome/_project_list_view.html.erb

@@ -10,7 +10,7 @@
         </table>
         </a>
         <div class="w3-light-grey w3-round-xlarge">
-            <div class="w3-orange w3-round-xlarge" style="height:6px;width:5%"></div>
+            <div class="w3-orange w3-round-xlarge" style="height:6px;width:<%= project.quota_percentage(session_id: current_user.mediaflux_session) %>%"></div>
         </div>
     </td>
     <td class="status details <%= project.status.downcase %>"><%= project.status %></td>