Merge pull request #1928 from makeplane/develop

promote: develop to stage-release
makeplane · Aug 21, 2023 · aa2e169 · aa2e169 · vercel · Aug 21, 2023
2 parents 3beab9d + b024171
commit aa2e169
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 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
@@ -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}

diff --git 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",

diff --git 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