diff --git a/web/components/issues/issue-layouts/spreadsheet/columns/issue/issue-column.tsx b/web/components/issues/issue-layouts/spreadsheet/columns/issue/issue-column.tsx index 5b6da6871..65547a805 100644 --- a/web/components/issues/issue-layouts/spreadsheet/columns/issue/issue-column.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/columns/issue/issue-column.tsx @@ -63,7 +63,7 @@ export const IssueColumn: React.FC = ({ const paddingLeft = `${nestingLevel * 54}px`; return ( -
+
{properties.key && (
= (props) => { )}
+
- - <> - {issues?.map((issue) => ( - ( +
+ {property === "state" ? ( + ) => handleUpdateIssue(issue, data)} + states={states} + /> + ) : property === "priority" ? ( + - {property === "state" ? ( - ) => handleUpdateIssue(issue, data)} - states={states} - /> - ) : property === "priority" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "estimate" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "assignee" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "labels" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "start_date" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "due_date" ? ( - ) => handleUpdateIssue(issue, data)} - /> - ) : property === "created_on" ? ( - - ) : property === "updated_on" ? ( - - ) : null} - - ))} - - + disabled={disableUserActions} + expandedIssues={expandedIssues} + issue={issue} + onChange={(data: Partial) => handleUpdateIssue(issue, data)} + /> + ) : property === "estimate" ? ( + ) => handleUpdateIssue(issue, data)} + /> + ) : property === "assignee" ? ( + ) => handleUpdateIssue(issue, data)} + /> + ) : property === "labels" ? ( + ) => handleUpdateIssue(issue, data)} + /> + ) : property === "start_date" ? ( + ) => handleUpdateIssue(issue, data)} + /> + ) : property === "due_date" ? ( + ) => handleUpdateIssue(issue, data)} + /> + ) : property === "created_on" ? ( + + ) : property === "updated_on" ? ( + + ) : null} +
+ ))}
); diff --git a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx index fe814f5fd..2be3a927e 100644 --- a/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx +++ b/web/components/issues/issue-layouts/spreadsheet/spreadsheet-view.tsx @@ -19,7 +19,6 @@ import { IStateResponse, IUserLite, } from "types"; -import { Command } from "cmdk"; type Props = { displayProperties: IIssueDisplayProperties; @@ -81,68 +80,66 @@ export const SpreadsheetView: React.FC = observer((props) => { }, []); return ( - - -
-
-
- {issues ? ( - <> -
-
-
- {displayProperties.key && ( - ID - )} - Issue -
- - {issues.map((issue: IIssue, index) => ( - - ))} -
+
+
+
+ {issues ? ( + <> +
+
+
+ {displayProperties.key && ( + ID + )} + Issue
- - - ) : ( -
- + {issues.map((issue: IIssue, index) => ( + + ))}
- )} -
+
-
-
- {/* + + ) : ( +
+ +
+ )} +
+ +
+
+ {/* setIsInlineCreateIssueFormOpen(false)} prePopulatedData={{ @@ -150,45 +147,43 @@ export const SpreadsheetView: React.FC = observer((props) => { ...(moduleId && { module: moduleId.toString() }), }} /> */} -
+
- {!disableUserActions && - !isInlineCreateIssueFormOpen && - (type === "issue" ? ( + {!disableUserActions && + !isInlineCreateIssueFormOpen && + (type === "issue" ? ( + + ) : ( + setIsInlineCreateIssueFormOpen(true)} + className="flex gap-1.5 items-center text-custom-primary-100 pl-4 py-2.5 text-sm sticky left-0 z-[1] border-custom-border-200 w-full" + type="button" > New Issue - ) : ( - - - New Issue - - } - optionsClassName="left-5 !w-36" - noBorder - > - setIsInlineCreateIssueFormOpen(true)}> - Create new - - {openIssuesListModal && ( - Add an existing issue - )} - - ))} -
-
+ } + optionsClassName="left-5 !w-36" + noBorder + > + setIsInlineCreateIssueFormOpen(true)}> + Create new + + {openIssuesListModal && ( + Add an existing issue + )} + + ))}
- - +
+
); });