Merge remote-tracking branch 'origin/main' into #1171

# Conflicts: # src/app/submission/sections/upload/file/section-upload-file.component.html
2021-07-08 17:09:01 +02:00
parent 5fd30e1be9 d55ae48e4a
commit 3b264015cb
47 changed files with 1698 additions and 611 deletions
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -44,7 +44,8 @@ describe('AuthNavMenuComponent', () => {
      authenticated: false,
      loaded: false,
      blocking: false,
-      loading: false
+      loading: false,
+      idle: false
    };
    authState = {
      authenticated: true,
@@ -52,7 +53,8 @@ describe('AuthNavMenuComponent', () => {
      blocking: false,
      loading: false,
      authToken: new AuthTokenInfo('test_token'),
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
    };
  }