Final test fixes

sifis-home · Oct 6, 2023 · 3a6e2e3 · 3a6e2e3
1 parent 693cf58
commit 3a6e2e3
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 113 deletions.
diff --git a/frontend/generated/vaadin-featureflags.ts b/frontend/generated/vaadin-featureflags.ts
@@ -3,8 +3,4 @@ window.Vaadin = window.Vaadin || {};
 window.Vaadin.featureFlags = window.Vaadin.featureFlags || {};
 window.Vaadin.featureFlags.exampleFeatureFlag = false;
 window.Vaadin.featureFlags.viteForFrontendBuild = false;
-window.Vaadin.featureFlags.mapComponent = false;
-window.Vaadin.featureFlags.spreadsheetComponent = false;
-window.Vaadin.featureFlags.hillaPush = false;
-window.Vaadin.featureFlags.newLicenseChecker = false;
-window.Vaadin.featureFlags.collaborationEngineBackend = false;
+window.Vaadin.featureFlags.mapComponent = false;
diff --git a/package.json b/package.json
@@ -116,10 +116,10 @@
     "@vaadin/vaadin-virtual-list": "23.1.0",
     "@vaadin/vertical-layout": "23.1.0",
     "@vaadin/virtual-list": "23.1.0",
-    "construct-style-sheets-polyfill": "3.1.0",
+    "construct-style-sheets-polyfill": "3.0.4",
     "date-fns": "2.28.0",
     "line-awesome": "1.3.0",
-    "lit": "2.2.3"
+    "lit": "2.1.4"
   },
   "devDependencies": {
     "async": "3.2.2",
@@ -379,10 +379,10 @@
       "@vaadin/vaadin-virtual-list": "23.1.0",
       "@vaadin/vertical-layout": "23.1.0",
       "@vaadin/virtual-list": "23.1.0",
-      "construct-style-sheets-polyfill": "3.1.0",
+      "construct-style-sheets-polyfill": "3.0.4",
       "date-fns": "2.28.0",
       "line-awesome": "1.3.0",
-      "lit": "2.2.3"
+      "lit": "2.1.4"
     },
     "devDependencies": {
       "async": "3.2.2",

diff --git a/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java b/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java
@@ -369,7 +369,13 @@ public AvailableAppsView(DataBaseService dataBaseService, AuthenticatedUser auth
         }
         catch(Exception e){
             System.out.println("Exception: "+e);
-            Span exNotice = e.getMessage().equals("Size was 0") ? new Span("You do not have any apps.") : new Span("We could not retrieve your apps.");
+            Span exNotice = new Span();
+            if(e.getMessage() == "Size was 0"){
+                exNotice.add("There are no available apps.");
+            }
+            else{
+                exNotice.add("We could not retrieve the available apps.");
+            }
             exNotice.addClassName("bold");
             appLayout.add(exNotice);
         }

diff --git a/src/main/java/com/privacydashboard/application/views/home/HomeView.java b/src/main/java/com/privacydashboard/application/views/home/HomeView.java
@@ -59,7 +59,7 @@ private void initializeLayout(){
     private void createSections(){
         createSingleSection(0, "Contacts", "contacts", "la-address-book");
         createSingleSection(1, "Messages", "messages", "la-comments");
-        createSingleSection(3, "Available Apps", "available_apps-view", "la-list");
+        createSingleSection(3, "Available Apps", "available-apps-view", "la-list");
         createSingleSection(4, "Apps", "apps-view", "la-list");
         createSingleSection(5, "Privacy Notice", "privacyNotice", "la-file");
         if(authenticatedUser.getUser().getRole().equals(Role.CONTROLLER) || authenticatedUser.getUser().getRole().equals(Role.DPO)){