split uploaded and generated backups

src/components/admin/user/backup/RestoreBackupModal.vue

@@ -15,12 +15,17 @@
           <option v-for="section in backupSections" :value="section">{{ section }}</option>
         </select>
       </div>
+      <div v-if="!partial" class="flex flex-row items-center gap-2">
+        <input type="checkbox" id="overwrite" checked />
+        <label for="overwrite">Daten entfernen und importieren</label>
+      </div>
 
       <br />
       <p class="flex">
         <InformationCircleIcon class="min-h-5 h-5 min-w-5 w-5" />Je nach Auswahl, werden die entsprechenden
         Bestandsdaten ersetzt. Dadurch können Daten, die seit diesem Backup erstellt wurden, verloren gehen.
       </p>
+      <p class="flex">Das Laden eines vollständigen Backups wird zur Vermeidung von Inkonsistenzen empfohlen.</p>
 
       <div class="flex flex-row gap-2">
         <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">
@@ -83,6 +88,7 @@ export default defineComponent({
         include: Array.from(formData?.sections?.selectedOptions ?? []).map(
           (t) => (t as HTMLOptionElement).value
         ) as Array<BackupSection>,
+        overwrite: !formData?.overwrite.checked,
       };
       this.status = "loading";
       this.restoreBackup(restoreBackup)

src/components/admin/user/backup/UploadBackupModal.vue

@@ -18,7 +18,12 @@
         type="file"
         ref="fileSelect"
         accept="application/JSON"
-        @change="(e) => uploadFile((e.target as HTMLInputElement)?.files?.[0])"
+        @change="
+          (e) => {
+            uploadFile((e.target as HTMLInputElement)?.files?.[0]);
+            e.target.value = null;
+          }
+        "
         multiple
       />
       <button primary @click="openFileSelect">Datei auswählen</button>

src/router/backupGuard.ts

@@ -0,0 +1,19 @@
+import { useBackupStore } from "../stores/admin/user/backup";
+
+export async function setBackupPage(to: any, from: any, next: any) {
+  const backup = useBackupStore();
+
+  let uploadPage = to.name.includes("uploaded");
+
+  if (uploadPage) {
+    backup.page = "uploaded";
+    backup.backups = [];
+  } else {
+    backup.page = "generated";
+    backup.backups = [];
+  }
+
+  backup.fetchBackups();
+
+  next();
+}

src/router/index.ts

@@ -10,6 +10,7 @@ import { resetMemberStores, setMemberId } from "./memberGuard";
 import { resetProtocolStores, setProtocolId } from "./protocolGuard";
 import { resetNewsletterStores, setNewsletterId } from "./newsletterGuard";
 import { config } from "../config";
+import { setBackupPage } from "./backupGuard";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -636,10 +637,29 @@ const router = createRouter({
             },
             {
               path: "backup",
-              name: "admin-user-backup",
+              name: "admin-user-backup-route",
-              component: () => import("@/views/admin/user/backup/Backup.vue"),
+              component: () => import("@/views/admin/user/backup/BackupRouting.vue"),
               meta: { type: "read", section: "user", module: "backup" },
               beforeEnter: [abilityAndNavUpdate],
+              children: [
+                {
+                  path: "",
+                  name: "admin-user-backup",
+                  redirect: { name: "admin-user-backup-generated" },
+                },
+                {
+                  path: "generated",
+                  name: "admin-user-backup-generated",
+                  component: () => import("@/views/admin/user/backup/GeneratedBackup.vue"),
+                  beforeEnter: [setBackupPage],
+                },
+                {
+                  path: "uploads",
+                  name: "admin-user-backup-uploaded",
+                  component: () => import("@/views/admin/user/backup/UploadedBackup.vue"),
+                  beforeEnter: [setBackupPage],
+                },
+              ],
             },
           ],
         },

src/stores/admin/user/backup.ts

