Merge branch 'develop' of gurusainath:makeplane/plane into fix/kanaban-sorting

2024-06-14 14:31:34 +00:00 · 2023-09-05 11:34:17 +05:30 · 2023-09-05 11:34:17 +05:30 · 731309a932
commit 731309a932
parent 9d334cf3a3 900a4fcb0e
19 changed files with 130 additions and 57 deletions
--- a/.husky/pre-push
+++ b/.husky/pre-push
@ -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
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@ -38,7 +38,7 @@ services:
                container_name: planefrontend
                image: makeplane/plane-frontend:latest
                restart: always
-                command: /usr/local/bin/start.sh apps/app/server.js app
+                command: /usr/local/bin/start.sh web/server.js web
                env_file:
                        - .env
                environment:
@ -56,6 +56,20 @@ services:
                        - plane-api
                        - plane-worker

+        plane-deploy:
+                container_name: planedeploy
+                image: makeplane/plane-deploy:latest
+                restart: always
+                command: /usr/local/bin/start.sh space/server.js space
+                env_file:
+                        - .env
+                environment:
+                        NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
+                depends_on:
+                        - plane-api
+                        - plane-worker
+                        - plane-web
+
        plane-api:
                container_name: planebackend
                image: makeplane/plane-backend:latest
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -39,6 +39,7 @@ services:
      context: .
      dockerfile: ./web/Dockerfile.web
      args:
+        DOCKER_BUILDKIT: 1
        NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
        NEXT_PUBLIC_DEPLOY_URL: http://localhost/spaces
    restart: always
@ -67,6 +68,7 @@ services:
      dockerfile: ./space/Dockerfile.space
      args:
        DOCKER_BUILDKIT: 1
+        NEXT_PUBLIC_DEPLOY_WITH_NGINX: 1
        NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
    restart: always
    command: /usr/local/bin/start.sh space/server.js space
@ -84,8 +86,12 @@ services:
    build:
      context: ./apiserver
      dockerfile: Dockerfile.api
+      args:
+        DOCKER_BUILDKIT: 1
    restart: always
    command: ./bin/takeoff
+    ports:
+      - 8000:8000
    env_file:
      - .env
    environment:
@ -99,6 +105,8 @@ services:
    build:
      context: ./apiserver
      dockerfile: Dockerfile.api
+      args:
+        DOCKER_BUILDKIT: 1
    restart: always
    command: ./bin/worker
    env_file:
@ -115,6 +123,8 @@ services:
    build:
      context: ./apiserver
      dockerfile: Dockerfile.api
+      args:
+        DOCKER_BUILDKIT: 1
    restart: always
    command: ./bin/beat
    env_file:
--- 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"
 }
--- 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
--- a/space/Dockerfile.space
+++ b/space/Dockerfile.space
@ -1,6 +1,5 @@
 FROM node:18-alpine AS builder
 RUN apk add --no-cache libc6-compat
-# Set working directory
 WORKDIR /app
 ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER

@ -9,37 +8,34 @@ COPY . .

 RUN turbo prune --scope=space --docker

-# Add lockfile and package.json's of isolated subworkspace
 FROM node:18-alpine AS installer

 RUN apk add --no-cache libc6-compat
 WORKDIR /app
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000

-# First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/yarn.lock ./yarn.lock
 RUN yarn install --network-timeout 500000

-# Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY replace-env-vars.sh /usr/local/bin/
 USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh

-RUN yarn turbo run build --filter=space
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ARG NEXT_PUBLIC_DEPLOY_WITH_NGINX=1

-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL NEXT_PUBLIC_DEPLOY_WITH_NGINX=$NEXT_PUBLIC_DEPLOY_WITH_NGINX
+
+RUN yarn turbo run build --filter=space

 RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} space

 FROM node:18-alpine AS runner
 WORKDIR /app

-# Don't run production as root
 RUN addgroup --system --gid 1001 plane
 RUN adduser --system --uid 1001 captain
 USER captain
@ -47,16 +43,14 @@ USER captain
 COPY --from=installer /app/space/next.config.js .
 COPY --from=installer /app/space/package.json .

