Final fixes

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

Hide file tree

Showing 9 changed files with 133 additions and 82 deletions.
diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
@@ -37,34 +37,34 @@ jobs:
       - name: Package privacydashboard
         run: mvn clean package -Pproduction -DskipTests
 
-#      - name: Coverage Report
-#        run: mvn jacoco:report
-#
-#      - name: Generate Jacoco Badge
-#        id: jacoco
-#        if: ${{ matrix.java-version == '18.0.x' }}
-#        uses: cicirello/jacoco-badge-generator@v2
-#        with:
-#          jacoco-csv-file: target/site/jacoco/jacoco.csv
-#
-#      - name: Log coverage percentage
-#        if: ${{ matrix.java-version == '18.0.x' }}
-#        run: |
-#          echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
-#
-#      - name: Move the badge to jacoco-aggregate folder
-#        if: ${{ matrix.java-version == '18.0.x' }}
-#        run: |
-#          mv .github/badges/*.svg target/site/jacoco/
-#
-#      - name: Deploy Jacoco code coverage reports to gh-pages
-#        uses: JamesIves/github-pages-deploy-action@v4
-#        if: ${{ matrix.java-version == '18.0.x' }}
-#        with:
-#          clean: true
-#          folder: target/site/jacoco
-#          target-folder: reports
-#          branch: gh-pages
+      - name: Coverage Report
+        run: mvn jacoco:report
+
+      - name: Generate Jacoco Badge
+        id: jacoco
+        if: ${{ matrix.java-version == '18.0.x' }}
+        uses: cicirello/jacoco-badge-generator@v2
+        with:
+          jacoco-csv-file: target/site/jacoco/jacoco.csv
+
+      - name: Log coverage percentage
+        if: ${{ matrix.java-version == '18.0.x' }}
+        run: |
+          echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+
+      - name: Move the badge to jacoco-aggregate folder
+        if: ${{ matrix.java-version == '18.0.x' }}
+        run: |
+          mv .github/badges/*.svg target/site/jacoco/
+
+      - name: Deploy Jacoco code coverage reports to gh-pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        if: ${{ matrix.java-version == '18.0.x' }}
+        with:
+          clean: true
+          folder: target/site/jacoco
+          target-folder: reports
+          branch: gh-pages
 
   # Build files necessary for building Docker Images (Dockerfiles and Contexts)
   build-for-docker:

diff --git a/frontend/generated/vaadin-featureflags.ts b/frontend/generated/vaadin-featureflags.ts
@@ -3,4 +3,8 @@ 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.mapComponent = false;
+window.Vaadin.featureFlags.spreadsheetComponent = false;
+window.Vaadin.featureFlags.hillaPush = false;
+window.Vaadin.featureFlags.newLicenseChecker = false;
+window.Vaadin.featureFlags.collaborationEngineBackend = false;
diff --git a/frontend/generated/vaadin.ts b/frontend/generated/vaadin.ts
@@ -2,5 +2,7 @@ import './vaadin-featureflags.ts';
 
 import './index';
 
+import '@vaadin/flow-frontend/vaadin-dev-tools.js';
+
 import { applyTheme } from './theme';
 applyTheme(document);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -116,12 +116,13 @@
     "@vaadin/vaadin-virtual-list": "23.1.0",
     "@vaadin/vertical-layout": "23.1.0",
     "@vaadin/virtual-list": "23.1.0",
-    "construct-style-sheets-polyfill": "3.0.4",
+    "construct-style-sheets-polyfill": "3.1.0",
     "date-fns": "2.28.0",
     "line-awesome": "1.3.0",
-    "lit": "2.1.4"
+    "lit": "2.2.3"
   },
   "devDependencies": {
+    "async": "3.2.2",
     "chokidar": "^3.5.0",
     "compression-webpack-plugin": "4.0.1",
     "css-loader": "5.2.7",
@@ -378,12 +379,13 @@
       "@vaadin/vaadin-virtual-list": "23.1.0",
       "@vaadin/vertical-layout": "23.1.0",
       "@vaadin/virtual-list": "23.1.0",
-      "construct-style-sheets-polyfill": "3.0.4",
+      "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.28.0",
       "line-awesome": "1.3.0",
-      "lit": "2.1.4"
+      "lit": "2.2.3"
     },
     "devDependencies": {
+      "async": "3.2.2",
       "chokidar": "^3.5.0",
       "compression-webpack-plugin": "4.0.1",
       "css-loader": "5.2.7",
@@ -405,6 +407,6 @@
       "workbox-precaching": "6.5.0",
       "workbox-webpack-plugin": "6.5.0"
     },
-    "hash": "3b16695e3f7bb085e675a9b14b37f92ee4989515e9410b15414cea9d123b8bf4"
+    "hash": "48c21928de86ae4372de126c2e0cac0c63f0f4b73cb82c1c05e740d20b194724"
   }
 }
diff --git a/src/main/java/com/privacydashboard/application/views/MainLayout.java b/src/main/java/com/privacydashboard/application/views/MainLayout.java
@@ -153,7 +153,7 @@ private MenuItemInfo[] createMenuItems() {
 
                 new MenuItemInfo("Rights", "las la-school", ControllerDPORightsView.class),  //ONLY FOR CONTROLLERS AND DPOS
 
-                new MenuItemInfo("AvailableApps", "la la-list", AvailableAppsView.class), //
+                new MenuItemInfo("Available Apps", "la la-list", AvailableAppsView.class), //
 
                 new MenuItemInfo("Apps", "la la-list", AppsView.class), //
 

diff --git a/src/main/java/com/privacydashboard/application/views/apps/AppsView.java b/src/main/java/com/privacydashboard/application/views/apps/AppsView.java
@@ -141,6 +141,11 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
             JsonNode json = new ObjectMapper().readTree(new StringReader(responseString));
             json = json.get("value");
             int size = json.get("containers").size();
+
+            if(size == 0){
+                throw new NullPointerException("Size was 0");
+            }
+
             IoTApp[] appArray = new IoTApp[size];
 
             Iterator<JsonNode> iterator = json.get("containers").elements();
@@ -201,6 +206,9 @@ public AppsView(DataBaseService dataBaseService, AuthenticatedUser authenticated
         }
         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.");
+            exNotice.addClassName("bold");
+            appLayout.add(exNotice);
         }
 
         add(summaryEvaluation, searchText, appLayout, grid);