Merge pull request #314 from makeplane/develop

* chore: update all backend dependencies to the latest version * feat: record issue completed at date when the issues are moved to fompleted group (#262) * feat: cycle status (#265) * feat: cycle status and dates added in sidebar * feat: update status added * chore: update python runtime * feat: label grouping in dropdowns, default state in project settings (#266) * feat: label grouping in dropdowns, default state in project settings * feat: label disclosure default open * refactor: label setting page * chore: tooltip component updated * chore: tooltip component updated * feat/state_sequence_change * fix: remirror buttons (#267) * feat: burndown chart (#268) * chore: recharts dependencie added * chore: tpye added for issue completed at * feat: date range helper fn added * feat: progress chart added * feat: ideal task line added in progress chart * feat: chart legends added * fix: state reordering (#269) * fix: state reordering * refactor: remove unnecessary argument * refactor: mutation after setting default * feat: drag and drop an issue to delete (#270) * feat: drag and drop an issue to delete * style: repositioned trash box * feat : cycle sidebar revamp (#271) * feat: range date picker added * feat: cycle status ui improved * feat : sidebar progress improvement (#272) * feat: progress chart render validation * fix: sidebar stats tab * feat: sidebar active tab context * chore: removed minor bugs (#273) * fix: ui bug (#274) * fix: shortcut search fix shortcut modal ui fixes shortcut search fix email us label change * fix: email us label updated * feat: default state for project (#264) * build: add channels requirement for the asgi configuration (#225) * refactor: combine sign in and sign up endpoint to a single endpoint (#263) * feat: state grouping and ordering list (#253) * feat: state grouping and ordering list * fix: state grouping in state list endpoint * dev: added migrations for new models schema changes * fix: mac text copy fix (#277) * feat: state description in settings (#275) * chore: removed minor bugs * feat: state description in settings * feat: group by assignee * refactor: update django admin panel heading (#276) * feat: create label option in create issue modal (#281) * refactor: issue details page (#282) * fix: shortcut search (#283) * fix: search case innsensitive * style: email icon updated * feat: module sidebar date and status updated (#285) * feat: bulk assign sub-issues (#284) * fix: consistent dropdowns, refactor: ui components (#286) * build(deps): bump django in /apiserver/requirements (#289) Bumps [django](https://github.com/django/django) from 3.2.17 to 3.2.18. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@3.2.17...3.2.18) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: workspace name and breadcrumb title , refactor: command palette (#290) * refactor: command pallette * fix: workspace name trim * fix: breadcrumb title responsiveness added * feat: copy link option (#292) * feat: copy issue link added in issue card * feat: copy cycle link added * feat: ellipsis added in module card * fix: origin path and handlecopytext added * fix: remirror image not updating (#294) * feat: resend login magic code (#291) * feat: resend login code on signing page after 30 seconds * feat: handling error on code send * refractor: isResendDisabled varible for resend button * dev: timer count-down hook * refractor: using new timer hook in sign in page * feat: issue links (#288) * feat: links for issues * fix: add issue link in serilaizer * feat: links can be added to issues --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> * fix: default label color (#295) * fix: colors of old labels can now be changed * fix: black color for labels with no color * fix: ui changes (#297) * fix: module card height and invalid date * fix: issue details page title resizing fix * refractor: use local storage hook (#293) * feat: resend login code on signing page after 30 seconds * refractor: use local storage hook * refractor: properly using new local storage hook on modules sidebar * fix: assignee and labels field while editing an issue (#296) * fix: assignee and labels field while editing an issue * chore: remove unused declarations * fix: issue title resizing fix (#300) * fix: issue title resizing fix * fix: header ui fix and invalid date label updated * fix: try/catch for invalid values stored in local storage (#301) * fix: create issue modal closing on clicking on Grammarly recommendation (#299) fixed it by not closing modal on outside click * style: not showing pointer & theme color on resend code button disabled (#298) * fix: new project issues response (#303) * refactor/cycles_folder_structure (#304) * fix: ui changes (#306) * fix: sidebar date range * fix: renamed key with id in filters * fix: replace progress bar * chore: react progress bar package removed * fix: progress chart legends position * fix: progress chart legends alignment fix * feat: manual ordering of issues (#305) * feat: global component for links list (#307) * Feat: Dockerizing using nginx reverse proxy (#280) * minor docker fixes * eslint config changes * dockerfile changes to backend and frontend * oauth enabled env flag * sentry enabled env flag * build: get alternatives for environment variables and static file storage * build: automatically generate random secret key if not provided * build: update docker compose for next url env add channels to requirements for asgi server and save files in local machine for docker environment * build: update nginx conf for backend base url update backend dockerfile to make way for static file uploads * feat: create a default user with given values else default values * chore: update docker python version and other dependency version in docker * build: update local settings file to run it in docker * fix: update script to run in default production setting * fix: env variable changes and env setup shell script added * Added Single Dockerfile to run the Entire plane application * docs build fixes --------- Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> * feat: edit module (#309) * feat: edit module * fix: build fix * refactor: dnd function (#308) * refactor: manual ordering bugs (#312) * refactor: create issue modal input fields (#310) * style: showing user sign-in progress on sign-in with code (#311) * style: not showing pointer & theme color on resend code button disabled * style: showing user sign-in progress on sign-in with code * style: showing error from server on sign-in with code fail --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia1001@gmail.com> Co-authored-by: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Co-authored-by: vamsi <vamsi.kurama@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com> Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com> Co-authored-by: Narayana <narayana.vadapalli1996@gmail.com>
makeplane · Feb 21, 2023 · 1b94c7b · 1b94c7b · vercel · Feb 21, 2023
2 parents 605ab26 + 5cbb3ec
commit 1b94c7b
Show file tree

Hide file tree

Showing 195 changed files with 14,233 additions and 14,878 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,10 +1,10 @@
 module.exports = {
   root: true,
-  // This tells ESLint to load the config from the package `config`
-  // extends: ["custom"],
+  // This tells ESLint to load the config from the package `eslint-config-custom`
+  extends: ["custom"],
   settings: {
     next: {
-      rootDir: ["apps/*/"],
+      rootDir: ["apps/*"],
     },
   },
 };
diff --git a/.gitignore b/.gitignore
@@ -64,4 +64,9 @@ package-lock.json
 .vscode
 
 # Sentry
-.sentryclirc
+.sentryclirc
+
+# lock files
+package-lock.json
+pnpm-lock.yaml
+pnpm-workspace.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,116 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+RUN apk update
+# Set working directory
+WORKDIR /app
+
+RUN yarn global add turbo
+COPY . .
+
+RUN turbo prune --scope=app --docker
+
+# Add lockfile and package.json's of isolated subworkspace
+FROM node:18-alpine AS installer
+
+
+RUN apk add --no-cache libc6-compat
+RUN apk update
+WORKDIR /app
+
+# 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
+
+# Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+
+RUN yarn turbo run build --filter=app
+
+
+FROM python:3.11.1-alpine3.17 AS backend
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+
+WORKDIR /code
+
+RUN apk --update --no-cache add \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2" \
+    "nginx" \
+    "nodejs" \
+    "npm" \
+    "supervisor"
+
+COPY apiserver/requirements.txt ./
+COPY apiserver/requirements ./requirements
+RUN apk add libffi-dev
+RUN apk --update --no-cache --virtual .build-deps add \
+    "bash~=5.2" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
+    "libc-dev" \
+    "linux-headers" \
+    && \
+    pip install -r requirements.txt --compile --no-cache-dir \
+    && \
+    apk del .build-deps
+
+# Add in Django deps and generate Django's static files
+COPY apiserver/manage.py manage.py
+COPY apiserver/plane plane/
+COPY apiserver/templates templates/
+
+COPY apiserver/gunicorn.config.py ./
+RUN apk --update --no-cache add "bash~=5.2"
+COPY apiserver/bin ./bin/
+
+RUN chmod +x ./bin/takeoff ./bin/worker
+RUN chmod -R 777 /code
+
+# Expose container port and run entry point script
+EXPOSE 8000
+EXPOSE 3000
+EXPOSE 80
+
+
+
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+
+COPY --from=installer /app/apps/app/next.config.js .
+COPY --from=installer /app/apps/app/package.json .
+
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
+
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+# RUN rm /etc/nginx/conf.d/default.conf
+#######################################################################
+COPY nginx/nginx-single-docker-image.conf /etc/nginx/http.d/default.conf
+#######################################################################
+
+COPY nginx/supervisor.conf /code/supervisor.conf
+
+
+CMD ["supervisord","-c","/code/supervisor.conf"]
+
+
+
+
diff --git a/apiserver/.env.example b/apiserver/.env.example
@@ -1,18 +1,22 @@
-# Backend
 SECRET_KEY="<-- django secret -->"
+DJANGO_SETTINGS_MODULE="plane.settings.production"
+# Database
+DATABASE_URL=postgres://plane:plane@plane-db-1:5432/plane
+# Cache
+REDIS_URL=redis://redis:6379/
+# SMPT
 EMAIL_HOST="<-- email smtp -->"
 EMAIL_HOST_USER="<-- email host user -->"
 EMAIL_HOST_PASSWORD="<-- email host password -->"
-
+# AWS 
 AWS_REGION="<-- aws region -->"
 AWS_ACCESS_KEY_ID="<-- aws access key -->"
 AWS_SECRET_ACCESS_KEY="<-- aws secret acess key -->"
 AWS_S3_BUCKET_NAME="<-- aws s3 bucket name -->"
-
-SENTRY_DSN="<-- sentry dsn -->"
-WEB_URL="<-- frontend web url -->"
-
+# FE
+WEB_URL="localhost/"
+# OAUTH
 GITHUB_CLIENT_SECRET="<-- github secret -->"
-
+# Flags
 DISABLE_COLLECTSTATIC=1
-DOCKERIZED=0 //True if running docker compose else 0
+DOCKERIZED=1
diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api
@@ -1,4 +1,4 @@
-FROM python:3.8.14-alpine3.16 AS backend
+FROM python:3.11.1-alpine3.17 AS backend
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -8,19 +8,19 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 WORKDIR /code
 
 RUN apk --update --no-cache add \
-    "libpq~=14" \
+    "libpq~=15" \
     "libxslt~=1.1" \
-    "nodejs-current~=18" \
+    "nodejs-current~=19" \
     "xmlsec~=1.2"
 
 COPY requirements.txt ./
 COPY requirements ./requirements
 RUN apk add libffi-dev
 RUN apk --update --no-cache --virtual .build-deps add \
-    "bash~=5.1" \
-    "g++~=11.2" \
-    "gcc~=11.2" \
-    "cargo~=1.60" \
+    "bash~=5.2" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
     "git~=2" \
     "make~=4.3" \
     "postgresql13-dev~=13" \
@@ -46,15 +46,16 @@ COPY templates templates/
 
 COPY gunicorn.config.py ./
 USER root
-RUN apk --update --no-cache add "bash~=5.1"
+RUN apk --update --no-cache add "bash~=5.2"
 COPY ./bin ./bin/
 
 RUN chmod +x ./bin/takeoff ./bin/worker
+RUN chmod -R 777 /code
 
 USER captain
 
 # Expose container port and run entry point script
 EXPOSE 8000
 
-CMD [ "./bin/takeoff" ]
+# CMD [ "./bin/takeoff" ]
 
diff --git a/apiserver/bin/takeoff b/apiserver/bin/takeoff
@@ -2,4 +2,8 @@
 set -e
 python manage.py wait_for_db
 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 --config gunicorn.config.py --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
diff --git a/apiserver/bin/user_script.py b/apiserver/bin/user_script.py
@@ -0,0 +1,28 @@
+import os, sys
+import uuid
+
+sys.path.append("/code")
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
+import django
+
+django.setup()
+
+from plane.db.models import User
+
+
+def populate():
+    default_email = os.environ.get("DEFAULT_EMAIL", "captain@plane.so")
+    default_password = os.environ.get("DEFAULT_PASSWORD", "password123")
+
+    if not User.objects.filter(email=default_email).exists():
+        user = User.objects.create(email=default_email, username=uuid.uuid4().hex)
+        user.set_password(default_password)
+        user.save()
+        print("User created")
+
+    print("Success")
+
+
+if __name__ == "__main__":
+    populate()
diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
@@ -24,9 +24,15 @@
     Cycle,
     Module,
     ModuleIssue,
+    IssueLink,
 )
 
 
