From aba4592b7359e79c9e46ab8cd674bc8e16f660da Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:10:53 +0530 Subject: [PATCH] fix: bug fixes (#3010) * fix: project view modal auto close bug fix * fix: issue peek overview label select permission validation added --- web/components/headers/project-views.tsx | 12 +----------- web/components/issues/select/label.tsx | 12 ++++++++++-- web/components/issues/sidebar-select/label.tsx | 1 + 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/web/components/headers/project-views.tsx b/web/components/headers/project-views.tsx index 92e876557..e598d5a6b 100644 --- a/web/components/headers/project-views.tsx +++ b/web/components/headers/project-views.tsx @@ -4,8 +4,6 @@ import { Plus } from "lucide-react"; // mobx store import { useMobxStore } from "lib/mobx/store-provider"; // components -import { CreateUpdateProjectViewModal } from "components/views"; -// components import { Breadcrumbs, PhotoFilterIcon, Button } from "@plane/ui"; // helpers import { renderEmoji } from "helpers/emoji.helper"; @@ -13,21 +11,13 @@ import { renderEmoji } from "helpers/emoji.helper"; export const ProjectViewsHeader: React.FC = observer(() => { // router const router = useRouter(); - const { workspaceSlug, projectId } = router.query; + const { workspaceSlug } = router.query; const { project: projectStore, commandPalette } = useMobxStore(); const { currentProjectDetails } = projectStore; return ( <> - {workspaceSlug && projectId && ( - commandPalette.toggleCreateViewModal(false)} - workspaceSlug={workspaceSlug.toString()} - projectId={projectId.toString()} - /> - )}
diff --git a/web/components/issues/select/label.tsx b/web/components/issues/select/label.tsx index ac76ecd1d..181133cae 100644 --- a/web/components/issues/select/label.tsx +++ b/web/components/issues/select/label.tsx @@ -17,10 +17,11 @@ type Props = { onChange: (value: string[]) => void; projectId: string; label?: JSX.Element; + disabled?: boolean; }; export const IssueLabelSelect: React.FC = observer((props) => { - const { setIsOpen, value, onChange, projectId, label } = props; + const { setIsOpen, value, onChange, projectId, label, disabled = false } = props; // states const [query, setQuery] = useState(""); @@ -50,7 +51,14 @@ export const IssueLabelSelect: React.FC = observer((props) => { query === "" ? issueLabels : issueLabels?.filter((l) => l.name.toLowerCase().includes(query.toLowerCase())); return ( - onChange(val)} className="relative flex-shrink-0" multiple> + onChange(val)} + className="relative flex-shrink-0" + multiple + disabled={disabled} + > {({ open }: any) => ( <> diff --git a/web/components/issues/sidebar-select/label.tsx b/web/components/issues/sidebar-select/label.tsx index 4d9459a31..1c96da1d4 100644 --- a/web/components/issues/sidebar-select/label.tsx +++ b/web/components/issues/sidebar-select/label.tsx @@ -125,6 +125,7 @@ export const SidebarLabelSelect: React.FC = observer((props) => { Select Label } + disabled={uneditable} /> {!isNotAllowed && (