From 097365b9b9e4a53f0888777ee1abf142ecc31c25 Mon Sep 17 00:00:00 2001
From: anmolsinghbhatia <anmolsinghbhatia@caravel.tech>
Date: Mon, 24 Jul 2023 18:43:50 +0530
Subject: [PATCH 1/2] style: issue label ui updated

---
 .../core/board-view/single-issue.tsx          | 10 +---
 .../core/list-view/single-issue.tsx           | 14 +----
 .../core/spreadsheet-view/single-issue.tsx    | 12 +---
 apps/app/components/issues/index.ts           |  1 +
 apps/app/components/issues/label.tsx          | 55 +++++++++++++++++++
 5 files changed, 63 insertions(+), 29 deletions(-)
 create mode 100644 apps/app/components/issues/label.tsx

diff --git a/apps/app/components/core/board-view/single-issue.tsx b/apps/app/components/core/board-view/single-issue.tsx
index bd87dde6cbb..bab90c53797 100644
--- a/apps/app/components/core/board-view/single-issue.tsx
+++ b/apps/app/components/core/board-view/single-issue.tsx
@@ -23,7 +23,7 @@ import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
   ViewEstimateSelect,
-  ViewLabelSelect,
+  ViewIssueLabel,
   ViewPrioritySelect,
   ViewStateSelect,
 } from "components/issues";
@@ -365,13 +365,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
               />
             )}
             {properties.labels && issue.labels.length > 0 && (
-              <ViewLabelSelect
-                issue={issue}
-                partialUpdateIssue={partialUpdateIssue}
-                isNotAllowed={isNotAllowed}
-                user={user}
-                selfPositioned
-              />
+              <ViewIssueLabel issue={issue} maxRender={2} />
             )}
             {properties.assignee && (
               <ViewAssigneeSelect
diff --git a/apps/app/components/core/list-view/single-issue.tsx b/apps/app/components/core/list-view/single-issue.tsx
index 7e397fb7415..77b67945ddc 100644
--- a/apps/app/components/core/list-view/single-issue.tsx
+++ b/apps/app/components/core/list-view/single-issue.tsx
@@ -14,10 +14,10 @@ import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
   ViewEstimateSelect,
-  ViewLabelSelect,
+  ViewIssueLabel,
   ViewPrioritySelect,
   ViewStateSelect,
-} from "components/issues/view-select";
+} from "components/issues";
 // hooks
 import useIssueView from "hooks/use-issues-view";
 // ui
@@ -279,15 +279,7 @@ export const SingleListIssue: React.FC<Props> = ({
               isNotAllowed={isNotAllowed}
             />
           )}
-          {properties.labels && issue.labels.length > 0 && (
-            <ViewLabelSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              position="right"
-              user={user}
-              isNotAllowed={isNotAllowed}
-            />
-          )}
+          {properties.labels && <ViewIssueLabel issue={issue} maxRender={3} />}
           {properties.assignee && (
             <ViewAssigneeSelect
               issue={issue}
diff --git a/apps/app/components/core/spreadsheet-view/single-issue.tsx b/apps/app/components/core/spreadsheet-view/single-issue.tsx
index e85814ea79b..bd2d5d101cf 100644
--- a/apps/app/components/core/spreadsheet-view/single-issue.tsx
+++ b/apps/app/components/core/spreadsheet-view/single-issue.tsx
@@ -10,7 +10,7 @@ import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
   ViewEstimateSelect,
-  ViewLabelSelect,
+  ViewIssueLabel,
   ViewPrioritySelect,
   ViewStateSelect,
 } from "components/issues";
@@ -311,15 +311,7 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
       )}
       {properties.labels && (
         <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
-          <ViewLabelSelect
-            issue={issue}
-            partialUpdateIssue={partialUpdateIssue}
-            position="left"
-            tooltipPosition={tooltipPosition}
-            customButton
-            user={user}
-            isNotAllowed={isNotAllowed}
-          />
+          <ViewIssueLabel issue={issue} maxRender={1} />
         </div>
       )}
 
diff --git a/apps/app/components/issues/index.ts b/apps/app/components/issues/index.ts
index 0ac13c99281..7e9bff17567 100644
--- a/apps/app/components/issues/index.ts
+++ b/apps/app/components/issues/index.ts
@@ -13,3 +13,4 @@ export * from "./my-issues-list-item";
 export * from "./parent-issues-list-modal";
 export * from "./sidebar";
 export * from "./sub-issues-list";
+export * from "./label";
diff --git a/apps/app/components/issues/label.tsx b/apps/app/components/issues/label.tsx
new file mode 100644
index 00000000000..b59c1e2ec11
--- /dev/null
+++ b/apps/app/components/issues/label.tsx
@@ -0,0 +1,55 @@
+import React from "react";
+
+// components
+import { Tooltip } from "components/ui";
+// types
+import { IIssue } from "types";
+
+type Props = {
+  issue: IIssue;
+  maxRender?: number;
+};
+
+export const ViewIssueLabel: React.FC<Props> = ({ issue, maxRender = 1 }) => (
+  <>
+    {issue.label_details.length > 0 ? (
+      issue.label_details.length < maxRender || issue.label_details.length === maxRender ? (
+        <>
+          {issue.label_details.map((label, index) => (
+            <div
+              key={label.id}
+              className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm"
+            >
+              <Tooltip position="top" tooltipHeading="Label" tooltipContent={label.name}>
+                <div className="flex items-center gap-1.5 text-custom-text-200">
+                  <span
+                    className="h-2 w-2 flex-shrink-0 rounded-full"
+                    style={{
+                      backgroundColor: label?.color ?? "#000000",
+                    }}
+                  />
+                  {label.name}
+                </div>
+              </Tooltip>
+            </div>
+          ))}
+        </>
+      ) : (
+        <div className="flex cursor-default items-center rounded-md border border-custom-border-300 px-2.5 py-1 text-xs shadow-sm">
+          <Tooltip
+            position="top"
+            tooltipHeading="Labels"
+            tooltipContent={issue.label_details.map((l) => l.name).join(", ")}
+          >
+            <div className="flex items-center gap-1.5 text-custom-text-200">
+              <span className="h-2 w-2 flex-shrink-0 rounded-full bg-custom-primary" />
+              {`${issue.label_details.length} Labels`}
+            </div>
+          </Tooltip>
+        </div>
+      )
+    ) : (
+      ""
+    )}
+  </>
+);

From ff0275aff6d536334c6d5a6eb6786f4ffd47dc05 Mon Sep 17 00:00:00 2001
From: anmolsinghbhatia <anmolsinghbhatia@caravel.tech>
Date: Tue, 25 Jul 2023 11:59:21 +0530
Subject: [PATCH 2/2] chore: code refactor

---
 apps/app/components/issues/label.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/components/issues/label.tsx b/apps/app/components/issues/label.tsx
index b59c1e2ec11..f3a7be9dd96 100644
--- a/apps/app/components/issues/label.tsx
+++ b/apps/app/components/issues/label.tsx
@@ -13,7 +13,7 @@ type Props = {
 export const ViewIssueLabel: React.FC<Props> = ({ issue, maxRender = 1 }) => (
   <>
     {issue.label_details.length > 0 ? (
-      issue.label_details.length < maxRender || issue.label_details.length === maxRender ? (
+      issue.label_details.length <= maxRender ? (
         <>
           {issue.label_details.map((label, index) => (
             <div