-# Automatically leverage output traces to reduce image sizß
-# https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=installer --chown=captain:plane /app/space/.next/standalone ./

 COPY --from=installer --chown=captain:plane /app/space/.next ./space/.next
 COPY --from=installer --chown=captain:plane /app/space/public ./space/public

 ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+ARG NEXT_PUBLIC_DEPLOY_WITH_NGINX=1
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL NEXT_PUBLIC_DEPLOY_WITH_NGINX=$NEXT_PUBLIC_DEPLOY_WITH_NGINX

 USER root
 COPY replace-env-vars.sh /usr/local/bin/
--- 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 ? (
-            <div className="text-sm text-center py-10 bg-custom-background-200 text-custom-text-100">
-              Something went wrong.
+            <div className="h-full w-full grid place-items-center p-6">
+              <div className="text-center">
+                <div className="h-52 w-52 bg-custom-background-80 rounded-full grid place-items-center mx-auto">
+                  <div className="h-32 w-32 grid place-items-center">
+                    <Image src={SomethingWentWrongImage} alt="Oops! Something went wrong" />
+                  </div>
+                </div>
+                <h1 className="text-3xl font-semibold mt-12">Oops! Something went wrong.</h1>
+                <p className="mt-4 text-custom-text-300">The public board does not exist. Please check the URL.</p>
+              </div>
            </div>
          ) : (
            projectStore?.activeBoard && (
--- 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;
 }
--- a/space/package.json
+++ b/space/package.json
@ -9,8 +9,15 @@
    "lint": "next lint"
  },
  "dependencies": {
+    "@blueprintjs/core": "^4.16.3",
+    "@blueprintjs/popover2": "^1.13.3",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
    "@headlessui/react": "^1.7.13",
-    "@mui/icons-material": "^5.14.7",
+    "@heroicons/react": "^2.0.12",
+    "@mui/icons-material": "^5.14.1",
+    "@mui/material": "^5.14.1",
+    "@tailwindcss/typography": "^0.5.9",
    "@tiptap-pro/extension-unique-id": "^2.1.0",
    "@tiptap/extension-code-block-lowlight": "^2.0.4",
    "@tiptap/extension-color": "^2.0.4",
@ -33,17 +40,25 @@
    "@tiptap/starter-kit": "^2.0.4",
    "@tiptap/suggestion": "^2.0.4",
    "axios": "^1.3.4",
+    "clsx": "^2.0.0",
    "js-cookie": "^3.0.1",
+    "lowlight": "^2.9.0",
+    "lucide-react": "^0.263.1",
    "mobx": "^6.10.0",
    "mobx-react-lite": "^4.0.3",
    "next": "12.3.2",
    "next-images": "^1.8.5",
-    "next-theme": "^0.1.5",
+    "next-themes": "^0.2.1",
    "nprogress": "^0.2.0",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-hook-form": "^7.38.0",
+    "react-moveable": "^0.54.1",
    "swr": "^2.2.2",
+    "tailwind-merge": "^1.14.0",
+    "tiptap-markdown": "^0.8.2",
    "typescript": "4.9.5",
+    "use-debounce": "^9.0.4",
    "uuid": "^9.0.0"
  },
  "devDependencies": {
--- a/space/public/something-went-wrong.svg
+++ b/space/public/something-went-wrong.svg
@ -0,0 +1,3 @@
+<svg width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M52.4226 95.3614C46.3393 95.3614 40.6853 94.2699 35.4608 92.0871C30.2363 89.9043 25.6917 86.8805 21.827 83.0158C17.9623 79.1511 14.9385 74.6065 12.7557 69.3819C10.5728 64.1574 9.48141 58.5035 9.48141 52.4202C9.48141 47.5535 10.1971 42.9731 11.6285 38.679C13.0598 34.3849 15.0638 30.4486 17.6402 26.8702L5.93876 15.1687C5.29464 14.5246 4.99048 13.7552 5.02626 12.8606C5.06205 11.966 5.402 11.1967 6.04612 10.5525C6.69023 9.90842 7.4596 9.58636 8.3542 9.58636C9.24881 9.58636 10.0182 9.90842 10.6623 10.5525L92.6799 92.6775C93.3241 93.3217 93.6461 94.0731 93.6461 94.9319C93.6461 95.7908 93.3241 96.5422 92.6799 97.1864C92.0358 97.8305 91.2665 98.1525 90.3718 98.1525C89.4772 98.1525 88.7079 97.8305 88.0638 97.1864L77.9726 87.2025C74.3942 89.779 70.4579 91.7829 66.1638 93.2143C61.8696 94.6457 57.2893 95.3614 52.4226 95.3614ZM52.4226 88.9202C56.3589 88.9202 60.0804 88.3655 63.5873 87.2562C67.0942 86.1469 70.3505 84.5903 73.3564 82.5864L54.3549 63.5849L48.3432 69.5967C47.6991 70.2408 46.9476 70.5807 46.0888 70.6165C45.2299 70.6523 44.4785 70.3481 43.8344 69.704L30.7373 56.4996C30.0932 55.8555 29.789 55.0503 29.8248 54.0842C29.8606 53.118 30.2005 52.3128 30.8446 51.6687C31.4888 51.0246 32.2939 50.7025 33.2601 50.7025C34.2263 50.7025 35.0314 51.0246 35.6755 51.6687L46.0888 62.1893L49.5241 58.754L22.2564 31.4864C20.2525 34.4922 18.6959 37.7486 17.5866 41.2555C16.4772 44.7623 15.9226 48.4839 15.9226 52.4202C15.9226 62.7976 19.4116 71.4753 26.3895 78.4533C33.3674 85.4312 42.0451 88.9202 52.4226 88.9202ZM87.2049 77.9702L82.5888 73.354C84.5927 70.3481 86.1493 67.0918 87.2586 63.5849C88.3679 60.078 88.9226 56.3565 88.9226 52.4202C88.9226 42.0427 85.4336 33.365 78.4557 26.3871C71.4777 19.4092 62.8 15.9202 52.4226 15.9202C48.4863 15.9202 44.7647 16.4748 41.2579 17.5842C37.751 18.6935 34.4946 20.2501 31.4888 22.254L26.8726 17.6378C30.451 15.0614 34.3873 13.0574 38.6814 11.6261C42.9755 10.1947 47.5559 9.479 52.4226 9.479C58.4343 9.479 64.0525 10.5883 69.277 12.8069C74.5015 15.0256 79.0461 18.0672 82.9108 21.9319C86.7755 25.7967 89.8172 30.3413 92.0358 35.5658C94.2544 40.7903 95.3638 46.4084 95.3638 52.4202C95.3638 57.2868 94.6481 61.8672 93.2167 66.1614C91.7853 70.4555 89.7814 74.3917 87.2049 77.9702ZM63.6946 54.3525L58.7564 49.5217L69.1696 39.1084C69.8138 38.4643 70.601 38.1422 71.5314 38.1422C72.4618 38.1422 73.2848 38.4643 74.0005 39.1084C74.7162 39.8241 75.0741 40.6471 75.0741 41.5775C75.0741 42.5079 74.7162 43.331 74.0005 44.0466L63.6946 54.3525Z" fill="#B9B9B9"/>
+</svg>
--- a/web/Dockerfile.web
+++ b/web/Dockerfile.web
@ -15,6 +15,7 @@ FROM node:18-alpine AS installer
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ARG NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces

 # First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
@ -29,11 +30,12 @@ COPY replace-env-vars.sh /usr/local/bin/
 USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh

+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    NEXT_PUBLIC_DEPLOY_URL=$NEXT_PUBLIC_DEPLOY_URL
+
 RUN yarn turbo run build --filter=web

-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-ENV NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL}
 RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} web

 FROM node:18-alpine AS runner
