fix: fix the wrong organization profile object (#946)

Because - fix the wrong organization profile object This commit - fix the wrong organization profile object
instill-ai · Feb 10, 2024 · 1f9780b · 1f9780b
1 parent 03ef163
commit 1f9780b
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 22 deletions.
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@instill-ai/toolkit",
-  "version": "0.80.3",
+  "version": "0.80.4-rc.2",
   "description": "Instill AI's frontend toolkit",
   "repository": "https://github.com/instill-ai/design-system.git",
   "bugs": "https://github.com/instill-ai/design-system/issues",

diff --git a/packages/toolkit/src/components/card-pipeline/Head.tsx b/packages/toolkit/src/components/card-pipeline/Head.tsx
@@ -64,7 +64,7 @@ export const Head = ({
     <div className="flex flex-row p-3">
       <div className="mr-auto flex flex-row gap-x-2">
         <EntityAvatar
-          src={pipeline.owner.profile_avatar ?? null}
+          src={pipeline.owner?.profile?.avatar ?? null}
           className="h-8 w-8"
           entityName={ownerID}
           fallbackImg={

diff --git a/packages/toolkit/src/lib/vdp-sdk/mgmt/types.ts b/packages/toolkit/src/lib/vdp-sdk/mgmt/types.ts
@@ -6,7 +6,7 @@ export type UserProfile = {
   public_email?: string;
   company_name?: string;
   avatar?: string;
-  social_profiles?: {
+  social_profiles_links?: {
     webiste?: string;
     x?: string;
     github?: string;

diff --git a/packages/toolkit/src/lib/vdp-sdk/organization/mutations.ts b/packages/toolkit/src/lib/vdp-sdk/organization/mutations.ts
@@ -6,13 +6,12 @@ import {
   OrganizationMembership,
   MembershipState,
   UserMembership,
+  OrganizationProfile,
 } from "./types";
 
 export type CreateOrganizationPayload = {
   id: string;
-  org_name: string;
-  profile_avatar?: Nullable<string>;
-  profile_data?: Nullable<GeneralRecord>;
+  profile?: OrganizationProfile;
 };
 
 export type CreateOrganizationResponse = {
@@ -46,9 +45,7 @@ export type UpdateOrganizationResponse = {
 
 export type UpdateOrganizationPayload = {
   id: string;
-  org_name: string;
-  profile_avatar?: Nullable<string>;
-  profile_data?: Nullable<GeneralRecord>;
+  profile?: Partial<OrganizationProfile>;
 };
 
 export async function updateOrganizationMutation({

diff --git a/packages/toolkit/src/lib/vdp-sdk/organization/types.ts b/packages/toolkit/src/lib/vdp-sdk/organization/types.ts
@@ -2,17 +2,26 @@ import { GeneralRecord, Nullable } from "../../type";
 import { User } from "../mgmt";
 import { StripeSubscriptionDetail } from "../types";
 
+export type OrganizationProfile = {
+  display_name?: string;
+  bio?: string;
+  public_email?: string;
+  avatar?: string;
+  social_profiles_links?: {
+    webiste?: string;
+    x?: string;
+    github?: string;
+  };
+};
+
 export type Organization = {
   name: string;
   uid: string;
   id: string;
   create_time: string;
   update_time: string;
-  org_name: string;
-  customer_id: string;
-  profile_avatar: Nullable<string>;
-  profile_data: Nullable<GeneralRecord>;
-  owner: Nullable<User>;
+  owner: User;
+  profile?: OrganizationProfile;
 };
 
 export type OrganizationSubscriptionPlan =

diff --git a/...s/toolkit/src/view/pipeline-builder/components/dialogs/share-pipeline-dialog/TabShare.tsx b/...s/toolkit/src/view/pipeline-builder/components/dialogs/share-pipeline-dialog/TabShare.tsx
@@ -184,7 +184,7 @@ export const TabShare = () => {
       <div className="flex flex-row">
         <div className="mr-auto flex flex-row gap-x-2">
           <EntityAvatar
-            src={pipeline.data?.owner.profile_avatar ?? null}
+            src={pipeline.data?.owner?.profile.avatar ?? null}
             entityName={pipeline.data?.owner_name ?? ""}
             className="h-[30px] w-[30px]"
             fallbackImg={

diff --git a/packages/toolkit/src/view/pipeline/view-pipeline/Head.tsx b/packages/toolkit/src/view/pipeline/view-pipeline/Head.tsx
@@ -94,7 +94,7 @@ export const Head = () => {
                 {entityObject.isSuccess ? (
                   entityObject.namespaceType === "NAMESPACE_ORGANIZATION" ? (
                     <EntityAvatar
-                      src={organization.data?.profile_avatar ?? null}
+                      src={organization.data?.profile?.avatar ?? null}
                       entityName={organization.data?.name ?? ""}
                       className="h-6 w-6"
                       fallbackImg={

diff --git a/packages/toolkit/src/view/profile/user-profile-view/Bio.tsx b/packages/toolkit/src/view/profile/user-profile-view/Bio.tsx
@@ -128,7 +128,7 @@ export const UserProfileBio = ({
               >
                 <EntityAvatar
                   entityName={membership.organization.name}
-                  src={membership.organization.profile_avatar ?? null}
+                  src={membership.organization.profile?.avatar ?? null}
                   className="h-5 w-5"
                   fallbackImg={
                     <Icons.User02 className="h-5 w-5 stroke-semantic-fg-secondary" />

diff --git a/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx b/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx
@@ -74,8 +74,10 @@ export const UserProfileView = () => {
               entityObject.isSuccess &&
               me.data.id === String(entityObject.entity)
             }
-            twitterLink={user.data.profile?.social_profiles?.x ?? null}
-            githubLink={user.data.profile?.social_profiles?.github ?? null}
+            twitterLink={user.data.profile?.social_profiles_links?.x ?? null}
+            githubLink={
+              user.data.profile?.social_profiles_links?.github ?? null
+            }
           />
         ) : (
           <UserProfileBio.Skeleton />

diff --git a/packages/toolkit/src/view/settings/user/UserProfileTab.tsx b/packages/toolkit/src/view/settings/user/UserProfileTab.tsx
@@ -30,11 +30,11 @@ import { useUpdateAuthenticatedUser } from "../../../lib";
 
 export const UserProfileTabSchema = z.object({
   id: z.string().min(1, "User name is required"),
-  profile_avatar: z.string().optional(),
   newsletter_subscription: z.boolean(),
 
   profile: z
     .object({
+      avatar: z.string().optional(),
       display_name: z.string().optional(),
       company_name: z.string().optional(),
       bio: z.string().optional(),
@@ -132,7 +132,7 @@ export const UserProfileTab = () => {
     setIsOpenProfileAvatar(false);
     setProfileAvatar(null);
 
-    form.resetField("profile_avatar");
+    form.resetField("profile.avatar");
   }
 
   return (
@@ -279,7 +279,7 @@ export const UserProfileTab = () => {
             <Setting.TabSectionContent className="gap-y-4">
               <Form.Field
                 control={form.control}
-                name="profile_avatar"
+                name="profile.avatar"
                 render={({ field }) => {
                   return (
                     <Form.Item className="w-full">