refactor(routes): update expression views

- use `createEliPathParameter()` in route
- refactored metadata-editor
- Renamed `expressionEli` to `dokumentExpressionEli` for consistency.
- Removed `affectedDocumentEli` as a separate variable.
-Refactor proprietary metadata fetching

RISDEV-6266.

frontend/src/router.ts

@@ -18,7 +18,7 @@ const routes: readonly RouteRecordRaw[] = [
     redirect: { name: "AmendingLaws" },
   },
   {
-    path: "/eli/:eli",
+    path: `/${createEliPathParameter()}`,
     name: "ExpressionMetadataEditor",
     component: () =>
       import(

frontend/src/services/proprietaryService.ts

@@ -1,6 +1,5 @@
 import { ElementProprietary, RahmenProprietary } from "@/types/proprietary"
 import { UseFetchOptions, UseFetchReturn } from "@vueuse/core"
-import dayjs from "dayjs"
 import { MaybeRefOrGetter, computed, toValue } from "vue"
 import { INVALID_URL, useApiFetch } from "./apiService"
 
@@ -27,34 +26,18 @@ export function useProprietaryService(
      * accident.
      */
     eid: MaybeRefOrGetter<string | undefined> | null
-
-    /**
-     * If set, returns the state of the metadata at that date. Otherwise the
-     * metadata of the current version will be returned.
-     */
-    atDate: MaybeRefOrGetter<string | Date | undefined>
   },
   fetchOptions: UseFetchOptions = {},
 ): UseFetchReturn<RahmenProprietary | ElementProprietary> {
-  const dateAsString = computed(() => {
-    const atDateVal = toValue(options?.atDate)
-
-    if (!atDateVal) return undefined
-
-    return typeof atDateVal === "string"
-      ? atDateVal
-      : dayjs(atDateVal).format("YYYY-MM-DD")
-  })
-
   const url = computed(() => {
     const eliVal = toValue(eli)
     const eidVal = toValue(options.eid)
 
-    if (!eliVal || !dateAsString.value || (eidVal !== null && !eidVal)) {
+    if (!eliVal || (eidVal !== null && !eidVal)) {
       return INVALID_URL
     }
 
-    return `/norms/${eliVal}/proprietary/${eidVal ? eidVal + "/" : ""}${dateAsString.value}`
+    return `/norms/${eliVal}/proprietary${eidVal ? `/${eidVal}` : ""}`
   })
 
   return useApiFetch<RahmenProprietary>(url, fetchOptions)
@@ -65,18 +48,16 @@ export function useProprietaryService(
  * configuration for getting JSON data of the frame ("Rahmen", i.e. whole norm).
  *
  * @param eli ELI of the norm
- * @param options Optional additional filters and queries
  * @param [fetchOptions={}] Optional configuration for fetch behavior
  * @returns Reactive fetch wrapper
  */
 export function useGetRahmenProprietary(
   eli: Parameters<typeof useProprietaryService>["0"],
-  options: Omit<Parameters<typeof useProprietaryService>["1"], "eid">,
   fetchOptions?: Parameters<typeof useProprietaryService>["2"],
 ): UseFetchReturn<RahmenProprietary> {
   return useProprietaryService(
     eli,
-    { ...options, eid: null },
+    { eid: null },
     { refetch: true, ...fetchOptions },
   ).json()
 }
@@ -87,19 +68,17 @@ export function useGetRahmenProprietary(
  *
  * @param updateData The new proprietary data
  * @param eli ELI of the norm
- * @param options Optional additional filters and queries
  * @param [fetchOptions={}] Optional configuration for fetch behavior
  * @returns Reactive fetch wrapper
  */
 export function usePutRahmenProprietary(
   updateData: MaybeRefOrGetter<RahmenProprietary | null>,
   eli: Parameters<typeof useProprietaryService>["0"],
-  options: Omit<Parameters<typeof useProprietaryService>["1"], "eid">,
   fetchOptions?: Parameters<typeof useProprietaryService>["2"],
 ): UseFetchReturn<RahmenProprietary> {
   return useProprietaryService(
     eli,
-    { ...options, eid: null },
+    { eid: null },
     { immediate: false, ...fetchOptions },
   )
     .json()
@@ -112,19 +91,17 @@ export function usePutRahmenProprietary(
  *
  * @param eli ELI of the norm
  * @param eid eId of the element
- * @param options Optional additional filters and queries
  * @param [fetchOptions={}] Optional configuration for fetch behavior
  * @returns Reactive fetch wrapper
  */
 export function useGetElementProprietary(
   eli: Parameters<typeof useProprietaryService>["0"],
   eid: Parameters<typeof useProprietaryService>["1"]["eid"],
-  options: Omit<Parameters<typeof useProprietaryService>["1"], "eid">,
   fetchOptions?: Parameters<typeof useProprietaryService>["2"],
 ): UseFetchReturn<ElementProprietary> {
   return useProprietaryService(
     eli,
-    { ...options, eid },
+    { eid },
     { refetch: true, ...fetchOptions },
   ).json()
 }
@@ -136,20 +113,18 @@ export function useGetElementProprietary(
  * @param updateData The new proprietary data
  * @param eli ELI of the norm
  * @param eid eId of the element
- * @param options Optional additional filters and queries
  * @param [fetchOptions={}] Optional configuration for fetch behavior
  * @returns Reactive fetch wrapper
  */
 export function usePutElementProprietary(
   updateData: MaybeRefOrGetter<ElementProprietary | null>,
   eli: Parameters<typeof useProprietaryService>["0"],
   eid: Parameters<typeof useProprietaryService>["1"]["eid"],
-  options: Omit<Parameters<typeof useProprietaryService>["1"], "eid">,
   fetchOptions?: Parameters<typeof useProprietaryService>["2"],
 ): UseFetchReturn<ElementProprietary> {
   return useProprietaryService(
     eli,
-    { ...options, eid },
+    { eid },
     { immediate: false, ...fetchOptions },
   )
     .json()

frontend/src/views/expression/metadata-editor/ExpressionMetadataEditor.view.vue

@@ -4,7 +4,7 @@ import RisHeader from "@/components/controls/RisHeader.vue"
 import RisLoadingSpinner from "@/components/controls/RisLoadingSpinner.vue"
 import { useEliPathParameter } from "@/composables/useEliPathParameter"
 import { useGetElements } from "@/services/elementService"
-import { computed, ref } from "vue"
+import { ComputedRef, computed, ref } from "vue"
 import RisErrorCallout from "@/components/controls/RisErrorCallout.vue"
 import Tree from "primevue/tree"
 
@@ -29,74 +29,47 @@ const {
 ])
 
 const expandedKeys = ref<Record<string, boolean>>({})
-if (!expandedKeys.value) {
-  expandedKeys.value = {}
-}
-
 const selectionKeys = ref<Record<string, boolean>>({})
 
-const elementData = computed(
+const elementLinks = computed(
   () =>
-    elements.value ?? [
-      { eid: "1", title: "Kapitel 1", type: "article" },
-      { eid: "2", title: "Kapitel 2", type: "book" },
-      { eid: "3", title: "Annex 1", type: "annex" },
-      { eid: "4", title: "Appendix A", type: "appendix" },
-    ],
-)
-
-const elementLinks = computed(() => {
-  const items = elements.value ?? [
-    { eid: "1", title: "Kapitel 1", type: "article" },
-    { eid: "2", title: "Kapitel 2", type: "book" },
-  ]
-
-  return items.map((el) => ({
-    eid: el.eid,
-    title: el.title,
-    type: el.type,
-    route: {
-      name:
-        el.type === "article" ||
-        el.type === "conclusions" ||
-        el.type === "preamble" ||
-        el.type === "preface"
+    elements.value?.map((el) => ({
+      eid: el.eid,
+      title: el.title,
+      type: el.type,
+      route: {
+        name: ["article", "conclusions", "preamble", "preface"].includes(
+          el.type,
+        )
           ? "ExpressionMetadataEditorElement"
           : "ExpressionMetadataEditorOutlineElement",
-      params: {
-        eli: expressionEli.value,
-        eid: expressionEli.eid,
+        params: { eid: el.eid },
       },
-    },
-  }))
-})
+    })) ?? [],
+)
 
-const treeNodes = computed<TreeNode[]>(() => {
-  if (!elementLinks.value) return []
+interface TreeNode {
+  key: string
+  label: string
+  route?: { name: string; params: { expressionEli: string; eid: string } }
+  children?: TreeNode[]
+}
 
+const treeNodes: ComputedRef<TreeNode[]> = computed(() => {
   return elementLinks.value.map((el) => ({
     key: el.eid,
     label: el.title,
     route: el.route
       ? {
           name: el.route.name,
           params: {
-            eli: eli.value ?? "default-eli", // Ensure eli is never undefined
+            expressionEli: expressionEli.value,
             eid: el.eid,
           },
         }
       : undefined,
-    children: el.children ?? [],
   }))
 })
-
-interface TreeNode {
-  key: string
-  label: string
-  route?: { name: string; params: Record<string, string | number> }
-  secondaryLabel?: string
-  children?: TreeNode[]
-}
 </script>
 
 <template>
@@ -134,7 +107,7 @@ interface TreeNode {
           />
 
           <RisEmptyState
-            v-else-if="!elementData.length"
+            v-else-if="!elements || !elements.length"
             text-content="Keine Artikel gefunden."
             class="mx-16"
             variant="simple"