From d53c5dace7640020f6e2dc98a10297d47b4dac64 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 01:56:41 +0200
Subject: [PATCH 1/9] made sure that `https://nav.tum.de/` does not need
 `/api/get/root`

---
 webclient/pages/index.vue | 97 +++++++++++++++++++++++++++++++++++----
 1 file changed, 87 insertions(+), 10 deletions(-)

diff --git a/webclient/pages/index.vue b/webclient/pages/index.vue
index 037ab8f52..568e59a9f 100644
--- a/webclient/pages/index.vue
+++ b/webclient/pages/index.vue
@@ -1,14 +1,87 @@
 <script setup lang="ts">
-import type { components } from "~/api_types";
 import { MapPinIcon } from "@heroicons/vue/24/outline";
 import { ArrowRightIcon, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
+import type { components } from "~/api_types";
 
-type RootResponse = components["schemas"]["RootResponse"];
+/**
+ * @description This is a list of all sites, that are available in the system.
+ * It is sorted by the number of rooms in the site, descending.
+ * The first entry is the site with the most importance
+ */
+type SitesOverview = readonly (components["schemas"]["ChildEntry"] & {
+  /**
+   * Format: int64
+   * @description A recommendation how many of the entries should be displayed by default.
+   * The number is usually from 0-5.
+   * More results might be displayed when clicking "expand".
+   * If this field is not present, then all entries are displayed.
+   *
+   * @example 6
+   */
+  readonly n_visible: number;
+  /**
+   * @description A select list of buildings, that are in this site.
+   * Derived from the areatree.
+   */
+  readonly children: readonly components["schemas"]["ChildEntry"][];
+})[];
 
-const { t, locale } = useI18n({ useScope: "local" });
-const runtimeConfig = useRuntimeConfig();
-const url = computed<string>(() => `${runtimeConfig.public.apiURL}/api/get/root?lang=${locale.value}`);
-const { data, pending } = await useFetch<RootResponse>(url, { pick: ["sites_overview"] });
+const { t } = useI18n({ useScope: "local" });
+const sites_overview: SitesOverview = [
+  {
+    children: [
+      { id: "mi", name: "Mathematik / Informatik" },
+      { id: "mw", name: "Maschinenwesen" },
+      { id: "physik", name: "Physik" },
+      { id: "chemie", name: "Chemie" },
+      { id: "garching-interims", name: "Interimshörsäle" },
+      { id: "5532", name: "StudiTUM Garching" },
+    ],
+    id: "garching",
+    n_visible: 4,
+    name: "Garching Forschungszentrum",
+  },
+  {
+    children: [
+      { id: "zentralgelaende", name: "Zentralgelände" },
+      { id: "nordgelaende", name: "Nordgelände" },
+      { id: "suedgelaende", name: "Südgelände" },
+      { id: "suedwestgelaende", name: "Südwestgelände" },
+      { id: "0201", name: "StudiTUM Innenstadt" },
+      { id: "2910", name: "RiWa 1 (HfP, Governance)" },
+    ],
+    id: "stammgelaende",
+    n_visible: 3,
+    name: "Stammgelände",
+  },
+  {
+    children: [
+      { id: "wzw-berg", name: "Gebiet 4100 Berg" },
+      { id: "wzw-mitte", name: "Gebiet 4200 Mitte" },
+      { id: "wzw-nord", name: "Gebiet 4300 Nord" },
+      { id: "duernast", name: "Dürnast (Versuchsstation)" },
+      { id: "roggenstein", name: "Roggenstein (Versuchsstation)" },
+      { id: "thalhausen", name: "Thalhausen (Versuchsstation)" },
+      { id: "veitshof", name: "Veitshof (Stallungen)" },
+      { id: "viehhausen", name: "Viehhausen (Versuchsstation)" },
+    ],
+    id: "wzw",
+    n_visible: 3,
+    name: "Weihenstephan (Freising)",
+  },
+  {
+    children: [
+      { id: "mri", name: "MRI Klinikum rechts der Isar" },
+      { id: "olympiapark", name: "Campus im Olympiapark" },
+      { id: "cs", name: "Campus Straubing" },
+      { id: "garching-hochbrueck", name: "Garching Hochbrück" },
+      { id: "taufkirchen-ottobrunn", name: "Taufkirchen / Ottobrunn" },
+    ],
+    id: "others",
+    n_visible: 5,
+    name: t("sites_overview.others"),
+  },
+];
 
 const title = computed(() => t("sites") + " - NavigaTUM");
 useSeoMeta({
@@ -24,7 +97,7 @@ const openPanels = ref<(boolean | undefined)[]>([]);
 </script>
 
 <template>
-  <div v-if="pending" class="text-zinc-900 flex flex-col items-center gap-5 py-32">
+  <div class="text-zinc-900 flex flex-col items-center gap-5 py-32">
     <Spinner class="h-8 w-8" />
     {{ t("Loading data...") }}
   </div>
@@ -32,16 +105,16 @@ const openPanels = ref<(boolean | undefined)[]>([]);
     <h1 class="text-zinc-600 !text-lg font-semibold">{{ t("sites") }}</h1>
     <!-- <NuxtLink to="#" class="flex flex-row"><MapPinIcon class="h-4 w-4" /> {{ t("overview_map") }}</NuxtLink> -->
   </div>
-  <div v-if="data" class="mt-5">
+  <div class="mt-5">
     <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
       <div
-        v-for="(site, siteIndex) in data.sites_overview"
+        v-for="(site, siteIndex) in sites_overview"
         :key="site.id"
         class="border-zinc-200 flex flex-col gap-4 rounded-lg border-2 p-5"
       >
         <div>
           <NuxtLink
-            v-if="site.id"
+            v-if="site.id !== 'others'"
             :to="'/view/' + site.id"
             :aria-label="t('show_details_for_campus', [site.name])"
             class="focusable text-zinc-700 flex grow-0 flex-row justify-between rounded !no-underline hover:text-blue-500"
@@ -98,6 +171,8 @@ de:
   show_details_for_campus: show the details for the campus '{0}'
   show_details_for_building: show the details for the building '{0}'
   description: Finde Räume, Gebäude und andere Orte an der TUM mit Exzellenz. Eine moderne Alternative zum RoomFinder, entwickelt von Studierenden.
+  sites_overview:
+    others: Sonstige
 en:
   less: less
   less_aria: show more buildings
@@ -109,4 +184,6 @@ en:
   show_details_for_campus: show the details for the campus '{0}'
   show_details_for_building: show the details for the building '{0}'
   description: Find rooms, buildings and other places at TUM with excellence. A modern alternative to RoomFinder, developed by students.
+  sites_overview:
+    others: Others
 </i18n>

From a028564f47652df8a7566177580d84e76ba10728 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 01:57:32 +0200
Subject: [PATCH 2/9] removed the root response from the details api

---
 openapi.yaml                 | 285 +++++++++++++----------------------
 webclient/api_types/index.ts |  97 ++++--------
 2 files changed, 134 insertions(+), 248 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 77823f08f..1de8e0056 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -305,9 +305,6 @@ paths:
             '5304':
               summary: A normal building
               value: '5304'
-            root:
-              summary: The root entry of the NavigaTUM-data
-              value: root
             garching:
               summary: The garching campus
               value: garching
@@ -338,20 +335,7 @@ paths:
           content:
             application/json:
               schema:
-                discriminator:
-                  propertyName: type
-                  mapping:
-                    root: RootResponse
-                    room: DetailsResponse
-                    building: DetailsResponse
-                    joined_building: DetailsResponse
-                    area: DetailsResponse
-                    site: DetailsResponse
-                    campus: DetailsResponse
-                    poi: DetailsResponse
-                oneOf:
-                  - $ref: '#/components/schemas/RootResponse'
-                  - $ref: '#/components/schemas/DetailsResponse'
+                $ref: '#/components/schemas/DetailsResponse'
               examples:
                 mi-hs-1:
                   value:
@@ -867,9 +851,6 @@ paths:
             '5304':
               summary: A normal building
               value: '5304'
-            root:
-              summary: The root entry of the NavigaTUM-data
-              value: root
             garching:
               summary: The garching campus
               value: garching
@@ -1818,53 +1799,111 @@ components:
         - sections
         - time_ms
     DetailsResponse:
-      allOf:
-        - $ref: '#/components/schemas/BaseDetailsResponse'
-        - type: object
+      type: object
+      properties:
+        id:
+          description: 'The id, that was requested'
+          type: string
+        type:
+          description: The type of the entry
+          type: string
+          enum:
+            - room
+            - building
+            - joined_building
+            - area
+            - site
+            - campus
+            - poi
+        type_common_name:
+          description: The type of the entry in a human-readable form
+          type: string
+        name:
+          description: The name of the entry in a human-readable form
+          type: string
+          example: '5602.EG.001 (MI HS 1, Friedrich L. Bauer Hörsaal)'
+        aliases:
+          description: |
+            A list of alternative ids for this entry.  
+            
+            Not to be confused with
+            - `id` which is the unique identifier or
+            - `visual-id` which is an alternative identifier for the entry (only displayed in the URL).
+          type: array
+          items:
+            type: string
+            example: 26503@5406
+        parents:
+          type: array
+          items:
+            type: string
+            description: The ids of the parents. They are ordered as they would appear in a Breadcrumb menu. See parent_names for their actual ids.
+          examples:
+            - root
+            - garching
+        parent_names:
+          type: array
+          items:
+            type: string
+            description: The ids of the parents. They are ordered as they would appear in a Breadcrumb menu. See parents for their actual ids.
+          examples:
+            - Standorte
+            - Garching Forschungszentrum
+          minItems: 1
+          uniqueItems: true
+        props:
+          $ref: '#/components/schemas/Props'
+        imgs:
+          type: array
+          items:
+            $ref: '#/components/schemas/ImageInfo'
+        ranking_factors:
+          $ref: '#/components/schemas/RankingFactors'
+        sources:
+          $ref: '#/components/schemas/DataSources'
+        redirect_url:
+          description: |
+            The url, this item should be displayed at.
+            Present on both redirects and normal entries, to allow for the common /view/:id path
+          type: string
+          example: /room/5602.EG.001
+        coords:
+          $ref: '#/components/schemas/Coordinate'
+        maps:
+          $ref: '#/components/schemas/Maps'
+        sections:
+          type: object
           properties:
-            id:
-              description: 'The id, that was requested'
-              type: string
-            type:
-              description: The type of the entry
-              type: string
-              enum:
-                - room
-                - building
-                - joined_building
-                - area
-                - site
-                - campus
-                - poi
-            coords:
-              $ref: '#/components/schemas/Coordinate'
-            maps:
-              $ref: '#/components/schemas/Maps'
-            sections:
-              type: object
-              properties:
-                buildings_overview:
-                  $ref: '#/components/schemas/BuildingsOverview'
-                rooms_overview:
-                  $ref: '#/components/schemas/RoomsOverview'
-                featured_overview:
-                  $ref: '#/components/schemas/FeaturedOverview'
-            poi:
-              type: object
-              properties:
-                mvg:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/Station'
-                  minItems: 1
-                  uniqueItems: true
-              required:
-                - mvg
+            buildings_overview:
+              $ref: '#/components/schemas/BuildingsOverview'
+            rooms_overview:
+              $ref: '#/components/schemas/RoomsOverview'
+            featured_overview:
+              $ref: '#/components/schemas/FeaturedOverview'
+        poi:
+          type: object
+          properties:
+            mvg:
+              type: array
+              items:
+                $ref: '#/components/schemas/Station'
+              minItems: 1
+              uniqueItems: true
           required:
-            - id
-            - type
-            - coords
-            - maps
+            - mvg
+      required:
+        - id
+        - type
+        - coords
+        - maps
+        - type_common_name
+        - name
+        - parents
+        - parent_names
+        - props
+        - ranking_factors
+        - sources
+        - redirect_url
     BuildingsOverview:
       type: object
       properties:
@@ -1960,122 +1999,6 @@ components:
       required:
         - id
         - name
-    SitesOverview:
-      description: |
-        This is a list of all sites, that are available in the system.
-        It is sorted by the number of rooms in the site, descending.
-        The first entry is the site with the most importance
-      type: array
-      items:
-        allOf:
-          - $ref: '#/components/schemas/ChildEntry'
-          - type: object
-            properties:
-              n_visible:
-                description: |
-                  A recommendation how many of the entries should be displayed by default.  
-                  The number is usually from 0-5.  
-                  More results might be displayed when clicking "expand".  
-                  If this field is not present, then all entries are displayed.
-                type: integer
-                format: int64
-                example: 6
-                minimum: 0
-              children:
-                description: |
-                  A select list of buildings, that are in this site.
-                  Derived from the areatree.
-                type: array
-                items:
-                  $ref: '#/components/schemas/ChildEntry'
-            required:
-              - n_visible
-              - children
-    RootResponse:
-      allOf:
-        - $ref: '#/components/schemas/BaseDetailsResponse'
-        - type: object
-          properties:
-            id:
-              description: 'The id, that was requested'
-              type: string
-              enum:
-                - root
-            type:
-              description: The type of the entry
-              type: string
-              enum:
-                - root
-            sites_overview:
-              $ref: '#/components/schemas/SitesOverview'
-          required:
-            - id
-            - type
-            - sites_overview
-    BaseDetailsResponse:
-      type: object
-      properties:
-        type_common_name:
-          description: The type of the entry in a human-readable form
-          type: string
-        name:
-          description: The name of the entry in a human-readable form
-          type: string
-          example: '5602.EG.001 (MI HS 1, Friedrich L. Bauer Hörsaal)'
-        aliases:
-          description: |
-            A list of alternative ids for this entry.  
-
-            Not to be confused with
-            - `id` which is the unique identifier or
-            - `visual-id` which is an alternative identifier for the entry (only displayed in the URL).
-          type: array
-          items:
-            type: string
-            example: 26503@5406
-        parents:
-          type: array
-          items:
-            type: string
-            description: The ids of the parents. They are ordered as they would appear in a Breadcrumb menu. See parent_names for their actual ids.
-          examples:
-            - root
-            - garching
-        parent_names:
-          type: array
-          items:
-            type: string
-            description: The ids of the parents. They are ordered as they would appear in a Breadcrumb menu. See parents for their actual ids.
-          examples:
-            - Standorte
-            - Garching Forschungszentrum
-          minItems: 1
-          uniqueItems: true
-        props:
-          $ref: '#/components/schemas/Props'
-        imgs:
-          type: array
-          items:
-            $ref: '#/components/schemas/ImageInfo'
-        ranking_factors:
-          $ref: '#/components/schemas/RankingFactors'
-        sources:
-          $ref: '#/components/schemas/DataSources'
-        redirect_url:
-          description: |
-            The url, this item should be displayed at.
-            Present on both redirects and normal entries, to allow for the common /view/:id path
-          type: string
-          example: /room/5602.EG.001
-      required:
-        - type_common_name
-        - name
-        - parents
-        - parent_names
-        - props
-        - ranking_factors
-        - sources
-        - redirect_url
     CalendarResponse:
       type: object
       properties:
diff --git a/webclient/api_types/index.ts b/webclient/api_types/index.ts
index 3af738f68..ed7a2f3c5 100644
--- a/webclient/api_types/index.ts
+++ b/webclient/api_types/index.ts
@@ -495,7 +495,7 @@ export type components = {
        */
       readonly time_ms: number;
     };
-    readonly DetailsResponse: components["schemas"]["BaseDetailsResponse"] & {
+    readonly DetailsResponse: {
       /** @description The id, that was requested */
       readonly id: string;
       /**
@@ -503,6 +503,34 @@ export type components = {
        * @enum {string}
        */
       readonly type: "room" | "building" | "joined_building" | "area" | "site" | "campus" | "poi";
+      /** @description The type of the entry in a human-readable form */
+      readonly type_common_name: string;
+      /**
+       * @description The name of the entry in a human-readable form
+       * @example 5602.EG.001 (MI HS 1, Friedrich L. Bauer Hörsaal)
+       */
+      readonly name: string;
+      /**
+       * @description A list of alternative ids for this entry.
+       *
+       * Not to be confused with
+       * - `id` which is the unique identifier or
+       * - `visual-id` which is an alternative identifier for the entry (only displayed in the URL).
+       */
+      readonly aliases?: readonly string[];
+      readonly parents: readonly string[];
+      readonly parent_names: readonly [string, ...string[]];
+      readonly props: components["schemas"]["Props"];
+      readonly imgs?: readonly components["schemas"]["ImageInfo"][];
+      readonly ranking_factors: components["schemas"]["RankingFactors"];
+      readonly sources: components["schemas"]["DataSources"];
+      /**
+       * @description The url, this item should be displayed at.
+       * Present on both redirects and normal entries, to allow for the common /view/:id path
+       *
+       * @example /room/5602.EG.001
+       */
+      readonly redirect_url: string;
       readonly coords: components["schemas"]["Coordinate"];
       readonly maps: components["schemas"]["Maps"];
       readonly sections?: {
@@ -579,71 +607,6 @@ export type components = {
        */
       readonly name: string;
     };
-    /**
-     * @description This is a list of all sites, that are available in the system.
-     * It is sorted by the number of rooms in the site, descending.
-     * The first entry is the site with the most importance
-     */
-    readonly SitesOverview: readonly (components["schemas"]["ChildEntry"] & {
-      /**
-       * Format: int64
-       * @description A recommendation how many of the entries should be displayed by default.
-       * The number is usually from 0-5.
-       * More results might be displayed when clicking "expand".
-       * If this field is not present, then all entries are displayed.
-       *
-       * @example 6
-       */
-      readonly n_visible: number;
-      /**
-       * @description A select list of buildings, that are in this site.
-       * Derived from the areatree.
-       */
-      readonly children: readonly components["schemas"]["ChildEntry"][];
-    })[];
-    readonly RootResponse: components["schemas"]["BaseDetailsResponse"] & {
-      /**
-       * @description The id, that was requested
-       * @enum {string}
-       */
-      readonly id: "root";
-      /**
-       * @description The type of the entry
-       * @enum {string}
-       */
-      readonly type: "root";
-      readonly sites_overview: components["schemas"]["SitesOverview"];
-    };
-    readonly BaseDetailsResponse: {
-      /** @description The type of the entry in a human-readable form */
-      readonly type_common_name: string;
-      /**
-       * @description The name of the entry in a human-readable form
-       * @example 5602.EG.001 (MI HS 1, Friedrich L. Bauer Hörsaal)
-       */
-      readonly name: string;
-      /**
-       * @description A list of alternative ids for this entry.
-       *
-       * Not to be confused with
-       * - `id` which is the unique identifier or
-       * - `visual-id` which is an alternative identifier for the entry (only displayed in the URL).
-       */
-      readonly aliases?: readonly string[];
-      readonly parents: readonly string[];
-      readonly parent_names: readonly [string, ...string[]];
-      readonly props: components["schemas"]["Props"];
-      readonly imgs?: readonly components["schemas"]["ImageInfo"][];
-      readonly ranking_factors: components["schemas"]["RankingFactors"];
-      readonly sources: components["schemas"]["DataSources"];
-      /**
-       * @description The url, this item should be displayed at.
-       * Present on both redirects and normal entries, to allow for the common /view/:id path
-       *
-       * @example /room/5602.EG.001
-       */
-      readonly redirect_url: string;
-    };
     readonly CalendarResponse: {
       /** @description The entries of the requested */
       readonly events: readonly components["schemas"]["CalendarEntry"][];
@@ -958,7 +921,7 @@ export type operations = {
       /** @description More data about the requested building/room */
       200: {
         content: {
-          readonly "application/json": components["schemas"]["RootResponse"] | components["schemas"]["DetailsResponse"];
+          readonly "application/json": components["schemas"]["DetailsResponse"];
         };
       };
       /** @description Invalid input */

From 90187f40a6c3d713d1708b65af061bcdd258fe6d Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 02:06:39 +0200
Subject: [PATCH 3/9] removed the root-handling from the api

---
 data/compile.py                | 4 ++++
 data/processors/export.py      | 9 ++-------
 data/processors/sitemap.py     | 5 -----
 server/main-api/src/details.rs | 3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/data/compile.py b/data/compile.py
index 8fa41def3..0b9ce7090 100644
--- a/data/compile.py
+++ b/data/compile.py
@@ -120,6 +120,10 @@ def main() -> None:
     search.add_ranking_combined(data)
 
     logging.info("-- 100 Export and generate Sitemap")
+    # the root entry is somewhat arbitrary
+    # leaving it here and thus having it delivered by the other apis leads to bad ergonomics
+    # => we construct the frontpage "manually" with the most popular buildings
+    data.pop("root")
     export.export_for_search(data, "output/search_data.json")
     export.export_for_api(data, "output/api_data.json")
     sitemap.generate_sitemap()  # only for deployments
diff --git a/data/processors/export.py b/data/processors/export.py
index 76cdd79c6..25f7fbde9 100644
--- a/data/processors/export.py
+++ b/data/processors/export.py
@@ -42,10 +42,6 @@ def export_for_search(data: dict, path: str) -> None:
     """Export a subset of the data for the /search api"""
     export = []
     for _id, entry in data.items():
-        # Currently, the "root" entry is excluded from search
-        if _id == "root":
-            continue
-
         building_parents_index = len(entry["parents"])
         if entry["type"] in {"room", "virtual_room"}:
             for i, parent in enumerate(entry["parents"]):
@@ -55,7 +51,7 @@ def export_for_search(data: dict, path: str) -> None:
 
         # The 'campus name' is the campus of site of this building or room
         campus_name = None
-        if entry["type"] not in {"root", "campus", "site"}:
+        if entry["type"] not in {"campus", "site"}:
             for parent in entry["parents"]:
                 if data[parent]["type"] in {"campus", "site"}:
                     campus = data[parent]
@@ -124,8 +120,7 @@ def export_for_api(data: dict, path: str) -> None:
     """Add some more information about parents to the data and export for the /get/:id api"""
     export_data = []
     for _id, entry in data.items():
-        if entry["type"] != "root":
-            entry.setdefault("maps", {})["default"] = "interactive"
+        entry.setdefault("maps", {})["default"] = "interactive"
 
         entry["aliases"] = []
         if arch_name := extract_arch_name(entry):
diff --git a/data/processors/sitemap.py b/data/processors/sitemap.py
index dcd49049f..883491ae2 100644
--- a/data/processors/sitemap.py
+++ b/data/processors/sitemap.py
@@ -83,8 +83,6 @@ def _extract_sitemap_data(new_data: list, old_data: list, old_sitemaps: Simplifi
     # so it's unlikely that we'll hit this limit without adding a lot of
     # data. But for the case that a new type of entry is introduced, the
     # sitemap is split into one for rooms and one for the rest.
-    # Note that the root element is not included, because it just redirects
-    # to the main page.
     sitemaps: Sitemaps = {
         "room": [],
         "other": [],
@@ -93,9 +91,6 @@ def _extract_sitemap_data(new_data: list, old_data: list, old_sitemaps: Simplifi
     new_data_dict = {entry["id"]: entry for entry in new_data}
     changed_count = 0
     for _id, entry in new_data_dict.items():
-        if entry["type"] == "root":
-            continue
-
         sitemap_name: Literal["room"] | Literal["other"] = entry["type"] if entry["type"] in sitemaps else "other"
 
         # Just copied from the webclient.
diff --git a/server/main-api/src/details.rs b/server/main-api/src/details.rs
index 7168f0c0c..f041140e6 100644
--- a/server/main-api/src/details.rs
+++ b/server/main-api/src/details.rs
@@ -1,4 +1,4 @@
-use actix_web::{get, web, HttpResponse};
+use actix_web::{get, HttpResponse, web};
 use log::error;
 use sqlx::PgPool;
 
@@ -85,7 +85,6 @@ async fn get_alias_and_redirect(conn: &PgPool, query: &str) -> Option<(String, S
 
 fn extract_redirect_exact_match(type_: &str, key: &str) -> String {
     match type_ {
-        "root" => String::new(),
         "campus" => format!("/campus/{key}"),
         "site" | "area" => format!("/site/{key}"),
         "building" | "joined_building" => format!("/building/{key}"),

From cec8ec5e50649b3ef977ea39beddd477c8ddfcc8 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 02:25:30 +0200
Subject: [PATCH 4/9] removed more stale parts

---
 webclient/pages/index.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/webclient/pages/index.vue b/webclient/pages/index.vue
index 568e59a9f..7ed437958 100644
--- a/webclient/pages/index.vue
+++ b/webclient/pages/index.vue
@@ -97,10 +97,6 @@ const openPanels = ref<(boolean | undefined)[]>([]);
 </script>
 
 <template>
-  <div class="text-zinc-900 flex flex-col items-center gap-5 py-32">
-    <Spinner class="h-8 w-8" />
-    {{ t("Loading data...") }}
-  </div>
   <div class="flex flex-col justify-between gap-3 pt-8">
     <h1 class="text-zinc-600 !text-lg font-semibold">{{ t("sites") }}</h1>
     <!-- <NuxtLink to="#" class="flex flex-row"><MapPinIcon class="h-4 w-4" /> {{ t("overview_map") }}</NuxtLink> -->
@@ -167,7 +163,6 @@ de:
   more_aria: mehr Gebäude anzeigen
   overview_map: Übersichtskarte
   sites: Standorte
-  "Loading data...": Lädt daten...
   show_details_for_campus: show the details for the campus '{0}'
   show_details_for_building: show the details for the building '{0}'
   description: Finde Räume, Gebäude und andere Orte an der TUM mit Exzellenz. Eine moderne Alternative zum RoomFinder, entwickelt von Studierenden.
@@ -180,7 +175,6 @@ en:
   more_aria: show more buildings
   overview_map: Overview Map
   sites: Sites
-  "Loading data...": Loading data...
   show_details_for_campus: show the details for the campus '{0}'
   show_details_for_building: show the details for the building '{0}'
   description: Find rooms, buildings and other places at TUM with excellence. A modern alternative to RoomFinder, developed by students.

From d1ab7480785073bc6e1690f1cb8d01155359bde4 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 14:38:53 +0200
Subject: [PATCH 5/9] Fixed formatting mistakes

---
 openapi.yaml                   | 2 +-
 server/main-api/src/details.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 1de8e0056..f4de50e74 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1825,7 +1825,7 @@ components:
         aliases:
           description: |
             A list of alternative ids for this entry.  
-            
+
             Not to be confused with
             - `id` which is the unique identifier or
             - `visual-id` which is an alternative identifier for the entry (only displayed in the URL).
diff --git a/server/main-api/src/details.rs b/server/main-api/src/details.rs
index f041140e6..6f5911a69 100644
--- a/server/main-api/src/details.rs
+++ b/server/main-api/src/details.rs
@@ -1,4 +1,4 @@
-use actix_web::{get, HttpResponse, web};
+use actix_web::{get, web, HttpResponse};
 use log::error;
 use sqlx::PgPool;
 

From 47af521d18d1b38f446d7794c1cb72ec93fafa71 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 14:53:20 +0200
Subject: [PATCH 6/9] Fixed data export mistake

---
 data/processors/export.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/processors/export.py b/data/processors/export.py
index 25f7fbde9..360d43b8d 100644
--- a/data/processors/export.py
+++ b/data/processors/export.py
@@ -53,6 +53,8 @@ def export_for_search(data: dict, path: str) -> None:
         campus_name = None
         if entry["type"] not in {"campus", "site"}:
             for parent in entry["parents"]:
+                if parent == "root":
+                    continue
                 if data[parent]["type"] in {"campus", "site"}:
                     campus = data[parent]
                     campus_name = campus.get("short_name", campus["name"])

From 32855c8699212711a79ff9aa7988265ff462555e Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 15:01:33 +0200
Subject: [PATCH 7/9] fixed another export error

---
 data/processors/export.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/processors/export.py b/data/processors/export.py
index 360d43b8d..5ab591674 100644
--- a/data/processors/export.py
+++ b/data/processors/export.py
@@ -45,6 +45,8 @@ def export_for_search(data: dict, path: str) -> None:
         building_parents_index = len(entry["parents"])
         if entry["type"] in {"room", "virtual_room"}:
             for i, parent in enumerate(entry["parents"]):
+                if parent == "root":
+                    continue
                 if data[parent]["type"] in {"building", "joined_building"}:
                     building_parents_index = i
                     break

From e7397e0e211b0ec0f1377df1f00c70c1c650dea5 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 15:12:21 +0200
Subject: [PATCH 8/9] fixed another export error

---
 data/processors/export.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/processors/export.py b/data/processors/export.py
index 5ab591674..b90786515 100644
--- a/data/processors/export.py
+++ b/data/processors/export.py
@@ -5,6 +5,7 @@
 
 from external.models.common import PydanticConfiguration
 from utils import TranslatableStr
+from utils import TranslatableStr as _
 
 OUTPUT_DIR = Path(__file__).parent.parent / "output"
 SLUGIFY_REGEX = re.compile(r"[^a-zA-Z0-9-äöüß.]+")
@@ -138,8 +139,9 @@ def export_for_api(data: dict, path: str) -> None:
 
 def extract_exported_item(data, entry):
     """Extract the item that will be finally exported to the api"""
+    parent_names = [data[p]["name"] if not p == "root" else _("Standorte","Sites") for p in entry["parents"]]
     result = {
-        "parent_names": [data[p]["name"] for p in entry["parents"]],
+        "parent_names": parent_names,
         **entry,
     }
     if "children" in result:

From 0900c802e7aa1aefe72b577f129a8dcbc294ae78 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 15:15:00 +0200
Subject: [PATCH 9/9] fixed a linting mistake

---
 data/processors/export.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/processors/export.py b/data/processors/export.py
index b90786515..376a32a66 100644
--- a/data/processors/export.py
+++ b/data/processors/export.py
@@ -139,7 +139,7 @@ def export_for_api(data: dict, path: str) -> None:
 
 def extract_exported_item(data, entry):
     """Extract the item that will be finally exported to the api"""
-    parent_names = [data[p]["name"] if not p == "root" else _("Standorte","Sites") for p in entry["parents"]]
+    parent_names = [data[p]["name"] if not p == "root" else _("Standorte", "Sites") for p in entry["parents"]]
     result = {
         "parent_names": parent_names,
         **entry,