From f73135c504acb0f661a4a01978fa9d1ec34d7909 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:03:36 +0530 Subject: [PATCH 1/3] fix: workspace view redirection fix, style: spreadsheet view shadow scroll fix (#2314) * fix: workspace view redirection fix * style: spreadsheet view scroll shadow fix --- .../core/views/spreadsheet-view/spreadsheet-view.tsx | 7 ++++--- web/components/workspace/views/modal.tsx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx index 7852a5a9da2..0d9214a36d9 100644 --- a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx +++ b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx @@ -500,9 +500,10 @@ export const SpreadsheetView: React.FC = ({ <>
{currentViewProperties.key && ( diff --git a/web/components/workspace/views/modal.tsx b/web/components/workspace/views/modal.tsx index 7d8f679b5bd..f0f02746882 100644 --- a/web/components/workspace/views/modal.tsx +++ b/web/components/workspace/views/modal.tsx @@ -52,7 +52,7 @@ export const CreateUpdateWorkspaceViewModal: React.FC = ({ mutate(WORKSPACE_VIEWS_LIST(workspaceSlug as string)); handleClose(); - router.replace(`/${workspaceSlug}/workspace-views/issues?viewId=${res.id}`); + router.replace(`/${workspaceSlug}/workspace-views/issues?globalViewId=${res.id}`); setToastAlert({ type: "success", From 6b5fe0fff176dcabd22ba4d720a9d0cbcb09838e Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:14:07 +0530 Subject: [PATCH 2/3] fix: update build workflow for the deploy app (#2315) --- .github/workflows/Update_Docker_Images.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Update_Docker_Images.yml b/.github/workflows/Update_Docker_Images.yml index 30593b58429..67ae97e758c 100644 --- a/.github/workflows/Update_Docker_Images.yml +++ b/.github/workflows/Update_Docker_Images.yml @@ -39,10 +39,10 @@ jobs: type=ref,event=tag - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release - id: metaDeploy + id: metaSpace uses: docker/metadata-action@v4.3.0 with: - images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-deploy + images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space tags: | type=ref,event=tag @@ -87,7 +87,7 @@ jobs: file: ./space/Dockerfile.space platforms: linux/amd64 push: true - tags: ${{ steps.metaDeploy.outputs.tags }} + tags: ${{ steps.metaSpace.outputs.tags }} env: DOCKER_BUILDKIT: 1 DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} From ebf79ee2aaa0a4be8e62770ba5830892577facae Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:02:56 +0530 Subject: [PATCH 3/3] fix: workspace view add issue mutation fix (#2317) --- web/components/issues/modal.tsx | 49 ++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/web/components/issues/modal.tsx b/web/components/issues/modal.tsx index 608cf4fd1eb..cf6f811f68f 100644 --- a/web/components/issues/modal.tsx +++ b/web/components/issues/modal.tsx @@ -20,6 +20,7 @@ import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view"; import useProjects from "hooks/use-projects"; import useMyIssues from "hooks/my-issues/use-my-issues"; import useLocalStorage from "hooks/use-local-storage"; +import { useWorkspaceView } from "hooks/use-workspace-view"; // components import { IssueForm, ConfirmIssueDiscard } from "components/issues"; // types @@ -37,6 +38,7 @@ import { VIEW_ISSUES, INBOX_ISSUES, PROJECT_DRAFT_ISSUES_LIST_WITH_PARAMS, + WORKSPACE_VIEW_ISSUES, } from "constants/fetch-keys"; // constants import { INBOX_ISSUE_SOURCE } from "constants/inbox"; @@ -81,7 +83,8 @@ export const CreateUpdateIssueModal: React.FC = ({ const [prePopulateData, setPreloadedData] = useState>({}); const router = useRouter(); - const { workspaceSlug, projectId, cycleId, moduleId, viewId, inboxId } = router.query; + const { workspaceSlug, projectId, cycleId, moduleId, viewId, globalViewId, inboxId } = + router.query; const { displayFilters, params } = useIssuesView(); const { params: calendarParams } = useCalendarIssuesView(); @@ -94,6 +97,8 @@ export const CreateUpdateIssueModal: React.FC = ({ const { groupedIssues, mutateMyIssues } = useMyIssues(workspaceSlug?.toString()); + const { params: globalViewParams } = useWorkspaceView(); + const { setValue: setValueInLocalStorage, clearValue: clearLocalStorageValue } = useLocalStorage("draftedIssue", {}); @@ -276,6 +281,40 @@ export const CreateUpdateIssueModal: React.FC = ({ }); }; + const workspaceIssuesPath = [ + { + params: { + sub_issue: false, + }, + path: "workspace-views/all-issues", + }, + { + params: { + assignees: user?.id ?? undefined, + sub_issue: false, + }, + path: "workspace-views/assigned", + }, + { + params: { + created_by: user?.id ?? undefined, + sub_issue: false, + }, + path: "workspace-views/created", + }, + { + params: { + subscriber: user?.id ?? undefined, + sub_issue: false, + }, + path: "workspace-views/subscribed", + }, + ]; + + const currentWorkspaceIssuePath = workspaceIssuesPath.find((path) => + router.pathname.includes(path.path) + ); + const calendarFetchKey = cycleId ? CYCLE_ISSUES_WITH_PARAMS(cycleId.toString(), calendarParams) : moduleId @@ -332,6 +371,14 @@ export const CreateUpdateIssueModal: React.FC = ({ mutate(USER_ISSUE(workspaceSlug as string)); if (payload.parent && payload.parent !== "") mutate(SUB_ISSUES(payload.parent)); + + if (globalViewId) + mutate(WORKSPACE_VIEW_ISSUES(globalViewId.toString(), globalViewParams)); + + if (currentWorkspaceIssuePath) + mutate( + WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), currentWorkspaceIssuePath?.params) + ); }) .catch(() => { setToastAlert({