@ -54,8 +56,11 @@ COPY --from=installer --chown=captain:plane /app/web/.next/standalone ./
 COPY --from=installer --chown=captain:plane /app/web/.next ./web/.next

 ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ARG NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
+
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    NEXT_PUBLIC_DEPLOY_URL=$NEXT_PUBLIC_DEPLOY_URL

 USER root
 COPY replace-env-vars.sh /usr/local/bin/
--- 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<void>;
  openIssuesListModal: (() => void) | null;
  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  disableAddIssueOption?: boolean;
  trashBox: boolean;
  setTrashBox: React.Dispatch<React.SetStateAction<boolean>>;
  viewProps: IIssueViewProps;
@ -68,6 +69,7 @@ export const AllViews: React.FC<Props> = ({
  handleOnDragEnd,
  openIssuesListModal,
  removeIssue,
+  disableAddIssueOption = false,
  trashBox,
  setTrashBox,
  viewProps,
@ -127,6 +129,7 @@ export const AllViews: React.FC<Props> = ({
                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<Props> = ({
              <AllBoards
                addIssueToGroup={addIssueToGroup}
                disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                dragDisabled={dragDisabled}
                handleIssueAction={handleIssueAction}
                handleTrashBox={handleTrashBox}
--- a/web/components/core/views/board-view/all-boards.tsx
+++ b/web/components/core/views/board-view/all-boards.tsx
@ -10,6 +10,7 @@ import { ICurrentUserResponse, IIssue, IIssueViewProps, IState, UserAuth } from
 type Props = {
  addIssueToGroup: (groupTitle: string) => 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<Props> = ({
  addIssueToGroup,
  disableUserActions,
+  disableAddIssueOption = false,
  dragDisabled,
  handleIssueAction,
  handleTrashBox,
@ -54,6 +56,7 @@ export const AllBoards: React.FC<Props> = ({
                addIssueToGroup={() => addIssueToGroup(singleGroup)}
                currentState={currentState}
                disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                dragDisabled={dragDisabled}
                groupTitle={singleGroup}
                handleIssueAction={handleIssueAction}
--- 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<Props> = ({
  currentState,
  groupTitle,
  disableUserActions,
+  disableAddIssueOption = false,
  dragDisabled,
  handleIssueAction,
  handleTrashBox,
@ -53,8 +55,6 @@ export const SingleBoard: React.FC<Props> = ({
  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<Props> = ({
        isCollapsed={isCollapsed}
        setIsCollapsed={setIsCollapsed}
        disableUserActions={disableUserActions}
-        disableAddIssue={isSubscribedIssues}
+        disableAddIssue={disableAddIssueOption}
        viewProps={viewProps}
      />
      {isCollapsed && (
@ -154,7 +154,7 @@ export const SingleBoard: React.FC<Props> = ({
              {selectedGroup !== "created_by" && (
                <div>
                  {type === "issue"
-                    ? !isSubscribedIssues && (
+                    ? !disableAddIssueOption && (
                        <button
                          type="button"
                          className="flex items-center gap-2 font-medium text-custom-primary outline-none p-1"
--- a/web/components/core/views/list-view/all-lists.tsx
+++ b/web/components/core/views/list-view/all-lists.tsx
@ -11,6 +11,7 @@ type Props = {
  openIssuesListModal?: (() => void) | null;
  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
  disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
  user: ICurrentUserResponse | undefined;
  userAuth: UserAuth;
  viewProps: IIssueViewProps;
@ -20,6 +21,7 @@ export const AllLists: React.FC<Props> = ({
  addIssueToGroup,
  handleIssueAction,
  disableUserActions,
+  disableAddIssueOption = false,
  openIssuesListModal,
  removeIssue,
  states,
@ -49,6 +51,7 @@ export const AllLists: React.FC<Props> = ({
                openIssuesListModal={openIssuesListModal}
                removeIssue={removeIssue}
                disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                user={user}
                userAuth={userAuth}
                viewProps={viewProps}
--- a/web/components/core/views/list-view/single-list.tsx
+++ b/web/components/core/views/list-view/single-list.tsx
@ -39,6 +39,7 @@ type Props = {
  openIssuesListModal?: (() => void) | null;
  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
  disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
  user: ICurrentUserResponse | undefined;
  userAuth: UserAuth;
  viewProps: IIssueViewProps;
@ -52,6 +53,7 @@ export const SingleList: React.FC<Props> = ({
  openIssuesListModal,
  removeIssue,
  disableUserActions,
+  disableAddIssueOption = false,
  user,
  userAuth,
  viewProps,
@ -60,7 +62,6 @@ export const SingleList: React.FC<Props> = ({
  const { workspaceSlug, projectId, cycleId, moduleId } = router.query;

  const isArchivedIssues = router.pathname.includes("archived-issues");
-  const isSubscribedIssues = router.pathname.includes("subscribed");

  const type = cycleId ? "cycle" : moduleId ? "module" : "issue";

@ -181,7 +182,7 @@ export const SingleList: React.FC<Props> = ({
            {isArchivedIssues ? (
              ""
            ) : type === "issue" ? (
-              !isSubscribedIssues && (
+              !disableAddIssueOption && (
                <button
                  type="button"
                  className="p-1  text-custom-text-200 hover:bg-custom-background-80"
--- a/web/components/issues/my-issues/my-issues-view.tsx
+++ b/web/components/issues/my-issues/my-issues-view.tsx
@ -209,6 +209,15 @@ export const MyIssuesView: React.FC<Props> = ({
    Object.keys(filtersToDisplay).length > 0 &&
    nullFilters.length !== Object.keys(filtersToDisplay).length;

+  const isSubscribedIssuesRoute = router.pathname.includes("subscribed");
+  const isMySubscribedIssues =
+    (filters.subscriber &&
+      filters.subscriber.length > 0 &&
+      router.pathname.includes("my-issues")) ??
+    false;
+
+  const disableAddIssueOption = isSubscribedIssuesRoute || isMySubscribedIssues;
+
  return (
    <>
      <CreateUpdateIssueModal
@ -291,6 +300,7 @@ export const MyIssuesView: React.FC<Props> = ({
        handleIssueAction={handleIssueAction}
        openIssuesListModal={openIssuesListModal ? openIssuesListModal : null}
        removeIssue={null}
+        disableAddIssueOption={disableAddIssueOption}
        trashBox={trashBox}
        setTrashBox={setTrashBox}
        viewProps={{
--- a/web/components/profile/profile-issues-view.tsx
+++ b/web/components/profile/profile-issues-view.tsx
@ -223,6 +223,15 @@ export const ProfileIssuesView = () => {
    Object.keys(filtersToDisplay).length > 0 &&
    nullFilters.length !== Object.keys(filtersToDisplay).length;

+  const isSubscribedIssuesRoute = router.pathname.includes("subscribed");
+  const isMySubscribedIssues =
+    (filters.subscriber &&
+      filters.subscriber.length > 0 &&
+      router.pathname.includes("my-issues")) ??
+    false;
+
+  const disableAddIssueOption = isSubscribedIssuesRoute || isMySubscribedIssues;
+
  return (
    <>
      <CreateUpdateIssueModal
@ -292,6 +301,7 @@ export const ProfileIssuesView = () => {
        handleIssueAction={handleIssueAction}
        openIssuesListModal={null}
        removeIssue={null}
+        disableAddIssueOption={disableAddIssueOption}
        trashBox={trashBox}
        setTrashBox={setTrashBox}
        viewProps={{
--- a/web/components/profile/sidebar.tsx
+++ b/web/components/profile/sidebar.tsx
@ -14,7 +14,7 @@ import { Icon, Loader, Tooltip } from "components/ui";
 // icons
 import { EditOutlined } from "@mui/icons-material";
 // helpers
-import { render12HourFormatTime, renderLongDetailDateFormat } from "helpers/date-time.helper";
+import { renderLongDetailDateFormat } from "helpers/date-time.helper";
 import { renderEmoji } from "helpers/emoji.helper";
 // fetch-keys
 import { USER_PROFILE_PROJECT_SEGREGATION } from "constants/fetch-keys";
@ -35,6 +35,16 @@ export const ProfileSidebar = () => {
      : null
  );

+  // Create a date object for the current time in the specified timezone
+  const currentTime = new Date();
+  const formatter = new Intl.DateTimeFormat("en-US", {
+    timeZone: userProjectsData?.user_data.user_timezone,
+    hour12: false, // Use 24-hour format
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+  const timeString = formatter.format(currentTime);
+
  const userDetails = [
    {
      label: "Joined on",
@ -44,7 +54,7 @@ export const ProfileSidebar = () => {
      label: "Timezone",
      value: (
        <span>
-          {render12HourFormatTime(new Date())}{" "}
+          {timeString}{" "}
          <span className="text-custom-text-200">{userProjectsData?.user_data.user_timezone}</span>
        </span>
      ),