π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1956] fix: Keyboard shortcuts (#5134)
Akshita Goyale7948eabf25e
diff --git a/web/core/components/command-palette/command-modal.tsx b/web/core/components/command-palette/command-modal.tsxindex e24e64f3e8..f0c779c55a 100644--- a/web/core/components/command-palette/command-modal.tsx+++ b/web/core/components/command-palette/command-modal.tsx@@ -46,7 +46,7 @@ export const CommandModal: React.FC = observer(() => {// hooksconst { getProjectById, workspaceProjectIds } = useProject();const { isMobile } = usePlatformOS();- const { canPerformWorkspaceCreateActions } = useUser();+ const { canPerformAnyCreateAction } = useUser();// statesconst [placeholder, setPlaceholder] = useState("Type a command or search...");const [resultsCount, setResultsCount] = useState(0);@@ -286,7 +286,7 @@ export const CommandModal: React.FC = observer(() => {{workspaceSlug &&workspaceProjectIds &&workspaceProjectIds.length > 0 &&- canPerformWorkspaceCreateActions && (+ canPerformAnyCreateAction && (<Command.Group heading="Issue"><Command.ItemonSelect={() => {diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsxindex 70eef011f3..ab9215d3e0 100644--- a/web/core/components/command-palette/command-palette.tsx+++ b/web/core/components/command-palette/command-palette.tsx@@ -41,7 +41,12 @@ export const CommandPalette: FC = observer(() => {const { toggleSidebar } = useAppTheme();const { setTrackElement } = useEventTracker();const { platform } = usePlatformOS();- const { data: currentUser, canPerformProjectCreateActions, canPerformWorkspaceCreateActions } = useUser();+ const {+ data: currentUser,+ canPerformProjectCreateActions,+ canPerformWorkspaceCreateActions,+ canPerformAnyCreateAction,+ } = useUser();const {issues: { removeIssue },} = useIssuesStore();@@ -120,6 +125,18 @@ export const CommandPalette: FC = observer(() => {[canPerformWorkspaceCreateActions]);+ const performAnyProjectCreateActions = useCallback(+ (showToast: boolean = true) => {+ if (!canPerformAnyCreateAction && showToast)+ setToast({+ type: TOAST_TYPE.ERROR,+ title: "You don't have permission to perform this action.",+ });+ return canPerformAnyCreateAction;+ },+ [canPerformAnyCreateAction]+ );+const shortcutsList: {global: Record<string, { title: string; description: string; action: () => void }>;workspace: Record<string, { title: string; description: string; action: () => void }>;@@ -222,7 +239,10 @@ export const CommandPalette: FC = observer(() => {}} else if (!isAnyModalOpen) {setTrackElement("Shortcut key");- if (Object.keys(shortcutsList.global).includes(keyPressed) && performWorkspaceCreateActions())+ if (+ Object.keys(shortcutsList.global).includes(keyPressed) &&+ ((!projectId && performAnyProjectCreateActions()) || performProjectCreateActions())+ )shortcutsList.global[keyPressed].action();// workspace authorized actionselse if (@@ -244,6 +264,7 @@ export const CommandPalette: FC = observer(() => {}},[+ performAnyProjectCreateActions,performProjectCreateActions,performWorkspaceCreateActions,copyIssueUrlToClipboard,diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsxindex b041cf3dd3..8c6cd1b8c0 100644--- a/web/core/components/issues/issue-modal/form.tsx+++ b/web/core/components/issues/issue-modal/form.tsx@@ -32,7 +32,7 @@ import { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper"import { getChangedIssuefields, getDescriptionPlaceholder } from "@/helpers/issue.helper";import { shouldRenderProject } from "@/helpers/project.helper";// hooks-import { useProjectEstimates, useInstance, useIssueDetail, useProject, useWorkspace } from "@/hooks/store";+import { useProjectEstimates, useInstance, useIssueDetail, useProject, useWorkspace, useUser } from "@/hooks/store";import useKeypress from "@/hooks/use-keypress";import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";// services@@ -121,6 +121,8 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {const workspaceStore = useWorkspace();const workspaceId = workspaceStore.getWorkspaceBySlug(workspaceSlug?.toString())?.id as string;const { config } = useInstance();+ const { projectsWithCreatePermissions } = useUser();+const { getProjectById } = useProject();const { areEstimateEnabledByProjectId } = useProjectEstimates();@@ -341,20 +343,24 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {rules={{required: true,}}- render={({ field: { value, onChange } }) => (- <div className="h-7">- <ProjectDropdown- value={value}- onChange={(projectId) => {- onChange(projectId);- handleFormChange();- }}- buttonVariant="border-with-text"- renderCondition={(project) => shouldRenderProject(project)}- tabIndex={getTabIndex("project_id")}- />- </div>- )}+ render={({ field: { value, onChange } }) =>+ projectsWithCreatePermissions && projectsWithCreatePermissions[value!] ? (+ <div className="h-7">+ <ProjectDropdown+ value={value}+ onChange={(projectId) => {+ onChange(projectId);+ handleFormChange();+ }}+ buttonVariant="border-with-text"+ renderCondition={(project) => shouldRenderProject(project)}+ tabIndex={getTabIndex("project_id")}+ />+ </div>+ ) : (+ <></>+ )+ }/>)}<h3 className="text-xl font-medium text-custom-text-200">{data?.id ? "Update" : "Create"} Issue</h3>diff --git a/web/core/store/user/index.ts b/web/core/store/user/index.tsindex 4983c61d87..d218811716 100644--- a/web/core/store/user/index.ts+++ b/web/core/store/user/index.ts@@ -44,6 +44,8 @@ export interface IUserStore {// computedcanPerformProjectCreateActions: boolean;canPerformWorkspaceCreateActions: boolean;+ canPerformAnyCreateAction: boolean;+ projectsWithCreatePermissions: { [projectId: string]: number } | null;}export class UserStore implements IUserStore {@@ -91,6 +93,8 @@ export class UserStore implements IUserStore {// computedcanPerformProjectCreateActions: computed,canPerformWorkspaceCreateActions: computed,+ canPerformAnyCreateAction: computed,+ projectsWithCreatePermissions: computed,});}@@ -136,6 +140,26 @@ export class UserStore implements IUserStore {}};+ /**+ * @description fetches the prjects with write permissions+ * @returns {{[projectId: string]: number} || null}+ */+ fetchProjectsWithCreatePermissions() {+ const allWorkspaceRoles =+ this.membership.workspaceProjectsRole &&+ this.membership.workspaceProjectsRole[this.membership.router.workspaceSlug || ""];+ return (+ (allWorkspaceRoles &&+ Object.keys(allWorkspaceRoles)+ .filter((key) => allWorkspaceRoles[key] >= EUserProjectRoles.MEMBER)+ .reduce(+ (res: { [projectId: string]: number }, key: string) => ((res[key] = allWorkspaceRoles[key]), res),+ {}+ )) ||+ null+ );+ }+/*** @description updates the current user* @param data@@ -229,6 +253,23 @@ export class UserStore implements IUserStore {this.store.resetOnSignOut();};+ /**+ * @description returns projects where user has permissions+ * @returns {{[projectId: string]: number} || null}+ */+ get projectsWithCreatePermissions() {+ return this.fetchProjectsWithCreatePermissions();+ }++ /**+ * @description returns true if user has permissions to write in any project+ * @returns {boolean}+ */+ get canPerformAnyCreateAction() {+ const filteredProjects = this.fetchProjectsWithCreatePermissions();+ return filteredProjects ? Object.keys(filteredProjects).length > 0 : false;+ }+/*** @description tells if user has project create actions permissions* @returns {boolean}diff --git a/web/core/store/user/user-membership.store.ts b/web/core/store/user/user-membership.store.tsindex 86f8c442bc..efe58eac05 100644--- a/web/core/store/user/user-membership.store.ts+++ b/web/core/store/user/user-membership.store.ts@@ -11,6 +11,7 @@ import { ProjectMemberService } from "@/services/project";import { UserService } from "@/services/user.service";// plane web storeimport { CoreRootStore } from "../root.store";+import { IRouterStore } from "../router.store";export interface IUserMembershipStore {// observables@@ -47,6 +48,8 @@ export interface IUserMembershipStore {leaveWorkspace: (workspaceSlug: string) => Promise<void>;joinProject: (workspaceSlug: string, projectIds: string[]) => Promise<any>;leaveProject: (workspaceSlug: string, projectId: string) => Promise<void>;++ router: IRouterStore;}export class UserMembershipStore implements IUserMembershipStore {