fixed typing bugs

TUM-Dev · Mar 26, 2023 · 6d3d5a2 · 6d3d5a2
1 parent aedafd2
commit 6d3d5a2
Show file tree

Hide file tree

Showing 23 changed files with 454 additions and 416 deletions.
diff --git a/openapi.yaml b/openapi.yaml
@@ -1176,25 +1176,9 @@ components:
       type: object
       properties:
         text:
-          type: object
-          properties:
-            de:
-              type: string
-            en:
-              type: string
-          required:
-            - de
-            - en
+          type: string
         url:
-          type: object
-          properties:
-            de:
-              type: string
-            en:
-              type: string
-          required:
-            - de
-            - en
+          type: string
       required:
         - text
         - url
@@ -1649,17 +1633,19 @@ components:
                     example: 126
                     minimum: 0
                   children:
-                    type: object
-                    properties:
-                      id:
-                        description: The id of the building
-                        type: string
-                      name:
-                        description: Main display name
-                        type: string
-                    required:
-                      - id
-                      - name
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        id:
+                          description: The id of the room
+                          type: string
+                        name:
+                          description: Main display name
+                          type: string
+                      required:
+                        - id
+                        - name
                 required:
                   - children
                   - count
@@ -1727,13 +1713,33 @@ components:
             $ref: '#/components/schemas/ImageInfo'
         ranking_factors:
           $ref: '#/components/schemas/RankingFactors'
+        sources:
+          type: object
+          required:
+            - base
+          description: 'Where we got our data from, should be displayed at the bottom of any page containing this data'
+          properties:
+            base:
+              type: array
+              description: What is the basis of the data we have
+              items:
+                type: object
+                minProperties: 1
+                properties:
+                  name:
+                    type: string
+                    example: NavigaTUM
+                    description: The name of the provider
+                required:
+                  - name
       required:
         - type_common_name
         - name
         - parents
         - parent_names
         - props
         - ranking_factors
+        - sources
     CalendarResponse:
       type: object
       properties:

diff --git a/webclient/README.md b/webclient/README.md
@@ -63,7 +63,7 @@ npm run lint
 ### Update the API's type definitions
 
 ```sh
-npx openapi-typescript openapi.yaml --output webclient/src/codegen/api.ts --export-type --immutable-types 
+npx openapi-typescript openapi.yaml --output webclient/src/api_types/index.ts --export-type --immutable-types --support-array-length
 ```
 
 ## Build files & Serving release build

diff --git a/webclient/src/App.vue b/webclient/src/App.vue
@@ -130,19 +130,20 @@ const global = useGlobalStore();
   </footer>
   <FeedbackModal v-if="global.feedback.open" />
   <!-- General message modal -->
-  <div class="modal" :class="active" v-if="global.information_modal?.body">
+  <div class="modal active" v-if="global.information_modal?.body">
     <div class="modal-overlay" @click="global.information_modal.body = null"></div>
     <div class="modal-container">
       <div class="modal-header">
         <button
           class="btn btn-clear float-right"
           aria-label="Close"
-          @click="global.information_modal.body = null"></button>
+          @click="global.information_modal.body = null"
+        ></button>
         <div v-if="global.information_modal.header" class="modal-title h5">{{ global.information_modal.header }}</div>
       </div>
       <div class="modal-body">
         <div class="content">
-          <p>{{ modal.body }}</p>
+          <p>{{ global.information_modal.body }}</p>
         </div>
       </div>
     </div>