From 03f204a71cd92b182ac22533d2cf751f76462482 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Mon, 4 Sep 2023 17:27:29 +0530 Subject: [PATCH 1/6] chore: invalid url content (#2082) --- space/components/views/project-details.tsx | 18 ++++++++++++++++-- space/public/something-went-wrong.svg | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 space/public/something-went-wrong.svg diff --git a/space/components/views/project-details.tsx b/space/components/views/project-details.tsx index 9a6cd824c..1c9c6ddc9 100644 --- a/space/components/views/project-details.tsx +++ b/space/components/views/project-details.tsx @@ -1,5 +1,9 @@ import { useEffect } from "react"; + +import Image from "next/image"; import { useRouter } from "next/router"; + +// mobx import { observer } from "mobx-react-lite"; // components import { IssueListView } from "components/issues/board-views/list"; @@ -11,6 +15,8 @@ import { IssuePeekOverview } from "components/issues/peek-overview"; // mobx store import { RootStore } from "store/root"; import { useMobxStore } from "lib/mobx/store-provider"; +// assets +import SomethingWentWrongImage from "public/something-went-wrong.svg"; export const ProjectDetailsView = observer(() => { const router = useRouter(); @@ -55,8 +61,16 @@ export const ProjectDetailsView = observer(() => { ) : ( <> {issueStore?.error ? ( -
- Something went wrong. +
+
+
+
+ Oops! Something went wrong +
+
+

Oops! Something went wrong.

+

The public board does not exist. Please check the URL.

+
) : ( projectStore?.activeBoard && ( diff --git a/space/public/something-went-wrong.svg b/space/public/something-went-wrong.svg new file mode 100644 index 000000000..bd51f7f49 --- /dev/null +++ b/space/public/something-went-wrong.svg @@ -0,0 +1,3 @@ + + + From 729eabdd3f51d420a071ffc2a66ad5f68a5b382c Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Mon, 4 Sep 2023 17:55:40 +0530 Subject: [PATCH 2/6] next config fixes in space app (#2084) --- space/next.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/space/next.config.js b/space/next.config.js index 712c1c472..392a4cab9 100644 --- a/space/next.config.js +++ b/space/next.config.js @@ -13,6 +13,7 @@ const nextConfig = { if (parseInt(process.env.NEXT_PUBLIC_DEPLOY_WITH_NGINX || "0")) { const nextConfigWithNginx = withImages({ basePath: "/spaces", ...nextConfig }); + module.exports = nextConfigWithNginx; } else { module.exports = nextConfig; } From 9423472838c2e9dc6a2fafd24b58f94cc893a3cc Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Mon, 4 Sep 2023 18:03:31 +0530 Subject: [PATCH 3/6] Env Fixes (#2086) * fixing env issues * removing husky --- .husky/pre-push | 23 ----------------------- package.json | 3 +-- space/.env.example | 4 ++-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100755 .husky/pre-push diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index 0e7d3240b..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -. "$(dirname -- "$0")/_/husky.sh" - -changed_files=$(git diff --name-only HEAD~1) - -web_changed=$(echo "$changed_files" | grep -E '^web/' || true) -space_changed=$(echo "$changed_files" | grep -E '^space/' || true) -echo $web_changed -echo $space_changed - -if [ -n "$web_changed" ] && [ -n "$space_changed" ]; then - echo "Changes detected in both web and space. Building..." - yarn run lint - yarn run build -elif [ -n "$web_changed" ]; then - echo "Changes detected in web app. Building..." - yarn run lint --filter=web - yarn run build --filter=web -elif [ -n "$space_changed" ]; then - echo "Changes detected in space app. Building..." - yarn run lint --filter=space - yarn run build --filter=space -fi diff --git a/package.json b/package.json index 397952b3b..eb6a23994 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,7 @@ "devDependencies": { "eslint-config-custom": "*", "prettier": "latest", - "turbo": "latest", - "husky": "^8.0.3" + "turbo": "latest" }, "packageManager": "yarn@1.22.19" } diff --git a/space/.env.example b/space/.env.example index 2d3165893..238f70854 100644 --- a/space/.env.example +++ b/space/.env.example @@ -1,8 +1,8 @@ # Base url for the API requests NEXT_PUBLIC_API_BASE_URL="" # Public boards deploy URL -NEXT_PUBLIC_DEPLOY_URL="https://plane-space-dev.vercel.app" +NEXT_PUBLIC_DEPLOY_URL="" # Google Client ID for Google OAuth -NEXT_PUBLIC_GOOGLE_CLIENTID=232920797020-235n93bn7hh7628vdd69hq873129ng4o.apps.googleusercontent.com +NEXT_PUBLIC_GOOGLE_CLIENTID="" # Flag to toggle OAuth NEXT_PUBLIC_ENABLE_OAUTH=1 \ No newline at end of file From 71394d33165a9117a7ef3d03fdafcba4f1bf54f4 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Mon, 4 Sep 2023 18:42:31 +0530 Subject: [PATCH 4/6] chore: add issue option removed from subscribed issue page (#2088) * chore: condition for subscribed page add issue option * chore: condition for subscribed page add issue option --- web/components/core/views/all-views.tsx | 4 ++++ web/components/core/views/board-view/all-boards.tsx | 3 +++ web/components/core/views/board-view/single-board.tsx | 8 ++++---- web/components/core/views/list-view/all-lists.tsx | 3 +++ web/components/core/views/list-view/single-list.tsx | 5 +++-- web/components/issues/my-issues/my-issues-view.tsx | 10 ++++++++++ web/components/profile/profile-issues-view.tsx | 10 ++++++++++ 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/web/components/core/views/all-views.tsx b/web/components/core/views/all-views.tsx index 79d5d6b11..eb54ccb2a 100644 --- a/web/components/core/views/all-views.tsx +++ b/web/components/core/views/all-views.tsx @@ -53,6 +53,7 @@ type Props = { handleOnDragEnd: (result: DropResult) => Promise; openIssuesListModal: (() => void) | null; removeIssue: ((bridgeId: string, issueId: string) => void) | null; + disableAddIssueOption?: boolean; trashBox: boolean; setTrashBox: React.Dispatch>; viewProps: IIssueViewProps; @@ -68,6 +69,7 @@ export const AllViews: React.FC = ({ handleOnDragEnd, openIssuesListModal, removeIssue, + disableAddIssueOption = false, trashBox, setTrashBox, viewProps, @@ -127,6 +129,7 @@ export const AllViews: React.FC = ({ openIssuesListModal={cycleId || moduleId ? openIssuesListModal : null} removeIssue={removeIssue} disableUserActions={disableUserActions} + disableAddIssueOption={disableAddIssueOption} user={user} userAuth={memberRole} viewProps={viewProps} @@ -135,6 +138,7 @@ export const AllViews: React.FC = ({ void; disableUserActions: boolean; + disableAddIssueOption?: boolean; dragDisabled: boolean; handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void; handleTrashBox: (isDragging: boolean) => void; @@ -24,6 +25,7 @@ type Props = { export const AllBoards: React.FC = ({ addIssueToGroup, disableUserActions, + disableAddIssueOption = false, dragDisabled, handleIssueAction, handleTrashBox, @@ -52,6 +54,7 @@ export const AllBoards: React.FC = ({ addIssueToGroup={() => addIssueToGroup(singleGroup)} currentState={currentState} disableUserActions={disableUserActions} + disableAddIssueOption={disableAddIssueOption} dragDisabled={dragDisabled} groupTitle={singleGroup} handleIssueAction={handleIssueAction} diff --git a/web/components/core/views/board-view/single-board.tsx b/web/components/core/views/board-view/single-board.tsx index 52e8c27c7..7ba70c97b 100644 --- a/web/components/core/views/board-view/single-board.tsx +++ b/web/components/core/views/board-view/single-board.tsx @@ -20,6 +20,7 @@ type Props = { addIssueToGroup: () => void; currentState?: IState | null; disableUserActions: boolean; + disableAddIssueOption?: boolean; dragDisabled: boolean; groupTitle: string; handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void; @@ -36,6 +37,7 @@ export const SingleBoard: React.FC = ({ currentState, groupTitle, disableUserActions, + disableAddIssueOption = false, dragDisabled, handleIssueAction, handleTrashBox, @@ -53,8 +55,6 @@ export const SingleBoard: React.FC = ({ const router = useRouter(); const { cycleId, moduleId } = router.query; - const isSubscribedIssues = router.pathname.includes("subscribed"); - const type = cycleId ? "cycle" : moduleId ? "module" : "issue"; // Check if it has at least 4 tickets since it is enough to accommodate the Calendar height @@ -72,7 +72,7 @@ export const SingleBoard: React.FC = ({ isCollapsed={isCollapsed} setIsCollapsed={setIsCollapsed} disableUserActions={disableUserActions} - disableAddIssue={isSubscribedIssues} + disableAddIssue={disableAddIssueOption} viewProps={viewProps} /> {isCollapsed && ( @@ -154,7 +154,7 @@ export const SingleBoard: React.FC = ({ {selectedGroup !== "created_by" && (
{type === "issue" - ? !isSubscribedIssues && ( + ? !disableAddIssueOption && (