chore: update workspace file

* fix: circular dependencies and build issues
* chore: removed duplicate enums

* fix: build errors

.github/workflows/build-branch.yml

@@ -117,44 +117,6 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
 
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            proxy:
-              - caddy/**
-            admin:
-              - admin/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            space:
-              - space/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            web:
-              - web/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            live:
-              - live/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-
   branch_build_push_admin:
     name: Build-Push Admin Docker Image
     runs-on: ubuntu-22.04
@@ -280,8 +242,8 @@ jobs:
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
-          build-context: ./caddy
-          dockerfile-path: ./caddy/Dockerfile
+          build-context: ./nginx
+          dockerfile-path: ./nginx/Dockerfile
           buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
           buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}

.gitignore

@@ -75,8 +75,7 @@ package-lock.json
 
 # lock files
 package-lock.json
-pnpm-lock.yaml
-pnpm-workspace.yaml
+yarn.lock
 
 .npmrc
 .secrets

.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

CONTRIBUTING.md

@@ -72,7 +72,7 @@ docker compose -f docker-compose-local.yml up
 4. Start web apps:
 
 ```bash
-yarn dev
+pnpm dev
 ```
 
 5. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin

aio/Dockerfile-app

@@ -11,7 +11,7 @@ WORKDIR /app
 RUN yarn global add turbo
 COPY . .
 
-RUN turbo prune --scope=web --scope=space --scope=admin --scope=live --docker
+RUN turbo prune --scope=web --scope=space --scope=admin --docker
 
 # *****************************************************************************
 # STAGE 2: Install dependencies & build the project
@@ -53,7 +53,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN yarn turbo run build --filter=web --filter=space --filter=admin --filter=live
+RUN yarn turbo run build --filter=web --filter=space --filter=admin
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
@@ -87,8 +87,6 @@ RUN chmod +x ./api/bin/*
 RUN chmod -R 777 ./api/
 
 # NEXTJS BUILDS
-COPY --from=installer /app/node_modules ./node_modules/
-
 COPY --from=installer /app/web/next.config.js ./web/
 COPY --from=installer /app/web/package.json ./web/
 COPY --from=installer /app/web/.next/standalone ./web
@@ -107,10 +105,6 @@ COPY --from=installer /app/admin/.next/standalone ./admin
 COPY --from=installer /app/admin/.next/static ./admin/admin/.next/static
 COPY --from=installer /app/admin/public ./admin/admin/public
 
-COPY --from=installer /app/live/package.json ./live/
-COPY --from=installer /app/live/dist ./live/dist
-# COPY --from=installer /app/live/node_modules ./live/node_modules
-
 ARG NEXT_PUBLIC_API_BASE_URL=""
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
 

aio/nginx.conf

@@ -45,14 +45,6 @@ http {
             proxy_pass http://localhost:3003/god-mode/;
         }
 
-        location /live/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:3004/;
-        }
-
         location /api/ {
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;

aio/supervisord-app

@@ -29,16 +29,6 @@ stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 environment=PORT=3003,HOSTNAME=0.0.0.0
 
-[program:live]
-command=node /app/live/dist/server.js
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3004,HOSTNAME=0.0.0.0,API_BASE_URL="http://localhost:8000"
-
 [program:migrator]
 directory=/app/api
 command=sh -c "./bin/docker-entrypoint-migrator.sh"

apiserver/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "plane-api",
-  "version": "0.26.1",
-  "license": "AGPL-3.0",
-  "private": true,
-  "description": "API server powering Plane's backend"
-}

apiserver/plane/tests/contract/app/test_api_token.py

@@ -1,372 +0,0 @@
-import pytest
-from datetime import timedelta
-from uuid import uuid4
-from django.urls import reverse
-from django.utils import timezone
-from rest_framework import status
-
-from plane.db.models import APIToken, User
-
-
-@pytest.mark.contract
-class TestApiTokenEndpoint:
-    """Test cases for ApiTokenEndpoint"""
-
-    # POST /user/api-tokens/ tests
-    @pytest.mark.django_db
-    def test_create_api_token_success(
-        self, session_client, create_user, api_token_data
-    ):
-        """Test successful API token creation"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert "token" in response.data
-        assert response.data["label"] == api_token_data["label"]
-        assert response.data["description"] == api_token_data["description"]
-        assert response.data["user_type"] == 0  # Human user
-
-        # Verify token was created in database
-        token = APIToken.objects.get(pk=response.data["id"])
-        assert token.user == create_user
-        assert token.label == api_token_data["label"]
-
-    @pytest.mark.django_db
-    def test_create_api_token_for_bot_user(
-        self, session_client, create_bot_user, api_token_data
-    ):
-        """Test API token creation for bot user"""
-        # Arrange
-        session_client.force_authenticate(user=create_bot_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert response.data["user_type"] == 1  # Bot user
-
-    @pytest.mark.django_db
-    def test_create_api_token_minimal_data(self, session_client, create_user):
-        """Test API token creation with minimal data"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, {}, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert "token" in response.data
-        assert len(response.data["label"]) == 32  # UUID hex length
-        assert response.data["description"] == ""
-
-    @pytest.mark.django_db
-    def test_create_api_token_with_expiry(self, session_client, create_user):
-        """Test API token creation with expiry date"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-        future_date = timezone.now() + timedelta(days=30)
-        data = {"label": "Expiring Token", "expired_at": future_date.isoformat()}
-
-        # Act
-        response = session_client.post(url, data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-
-        # Verify expiry date was set
-        token = APIToken.objects.get(pk=response.data["id"])
-        assert token.expired_at is not None
-
-    @pytest.mark.django_db
-    def test_create_api_token_unauthenticated(self, api_client, api_token_data):
-        """Test API token creation without authentication"""
-        # Arrange
-        url = reverse("api-tokens")
-
-        # Act
-        response = api_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_401_UNAUTHORIZED
-
-    # GET /user/api-tokens/ tests
-    @pytest.mark.django_db
-    def test_get_all_api_tokens(self, session_client, create_user):
-        """Test retrieving all API tokens for user"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-
-        # Create multiple tokens
-        APIToken.objects.create(label="Token 1", user=create_user, user_type=0)
-        APIToken.objects.create(label="Token 2", user=create_user, user_type=0)
-        # Create a service token (should be excluded)
-        APIToken.objects.create(
-            label="Service Token", user=create_user, user_type=0, is_service=True
-        )
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.data) == 2  # Only non-service tokens
-        assert all(token["is_service"] is False for token in response.data)
-
-    @pytest.mark.django_db
-    def test_get_empty_api_tokens_list(self, session_client, create_user):
-        """Test retrieving API tokens when none exist"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data == []
-
-    # GET /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_get_specific_api_token(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test retrieving a specific API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert str(response.data["id"]) == str(create_api_token_for_user.pk)
-        assert response.data["label"] == create_api_token_for_user.label
-        assert (
-            "token" not in response.data
-        )  # Token should not be visible in read serializer
-
-    @pytest.mark.django_db
-    def test_get_nonexistent_api_token(self, session_client, create_user):
-        """Test retrieving a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_get_other_users_api_token(self, session_client, create_user, db):
-        """Test retrieving another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"other-{unique_id}@plane.so"
-        unique_username = f"other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    # DELETE /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_delete_api_token_success(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test successful API token deletion"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_204_NO_CONTENT
-        assert not APIToken.objects.filter(pk=create_api_token_for_user.pk).exists()
-
-    @pytest.mark.django_db
-    def test_delete_nonexistent_api_token(self, session_client, create_user):
-        """Test deleting a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_delete_other_users_api_token(self, session_client, create_user, db):
-        """Test deleting another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"delete-other-{unique_id}@plane.so"
-        unique_username = f"delete_other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-        # Verify token still exists
-        assert APIToken.objects.filter(pk=other_token.pk).exists()
-
-    @pytest.mark.django_db
-    def test_delete_service_api_token_forbidden(self, session_client, create_user):
-        """Test deleting a service API token (should fail)"""
-        # Arrange
-        service_token = APIToken.objects.create(
-            label="Service Token", user=create_user, user_type=0, is_service=True
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": service_token.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-        # Verify token still exists
-        assert APIToken.objects.filter(pk=service_token.pk).exists()
-
-    # PATCH /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_patch_api_token_success(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test successful API token update"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-        update_data = {
-            "label": "Updated Token Label",
-            "description": "Updated description",
-        }
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data["label"] == update_data["label"]
-        assert response.data["description"] == update_data["description"]
-
-        # Verify database was updated
-        create_api_token_for_user.refresh_from_db()
-        assert create_api_token_for_user.label == update_data["label"]
-        assert create_api_token_for_user.description == update_data["description"]
-
-    @pytest.mark.django_db
-    def test_patch_api_token_partial_update(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test partial API token update"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-        original_description = create_api_token_for_user.description
-        update_data = {"label": "Only Label Updated"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data["label"] == update_data["label"]
-        assert response.data["description"] == original_description
-
-    @pytest.mark.django_db
-    def test_patch_nonexistent_api_token(self, session_client, create_user):
-        """Test updating a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-        update_data = {"label": "New Label"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_patch_other_users_api_token(self, session_client, create_user, db):
-        """Test updating another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"patch-other-{unique_id}@plane.so"
-        unique_username = f"patch_other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-        update_data = {"label": "Hacked Label"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-        # Verify token was not updated
-        other_token.refresh_from_db()
-        assert other_token.label == "Other Token"
-
-    # Authentication tests
-    @pytest.mark.django_db
-    def test_all_endpoints_require_authentication(self, api_client):
-        """Test that all endpoints require authentication"""
-        # Arrange
-        endpoints = [
-            (reverse("api-tokens"), "get"),
-            (reverse("api-tokens"), "post"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "get"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "patch"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "delete"),
-        ]
-
-        # Act & Assert
-        for url, method in endpoints:
-            response = getattr(api_client, method)(url)
-            assert response.status_code == status.HTTP_401_UNAUTHORIZED

apiserver/plane/tests/unit/serializers/test_issue_recent_visit.py

@@ -1,75 +0,0 @@
-import pytest
-
-from plane.db.models import (
-    Workspace,
-    Project,
-    Issue,
-    User,
-    IssueAssignee,
-    WorkspaceMember,
-    ProjectMember,
-)
-from plane.app.serializers.workspace import IssueRecentVisitSerializer
-from django.utils import timezone
-
-
-@pytest.mark.unit
-class TestIssueRecentVisitSerializer:
-    """Test the IssueRecentVisitSerializer"""
-
-    def test_issue_recent_visit_serializer_fields(self, db):
-        """Test that the serializer includes the correct fields"""
-
-        test_user_1 = User.objects.create(
-            email="test_user_1@example.com", first_name="Test", last_name="User"
-        )
-
-        # To test for deleted issue assignee
-        test_user_2 = User.objects.create(
-            email="test_user_2@example.com",
-            first_name="Other",
-            last_name="User",
-            username="some user name",
-        )
-
-        workspace = Workspace.objects.create(
-            name="Test Workspace", slug="test-workspace", owner=test_user_1
-        )
-
-        WorkspaceMember.objects.create(member=test_user_2, role=15, workspace=workspace)
-
-        project = Project.objects.create(
-            name="Test Project", identifier="test-project", workspace=workspace
-        )
-        ProjectMember.objects.create(project=project, member=test_user_2)
-
-        issue = Issue.objects.create(
-            name="Test Issue",
-            workspace=workspace,
-            project=project,
-        )
-
-        IssueAssignee.objects.create(issue=issue, assignee=test_user_1, project=project)
-
-        # Deleted issue assignee
-        IssueAssignee.objects.create(
-            issue=issue,
-            assignee=test_user_2,
-            project=project,
-            deleted_at=timezone.now(),
-        )
-
-        serialized_data = IssueRecentVisitSerializer(
-            issue,
-        ).data
-
-        # Check fields are present and correct
-        assert "name" in serialized_data
-        assert "assignees" in serialized_data
-        assert "project_identifier" in serialized_data
-
-        assert serialized_data["name"] == "Test Issue"
-        assert serialized_data["project_identifier"] == "TEST-PROJECT"
-
-        # Only including non-deleted issue assignees
-        assert serialized_data["assignees"] == [test_user_1.id]

apps/admin/core/components/auth-header.tsx

@@ -67,8 +67,9 @@ export const InstanceHeader: FC = observer(() => {
         {breadcrumbItems.length >= 0 && (
           <div>
             <Breadcrumbs>
-              <Breadcrumbs.Item
-                component={
+              <Breadcrumbs.BreadcrumbItem
+                type="text"
+                link={
                   <BreadcrumbLink
                     href="/general/"
                     label="Settings"
@@ -79,9 +80,10 @@ export const InstanceHeader: FC = observer(() => {
               {breadcrumbItems.map(
                 (item) =>
                   item.title && (
-                    <Breadcrumbs.Item
+                    <Breadcrumbs.BreadcrumbItem
                       key={item.title}
-                      component={<BreadcrumbLink href={item.href} label={item.title} />}
+                      type="text"
+                      link={<BreadcrumbLink href={item.href} label={item.title} />}
                     />
                   )
               )}