From 911b974360b585294a0937aa9203409762e78adf Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 31 Aug 2022 12:23:05 +0200
Subject: [PATCH] Fix some typescript warnings

---
 .tool-versions                                |  2 +-
 client/package.json                           |  3 +-
 .../src/components/circle/CircleOverview.vue  | 23 +++++---------
 .../src/components/circle/LearningContent.vue |  2 +-
 client/src/services/circle.ts                 |  5 +--
 client/src/services/learningPath.ts           | 20 +++++++-----
 client/src/views/LoginView.vue                | 31 +++++++------------
 client/tsconfig.app.json                      |  1 +
 8 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index a6a8eac6..8c4ec728 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 16.10.0
+nodejs 16.17.0
 python 3.10.5
diff --git a/client/package.json b/client/package.json
index 91a7c6e4..07906114 100644
--- a/client/package.json
+++ b/client/package.json
@@ -7,7 +7,7 @@
     "build:tailwind": "tailwindcss -i tailwind.css -o ../server/vbv_lernwelt/static/css/tailwind.css --minify",
     "test": "vitest run",
     "coverage": "vitest run --coverage",
-    "typecheck": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
+    "typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "tailwind": "tailwindcss -i tailwind.css -o ../server/vbv_lernwelt/static/css/tailwind.css --watch"
   },
@@ -30,6 +30,7 @@
     "@testing-library/vue": "^6.6.1",
     "@types/d3": "^7.4.0",
     "@types/jsdom": "^20.0.0",
+    "@types/lodash": "^4.14.184",
     "@types/node": "^18.7.14",
     "@vitejs/plugin-vue": "^3.0.3",
     "@vue/eslint-config-prettier": "^7.0.0",
diff --git a/client/src/components/circle/CircleOverview.vue b/client/src/components/circle/CircleOverview.vue
index 59776904..ce95474a 100644
--- a/client/src/components/circle/CircleOverview.vue
+++ b/client/src/components/circle/CircleOverview.vue
@@ -1,27 +1,23 @@
 <script setup lang="ts">
-import {Circle} from '@/services/circle';
+import { Circle } from '@/services/circle'
 import ItFullScreenModal from '@/components/ui/ItFullScreenModal.vue'
 
 const props = defineProps<{
-  circle: Circle,
+  circle: Circle
   show: boolean
 }>()
 
-const emits = defineEmits(['closemodal'])
-
+// const emits = defineEmits(['closemodal'])
 </script>
 
 <template>
-  <ItFullScreenModal
-    :show="show"
-    @closemodal="$emit('closemodal')"
-  >
+  <ItFullScreenModal :show="show" @closemodal="$emit('closemodal')">
     <h1 class="">Überblick: Circle "{{ circle.title }}"</h1>
 
     <p class="mt-8 text-xl">Hier zeigen wir dir, was du in diesem Circle lernen wirst.</p>
 
     <div class="mt-8 p-4 border border-gray-500">
-      <h3>Du wirst in der Lage sein, ... </h3>
+      <h3>Du wirst in der Lage sein, ...</h3>
 
       <ul class="mt-4">
         <li class="text-xl flex items-center" v-for="goal in circle.goals" :key="goal.id">
@@ -31,9 +27,7 @@ const emits = defineEmits(['closemodal'])
       </ul>
     </div>
 
-    <h3 class="mt-16">
-      Du wirst dein neu erworbenes Wissen auf folgenden berufstypischen Situation anwenden können:
-    </h3>
+    <h3 class="mt-16">Du wirst dein neu erworbenes Wissen auf folgenden berufstypischen Situation anwenden können:</h3>
 
     <ul class="grid grid-cols-1 lg:grid-cols-3 auto-rows-fr gap-6 mt-8">
       <li
@@ -41,11 +35,10 @@ const emits = defineEmits(['closemodal'])
         :key="jobSituation.id"
         class="job-situation border border-gray-500 p-4 text-xl flex items-center"
       >
-        {{jobSituation.value}}
+        {{ jobSituation.value }}
       </li>
     </ul>
   </ItFullScreenModal>
 </template>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/client/src/components/circle/LearningContent.vue b/client/src/components/circle/LearningContent.vue
