Fix filebrowser infinite loading and update deps 20240529 (#2312)

* Fix filebrowser infinite loading and update deps 20240529

* Revert coverage from 7.5.3 to 7.5.2

* Sleep 10 sec before test login

Author: henrikek

ESSArch_Core/frontend/static/frontend/scripts/controllers/FilebrowserController.js

@@ -31,6 +31,8 @@ export default class FilebrowserController {
     vm.$onChanges = function (changes) {
       if (changes.user) {
         $scope.previousGridArrays = [];
+        $scope.initLoad = true;
+        $scope.initExpanded = false;
         $scope.dirPipe($scope.tableState);
       }
       if (changes.ip) {
@@ -77,9 +79,6 @@ export default class FilebrowserController {
         vm.browserstate.path = $scope.previousGridArraysString();
       }
       $scope.gridArrayLoading = true;
-      if ($scope.deckGridData.length == 0) {
-        $scope.initLoad = true;
-      }
       if (!angular.isUndefined(tableState)) {
         $scope.tableState = tableState;
         const paginationParams = listViewService.getPaginationParams(tableState.pagination, $scope.filesPerPage);
@@ -124,12 +123,19 @@ export default class FilebrowserController {
               $scope.ip.state == 'Prepared'
             ) {
               for (let i = 0; i < dir.data.length; i++) {
-                if (dir.data[i].name == 'content') {
+                if (dir.data[i].name == 'content' || dir.data[i].name == 'c') {
                   $scope.expandFile($scope.ip, dir.data[i]);
                   $scope.initExpanded = true;
                   break;
                 }
               }
+              if (!$scope.initExpanded) {
+                $scope.deckGridData = dir.data;
+                tableState.pagination.numberOfPages = dir.numberOfPages; //set the number of pages so the pagination can update
+                $scope.gridArrayLoading = false;
+                $scope.initLoad = false;
+                $scope.openingNewPage = false;
+              }
             } else {
               $scope.deckGridData = dir.data;
               tableState.pagination.numberOfPages = dir.numberOfPages; //set the number of pages so the pagination can update
@@ -149,6 +155,8 @@ export default class FilebrowserController {
     $scope.deckGridInit = function (ip) {
       $scope.previousGridArrays = [];
       if ($scope.tableState) {
+        $scope.initLoad = true;
+        $scope.initExpanded = false;
         $scope.dirPipe($scope.tableState);
         $scope.selectedCards = [];
       }

ESSArch_Core/frontend/tests/test_login.py

@@ -26,9 +26,10 @@ def test_login(self):
         old_url = self.selenium.current_url
         self.selenium.find_element("xpath", '//button[@type="submit"]').click()
         try:
+            sleep(10)
             WebDriverWait(self.selenium, 15).until(EC.title_is('Info | ESSArch'))
         except TimeoutException:
-            sleep(10)
+            sleep(30)
             WebDriverWait(self.selenium, 15).until(EC.title_is('Info | ESSArch'))
         self.assertTrue(EC.url_changes(old_url))
 

requirements/base.txt

@@ -1,5 +1,5 @@
 asgiref==3.7.2
-boto3==1.34.113
+boto3==1.34.114
 celery[tblib]==5.4.0
 cffi==1.16.0
 channels==4.1.0
@@ -8,9 +8,9 @@ chardet==5.1.0
 click==8.1.3
 cryptography==42.0.7
 daphne==4.1.2
-dj-rest-auth[with_social]==5.0.2
+dj-rest-auth[with_social]==6.0.0
 django==5.0.6
-django-allauth==0.57.0
+django-allauth==0.61.1
 django-cors-headers==4.3.1
 django-countries-plus==2.2.0
 django-csp==3.7

requirements/optional.txt

@@ -7,7 +7,7 @@ unoconv==0.9.0
 comtypes==1.4.2 ; platform_system=='Windows'
 wfastcgi==3.0.0
 mod-wsgi==5.0.0
-mssql-django==1.4.2
+mssql-django==1.5
 mysqlclient==2.2.4
 psycopg2==2.9.9
 python-logstash-async==1.6.4