@@ -8,13 +8,14 @@ export const useBackupStore = defineStore("backup", {
     return {
       backups: [] as Array<string>,
       loading: null as null | "loading" | "success" | "failed",
+      page: "generated" as "generated" | "uploaded",
     };
   },
   actions: {
     fetchBackups() {
       this.loading = "loading";
       http
-        .get("/admin/backup")
+        .get(`/admin/backup/${this.page}`)
         .then((result) => {
           this.backups = result.data;
           this.loading = "success";
@@ -24,16 +25,16 @@ export const useBackupStore = defineStore("backup", {
         });
     },
     fetchBackupById(filename: string): Promise<AxiosResponse<any, any>> {
-      return http.get(`/admin/backup/${filename}`);
+      return http.get(`/admin/backup/${this.page}/${filename}`);
+    },
+    async restoreBackup(backup: BackupRestoreViewModel): Promise<AxiosResponse<any, any>> {
+      return await http.post(`/admin/backup/${this.page}/restore`, backup);
     },
     async triggerBackupCreate(): Promise<AxiosResponse<any, any>> {
       const result = await http.post("/admin/backup");
       this.fetchBackups();
       return result;
     },
-    async restoreBackup(backup: BackupRestoreViewModel): Promise<AxiosResponse<any, any>> {
-      return await http.post("/admin/backup/restore", backup);
-    },
     async uploadBackup(file: File): Promise<AxiosResponse<any, any>> {
       const formData = new FormData();
       formData.append("file", file);

src/viewmodels/admin/club/member/membership.models.ts

@@ -9,7 +9,8 @@ export interface MembershipViewModel {
 
 export interface MembershipStatisticsViewModel {
   durationInDays: number;
-  durationInYears: string;
+  durationInYears: number;
+  exactDuration: string;
   status: string;
   statusId: number;
   memberId: string;

src/viewmodels/admin/user/backup.models.ts

@@ -4,4 +4,5 @@ export interface BackupRestoreViewModel {
   filename: string;
   partial: boolean;
   include: Array<BackupSection>;
+  overwrite: boolean;
 }

src/views/admin/club/members/MemberOverview.vue

@@ -34,7 +34,7 @@
           >
             <p>
               {{ stat.status }} für gesamt {{ stat.durationInDays }} Tage
-              <span class="whitespace-nowrap"> ~> {{ stat.durationInYears.replace("_", "") }} Jahre</span>
+              <span class="whitespace-nowrap"> ~> {{ stat.exactDuration }}</span>
             </p>
           </div>
         </div>

src/views/admin/user/backup/BackupRouting.vue

@@ -6,17 +6,27 @@
       </div>
     </template>
     <template #diffMain>
-      <div class="flex flex-col gap-4 h-full pl-7">
+      <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
-        <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+        <div class="flex flex-col grow gap-2 overflow-hidden">
-          <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+          <div class="w-full flex flex-row max-lg:flex-wrap justify-center">
-        </div>
+            <RouterLink
-        <div class="flex flex-row gap-4">
+              v-for="tab in tabs"
-          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openCreateModal">
+              :key="tab.route"
-            Backup erstellen
+              v-slot="{ isActive }"
-          </button>
+              :to="{ name: tab.route }"
-          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openUploadModal">
+              class="w-1/2 p-0.5 first:pl-0 last:pr-0"
-            Backup hochladen
+            >
-          </button>
+              <p
+                :class="[
+                  'w-full rounded-lg py-2.5 text-sm text-center font-medium leading-5 focus:ring-0 outline-none',
+                  isActive ? 'bg-red-200 shadow border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200',
+                ]"
+              >
+                {{ tab.title }}
+              </p>
+            </RouterLink>
+          </div>
+          <RouterView />
         </div>
       </div>
     </template>
@@ -35,6 +45,14 @@ import { useAbilityStore } from "@/stores/ability";
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      tabs: [
+        { route: "admin-user-backup-generated", title: "Erstellt" },
+        { route: "admin-user-backup-uploaded", title: "Uploads" },
+      ],
+    };
+  },
   computed: {
     ...mapState(useBackupStore, ["backups"]),
     ...mapState(useAbilityStore, ["can"]),

src/views/admin/user/backup/GeneratedBackup.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="flex flex-col gap-4 h-full pl-7">
+    <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+      <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+    </div>
+    <div class="flex flex-row gap-4">
+      <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openCreateModal">
+        Backup erstellen
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useBackupStore, ["backups"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchBackups();
+  },
+  methods: {
+    ...mapActions(useBackupStore, ["fetchBackups"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openCreateModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue")))
+      );
+    },
+    openUploadModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue")))
+      );
+    },
+  },
+});
+</script>

src/views/admin/user/backup/UploadedBackup.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="flex flex-col gap-4 h-full pl-7">
+    <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+      <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+    </div>
+    <div class="flex flex-row gap-4">
+      <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openUploadModal">
+        Backup hochladen
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useBackupStore, ["backups"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchBackups();
+  },
+  methods: {
+    ...mapActions(useBackupStore, ["fetchBackups"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openCreateModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue")))
+      );
+    },
+    openUploadModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue")))
+      );
+    },
+  },
+});
+</script>