index 44e6ca56..6644ba26 100644
--- a/client/src/components/circle/LearningContent.vue
+++ b/client/src/components/circle/LearningContent.vue
@@ -37,7 +37,7 @@ const block = computed(() => {
         <span class="hidden lg:inline">zurück zum Circle</span>
       </button>
 
-      <h1 class="text-xl hidden lg:block">{{ learningContent.title }}</h1>
+      <h1 class="text-xl hidden lg:block">{{ learningContent?.title }}</h1>
 
       <button
         type="button"
diff --git a/client/src/services/circle.ts b/client/src/services/circle.ts
index eb6dba57..87c0e7c4 100644
--- a/client/src/services/circle.ts
+++ b/client/src/services/circle.ts
@@ -6,6 +6,7 @@ import type {
   LearningContent,
   LearningSequence,
   LearningUnit,
+  LearningUnitQuestion,
   LearningWagtailPage,
 } from '@/types'
 import type { LearningPath } from '@/services/learningPath'
@@ -146,8 +147,8 @@ export class Circle implements LearningWagtailPage {
     )
   }
 
-  public get flatChildren(): CircleChild[] {
-    const result: CircleChild[] = [];
+  public get flatChildren(): (LearningContent | LearningUnitQuestion)[] {
+    const result: (LearningContent | LearningUnitQuestion)[] = [];
     this.learningSequences.forEach((learningSequence) => {
       learningSequence.learningUnits.forEach((learningUnit) => {
         learningUnit.children.forEach((learningUnitQuestion) => {
diff --git a/client/src/services/learningPath.ts b/client/src/services/learningPath.ts
index 0b7d2439..c3b38fa4 100644
--- a/client/src/services/learningPath.ts
+++ b/client/src/services/learningPath.ts
@@ -59,29 +59,33 @@ export class LearningPath implements LearningWagtailPage {
       this.topics.push(topic)
     }
 
-    this.calcNextLearningContent(completionData);
+    this.calcNextLearningContent(completionData)
   }
 
   public calcNextLearningContent(completionData: CircleCompletion[]): void {
-    this.nextLearningContent = undefined;
+    this.nextLearningContent = undefined
 
-    const lastCompletedLearningContent = getLastCompleted(this.translation_key, completionData);
+    const lastCompletedLearningContent = getLastCompleted(this.translation_key, completionData)
 
     if (lastCompletedLearningContent) {
-      const lastCircle = this.circles.find(circle => circle.translation_key === lastCompletedLearningContent.circle_key);
+      const lastCircle = this.circles.find(
+        (circle) => circle.translation_key === lastCompletedLearningContent.circle_key
+      )
       if (lastCircle) {
-        const lastLearningContent = lastCircle.flatLearningContents.find(learningContent => learningContent.translation_key === lastCompletedLearningContent.page_key);
+        const lastLearningContent = lastCircle.flatLearningContents.find(
+          (learningContent) => learningContent.translation_key === lastCompletedLearningContent.page_key
+        )
         if (lastLearningContent && lastLearningContent.nextLearningContent) {
-          this.nextLearningContent = lastLearningContent.nextLearningContent;
+          this.nextLearningContent = lastLearningContent.nextLearningContent
         } else {
           if (lastCircle.nextCircle) {
-            this.nextLearningContent = lastCircle.nextCircle.flatLearningContents[0];
+            this.nextLearningContent = lastCircle.nextCircle.flatLearningContents[0]
           }
         }
       }
     } else {
       if (this.circles[0]) {
-        this.nextLearningContent = this.circles[0].flatLearningContents[0];
+        this.nextLearningContent = this.circles[0].flatLearningContents[0]
       }
     }
   }
diff --git a/client/src/views/LoginView.vue b/client/src/views/LoginView.vue
index b3695464..9c7c4c40 100644
--- a/client/src/views/LoginView.vue
+++ b/client/src/views/LoginView.vue
@@ -1,30 +1,27 @@
 <script setup lang="ts">
-import * as log from 'loglevel';
-import {reactive} from 'vue';
-import {useUserStore} from '@/stores/user';
-import {useRoute} from 'vue-router';
+import * as log from 'loglevel'
+import { reactive } from 'vue'
+import { useUserStore } from '@/stores/user'
+import { useRoute } from 'vue-router'
 
 const route = useRoute()
 
-log.debug('LoginView.vue created');
-log.debug(route.query);
+log.debug('LoginView.vue created')
+log.debug(route.query)
 
 const state = reactive({
   username: '',
   password: '',
-});
-
-const userStore = useUserStore();
+})
 
+const userStore = useUserStore()
 </script>
 
 <template>
   <main class="px-8 py-8">
     <h1>Login</h1>
 
-    <form
-      @submit.prevent="userStore.handleLogin(state.username, state.password, route.query.next)"
-    >
+    <form @submit.prevent="userStore.handleLogin(state.username, state.password, route.query.next)">
       <div class="mt-8 mb-4">
         <label class="block mb-1" for="email">Username</label>
         <input
@@ -47,17 +44,11 @@ const userStore = useUserStore();
       </div>
 
       <div>
-        <input
-          data-cy="login-button"
-          type="submit"
-          value="Login"
-          class="btn-primary"
-        />
+        <input data-cy="login-button" type="submit" value="Login" class="btn-primary" />
       </div>
     </form>
     <p class="pt-8"><a href="/sso/login/">Login mit SSO</a></p>
   </main>
 </template>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json
index 98e2e534..bea740ec 100644
--- a/client/tsconfig.app.json
+++ b/client/tsconfig.app.json
@@ -5,6 +5,7 @@
   "compilerOptions": {
     "composite": true,
     "strict": true,
+    "allowJs": true,
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]