+class IssueLinkCreateSerializer(serializers.Serializer):
+    url = serializers.CharField(required=True)
+    title = serializers.CharField(required=False)
+
+
 class IssueFlatSerializer(BaseSerializer):
     ## Contain only flat fields
 
@@ -86,6 +92,11 @@ class IssueCreateSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
+    links_list = serializers.ListField(
+        child=IssueLinkCreateSerializer(),
+        write_only=True,
+        required=False,
+    )
 
     class Meta:
         model = Issue
@@ -104,6 +115,7 @@ def create(self, validated_data):
         assignees = validated_data.pop("assignees_list", None)
         labels = validated_data.pop("labels_list", None)
         blocks = validated_data.pop("blocks_list", None)
+        links = validated_data.pop("links_list", None)
 
         project = self.context["project"]
         issue = Issue.objects.create(**validated_data, project=project)
@@ -172,13 +184,32 @@ def create(self, validated_data):
                 batch_size=10,
             )
 
+        if links is not None:
+            IssueLink.objects.bulk_create(
+                [
+                    IssueLink(
+                        issue=issue,
+                        project=project,
+                        workspace=project.workspace,
+                        created_by=issue.created_by,
+                        updated_by=issue.updated_by,
+                        title=link.get("title", None),
+                        url=link.get("url", None),
+                    )
+                    for link in links
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
+
         return issue
 
     def update(self, instance, validated_data):
         blockers = validated_data.pop("blockers_list", None)
         assignees = validated_data.pop("assignees_list", None)
         labels = validated_data.pop("labels_list", None)
         blocks = validated_data.pop("blocks_list", None)
+        links = validated_data.pop("links_list", None)
 
         if blockers is not None:
             IssueBlocker.objects.filter(block=instance).delete()
@@ -248,6 +279,25 @@ def update(self, instance, validated_data):
                 batch_size=10,
             )
 
+        if links is not None:
+            IssueLink.objects.filter(issue=instance).delete()
+            IssueLink.objects.bulk_create(
+                [
+                    IssueLink(
+                        issue=instance,
+                        project=instance.project,
+                        workspace=instance.project.workspace,
+                        created_by=instance.created_by,
+                        updated_by=instance.updated_by,
+                        title=link.get("title", None),
+                        url=link.get("url", None),
+                    )
+                    for link in links
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
+
         return super().update(instance, validated_data)
 
 
@@ -410,6 +460,12 @@ class Meta:
         ]
 
 
+class IssueLinkSerializer(BaseSerializer):
+    class Meta:
+        model = IssueLink
+        fields = "__all__"
+
+
 class IssueSerializer(BaseSerializer):
     project_detail = ProjectSerializer(read_only=True, source="project")
     state_detail = StateSerializer(read_only=True, source="state")
@@ -422,6 +478,7 @@ class IssueSerializer(BaseSerializer):
     blocker_issues = BlockerIssueSerializer(read_only=True, many=True)
     issue_cycle = IssueCycleDetailSerializer(read_only=True)
     issue_module = IssueModuleDetailSerializer(read_only=True)
+    issue_link = IssueLinkSerializer(read_only=True, many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
 
     class Meta:

diff --git a/apiserver/plane/api/urls.py b/apiserver/plane/api/urls.py
@@ -5,7 +5,6 @@
 
 from plane.api.views import (
     # Authentication
-    SignUpEndpoint,
     SignInEndpoint,
     SignOutEndpoint,
     MagicSignInEndpoint,
@@ -95,7 +94,6 @@
     path("social-auth/", OauthEndpoint.as_view(), name="oauth"),
     # Auth
     path("sign-in/", SignInEndpoint.as_view(), name="sign-in"),
-    path("sign-up/", SignUpEndpoint.as_view(), name="sign-up"),
     path("sign-out/", SignOutEndpoint.as_view(), name="sign-out"),
     # Magic Sign In/Up
     path(