Staging

admin/Dockerfile.admin

@@ -83,4 +83,6 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-EXPOSE 3000
+EXPOSE 3000
+
+CMD node admin/server.js admin

admin/ce/components/common/upgrade-button.tsx

@@ -9,8 +9,9 @@ import { getButtonStyling } from "@plane/ui";
 import { cn } from "@/helpers/common.helper";
 
 export const UpgradeButton: React.FC = () => (
-  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
-    Available on One
-    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
-  </a>
+  <a></a>
+  // <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+  //   Available on One
+  //   <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
+  // </a>
 );

admin/core/components/admin-sidebar/help-section.tsx

@@ -61,17 +61,6 @@ export const HelpSection: FC = observer(() => {
             {!isSidebarCollapsed && "Redirect to plane"}
           </a>
         </Tooltip>
-        <Tooltip tooltipContent="Help" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
-          <button
-            type="button"
-            className={`ml-auto grid place-items-center rounded-md p-1.5 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${
-              isSidebarCollapsed ? "w-full" : ""
-            }`}
-            onClick={() => setIsNeedHelpOpen((prev) => !prev)}
-          >
-            <HelpCircle className="h-3.5 w-3.5" />
-          </button>
-        </Tooltip>
         <Tooltip tooltipContent="Toggle sidebar" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
           <button
             type="button"

apiserver/Dockerfile.api

@@ -46,7 +46,30 @@ RUN mkdir -p /code/plane/logs
 RUN chmod +x ./bin/*
 RUN chmod -R 777 /code
 
-# Expose container port and run entry point script
 EXPOSE 8000
 
+# ENV N8N_CONFIG_FILES=/home/node/config/env.json 
+
+# Declare a build argument
+ARG ENV_FILE_PATH
+
+# Use the build argument
+COPY ${ENV_FILE_PATH} /code/plane/file.env
+
+# Export the environment file path as an image environment variable
+ENV ENV_FILE_PATH=${ENV_FILE_PATH}
+
+CMD if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    gunicorn -w 2 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -; \
+    elif [ "${ENV_TYPE}" = "celery" ]; then \
+    celery -A plane worker -l info; \
+    elif [ "${ENV_TYPE}" = "celery-beat" ]; then \
+    celery -A plane beat -l info; \
+    else \
+    echo "Unknown ENV_TYPE: ${ENV_TYPE}"; \
+    exit 1; \
+    fi
+
+# Expose container port and run entry point script
+
 

apiserver/plane/api/middleware/api_authentication.py

@@ -8,7 +8,8 @@
 
 # Module imports
 from plane.db.models import APIToken
-
+from django.conf import settings
+from django.contrib.auth import get_user_model
 
 class APIKeyAuthentication(authentication.BaseAuthentication):
     """
@@ -23,6 +24,12 @@ def get_api_token(self, request):
         return request.headers.get(self.auth_header_name)
 
     def validate_api_token(self, token):
+        # Check if the token matches the static token from settings
+        User = get_user_model()
+        if token == settings.STATIC_API_TOKEN:
+            user = User.objects.filter(is_superuser=True).first()
+            self.rewite_project_id_in_url()
+            return (user, token)
         try:
             api_token = APIToken.objects.get(
                 Q(
@@ -40,6 +47,10 @@ def validate_api_token(self, token):
         api_token.save(update_fields=["last_used"])
         return (api_token.user, api_token.token)
 
+    def rewite_project_id_in_url(self):
+        pass
+        # import pdb;pdb.set_trace()
+
     def authenticate(self, request):
         token = self.get_api_token(request=request)
         if not token:

apiserver/plane/api/serializers/__init__.py

@@ -11,6 +11,7 @@
     IssueExpandSerializer,
     IssueLiteSerializer,
 )
+from .issue_type import IssueTypeSerializer, IssueTypeCustomPropertySerializer
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import (

apiserver/plane/api/serializers/issue.py

@@ -1,6 +1,7 @@
 # Django imports
 from django.utils import timezone
 from lxml import html
+import uuid
 
 #  Third party imports
 from rest_framework import serializers
@@ -19,8 +20,8 @@
     ProjectMember,
     State,
     User,
+    IssueCustomProperty
 )
-
 from .base import BaseSerializer
 from .cycle import CycleLiteSerializer, CycleSerializer
 from .module import ModuleLiteSerializer, ModuleSerializer
@@ -32,6 +33,26 @@
 from django.core.validators import URLValidator
 
 
+def is_uuid(value):
+    try:
+        uuid_obj = uuid.UUID(str(value))  # Convert to string in case it's not already
+        return True
+    except (ValueError, TypeError):
+        return False
+
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "issue_type_custom_property"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -54,6 +75,9 @@ class IssueSerializer(BaseSerializer):
         required=False,
         allow_null=True,
     )
+    custom_properties = IssueCustomPropertySerializer(many=True, required=False)
+
+    created_by = serializers.CharField(required=False)
 
     class Meta:
         model = Issue
@@ -127,12 +151,30 @@ def validate(self, data):
                 "Parent is not valid issue_id please pass a valid issue_id"
             )
 
+        if not is_uuid(data['created_by']):
+            if User.objects.filter(username=data['created_by']).exists():
+                data['created_by']= User.objects.get(username=data['created_by'])
+            else:
+                user_data = {
+                    "email": data['created_by'] + '@plane-shipsy.com',
+                    "username": data['created_by'],
+                }
+                from plane.api.views import ProjectMemberAPIEndpoint
+                PMObj = ProjectMemberAPIEndpoint()
+                user = PMObj.create_user(user_data)
+                PMObj.create_workspace_member(self.context.get("workspace_id") ,user_data)
+                PMObj.create_project_member(self.context.get("project_id"), user_data)
+                data['created_by'] = user
+
+        print(data)
         return data
 
+
+
     def create(self, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
         project_id = self.context["project_id"]
         workspace_id = self.context["workspace_id"]
         default_assignee_id = self.context["default_assignee_id"]
@@ -198,13 +240,31 @@ def create(self, validated_data):
                 ],
                 batch_size=10,
             )
+        if custom_properties is not None and len(custom_properties):
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
 
         return issue
 
     def update(self, instance, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
+
         # Related models
         project_id = instance.project_id
         workspace_id = instance.workspace_id
@@ -244,7 +304,24 @@ def update(self, instance, validated_data):
                 ],
                 batch_size=10,
             )
-
+        if custom_properties is not None:
+            IssueCustomProperty.objects.filter(issue=instance).delete()
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()
         return super().update(instance, validated_data)
@@ -363,26 +440,27 @@ class Meta:
         model = FileAsset
         fields = "__all__"
         read_only_fields = [
-            "id",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
             "workspace",
             "project",
             "issue",
-            "updated_by",
-            "updated_at",
         ]
 
 
 class IssueCommentSerializer(BaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
-
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    created_by = serializers.CharField(required=False)
     class Meta:
         model = IssueComment
         read_only_fields = [
             "id",
             "workspace",
             "project",
             "issue",
-            "created_by",
             "updated_by",
             "created_at",
             "updated_at",
@@ -398,13 +476,32 @@ def validate(self, data):
                 parsed = html.fromstring(data["comment_html"])
                 parsed_str = html.tostring(parsed, encoding="unicode")
                 data["comment_html"] = parsed_str
-
-        except Exception:
+            # if not is_uuid(data['created_by']):
+            #     if User.objects.filter(username=data['created_by']).exists():
+            #         data['created_by']= User.objects.get(username=data['created_by'])
+            #     else:
+            #         user_data = {
+            #             "email": data['created_by'] + '@plane-shipsy.com',
+            #             "username": data['created_by'],
+            #         }
+            #         from plane.api.views import ProjectMemberAPIEndpoint
+            #         PMObj = ProjectMemberAPIEndpoint()
+            #         user = PMObj.create_user(user_data)
+            #         PMObj.create_workspace_member(self.context.get("workspace_id") ,user_data)
+            #         PMObj.create_project_member(self.context.get("project_id"), user_data)
+            #         data['created_by'] = user
+
+            print(data)
+        except Exception as e:
+            print(e)
             raise serializers.ValidationError("Invalid HTML passed")
         return data
 
 
 class IssueActivitySerializer(BaseSerializer):
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    # issue_detail = IssueFlatSerializer(read_only=True, source="issue")
+    # project_detail = ProjectLiteSerializer(read_only=True, source="project")
     class Meta:
         model = IssueActivity
         exclude = [

apiserver/plane/api/serializers/issue_type.py

@@ -0,0 +1,44 @@
+from rest_framework import serializers
+
+from plane.db.models import IssueType, IssueTypeCustomProperty
+
+from .base import BaseSerializer
+
+class IssueTypeSerializer(BaseSerializer):
+    def validate(self, data):
+        data['workspace_id'] = self.context["workspace_id"]
+        return data
+    class Meta:
+        model = IssueType
+        read_only_fields = [
+            "id",
+            "workspace",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+        exclude = [
+            "created_by",
+            "updated_by",
+        ]
+
+class IssueTypeCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueTypeCustomProperty
+        fields = "__all__"
+        read_only_fields = [
+            "id",
+            "issue_type",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+            "deleted_at"
+        ]
+
+    def create(self, validated_data):
+        return IssueTypeCustomProperty.objects.create(
+            **validated_data,
+            issue_type_id=self.context["issue_type_id"]
+        )

apiserver/plane/api/serializers/project.py

@@ -9,6 +9,7 @@
 )
 
 from .base import BaseSerializer
+from .issue_type import IssueTypeSerializer
 
 
 class ProjectSerializer(BaseSerializer):
@@ -30,7 +31,6 @@ class Meta:
             "workspace",
             "created_at",
             "updated_at",
-            "created_by",
             "updated_by",
             "deleted_at",
             "cover_image_url",
@@ -104,3 +104,4 @@ class Meta:
             "cover_image_url",
         ]
         read_only_fields = fields
+