Fix role and organization logo

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

apps/console/src/layouts/MainLayout.tsx

@@ -384,14 +384,14 @@ function OrganizationSelector({
 
               const isSAMLUrl = targetUrl.includes("/connect/saml/");
 
+              // Use organization endpoint for all logos for consistency
+              const logoUrl = organization.logoUrl;
+
               return (
                 <DropdownItem asChild key={organization.id}>
                   {isSAMLUrl ? (
                     <a href={targetUrl} className="flex items-center gap-2">
-                      <Avatar
-                        name={organization.name}
-                        src={organization.logoUrl}
-                      />
+                      <Avatar name={organization.name} src={logoUrl} />
                       <span className="flex-1">{organization.name}</span>
                       {isAuthenticated && (
                         <IconCheckmark1 size={16} className="text-green-600" />
@@ -405,10 +405,7 @@ function OrganizationSelector({
                     </a>
                   ) : (
                     <Link to={targetUrl} className="flex items-center gap-2">
-                      <Avatar
-                        name={organization.name}
-                        src={organization.logoUrl}
-                      />
+                      <Avatar name={organization.name} src={logoUrl} />
                       <span className="flex-1">{organization.name}</span>
                       {isAuthenticated && (
                         <IconCheckmark1 size={16} className="text-green-600" />

apps/console/src/pages/organizations/settings/GeneralSettingsTab.tsx

@@ -175,19 +175,23 @@ export default function GeneralSettingsTab() {
     const reader = new FileReader();
     reader.onload = () => {
       setLogoPreview(reader.result as string);
-      updateOrganization({
-        variables: {
-          input: {
-            organizationId: organization.id,
-            logo: file,
-          },
-        },
-        onCompleted: () => {
-          setLogoPreview(null);
-        },
-      });
     };
     reader.readAsDataURL(file);
+
+    updateOrganization({
+      variables: {
+        input: {
+          organizationId: organization.id,
+          logoFile: null,
+        },
+      },
+      uploadables: {
+        "input.logoFile": file,
+      },
+      onCompleted: () => {
+        setLogoPreview(null);
+      },
+    });
   };
 
   const handleHorizontalLogoChange: ChangeEventHandler<HTMLInputElement> = (
@@ -199,19 +203,23 @@ export default function GeneralSettingsTab() {
     const reader = new FileReader();
     reader.onload = () => {
       setHorizontalLogoPreview(reader.result as string);
-      updateOrganization({
-        variables: {
-          input: {
-            organizationId: organization.id,
-            horizontalLogo: file,
-          },
-        },
-        onCompleted: () => {
-          setHorizontalLogoPreview(null);
-        },
-      });
     };
     reader.readAsDataURL(file);
+
+    updateOrganization({
+      variables: {
+        input: {
+          organizationId: organization.id,
+          horizontalLogoFile: null,
+        },
+      },
+      uploadables: {
+        "input.horizontalLogoFile": file,
+      },
+      onCompleted: () => {
+        setHorizontalLogoPreview(null);
+      },
+    });
   };
 
   const handleDeleteHorizontalLogo = () => {