sync: moving changes from develop to qa branch (#2742)

* fix: package version fixes and mentions build error fixes (#2665) * fix: existing issues modal for cycle and module (#2664) * fix: existing issues modal for cycle and module * refactor: existing issues modal code * fix: build errors * dev: On Demand Code Build for any branch (#2668) * wip * wip * testing * wip * wip * wip * wip * image push fix * wip * wip * dynamic branch name and tag * workflow_dispatch modified * job splitting * file sharing * wip * checking * wip * wip * wip * wip * build fixes * code upload download fixes * image name change --------- Co-authored-by: sriram veeraghanta <[email protected]> * Fix/mentions spaces fix (#2667) * feat: add mentions store to the space project * fix: added mentions highlights in read only comment cards * feat: added mention highlights in richtexteditor in space app * fix: render the estimate select if estimate is enabled for the project (#2663) * style: updated layouts UI in the space app (#2671) * style: updated layouts UI in space * fix: build error * chore: update avatar group logic (#2672) * fix: In kanban issues can be shifted between the column in order_by (#2676) * fix: slack integration workflow (#2675) * fix: slack integration workflow * dev: add slack client id as configuration * fix: clean up * fix: added env to turbo --------- Co-authored-by: sriram veeraghanta <[email protected]> * fix: bug fixes and ui improvement (#2674) * chore: peekoverview edit permission updated * chore: tab index added in create project modal * chore: project card improvement * style: avatar component improvement * chore: create issue modal improvement * style: global style sidebar border variable name fix * style: update border across workspace and project settings. (#2669) * style: update border across workspace and project settings. * update border width * style: update project description as per design. (#2682) * fix: kanban card state name and drop down items text overflow (#2686) * fix: slack project integration (#2684) * fix: replacing jira importer image (#2685) * fix: cycle and module bug fixes and improvement (#2691) * fix: cycle and module card issue count fix * fix: cycle and module list progress icon fix * fix: module card progress fix * style: cycle & module empty date label updated * fix: build error * chore: spreadsheet layout improvement (#2677) * style: spreadsheet column width fix * style: spreadsheet label column styling * chore: spreadsheet layout issue properties improvement * fix: build error * chore: user profile issue improvement (#2679) * fix: user profile filters z-index * chore: user profile issue state group heading fix * fix: build error * chore: peek overview improvement and bug fixes (#2683) * style: issue peek overview improvement * style: peek overview improvement * fix: subscribe issue from peek overview fix and validation added * fix: build error * fix: state icon (#2678) * fix: environment config changes in the API are replicated in web and space app (#2699) * fix: envconfig type changes * chore: configuration variables (#2692) * chore: update avatar group logic (#2672) * chore: configuration variables --------- * fix: replacing slack client id with env config --------- Co-authored-by: Nikhil <[email protected]> * dev: modified the branch wise build (#2702) * cherrypicked branch build code * trigger on pull request * branch filter * checking branch filter * checking push * checking push again * code cleanup before PR * style: update font weight in project general setting section. (#2697) * dev: Modified the branch-build action yaml (#2704) * cherrypicked code * removed PUSH event * dev: worker count (#2573) * dev: workers count * dev: update the worker count variable to GUNICORN_WORKERS * style: update user profile button alignment. (#2695) * fix: add issues to cycles and modules (#2659) * fix: able to add issue in cycle and module * fix: issue activity message * fix: issue draft delete functionality (#2696) * add errors for duplicate labels (#2706) Co-authored-by: rahulramesha <[email protected]> * style: spinner component improvement (#2708) * fix: quick add not working for labels & assignee (#2689) * fix: quick add not working for labels & assignee * fix: build error on spreadsheet view * refactor: replace keyboard events with command palette store (#2688) * fix: project select validation (#2723) * Fix: Render bar chart axis labels in lighter color when dark theme applied (#2721) * fix: project automation settings flickering (#2680) * fix: cycle and module sidebar z-index * fix: project automation settings flickering * chore: remove active ids from the MobX stores if not present in the route (#2681) * chore: remove active ids if not present in the route * refactor: set active id logic * style: ui consistency and improvement (#2725) * style: create/update issue modal properties ui improvement * style: create update issue modal improvement * style: modal ui consistency * fix: bug fixes and ui improvements (#2703) * fix: gantt chart duration in decimal * fix: Loading text instead Spinner in peek view * fix: cycle more popover typo & icon overlapping * fix: list layout properties alignment * fix: project search empty state * fix: calendar layout issue text overflow & redirection inconsistency * style: urgent priority hover background color * fix: Cycle issues kanban layout empty state missing * style: custom snooze modal placeholder text color * refactor: replaced unwanted anchor tag with div * chore: removed empty state for cycle kanban layout * fix: unwanted go back button in onboarding step 2 (#2714) * fix: added empty project state when no project exists. (#2727) * fix: added empty project state when no project exists * fix: duplicate import * fix: issue property height and peek view date picker border radius (#2726) * fix: all issues values not changeable and assignee image not rendering (#2707) * fix: all issues values are not changeable and assignee image not rendering * chore: removed console log * [fix]: Error Handling for Images and Table Fix for Form Submissions in Editor (#2710) * cancellable uploads and image limits with better error handling * fixed table row/column picker behaviour on modals * Merge branch 'rerender-debounce-editor-fix' into editor-draggable-nodes * fix: added mention suggestions and highlights in `create-issue-modal` * removed uncessary files * solved lint error of trailing spaces * added plane/ui dependency for tooltips --------- Co-authored-by: Henit Chobisa <[email protected]> * style: kanban card label overflow (#2722) * chore: kanban card lable drop down items overflow * style: kaban card label text overflow, tool tip, hover cursor * style: label overflow in list layout * fix: project states fixes (#2731) * fix: project states fixes * fix: states fixes * fix: formating all files * fix: toast alert inconsistency (#2730) * fix: Tooltip content on assignee hover in all layouts (#2724) * fix: Tooltip content on assignee hover in all layouts * chore: comments added * feat: state list endpoint (#2717) * feat: state list endpoint * dev: update states endpoint * dev: mark default state endpoint * fix: workspace members store added and implemented across the app (#2732) * fix: minor changes * fix: workspace members store added and implemnted across the app * fix: cystom analytics bar graph index alignment (#2737) * fix: Add horizontal scroll bar to views (#2736) * add errors for duplicate labels * adding horizonatal scroll bar to views --------- Co-authored-by: rahulramesha <[email protected]> * style: sidebar UI improvements (#2735) * updated font weight and color as per designs. * removed background color from workspace with logo. * updated dropdown design. * fix: UI improvements. (#2734) * style: update check icon colors to match our design. * fix: automatically focus input box in pages `add label` modal. * fix: spliting out the project members from project store and service (#2739) * refactor: gantt sidebar (#2705) * refactor: gantt sidebar * fix: exception error fix: file placement * refactor: not passing sidebar block as props * chore: configuration add tracker variables (#2709) * chore: configuration add tracker variables * dev: unsplash configuration * fix: mention notification (#2670) * fix: mention notification * feat: updated mentions for comments in the notification background task * feat: added subscription for issue_comment_mentions as well * fix: removed the print statement * fix: double notification popup for mentioned assignees * fix: added issue subscriber * fix: removed creator for subscribed * fix: creator will not be subscribed to issue * fix: double notification removed --------- Co-authored-by: Henit Chobisa <[email protected]> * fix: favourite cycle and modules displayed at top (#2719) * feat: issues v2 endpoint (#2713) * feat: issue v2 listing endpoint * dev: issues v3 endpoint * dev: add permission in the grouped endpoint * dev: update grouped endpoint * fix: fliter list item clear button alignment fix (#2741) * fix: date select tooltip fix (#2740) * refactor: cycles store (#2716) * refactor: cycles store * refactor: active cycle details --------- Co-authored-by: Aaryan Khandelwal <[email protected]> Co-authored-by: Manish Gupta <[email protected]> Co-authored-by: Henit Chobisa <[email protected]> Co-authored-by: guru_sainath <[email protected]> Co-authored-by: Nikhil <[email protected]> Co-authored-by: Anmol Singh Bhatia <[email protected]> Co-authored-by: Prateek Shourya <[email protected]> Co-authored-by: Ramesh Kumar Chandra <[email protected]> Co-authored-by: Bavisetti Narayan <[email protected]> Co-authored-by: rahulramesha <[email protected]> Co-authored-by: rahulramesha <[email protected]> Co-authored-by: Dakshesh Jain <[email protected]> Co-authored-by: Ankush Deshmukh <[email protected]> Co-authored-by: Lakhan Baheti <[email protected]> Co-authored-by: sabith-tu <[email protected]> Co-authored-by: M. Palanikannan <[email protected]>
makeplane · Nov 9, 2023 · 3af4396 · 3af4396
1 parent a03e0c7
commit 3af4396
Show file tree

Hide file tree

Showing 478 changed files with 6,637 additions and 5,739 deletions.
diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
@@ -0,0 +1,213 @@
+
+name: Branch Build
+
+on:
+  pull_request:
+    types: 
+      - closed
+    branches: 
+      - master
+      - release
+      - qa
+      - develop
+
+env:
+  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+
+jobs:
+  branch_build_and_push:
+    if: ${{ (github.event_name == 'pull_request' && github.event.action =='closed' && github.event.pull_request.merged == true) }}
+    name: Build-Push Web/Space/API/Proxy Docker Image
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Check out the repo
+        uses: actions/[email protected]
+
+      # - name: Set Target Branch Name on PR close
+      #   if: ${{ github.event_name == 'pull_request' && github.event.action =='closed' }}
+      #   run: echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
+
+      # - name: Set Target Branch Name on other than PR close
+      #   if: ${{ github.event_name == 'push' }}
+      #   run: echo "TARGET_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
+
+      - uses: ASzc/change-string-case-action@v2
+        id: gh_branch_upper_lower
+        with:
+          string: ${{env.TARGET_BRANCH}}
+
+      - uses: mad9000/actions-find-and-replace-string@2
+        id: gh_branch_replace_slash
+        with:
+          source: ${{ steps.gh_branch_upper_lower.outputs.lowercase }}
+          find: '/'        
+          replace: '-'
+
+      - uses: mad9000/actions-find-and-replace-string@2
+        id: gh_branch_replace_dot
+        with:
+          source: ${{ steps.gh_branch_replace_slash.outputs.value }}
+          find: '.'        
+          replace: ''
+
+      - uses: mad9000/actions-find-and-replace-string@2
+        id: gh_branch_clean
+        with:
+          source: ${{ steps.gh_branch_replace_dot.outputs.value }}
+          find: '_'
+          replace: ''
+      - name: Uploading Proxy Source
+        uses: actions/upload-artifact@v3
+        with:
+          name: proxy-src-code
+          path: ./nginx
+      - name: Uploading Backend Source
+        uses: actions/upload-artifact@v3
+        with:
+          name: backend-src-code
+          path: ./apiserver
+      - name: Uploading Web Source
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-src-code
+          path: |
+            ./
+            !./apiserver
+            !./nginx
+            !./deploy
+            !./space
+      
+      - name: Uploading Space Source
+        uses: actions/upload-artifact@v3
+        with:
+          name: space-src-code
+          path: |
+            ./
+            !./apiserver
+            !./nginx
+            !./deploy
+            !./web
+    outputs:
+        gh_branch_name: ${{ steps.gh_branch_clean.outputs.value }}
+
+  branch_build_push_frontend:
+    runs-on: ubuntu-20.04
+    needs: [ branch_build_and_push ]
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Downloading Web Source Code
+        uses: actions/download-artifact@v3
+        with:
+          name: web-src-code
+
+      - name: Build and Push Frontend to Docker Container Registry
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./web/Dockerfile.web
+          platforms: linux/amd64
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+          push: true
+        env:
+          DOCKER_BUILDKIT: 1
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  branch_build_push_space:
+    runs-on: ubuntu-20.04
+    needs: [ branch_build_and_push ]
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Downloading Space Source Code
+        uses: actions/download-artifact@v3
+        with:
+          name: space-src-code
+
+      - name: Build and Push Space to Docker Hub
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./space/Dockerfile.space
+          platforms: linux/amd64
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+          push: true
+        env:
+          DOCKER_BUILDKIT: 1
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  branch_build_push_backend:
+    runs-on: ubuntu-20.04
+    needs: [ branch_build_and_push ]
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Downloading Backend Source Code
+        uses: actions/download-artifact@v3
+        with:
+          name: backend-src-code
+
+      - name: Build and Push Backend to Docker Hub
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./Dockerfile.api
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+        env:
+          DOCKER_BUILDKIT: 1
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  branch_build_push_proxy:
+    runs-on: ubuntu-20.04
+    needs: [ branch_build_and_push ]
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Downloading Proxy Source Code
+        uses: actions/download-artifact@v3
+        with:
+          name: proxy-src-code
+
+      - name: Build and Push Plane-Proxy to Docker Hub
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
+          push: true
+        env:
+          DOCKER_BUILDKIT: 1
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -75,7 +75,7 @@ pnpm-lock.yaml
 pnpm-workspace.yaml
 
 .npmrc
+.secrets
 tmp/
-
 ## packages
 dist
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,8 +8,8 @@ Before submitting a new issue, please search the [issues](https://github.com/mak
 
 While we want to fix all the [issues](https://github.com/makeplane/plane/issues), before fixing a bug we need to be able to reproduce and confirm it. Please provide us with a minimal reproduction scenario using a repository or [Gist](https://gist.github.com/). Having a live, reproducible scenario gives us the information without asking questions back & forth with additional questions like:
 
--   3rd-party libraries being used and their versions
--   a use-case that fails
+- 3rd-party libraries being used and their versions
+- a use-case that fails
 
 Without said minimal reproduction, we won't be able to investigate all [issues](https://github.com/makeplane/plane/issues), and the issue might not be resolved.
 
@@ -19,10 +19,10 @@ You can open a new issue with this [issue form](https://github.com/makeplane/pla
 
 ### Requirements
 
--   Node.js version v16.18.0
--   Python version 3.8+
--   Postgres version v14
--   Redis version v6.2.7
+- Node.js version v16.18.0
+- Python version 3.8+
+- Postgres version v14
+- Redis version v6.2.7
 
 ### Setup the project
 
@@ -81,20 +81,20 @@ If you would like to _implement_ it, an issue with your proposal must be submitt
 
 To ensure consistency throughout the source code, please keep these rules in mind as you are working:
 
--   All features or bug fixes must be tested by one or more specs (unit-tests).
--   We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
+- All features or bug fixes must be tested by one or more specs (unit-tests).
+- We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
 
 ## Need help? Questions and suggestions
 
 Questions, suggestions, and thoughts are most welcome. We can also be reached in our [Discord Server](https://discord.com/invite/A92xrEGCge).
 
 ## Ways to contribute
 
--   Try Plane Cloud and the self hosting platform and give feedback
--   Add new integrations
--   Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
--   Share your thoughts and suggestions with us
--   Help create tutorials and blog posts
--   Request a feature by submitting a proposal
--   Report a bug
--   **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.
+- Try Plane Cloud and the self hosting platform and give feedback
+- Add new integrations
+- Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
+- Share your thoughts and suggestions with us
+- Help create tutorials and blog posts
+- Request a feature by submitting a proposal
+- Report a bug
+- **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.
diff --git a/ENV_SETUP.md b/ENV_SETUP.md
@@ -1,8 +1,10 @@
 # Environment Variables
+
 
-Environment variables are distributed in various files. Please refer them carefully. 
+Environment variables are distributed in various files. Please refer them carefully.
 
 ## {PROJECT_FOLDER}/.env
+
 File is available in the project root folder
 
 ```
@@ -41,25 +43,37 @@ USE_MINIO=1
 # Nginx Configuration
 NGINX_PORT=80
 ```
+
 
+
 ## {PROJECT_FOLDER}/web/.env.example
+
 
+
 ```
 # Enable/Disable OAUTH - default 0 for selfhosted instance
 NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```
+
 
+
 ## {PROJECT_FOLDER}/spaces/.env.example
+
 
+
 ```
 # Flag to toggle OAuth
 NEXT_PUBLIC_ENABLE_OAUTH=0
 ```
+
 
+
 ## {PROJECT_FOLDER}/apiserver/.env
+
 
+
 ```
 # Backend
 # Debug value for api server use it as 0 for production use
@@ -126,7 +140,9 @@ ENABLE_SIGNUP="1"
 # Email Redirection URL
 WEB_URL="http://localhost"
 ```
+
 ## Updates
+
 - The environment variable NEXT_PUBLIC_API_BASE_URL has been removed from both the web and space projects.
 - The naming convention for containers and images has been updated.
 - The plane-worker image will no longer be maintained, as it has been merged with plane-backend.

diff --git a/apiserver/.env.example b/apiserver/.env.example
@@ -70,3 +70,6 @@ ENABLE_MAGIC_LINK_LOGIN="0"
 # Email redirections and minio domain settings
 WEB_URL="http://localhost"
 
+
+# Gunicorn Workers
+GUNICORN_WORKERS=2
diff --git a/apiserver/bin/takeoff b/apiserver/bin/takeoff
@@ -6,4 +6,4 @@ python manage.py migrate
 # Create a Default User
 python bin/user_script.py
 
-exec gunicorn -w 8 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
+exec gunicorn -w $GUNICORN_WORKERS -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
@@ -5,7 +5,7 @@
 from rest_framework import serializers
 
 # Module imports
-from .base import BaseSerializer
+from .base import BaseSerializer, DynamicBaseSerializer
 from .user import UserLiteSerializer
 from .state import StateSerializer, StateLiteSerializer
 from .project import ProjectLiteSerializer
@@ -548,7 +548,7 @@ class Meta:
         ]
 
 
-class IssueLiteSerializer(BaseSerializer):
+class IssueLiteSerializer(DynamicBaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     state_detail = StateLiteSerializer(read_only=True, source="state")

diff --git a/apiserver/plane/api/serializers/state.py b/apiserver/plane/api/serializers/state.py
@@ -7,8 +7,6 @@
 
 
 class StateSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = State

diff --git a/apiserver/plane/api/urls/__init__.py b/apiserver/plane/api/urls/__init__.py
@@ -1,7 +1,7 @@
 from .analytic import urlpatterns as analytic_urls
 from .asset import urlpatterns as asset_urls
 from .authentication import urlpatterns as authentication_urls
-from .configuration import urlpatterns as configuration_urls
+from .config import urlpatterns as configuration_urls
 from .cycle import urlpatterns as cycle_urls
 from .estimate import urlpatterns as estimate_urls
 from .gpt import urlpatterns as gpt_urls

diff --git a/apiserver/plane/api/urls/configuration.py → apiserver/plane/api/urls/config.py b/apiserver/plane/api/urls/configuration.py → apiserver/plane/api/urls/config.py