Merge pull request #533 from buster-so/hot-fix/avatar-url-in-share

Hot fix - avatar url in share menu and assets

apps/api/libs/handlers/src/chats/get_chat_handler.rs

@@ -53,6 +53,7 @@ struct AssetPermissionInfo {
     role: AssetPermissionRole,
     email: String,
     name: Option<String>,
+    avatar_url: Option<String>,
 }
 
 pub async fn get_chat_handler(
@@ -154,7 +155,7 @@ pub async fn get_chat_handler(
                 .filter(asset_permissions::asset_type.eq(AssetType::Chat))
                 .filter(asset_permissions::identity_type.eq(IdentityType::User))
                 .filter(asset_permissions::deleted_at.is_null())
-                .select((asset_permissions::role, users::email, users::name))
+                .select((asset_permissions::role, users::email, users::name, users::avatar_url))
                 .load::<AssetPermissionInfo>(&mut conn)
                 .await;
 
@@ -302,6 +303,7 @@ pub async fn get_chat_handler(
                             email: p.email,
                             role: p.role,
                             name: p.name,
+                            avatar_url: p.avatar_url,
                         })
                         .collect::<Vec<BusterShareIndividual>>(),
                 )

apps/api/libs/handlers/src/chats/types.rs

@@ -12,6 +12,7 @@ pub struct BusterShareIndividual {
     pub email: String,
     pub role: AssetPermissionRole,
     pub name: Option<String>,
+    pub avatar_url: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]

apps/api/libs/handlers/src/collections/get_collection_handler.rs

@@ -25,6 +25,7 @@ struct AssetPermissionInfo {
     role: AssetPermissionRole,
     email: String,
     name: Option<String>,
+    avatar_url: Option<String>,
 }
 
 /// Type for querying asset data from database
@@ -128,6 +129,7 @@ pub async fn get_collection_handler(
             asset_permissions::role,
             users::email,
             users::name,
+            users::avatar_url,
         ))
         .load::<AssetPermissionInfo>(&mut conn)
         .await;
@@ -150,6 +152,7 @@ pub async fn get_collection_handler(
                             email: p.email,
                             role: p.role,
                             name: p.name,
+                            avatar_url: p.avatar_url,
                         })
                         .collect::<Vec<BusterShareIndividual>>(),
                 )

apps/api/libs/handlers/src/collections/types.rs

@@ -12,6 +12,7 @@ pub struct BusterShareIndividual {
     pub email: String,
     pub role: AssetPermissionRole,
     pub name: Option<String>,
+    pub avatar_url: Option<String>,
 }
 
 // List collections types

apps/api/libs/handlers/src/dashboards/get_dashboard_handler.rs

@@ -52,6 +52,7 @@ struct AssetPermissionInfo {
     role: AssetPermissionRole,
     email: String,
     name: Option<String>,
+    avatar_url: Option<String>,
 }
 
 /// Fetches collections that the dashboard belongs to, filtered by user permissions
@@ -328,7 +329,7 @@ pub async fn get_dashboard_handler(
         .filter(asset_permissions::asset_type.eq(AssetType::DashboardFile))
         .filter(asset_permissions::identity_type.eq(IdentityType::User))
         .filter(asset_permissions::deleted_at.is_null())
-        .select((asset_permissions::role, users::email, users::name))
+        .select((asset_permissions::role, users::email, users::name, users::avatar_url))
         .load::<AssetPermissionInfo>(&mut conn)
         .await;
 
@@ -371,6 +372,7 @@ pub async fn get_dashboard_handler(
                             email: p.email,
                             role: p.role,
                             name: p.name,
+                            avatar_url: p.avatar_url,
                         })
                         .collect::<Vec<BusterShareIndividual>>(),
                 )

apps/api/libs/handlers/src/dashboards/types.rs

@@ -31,6 +31,7 @@ pub struct BusterShareIndividual {
     pub email: String,
     pub role: AssetPermissionRole,
     pub name: Option<String>,
+    pub avatar_url: Option<String>,
 }
 
 // Note: This extends BusterShare which needs to be defined

apps/api/libs/handlers/src/metrics/get_metric_for_dashboard_handler.rs

@@ -32,6 +32,7 @@ struct AssetPermissionInfo {
     role: AssetPermissionRole,
     email: String,
     name: Option<String>,
+    avatar_url: Option<String>,
 }
 
 /// Fetch the dashboards associated with the given metric id, filtered by user permissions
@@ -348,7 +349,7 @@ pub async fn get_metric_for_dashboard_handler(
         .filter(asset_permissions::asset_type.eq(AssetType::MetricFile))
         .filter(asset_permissions::identity_type.eq(IdentityType::User))
         .filter(asset_permissions::deleted_at.is_null())
-        .select((asset_permissions::role, users::email, users::name))
+        .select((asset_permissions::role, users::email, users::name, users::avatar_url))
         .load::<AssetPermissionInfo>(&mut conn)
         .await;
 
@@ -412,6 +413,7 @@ pub async fn get_metric_for_dashboard_handler(
                             email: p.email,
                             role: p.role,
                             name: p.name,
+                            avatar_url: p.avatar_url,
                         })
                         .collect::<Vec<BusterShareIndividual>>(),
                 )

