Change the show details to utilize the dashboard size presenter metho…

…ds (#1250)

fixes #1249

app/models/project.rb

@@ -222,19 +222,12 @@ def self.default_storage_usage
 
   def storage_usage(session_id:)
     values = mediaflux_metadata(session_id:)
-    quota_value = values.fetch(:quota_used, '')
-
-    if quota_value.blank?
-      return self.class.default_storage_usage
-    else
-      return quota_value
-    end
+    values.fetch(:quota_used, self.class.default_storage_usage) # if the storage is empty use the default
   end
 
   def storage_usage_raw(session_id:)
     values = mediaflux_metadata(session_id:)
-    quota_value = values.fetch(:quota_used_raw, 0)
-    quota_value
+    values.fetch(:quota_used_raw, 0) # if the storage raw is empty use zero
   end
 
   def self.default_storage_capacity

app/presenters/project_dashboard_presenter.rb

@@ -2,7 +2,7 @@
 class ProjectDashboardPresenter < ProjectShowPresenter
   include ActionView::Helpers::DateHelper
 
-  delegate :to_model, to: :project
+  delegate :to_model, :updated_at, to: :project
 
   delegate :data_sponsor, :data_manager, to: :project_metadata
 
@@ -33,10 +33,6 @@ def last_activity
     end
   end
 
-  def updated_at
-    project.updated_at
-  end
-
   def role(user)
     if data_sponsor == user.uid
       "Sponsor"
@@ -46,19 +42,4 @@ def role(user)
       "Data User"
     end
   end
-
-  def quota_usage(session_id:)
-    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:)
-    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/presenters/project_show_presenter.rb

@@ -39,11 +39,6 @@ def storage_usage(session_id:)
     value*default_usage_divisor
   end
 
-  def formatted_storage_usage(session_id:)
-    value = storage_usage(session_id: session_id)
-    format("%.3f", value)
-  end
-
   def storage_capacity(session_id: nil)
     return project_metadata.storage_capacity if session_id.nil?
 
@@ -58,21 +53,26 @@ def formatted_storage_capacity(session_id:)
     format("%.3f", value)
   end
 
-  def formatted_storage_remaining(session_id:)
-    value = storage_remaining(session_id:)
+  def formatted_quota_percentage(session_id:)
+    value = quota_percentage(session_id:)
     format("%.3f", value)
   end
 
-  def storage_usage_percent(session_id:)
-    capacity = storage_capacity(session_id: session_id)
-    return 0.0 if capacity.zero?
-
-    usage = storage_usage(session_id: session_id)
-
-    value = (usage/(capacity/default_capacity_divisor))*100.0
-    format("%.1f", value)
+  def quota_usage(session_id:)
+    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:)
+    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  
+
   private
 
     def default_usage_divisor

app/views/projects/_project_details_heading.html.erb

@@ -57,17 +57,12 @@
             </div>
           </div>
           <div class="row my-2">
-            <div class="progress" role="progressbar" aria-label="Storage quota usage" aria-valuenow="<%= @project.storage_usage_percent(session_id: current_user.mediaflux_session) %>" aria-valuemin="0" aria-valuemax="100">
-              <div class="progress-bar" style="width: <%= @project.storage_usage_percent(session_id: current_user.mediaflux_session) %>%"></div>
+            <div class="progress" role="progressbar" aria-label="Storage quota usage" aria-valuenow="<%= @project.formatted_quota_percentage(session_id: current_user.mediaflux_session) %>" aria-valuemin="0" aria-valuemax="100">
+              <div class="progress-bar" style="width: <%= @project.quota_percentage(session_id: current_user.mediaflux_session) %>%"></div>
             </div>
           </div>
           <div class="row my-2">
-            <div class="col-6">
-              <%= @project.formatted_storage_usage(session_id: current_user.mediaflux_session) %> KB Used
-            </div>
-            <div class="col-6 text-secondary text-end">
-              <%= @project.formatted_storage_remaining(session_id: current_user.mediaflux_session) %> GB Free
-            </div>
+            <%= @project.quota_usage(session_id: current_user.mediaflux_session) %>
           </div>
         </div>
       </div><!-- .row -->

spec/system/project_spec.rb

@@ -604,7 +604,7 @@
             description: "hello world",
             data_user_read_only: [read_only.uid],
             data_user_read_write: [read_write.uid],
-            status: ::Project::PENDING_STATUS,
+            status: ::Project::APPROVED_STATUS,
             created_on: Time.current.in_time_zone("America/New_York").iso8601,
             created_by: FactoryBot.create(:user).uid,
             project_id: "abc-123",
@@ -631,8 +631,7 @@
           visit project_path(approved_project)
 
           expect(page).to have_content "Storage (500.000 GB)"
-          expect(page).to have_content "0.400 KB Used"
-          expect(page).to have_content "500.000 GB Free"
+          expect(page).to have_content "400 bytes out of 500 GB used"
           expect(page).to be_axe_clean
             .according_to(:wcag2a, :wcag2aa, :wcag21a, :wcag21aa, :section508)
             .skipping(:'color-contrast')