@zap-wunschlachen/wl-shared-components 1.0.80 → 1.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zap-wunschlachen/wl-shared-components",
-  "version": "1.0.80",
+  "version": "1.0.81",
   "type": "module",
   "module": "./src/index.ts",
   "scripts": {

package/src/composables/useReleaseNotes.ts

@@ -2,52 +2,19 @@ import { ref, watch, type Ref, type ComputedRef } from 'vue';
 import type { ReleaseNote } from '../types';
 
 export function useReleaseNotes(options: {
-  directusUrl: string;
   userId: Ref<string | null> | ComputedRef<string | null>;
+  checkIsEmployee: () => Promise<boolean>;
+  resolveAppId: () => Promise<string | null>;
+  fetchUnreadNotes: (appId: string, userId: string) => Promise<ReleaseNote[]>;
+  markNotesAsRead: (notes: ReleaseNote[], userId: string) => Promise<void>;
 }) {
-  const { directusUrl, userId } = options;
+  const { userId, checkIsEmployee, resolveAppId, fetchUnreadNotes, markNotesAsRead } = options;
   const unreadNotes = ref<ReleaseNote[]>([]);
   const showModal = ref(false);
   const loading = ref(false);
   const markingAsRead = ref(false);
   const appId = ref<string | null>(null);
 
-  async function checkIsEmployee(): Promise<boolean> {
-    try {
-      const res = await fetch(`${directusUrl}/secure-auth/is-employee`, {
-        credentials: 'include',
-      });
-      if (!res.ok) return false;
-      const data = await res.json();
-      return data.is_employee === true;
-    } catch {
-      return false;
-    }
-  }
-
-  async function resolveAppId(): Promise<string | null> {
-    try {
-      const res = await fetch(
-        `${directusUrl}/secure-data/items/internal_apps?fields[]=id&fields[]=domain`,
-        { credentials: 'include' },
-      );
-      if (!res.ok) return null;
-      const data = await res.json();
-      const apps: { id: string; domain: string }[] = data.data || data;
-      const host = window.location.host;
-      const match = apps.find(
-        (app) => app.domain && host.includes(app.domain),
-      );
-      if (match) {
-        appId.value = match.id;
-        return match.id;
-      }
-      return null;
-    } catch {
-      return null;
-    }
-  }
-
   async function fetchUnread() {
     const currentUserId = userId.value;
     const currentAppId = appId.value;
@@ -55,30 +22,7 @@ export function useReleaseNotes(options: {
 
     loading.value = true;
     try {
-      const params = new URLSearchParams();
-      params.append('filter[app][_eq]', currentAppId);
-      params.append('fields[]', 'id');
-      params.append('fields[]', 'notes');
-      params.append('fields[]', 'date_created');
-      params.append('fields[]', 'notified_users.directus_users_id');
-      params.append('sort[]', '-date_created');
-
-      const res = await fetch(
-        `${directusUrl}/secure-data/items/release_notes?${params.toString()}`,
-        { credentials: 'include' },
-      );
-      if (!res.ok) return;
-
-      const data = await res.json();
-      const allNotes: ReleaseNote[] = data.data || data;
-
-      unreadNotes.value = allNotes.filter((note) => {
-        if (!note.notified_users || note.notified_users.length === 0) return true;
-        return !note.notified_users.some(
-          (entry) => entry.directus_users_id === currentUserId,
-        );
-      });
-
+      unreadNotes.value = await fetchUnreadNotes(currentAppId, currentUserId);
       if (unreadNotes.value.length > 0) {
         showModal.value = true;
       }
@@ -95,20 +39,7 @@ export function useReleaseNotes(options: {
 
     markingAsRead.value = true;
     try {
-      for (const note of unreadNotes.value) {
-        await fetch(
-          `${directusUrl}/secure-data/items/release_notes_directus_users`,
-          {
-            method: 'POST',
-            credentials: 'include',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              release_notes_id: note.id,
-              directus_users_id: currentUserId,
-            }),
-          },
-        );
-      }
+      await markNotesAsRead(unreadNotes.value, currentUserId);
       showModal.value = false;
       unreadNotes.value = [];
     } catch {
@@ -125,7 +56,10 @@ export function useReleaseNotes(options: {
       const isEmployee = await checkIsEmployee();
       if (!isEmployee) return;
       const resolved = await resolveAppId();
-      if (resolved) await fetchUnread();
+      if (resolved) {
+        appId.value = resolved;
+        await fetchUnread();
+      }
     },
     { immediate: true },
   );