update fixes

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java

@@ -152,7 +152,7 @@ public String init() {
             return permissionsWrapper.notAuthorized();
         }
         initMaps();
-        roleAssignmentHistory = null;
+
         return "";
     }
 
@@ -161,6 +161,7 @@ private void initMaps() {
         roleAssigneeMap.clear();
         fileMap.clear();
         fileAccessRequestMap.clear();
+        roleAssignmentHistory = null;
 
         for (DataFile file : dataset.getFiles()) {
 

src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java

@@ -179,6 +179,7 @@ public List<RoleAssignmentRow> initRoleAssignments() {
                 }
             }
         }
+        roleAssignmentHistory = null; // Reset the history
         return raList;
     }
 
@@ -269,8 +270,8 @@ public List<RoleAssignmentHistoryEntry> getRoleAssignmentHistory() {
 
             roleAssignmentHistory.addAll(historyMap.values());
             roleAssignmentHistory.sort(Comparator
-                    .comparing(RoleAssignmentHistoryEntry::getAssignedAt, Comparator.nullsLast(Comparator.naturalOrder()))
-                    .thenComparing(RoleAssignmentHistoryEntry::getRevokedAt, Comparator.nullsFirst(Comparator.naturalOrder()))
+                    .comparing(RoleAssignmentHistoryEntry::getRevokedAt, Comparator.nullsFirst(Comparator.naturalOrder()))
+                    .thenComparing(RoleAssignmentHistoryEntry::getAssignedAt, Comparator.nullsLast(Comparator.naturalOrder()))
                     .reversed());
         };
         return roleAssignmentHistory;

src/main/webapp/permissions-manage-files.xhtml

@@ -226,7 +226,9 @@
                             <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
                         </div>
                         <div id="panelCollapseHistory" class="collapse">
+                            <p:ajax event="toggle" update="historyTableContainer" />
                             <div class="panel-body">
+                              <h:panelGroup id="historyTableContainer">
                                 <p:dataTable id="roleAssignmentHistory" var="historyEntry" value="#{manageFilePermissionsPage.roleAssignmentHistory}">
                                     <p:column headerText="#{bundle['dataverse.permissions.history.assignee']}">
                                         <h:outputText value="#{historyEntry.assigneeIdentifier}" />
@@ -258,6 +260,7 @@
                                         </h:outputText>
                                     </p:column>
                                 </p:dataTable>
+                              </h:panelGroup>
                             </div>
                         </div>
                     </div>

src/main/webapp/permissions-manage.xhtml

@@ -206,8 +206,10 @@
                                 <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
                             </div>
                             <div id="panelCollapseHistory" class="collapse">
+                                <p:ajax event="toggle" update="historyTableContainer" />
                                 <div class="panel-body">
-                                    <p:dataTable id="roleAssignmentHistory" var="historyEntry" value="#{managePermissionsPage.roleAssignmentHistory}">
+                                  <h:panelGroup id="historyTableContainer">
+                                    <p:dataTable id="roleAssignmentHistory" widgetVar="roleAssignmentHistory" var="historyEntry" value="#{managePermissionsPage.roleAssignmentHistory}">
                                         <p:column headerText="#{bundle['dataverse.permissions.history.assignee']}">
                                             <h:outputText value="#{historyEntry.assigneeIdentifier}" />
                                         </p:column>
@@ -231,6 +233,7 @@
                                             </h:outputText>
                                         </p:column>
                                     </p:dataTable>
+                                  </h:panelGroup>
                                 </div>
                             </div>
                         </div>