From f7682c57ba16904d65894d4340b8ca26ff9eb485 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:25:12 +0530
Subject: [PATCH 1/5] fix: plane space start up command (#1925)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d1ffca809..07aa79f36 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
                 container_name: planedeploy
                 build:
                         context: .
-                        dockerfile: ./apps/space/Dockerfile.space space
+                        dockerfile: ./apps/space/Dockerfile.space
                         args:
                                 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
                 restart: always

From d0403948269ce670c10d9ace01063a5757837c04 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:44:51 +0530
Subject: [PATCH 2/5] fix: create project button not appearing on the sidebar
 (#1926)

---
 apps/app/components/project/sidebar-list.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/app/components/project/sidebar-list.tsx b/apps/app/components/project/sidebar-list.tsx
index 266b05204..8018d19a5 100644
--- a/apps/app/components/project/sidebar-list.tsx
+++ b/apps/app/components/project/sidebar-list.tsx
@@ -9,7 +9,6 @@ import { DragDropContext, Draggable, DropResult, Droppable } from "react-beautif
 import { Disclosure, Transition } from "@headlessui/react";
 // hooks
 import useToast from "hooks/use-toast";
-import useTheme from "hooks/use-theme";
 import useUserAuth from "hooks/use-user-auth";
 import useProjects from "hooks/use-projects";
 // components
@@ -42,18 +41,15 @@ export const ProjectSidebarList: FC = () => {
   const containerRef = useRef<HTMLDivElement | null>(null);
 
   const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
+  const { workspaceSlug } = router.query;
 
   const { user } = useUserAuth();
-
-  const { collapsed: sidebarCollapse } = useTheme();
   const { setToastAlert } = useToast();
 
   const { projects: allProjects } = useProjects();
 
   const joinedProjects = allProjects?.filter((p) => p.sort_order);
   const favoriteProjects = allProjects?.filter((p) => p.is_favorite);
-  const otherProjects = allProjects?.filter((p) => p.sort_order === null);
 
   const orderedJoinedProjects: IProject[] | undefined = joinedProjects
     ? orderArrayBy(joinedProjects, "sort_order", "ascending")
@@ -300,10 +296,10 @@ export const ProjectSidebarList: FC = () => {
           </Droppable>
         </DragDropContext>
 
-        {allProjects && allProjects.length === 0 && (
+        {joinedProjects && joinedProjects.length === 0 && (
           <button
             type="button"
-            className="flex w-full items-center gap-2 px-3 py-2 text-sm text-custom-sidebar-text-200 mt-5"
+            className="flex w-full items-center gap-2 px-3 text-sm text-custom-sidebar-text-200"
             onClick={() => {
               const e = new KeyboardEvent("keydown", {
                 key: "p",

From b02417120b816a9d5205c23abe2fba1170b3540a Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:50:17 +0530
Subject: [PATCH 3/5] chore: hide new issue button from my subscribed issues
 page (#1927)

---
 .../issues/my-issues/my-issues-view.tsx       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/app/components/issues/my-issues/my-issues-view.tsx b/apps/app/components/issues/my-issues/my-issues-view.tsx
index a6fdc81b4..6451bd1aa 100644
--- a/apps/app/components/issues/my-issues/my-issues-view.tsx
+++ b/apps/app/components/issues/my-issues/my-issues-view.tsx
@@ -270,16 +270,18 @@ export const MyIssuesView: React.FC<Props> = ({
             ? "You have not created any issue yet."
             : "You have not subscribed to any issue yet.",
           description: "Keep track of your work in a single place.",
-          primaryButton: {
-            icon: <PlusIcon className="h-4 w-4" />,
-            text: "New Issue",
-            onClick: () => {
-              const e = new KeyboardEvent("keydown", {
-                key: "c",
-              });
-              document.dispatchEvent(e);
-            },
-          },
+          primaryButton: filters.subscriber
+            ? undefined
+            : {
+                icon: <PlusIcon className="h-4 w-4" />,
+                text: "New Issue",
+                onClick: () => {
+                  const e = new KeyboardEvent("keydown", {
+                    key: "c",
+                  });
+                  document.dispatchEvent(e);
+                },
+              },
         }}
         handleOnDragEnd={handleOnDragEnd}
         handleIssueAction={handleIssueAction}

From b406a70e7268a46a53e4598639daba9ee05567f7 Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Tue, 22 Aug 2023 01:13:51 +0530
Subject: [PATCH 4/5] fix: access environment variables is changed in services
 (#1930)

Co-authored-by: Sainath <sainath@Sainaths-MacBook-Pro.local>
---
 apps/space/app/[workspace_slug]/[project_slug]/page.tsx | 4 +++-
 apps/space/next.config.js                               | 4 ++--
 apps/space/services/api.service.ts                      | 6 ++----
 apps/space/services/issue.service.ts                    | 4 +---
 apps/space/services/project.service.ts                  | 4 +---
 apps/space/services/user.service.ts                     | 4 +---
 yarn.lock                                               | 9 ++++++++-
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/apps/space/app/[workspace_slug]/[project_slug]/page.tsx b/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
index 80dd5f038..81c2b48c2 100644
--- a/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
+++ b/apps/space/app/[workspace_slug]/[project_slug]/page.tsx
@@ -26,7 +26,9 @@ const WorkspaceProjectPage = observer(() => {
 
   const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
   const board =
-    routerSearchparams && routerSearchparams.get("board") != null && (routerSearchparams.get("board") as TIssueBoardKeys | "");
+    routerSearchparams &&
+    routerSearchparams.get("board") != null &&
+    (routerSearchparams.get("board") as TIssueBoardKeys | "");
 
   // updating default board view when we are in the issues page
   useEffect(() => {
diff --git a/apps/space/next.config.js b/apps/space/next.config.js
index 0dd1894bb..4128b636a 100644
--- a/apps/space/next.config.js
+++ b/apps/space/next.config.js
@@ -1,5 +1,5 @@
 /** @type {import('next').NextConfig} */
-const path = require('path')
+const path = require("path");
 
 const nextConfig = {
   reactStrictMode: false,
@@ -8,7 +8,7 @@ const nextConfig = {
     outputFileTracingRoot: path.join(__dirname, "../../"),
     appDir: true,
   },
-  output: 'standalone'
+  output: "standalone",
 };
 
 module.exports = nextConfig;
diff --git a/apps/space/services/api.service.ts b/apps/space/services/api.service.ts
index cd7076a7a..4cf26d9ee 100644
--- a/apps/space/services/api.service.ts
+++ b/apps/space/services/api.service.ts
@@ -3,14 +3,12 @@ import axios from "axios";
 // js cookie
 import Cookies from "js-cookie";
 
-const base_url: string | null = "http://localhost:8000";
-
 abstract class APIService {
   protected baseURL: string;
   protected headers: any = {};
 
-  constructor(baseURL: string) {
-    this.baseURL = base_url ? base_url : baseURL;
+  constructor(_baseURL: string) {
+    this.baseURL = _baseURL;
   }
 
   setRefreshToken(token: string) {
diff --git a/apps/space/services/issue.service.ts b/apps/space/services/issue.service.ts
index 4b40bdf5c..38b2f7a1d 100644
--- a/apps/space/services/issue.service.ts
+++ b/apps/space/services/issue.service.ts
@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class IssueService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getPublicIssues(workspace_slug: string, project_slug: string): Promise<any> {
diff --git a/apps/space/services/project.service.ts b/apps/space/services/project.service.ts
index 4d973051f..6f0275877 100644
--- a/apps/space/services/project.service.ts
+++ b/apps/space/services/project.service.ts
@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class ProjectService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> {
diff --git a/apps/space/services/user.service.ts b/apps/space/services/user.service.ts
index d724374b6..a84358a96 100644
--- a/apps/space/services/user.service.ts
+++ b/apps/space/services/user.service.ts
@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class UserService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async currentUser(): Promise<any> {
diff --git a/yarn.lock b/yarn.lock
index 8bc1fec30..ac134d60f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6558,13 +6558,20 @@ prosemirror-menu@^1.2.1:
     prosemirror-history "^1.0.0"
     prosemirror-state "^1.0.0"
 
-prosemirror-model@1.18.1, prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.19.0, prosemirror-model@^1.8.1:
+prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.8.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd"
   integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw==
   dependencies:
     orderedmap "^2.0.0"
 
+prosemirror-model@^1.19.0:
+  version "1.19.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.3.tgz#f0d55285487fefd962d0ac695f716f4ec6705006"
+  integrity sha512-tgSnwN7BS7/UM0sSARcW+IQryx2vODKX4MI7xpqY2X+iaepJdKBPc7I4aACIsDV/LTaTjt12Z56MhDr9LsyuZQ==
+  dependencies:
+    orderedmap "^2.0.0"
+
 prosemirror-schema-basic@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7"

From 68b438ab1ad0ca74678c3d36199b08e2bcd8c8b3 Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:18:15 +0530
Subject: [PATCH 5/5] fix: aws region changed for exporter (#1933)

Co-authored-by: Bavisetti Narayan <narayan@Bavisettis-MacBook-Pro.local>
---
 apiserver/plane/bgtasks/export_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/plane/bgtasks/export_task.py b/apiserver/plane/bgtasks/export_task.py
index d8cb9f0cd..22a9afe51 100644
--- a/apiserver/plane/bgtasks/export_task.py
+++ b/apiserver/plane/bgtasks/export_task.py
@@ -68,7 +68,7 @@ def create_zip_file(files):
 def upload_to_s3(zip_file, workspace_id, token_id, slug):
     s3 = boto3.client(
         "s3",
-        region_name="ap-south-1",
+        region_name=settings.AWS_REGION,
         aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
         aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
         config=Config(signature_version="s3v4"),