From 7f5fdb9589c77dcb5e27c53f9891cf2015d435be Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Fri, 19 May 2023 16:35:51 +0530
Subject: [PATCH] fix: icon picker not working (#1080)

* fix: icon picker not working

* fix: project icon in analytics sidebar
---
 .../analytics/custom-analytics/sidebar.tsx    | 34 +++++++++---
 .../components/emoji-icon-picker/index.tsx    | 14 ++---
 .../components/emoji-icon-picker/types.d.ts   | 10 +++-
 .../project/create-project-modal.tsx          | 43 +++++++++++----
 .../project/single-project-card.tsx           | 13 +++--
 .../project/single-sidebar-project.tsx        | 13 ++++-
 apps/app/helpers/analytics.helper.ts          |  1 -
 .../projects/[projectId]/settings/control.tsx | 27 +++++-----
 .../projects/[projectId]/settings/index.tsx   | 53 +++++++++++++------
 apps/app/types/projects.d.ts                  | 21 ++++++--
 10 files changed, 158 insertions(+), 71 deletions(-)

diff --git a/apps/app/components/analytics/custom-analytics/sidebar.tsx b/apps/app/components/analytics/custom-analytics/sidebar.tsx
index 5988e654d..26eb66d12 100644
--- a/apps/app/components/analytics/custom-analytics/sidebar.tsx
+++ b/apps/app/components/analytics/custom-analytics/sidebar.tsx
@@ -153,12 +153,21 @@ export const AnalyticsSidebar: React.FC<Props> = ({
                     return (
                       <div key={project.id}>
                         <h5 className="text-sm flex items-center gap-1">
-                          {project.icon ? (
+                          {project.emoji ? (
                             <span className="grid h-6 w-6 flex-shrink-0 place-items-center">
-                              {String.fromCodePoint(parseInt(project.icon))}
+                              {String.fromCodePoint(parseInt(project.emoji))}
                             </span>
+                          ) : project.icon_prop ? (
+                            <div className="h-6 w-6 grid place-items-center flex-shrink-0">
+                              <span
+                                style={{ color: project.icon_prop.color }}
+                                className="material-symbols-rounded text-lg"
+                              >
+                                {project.icon_prop.name}
+                              </span>
+                            </div>
                           ) : (
-                            <span className="grid h-8 w-8 flex-shrink-0 place-items-center rounded bg-gray-700 uppercase text-white">
+                            <span className="grid h-6 w-6 mr-1 flex-shrink-0 place-items-center rounded bg-gray-700 uppercase text-white">
                               {project?.name.charAt(0)}
                             </span>
                           )}
@@ -254,12 +263,21 @@ export const AnalyticsSidebar: React.FC<Props> = ({
               ) : (
                 <div className="hidden md:flex md:flex-col h-full overflow-y-auto">
                   <div className="flex items-center gap-1">
-                    {projectDetails?.icon ? (
-                      <span className="grid h-6 w-6 flex-shrink-0 place-items-center">
-                        {String.fromCodePoint(parseInt(projectDetails.icon))}
-                      </span>
+                    {projectDetails?.emoji ? (
+                      <div className="grid h-6 w-6 flex-shrink-0 place-items-center">
+                        {String.fromCodePoint(parseInt(projectDetails.emoji))}
+                      </div>
+                    ) : projectDetails?.icon_prop ? (
+                      <div className="h-6 w-6 grid place-items-center flex-shrink-0">
+                        <span
+                          style={{ color: projectDetails.icon_prop.color }}
+                          className="material-symbols-rounded text-lg"
+                        >
+                          {projectDetails.icon_prop.name}
+                        </span>
+                      </div>
                     ) : (
-                      <span className="grid h-8 w-8 flex-shrink-0 place-items-center rounded bg-gray-700 uppercase text-white">
+                      <span className="grid h-6 w-6 mr-1 flex-shrink-0 place-items-center rounded bg-gray-700 uppercase text-white">
                         {projectDetails?.name.charAt(0)}
                       </span>
                     )}
diff --git a/apps/app/components/emoji-icon-picker/index.tsx b/apps/app/components/emoji-icon-picker/index.tsx
index e52335e47..f8f8e54e9 100644
--- a/apps/app/components/emoji-icon-picker/index.tsx
+++ b/apps/app/components/emoji-icon-picker/index.tsx
@@ -25,13 +25,7 @@ const tabOptions = [
   },
 ];
 
-const EmojiIconPicker: React.FC<Props> = ({
-  label,
-  value,
-  onChange,
-  onIconColorChange,
-  onIconsClick,
-}) => {
+const EmojiIconPicker: React.FC<Props> = ({ label, value, onChange, onIconColorChange }) => {
   const ref = useRef<HTMLDivElement>(null);
 
   const [isOpen, setIsOpen] = useState(false);
@@ -181,13 +175,13 @@ const EmojiIconPicker: React.FC<Props> = ({
                     </div>
                     <hr className="mb-1 h-[1px] w-full border-brand-base" />
                     <div className="mt-1 ml-1 grid grid-cols-8 gap-x-2 gap-y-3">
-                      {icons.material_rounded.map((icon) => (
+                      {icons.material_rounded.map((icon, index) => (
                         <button
+                          key={`${icon.name}-${index}`}
                           type="button"
                           className="mb-1 flex h-4 w-4 select-none items-center text-lg"
-                          key={icon.name}
                           onClick={() => {
-                            if (onIconsClick) onIconsClick(icon.name);
+                            onChange({ name: icon.name, color: activeColor });
                             setIsOpen(false);
                           }}
                         >
diff --git a/apps/app/components/emoji-icon-picker/types.d.ts b/apps/app/components/emoji-icon-picker/types.d.ts
index 0162640f5..c01dc2c2b 100644
--- a/apps/app/components/emoji-icon-picker/types.d.ts
+++ b/apps/app/components/emoji-icon-picker/types.d.ts
@@ -1,7 +1,13 @@
 export type Props = {
   label: string | React.ReactNode;
   value: any;
-  onChange: (data: any) => void;
-  onIconsClick?: (data: any) => void;
+  onChange: (
+    data:
+      | string
+      | {
+          name: string;
+          color: string;
+        }
+  ) => void;
   onIconColorChange?: (data: any) => void;
 };
diff --git a/apps/app/components/project/create-project-modal.tsx b/apps/app/components/project/create-project-modal.tsx
index 94b088133..c731c12f0 100644
--- a/apps/app/components/project/create-project-modal.tsx
+++ b/apps/app/components/project/create-project-modal.tsx
@@ -40,7 +40,7 @@ const defaultValues: Partial<IProject> = {
   identifier: "",
   description: "",
   network: 2,
-  icon: getRandomEmoji(),
+  emoji_and_icon: getRandomEmoji(),
   cover_image:
     "https://images.unsplash.com/photo-1575116464504-9e7652fddcb3?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=MnwyODUyNTV8MHwxfHNlYXJjaHwxOHx8cGxhbmV8ZW58MHx8fHwxNjgxNDY4NTY5&ixlib=rb-4.0.3&q=80&w=1080",
 };
@@ -113,8 +113,14 @@ export const CreateProjectModal: React.FC<Props> = (props) => {
 
   const onSubmit = async (formData: IProject) => {
     if (!workspaceSlug) return;
+
+    const { emoji_and_icon, ...payload } = formData;
+
+    if (typeof formData.emoji_and_icon === "object") payload.icon_prop = formData.emoji_and_icon;
+    else payload.emoji = formData.emoji_and_icon;
+
     await projectServices
-      .createProject(workspaceSlug as string, formData)
+      .createProject(workspaceSlug as string, payload)
       .then((res) => {
         mutate<IProject[]>(
           PROJECTS_LIST(workspaceSlug as string),
@@ -164,7 +170,7 @@ export const CreateProjectModal: React.FC<Props> = (props) => {
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
         >
-          <div className="fixed inset-0 bg-[#131313] bg-opacity-50 transition-opacity" />
+          <div className="fixed inset-0 bg-brand-backdrop bg-opacity-50 transition-opacity" />
         </Transition.Child>
 
         <div className="fixed inset-0 z-20 overflow-y-auto">
@@ -213,12 +219,31 @@ export const CreateProjectModal: React.FC<Props> = (props) => {
                   <div className="mt-5 space-y-4 px-4 py-3">
                     <div className="flex items-center gap-x-2">
                       <div>
-                        <EmojiIconPicker
-                          label={String.fromCodePoint(parseInt(watch("icon")))}
-                          onChange={(emoji) => {
-                            setValue("icon", emoji);
-                          }}
-                          value={watch("icon")}
+                        <Controller
+                          name="emoji_and_icon"
+                          control={control}
+                          render={({ field: { value, onChange } }) => (
+                            <EmojiIconPicker
+                              label={
+                                value ? (
+                                  typeof value === "object" ? (
+                                    <span
+                                      style={{ color: value.color }}
+                                      className="material-symbols-rounded text-lg"
+                                    >
+                                      {value.name}
+                                    </span>
+                                  ) : (
+                                    String.fromCodePoint(parseInt(value))
+                                  )
+                                ) : (
+                                  "Icon"
+                                )
+                              }
+                              onChange={onChange}
+                              value={value}
+                            />
+                          )}
                         />
                       </div>
 
diff --git a/apps/app/components/project/single-project-card.tsx b/apps/app/components/project/single-project-card.tsx
index c9e26f04e..c2844212d 100644
--- a/apps/app/components/project/single-project-card.tsx
+++ b/apps/app/components/project/single-project-card.tsx
@@ -185,11 +185,18 @@ export const SingleProjectCard: React.FC<ProjectCardProps> = ({
               <a>
                 <div className="flex items-center gap-1">
                   <h3 className="text-1.5xl font-medium text-brand-base">{project.name}</h3>
-                  {project.icon && (
+                  {project.emoji ? (
                     <span className="grid h-7 w-7 flex-shrink-0 place-items-center rounded uppercase">
-                      {String.fromCodePoint(parseInt(project.icon))}
+                      {String.fromCodePoint(parseInt(project.emoji))}
                     </span>
-                  )}
+                  ) : project.icon_prop ? (
+                    <span
+                      style={{ color: project.icon_prop.color }}
+                      className="material-symbols-rounded text-lg"
+                    >
+                      {project.icon_prop.name}
+                    </span>
+                  ) : null}
                 </div>
                 <p className="mt-3.5 mb-7 break-all">
                   {truncateText(project.description ?? "", 100)}
diff --git a/apps/app/components/project/single-sidebar-project.tsx b/apps/app/components/project/single-sidebar-project.tsx
index 4ff2b2cd3..9c73986a6 100644
--- a/apps/app/components/project/single-sidebar-project.tsx
+++ b/apps/app/components/project/single-sidebar-project.tsx
@@ -90,10 +90,19 @@ export const SingleSidebarProject: React.FC<Props> = ({
               }`}
             >
               <div className="flex items-center gap-x-2">
-                {project.icon ? (
+                {project.emoji ? (
                   <span className="grid h-7 w-7 flex-shrink-0 place-items-center rounded uppercase">
-                    {String.fromCodePoint(parseInt(project.icon))}
+                    {String.fromCodePoint(parseInt(project.emoji))}
                   </span>
+                ) : project.icon_prop ? (
+                  <div className="h-7 w-7 grid place-items-center">
+                    <span
+                      style={{ color: project.icon_prop.color }}
+                      className="material-symbols-rounded text-lg"
+                    >
+                      {project.icon_prop.name}
+                    </span>
+                  </div>
                 ) : (
                   <span className="grid h-7 w-7 flex-shrink-0 place-items-center rounded bg-gray-700 uppercase text-white">
                     {project?.name.charAt(0)}
diff --git a/apps/app/helpers/analytics.helper.ts b/apps/app/helpers/analytics.helper.ts
index f0c7864b5..efc781794 100644
--- a/apps/app/helpers/analytics.helper.ts
+++ b/apps/app/helpers/analytics.helper.ts
@@ -66,7 +66,6 @@ export const generateBarColor = (
   type: "x_axis" | "segment"
 ): string => {
   let color: string | undefined = generateRandomColor(value);
-  console.log(value);
 
   if (!analytics) return color;
 
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
index 1f529b143..932b9e323 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/control.tsx
@@ -56,27 +56,14 @@ const ControlSettings: NextPage = () => {
     formState: { isSubmitting },
   } = useForm<IProject>({ defaultValues });
 
-  useEffect(() => {
-    if (projectDetails)
-      reset({
-        ...projectDetails,
-        default_assignee: projectDetails.default_assignee?.id ?? projectDetails.default_assignee,
-        project_lead: projectDetails.project_lead?.id ?? projectDetails.project_lead,
-        workspace: (projectDetails.workspace as IWorkspace).id,
-      });
-  }, [projectDetails, reset]);
-
   const onSubmit = async (formData: IProject) => {
     if (!workspaceSlug || !projectId) return;
+
     const payload: Partial<IProject> = {
-      name: formData.name,
-      network: formData.network,
-      identifier: formData.identifier,
-      description: formData.description,
       default_assignee: formData.default_assignee,
       project_lead: formData.project_lead,
-      icon: formData.icon,
     };
+
     await projectService
       .updateProject(workspaceSlug as string, projectId as string, payload)
       .then((res) => {
@@ -94,6 +81,16 @@ const ControlSettings: NextPage = () => {
       });
   };
 
+  useEffect(() => {
+    if (projectDetails)
+      reset({
+        ...projectDetails,
+        default_assignee: projectDetails.default_assignee?.id ?? projectDetails.default_assignee,
+        project_lead: projectDetails.project_lead?.id ?? projectDetails.project_lead,
+        workspace: (projectDetails.workspace as IWorkspace).id,
+      });
+  }, [projectDetails, reset]);
+
   return (
     <ProjectAuthorizationWrapper
       breadcrumbs={
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
index d0b7f288e..5210c9ebe 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -74,8 +74,7 @@ const GeneralSettings: NextPage = () => {
     if (projectDetails)
       reset({
         ...projectDetails,
-        default_assignee: projectDetails.default_assignee?.id,
-        project_lead: projectDetails.project_lead?.id,
+        emoji_and_icon: projectDetails.emoji ?? projectDetails.icon_prop,
         workspace: (projectDetails.workspace as IWorkspace).id,
       });
   }, [projectDetails, reset]);
@@ -115,12 +114,17 @@ const GeneralSettings: NextPage = () => {
       network: formData.network,
       identifier: formData.identifier,
       description: formData.description,
-      default_assignee: formData.default_assignee,
-      project_lead: formData.project_lead,
-      icon: formData.icon,
       cover_image: formData.cover_image,
     };
 
+    if (typeof formData.emoji_and_icon === "object") {
+      payload.emoji = null;
+      payload.icon_prop = formData.emoji_and_icon;
+    } else {
+      payload.emoji = formData.emoji_and_icon;
+      payload.icon_prop = null;
+    }
+
     if (projectDetails.identifier !== formData.identifier)
       await projectService
         .checkProjectIdentifierAvailability(workspaceSlug as string, payload.identifier ?? "")
@@ -163,17 +167,34 @@ const GeneralSettings: NextPage = () => {
             </div>
             <div className="col-span-12 flex gap-2 sm:col-span-6">
               {projectDetails ? (
-                <Controller
-                  control={control}
-                  name="icon"
-                  render={({ field: { value, onChange } }) => (
-                    <EmojiIconPicker
-                      label={value ? String.fromCodePoint(parseInt(value)) : "Icon"}
-                      value={value}
-                      onChange={onChange}
-                    />
-                  )}
-                />
+                <div className="h-7 w-7 grid place-items-center">
+                  <Controller
+                    control={control}
+                    name="emoji_and_icon"
+                    render={({ field: { value, onChange } }) => (
+                      <EmojiIconPicker
+                        label={
+                          value ? (
+                            typeof value === "object" ? (
+                              <span
+                                style={{ color: value.color }}
+                                className="material-symbols-rounded text-lg"
+                              >
+                                {value.name}
+                              </span>
+                            ) : (
+                              String.fromCodePoint(parseInt(value))
+                            )
+                          ) : (
+                            "Icon"
+                          )
+                        }
+                        value={value}
+                        onChange={onChange}
+                      />
+                    )}
+                  />
+                </div>
               ) : (
                 <Loader>
                   <Loader.Item height="46px" width="46px" />
diff --git a/apps/app/types/projects.d.ts b/apps/app/types/projects.d.ts
index 11c76ab61..60195f850 100644
--- a/apps/app/types/projects.d.ts
+++ b/apps/app/types/projects.d.ts
@@ -9,22 +9,33 @@ import type {
 } from "./";
 
 export interface IProject {
-  cover_image: string | null;
   created_at: Date;
   created_by: string;
+  cover_image: string | null;
   cycle_view: boolean;
-  issue_views_view: boolean;
-  module_view: boolean;
-  page_view: boolean;
   default_assignee: IUser | string | null;
   description: string;
+  emoji: string | null;
+  emoji_and_icon:
+    | string
+    | {
+        name: string;
+        color: string;
+      }
+    | null;
   estimate: string | null;
-  icon: string;
+  icon_prop: {
+    name: string;
+    color: string;
+  } | null;
   id: string;
   identifier: string;
   is_favorite: boolean;
+  issue_views_view: boolean;
+  module_view: boolean;
   name: string;
   network: number;
+  page_view: boolean;
   project_lead: IUser | string | null;
   slug: string;
   total_cycles: number;