apps/api/libs/handlers/src/metrics/get_metric_handler.rs

@@ -30,6 +30,7 @@ struct AssetPermissionInfo {
     role: AssetPermissionRole,
     email: String,
     name: Option<String>,
+    avatar_url: Option<String>,
 }
 
 /// Fetch the dashboards associated with the given metric id, filtered by user permissions
@@ -374,7 +375,7 @@ pub async fn get_metric_handler(
         .filter(asset_permissions::asset_type.eq(AssetType::MetricFile))
         .filter(asset_permissions::identity_type.eq(IdentityType::User))
         .filter(asset_permissions::deleted_at.is_null())
-        .select((asset_permissions::role, users::email, users::name))
+        .select((asset_permissions::role, users::email, users::name, users::avatar_url))
         .load::<AssetPermissionInfo>(&mut conn)
         .await;
 
@@ -438,6 +439,7 @@ pub async fn get_metric_handler(
                             email: p.email,
                             role: p.role,
                             name: p.name,
+                            avatar_url: p.avatar_url,
                         })
                         .collect::<Vec<crate::metrics::types::BusterShareIndividual>>(),
                 )

apps/api/libs/handlers/src/metrics/types.rs

@@ -23,6 +23,7 @@ pub struct BusterShareIndividual {
     pub email: String,
     pub role: AssetPermissionRole,
     pub name: Option<String>,
+    pub avatar_url: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]

apps/web/src/api/asset_interfaces/shared_interfaces/shareInterfaces.ts

@@ -1,17 +1,5 @@
 import type { ShareRole } from '@buster/server-shared/share';
 
