This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 6f9ed0d52323feda6af5510a7e5d3c8c685e67d5
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Sat Mar 21 11:27:32 2020 -0400

    AIRAVATA-3216: Remove dynamic sorting, but sort new reservations by start 
time
---
 .../components/admin/group_resource_preferences/ComputePreference.vue  | 1 +
 .../group_resource_preferences/ComputeResourceReservationList.vue      | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
 
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
index 5ad366e..bff050e 100644
--- 
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
+++ 
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputePreference.vue
@@ -478,6 +478,7 @@ export default {
     },
     addReservation(reservation) {
       this.data.reservations.push(reservation);
+      this.data.reservations.sort((a, b) => a.startTime < b.startTime ? -1 : 
1);
     },
     deleteReservation(reservation) {
       const reservationIndex = this.data.reservations.findIndex(
diff --git 
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputeResourceReservationList.vue
 
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputeResourceReservationList.vue
index 8c23922..9054f9c 100644
--- 
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputeResourceReservationList.vue
+++ 
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/ComputeResourceReservationList.vue
@@ -51,7 +51,6 @@
         hover
         :fields="fields"
         :items="slotProps.items"
-        sort-by="startTime"
       >
         <template slot="reservationName" slot-scope="data">
           {{ data.value }}
@@ -154,14 +153,12 @@ export default {
         {
           label: "Start Time",
           key: "startTime",
-          sortable: true,
           formatter: value =>
             utils.dateFormatters.dateTimeInMinutesWithTimeZone.format(value)
         },
         {
           label: "End Time",
           key: "endTime",
-          sortable: true,
           formatter: value =>
             utils.dateFormatters.dateTimeInMinutesWithTimeZone.format(value)
         },

Reply via email to