@adventurelabs/scout-core 1.4.72 → 1.4.74

package/dist/helpers/herds.js

@@ -25,14 +25,7 @@ export async function get_herds_with_location(client) {
             data: null,
         };
     }
-    if (!data) {
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: "No herds found",
-            data: null,
-        };
-    }
-    return IWebResponse.success(data).to_compatible();
+    return IWebResponse.success(data ?? []).to_compatible();
 }
 export async function get_herd_by_slug(slug) {
     const supabase = await newServerClient();
@@ -83,11 +76,10 @@ export async function server_load_herd_modules() {
     const client_supabase = await newServerClient();
     const herdsResult = await get_herds_with_location(client_supabase);
     if (herdsResult.status !== EnumWebResponse.SUCCESS ||
-        !herdsResult.data ||
-        herdsResult.data.length === 0) {
+        !herdsResult.data) {
         return {
             status: EnumWebResponse.ERROR,
-            msg: herdsResult.msg ?? "No herds found",
+            msg: herdsResult.msg ?? "Failed to load herds",
             data: null,
             time_finished: Date.now(),
             time_sent: Date.now(),
@@ -95,20 +87,29 @@ export async function server_load_herd_modules() {
         };
     }
     const herds = herdsResult.data.filter((h) => h.id != null);
-    let new_herd_modules = [];
-    const herdModulePromises = herds.map((herd) => HerdModule.from_herd(herd, client_supabase));
-    new_herd_modules = await Promise.all(herdModulePromises);
-    const serialized_herd_modules = new_herd_modules.map((herd_module) => herd_module.to_serializable());
     const endTime = Date.now();
     const totalLoadTime = endTime - startTime;
+    if (herds.length === 0) {
+        console.log(`[server_load_herd_modules] No accessible herds (${totalLoadTime}ms)`);
+        return {
+            status: EnumWebResponse.SUCCESS,
+            msg: "No herds accessible",
+            data: [],
+            time_finished: endTime,
+            time_sent: endTime,
+            server_processing_time_ms: totalLoadTime,
+        };
+    }
+    const herdModulePromises = herds.map((herd) => HerdModule.from_herd(herd, client_supabase));
+    const new_herd_modules = await Promise.all(herdModulePromises);
+    const serialized_herd_modules = new_herd_modules.map((herd_module) => herd_module.to_serializable());
     console.log(`[server_load_herd_modules] Loaded ${herds.length} herds in ${totalLoadTime}ms (parallel processing)`);
-    const timeSent = Date.now();
     return {
         status: EnumWebResponse.SUCCESS,
         msg: "Herd modules loaded successfully",
         data: serialized_herd_modules,
         time_finished: endTime,
-        time_sent: timeSent,
+        time_sent: endTime,
         server_processing_time_ms: totalLoadTime,
     };
 }

package/dist/helpers/invitations.d.ts

@@ -1,10 +1,10 @@
 import { Database } from "../types/supabase";
-import { IHerdInvitation, Role } from "../types/db";
+import { IHerdInvitation, IHerdInvitationWithHerdSlug, Role } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
 import { SupabaseClient } from "@supabase/supabase-js";
 export declare function server_create_herd_invitation(herd_id: number, email: string, role: Role, expires_at?: string | null): Promise<IWebResponseCompatible<IHerdInvitation | null>>;
 export declare function accept_herd_invitations_for_current_user(invitation_ids: number[], supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerdInvitation[]>>;
-export declare function server_get_herd_invitations_for_current_user(): Promise<IWebResponseCompatible<IHerdInvitation[]>>;
+export declare function server_get_herd_invitations_for_current_user(): Promise<IWebResponseCompatible<IHerdInvitationWithHerdSlug[]>>;
 export declare function server_get_herd_invitations_by_herd(herd_id: number, supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerdInvitation[]>>;
 export declare function reject_herd_invitations_for_current_user(invitation_ids: number[], supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerdInvitation[]>>;
 export declare function server_revoke_herd_invitations(invitation_ids: number[], supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerdInvitation[]>>;

package/dist/helpers/users.d.ts

@@ -9,3 +9,4 @@ export declare function server_upsert_user_with_role(herd_id: number, username:
 export type UserProfileUpdate = Database["public"]["Tables"]["users"]["Update"];
 export declare function update_user_profile(client: SupabaseClient<Database>, user_id: string, patch: UserProfileUpdate): Promise<IWebResponseCompatible<IUserProfileRow | null>>;
 export declare function leave_herd_for_current_user(herd_id: number, supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IUserRolePerHerd | null>>;
+export declare function remove_user_from_herd_for_admin(herd_id: number, user_id: string, supabaseClient?: SupabaseClient<Database>): Promise<IWebResponseCompatible<IUserRolePerHerd | null>>;

package/dist/helpers/users.js

@@ -99,3 +99,14 @@ export async function leave_herd_for_current_user(herd_id, supabaseClient) {
     }
     return IWebResponse.success(data).to_compatible();
 }
+export async function remove_user_from_herd_for_admin(herd_id, user_id, supabaseClient) {
+    const supabase = supabaseClient ?? (await newServerClient());
+    const { data, error } = await supabase.rpc("remove_user_from_herd_for_admin", {
+        p_herd_id: herd_id,
+        p_user_id: user_id,
+    });
+    if (error) {
+        return IWebResponse.error(error.message).to_compatible();
+    }
+    return IWebResponse.success(data).to_compatible();
+}

package/dist/hooks/useScoutRefresh.js

@@ -6,6 +6,7 @@ import { EnumHerdModulesLoadingState } from "../types/herd_module";
 import { server_load_herd_modules } from "../helpers/herds";
 import { scoutCache } from "../helpers/cache";
 import { EnumDataSource } from "../types/data_source";
+import { EnumWebResponse } from "../types/requests";
 import { createBrowserClient } from "@supabase/ssr";
 /**
  * Hook for refreshing scout data with detailed timing measurements and cache-first loading
@@ -185,7 +186,8 @@ export function useScoutRefresh(options = {}) {
                                         }
                                         const backgroundUserResult = await userPromise;
                                         // Validate background responses
-                                        if (backgroundHerdModulesResult.data &&
+                                        if (backgroundHerdModulesResult.status ===
+                                            EnumWebResponse.SUCCESS &&
                                             Array.isArray(backgroundHerdModulesResult.data) &&
                                             backgroundUserResult) {
                                             // Update cache with fresh data
@@ -295,9 +297,9 @@ export function useScoutRefresh(options = {}) {
             // Dispatch timing actions
             dispatch(setHerdModulesApiServerProcessingDuration(herdModulesServerDuration));
             dispatch(setHerdModulesApiTotalRequestDuration(herdModulesTotalDuration));
-            // Validate API responses
+            // Validate API responses 
             const validationStartTime = Date.now();
-            if (!herdModulesResponse.data ||
+            if (herdModulesResponse.status !== EnumWebResponse.SUCCESS ||
                 !Array.isArray(herdModulesResponse.data)) {
                 throw new Error("Invalid herd modules response");
             }

package/dist/index.d.ts

@@ -76,5 +76,5 @@ export * from "./supabase/middleware";
 export * from "./supabase/server";
 export * from "./api_keys/actions";
 export type { HerdModule, IHerdModule } from "./types/herd_module";
-export type { IDevice, IEvent, IUser, IHerd, IHerdPrettyLocation, IEventWithTags, IZoneWithActions, ICredential, CredentialInsert, CredentialUpdate, ICertificate, CertificateInsert, CertificateUpdate, IUserAndRole, IUserProfileRow, IHerdInvitation, IHerdAllowedDomain, IUserRolePerHerd, HerdInvitationStatus, IApiKeyScout, ILayer, IHeartbeat, IProvider, IConnectivity, ISession, ISessionWithCoordinates, IConnectivityWithCoordinates, IObservation, ObservationInsert, ObservationUpdate, IAnalysisJob, IAnalysisTask, AnalysisWorkStatus, } from "./types/db";
+export type { IDevice, IEvent, IUser, IHerd, IHerdPrettyLocation, IEventWithTags, IZoneWithActions, ICredential, CredentialInsert, CredentialUpdate, ICertificate, CertificateInsert, CertificateUpdate, IUserAndRole, IUserProfileRow, IHerdInvitation, IHerdInvitationWithHerdSlug, IHerdAllowedDomain, IUserRolePerHerd, HerdInvitationStatus, IApiKeyScout, ILayer, IHeartbeat, IProvider, IConnectivity, ISession, ISessionWithCoordinates, IConnectivityWithCoordinates, IObservation, ObservationInsert, ObservationUpdate, IAnalysisJob, IAnalysisTask, AnalysisWorkStatus, } from "./types/db";
 export { EnumSessionsVisibility } from "./types/events";

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -2665,20 +2665,10 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
         };
         get_herd_invitations_for_current_user: {
             Args: never;
-            Returns: {
-                accepted_at: string | null;
-                created_at: string;
-                email: string;
-                expires_at: string | null;
-                herd_id: number;
-                id: number;
-                invited_by: string;
-                role: Database["public"]["Enums"]["role"];
-                status: Database["public"]["Enums"]["herd_invitation_status"];
-            }[];
+            Returns: Database["public"]["CompositeTypes"]["herd_invitation_with_herd_slug"][];
             SetofOptions: {
                 from: "*";
-                to: "herd_invitations";
+                to: "herd_invitation_with_herd_slug";
                 isOneToOne: false;
                 isSetofReturn: true;
             };
@@ -3034,6 +3024,29 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 isSetofReturn: false;
             };
         };
+        remove_user_from_herd_for_admin: {
+            Args: {
+                p_herd_id: number;
+                p_user_id: string;
+            };
+            Returns: {
+                herd_id: number;
+                id: number;
+                inserted_at: string;
+                lifecycle: Database["public"]["Enums"]["entity_lifecycle"];
+                lifecycle_changed_at: string;
+                lifecycle_changed_by: string | null;
+                lifecycle_reason: string | null;
+                role: Database["public"]["Enums"]["role"];
+                user_id: string;
+            };
+            SetofOptions: {
+                from: "*";
+                to: "users_roles_per_herd";
+                isOneToOne: true;
+                isSetofReturn: false;
+            };
+        };
         load_api_keys: {
             Args: {
                 id_of_device: number;
@@ -3391,6 +3404,18 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
             event_data: Database["public"]["CompositeTypes"]["event_and_tags_pretty_location"] | null;
             artifact_data: Database["public"]["Tables"]["artifacts"]["Row"] | null;
         };
+        herd_invitation_with_herd_slug: {
+            id: number | null;
+            email: string | null;
+            herd_id: number | null;
+            role: Database["public"]["Enums"]["role"] | null;
+            invited_by: string | null;
+            status: Database["public"]["Enums"]["herd_invitation_status"] | null;
+            created_at: string | null;
+            accepted_at: string | null;
+            expires_at: string | null;
+            herd_slug: string | null;
+        };
         herds_pretty_location: {
             id: number | null;
             inserted_at: string | null;

package/dist/types/db.d.ts

@@ -28,6 +28,7 @@ export type IAction = Database["public"]["Tables"]["actions"]["Row"];
 export type IZone = Database["public"]["Tables"]["zones"]["Row"];
 export type IUserRolePerHerd = Database["public"]["Tables"]["users_roles_per_herd"]["Row"];
 export type IHerdInvitation = Database["public"]["Tables"]["herd_invitations"]["Row"];
+export type IHerdInvitationWithHerdSlug = Database["public"]["CompositeTypes"]["herd_invitation_with_herd_slug"];
 export type IHerdAllowedDomain = Database["public"]["Tables"]["herd_allowed_domains"]["Row"];
 export type HerdInvitationStatus = Database["public"]["Enums"]["herd_invitation_status"];
 export type IHerd = Database["public"]["Tables"]["herds"]["Row"];

package/dist/types/supabase.d.ts

@@ -2762,20 +2762,10 @@ export type Database = {
             };
             get_herd_invitations_for_current_user: {
                 Args: never;
-                Returns: {
-                    accepted_at: string | null;
-                    created_at: string;
-                    email: string;
-                    expires_at: string | null;
-                    herd_id: number;
-                    id: number;
-                    invited_by: string;
-                    role: Database["public"]["Enums"]["role"];
-                    status: Database["public"]["Enums"]["herd_invitation_status"];
-                }[];
+                Returns: Database["public"]["CompositeTypes"]["herd_invitation_with_herd_slug"][];
                 SetofOptions: {
                     from: "*";
-                    to: "herd_invitations";
+                    to: "herd_invitation_with_herd_slug";
                     isOneToOne: false;
                     isSetofReturn: true;
                 };
@@ -3131,6 +3121,29 @@ export type Database = {
                     isSetofReturn: false;
                 };
             };
+            remove_user_from_herd_for_admin: {
+                Args: {
+                    p_herd_id: number;
+                    p_user_id: string;
+                };
+                Returns: {
+                    herd_id: number;
+                    id: number;
+                    inserted_at: string;
+                    lifecycle: Database["public"]["Enums"]["entity_lifecycle"];
+                    lifecycle_changed_at: string;
+                    lifecycle_changed_by: string | null;
+                    lifecycle_reason: string | null;
+                    role: Database["public"]["Enums"]["role"];
+                    user_id: string;
+                };
+                SetofOptions: {
+                    from: "*";
+                    to: "users_roles_per_herd";
+                    isOneToOne: true;
+                    isSetofReturn: false;
+                };
+            };
             load_api_keys: {
                 Args: {
                     id_of_device: number;
@@ -3488,6 +3501,18 @@ export type Database = {
                 event_data: Database["public"]["CompositeTypes"]["event_and_tags_pretty_location"] | null;
                 artifact_data: Database["public"]["Tables"]["artifacts"]["Row"] | null;
             };
+            herd_invitation_with_herd_slug: {
+                id: number | null;
+                email: string | null;
+                herd_id: number | null;
+                role: Database["public"]["Enums"]["role"] | null;
+                invited_by: string | null;
+                status: Database["public"]["Enums"]["herd_invitation_status"] | null;
+                created_at: string | null;
+                accepted_at: string | null;
+                expires_at: string | null;
+                herd_slug: string | null;
+            };
             herds_pretty_location: {
                 id: number | null;
                 inserted_at: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "1.4.72",
+  "version": "1.4.74",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",