fix: minor fixes for issue relations list and retrival

makeplane · Jan 22, 2025 · 2374c09 · 2374c09
1 parent 8f3a0be
commit 2374c09
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 49 deletions.
diff --git a/web/core/components/issues/relations/issue-list-item.tsx b/web/core/components/issues/relations/issue-list-item.tsx
@@ -134,58 +134,62 @@ export const RelationIssueListItem: FC<Props> = observer((props) => {
                 <span className="w-full truncate text-sm text-custom-text-100">{issue.name}</span>
               </Tooltip>
             </div>
-            <div
-              className="flex-shrink-0 text-sm"
-              onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-              }}
-            >
-              <RelationIssueProperty
-                workspaceSlug={workspaceSlug}
-                issueId={relationIssueId}
-                disabled={disabled}
-                issueOperations={issueOperations}
-                issueServiceType={issueServiceType}
-              />
-            </div>
-            <div className="flex-shrink-0 text-sm">
-              <CustomMenu placement="bottom-end" ellipsis>
-                {!disabled && (
-                  <CustomMenu.MenuItem onClick={handleEditIssue}>
-                    <div className="flex items-center gap-2">
-                      <Pencil className="h-3.5 w-3.5" strokeWidth={2} />
-                      <span>Edit issue</span>
-                    </div>
-                  </CustomMenu.MenuItem>
-                )}
+            {!issue.is_epic && (
+              <>
+                <div
+                  className="flex-shrink-0 text-sm"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                  }}
+                >
+                  <RelationIssueProperty
+                    workspaceSlug={workspaceSlug}
+                    issueId={relationIssueId}
+                    disabled={disabled}
+                    issueOperations={issueOperations}
+                    issueServiceType={issueServiceType}
+                  />
+                </div>
+                <div className="flex-shrink-0 text-sm">
+                  <CustomMenu placement="bottom-end" ellipsis>
+                    {!disabled && (
+                      <CustomMenu.MenuItem onClick={handleEditIssue}>
+                        <div className="flex items-center gap-2">
+                          <Pencil className="h-3.5 w-3.5" strokeWidth={2} />
+                          <span>Edit issue</span>
+                        </div>
+                      </CustomMenu.MenuItem>
+                    )}
 
-                <CustomMenu.MenuItem onClick={handleCopyIssueLink}>
-                  <div className="flex items-center gap-2">
-                    <LinkIcon className="h-3.5 w-3.5" strokeWidth={2} />
-                    <span>Copy issue link</span>
-                  </div>
-                </CustomMenu.MenuItem>
+                    <CustomMenu.MenuItem onClick={handleCopyIssueLink}>
+                      <div className="flex items-center gap-2">
+                        <LinkIcon className="h-3.5 w-3.5" strokeWidth={2} />
+                        <span>Copy issue link</span>
+                      </div>
+                    </CustomMenu.MenuItem>
 
-                {!disabled && (
-                  <CustomMenu.MenuItem onClick={handleRemoveRelation}>
-                    <div className="flex items-center gap-2">
-                      <X className="h-3.5 w-3.5" strokeWidth={2} />
-                      <span>Remove relation</span>
-                    </div>
-                  </CustomMenu.MenuItem>
-                )}
+                    {!disabled && (
+                      <CustomMenu.MenuItem onClick={handleRemoveRelation}>
+                        <div className="flex items-center gap-2">
+                          <X className="h-3.5 w-3.5" strokeWidth={2} />
+                          <span>Remove relation</span>
+                        </div>
+                      </CustomMenu.MenuItem>
+                    )}
 
-                {!disabled && (
-                  <CustomMenu.MenuItem onClick={handleDeleteIssue}>
-                    <div className="flex items-center gap-2">
-                      <Trash className="h-3.5 w-3.5" strokeWidth={2} />
-                      <span>Delete issue</span>
-                    </div>
-                  </CustomMenu.MenuItem>
-                )}
-              </CustomMenu>
-            </div>
+                    {!disabled && (
+                      <CustomMenu.MenuItem onClick={handleDeleteIssue}>
+                        <div className="flex items-center gap-2">
+                          <Trash className="h-3.5 w-3.5" strokeWidth={2} />
+                          <span>Delete issue</span>
+                        </div>
+                      </CustomMenu.MenuItem>
+                    )}
+                  </CustomMenu>
+                </div>
+              </>
+            )}
           </div>
         )}
       </ControlLink>

diff --git a/web/core/services/issue/issue.service.ts b/web/core/services/issue/issue.service.ts
@@ -117,6 +117,10 @@ export class IssueService extends APIService {
         if (response.data && this.serviceType === EIssueServiceType.ISSUES) {
           updateIssue({ ...response.data, is_local_update: 1 });
         }
+        // add is_epic flag when the service type is epic
+        if (response.data && this.serviceType === EIssueServiceType.EPICS) {
+          response.data.is_epic = true;
+        }
         return response?.data;
       })
       .catch((error) => {

diff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.ts
@@ -188,6 +188,7 @@ export class IssueStore implements IIssueStore {
       updated_by: issue?.updated_by,
       is_draft: issue?.is_draft,
       is_subscribed: issue?.is_subscribed,
+      is_epic: issue?.is_epic,
     };
 
     this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload]);