-/**
- * Type defining the sharing permissions and settings for a dashboard
- *
- * @interface ShareRequest
- */
-export type SharePostRequest = {
-  email: string;
-  role: ShareRole;
-  avatar_url?: string | null;
-  name?: string | undefined;
-}[];
-
 export type ShareDeleteRequest = string[];
 
 export type ShareUpdateRequest = {

apps/web/src/api/buster_rest/collections/requests.ts

@@ -2,10 +2,10 @@ import type { ShareAssetType } from '@buster/server-shared/share';
 import type { BusterCollection, BusterCollectionListItem } from '@/api/asset_interfaces/collection';
 import type {
   ShareDeleteRequest,
-  SharePostRequest,
   ShareUpdateRequest
 } from '@/api/asset_interfaces/shared_interfaces';
 import mainApi from '@/api/buster_rest/instances';
+import { SharePostRequest } from '@buster/server-shared/share';
 
 export const collectionsGetList = async (params: {
   /** Current page number (1-based indexing) */

apps/web/src/api/buster_rest/dashboards/queryRequests.ts

@@ -355,17 +355,14 @@ export const useShareDashboard = () => {
   const { latestVersionNumber } = useGetDashboardVersionNumber();
   return useMutation({
     mutationFn: shareDashboard,
-    onMutate: (variables) => {
+    onMutate: ({ id, params }) => {
-      const queryKey = dashboardQueryKeys.dashboardGetDashboard(
+      const queryKey = dashboardQueryKeys.dashboardGetDashboard(id, latestVersionNumber).queryKey;
-        variables.id,
-        latestVersionNumber
-      ).queryKey;
 
       queryClient.setQueryData(queryKey, (previousData) => {
         if (!previousData) return previousData;
         return create(previousData, (draft) => {
           draft.individual_permissions = [
-            ...variables.params.map((p) => ({
+            ...params.map((p) => ({
               ...p,
               name: p.name,
               avatar_url: p.avatar_url || null

apps/web/src/api/buster_rest/dashboards/requests.ts

@@ -5,11 +5,11 @@ import type {
 } from '@/api/asset_interfaces/dashboard';
 import type {
   ShareDeleteRequest,
-  SharePostRequest,
   ShareUpdateRequest
 } from '@/api/asset_interfaces/shared_interfaces';
 import mainApi from '@/api/buster_rest/instances';
 import { serverFetch } from '@/api/createServerInstance';
+import { SharePostRequest } from '@buster/server-shared/share';
 
 export const dashboardsGetList = async (params: {
   /** The page number to fetch */

apps/web/src/api/buster_rest/metrics/requests.ts

@@ -9,8 +9,6 @@ import type {
   DuplicateMetricResponse,
   GetMetricDataRequest,
   ListMetricsResponse,
-  ShareMetricRequest,
-  ShareMetricResponse,
   UpdateMetricRequest,
   GetMetricRequest,
   GetMetricListRequest,
@@ -22,6 +20,7 @@ import type {
 } from '@buster/server-shared/metrics';
 import { serverFetch } from '@/api/createServerInstance';
 import { mainApi } from '../instances';
+import { SharePostRequest } from '@buster/server-shared/share';
 
 export const getMetric = async (params: GetMetricRequest): Promise<GetMetricResponse> => {
   return mainApi
@@ -85,7 +84,7 @@ export const bulkUpdateMetricVerificationStatus = async (
 
 // share metrics
 
-export const shareMetric = async ({ id, params }: { id: string; params: ShareMetricRequest }) => {
+export const shareMetric = async ({ id, params }: { id: string; params: SharePostRequest }) => {
   return mainApi.post<string>(`/metric_files/${id}/sharing`, params).then((res) => res.data);
 };
 

apps/web/src/api/buster_rest/metrics/updateMetricQueryRequests.ts

@@ -221,17 +221,14 @@ export const useShareMetric = () => {
   const { selectedVersionNumber } = useGetMetricVersionNumber();
   return useMutation({
     mutationFn: shareMetric,
-    onMutate: (variables) => {
+    onMutate: ({ id, params }) => {
-      const queryKey = metricsQueryKeys.metricsGetMetric(
+      const queryKey = metricsQueryKeys.metricsGetMetric(id, selectedVersionNumber).queryKey;
-        variables.id,
-        selectedVersionNumber
-      ).queryKey;
 
       queryClient.setQueryData(queryKey, (previousData: BusterMetric | undefined) => {
         if (!previousData) return previousData;
         return create(previousData, (draft: BusterMetric) => {
           draft.individual_permissions = [
-            ...variables.params.map((p) => ({
+            ...params.map((p) => ({
               ...p,
               name: p.name,
               avatar_url: p.avatar_url || null

packages/server-shared/src/chats/chat.types.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { ShareIndividualSchema } from '../share';
 import { ChatMessageSchema } from './chat-message.types';
 
 const AssetType = z.enum(['metric_file', 'dashboard_file']);
@@ -6,13 +7,6 @@ const AssetType = z.enum(['metric_file', 'dashboard_file']);
 // Asset Permission Role enum (matching database enum)
 export const AssetPermissionRoleSchema = z.enum(['viewer', 'editor', 'owner']);
 
-// Individual permission schema
-export const BusterShareIndividualSchema = z.object({
-  email: z.string().email(),
-  role: AssetPermissionRoleSchema,
-  name: z.string().optional(),
-});
-
 // Main ChatWithMessages schema
 export const ChatWithMessagesSchema = z.object({
   id: z.string(),
@@ -27,7 +21,7 @@ export const ChatWithMessagesSchema = z.object({
   created_by_name: z.string(),
   created_by_avatar: z.string().nullable(),
   // Sharing fields
-  individual_permissions: z.array(BusterShareIndividualSchema).optional(),
+  individual_permissions: z.array(ShareIndividualSchema).optional(),
   publicly_accessible: z.boolean(),
   public_expiry_date: z.string().datetime().optional(),
   public_enabled_by: z.string().optional(),
@@ -67,7 +61,6 @@ export const CancelChatParamsSchema = z.object({
 
 // Infer types from schemas
 export type AssetPermissionRole = z.infer<typeof AssetPermissionRoleSchema>;
-export type BusterShareIndividual = z.infer<typeof BusterShareIndividualSchema>;
 export type ChatWithMessages = z.infer<typeof ChatWithMessagesSchema>;
 export type ChatCreateRequest = z.infer<typeof ChatCreateRequestSchema>;
 export type ChatCreateHandlerRequest = z.infer<typeof ChatCreateHandlerRequestSchema>;

packages/server-shared/src/metrics/requests.types.ts

@@ -53,15 +53,6 @@ export const BulkUpdateMetricVerificationStatusRequestSchema = z.array(
   })
 );
 
-export const ShareMetricRequestSchema = z.array(
-  z.object({
-    email: z.string(),
-    name: z.string().optional(),
-    role: ShareRoleSchema,
-    avatar_url: z.string().nullable().optional(),
-  })
-);
-
 export const ShareDeleteRequestSchema = z.array(z.string());
 
 export const ShareUpdateRequestSchema = z.object({
@@ -87,6 +78,5 @@ export type DuplicateMetricRequest = z.infer<typeof DuplicateMetricRequestSchema
 export type BulkUpdateMetricVerificationStatusRequest = z.infer<
   typeof BulkUpdateMetricVerificationStatusRequestSchema
 >;
-export type ShareMetricRequest = z.infer<typeof ShareMetricRequestSchema>;
 export type ShareDeleteRequest = z.infer<typeof ShareDeleteRequestSchema>;
 export type ShareUpdateRequest = z.infer<typeof ShareUpdateRequestSchema>;

packages/server-shared/src/share/index.ts

@@ -1,2 +1,3 @@
 export * from './share-interfaces.types';
 export * from './verification.types';
+export * from './requests';

packages/server-shared/src/share/requests.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+import { ShareRoleSchema } from './share-interfaces.types';
+
+export const SharePostRequestSchema = z.array(
+  z.object({
+    email: z.string().email(),
+    role: ShareRoleSchema,
+    avatar_url: z.string().nullable().optional(),
+    name: z.string().optional(),
+  })
+);
+
+export type SharePostRequest = z.infer<typeof SharePostRequestSchema>;