fix: uuid validation error

fix: module activity
fix: meta endpoint to return correct error message
2025-02-19 16:36:58 +05:30 · 2025-02-18 21:16:20 +05:30 · 2025-02-18 21:04:31 +05:30 · 2025-02-18 18:51:13 +05:30
1541 changed files with 22357 additions and 88491 deletions
@@ -2,7 +2,6 @@
 *.pyc
 .env
 venv
-.venv
 node_modules/
 **/node_modules/
 npm-debug.log
@@ -15,4 +14,4 @@ build/
 out/
 **/out/
 dist/
-**/dist/
+**/dist/
@@ -38,9 +38,3 @@ USE_MINIO=1

 # Nginx Configuration
 NGINX_PORT=80
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"
@@ -88,7 +88,7 @@ jobs:

  full_build_push:
    if: ${{ needs.branch_build_setup.outputs.do_full_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
      BUILD_TYPE: full
@@ -148,7 +148,7 @@ jobs:

  slim_build_push:
    if: ${{ needs.branch_build_setup.outputs.do_slim_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
      BUILD_TYPE: slim
@@ -47,6 +47,12 @@ jobs:
      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
+      build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
+      build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
+      build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
+      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
+      build_web: ${{ steps.changed_files.outputs.web_any_changed }}
+      build_live: ${{ steps.changed_files.outputs.live_any_changed }}

      dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
      dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
@@ -117,7 +123,46 @@ 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:
+              - nginx/**
+            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:
+    if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push Admin Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -140,6 +185,7 @@ jobs:
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

  branch_build_push_web:
+    if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push Web Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -162,6 +208,7 @@ jobs:
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

  branch_build_push_space:
+    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push Space Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -184,6 +231,7 @@ jobs:
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

  branch_build_push_live:
+    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push Live Collaboration Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -206,6 +254,7 @@ jobs:
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

  branch_build_push_apiserver:
+    if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push API Server Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -228,6 +277,7 @@ jobs:
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

  branch_build_push_proxy:
+    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
    name: Build-Push Proxy Docker Image
    runs-on: ubuntu-22.04
    needs: [branch_build_setup]
@@ -249,6 +299,31 @@ jobs:
          buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
          buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}

+  attach_assets_to_build:
+    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
+    name: Attach Assets to Release
+    runs-on: ubuntu-22.04
+    needs: [branch_build_setup]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update Assets
+        run: |
+          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
+
+      - name: Attach Assets
+        id: attach_assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: selfhost-assets
+          retention-days: 2
+          path: |
+            ${{ github.workspace }}/deploy/selfhost/setup.sh
+            ${{ github.workspace }}/deploy/selfhost/restore.sh
+            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
+            ${{ github.workspace }}/deploy/selfhost/variables.env
+
  publish_release:
    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
    name: Build Release
@@ -262,6 +337,7 @@ jobs:
        branch_build_push_live,
        branch_build_push_apiserver,
        branch_build_push_proxy,
+        attach_assets_to_build,
      ]
    env:
      REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -272,8 +348,6 @@ jobs:
      - name: Update Assets
        run: |
          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
-          sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
-          # sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env

      - name: Create Release
        id: create_release
@@ -288,8 +362,6 @@ jobs:
          generate_release_notes: true
          files: |
            ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
            ${{ github.workspace }}/deploy/selfhost/restore.sh
-            ${{ github.workspace }}/deploy/selfhost/restore-airgapped.sh
            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
            ${{ github.workspace }}/deploy/selfhost/variables.env
@@ -6,9 +6,49 @@ on:
    types: ["opened", "synchronize", "ready_for_review"]

 jobs:
-  lint-apiserver:
+  get-changed-files:
    if: github.event.pull_request.draft == false
    runs-on: ubuntu-latest
+    outputs:
+      apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
+      admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
+      space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
+      web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files_yaml: |
+            apiserver:
+              - apiserver/**
+            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'
+
+  lint-apiserver:
+    needs: get-changed-files
+    runs-on: ubuntu-latest
+    if: needs.get-changed-files.outputs.apiserver_changed == 'true'
    steps:
      - uses: actions/checkout@v4
      - name: Set up Python
@@ -23,7 +63,8 @@ jobs:
        run: ruff check --fix apiserver

  lint-admin:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.admin_changed == 'true'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -35,7 +76,8 @@ jobs:
      - run: yarn lint --filter=admin

  lint-space:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.space_changed == 'true'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -47,7 +89,8 @@ jobs:
      - run: yarn lint --filter=space

  lint-web:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.web_changed == 'true'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
        uses: actions/checkout@v4

  full_build_push:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
      BUILD_TYPE: full
@@ -11,7 +11,7 @@ env:

 jobs:
  sync_changes:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    permissions:
      pull-requests: write
      contents: read
@@ -1,6 +1,5 @@
 node_modules
 .next
-.yarn

 ### NextJS ###
 # Dependencies
@@ -53,8 +52,6 @@ mediafiles
 .env
 .DS_Store
 logs/
-htmlcov/
-.coverage

 node_modules/
 assets/dist/
@@ -75,22 +72,16 @@ package-lock.json

 # lock files
 package-lock.json
-yarn.lock
+pnpm-lock.yaml
+pnpm-workspace.yaml

 .npmrc
 .secrets
 tmp/
-
 ## packages
 dist
 .temp/
 deploy/selfhost/plane-app/
-
 ## Storybook
 *storybook.log
 output.css
-
-dev-editor
-# Redis
-*.rdb
-*.rdb.gz
@@ -1 +0,0 @@
-nodeLinker: node-modules
@@ -15,33 +15,14 @@ Without said minimal reproduction, we won't be able to investigate all [issues](

 You can open a new issue with this [issue form](https://github.com/makeplane/plane/issues/new).

-### Naming conventions for issues
-
-When opening a new issue, please use a clear and concise title that follows this format:
-
- For bugs: `🐛 Bug: [short description]`
- For features: `🚀 Feature: [short description]`
- For improvements: `🛠️ Improvement: [short description]`
- For documentation: `📘 Docs: [short description]`
-
-**Examples:**
- `🐛 Bug: API token expiry time not saving correctly`
- `📘 Docs: Clarify RAM requirement for local setup`
- `🚀 Feature: Allow custom time selection for token expiration`
-
-This helps us triage and manage issues more efficiently.
-
 ## Projects setup and Architecture

 ### Requirements

- Docker Engine installed and running
- Node.js version 20+ [LTS version](https://nodejs.org/en/about/previous-releases)
+- Node.js version v16.18.0
 - Python version 3.8+
 - Postgres version v14
 - Redis version v6.2.7
- **Memory**: Minimum **12 GB RAM** recommended
-  > ⚠️ Running the project on a system with only 8 GB RAM may lead to setup failures or memory crashes (especially during Docker container build/start or dependency install). Use cloud environments like GitHub Codespaces or upgrade local RAM if possible.

 ### Setup the project

@@ -69,17 +50,6 @@ chmod +x setup.sh
 docker compose -f docker-compose-local.yml up
 ```

-4. Start web apps:
-
-```bash
-pnpm dev
-```
-
-5. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin
-6. Open up your browser to http://localhost:3000 then log in using the same credentials from the previous step
-
-That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
-
 ## Missing a Feature?

 If a feature is missing, you can directly _request_ a new one [here](https://github.com/makeplane/plane/issues/new?assignees=&labels=feature&template=feature_request.yml&title=%F0%9F%9A%80+Feature%3A+). You also can do the same by choosing "🚀 Feature" when raising a [New Issue](https://github.com/makeplane/plane/issues/new/choose) on our GitHub Repository.
@@ -92,143 +62,17 @@ To ensure consistency throughout the source code, please keep these rules in min
 - 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
- Add or update translations
 - 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.
-
-## Contributing to language support
-This guide is designed to help contributors understand how to add or update translations in the application.
-
-### Understanding translation structure
-
-#### File organization
-Translations are organized by language in the locales directory. Each language has its own folder containing JSON files for translations. Here's how it looks:
-
-```
-packages/i18n/src/locales/
-    ├── en/
-    │   ├── core.json       # Critical translations
-    │   └── translations.json
-    ├── fr/
-    │   └── translations.json
-    └── [language]/
-        └── translations.json
-```
-#### Nested structure
-To keep translations organized, we use a nested structure for keys. This makes it easier to manage and locate specific translations. For example:
-
-```json
-{
-  "issue": {
-    "label": "Work item",
-    "title": {
-      "label": "Work item title"
-    }
-  }
-}
-```
-
-### Translation formatting guide
-We use [IntlMessageFormat](https://formatjs.github.io/docs/intl-messageformat/) to handle dynamic content, such as variables and pluralization. Here's how to format your translations:
-
-#### Examples
- **Simple variables**
-    ```json
-    {
-    "greeting": "Hello, {name}!"
-    }
-    ```
-
- **Pluralization**
-    ```json
-    {
-    "items": "{count, plural, one {Work item} other {Work items}}"
-    }
-    ```
-
-### Contributing guidelines
-
-#### Updating existing translations
-1. Locate the key in `locales/<language>/translations.json`.
-
-2. Update the value while ensuring the key structure remains intact.
-3. Preserve any existing ICU formats (e.g., variables, pluralization).
-
-#### Adding new translation keys
-1. When introducing a new key, ensure it is added to **all** language files, even if translations are not immediately available. Use English as a placeholder if needed.
-
-2. Keep the nesting structure consistent across all languages.
-
-3. If the new key requires dynamic content (e.g., variables or pluralization), ensure the ICU format is applied uniformly across all languages.
-
-### Adding new languages
-Adding a new language involves several steps to ensure it integrates seamlessly with the project. Follow these instructions carefully:
-
-1. **Update type definitions**
-Add the new language to the TLanguage type in the language definitions file:
-
-    ```typescript
-    // types/language.ts
-    export type TLanguage = "en" | "fr" | "your-lang";
-    ```
-
-2. **Add language configuration**
-Include the new language in the list of supported languages:
-
-    ```typescript
-    // constants/language.ts
-    export const SUPPORTED_LANGUAGES: ILanguageOption[] = [
-    { label: "English", value: "en" },
-    { label: "Your Language", value: "your-lang" }
-    ];
-    ```
-
-3. **Create translation files**
-    1.  Create a new folder for your language under locales (e.g., `locales/your-lang/`).
-
-    2. Add a `translations.json` file inside the folder.
-
-    3. Copy the structure from an existing translation file and translate all keys.
-
-4. **Update import logic**
-Modify the language import logic to include your new language:
-
-    ```typescript
-    private importLanguageFile(language: TLanguage): Promise<any> {
-    switch (language) {
-        case "your-lang":
-        return import("../locales/your-lang/translations.json");
-        // ...
-    }
-    }
-    ```
-
-### Quality checklist
-Before submitting your contribution, please ensure the following:
-
- All translation keys exist in every language file.
- Nested structures match across all language files.
- ICU message formats are correctly implemented.
- All languages load without errors in the application.
- Dynamic values and pluralization work as expected.
- There are no missing or untranslated keys.
-
-#### Pro tips
- When in doubt, refer to the English translations for context.
- Verify pluralization works with different numbers.
- Ensure dynamic values (e.g., `{name}`) are correctly interpolated.
- Double-check that nested key access paths are accurate.
-
-Happy translating! 🌍✨
-
-## 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).
@@ -43,6 +43,9 @@ NGINX_PORT=80
 # Debug value for api server use it as 0 for production use
 DEBUG=0
 CORS_ALLOWED_ORIGINS="http://localhost"
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
 # Database Settings
 POSTGRES_USER="plane"
 POSTGRES_PASSWORD="plane"
@@ -16,10 +16,10 @@
 </p>

 <p align="center">
-    <a href="https://plane.so/"><b>Website</b></a> •
-    <a href="https://github.com/makeplane/plane/releases"><b>Releases</b></a> •
-    <a href="https://twitter.com/planepowers"><b>Twitter</b></a> •
-    <a href="https://docs.plane.so/"><b>Documentation</b></a>
+    <a href="https://dub.sh/plane-website-readme"><b>Website</b></a> •
+    <a href="https://git.new/releases"><b>Releases</b></a> •
+    <a href="https://dub.sh/planepowershq"><b>Twitter</b></a> •
+    <a href="https://dub.sh/planedocs"><b>Documentation</b></a>
 </p>

 <p>
@@ -39,7 +39,7 @@
    </a>
 </p>

-Meet [Plane](https://plane.so/), an open-source project management tool to track issues, run ~sprints~ cycles, and manage product roadmaps without the chaos of managing the tool itself. 🧘‍♀️
+Meet [Plane](https://dub.sh/plane-website-readme), an open-source project management tool to track issues, run ~sprints~ cycles, and manage product roadmaps without the chaos of managing the tool itself. 🧘‍♀️

 > Plane is evolving every day. Your suggestions, ideas, and reported bugs help us immensely. Do not hesitate to join in the conversation on [Discord](https://discord.com/invite/A92xrEGCge) or raise a GitHub issue. We read everything and respond to most.

@@ -47,10 +47,10 @@ Meet [Plane](https://plane.so/), an open-source project management tool to track

 Getting started with Plane is simple. Choose the setup that works best for you:

- **Plane Cloud**
+- **Plane Cloud**   
 Sign up for a free account on [Plane Cloud](https://app.plane.so)—it's the fastest way to get up and running without worrying about infrastructure.

- **Self-host Plane**
+- **Self-host Plane**  
 Prefer full control over your data and infrastructure? Install and run Plane on your own servers. Follow our detailed [deployment guides](https://developers.plane.so/self-hosting/overview) to get started.

 | Installation methods | Docs link                                                                                                                                          |
@@ -62,22 +62,22 @@ Prefer full control over your data and infrastructure? Install and run Plane on

 ## 🌟 Features

- **Issues**
+- **Issues**  
 Efficiently create and manage tasks with a robust rich text editor that supports file uploads. Enhance organization and tracking by adding sub-properties and referencing related issues.

- **Cycles**
+- **Cycles**   
 Maintain your team’s momentum with Cycles. Track progress effortlessly using burn-down charts and other insightful tools.

- **Modules**
-Simplify complex projects by dividing them into smaller, manageable modules.
+- **Modules**  
+Simplify complex projects by dividing them into smaller, manageable modules. 

- **Views**
+- **Views**  
 Customize your workflow by creating filters to display only the most relevant issues. Save and share these views with ease.

- **Pages**
+- **Pages**  
 Capture and organize ideas using Plane Pages, complete with AI capabilities and a rich text editor. Format text, insert images, add hyperlinks, or convert your notes into actionable items.

- **Analytics**
+- **Analytics**  
 Access real-time insights across all your Plane data. Visualize trends, remove blockers, and keep your projects moving forward.

 - **Drive** (_coming soon_): The drive helps you share documents, images, videos, or any other files that make sense to you or your team and align on the problem/solution.
@@ -85,7 +85,38 @@ Access real-time insights across all your Plane data. Visualize trends, remove b

 ## 🛠️ Local development

-See [CONTRIBUTING](./CONTRIBUTING.md)
+### Pre-requisites
+- Ensure Docker Engine is installed and running.
+
+###  Development setup
+Setting up your local environment is simple and straightforward. Follow these steps to get started:
+
+1. Clone the repository:
+   ```
+   git clone https://github.com/makeplane/plane.git
+   ```
+2. Navigate to the project folder:
+   ```
+   cd plane
+   ```
+3. Create a new branch for your feature or fix:
+   ```
+   git checkout -b <feature-branch-name>
+   ```
+4. Run the setup script in the terminal:
+   ```
+   ./setup.sh
+   ```
+5. Open the project in an IDE such as VS Code.
+
+6. Review the `.env` files in the relevant folders. Refer to [Environment Setup](./ENV_SETUP.md) for details on the environment variables used.
+
+7. Start the services using Docker:
+   ```
+   docker compose -f docker-compose-local.yml up -d
+   ```
+
+That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉

 ## ⚙️ Built with
 [![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)
@@ -163,7 +194,7 @@ Feel free to ask questions, report bugs, participate in discussions, share ideas

 If you discover a security vulnerability in Plane, please report it responsibly instead of opening a public issue. We take all legitimate reports seriously and will investigate them promptly. See [Security policy](https://github.com/makeplane/plane/blob/master/SECURITY.md) for more info.

-To disclose any security issues, please email us at security@plane.so.
+To disclose any security issues, please email us at security@plane.so. 

 ## 🤝 Contributing

@@ -188,4 +219,4 @@ Please read [CONTRIBUTING.md](https://github.com/makeplane/plane/blob/master/CON


 ## License
-This project is licensed under the [GNU Affero General Public License v3.0](https://github.com/makeplane/plane/blob/master/LICENSE.txt).
+This project is licensed under the [GNU Affero General Public License v3.0](https://github.com/makeplane/plane/blob/master/LICENSE.txt).
@@ -1,12 +1,3 @@
-NEXT_PUBLIC_API_BASE_URL="http://localhost:8000"
-
-NEXT_PUBLIC_WEB_BASE_URL="http://localhost:3000"
-
-NEXT_PUBLIC_ADMIN_BASE_URL="http://localhost:3001"
+NEXT_PUBLIC_API_BASE_URL=""
 NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
-
-NEXT_PUBLIC_SPACE_BASE_URL="http://localhost:3002"
-NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
-
-NEXT_PUBLIC_LIVE_BASE_URL="http://localhost:3100"
-NEXT_PUBLIC_LIVE_BASE_PATH="/live"
+NEXT_PUBLIC_WEB_BASE_URL=""
@@ -26,16 +26,16 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
    formState: { errors, isSubmitting },
  } = useForm<AIFormValues>({
    defaultValues: {
-      LLM_API_KEY: config["LLM_API_KEY"],
-      LLM_MODEL: config["LLM_MODEL"],
+      OPENAI_API_KEY: config["OPENAI_API_KEY"],
+      GPT_ENGINE: config["GPT_ENGINE"],
    },
  });

  const aiFormFields: TControllerInputFormField[] = [
    {
-      key: "LLM_MODEL",
+      key: "GPT_ENGINE",
      type: "text",
-      label: "LLM Model",
+      label: "GPT_ENGINE",
      description: (
        <>
          Choose an OpenAI engine.{" "}
@@ -49,12 +49,12 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
          </a>
        </>
      ),
-      placeholder: "gpt-4o-mini",
-      error: Boolean(errors.LLM_MODEL),
+      placeholder: "gpt-3.5-turbo",
+      error: Boolean(errors.GPT_ENGINE),
      required: false,
    },
    {
-      key: "LLM_API_KEY",
+      key: "OPENAI_API_KEY",
      type: "password",
      label: "API key",
      description: (
@@ -71,7 +71,7 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
        </>
      ),
      placeholder: "sk-asddassdfasdefqsdfasd23das3dasdcasd",
-      error: Boolean(errors.LLM_API_KEY),
+      error: Boolean(errors.OPENAI_API_KEY),
      required: false,
    },
  ];
@@ -43,7 +43,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
    defaultValues: {
      GITHUB_CLIENT_ID: config["GITHUB_CLIENT_ID"],
      GITHUB_CLIENT_SECRET: config["GITHUB_CLIENT_SECRET"],
-      GITHUB_ORGANIZATION_ID: config["GITHUB_ORGANIZATION_ID"],
    },
  });

@@ -94,15 +93,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
      error: Boolean(errors.GITHUB_CLIENT_SECRET),
      required: true,
    },
-    {
-      key: "GITHUB_ORGANIZATION_ID",
-      type: "text",
-      label: "Organization ID",
-      description: <>The organization github ID.</>,
-      placeholder: "123456789",
-      error: Boolean(errors.GITHUB_ORGANIZATION_ID),
-      required: false,
-    },
  ];

  const GITHUB_SERVICE_FIELD: TCopyField[] = [
@@ -160,7 +150,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
        reset({
          GITHUB_CLIENT_ID: response.find((item) => item.key === "GITHUB_CLIENT_ID")?.value,
          GITHUB_CLIENT_SECRET: response.find((item) => item.key === "GITHUB_CLIENT_SECRET")?.value,
-          GITHUB_ORGANIZATION_ID: response.find((item) => item.key === "GITHUB_ORGANIZATION_ID")?.value,
        });
      })
      .catch((err) => console.error(err));
@@ -1,4 +1,5 @@
-@import "@plane/propel/styles/fonts";
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0&display=swap");

@tailwind base;
@tailwind components;
@@ -59,31 +60,23 @@
    --color-border-300: 212, 212, 212; /* strong border- 1 */
    --color-border-400: 185, 185, 185; /* strong border- 2 */

-    --color-shadow-2xs:
-      0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
+    --color-shadow-2xs: 0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
      0px 1px 2px 0px rgba(23, 23, 23, 0.14);
-    --color-shadow-xs:
-      0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-xs: 0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
      0px 1px 8px -1px rgba(16, 24, 40, 0.1);
-    --color-shadow-sm:
-      0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02), 0px 1px 12px 0px rgba(0, 0, 0, 0.12);
-    --color-shadow-rg:
-      0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
+    --color-shadow-sm: 0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02),
+      0px 1px 12px 0px rgba(0, 0, 0, 0.12);
+    --color-shadow-rg: 0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
      0px 1px 12px 0px rgba(16, 24, 40, 0.04);
-    --color-shadow-md:
-      0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-md: 0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
      0px 1px 16px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-lg:
-      0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-lg: 0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
      0px 1px 24px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-xl:
-      0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
+    --color-shadow-xl: 0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
      0px 0px 52px 0px rgba(16, 24, 40, 0.16);
-    --color-shadow-2xl:
-      0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-2xl: 0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
      0px 1px 32px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-3xl:
-      0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-3xl: 0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
      0px 1px 48px 0px rgba(16, 24, 40, 0.12);
    --color-shadow-4xl: 0px 8px 40px 0px rgba(0, 0, 61, 0.05), 0px 12px 32px -16px rgba(0, 0, 0, 0.05);

@@ -3,16 +3,18 @@
 import { ReactNode } from "react";
 import { ThemeProvider, useTheme } from "next-themes";
 import { SWRConfig } from "swr";
-// plane imports
+// ui
 import { ADMIN_BASE_PATH, DEFAULT_SWR_CONFIG } from "@plane/constants";
 import { Toast } from "@plane/ui";
 import { resolveGeneralTheme } from "@plane/utils";
+// constants
+// helpers
 // lib
 import { InstanceProvider } from "@/lib/instance-provider";
 import { StoreProvider } from "@/lib/store-provider";
 import { UserProvider } from "@/lib/user-provider";
 // styles
-import "@/styles/globals.css";
+import "./globals.css";

 const ToastWithTheme = () => {
  const { resolvedTheme } = useTheme();
@@ -7,7 +7,7 @@ import { LogOut, UserCog2, Palette } from "lucide-react";
 import { Menu, Transition } from "@headlessui/react";
 // plane internal packages
 import { API_BASE_URL } from "@plane/constants";
-import { AuthService } from "@plane/services";
+import  {AuthService } from "@plane/services";
 import { Avatar } from "@plane/ui";
 import { getFileURL, cn } from "@plane/utils";
 // hooks
@@ -2,7 +2,7 @@ import set from "lodash/set";
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // plane internal packages
 import { EInstanceStatus, TInstanceStatus } from "@plane/constants";
-import { InstanceService } from "@plane/services";
+import {InstanceService} from "@plane/services";
 import {
  IInstance,
  IInstanceAdmin,
@@ -1 +1 @@
-export * from "ce/components/authentication/authentication-modes";
+export * from "ce/components/authentication/authentication-modes";
@@ -9,19 +9,6 @@ const nextConfig = {
    unoptimized: true,
  },
  basePath: process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "",
-  transpilePackages: [
-    "@plane/constants",
-    "@plane/editor",
-    "@plane/hooks",
-    "@plane/i18n",
-    "@plane/logger",
-    "@plane/propel",
-    "@plane/services",
-    "@plane/shared-state",
-    "@plane/types",
-    "@plane/ui",
-    "@plane/utils",
-  ],
 };

 module.exports = nextConfig;
@@ -1,8 +1,6 @@
 {
  "name": "admin",
-  "description": "Admin UI for Plane",
-  "version": "0.26.1",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
  "private": true,
  "scripts": {
    "dev": "turbo run develop",
@@ -10,28 +8,27 @@
    "build": "next build",
    "preview": "next build && next start",
    "start": "next start",
-    "format": "prettier --write .",
    "lint": "eslint . --ext .ts,.tsx",
    "lint:errors": "eslint . --ext .ts,.tsx --quiet"
  },
  "dependencies": {
    "@headlessui/react": "^1.7.19",
-    "@plane/constants": "workspace:*",
-    "@plane/hooks": "workspace:*",
-    "@plane/propel": "workspace:*",
-    "@plane/services": "workspace:*",
-    "@plane/types": "workspace:*",
-    "@plane/ui": "workspace:*",
-    "@plane/utils": "workspace:*",
+    "@plane/constants": "*",
+    "@plane/hooks": "*",
+    "@plane/types": "*",
+    "@plane/ui": "*",
+    "@plane/utils": "*",
+    "@plane/services": "*",
+    "@sentry/nextjs": "^8.54.0",
    "@tailwindcss/typography": "^0.5.9",
    "@types/lodash": "^4.17.0",
    "autoprefixer": "10.4.14",
-    "axios": "^1.8.3",
+    "axios": "^1.7.9",
    "lodash": "^4.17.21",
    "lucide-react": "^0.469.0",
    "mobx": "^6.12.0",
    "mobx-react": "^9.1.1",
-    "next": "^14.2.29",
+    "next": "^14.2.20",
    "next-themes": "^0.2.1",
    "postcss": "^8.4.38",
    "react": "^18.3.1",
@@ -42,9 +39,9 @@
    "zxcvbn": "^4.4.2"
  },
  "devDependencies": {
-    "@plane/eslint-config": "workspace:*",
-    "@plane/tailwind-config": "workspace:*",
-    "@plane/typescript-config": "workspace:*",
+    "@plane/eslint-config": "*",
+    "@plane/tailwind-config": "*",
+    "@plane/typescript-config": "*",
    "@types/node": "18.16.1",
    "@types/react": "^18.3.11",
    "@types/react-dom": "^18.2.18",
@@ -1,2 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-module.exports = require("@plane/tailwind-config/postcss.config.js");
+module.exports = {
+  plugins: {
+    "postcss-import": {},
+    "tailwindcss/nesting": {},
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
@@ -1,19 +1,13 @@
 {
  "extends": "@plane/typescript-config/nextjs.json",
  "compilerOptions": {
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
+    "plugins": [{ "name": "next" }],
    "baseUrl": ".",
    "paths": {
      "@/*": ["core/*"],
      "@/public/*": ["public/*"],
-      "@/plane-admin/*": ["ce/*"],
-      "@/styles/*": ["styles/*"]
-    },
-    "strictNullChecks": true
+      "@/plane-admin/*": ["ce/*"]
+    }
  },
  "include": ["next-env.d.ts", "next.config.js", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
  "exclude": ["node_modules"]
@@ -145,8 +145,11 @@ RUN chmod +x /app/pg-setup.sh
 #  APPLICATION ENVIRONMENT SETTINGS
 # *****************************************************************************
 ENV APP_DOMAIN=localhost
+
 ENV WEB_URL=http://${APP_DOMAIN}
 ENV DEBUG=0
+ENV SENTRY_DSN=
+ENV SENTRY_ENVIRONMENT=production
 ENV CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN},https://${APP_DOMAIN}
 # Secret Key
 ENV SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
@@ -1,25 +0,0 @@
-[run]
-source = plane
-omit =
-    */tests/*
-    */migrations/*
-    */settings/*
-    */wsgi.py
-    */asgi.py
-    */urls.py
-    manage.py
-    */admin.py
-    */apps.py
-
-[report]
-exclude_lines =
-    pragma: no cover
-    def __repr__
-    if self.debug:
-    raise NotImplementedError
-    if __name__ == .__main__.
-    pass
-    raise ImportError
-
-[html]
-directory = htmlcov 
@@ -1,7 +1,11 @@
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS="http://localhost:3000,http://localhost:3001,http://localhost:3002,http://localhost:3100"
+CORS_ALLOWED_ORIGINS="http://localhost"
+
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"

 # Database Settings
 POSTGRES_USER="plane"
@@ -27,7 +31,7 @@ RABBITMQ_VHOST="plane"
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
 AWS_SECRET_ACCESS_KEY="secret-key"
-AWS_S3_ENDPOINT_URL="http://localhost:9000"
+AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 # Changing this requires change in the nginx.conf for uploads if using minio setup
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
@@ -37,37 +41,22 @@ FILE_SIZE_LIMIT=5242880
 DOCKERIZED=1 # deprecated

 # set to 1 If using the pre-configured minio setup
-USE_MINIO=0
+USE_MINIO=1

 # Nginx Configuration
 NGINX_PORT=80

 # Email redirections and minio domain settings
-WEB_URL="http://localhost:8000"
+WEB_URL="http://localhost"

 # Gunicorn Workers
 GUNICORN_WORKERS=2

 # Base URLs
-ADMIN_BASE_URL="http://localhost:3001"
-ADMIN_BASE_PATH="/god-mode"
+ADMIN_BASE_URL=
+SPACE_BASE_URL=
+APP_BASE_URL=

-SPACE_BASE_URL="http://localhost:3002"
-SPACE_BASE_PATH="/spaces"
-
-APP_BASE_URL="http://localhost:3000"
-APP_BASE_PATH=""
-
-LIVE_BASE_URL="http://localhost:3100"
-LIVE_BASE_PATH="/live"
-
-LIVE_SERVER_SECRET_KEY="secret-key"

 # Hard delete files after days
-HARD_DELETE_AFTER_DAYS=60
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"
+HARD_DELETE_AFTER_DAYS=60
@@ -1,7 +1,4 @@
 {
  "name": "plane-api",
-  "version": "0.26.1",
-  "license": "AGPL-3.0",
-  "private": true,
-  "description": "API server powering Plane's backend"
+  "version": "0.24.1"
 }
@@ -1,13 +1,9 @@
-# python imports
-import os
-
-# Third party imports
 from rest_framework.throttling import SimpleRateThrottle


 class ApiKeyRateThrottle(SimpleRateThrottle):
    scope = "api_key"
-    rate = os.environ.get("API_KEY_RATE_LIMIT", "60/minute")
+    rate = "60/minute"

    def get_cache_key(self, request, view):
        # Retrieve the API key from the request header
@@ -15,4 +15,4 @@ from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
 from .intake import IntakeIssueSerializer
-from .estimate import EstimatePointSerializer
+from .estimate import EstimatePointSerializer
@@ -1,5 +1,4 @@
 # Third party imports
-import pytz
 from rest_framework import serializers

 # Module imports
@@ -19,14 +18,6 @@ class CycleSerializer(BaseSerializer):
    completed_estimates = serializers.FloatField(read_only=True)
    started_estimates = serializers.FloatField(read_only=True)

-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        project = self.context.get("project")
-        if project and project.timezone:
-            project_timezone = pytz.timezone(project.timezone)
-            self.fields["start_date"].timezone = project_timezone
-            self.fields["end_date"].timezone = project_timezone
-
    def validate(self, data):
        if (
            data.get("start_date", None) is not None
@@ -39,15 +30,12 @@ class CycleSerializer(BaseSerializer):
            data.get("start_date", None) is not None
            and data.get("end_date", None) is not None
        ):
-            project_id = self.initial_data.get("project_id") or (
-                self.instance.project_id
-                if self.instance and hasattr(self.instance, "project_id")
-                else None
+            project_id = self.initial_data.get("project_id") or self.instance.project_id
+            is_start_date_end_date_equal = (
+                True
+                if str(data.get("start_date")) == str(data.get("end_date"))
+                else False
            )
-
-            if not project_id:
-                raise serializers.ValidationError("Project ID is required")
-
            data["start_date"] = convert_to_utc(
                date=str(data.get("start_date").date()),
                project_id=project_id,
@@ -56,6 +44,7 @@ class CycleSerializer(BaseSerializer):
            data["end_date"] = convert_to_utc(
                date=str(data.get("end_date", None).date()),
                project_id=project_id,
+                is_start_date_end_date_equal=is_start_date_end_date_equal,
            )
        return data

@@ -80,7 +80,6 @@ class IssueSerializer(BaseSerializer):
            data["assignees"] = ProjectMember.objects.filter(
                project_id=self.context.get("project_id"),
                is_active=True,
-                role__gte=15,
                member_id__in=data["assignees"],
            ).values_list("member_id", flat=True)

@@ -159,16 +158,8 @@ class IssueSerializer(BaseSerializer):
                pass
        else:
            try:
-                # Then assign it to default assignee, if it is a valid assignee
-                if (
-                    default_assignee_id is not None
-                    and ProjectMember.objects.filter(
-                        member_id=default_assignee_id,
-                        project_id=project_id,
-                        role__gte=15,
-                        is_active=True,
-                    ).exists()
-                ):
+                # Then assign it to default assignee
+                if default_assignee_id is not None:
                    IssueAssignee.objects.create(
                        assignee_id=default_assignee_id,
                        issue=issue,
@@ -16,6 +16,7 @@ class ProjectSerializer(BaseSerializer):
    member_role = serializers.IntegerField(read_only=True)
    is_deployed = serializers.BooleanField(read_only=True)
    cover_image_url = serializers.CharField(read_only=True)
+    inbox_view = serializers.BooleanField(read_only=True, source="intake_view")

    class Meta:
        model = Project
@@ -4,6 +4,16 @@ from plane.api.views import IntakeIssueAPIEndpoint


 urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
+        IntakeIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
+        IntakeIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/",
        IntakeIssueAPIEndpoint.as_view(),
@@ -39,7 +39,7 @@ from plane.db.models import (
    UserFavorite,
 )
 from plane.utils.analytics_plot import burndown_plot
-from plane.utils.host import base_host
+
 from .base import BaseAPIView
 from plane.bgtasks.webhook_task import model_activity

@@ -137,14 +137,10 @@ class CycleAPIEndpoint(BaseAPIView):
        )

    def get(self, request, slug, project_id, pk=None):
-        project = Project.objects.get(workspace__slug=slug, pk=project_id)
        if pk:
            queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
            data = CycleSerializer(
-                queryset,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                queryset, fields=self.fields, expand=self.expand
            ).data
            return Response(data, status=status.HTTP_200_OK)
        queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -156,11 +152,7 @@ class CycleAPIEndpoint(BaseAPIView):
                start_date__lte=timezone.now(), end_date__gte=timezone.now()
            )
            data = CycleSerializer(
-                queryset,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                queryset, many=True, fields=self.fields, expand=self.expand
            ).data
            return Response(data, status=status.HTTP_200_OK)

@@ -171,11 +163,7 @@ class CycleAPIEndpoint(BaseAPIView):
                request=request,
                queryset=(queryset),
                on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                ).data,
            )

@@ -186,11 +174,7 @@ class CycleAPIEndpoint(BaseAPIView):
                request=request,
                queryset=(queryset),
                on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                ).data,
            )

@@ -201,11 +185,7 @@ class CycleAPIEndpoint(BaseAPIView):
                request=request,
                queryset=(queryset),
                on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                ).data,
            )

@@ -218,22 +198,14 @@ class CycleAPIEndpoint(BaseAPIView):
                request=request,
                queryset=(queryset),
                on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
-                    context={"project": project},
+                    cycles, many=True, fields=self.fields, expand=self.expand
                ).data,
            )
        return self.paginate(
            request=request,
            queryset=(queryset),
            on_results=lambda cycles: CycleSerializer(
-                cycles,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-                context={"project": project},
+                cycles, many=True, fields=self.fields, expand=self.expand
            ).data,
        )

@@ -279,7 +251,7 @@ class CycleAPIEndpoint(BaseAPIView):
                    current_instance=None,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -351,7 +323,7 @@ class CycleAPIEndpoint(BaseAPIView):
                current_instance=current_instance,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -722,7 +694,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        # Return all Cycle Issues
        return Response(
@@ -788,7 +760,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -800,7 +771,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -849,7 +819,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                )
            )
        )
-        old_cycle = old_cycle.first()

        estimate_type = Project.objects.filter(
            workspace__slug=slug,
@@ -969,7 +938,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
            )

            estimate_completion_chart = burndown_plot(
-                queryset=old_cycle,
+                queryset=old_cycle.first(),
                slug=slug,
                project_id=project_id,
                plot_type="points",
@@ -1117,7 +1086,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):

        # Pass the new_cycle queryset to burndown_plot
        completion_chart = burndown_plot(
-            queryset=old_cycle,
+            queryset=old_cycle.first(),
            slug=slug,
            project_id=project_id,
            plot_type="issues",
@@ -1129,12 +1098,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
        ).first()

        current_cycle.progress_snapshot = {
-            "total_issues": old_cycle.total_issues,
-            "completed_issues": old_cycle.completed_issues,
-            "cancelled_issues": old_cycle.cancelled_issues,
-            "started_issues": old_cycle.started_issues,
-            "unstarted_issues": old_cycle.unstarted_issues,
-            "backlog_issues": old_cycle.backlog_issues,
+            "total_issues": old_cycle.first().total_issues,
+            "completed_issues": old_cycle.first().completed_issues,
+            "cancelled_issues": old_cycle.first().cancelled_issues,
+            "started_issues": old_cycle.first().started_issues,
+            "unstarted_issues": old_cycle.first().unstarted_issues,
+            "backlog_issues": old_cycle.first().backlog_issues,
            "distribution": {
                "labels": label_distribution_data,
                "assignees": assignee_distribution_data,
@@ -1199,7 +1168,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -18,9 +18,8 @@ from plane.api.serializers import IntakeIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State
-from plane.utils.host import base_host
+
 from .base import BaseAPIView
-from plane.db.models.intake import SourceType


 class IntakeIssueAPIEndpoint(BaseAPIView):
@@ -126,7 +125,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
            intake_id=intake.id,
            project_id=project_id,
            issue=issue,
-            source=SourceType.IN_APP,
+            source=request.data.get("source", "IN-APP"),
        )
        # Create an Issue Activity
        issue_activity.delay(
@@ -298,7 +297,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                    current_instance=current_instance,
                    epoch=int(timezone.now().timestamp()),
                    notification=False,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                    intake=str(intake_issue.id),
                )

@@ -56,9 +56,7 @@ from plane.db.models import (
 from plane.settings.storage import S3Storage
 from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
 from .base import BaseAPIView
-from plane.utils.host import base_host
-from plane.bgtasks.webhook_task import model_activity
-from plane.bgtasks.work_item_link_task import crawl_work_item_link_title
+

 class WorkspaceIssueAPIEndpoint(BaseAPIView):
    """
@@ -323,17 +321,6 @@ class IssueAPIEndpoint(BaseAPIView):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
            )
-
-            # Send the model activity
-            model_activity.delay(
-                model_name="issue",
-                model_id=str(serializer.data["id"]),
-                requested_data=request.data,
-                current_instance=None,
-                actor_id=request.user.id,
-                slug=slug,
-                origin=base_host(request=request, is_app=True),
-            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

@@ -692,9 +679,6 @@ class IssueLinkAPIEndpoint(BaseAPIView):
        serializer = IssueLinkSerializer(data=request.data)
        if serializer.is_valid():
            serializer.save(project_id=project_id, issue_id=issue_id)
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )

            link = IssueLink.objects.get(pk=serializer.data["id"])
            link.created_by_id = request.data.get("created_by", request.user.id)
@@ -722,9 +706,6 @@ class IssueLinkAPIEndpoint(BaseAPIView):
        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )
            issue_activity.delay(
                type="link.activity.updated",
                requested_data=requested_data,
@@ -1067,7 +1048,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        # Get the storage metadata
@@ -1127,7 +1108,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
                current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            # Update the attachment
@@ -33,7 +33,6 @@ from plane.db.models import (

 from .base import BaseAPIView
 from plane.bgtasks.webhook_task import model_activity
-from plane.utils.host import base_host


 class ModuleAPIEndpoint(BaseAPIView):
@@ -175,7 +174,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                current_instance=None,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            module = Module.objects.get(pk=serializer.data["id"])
            serializer = ModuleSerializer(module)
@@ -227,7 +226,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                current_instance=current_instance,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -281,7 +280,6 @@ class ModuleAPIEndpoint(BaseAPIView):
            project_id=str(project_id),
            current_instance=json.dumps({"module_name": str(module.name)}),
            epoch=int(timezone.now().timestamp()),
-            origin=base_host(request=request, is_app=True),
        )
        module.delete()
        # Delete the module issues
@@ -451,7 +449,6 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
                }
            ),
            epoch=int(timezone.now().timestamp()),
-            origin=base_host(request=request, is_app=True),
        )

        return Response(
@@ -30,7 +30,6 @@ from plane.db.models import (
 )
 from plane.bgtasks.webhook_task import model_activity, webhook_activity
 from .base import BaseAPIView
-from plane.utils.host import base_host


 class ProjectAPIEndpoint(BaseAPIView):
@@ -172,14 +171,14 @@ class ProjectAPIEndpoint(BaseAPIView):
                states = [
                    {
                        "name": "Backlog",
-                        "color": "#60646C",
+                        "color": "#A3A3A3",
                        "sequence": 15000,
                        "group": "backlog",
                        "default": True,
                    },
                    {
                        "name": "Todo",
-                        "color": "#60646C",
+                        "color": "#3A3A3A",
                        "sequence": 25000,
                        "group": "unstarted",
                    },
@@ -191,13 +190,13 @@ class ProjectAPIEndpoint(BaseAPIView):
                    },
                    {
                        "name": "Done",
-                        "color": "#46A758",
+                        "color": "#16A34A",
                        "sequence": 45000,
                        "group": "completed",
                    },
                    {
                        "name": "Cancelled",
-                        "color": "#9AA4BC",
+                        "color": "#EF4444",
                        "sequence": 55000,
                        "group": "cancelled",
                    },
@@ -229,7 +228,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                    current_instance=None,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )

                serializer = ProjectSerializer(project)
@@ -239,7 +238,7 @@ class ProjectAPIEndpoint(BaseAPIView):
            if "already exists" in str(e):
                return Response(
                    {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )
        except Workspace.DoesNotExist:
            return Response(
@@ -248,7 +247,7 @@ class ProjectAPIEndpoint(BaseAPIView):
        except ValidationError:
            return Response(
                {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
            )

    def patch(self, request, slug, pk):
@@ -259,7 +258,9 @@ class ProjectAPIEndpoint(BaseAPIView):
                ProjectSerializer(project).data, cls=DjangoJSONEncoder
            )

-            intake_view = request.data.get("intake_view", project.intake_view)
+            intake_view = request.data.get(
+                "inbox_view", request.data.get("intake_view", project.intake_view)
+            )

            if project.archived_at:
                return Response(
@@ -296,7 +297,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                    current_instance=current_instance,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )

                serializer = ProjectSerializer(project)
@@ -306,7 +307,7 @@ class ProjectAPIEndpoint(BaseAPIView):
            if "already exists" in str(e):
                return Response(
                    {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )
        except (Project.DoesNotExist, Workspace.DoesNotExist):
            return Response(
@@ -315,7 +316,7 @@ class ProjectAPIEndpoint(BaseAPIView):
        except ValidationError:
            return Response(
                {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
            )

    def delete(self, request, slug, pk):
@@ -333,7 +334,7 @@ class ProjectAPIEndpoint(BaseAPIView):
            new_value=None,
            actor_id=request.user.id,
            slug=slug,
-            current_site=base_host(request=request, is_app=True),
+            current_site=request.META.get("HTTP_ORIGIN"),
            event_id=project.id,
            old_identifier=None,
            new_identifier=None,
@@ -121,6 +121,8 @@ from .exporter import ExporterHistorySerializer

 from .webhook import WebhookSerializer, WebhookLogSerializer

+from .dashboard import DashboardSerializer, WidgetSerializer
+
 from .favorite import UserFavoriteSerializer

 from .draft import (
@@ -1,7 +1,5 @@
 from .base import BaseSerializer
 from plane.db.models import APIToken, APIActivityLog
-from rest_framework import serializers
-from django.utils import timezone


 class APITokenSerializer(BaseSerializer):
@@ -19,17 +17,10 @@ class APITokenSerializer(BaseSerializer):


 class APITokenReadSerializer(BaseSerializer):
-    is_active = serializers.SerializerMethodField()
-
    class Meta:
        model = APIToken
        exclude = ("token",)

-    def get_is_active(self, obj: APIToken) -> bool:
-        if obj.expired_at is None:
-            return True
-        return timezone.now() < obj.expired_at
-

 class APIActivityLogSerializer(BaseSerializer):
    class Meta:
@@ -25,6 +25,11 @@ class CycleWriteSerializer(BaseSerializer):
                or (self.instance and self.instance.project_id)
                or self.context.get("project_id", None)
            )
+            is_start_date_end_date_equal = (
+                True
+                if str(data.get("start_date")) == str(data.get("end_date"))
+                else False
+            )
            data["start_date"] = convert_to_utc(
                date=str(data.get("start_date").date()),
                project_id=project_id,
@@ -33,6 +38,7 @@ class CycleWriteSerializer(BaseSerializer):
            data["end_date"] = convert_to_utc(
                date=str(data.get("end_date", None).date()),
                project_id=project_id,
+                is_start_date_end_date_equal=is_start_date_end_date_equal,
            )
        return data

@@ -0,0 +1,21 @@
+# Module imports
+from .base import BaseSerializer
+from plane.db.models import DeprecatedDashboard, DeprecatedWidget
+
+# Third party frameworks
+from rest_framework import serializers
+
+
+class DashboardSerializer(BaseSerializer):
+    class Meta:
+        model = DeprecatedDashboard
+        fields = "__all__"
+
+
+class WidgetSerializer(BaseSerializer):
+    is_visible = serializers.BooleanField(read_only=True)
+    widget_filters = serializers.JSONField(read_only=True)
+
+    class Meta:
+        model = DeprecatedWidget
+        fields = ["id", "key", "is_visible", "widget_filters"]
@@ -53,7 +53,6 @@ def get_entity_model_and_serializer(entity_type):
    }
    return entity_map.get(entity_type, (None, None))

-
 class UserFavoriteSerializer(serializers.ModelSerializer):
    entity_data = serializers.SerializerMethodField()

@@ -36,7 +36,6 @@ from plane.db.models import (
    State,
    IssueVersion,
    IssueDescriptionVersion,
-    ProjectMember,
 )


@@ -111,23 +110,14 @@ class IssueCreateSerializer(BaseSerializer):
        data["label_ids"] = label_ids if label_ids else []
        return data

-    def validate(self, attrs):
+    def validate(self, data):
        if (
-            attrs.get("start_date", None) is not None
-            and attrs.get("target_date", None) is not None
-            and attrs.get("start_date", None) > attrs.get("target_date", None)
+            data.get("start_date", None) is not None
+            and data.get("target_date", None) is not None
+            and data.get("start_date", None) > data.get("target_date", None)
        ):
            raise serializers.ValidationError("Start date cannot exceed target date")
-
-        if attrs.get("assignee_ids", []):
-            attrs["assignee_ids"] = ProjectMember.objects.filter(
-                project_id=self.context["project_id"],
-                role__gte=15,
-                is_active=True,
-                member_id__in=attrs["assignee_ids"],
-            ).values_list("member_id", flat=True)
-
-        return attrs
+        return data

    def create(self, validated_data):
        assignees = validated_data.pop("assignee_ids", None)
@@ -149,30 +139,22 @@ class IssueCreateSerializer(BaseSerializer):
                IssueAssignee.objects.bulk_create(
                    [
                        IssueAssignee(
-                            assignee_id=assignee_id,
+                            assignee=user,
                            issue=issue,
                            project_id=project_id,
                            workspace_id=workspace_id,
                            created_by_id=created_by_id,
                            updated_by_id=updated_by_id,
                        )
-                        for assignee_id in assignees
+                        for user in assignees
                    ],
                    batch_size=10,
                )
            except IntegrityError:
                pass
        else:
-            # Then assign it to default assignee, if it is a valid assignee
-            if (
-                default_assignee_id is not None
-                and ProjectMember.objects.filter(
-                    member_id=default_assignee_id,
-                    project_id=project_id,
-                    role__gte=15,
-                    is_active=True,
-                ).exists()
-            ):
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
                try:
                    IssueAssignee.objects.create(
                        assignee_id=default_assignee_id,
@@ -222,14 +204,14 @@ class IssueCreateSerializer(BaseSerializer):
                IssueAssignee.objects.bulk_create(
                    [
                        IssueAssignee(
-                            assignee_id=assignee_id,
+                            assignee=user,
                            issue=instance,
                            project_id=project_id,
                            workspace_id=workspace_id,
                            created_by_id=created_by_id,
                            updated_by_id=updated_by_id,
                        )
-                        for assignee_id in assignees
+                        for user in assignees
                    ],
                    batch_size=10,
                    ignore_conflicts=True,
@@ -268,20 +250,6 @@ class IssueActivitySerializer(BaseSerializer):
    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    source_data = serializers.SerializerMethodField()
-
-    def get_source_data(self, obj):
-        if (
-            hasattr(obj, "issue")
-            and hasattr(obj.issue, "source_data")
-            and obj.issue.source_data
-        ):
-            return {
-                "source": obj.issue.source_data[0].source,
-                "source_email": obj.issue.source_data[0].source_email,
-                "extra": obj.issue.source_data[0].extra,
-            }
-        return None

    class Meta:
        model = IssueActivity
@@ -352,19 +320,8 @@ class IssueRelationSerializer(BaseSerializer):
            "state_id",
            "priority",
            "assignee_ids",
-            "created_by",
-            "created_at",
-            "updated_at",
-            "updated_by",
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
        ]
+        read_only_fields = ["workspace", "project"]


 class RelatedIssueSerializer(BaseSerializer):
@@ -394,19 +351,8 @@ class RelatedIssueSerializer(BaseSerializer):
            "state_id",
            "priority",
            "assignee_ids",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
-            "created_by",
-            "created_at",
-            "updated_by",
-            "updated_at",
        ]
+        read_only_fields = ["workspace", "project"]


 class IssueAssigneeSerializer(BaseSerializer):
@@ -576,7 +522,6 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
            "asset",
            "attributes",
            # "issue_id",
-            "created_by",
            "updated_at",
            "updated_by",
            "asset_url",
@@ -148,13 +148,10 @@ class ProjectMemberAdminSerializer(BaseSerializer):
        fields = "__all__"


-class ProjectMemberRoleSerializer(DynamicBaseSerializer): 
-    original_role = serializers.IntegerField(source='role', read_only=True)
-
+class ProjectMemberRoleSerializer(DynamicBaseSerializer):
    class Meta:
        model = ProjectMember
-        fields = ("id", "role", "member", "project", "original_role", "created_at")
-        read_only_fields = ["original_role", "created_at"]
+        fields = ("id", "role", "member", "project")


 class ProjectMemberInviteSerializer(BaseSerializer):
@@ -1,13 +1,11 @@
 # Module imports
 from .base import BaseSerializer
-from rest_framework import serializers
+

 from plane.db.models import State


 class StateSerializer(BaseSerializer):
-    order = serializers.FloatField(required=False)
-
    class Meta:
        model = State
        fields = [
@@ -20,7 +18,6 @@ class StateSerializer(BaseSerializer):
            "default",
            "description",
            "sequence",
-            "order",
        ]
        read_only_fields = ["workspace", "project"]

@@ -3,22 +3,11 @@ from rest_framework import serializers

 # Module import
 from plane.db.models import Account, Profile, User, Workspace, WorkspaceMemberInvite
-from plane.utils.url import contains_url

 from .base import BaseSerializer


 class UserSerializer(BaseSerializer):
-    def validate_first_name(self, value):
-        if contains_url(value):
-            raise serializers.ValidationError("First name cannot contain a URL.")
-        return value
-
-    def validate_last_name(self, value):
-        if contains_url(value):
-            raise serializers.ValidationError("Last name cannot contain a URL.")
-        return value
-
    class Meta:
        model = User
        # Exclude password field from the serializer
@@ -110,16 +99,11 @@ class UserMeSettingsSerializer(BaseSerializer):
                workspace_member__member=obj.id,
                workspace_member__is_active=True,
            ).first()
-            logo_asset_url = workspace.logo_asset.asset_url if workspace.logo_asset is not None else ""
            return {
                "last_workspace_id": profile.last_workspace_id,
                "last_workspace_slug": (
                    workspace.slug if workspace is not None else ""
                ),
-                "last_workspace_name": (
-                    workspace.name if workspace is not None else ""
-                ),
-                "last_workspace_logo": (logo_asset_url),
                "fallback_workspace_id": profile.last_workspace_id,
                "fallback_workspace_slug": (
                    workspace.slug if workspace is not None else ""
@@ -25,12 +25,10 @@ from plane.db.models import (
    WorkspaceUserPreference,
 )
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
-from plane.utils.url import contains_url

 # Django imports
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
-import re


 class WorkSpaceSerializer(DynamicBaseSerializer):
@@ -38,21 +36,10 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
    logo_url = serializers.CharField(read_only=True)
    role = serializers.IntegerField(read_only=True)

-    def validate_name(self, value):
-        # Check if the name contains a URL
-        if contains_url(value):
-            raise serializers.ValidationError("Name must not contain URLs")
-        return value
-
    def validate_slug(self, value):
        # Check if the slug is restricted
        if value in RESTRICTED_WORKSPACE_SLUGS:
            raise serializers.ValidationError("Slug is not valid")
-        # Slug should only contain alphanumeric characters, hyphens, and underscores
-        if not re.match(r"^[a-zA-Z0-9_-]+$", value):
-            raise serializers.ValidationError(
-                "Slug can only contain letters, numbers, hyphens (-), and underscores (_)"
-            )
        return value

    class Meta:
@@ -161,6 +148,7 @@ class WorkspaceUserLinkSerializer(BaseSerializer):

        return value

+
    def create(self, validated_data):
        # Filtering the WorkspaceUserLink with the given url to check if the link already exists.

@@ -169,7 +157,7 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
        workspace_user_link = WorkspaceUserLink.objects.filter(
            url=url,
            workspace_id=validated_data.get("workspace_id"),
-            owner_id=validated_data.get("owner_id"),
+            owner_id=validated_data.get("owner_id")
        )

        if workspace_user_link.exists():
@@ -185,8 +173,10 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
        url = validated_data.get("url")

        workspace_user_link = WorkspaceUserLink.objects.filter(
-            url=url, workspace_id=instance.workspace_id, owner=instance.owner
-        )
+                url=url,
+                workspace_id=instance.workspace_id,
+                owner=instance.owner
+            )

        if workspace_user_link.exclude(pk=instance.id).exists():
            raise serializers.ValidationError(
@@ -195,7 +185,6 @@ class WorkspaceUserLinkSerializer(BaseSerializer):

        return super().update(instance, validated_data)

-
 class IssueRecentVisitSerializer(serializers.ModelSerializer):
    project_identifier = serializers.SerializerMethodField()

@@ -2,6 +2,7 @@ from .analytic import urlpatterns as analytic_urls
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
 from .cycle import urlpatterns as cycle_urls
+from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
 from .intake import urlpatterns as intake_urls
@@ -22,6 +23,7 @@ urlpatterns = [
    *analytic_urls,
    *asset_urls,
    *cycle_urls,
+    *dashboard_urls,
    *estimate_urls,
    *external_urls,
    *intake_urls,
@@ -6,14 +6,8 @@ from plane.app.views import (
    AnalyticViewViewset,
    SavedAnalyticEndpoint,
    ExportAnalyticsEndpoint,
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
    DefaultAnalyticsEndpoint,
    ProjectStatsEndpoint,
-    ProjectAdvanceAnalyticsEndpoint,
-    ProjectAdvanceAnalyticsStatsEndpoint,
-    ProjectAdvanceAnalyticsChartEndpoint,
 )


@@ -55,34 +49,4 @@ urlpatterns = [
        ProjectStatsEndpoint.as_view(),
        name="project-analytics",
    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics/",
-        AdvanceAnalyticsEndpoint.as_view(),
-        name="advance-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-stats/",
-        AdvanceAnalyticsStatsEndpoint.as_view(),
-        name="advance-analytics-stats",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-charts/",
-        AdvanceAnalyticsChartEndpoint.as_view(),
-        name="advance-analytics-chart",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics/",
-        ProjectAdvanceAnalyticsEndpoint.as_view(),
-        name="project-advance-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-stats/",
-        ProjectAdvanceAnalyticsStatsEndpoint.as_view(),
-        name="project-advance-analytics-stats",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/advance-analytics-charts/",
-        ProjectAdvanceAnalyticsChartEndpoint.as_view(),
-        name="project-advance-analytics-chart",
-    ),
 ]
@@ -12,7 +12,6 @@ from plane.app.views import (
    AssetRestoreEndpoint,
    ProjectAssetEndpoint,
    ProjectBulkAssetEndpoint,
-    AssetCheckEndpoint,
 )


@@ -82,11 +81,5 @@ urlpatterns = [
    path(
        "assets/v2/workspaces/<str:slug>/projects/<uuid:project_id>/<uuid:entity_id>/bulk/",
        ProjectBulkAssetEndpoint.as_view(),
-        name="bulk-asset-update",
-    ),
-    path(
-        "assets/v2/workspaces/<str:slug>/check/<uuid:asset_id>/",
-        AssetCheckEndpoint.as_view(),
-        name="asset-check",
    ),
 ]
@@ -0,0 +1,23 @@
+from django.urls import path
+
+
+from plane.app.views import DashboardEndpoint, WidgetsEndpoint
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/dashboard/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "workspaces/<str:slug>/dashboard/<uuid:dashboard_id>/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "dashboard/<uuid:dashboard_id>/widgets/<uuid:widget_id>/",
+        WidgetsEndpoint.as_view(),
+        name="widgets",
+    ),
+]
@@ -1,11 +1,7 @@
 from django.urls import path


-from plane.app.views import (
-    IntakeViewSet,
-    IntakeIssueViewSet,
-    IntakeWorkItemDescriptionVersionEndpoint,
-)
+from plane.app.views import IntakeViewSet, IntakeIssueViewSet


 urlpatterns = [
@@ -57,14 +53,4 @@ urlpatterns = [
        ),
        name="inbox-issue",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-work-items/<uuid:work_item_id>/description-versions/",
-        IntakeWorkItemDescriptionVersionEndpoint.as_view(),
-        name="intake-work-item-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-work-items/<uuid:work_item_id>/description-versions/<uuid:pk>/",
-        IntakeWorkItemDescriptionVersionEndpoint.as_view(),
-        name="intake-work-item-versions",
-    ),
 ]
@@ -25,7 +25,7 @@ from plane.app.views import (
    IssueAttachmentV2Endpoint,
    IssueBulkUpdateDateEndpoint,
    IssueVersionEndpoint,
-    WorkItemDescriptionVersionEndpoint,
+    IssueDescriptionVersionEndpoint,
    IssueMetaEndpoint,
    IssueDetailIdentifierEndpoint,
 )
@@ -263,22 +263,22 @@ urlpatterns = [
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/versions/",
        IssueVersionEndpoint.as_view(),
-        name="issue-versions",
+        name="page-versions",
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/versions/<uuid:pk>/",
        IssueVersionEndpoint.as_view(),
-        name="issue-versions",
+        name="page-versions",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/work-items/<uuid:work_item_id>/description-versions/",
-        WorkItemDescriptionVersionEndpoint.as_view(),
-        name="work-item-versions",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/description-versions/",
+        IssueDescriptionVersionEndpoint.as_view(),
+        name="page-versions",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/work-items/<uuid:work_item_id>/description-versions/<uuid:pk>/",
-        WorkItemDescriptionVersionEndpoint.as_view(),
-        name="work-item-versions",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/description-versions/<uuid:pk>/",
+        IssueDescriptionVersionEndpoint.as_view(),
+        name="page-versions",
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/meta/",
@@ -106,7 +106,6 @@ from .asset.v2 import (
    AssetRestoreEndpoint,
    ProjectAssetEndpoint,
    ProjectBulkAssetEndpoint,
-    AssetCheckEndpoint,
 )
 from .issue.base import (
    IssueListEndpoint,
@@ -145,7 +144,7 @@ from .issue.sub_issue import SubIssuesEndpoint

 from .issue.subscriber import IssueSubscriberViewSet

-from .issue.version import IssueVersionEndpoint, WorkItemDescriptionVersionEndpoint
+from .issue.version import IssueVersionEndpoint, IssueDescriptionVersionEndpoint

 from .module.base import (
    ModuleViewSet,
@@ -185,11 +184,7 @@ from .estimate.base import (
    EstimatePointEndpoint,
 )

-from .intake.base import (
-    IntakeViewSet,
-    IntakeIssueViewSet,
-    IntakeWorkItemDescriptionVersionEndpoint,
-)
+from .intake.base import IntakeViewSet, IntakeIssueViewSet

 from .analytic.base import (
    AnalyticsEndpoint,
@@ -200,18 +195,6 @@ from .analytic.base import (
    ProjectStatsEndpoint,
 )

-from .analytic.advance import (
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
-)
-
-from .analytic.project_analytics import (
-    ProjectAdvanceAnalyticsEndpoint,
-    ProjectAdvanceAnalyticsStatsEndpoint,
-    ProjectAdvanceAnalyticsChartEndpoint,
-)
-
 from .notification.base import (
    NotificationViewSet,
    UnreadNotificationEndpoint,
@@ -227,6 +210,8 @@ from .webhook.base import (
    WebhookSecretRegenerateEndpoint,
 )

+from .dashboard.base import DashboardEndpoint, WidgetsEndpoint
+
 from .error_404 import custom_404_view

 from .notification.base import MarkAllReadNotificationViewSet
@@ -1,366 +0,0 @@
-from rest_framework.response import Response
-from rest_framework import status
-from typing import Dict, List, Any
-from django.db.models import QuerySet, Q, Count
-from django.http import HttpRequest
-from django.db.models.functions import TruncMonth
-from django.utils import timezone
-from plane.app.views.base import BaseAPIView
-from plane.app.permissions import ROLE, allow_permission
-from plane.db.models import (
-    WorkspaceMember,
-    Project,
-    Issue,
-    Cycle,
-    Module,
-    IssueView,
-    ProjectPage,
-    Workspace,
-    CycleIssue,
-    ModuleIssue,
-    ProjectMember,
-)
-from plane.utils.build_chart import build_analytics_chart
-from plane.utils.date_utils import (
-    get_analytics_filters,
-)
-
-
-class AdvanceAnalyticsBaseView(BaseAPIView):
-    def initialize_workspace(self, slug: str, type: str) -> None:
-        self._workspace_slug = slug
-        self.filters = get_analytics_filters(
-            slug=slug,
-            type=type,
-            user=self.request.user,
-            date_filter=self.request.GET.get("date_filter", None),
-            project_ids=self.request.GET.get("project_ids", None),
-        )
-
-
-class AdvanceAnalyticsEndpoint(AdvanceAnalyticsBaseView):
-    def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:
-        def get_filtered_count() -> int:
-            if self.filters["analytics_date_range"]:
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["current"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["current"][
-                        "lte"
-                    ],
-                ).count()
-            return queryset.count()
-
-        def get_previous_count() -> int:
-            if self.filters["analytics_date_range"] and self.filters[
-                "analytics_date_range"
-            ].get("previous"):
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["previous"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["previous"][
-                        "lte"
-                    ],
-                ).count()
-            return 0
-
-        return {
-            "count": get_filtered_count(),
-            # "filter_count": get_previous_count(),
-        }
-
-    def get_overview_data(self) -> Dict[str, Dict[str, int]]:
-        members_query = WorkspaceMember.objects.filter(
-            workspace__slug=self._workspace_slug, is_active=True
-        )
-
-        if self.request.GET.get("project_ids", None):
-            project_ids = self.request.GET.get("project_ids", None)
-            project_ids = [str(project_id) for project_id in project_ids.split(",")]
-            members_query = ProjectMember.objects.filter(
-                project_id__in=project_ids, is_active=True
-            )
-
-        return {
-            "total_users": self.get_filtered_counts(members_query),
-            "total_admins": self.get_filtered_counts(
-                members_query.filter(role=ROLE.ADMIN.value)
-            ),
-            "total_members": self.get_filtered_counts(
-                members_query.filter(role=ROLE.MEMBER.value)
-            ),
-            "total_guests": self.get_filtered_counts(
-                members_query.filter(role=ROLE.GUEST.value)
-            ),
-            "total_projects": self.get_filtered_counts(
-                Project.objects.filter(**self.filters["project_filters"])
-            ),
-            "total_work_items": self.get_filtered_counts(
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-            ),
-            "total_cycles": self.get_filtered_counts(
-                Cycle.objects.filter(**self.filters["base_filters"])
-            ),
-            "total_intake": self.get_filtered_counts(
-                Issue.objects.filter(**self.filters["base_filters"]).filter(
-                    issue_intake__status__in=["-2", "0"]
-                )
-            ),
-        }
-
-    def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        return {
-            "total_work_items": self.get_filtered_counts(base_queryset),
-            "started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="started")
-            ),
-            "backlog_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="backlog")
-            ),
-            "un_started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="unstarted")
-            ),
-            "completed_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="completed")
-            ),
-        }
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="analytics")
-        tab = request.GET.get("tab", "overview")
-
-        if tab == "overview":
-            return Response(
-                self.get_overview_data(),
-                status=status.HTTP_200_OK,
-            )
-        elif tab == "work-items":
-            return Response(
-                self.get_work_items_stats(),
-                status=status.HTTP_200_OK,
-            )
-        return Response({"message": "Invalid tab"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):
-    def get_project_issues_stats(self) -> QuerySet:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            base_queryset = base_queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        return (
-            base_queryset.values("project_id", "project__name").annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    def get_work_items_stats(self) -> Dict[str, Dict[str, int]]:
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        return (
-            base_queryset
-            .values("project_id", "project__name")
-            .annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "work-items")
-
-        if type == "work-items":
-            return Response(
-                self.get_work_items_stats(),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):
-    def project_chart(self) -> List[Dict[str, Any]]:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        date_filter = {}
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            date_filter = {
-                "created_at__date__gte": start_date,
-                "created_at__date__lte": end_date,
-            }
-
-        total_work_items = base_queryset.filter(**date_filter).count()
-        total_cycles = Cycle.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_modules = Module.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_intake = Issue.objects.filter(
-            issue_intake__isnull=False, **self.filters["base_filters"], **date_filter
-        ).count()
-        total_members = WorkspaceMember.objects.filter(
-            workspace__slug=self._workspace_slug, is_active=True, **date_filter
-        ).count()
-        total_pages = ProjectPage.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_views = IssueView.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-
-        data = {
-            "work_items": total_work_items,
-            "cycles": total_cycles,
-            "modules": total_modules,
-            "intake": total_intake,
-            "members": total_members,
-            "pages": total_pages,
-            "views": total_views,
-        }
-
-        return [
-            {
-                "key": key,
-                "name": key.replace("_", " ").title(),
-                "count": value or 0,
-            }
-            for key, value in data.items()
-        ]
-
-    def work_item_completion_chart(self) -> Dict[str, Any]:
-        # Get the base queryset
-        queryset = (
-            Issue.issue_objects.filter(**self.filters["base_filters"])
-            .select_related("workspace", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
-        )
-
-        workspace = Workspace.objects.get(slug=self._workspace_slug)
-        start_date = workspace.created_at.date().replace(day=1)
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            queryset = queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        # Annotate by month and count
-        monthly_stats = (
-            queryset.annotate(month=TruncMonth("created_at"))
-            .values("month")
-            .annotate(
-                created_count=Count("id"),
-                completed_count=Count("id", filter=Q(state__group="completed")),
-            )
-            .order_by("month")
-        )
-
-        # Create dictionary of month -> counts
-        stats_dict = {
-            stat["month"].strftime("%Y-%m-%d"): {
-                "created_count": stat["created_count"],
-                "completed_count": stat["completed_count"],
-            }
-            for stat in monthly_stats
-        }
-
-        # Generate monthly data (ensure months with 0 count are included)
-        data = []
-        # include the current date at the end
-        end_date = timezone.now().date()
-        last_month = end_date.replace(day=1)
-        current_month = start_date
-
-        while current_month <= last_month:
-            date_str = current_month.strftime("%Y-%m-%d")
-            stats = stats_dict.get(date_str, {"created_count": 0, "completed_count": 0})
-            data.append(
-                {
-                    "key": date_str,
-                    "name": date_str,
-                    "count": stats["created_count"],
-                    "completed_issues": stats["completed_count"],
-                    "created_issues": stats["created_count"],
-                }
-            )
-            # Move to next month
-            if current_month.month == 12:
-                current_month = current_month.replace(
-                    year=current_month.year + 1, month=1
-                )
-            else:
-                current_month = current_month.replace(month=current_month.month + 1)
-
-        schema = {
-            "completed_issues": "completed_issues",
-            "created_issues": "created_issues",
-        }
-
-        return {"data": data, "schema": schema}
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "projects")
-        group_by = request.GET.get("group_by", None)
-        x_axis = request.GET.get("x_axis", "PRIORITY")
-
-        if type == "projects":
-            return Response(self.project_chart(), status=status.HTTP_200_OK)
-
-        elif type == "custom-work-items":
-            queryset = (
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-                .select_related("workspace", "state", "parent")
-                .prefetch_related(
-                    "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-                )
-            )
-
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            return Response(
-                build_analytics_chart(queryset, x_axis, group_by),
-                status=status.HTTP_200_OK,
-            )
-
-        elif type == "work-items":
-            return Response(
-                self.work_item_completion_chart(),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
@@ -1,421 +0,0 @@
-from rest_framework.response import Response
-from rest_framework import status
-from typing import Dict, Any
-from django.db.models import QuerySet, Q, Count
-from django.http import HttpRequest
-from django.db.models.functions import TruncMonth
-from django.utils import timezone
-from datetime import timedelta
-from plane.app.views.base import BaseAPIView
-from plane.app.permissions import ROLE, allow_permission
-from plane.db.models import (
-    Project,
-    Issue,
-    Cycle,
-    Module,
-    CycleIssue,
-    ModuleIssue,
-)
-from django.db import models
-from django.db.models import F, Case, When, Value
-from django.db.models.functions import Concat
-from plane.utils.build_chart import build_analytics_chart
-from plane.utils.date_utils import (
-    get_analytics_filters,
-)
-
-
-class ProjectAdvanceAnalyticsBaseView(BaseAPIView):
-    def initialize_workspace(self, slug: str, type: str) -> None:
-        self._workspace_slug = slug
-        self.filters = get_analytics_filters(
-            slug=slug,
-            type=type,
-            user=self.request.user,
-            date_filter=self.request.GET.get("date_filter", None),
-            project_ids=self.request.GET.get("project_ids", None),
-        )
-
-
-class ProjectAdvanceAnalyticsEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:
-        def get_filtered_count() -> int:
-            if self.filters["analytics_date_range"]:
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["current"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["current"][
-                        "lte"
-                    ],
-                ).count()
-            return queryset.count()
-
-        return {
-            "count": get_filtered_count(),
-        }
-
-    def get_work_items_stats(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Dict[str, int]]:
-        """
-        Returns work item stats for the workspace, or filtered by cycle_id or module_id if provided.
-        """
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        else:
-            base_queryset = Issue.issue_objects.filter(
-                **self.filters["base_filters"], project_id=project_id
-            )
-
-        return {
-            "total_work_items": self.get_filtered_counts(base_queryset),
-            "started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="started")
-            ),
-            "backlog_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="backlog")
-            ),
-            "un_started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="unstarted")
-            ),
-            "completed_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="completed")
-            ),
-        }
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="analytics")
-
-        # Optionally accept cycle_id or module_id as query params
-        cycle_id = request.GET.get("cycle_id", None)
-        module_id = request.GET.get("module_id", None)
-        return Response(
-            self.get_work_items_stats(
-                cycle_id=cycle_id, module_id=module_id, project_id=project_id
-            ),
-            status=status.HTTP_200_OK,
-        )
-
-
-class ProjectAdvanceAnalyticsStatsEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def get_project_issues_stats(self) -> QuerySet:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            base_queryset = base_queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        return (
-            base_queryset.values("project_id", "project__name")
-            .annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    def get_work_items_stats(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Dict[str, int]]:
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        else:
-            base_queryset = Issue.issue_objects.filter(
-                **self.filters["base_filters"], project_id=project_id
-            )
-        return (
-            base_queryset.annotate(display_name=F("assignees__display_name"))
-            .annotate(assignee_id=F("assignees__id"))
-            .annotate(avatar=F("assignees__avatar"))
-            .annotate(
-                avatar_url=Case(
-                    # If `avatar_asset` exists, use it to generate the asset URL
-                    When(
-                        assignees__avatar_asset__isnull=False,
-                        then=Concat(
-                            Value("/api/assets/v2/static/"),
-                            "assignees__avatar_asset",  # Assuming avatar_asset has an id or relevant field
-                            Value("/"),
-                        ),
-                    ),
-                    # If `avatar_asset` is None, fall back to using `avatar` field directly
-                    When(
-                        assignees__avatar_asset__isnull=True, then="assignees__avatar"
-                    ),
-                    default=Value(None),
-                    output_field=models.CharField(),
-                )
-            )
-            .values("display_name", "assignee_id", "avatar_url")
-            .annotate(
-                cancelled_work_items=Count(
-                    "id", filter=Q(state__group="cancelled"), distinct=True
-                ),
-                completed_work_items=Count(
-                    "id", filter=Q(state__group="completed"), distinct=True
-                ),
-                backlog_work_items=Count(
-                    "id", filter=Q(state__group="backlog"), distinct=True
-                ),
-                un_started_work_items=Count(
-                    "id", filter=Q(state__group="unstarted"), distinct=True
-                ),
-                started_work_items=Count(
-                    "id", filter=Q(state__group="started"), distinct=True
-                ),
-            )
-            .order_by("display_name")
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "work-items")
-
-        if type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-            return Response(
-                self.get_work_items_stats(
-                    project_id=project_id, cycle_id=cycle_id, module_id=module_id
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class ProjectAdvanceAnalyticsChartEndpoint(ProjectAdvanceAnalyticsBaseView):
-    def work_item_completion_chart(
-        self, project_id, cycle_id=None, module_id=None
-    ) -> Dict[str, Any]:
-        # Get the base queryset
-        queryset = (
-            Issue.issue_objects.filter(**self.filters["base_filters"])
-            .filter(project_id=project_id)
-            .select_related("workspace", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
-        )
-
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            cycle = Cycle.objects.filter(id=cycle_id).first()
-            if cycle and cycle.start_date:
-                start_date = cycle.start_date.date()
-                end_date = cycle.end_date.date()
-            else:
-                return {"data": [], "schema": {}}
-            queryset = cycle_issues
-
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            module = Module.objects.filter(id=module_id).first()
-            if module and module.start_date:
-                start_date = module.start_date
-                end_date = module.target_date
-            else:
-                return {"data": [], "schema": {}}
-            queryset = module_issues
-
-        else:
-            project = Project.objects.filter(id=project_id).first()
-            if project.created_at:
-                start_date = project.created_at.date().replace(day=1)
-            else:
-                return {"data": [], "schema": {}}
-
-        if cycle_id or module_id:
-            # Get daily stats with optimized query
-            daily_stats = (
-                queryset.values("created_at__date")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count(
-                        "id", filter=Q(issue__state__group="completed")
-                    ),
-                )
-                .order_by("created_at__date")
-            )
-
-            # Create a dictionary of existing stats with summed counts
-            stats_dict = {
-                stat["created_at__date"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in daily_stats
-            }
-
-            # Generate data for all days in the range
-            data = []
-            current_date = start_date
-            while current_date <= end_date:
-                date_str = current_date.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"] + stats["completed_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                current_date += timedelta(days=1)
-        else:
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            # Annotate by month and count
-            monthly_stats = (
-                queryset.annotate(month=TruncMonth("created_at"))
-                .values("month")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count("id", filter=Q(state__group="completed")),
-                )
-                .order_by("month")
-            )
-
-            # Create dictionary of month -> counts
-            stats_dict = {
-                stat["month"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in monthly_stats
-            }
-
-            # Generate monthly data (ensure months with 0 count are included)
-            data = []
-            # include the current date at the end
-            end_date = timezone.now().date()
-            last_month = end_date.replace(day=1)
-            current_month = start_date
-
-            while current_month <= last_month:
-                date_str = current_month.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                # Move to next month
-                if current_month.month == 12:
-                    current_month = current_month.replace(
-                        year=current_month.year + 1, month=1
-                    )
-                else:
-                    current_month = current_month.replace(month=current_month.month + 1)
-
-        schema = {
-            "completed_issues": "completed_issues",
-            "created_issues": "created_issues",
-        }
-
-        return {"data": data, "schema": schema}
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request: HttpRequest, slug: str, project_id: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "projects")
-        group_by = request.GET.get("group_by", None)
-        x_axis = request.GET.get("x_axis", "PRIORITY")
-        cycle_id = request.GET.get("cycle_id", None)
-        module_id = request.GET.get("module_id", None)
-
-        if type == "custom-work-items":
-            queryset = (
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-                .filter(project_id=project_id)
-                .select_related("workspace", "state", "parent")
-                .prefetch_related(
-                    "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-                )
-            )
-
-            # Apply cycle/module filters if present
-            if cycle_id is not None:
-                cycle_issues = CycleIssue.objects.filter(
-                    **self.filters["base_filters"], cycle_id=cycle_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=cycle_issues)
-
-            elif module_id is not None:
-                module_issues = ModuleIssue.objects.filter(
-                    **self.filters["base_filters"], module_id=module_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=module_issues)
-
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            return Response(
-                build_analytics_chart(queryset, x_axis, group_by),
-                status=status.HTTP_200_OK,
-            )
-
-        elif type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-
-            return Response(
-                self.work_item_completion_chart(
-                    project_id=project_id, cycle_id=cycle_id, module_id=module_id
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
@@ -9,11 +9,11 @@ from rest_framework import status
 from .base import BaseAPIView
 from plane.db.models import APIToken, Workspace
 from plane.app.serializers import APITokenSerializer, APITokenReadSerializer
-from plane.app.permissions import WorkspaceEntityPermission
+from plane.app.permissions import WorkspaceOwnerPermission


 class ApiTokenEndpoint(BaseAPIView):
-    permission_classes = [WorkspaceEntityPermission]
+    permission_classes = [WorkspaceOwnerPermission]

    def post(self, request, slug):
        label = request.data.get("label", str(uuid4().hex))
@@ -68,7 +68,7 @@ class ApiTokenEndpoint(BaseAPIView):


 class ServiceApiTokenEndpoint(BaseAPIView):
-    permission_classes = [WorkspaceEntityPermission]
+    permission_classes = [WorkspaceOwnerPermission]

    def post(self, request, slug):
        workspace = Workspace.objects.get(slug=slug)
@@ -137,7 +137,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
        if type not in allowed_types:
            return Response(
                {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                    "status": False,
                },
                status=status.HTTP_400_BAD_REQUEST,
@@ -351,7 +351,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
        if type not in allowed_types:
            return Response(
                {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                    "status": False,
                },
                status=status.HTTP_400_BAD_REQUEST,
@@ -552,7 +552,7 @@ class ProjectAssetEndpoint(BaseAPIView):
        if type not in allowed_types:
            return Response(
                {
-                    "error": "Invalid file type. Only JPEG, PNG, WebP, JPG and GIF files are allowed.",
+                    "error": "Invalid file type. Only JPEG and PNG files are allowed.",
                    "status": False,
                },
                status=status.HTTP_400_BAD_REQUEST,
@@ -683,7 +683,7 @@ class ProjectBulkAssetEndpoint(BaseAPIView):
            # For some cases, the bulk api is called after the issue is deleted creating
            # an integrity error
            try:
-                assets.update(issue_id=entity_id, project_id=project_id)
+                assets.update(issue_id=entity_id)
            except IntegrityError:
                pass

@@ -707,14 +707,3 @@ class ProjectBulkAssetEndpoint(BaseAPIView):
                pass

        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class AssetCheckEndpoint(BaseAPIView):
-    """Endpoint to check if an asset exists."""
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug, asset_id):
-        asset = FileAsset.all_objects.filter(
-            id=asset_id, workspace__slug=slug, deleted_at__isnull=True
-        ).exists()
-        return Response({"exists": asset}, status=status.HTTP_200_OK)
@@ -51,7 +51,8 @@ from plane.db.models import (
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.utils.host import base_host
+
+# Module imports
 from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.webhook_task import model_activity
 from plane.utils.timezone_converter import convert_to_utc, user_timezone_converter
@@ -117,7 +118,6 @@ class CycleViewSet(BaseViewSet):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -130,7 +130,6 @@ class CycleViewSet(BaseViewSet):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -143,7 +142,6 @@ class CycleViewSet(BaseViewSet):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -269,7 +267,9 @@ class CycleViewSet(BaseViewSet):
            "created_by",
        )
        datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(data, datetime_fields, project_timezone)
+        data = user_timezone_converter(
+            data, datetime_fields, request.user.user_timezone
+        )
        return Response(data, status=status.HTTP_200_OK)

    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
@@ -318,13 +318,9 @@ class CycleViewSet(BaseViewSet):
                    .first()
                )

-                # Fetch the project timezone
-                project = Project.objects.get(id=self.kwargs.get("project_id"))
-                project_timezone = project.timezone
-
                datetime_fields = ["start_date", "end_date"]
                cycle = user_timezone_converter(
-                    cycle, datetime_fields, project_timezone
+                    cycle, datetime_fields, request.user.user_timezone
                )

                # Send the model activity
@@ -335,7 +331,7 @@ class CycleViewSet(BaseViewSet):
                    current_instance=None,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )
                return Response(cycle, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -411,12 +407,10 @@ class CycleViewSet(BaseViewSet):
                "created_by",
            ).first()

-            # Fetch the project timezone
-            project = Project.objects.get(id=self.kwargs.get("project_id"))
-            project_timezone = project.timezone
-
            datetime_fields = ["start_date", "end_date"]
-            cycle = user_timezone_converter(cycle, datetime_fields, project_timezone)
+            cycle = user_timezone_converter(
+                cycle, datetime_fields, request.user.user_timezone
+            )

            # Send the model activity
            model_activity.delay(
@@ -426,7 +420,7 @@ class CycleViewSet(BaseViewSet):
                current_instance=current_instance,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            return Response(cycle, status=status.HTTP_200_OK)
@@ -486,11 +480,10 @@ class CycleViewSet(BaseViewSet):
            )

        queryset = queryset.first()
-        # Fetch the project timezone
-        project = Project.objects.get(id=self.kwargs.get("project_id"))
-        project_timezone = project.timezone
        datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(data, datetime_fields, project_timezone)
+        data = user_timezone_converter(
+            data, datetime_fields, request.user.user_timezone
+        )

        recent_visited_task.delay(
            slug=slug,
@@ -539,7 +532,7 @@ class CycleViewSet(BaseViewSet):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        # TODO: Soft delete the cycle break the onetoone relationship with cycle issue
        cycle.delete()
@@ -573,12 +566,16 @@ class CycleDateCheckEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

+        is_start_date_end_date_equal = (
+            True if str(start_date) == str(end_date) else False
+        )
        start_date = convert_to_utc(
            date=str(start_date), project_id=project_id, is_start_date=True
        )
        end_date = convert_to_utc(
            date=str(end_date),
            project_id=project_id,
+            is_start_date_end_date_equal=is_start_date_end_date_equal,
        )

        # Check if any cycle intersects in the given interval
@@ -663,7 +660,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -728,7 +724,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                )
            )
        )
-        old_cycle = old_cycle.first()

        estimate_type = Project.objects.filter(
            workspace__slug=slug,
@@ -847,7 +842,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
            )

            estimate_completion_chart = burndown_plot(
-                queryset=old_cycle,
+                queryset=old_cycle.first(),
                slug=slug,
                project_id=project_id,
                plot_type="points",
@@ -994,7 +989,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):

        # Pass the new_cycle queryset to burndown_plot
        completion_chart = burndown_plot(
-            queryset=old_cycle,
+            queryset=old_cycle.first(),
            slug=slug,
            project_id=project_id,
            plot_type="issues",
@@ -1006,12 +1001,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
        ).first()

        current_cycle.progress_snapshot = {
-            "total_issues": old_cycle.total_issues,
-            "completed_issues": old_cycle.completed_issues,
-            "cancelled_issues": old_cycle.cancelled_issues,
-            "started_issues": old_cycle.started_issues,
-            "unstarted_issues": old_cycle.unstarted_issues,
-            "backlog_issues": old_cycle.backlog_issues,
+            "total_issues": old_cycle.first().total_issues,
+            "completed_issues": old_cycle.first().completed_issues,
+            "cancelled_issues": old_cycle.first().cancelled_issues,
+            "started_issues": old_cycle.first().started_issues,
+            "unstarted_issues": old_cycle.first().unstarted_issues,
+            "backlog_issues": old_cycle.first().backlog_issues,
            "distribution": {
                "labels": label_distribution_data,
                "assignees": assignee_distribution_data,
@@ -1076,7 +1071,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -1119,13 +1114,6 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
 class CycleProgressEndpoint(BaseAPIView):
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.filter(
-            workspace__slug=slug, project_id=project_id, id=cycle_id
-        ).first()
-        if not cycle:
-            return Response(
-                {"error": "Cycle not found"}, status=status.HTTP_404_NOT_FOUND
-            )
        aggregate_estimates = (
            Issue.issue_objects.filter(
                estimate_point__estimate__type="points",
@@ -1176,60 +1164,53 @@ class CycleProgressEndpoint(BaseAPIView):
                ),
            )
        )
-        if cycle.progress_snapshot:
-            backlog_issues = cycle.progress_snapshot.get("backlog_issues", 0)
-            unstarted_issues = cycle.progress_snapshot.get("unstarted_issues", 0)
-            started_issues = cycle.progress_snapshot.get("started_issues", 0)
-            cancelled_issues = cycle.progress_snapshot.get("cancelled_issues", 0)
-            completed_issues = cycle.progress_snapshot.get("completed_issues", 0)
-            total_issues = cycle.progress_snapshot.get("total_issues", 0)
-        else:
-            backlog_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="backlog",
-            ).count()

-            unstarted_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="unstarted",
-            ).count()
+        backlog_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="backlog",
+        ).count()

-            started_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="started",
-            ).count()
+        unstarted_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="unstarted",
+        ).count()

-            cancelled_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="cancelled",
-            ).count()
+        started_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="started",
+        ).count()

-            completed_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-                state__group="completed",
-            ).count()
+        cancelled_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="cancelled",
+        ).count()

-            total_issues = Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-                workspace__slug=slug,
-                project_id=project_id,
-            ).count()
+        completed_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+            state__group="completed",
+        ).count()
+
+        total_issues = Issue.issue_objects.filter(
+            issue_cycle__cycle_id=cycle_id,
+            issue_cycle__deleted_at__isnull=True,
+            workspace__slug=slug,
+            project_id=project_id,
+        ).count()

        return Response(
            {
@@ -1290,25 +1271,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        # this will tell whether the issues were transferred to the new cycle
-        """ 
-        if the issues were transferred to the new cycle, then the progress_snapshot will be present
-        return the progress_snapshot data in the analytics for each date
-            
-        else issues were not transferred to the new cycle then generate the stats from the cycle isssue bridge tables
-        """
-
-        if cycle.progress_snapshot:
-            distribution = cycle.progress_snapshot.get("distribution", {})
-            return Response(
-                {
-                    "labels": distribution.get("labels", []),
-                    "assignees": distribution.get("assignees", []),
-                    "completion_chart": distribution.get("completion_chart", {}),
-                },
-                status=status.HTTP_200_OK,
-            )
-
        estimate_type = Project.objects.filter(
            workspace__slug=slug,
            pk=project_id,
@@ -27,7 +27,6 @@ from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
 from plane.app.permissions import allow_permission, ROLE
-from plane.utils.host import base_host


 class CycleIssueViewSet(BaseViewSet):
@@ -292,7 +291,7 @@ class CycleIssueViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        return Response({"message": "success"}, status=status.HTTP_201_CREATED)

@@ -318,7 +317,7 @@ class CycleIssueViewSet(BaseViewSet):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        cycle_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -0,0 +1,812 @@
+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import (
+    Case,
+    CharField,
+    Count,
+    Exists,
+    F,
+    Func,
+    IntegerField,
+    JSONField,
+    OuterRef,
+    Prefetch,
+    Q,
+    Subquery,
+    UUIDField,
+    Value,
+    When,
+)
+from django.db.models.functions import Coalesce
+from django.utils import timezone
+from rest_framework import status
+
+# Third Party imports
+from rest_framework.response import Response
+
+from plane.app.serializers import (
+    DashboardSerializer,
+    IssueActivitySerializer,
+    IssueSerializer,
+    WidgetSerializer,
+)
+from plane.db.models import (
+    DeprecatedDashboard,
+    DeprecatedDashboardWidget,
+    Issue,
+    IssueActivity,
+    FileAsset,
+    IssueLink,
+    IssueRelation,
+    Project,
+    DeprecatedWidget,
+    WorkspaceMember,
+    CycleIssue,
+)
+from plane.utils.issue_filters import issue_filters
+
+# Module imports
+from .. import BaseAPIView
+
+
+def dashboard_overview_stats(self, request, slug):
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            (Q(assignees__in=[request.user]) & Q(issue_assignee__deleted_at__isnull=True)),
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    pending_issues_count = (
+        Issue.issue_objects.filter(
+            ~Q(state__group__in=["completed", "cancelled"]),
+            target_date__lt=timezone.now().date(),
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+            assignees__in=[request.user],
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    created_issues_count = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            created_by_id=request.user.id,
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    completed_issues_count = (
+        Issue.issue_objects.filter(
+            (
+                Q(assignees__in=[request.user])
+                & Q(issue_assignee__deleted_at__isnull=True)
+            ),
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            state__group="completed",
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    return Response(
+        {
+            "assigned_issues_count": assigned_issues,
+            "pending_issues_count": pending_issues_count,
+            "completed_issues_count": completed_issues_count,
+            "created_issues_count": created_issues_count,
+        },
+        status=status.HTTP_200_OK,
+    )
+
+
+def dashboard_assigned_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            (
+                Q(assignees__in=[request.user])
+                & Q(issue_assignee__deleted_at__isnull=True)
+            ),
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .prefetch_related(
+            Prefetch(
+                "issue_relation",
+                queryset=IssueRelation.objects.select_related(
+                    "related_issue"
+                ).select_related("issue"),
+            )
+        )
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+    )
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        assigned_issues = assigned_issues.filter(created_by=request.user)
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    assigned_issues = assigned_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = assigned_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = assigned_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    completed_issues, many=True, expand=self.expand
+                ).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    overdue_issues, many=True, expand=self.expand
+                ).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    upcoming_issues, many=True, expand=self.expand
+                ).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_created_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    created_issues = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            created_by=request.user,
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+        .order_by("created_at")
+    )
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    created_issues = created_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = created_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = created_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(completed_issues, many=True).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(overdue_issues, many=True).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(upcoming_issues, many=True).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_issues_by_state_groups(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_state_groups = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("state__group")
+        .annotate(count=Count("id"))
+    )
+
+    # default state
+    all_groups = {state: 0 for state in state_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_state_groups:
+        all_groups[entry["state__group"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"state": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_issues_by_priority(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_priority = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("priority")
+        .annotate(count=Count("id"))
+    )
+
+    # default priority
+    all_groups = {priority: 0 for priority in priority_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_priority:
+        all_groups[entry["priority"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"priority": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_recent_activity(self, request, slug):
+    queryset = IssueActivity.objects.filter(
+        ~Q(field__in=["comment", "vote", "reaction", "draft"]),
+        workspace__slug=slug,
+        project__project_projectmember__member=request.user,
+        project__project_projectmember__is_active=True,
+        project__archived_at__isnull=True,
+        actor=request.user,
+    ).select_related("actor", "workspace", "issue", "project")[:8]
+
+    return Response(
+        IssueActivitySerializer(queryset, many=True).data, status=status.HTTP_200_OK
+    )
+
+
+def dashboard_recent_projects(self, request, slug):
+    project_ids = (
+        IssueActivity.objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            actor=request.user,
+        )
+        .values_list("project_id", flat=True)
+        .distinct()
+    )
+
+    # Extract project IDs from the recent projects
+    unique_project_ids = set(project_id for project_id in project_ids)
+
+    # Fetch additional projects only if needed
+    if len(unique_project_ids) < 4:
+        additional_projects = Project.objects.filter(
+            project_projectmember__member=request.user,
+            project_projectmember__is_active=True,
+            archived_at__isnull=True,
+            workspace__slug=slug,
+        ).exclude(id__in=unique_project_ids)
+
+        # Append additional project IDs to the existing list
+        unique_project_ids.update(additional_projects.values_list("id", flat=True))
+
+    return Response(list(unique_project_ids)[:4], status=status.HTTP_200_OK)
+
+
+def dashboard_recent_collaborators(self, request, slug):
+    project_members_with_activities = (
+        WorkspaceMember.objects.filter(workspace__slug=slug, is_active=True)
+        .annotate(
+            active_issue_count=Count(
+                Case(
+                    When(
+                        member__issue_assignee__issue__state__group__in=[
+                            "unstarted",
+                            "started",
+                        ],
+                        member__issue_assignee__issue__workspace__slug=slug,
+                        member__issue_assignee__issue__project__project_projectmember__member=request.user,
+                        member__issue_assignee__issue__project__project_projectmember__is_active=True,
+                        then=F("member__issue_assignee__issue__id"),
+                    ),
+                    distinct=True,
+                    output_field=IntegerField(),
+                ),
+                distinct=True,
+            ),
+            user_id=F("member_id"),
+        )
+        .values("user_id", "active_issue_count")
+        .order_by("-active_issue_count")
+        .distinct()
+    )
+    return Response((project_members_with_activities), status=status.HTTP_200_OK)
+
+
+class DashboardEndpoint(BaseAPIView):
+    def create(self, request, slug):
+        serializer = DashboardSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_204_NO_CONTENT)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def get(self, request, slug, dashboard_id=None):
+        if not dashboard_id:
+            dashboard_type = request.GET.get("dashboard_type", None)
+            if dashboard_type == "home":
+                dashboard, created = DeprecatedDashboard.objects.get_or_create(
+                    type_identifier=dashboard_type,
+                    owned_by=request.user,
+                    is_default=True,
+                )
+
+                if created:
+                    widgets_to_fetch = [
+                        "overview_stats",
+                        "assigned_issues",
+                        "created_issues",
+                        "issues_by_state_groups",
+                        "issues_by_priority",
+                        "recent_activity",
+                        "recent_projects",
+                        "recent_collaborators",
+                    ]
+
+                    updated_dashboard_widgets = []
+                    for widget_key in widgets_to_fetch:
+                        widget = DeprecatedWidget.objects.filter(
+                            key=widget_key
+                        ).values_list("id", flat=True)
+                        if widget:
+                            updated_dashboard_widgets.append(
+                                DeprecatedDashboardWidget(
+                                    widget_id=widget, dashboard_id=dashboard.id
+                                )
+                            )
+
+                    DeprecatedDashboardWidget.objects.bulk_create(
+                        updated_dashboard_widgets, batch_size=100
+                    )
+
+                widgets = (
+                    DeprecatedWidget.objects.annotate(
+                        is_visible=Exists(
+                            DeprecatedDashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                is_visible=True,
+                            )
+                        )
+                    )
+                    .annotate(
+                        dashboard_filters=Subquery(
+                            DeprecatedDashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                filters__isnull=False,
+                            )
+                            .exclude(filters={})
+                            .values("filters")[:1]
+                        )
+                    )
+                    .annotate(
+                        widget_filters=Case(
+                            When(
+                                dashboard_filters__isnull=False,
+                                then=F("dashboard_filters"),
+                            ),
+                            default=F("filters"),
+                            output_field=JSONField(),
+                        )
+                    )
+                )
+                return Response(
+                    {
+                        "dashboard": DashboardSerializer(dashboard).data,
+                        "widgets": WidgetSerializer(widgets, many=True).data,
+                    },
+                    status=status.HTTP_200_OK,
+                )
+            return Response(
+                {"error": "Please specify a valid dashboard type"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        widget_key = request.GET.get("widget_key", "overview_stats")
+
+        WIDGETS_MAPPER = {
+            "overview_stats": dashboard_overview_stats,
+            "assigned_issues": dashboard_assigned_issues,
+            "created_issues": dashboard_created_issues,
+            "issues_by_state_groups": dashboard_issues_by_state_groups,
+            "issues_by_priority": dashboard_issues_by_priority,
+            "recent_activity": dashboard_recent_activity,
+            "recent_projects": dashboard_recent_projects,
+            "recent_collaborators": dashboard_recent_collaborators,
+        }
+
+        func = WIDGETS_MAPPER.get(widget_key)
+        if func is not None:
+            response = func(self, request=request, slug=slug)
+            if isinstance(response, Response):
+                return response
+
+        return Response(
+            {"error": "Please specify a valid widget key"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+
+class WidgetsEndpoint(BaseAPIView):
+    def patch(self, request, dashboard_id, widget_id):
+        dashboard_widget = DeprecatedDashboardWidget.objects.filter(
+            widget_id=widget_id, dashboard_id=dashboard_id
+        ).first()
+        dashboard_widget.is_visible = request.data.get(
+            "is_visible", dashboard_widget.is_visible
+        )
+        dashboard_widget.sort_order = request.data.get(
+            "sort_order", dashboard_widget.sort_order
+        )
+        dashboard_widget.filters = request.data.get("filters", dashboard_widget.filters)
+        dashboard_widget.save()
+        return Response({"message": "successfully updated"}, status=status.HTTP_200_OK)
@@ -3,7 +3,7 @@ import os
 from typing import List, Dict, Tuple

 # Third party import
-from openai import OpenAI
+import litellm
 import requests

 from rest_framework import status
@@ -11,7 +11,8 @@ from rest_framework.response import Response

 # Module import
 from plane.app.permissions import ROLE, allow_permission
-from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.app.serializers import (ProjectLiteSerializer,
+                                   WorkspaceLiteSerializer)
 from plane.db.models import Project, Workspace
 from plane.license.utils.instance_value import get_configuration_value
 from plane.utils.exception_logger import log_exception
@@ -21,7 +22,6 @@ from ..base import BaseAPIView

 class LLMProvider:
    """Base class for LLM provider configurations"""
-
    name: str = ""
    models: List[str] = []
    default_model: str = ""
@@ -34,13 +34,11 @@ class LLMProvider:
            "default_model": cls.default_model,
        }

-
 class OpenAIProvider(LLMProvider):
    name = "OpenAI"
    models = ["gpt-3.5-turbo", "gpt-4o-mini", "gpt-4o", "o1-mini", "o1-preview"]
    default_model = "gpt-4o-mini"

-
 class AnthropicProvider(LLMProvider):
    name = "Anthropic"
    models = [
@@ -51,45 +49,40 @@ class AnthropicProvider(LLMProvider):
        "claude-2.1",
        "claude-2",
        "claude-instant-1.2",
-        "claude-instant-1",
+        "claude-instant-1"
    ]
    default_model = "claude-3-sonnet-20240229"

-
 class GeminiProvider(LLMProvider):
    name = "Gemini"
    models = ["gemini-pro", "gemini-1.5-pro-latest", "gemini-pro-vision"]
    default_model = "gemini-pro"

-
 SUPPORTED_PROVIDERS = {
    "openai": OpenAIProvider,
    "anthropic": AnthropicProvider,
    "gemini": GeminiProvider,
 }

-
 def get_llm_config() -> Tuple[str | None, str | None, str | None]:
    """
    Helper to get LLM configuration values, returns:
        - api_key, model, provider
    """
-    api_key, provider_key, model = get_configuration_value(
-        [
-            {
-                "key": "LLM_API_KEY",
-                "default": os.environ.get("LLM_API_KEY", None),
-            },
-            {
-                "key": "LLM_PROVIDER",
-                "default": os.environ.get("LLM_PROVIDER", "openai"),
-            },
-            {
-                "key": "LLM_MODEL",
-                "default": os.environ.get("LLM_MODEL", None),
-            },
-        ]
-    )
+    api_key, provider_key, model = get_configuration_value([
+        {
+            "key": "LLM_API_KEY",
+            "default": os.environ.get("LLM_API_KEY", None),
+        },
+        {
+            "key": "LLM_PROVIDER",
+            "default": os.environ.get("LLM_PROVIDER", "openai"),
+        },
+        {
+            "key": "LLM_MODEL",
+            "default": os.environ.get("LLM_MODEL", None),
+        },
+    ])

    provider = SUPPORTED_PROVIDERS.get(provider_key.lower())
    if not provider:
@@ -106,20 +99,16 @@ def get_llm_config() -> Tuple[str | None, str | None, str | None]:

    # Validate model is supported by provider
    if model not in provider.models:
-        log_exception(
-            ValueError(
-                f"Model {model} not supported by {provider.name}. "
-                f"Supported models: {', '.join(provider.models)}"
-            )
-        )
+        log_exception(ValueError(
+            f"Model {model} not supported by {provider.name}. "
+            f"Supported models: {', '.join(provider.models)}"
+        ))
        return None, None, None

    return api_key, model, provider_key


-def get_llm_response(
-    task, prompt, api_key: str, model: str, provider: str
-) -> Tuple[str | None, str | None]:
+def get_llm_response(task, prompt, api_key: str, model: str, provider: str) -> Tuple[str | None, str | None]:
    """Helper to get LLM completion response"""
    final_text = task + "\n" + prompt
    try:
@@ -127,11 +116,12 @@ def get_llm_response(
        if provider.lower() == "gemini":
            model = f"gemini/{model}"

-        client = OpenAI(api_key=api_key)
-        chat_completion = client.chat.completions.create(
-            model=model, messages=[{"role": "user", "content": final_text}]
+        response = litellm.completion(
+            model=model,
+            messages=[{"role": "user", "content": final_text}],
+            api_key=api_key,
        )
-        text = chat_completion.choices[0].message.content
+        text = response.choices[0].message.content.strip()
        return text, None
    except Exception as e:
        log_exception(e)
@@ -143,7 +133,6 @@ def get_llm_response(
        else:
            return None, f"Error occurred while generating response from {provider}"

-
 class GPTIntegrationEndpoint(BaseAPIView):
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id):
@@ -161,9 +150,7 @@ class GPTIntegrationEndpoint(BaseAPIView):
                {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
            )

-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
-        )
+        text, error = get_llm_response(task, request.data.get("prompt", False), api_key, model, provider)
        if not text and error:
            return Response(
                {"error": "An internal error has occurred."},
@@ -188,7 +175,7 @@ class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
    def post(self, request, slug):
        api_key, model, provider = get_llm_config()
-
+        
        if not api_key or not model or not provider:
            return Response(
                {"error": "LLM provider API key and model are required"},
@@ -201,9 +188,7 @@ class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
                {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
            )

-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
-        )
+        text, error = get_llm_response(task, request.data.get("prompt", False), api_key, model, provider)
        if not text and error:
            return Response(
                {"error": "An internal error has occurred."},
@@ -27,24 +27,16 @@ from plane.db.models import (
    Project,
    ProjectMember,
    CycleIssue,
-    IssueDescriptionVersion,
 )
 from plane.app.serializers import (
    IssueCreateSerializer,
-    IssueDetailSerializer,
+    IssueSerializer,
    IntakeSerializer,
    IntakeIssueSerializer,
    IntakeIssueDetailSerializer,
-    IssueDescriptionVersionDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.bgtasks.issue_description_version_task import issue_description_version_task
-from plane.app.views.base import BaseAPIView
-from plane.utils.timezone_converter import user_timezone_converter
-from plane.utils.global_paginator import paginate
-from plane.utils.host import base_host
-from plane.db.models.intake import SourceType


 class IntakeViewSet(BaseViewSet):
@@ -95,7 +87,7 @@ class IntakeIssueViewSet(BaseViewSet):
    serializer_class = IntakeIssueSerializer
    model = IntakeIssue

-    filterset_fields = ["status"]
+    filterset_fields = ["statulls"]

    def get_queryset(self):
        return (
@@ -182,19 +174,14 @@ class IntakeIssueViewSet(BaseViewSet):

    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
-        intake = Intake.objects.filter(
+        intake_id = Intake.objects.filter(
            workspace__slug=slug, project_id=project_id
        ).first()
-        if not intake:
-            return Response(
-                {"error": "Intake not found"}, status=status.HTTP_404_NOT_FOUND
-            )
-
        project = Project.objects.get(pk=project_id)
        filters = issue_filters(request.GET, "GET", "issue__")
        intake_issue = (
            IntakeIssue.objects.filter(
-                intake_id=intake.id, project_id=project_id, **filters
+                intake_id=intake_id.id, project_id=project_id, **filters
            )
            .select_related("issue")
            .prefetch_related("issue__labels")
@@ -226,7 +213,7 @@ class IntakeIssueViewSet(BaseViewSet):
                workspace__slug=slug,
                project_id=project_id,
                member=request.user,
-                role=ROLE.GUEST.value,
+                role=5,
                is_active=True,
            ).exists()
            and not project.guest_view_all_features
@@ -279,7 +266,7 @@ class IntakeIssueViewSet(BaseViewSet):
                intake_id=intake_id.id,
                project_id=project_id,
                issue_id=serializer.data["id"],
-                source=SourceType.IN_APP,
+                source=request.data.get("source", "IN-APP"),
            )
            # Create an Issue Activity
            issue_activity.delay(
@@ -291,16 +278,9 @@ class IntakeIssueViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
                intake=str(intake_issue.id),
            )
-            # updated issue description version
-            issue_description_version_task.delay(
-                updated_issue=json.dumps(request.data, cls=DjangoJSONEncoder),
-                issue_id=str(serializer.data["id"]),
-                user_id=request.user.id,
-                is_creating=True,
-            )
            intake_issue = (
                IntakeIssue.objects.select_related("issue")
                .prefetch_related("issue__labels", "issue__assignees")
@@ -400,15 +380,13 @@ class IntakeIssueViewSet(BaseViewSet):
                    ),
                    "description": issue_data.get("description", issue.description),
                }
-            current_instance = json.dumps(
-                IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder
-            )

            issue_serializer = IssueCreateSerializer(
-                issue, data=issue_data, partial=True, context={"project_id": project_id}
+                issue, data=issue_data, partial=True
            )

            if issue_serializer.is_valid():
+                current_instance = issue
                # Log all the updates
                requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
                if issue is not None:
@@ -418,18 +396,15 @@ class IntakeIssueViewSet(BaseViewSet):
                        actor_id=str(request.user.id),
                        issue_id=str(issue.id),
                        project_id=str(project_id),
-                        current_instance=current_instance,
+                        current_instance=json.dumps(
+                            IssueSerializer(current_instance).data,
+                            cls=DjangoJSONEncoder,
+                        ),
                        epoch=int(timezone.now().timestamp()),
                        notification=True,
-                        origin=base_host(request=request, is_app=True),
+                        origin=request.META.get("HTTP_ORIGIN"),
                        intake=str(intake_issue.id),
                    )
-                    # updated issue description version
-                    issue_description_version_task.delay(
-                        updated_issue=current_instance,
-                        issue_id=str(pk),
-                        user_id=request.user.id,
-                    )
                issue_serializer.save()
            else:
                return Response(
@@ -487,7 +462,7 @@ class IntakeIssueViewSet(BaseViewSet):
                    current_instance=current_instance,
                    epoch=int(timezone.now().timestamp()),
                    notification=False,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                    intake=(intake_issue.id),
                )

@@ -569,7 +544,7 @@ class IntakeIssueViewSet(BaseViewSet):
                workspace__slug=slug,
                project_id=project_id,
                member=request.user,
-                role=ROLE.GUEST.value,
+                role=5,
                is_active=True,
            ).exists()
            and not project.guest_view_all_features
@@ -577,7 +552,7 @@ class IntakeIssueViewSet(BaseViewSet):
        ):
            return Response(
                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
            )
        issue = IntakeIssueDetailSerializer(intake_issue).data
        return Response(issue, status=status.HTTP_200_OK)
@@ -604,80 +579,3 @@ class IntakeIssueViewSet(BaseViewSet):

        intake_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class IntakeWorkItemDescriptionVersionEndpoint(BaseAPIView):
-    def process_paginated_result(self, fields, results, timezone):
-        paginated_data = results.values(*fields)
-
-        datetime_fields = ["created_at", "updated_at"]
-        paginated_data = user_timezone_converter(
-            paginated_data, datetime_fields, timezone
-        )
-
-        return paginated_data
-
-    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, work_item_id, pk=None):
-        project = Project.objects.get(pk=project_id)
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=work_item_id
-        )
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=ROLE.GUEST.value,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        if pk:
-            issue_description_version = IssueDescriptionVersion.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=work_item_id,
-                pk=pk,
-            )
-
-            serializer = IssueDescriptionVersionDetailSerializer(
-                issue_description_version
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        cursor = request.GET.get("cursor", None)
-
-        required_fields = [
-            "id",
-            "workspace",
-            "project",
-            "issue",
-            "last_saved_at",
-            "owned_by",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-
-        issue_description_versions_queryset = IssueDescriptionVersion.objects.filter(
-            workspace__slug=slug, project_id=project_id, issue_id=work_item_id
-        )
-
-        paginated_data = paginate(
-            base_queryset=issue_description_versions_queryset,
-            queryset=issue_description_versions_queryset,
-            cursor=cursor,
-            on_result=lambda results: self.process_paginated_result(
-                required_fields, results, request.user.user_timezone
-            ),
-        )
-        return Response(paginated_data, status=status.HTTP_200_OK)
@@ -14,7 +14,7 @@ from rest_framework import status
 from .. import BaseAPIView
 from plane.app.serializers import IssueActivitySerializer, IssueCommentSerializer
 from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
-from plane.db.models import IssueActivity, IssueComment, CommentReaction, IntakeIssue
+from plane.db.models import IssueActivity, IssueComment, CommentReaction


 class IssueActivityEndpoint(BaseAPIView):
@@ -57,22 +57,13 @@ class IssueActivityEndpoint(BaseAPIView):
                )
            )
        )
+        issue_activities = IssueActivitySerializer(issue_activities, many=True).data
+        issue_comments = IssueCommentSerializer(issue_comments, many=True).data

        if request.GET.get("activity_type", None) == "issue-property":
-            issue_activities = issue_activities.prefetch_related(
-                Prefetch(
-                    "issue__issue_intake",
-                    queryset=IntakeIssue.objects.only(
-                        "source_email", "source", "extra"
-                    ),
-                    to_attr="source_data",
-                )
-            )
-            issue_activities = IssueActivitySerializer(issue_activities, many=True).data
            return Response(issue_activities, status=status.HTTP_200_OK)

        if request.GET.get("activity_type", None) == "issue-comment":
-            issue_comments = IssueCommentSerializer(issue_comments, many=True).data
            return Response(issue_comments, status=status.HTTP_200_OK)

        result_list = sorted(
@@ -37,7 +37,6 @@ from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
 from plane.app.permissions import allow_permission, ROLE
 from plane.utils.error_codes import ERROR_CODES
-from plane.utils.host import base_host

 # Module imports
 from .. import BaseViewSet, BaseAPIView
@@ -260,7 +259,7 @@ class IssueArchiveViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        issue.archived_at = timezone.now().date()
        issue.save()
@@ -288,7 +287,7 @@ class IssueArchiveViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        issue.archived_at = None
        issue.save()
@@ -334,7 +333,7 @@ class BulkArchiveIssuesEndpoint(BaseAPIView):
                ),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            issue.archived_at = timezone.now().date()
            bulk_archive_issues.append(issue)
@@ -21,7 +21,6 @@ from plane.bgtasks.issue_activities_task import issue_activity
 from plane.app.permissions import allow_permission, ROLE
 from plane.settings.storage import S3Storage
 from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
-from plane.utils.host import base_host


 class IssueAttachmentEndpoint(BaseAPIView):
@@ -49,7 +48,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
                current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -68,7 +67,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -156,7 +155,7 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -214,7 +213,7 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
                current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            # Update the attachment
@@ -45,7 +45,6 @@ from plane.db.models import (
    ProjectMember,
    CycleIssue,
    UserRecentVisit,
-    ModuleIssue,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -61,7 +60,6 @@ from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.utils.global_paginator import paginate
 from plane.bgtasks.webhook_task import model_activity
 from plane.bgtasks.issue_description_version_task import issue_description_version_task
-from plane.utils.host import base_host


 class IssueListEndpoint(BaseAPIView):
@@ -380,7 +378,7 @@ class IssueViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            issue = (
                issue_queryset_grouper(
@@ -430,7 +428,7 @@ class IssueViewSet(BaseViewSet):
                current_instance=None,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            # updated issue description version
            issue_description_version_task.delay(
@@ -549,7 +547,7 @@ class IssueViewSet(BaseViewSet):
            )

        """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
        the requesting user then dont show the issue
        """

@@ -566,7 +564,7 @@ class IssueViewSet(BaseViewSet):
        ):
            return Response(
                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
            )

        recent_visited_task.delay(
@@ -633,13 +631,11 @@ class IssueViewSet(BaseViewSet):
            )

        current_instance = json.dumps(
-            IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder
+            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )

        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueCreateSerializer(
-            issue, data=request.data, partial=True, context={"project_id": project_id}
-        )
+        serializer = IssueCreateSerializer(issue, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            issue_activity.delay(
@@ -651,7 +647,7 @@ class IssueViewSet(BaseViewSet):
                current_instance=current_instance,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            model_activity.delay(
                model_name="issue",
@@ -660,7 +656,7 @@ class IssueViewSet(BaseViewSet):
                current_instance=current_instance,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            # updated issue description version
            issue_description_version_task.delay(
@@ -692,8 +688,7 @@ class IssueViewSet(BaseViewSet):
            current_instance={},
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
-            subscriber=False,
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

@@ -741,13 +736,6 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):

        total_issues = len(issues)

-        # First, delete all related cycle issues
-        CycleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Then, delete all related module issues
-        ModuleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Finally, delete the issues themselves
        issues.delete()

        return Response(
@@ -1035,17 +1023,9 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):
        """
        Validate that start date is before target date.
        """
-        from datetime import datetime
-
        start = new_start or current_start
        target = new_target or current_target

-        # Convert string dates to datetime objects if they're strings
-        if isinstance(start, str):
-            start = datetime.strptime(start, "%Y-%m-%d").date()
-        if isinstance(target, str):
-            target = datetime.strptime(target, "%Y-%m-%d").date()
-
        if start and target and start > target:
            return False
        return True
@@ -1119,6 +1099,7 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):


 class IssueMetaEndpoint(BaseAPIView):
+
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="PROJECT")
    def get(self, request, slug, project_id, issue_id):
        issue = Issue.issue_objects.only("sequence_id", "project__identifier").get(
@@ -1134,24 +1115,13 @@ class IssueMetaEndpoint(BaseAPIView):


 class IssueDetailIdentifierEndpoint(BaseAPIView):
-    def strict_str_to_int(self, s):
-        if not s.isdigit() and not (s.startswith("-") and s[1:].isdigit()):
-            raise ValueError("Invalid integer string")
-        return int(s)

    def get(self, request, slug, project_identifier, issue_identifier):
-        # Check if the issue identifier is a valid integer
-        try:
-            issue_identifier = self.strict_str_to_int(issue_identifier)
-        except ValueError:
-            return Response(
-                {"error": "Invalid issue identifier"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
+        
        # Fetch the project
        project = Project.objects.get(
-            identifier__iexact=project_identifier, workspace__slug=slug
+            identifier__iexact=project_identifier,
+            workspace__slug=slug,
        )

        # Check if the user is a member of the project
@@ -1253,8 +1223,8 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
            .annotate(
                is_subscribed=Exists(
                    IssueSubscriber.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project.id,
+                            workspace__slug=slug,
+                            project_id=project.id,
                        issue__sequence_id=issue_identifier,
                        subscriber=request.user,
                    )
@@ -1270,7 +1240,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
            )

        """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
        the requesting user then dont show the issue
        """

@@ -1287,7 +1257,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
        ):
            return Response(
                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
            )

        recent_visited_task.delay(
@@ -17,7 +17,6 @@ from plane.app.serializers import IssueCommentSerializer, CommentReactionSeriali
 from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import IssueComment, ProjectMember, CommentReaction, Project, Issue
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.host import base_host


 class IssueCommentViewSet(BaseViewSet):
@@ -88,7 +87,7 @@ class IssueCommentViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -106,13 +105,7 @@ class IssueCommentViewSet(BaseViewSet):
            issue_comment, data=request.data, partial=True
        )
        if serializer.is_valid():
-            if (
-                "comment_html" in request.data
-                and request.data["comment_html"] != issue_comment.comment_html
-            ):
-                serializer.save(edited_at=timezone.now())
-            else:
-                serializer.save()
+            serializer.save()
            issue_activity.delay(
                type="comment.activity.updated",
                requested_data=requested_data,
@@ -122,7 +115,7 @@ class IssueCommentViewSet(BaseViewSet):
                current_instance=current_instance,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -145,7 +138,7 @@ class IssueCommentViewSet(BaseViewSet):
            current_instance=current_instance,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

@@ -189,7 +182,7 @@ class CommentReactionViewSet(BaseViewSet):
                    current_instance=None,
                    epoch=int(timezone.now().timestamp()),
                    notification=True,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -223,7 +216,7 @@ class CommentReactionViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        comment_reaction.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -15,8 +15,6 @@ from plane.app.serializers import IssueLinkSerializer
 from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import IssueLink
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.bgtasks.work_item_link_task import crawl_work_item_link_title
-from plane.utils.host import base_host


 class IssueLinkViewSet(BaseViewSet):
@@ -45,9 +43,6 @@ class IssueLinkViewSet(BaseViewSet):
        serializer = IssueLinkSerializer(data=request.data)
        if serializer.is_valid():
            serializer.save(project_id=project_id, issue_id=issue_id)
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )
            issue_activity.delay(
                type="link.activity.created",
                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
@@ -57,12 +52,8 @@ class IssueLinkViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
-
-            issue_link = self.get_queryset().get(id=serializer.data.get("id"))
-            serializer = IssueLinkSerializer(issue_link)
-
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

@@ -74,14 +65,9 @@ class IssueLinkViewSet(BaseViewSet):
        current_instance = json.dumps(
            IssueLinkSerializer(issue_link).data, cls=DjangoJSONEncoder
        )
-
        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )
-
            issue_activity.delay(
                type="link.activity.updated",
                requested_data=requested_data,
@@ -91,11 +77,8 @@ class IssueLinkViewSet(BaseViewSet):
                current_instance=current_instance,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
-            issue_link = self.get_queryset().get(id=serializer.data.get("id"))
-            serializer = IssueLinkSerializer(issue_link)
-
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

@@ -115,7 +98,7 @@ class IssueLinkViewSet(BaseViewSet):
            current_instance=current_instance,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        issue_link.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -15,7 +15,6 @@ from plane.app.serializers import IssueReactionSerializer
 from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import IssueReaction
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.host import base_host


 class IssueReactionViewSet(BaseViewSet):
@@ -54,7 +53,7 @@ class IssueReactionViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -79,7 +78,7 @@ class IssueReactionViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        issue_reaction.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -27,7 +27,6 @@ from plane.db.models import (
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_relation_mapper import get_actual_relation
-from plane.utils.host import base_host


 class IssueRelationViewSet(BaseViewSet):
@@ -254,7 +253,7 @@ class IssueRelationViewSet(BaseViewSet):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )

        if relation_type in ["blocking", "start_after", "finish_after"]:
@@ -291,6 +290,6 @@ class IssueRelationViewSet(BaseViewSet):
            current_instance=current_instance,
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -22,8 +22,6 @@ from plane.db.models import Issue, IssueLink, FileAsset, CycleIssue
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.timezone_converter import user_timezone_converter
 from collections import defaultdict
-from plane.utils.host import base_host
-from plane.utils.order_queryset import order_issue_queryset


 class SubIssuesEndpoint(BaseAPIView):
@@ -104,15 +102,6 @@ class SubIssuesEndpoint(BaseAPIView):
            .order_by("-created_at")
        )

-        # Ordering
-        order_by_param = request.GET.get("order_by", "-created_at")
-        group_by = request.GET.get("group_by", False)
-
-        if order_by_param:
-            sub_issues, order_by_param = order_issue_queryset(
-                sub_issues, order_by_param
-            )
-
        # create's a dict with state group name with their respective issue id's
        result = defaultdict(list)
        for sub_issue in sub_issues:
@@ -149,26 +138,6 @@ class SubIssuesEndpoint(BaseAPIView):
        sub_issues = user_timezone_converter(
            sub_issues, datetime_fields, request.user.user_timezone
        )
-        # Grouping
-        if group_by:
-            result_dict = defaultdict(list)
-
-            for issue in sub_issues:
-                if group_by == "assignees__ids":
-                    if issue["assignee_ids"]:
-                        assignee_ids = issue["assignee_ids"]
-                        for assignee_id in assignee_ids:
-                            result_dict[str(assignee_id)].append(issue)
-                    elif issue["assignee_ids"] == []:
-                        result_dict["None"].append(issue)
-
-                elif group_by:
-                    result_dict[str(issue[group_by])].append(issue)
-
-            return Response(
-                {"sub_issues": result_dict, "state_distribution": result},
-                status=status.HTTP_200_OK,
-            )
        return Response(
            {"sub_issues": sub_issues, "state_distribution": result},
            status=status.HTTP_200_OK,
@@ -207,7 +176,7 @@ class SubIssuesEndpoint(BaseAPIView):
                current_instance=json.dumps({"parent": str(sub_issue_id)}),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            for sub_issue_id in sub_issue_ids
        ]
@@ -3,13 +3,7 @@ from rest_framework import status
 from rest_framework.response import Response

 # Module imports
-from plane.db.models import (
-    IssueVersion,
-    IssueDescriptionVersion,
-    Project,
-    ProjectMember,
-    Issue,
-)
+from plane.db.models import IssueVersion, IssueDescriptionVersion
 from ..base import BaseAPIView
 from plane.app.serializers import (
    IssueVersionDetailSerializer,
@@ -72,7 +66,7 @@ class IssueVersionEndpoint(BaseAPIView):
        return Response(paginated_data, status=status.HTTP_200_OK)


-class WorkItemDescriptionVersionEndpoint(BaseAPIView):
+class IssueDescriptionVersionEndpoint(BaseAPIView):
    def process_paginated_result(self, fields, results, timezone):
        paginated_data = results.values(*fields)

@@ -84,34 +78,10 @@ class WorkItemDescriptionVersionEndpoint(BaseAPIView):
        return paginated_data

    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, work_item_id, pk=None):
-        project = Project.objects.get(pk=project_id)
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=work_item_id
-        )
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=ROLE.GUEST.value,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
+    def get(self, request, slug, project_id, issue_id, pk=None):
        if pk:
            issue_description_version = IssueDescriptionVersion.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=work_item_id,
-                pk=pk,
+                workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
            )

            serializer = IssueDescriptionVersionDetailSerializer(
@@ -135,8 +105,8 @@ class WorkItemDescriptionVersionEndpoint(BaseAPIView):
        ]

        issue_description_versions_queryset = IssueDescriptionVersion.objects.filter(
-            workspace__slug=slug, project_id=project_id, issue_id=work_item_id
-        ).order_by("-created_at")
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id
+        )
        paginated_data = paginate(
            base_queryset=issue_description_versions_queryset,
            queryset=issue_description_versions_queryset,
@@ -61,7 +61,6 @@ from plane.utils.timezone_converter import user_timezone_converter
 from plane.bgtasks.webhook_task import model_activity
 from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.utils.host import base_host


 class ModuleViewSet(BaseViewSet):
@@ -377,7 +376,7 @@ class ModuleViewSet(BaseViewSet):
                current_instance=None,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            datetime_fields = ["created_at", "updated_at"]
            module = user_timezone_converter(
@@ -711,31 +710,23 @@ class ModuleViewSet(BaseViewSet):

    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(self, request, slug, project_id, pk):
-        module_queryset = self.get_queryset().filter(pk=pk)
+        module = self.get_queryset().filter(pk=pk)

-        current_module = module_queryset.first()
-
-        if not current_module:
-            return Response(
-                {"error": "Module not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        if current_module.archived_at:
+        if module.first().archived_at:
            return Response(
                {"error": "Archived module cannot be updated"},
                status=status.HTTP_400_BAD_REQUEST,
            )
        current_instance = json.dumps(
-            ModuleSerializer(current_module).data, cls=DjangoJSONEncoder
+            ModuleSerializer(module.first()).data, cls=DjangoJSONEncoder
        )
        serializer = ModuleWriteSerializer(
-            current_module, data=request.data, partial=True
+            module.first(), data=request.data, partial=True
        )

        if serializer.is_valid():
            serializer.save()
-            module = module_queryset.values(
+            module = module.values(
                # Required fields
                "id",
                "workspace_id",
@@ -777,7 +768,7 @@ class ModuleViewSet(BaseViewSet):
                current_instance=current_instance,
                actor_id=request.user.id,
                slug=slug,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            datetime_fields = ["created_at", "updated_at"]
@@ -804,7 +795,7 @@ class ModuleViewSet(BaseViewSet):
                current_instance=json.dumps({"module_name": str(module.name)}),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            for issue in module_issues
        ]
@@ -34,7 +34,6 @@ from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPagina

 # Module imports
 from .. import BaseViewSet
-from plane.utils.host import base_host


 class ModuleIssueViewSet(BaseViewSet):
@@ -222,7 +221,7 @@ class ModuleIssueViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            for issue in issues
        ]
@@ -262,7 +261,7 @@ class ModuleIssueViewSet(BaseViewSet):
                    current_instance=None,
                    epoch=int(timezone.now().timestamp()),
                    notification=True,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )
                for module in modules
            ]
@@ -281,15 +280,11 @@ class ModuleIssueViewSet(BaseViewSet):
                issue_id=str(issue_id),
                project_id=str(project_id),
                current_instance=json.dumps(
-                    {
-                        "module_name": module_issue.first().module.name
-                        if (module_issue.first() and module_issue.first().module)
-                        else None
-                    }
+                    {"module_name": module_issue.first().module.name}
                ),
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )
            module_issue.delete()

@@ -314,7 +309,7 @@ class ModuleIssueViewSet(BaseViewSet):
            ),
            epoch=int(timezone.now().timestamp()),
            notification=True,
-            origin=base_host(request=request, is_app=True),
+            origin=request.META.get("HTTP_ORIGIN"),
        )
        module_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -42,7 +42,6 @@ from plane.bgtasks.page_version_task import page_version
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.bgtasks.copy_s3_object import copy_s3_objects

-
 def unarchive_archive_page_and_descendants(page_id, archived_at):
    # Your SQL query
    sql = """
@@ -199,7 +198,7 @@ class PageViewSet(BaseViewSet):
        project = Project.objects.get(pk=project_id)

        """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
        the requesting user then dont show the page
        """

@@ -573,12 +572,6 @@ class PageDuplicateEndpoint(BaseAPIView):
            pk=page_id, workspace__slug=slug, projects__id=project_id
        ).first()

-        # check for permission
-        if page.access == Page.PRIVATE_ACCESS and page.owned_by_id != request.user.id:
-            return Response(
-                {"error": "Permission denied"}, status=status.HTTP_403_FORBIDDEN
-            )
-
        # get all the project ids where page is present
        project_ids = ProjectPage.objects.filter(page_id=page_id).values_list(
            "project_id", flat=True
@@ -39,7 +39,6 @@ from plane.utils.cache import cache_response
 from plane.bgtasks.webhook_task import model_activity, webhook_activity
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.utils.exception_logger import log_exception
-from plane.utils.host import base_host


 class ProjectViewSet(BaseViewSet):
@@ -178,9 +177,7 @@ class ProjectViewSet(BaseViewSet):
            "module_view",
            "page_view",
            "inbox_view",
-            "guest_view_all_features",
            "project_lead",
-            "network",
            "created_at",
            "updated_at",
            "created_by",
@@ -275,14 +272,14 @@ class ProjectViewSet(BaseViewSet):
                states = [
                    {
                        "name": "Backlog",
-                        "color": "#60646C",
+                        "color": "#A3A3A3",
                        "sequence": 15000,
                        "group": "backlog",
                        "default": True,
                    },
                    {
                        "name": "Todo",
-                        "color": "#60646C",
+                        "color": "#3A3A3A",
                        "sequence": 25000,
                        "group": "unstarted",
                    },
@@ -294,13 +291,13 @@ class ProjectViewSet(BaseViewSet):
                    },
                    {
                        "name": "Done",
-                        "color": "#46A758",
+                        "color": "#16A34A",
                        "sequence": 45000,
                        "group": "completed",
                    },
                    {
                        "name": "Cancelled",
-                        "color": "#9AA4BC",
+                        "color": "#EF4444",
                        "sequence": 55000,
                        "group": "cancelled",
                    },
@@ -332,7 +329,7 @@ class ProjectViewSet(BaseViewSet):
                    current_instance=None,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )

                serializer = ProjectListSerializer(project)
@@ -342,7 +339,7 @@ class ProjectViewSet(BaseViewSet):
            if "already exists" in str(e):
                return Response(
                    {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )
        except Workspace.DoesNotExist:
            return Response(
@@ -351,7 +348,7 @@ class ProjectViewSet(BaseViewSet):
        except serializers.ValidationError:
            return Response(
                {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
            )

    def partial_update(self, request, slug, pk=None):
@@ -410,7 +407,7 @@ class ProjectViewSet(BaseViewSet):
                    current_instance=current_instance,
                    actor_id=request.user.id,
                    slug=slug,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )
                serializer = ProjectListSerializer(project)
                return Response(serializer.data, status=status.HTTP_200_OK)
@@ -420,7 +417,7 @@ class ProjectViewSet(BaseViewSet):
            if "already exists" in str(e):
                return Response(
                    {"name": "The project name is already taken"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )
        except (Project.DoesNotExist, Workspace.DoesNotExist):
            return Response(
@@ -429,7 +426,7 @@ class ProjectViewSet(BaseViewSet):
        except serializers.ValidationError:
            return Response(
                {"identifier": "The project identifier is already taken"},
-                status=status.HTTP_409_CONFLICT,
+                status=status.HTTP_410_GONE,
            )

    def destroy(self, request, slug, pk):
@@ -445,7 +442,7 @@ class ProjectViewSet(BaseViewSet):
                is_active=True,
            ).exists()
        ):
-            project = Project.objects.get(pk=pk, workspace__slug=slug)
+            project = Project.objects.get(pk=pk)
            project.delete()
            webhook_activity.delay(
                event="project",
@@ -455,7 +452,7 @@ class ProjectViewSet(BaseViewSet):
                new_value=None,
                actor_id=request.user.id,
                slug=slug,
-                current_site=base_host(request=request, is_app=True),
+                current_site=request.META.get("HTTP_ORIGIN"),
                event_id=project.id,
                old_identifier=None,
                new_identifier=None,
@@ -16,18 +16,17 @@ from rest_framework.permissions import AllowAny
 # Module imports
 from .base import BaseViewSet, BaseAPIView
 from plane.app.serializers import ProjectMemberInviteSerializer
+
 from plane.app.permissions import allow_permission, ROLE
+
 from plane.db.models import (
    ProjectMember,
    Workspace,
    ProjectMemberInvite,
    User,
    WorkspaceMember,
-    Project,
    IssueUserProperty,
 )
-from plane.db.models.project import ProjectNetwork
-from plane.utils.host import base_host


 class ProjectInvitationsViewset(BaseViewSet):
@@ -100,7 +99,7 @@ class ProjectInvitationsViewset(BaseViewSet):
        project_invitations = ProjectMemberInvite.objects.bulk_create(
            project_invitations, batch_size=10, ignore_conflicts=True
        )
-        current_site = base_host(request=request, is_app=True)
+        current_site = request.META.get("HTTP_ORIGIN")

        # Send invitations
        for invitation in project_invitations:
@@ -129,7 +128,6 @@ class UserProjectInvitationsViewset(BaseViewSet):
            .select_related("workspace", "workspace__owner", "project")
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
    def create(self, request, slug):
        project_ids = request.data.get("project_ids", [])

@@ -138,20 +136,11 @@ class UserProjectInvitationsViewset(BaseViewSet):
            member=request.user, workspace__slug=slug, is_active=True
        )

-        # Get all the projects
-        projects = Project.objects.filter(
-            id__in=project_ids, workspace__slug=slug
-        ).only("id", "network")
-        # Check if user has permission to join each project
-        for project in projects:
-            if (
-                project.network == ProjectNetwork.SECRET.value
-                and workspace_member.role != ROLE.ADMIN.value
-            ):
-                return Response(
-                    {"error": "Only workspace admins can join private project"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
+        if workspace_member.role not in [ROLE.ADMIN.value, ROLE.MEMBER.value]:
+            return Response(
+                {"error": "You do not have permission to join the project"},
+                status=status.HTTP_403_FORBIDDEN,
+            )

        workspace_role = workspace_member.role
        workspace = workspace_member.workspace
@@ -10,7 +10,11 @@ from plane.app.serializers import (
    ProjectMemberRoleSerializer,
 )

-from plane.app.permissions import WorkspaceUserPermission
+from plane.app.permissions import (
+    ProjectMemberPermission,
+    ProjectLitePermission,
+    WorkspaceUserPermission,
+)

 from plane.db.models import Project, ProjectMember, IssueUserProperty, WorkspaceMember
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
@@ -22,6 +26,14 @@ class ProjectMemberViewSet(BaseViewSet):
    serializer_class = ProjectMemberAdminSerializer
    model = ProjectMember

+    def get_permissions(self):
+        if self.action == "leave":
+            self.permission_classes = [ProjectLitePermission]
+        else:
+            self.permission_classes = [ProjectMemberPermission]
+
+        return super(ProjectMemberViewSet, self).get_permissions()
+
    search_fields = ["member__display_name", "member__first_name"]

    def get_queryset(self):
@@ -168,8 +180,6 @@ class ProjectMemberViewSet(BaseViewSet):
            workspace__slug=slug,
            member__is_bot=False,
            is_active=True,
-            member__member_workspace__workspace__slug=slug,
-            member__member_workspace__is_active=True,
        ).select_related("project", "member", "workspace")

        serializer = ProjectMemberRoleSerializer(
@@ -177,20 +187,12 @@ class ProjectMemberViewSet(BaseViewSet):
        )
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN])
    def partial_update(self, request, slug, project_id, pk):
        project_member = ProjectMember.objects.get(
            pk=pk, workspace__slug=slug, project_id=project_id, is_active=True
        )
-
-        # Fetch the workspace role of the project member
-        workspace_role = WorkspaceMember.objects.get(
-            workspace__slug=slug, member=project_member.member, is_active=True
-        ).role
-        is_workspace_admin = workspace_role == ROLE.ADMIN.value
-
-        # Check if the user is not editing their own role if they are not an admin
-        if request.user.id == project_member.member_id and not is_workspace_admin:
+        if request.user.id == project_member.member_id:
            return Response(
                {"error": "You cannot update your own role"},
                status=status.HTTP_400_BAD_REQUEST,
@@ -203,6 +205,9 @@ class ProjectMemberViewSet(BaseViewSet):
            is_active=True,
        )

+        workspace_role = WorkspaceMember.objects.get(
+            workspace__slug=slug, member=project_member.member, is_active=True
+        ).role
        if workspace_role in [5] and int(
            request.data.get("role", project_member.role)
        ) in [15, 20]:
@@ -217,7 +222,6 @@ class ProjectMemberViewSet(BaseViewSet):
            "role" in request.data
            and int(request.data.get("role", project_member.role))
            > requested_project_member.role
-            and not is_workspace_admin
        ):
            return Response(
                {"error": "You cannot update a role that is higher than your own role"},
@@ -315,11 +319,7 @@ class UserProjectRolesEndpoint(BaseAPIView):

    def get(self, request, slug):
        project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=request.user.id,
-            is_active=True,
-            member__member_workspace__workspace__slug=slug,
-            member__member_workspace__is_active=True,
+            workspace__slug=slug, member_id=request.user.id, is_active=True
        ).values("project_id", "role")

        project_members = {
@@ -1,5 +1,5 @@
 # Django imports
-from django.db.models import Q, QuerySet
+from django.db.models import Q

 # Third party imports
 from rest_framework import status
@@ -12,95 +12,6 @@ from plane.utils.issue_search import search_issues


 class IssueSearchEndpoint(BaseAPIView):
-    def filter_issues_by_project(self, project_id: int, issues: QuerySet) -> QuerySet:
-        """
-        Filter issues by project
-        """
-
-        issues = issues.filter(project_id=project_id)
-
-        return issues
-
-    def search_issues_by_query(self, query: str, issues: QuerySet) -> QuerySet:
-        """
-        Search issues by query
-        """
-
-        issues = search_issues(query, issues)
-
-        return issues
-
-    def search_issues_and_excluding_parent(
-        self, issues: QuerySet, issue_id: str
-    ) -> QuerySet:
-        """
-        Search issues and epics by query excluding the parent
-        """
-
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        if issue:
-            issues = issues.filter(
-                ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id)
-            )
-        return issues
-
-    def filter_issues_excluding_related_issues(
-        self, issue_id: str, issues: QuerySet
-    ) -> QuerySet:
-        """
-        Filter issues excluding related issues
-        """
-
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        related_issue_ids = (
-            IssueRelation.objects.filter(Q(related_issue=issue) | Q(issue=issue))
-            .values_list("issue_id", "related_issue_id")
-            .distinct()
-        )
-
-        related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
-
-        if issue:
-            issues = issues.filter(~Q(pk=issue_id), ~Q(pk__in=related_issue_ids))
-
-        return issues
-
-    def filter_root_issues_only(self, issue_id: str, issues: QuerySet) -> QuerySet:
-        """
-        Filter root issues only
-        """
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        if issue:
-            issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
-        if issue.parent:
-            issues = issues.filter(~Q(pk=issue.parent_id))
-        return issues
-
-    def exclude_issues_in_cycles(self, issues: QuerySet) -> QuerySet:
-        """
-        Exclude issues in cycles
-        """
-        issues = issues.exclude(
-            Q(issue_cycle__isnull=False) & Q(issue_cycle__deleted_at__isnull=True)
-        )
-        return issues
-
-    def exclude_issues_in_module(self, issues: QuerySet, module: str) -> QuerySet:
-        """
-        Exclude issues in a module
-        """
-        issues = issues.exclude(
-            Q(issue_module__module=module) & Q(issue_module__deleted_at__isnull=True)
-        )
-        return issues
-
-    def filter_issues_without_target_date(self, issues: QuerySet) -> QuerySet:
-        """
-        Filter issues without a target date
-        """
-        issues = issues.filter(target_date__isnull=True)
-        return issues
-
    def get(self, request, slug, project_id):
        query = request.query_params.get("search", False)
        workspace_search = request.query_params.get("workspace_search", "false")
@@ -110,6 +21,7 @@ class IssueSearchEndpoint(BaseAPIView):
        module = request.query_params.get("module", False)
        sub_issue = request.query_params.get("sub_issue", "false")
        target_date = request.query_params.get("target_date", True)
+
        issue_id = request.query_params.get("issue_id", False)

        issues = Issue.issue_objects.filter(
@@ -120,28 +32,52 @@ class IssueSearchEndpoint(BaseAPIView):
        )

        if workspace_search == "false":
-            issues = self.filter_issues_by_project(project_id, issues)
+            issues = issues.filter(project_id=project_id)

        if query:
-            issues = self.search_issues_by_query(query, issues)
+            issues = search_issues(query, issues)

        if parent == "true" and issue_id:
-            issues = self.search_issues_and_excluding_parent(issues, issue_id)
-
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            if issue:
+                issues = issues.filter(
+                    ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id)
+                )
        if issue_relation == "true" and issue_id:
-            issues = self.filter_issues_excluding_related_issues(issue_id, issues)
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            related_issue_ids = IssueRelation.objects.filter(
+                Q(related_issue=issue) | Q(issue=issue)
+            ).values_list(
+                "issue_id", "related_issue_id"
+            ).distinct()

+            related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
+
+            if issue:
+                issues = issues.filter(
+                    ~Q(pk=issue_id),
+                    ~Q(pk__in=related_issue_ids),
+                )
        if sub_issue == "true" and issue_id:
-            issues = self.filter_root_issues_only(issue_id, issues)
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            if issue:
+                issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
+            if issue.parent:
+                issues = issues.filter(~Q(pk=issue.parent_id))

        if cycle == "true":
-            issues = self.exclude_issues_in_cycles(issues)
+            issues = issues.exclude(
+                Q(issue_cycle__isnull=False) & Q(issue_cycle__deleted_at__isnull=True)
+            )

        if module:
-            issues = self.exclude_issues_in_module(issues, module)
+            issues = issues.exclude(
+                Q(issue_module__module=module)
+                & Q(issue_module__deleted_at__isnull=True)
+            )

        if target_date == "none":
-            issues = self.filter_issues_without_target_date(issues)
+            issues = issues.filter(target_date__isnull=True)

        if ProjectMember.objects.filter(
            project_id=project_id, member=self.request.user, is_active=True, role=5
@@ -1,6 +1,5 @@
 # Python imports
 from itertools import groupby
-from collections import defaultdict

 # Django imports
 from django.db.utils import IntegrityError
@@ -75,19 +74,7 @@ class StateViewSet(BaseViewSet):
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        states = StateSerializer(self.get_queryset(), many=True).data
-
-        grouped_states = defaultdict(list)
-        for state in states:
-            grouped_states[state["group"]].append(state)
-
-        for group, group_states in grouped_states.items():
-            count = len(group_states)
-
-            for index, state in enumerate(group_states, start=1):
-                state["order"] = index / count
-
        grouped = request.GET.get("grouped", False)
-
        if grouped == "true":
            state_dict = {}
            for key, value in groupby(
@@ -96,7 +83,6 @@ class StateViewSet(BaseViewSet):
            ):
                state_dict[str(key)] = list(value)
            return Response(state_dict, status=status.HTTP_200_OK)
-
        return Response(states, status=status.HTTP_200_OK)

    @invalidate_cache(path="workspaces/:slug/states/", url_params=True, user=False)
@@ -21,187 +21,221 @@ class TimezoneEndpoint(APIView):

    throttle_classes = [AuthenticationThrottle]

-    @method_decorator(cache_page(60 * 60 * 2))
+    @method_decorator(cache_page(60 * 60 * 24))
    def get(self, request):
-        timezone_locations = [
-            ("Midway Island", "Pacific/Midway"),  # UTC-11:00
-            ("American Samoa", "Pacific/Pago_Pago"),  # UTC-11:00
-            ("Hawaii", "Pacific/Honolulu"),  # UTC-10:00
-            ("Aleutian Islands", "America/Adak"),  # UTC-10:00 (DST: UTC-09:00)
-            ("Marquesas Islands", "Pacific/Marquesas"),  # UTC-09:30
-            ("Alaska", "America/Anchorage"),  # UTC-09:00 (DST: UTC-08:00)
-            ("Gambier Islands", "Pacific/Gambier"),  # UTC-09:00
-            (
-                "Pacific Time (US and Canada)",
-                "America/Los_Angeles",
-            ),  # UTC-08:00 (DST: UTC-07:00)
-            ("Baja California", "America/Tijuana"),  # UTC-08:00 (DST: UTC-07:00)
-            (
-                "Mountain Time (US and Canada)",
-                "America/Denver",
-            ),  # UTC-07:00 (DST: UTC-06:00)
-            ("Arizona", "America/Phoenix"),  # UTC-07:00
-            ("Chihuahua, Mazatlan", "America/Chihuahua"),  # UTC-07:00 (DST: UTC-06:00)
-            (
-                "Central Time (US and Canada)",
-                "America/Chicago",
-            ),  # UTC-06:00 (DST: UTC-05:00)
-            ("Saskatchewan", "America/Regina"),  # UTC-06:00
-            (
-                "Guadalajara, Mexico City, Monterrey",
-                "America/Mexico_City",
-            ),  # UTC-06:00 (DST: UTC-05:00)
-            ("Tegucigalpa, Honduras", "America/Tegucigalpa"),  # UTC-06:00
-            ("Costa Rica", "America/Costa_Rica"),  # UTC-06:00
-            (
-                "Eastern Time (US and Canada)",
-                "America/New_York",
-            ),  # UTC-05:00 (DST: UTC-04:00)
-            ("Lima", "America/Lima"),  # UTC-05:00
-            ("Bogota", "America/Bogota"),  # UTC-05:00
-            ("Quito", "America/Guayaquil"),  # UTC-05:00
-            ("Chetumal", "America/Cancun"),  # UTC-05:00 (DST: UTC-04:00)
-            ("Caracas (Old Venezuela Time)", "America/Caracas"),  # UTC-04:30
-            ("Atlantic Time (Canada)", "America/Halifax"),  # UTC-04:00 (DST: UTC-03:00)
-            ("Caracas", "America/Caracas"),  # UTC-04:00
-            ("Santiago", "America/Santiago"),  # UTC-04:00 (DST: UTC-03:00)
-            ("La Paz", "America/La_Paz"),  # UTC-04:00
-            ("Manaus", "America/Manaus"),  # UTC-04:00
-            ("Georgetown", "America/Guyana"),  # UTC-04:00
-            ("Bermuda", "Atlantic/Bermuda"),  # UTC-04:00 (DST: UTC-03:00)
-            (
-                "Newfoundland Time (Canada)",
-                "America/St_Johns",
-            ),  # UTC-03:30 (DST: UTC-02:30)
-            ("Buenos Aires", "America/Argentina/Buenos_Aires"),  # UTC-03:00
-            ("Brasilia", "America/Sao_Paulo"),  # UTC-03:00
-            ("Greenland", "America/Godthab"),  # UTC-03:00 (DST: UTC-02:00)
-            ("Montevideo", "America/Montevideo"),  # UTC-03:00
-            ("Falkland Islands", "Atlantic/Stanley"),  # UTC-03:00
-            (
-                "South Georgia and the South Sandwich Islands",
-                "Atlantic/South_Georgia",
-            ),  # UTC-02:00
-            ("Azores", "Atlantic/Azores"),  # UTC-01:00 (DST: UTC+00:00)
-            ("Cape Verde Islands", "Atlantic/Cape_Verde"),  # UTC-01:00
-            ("Dublin", "Europe/Dublin"),  # UTC+00:00 (DST: UTC+01:00)
-            ("Reykjavik", "Atlantic/Reykjavik"),  # UTC+00:00
-            ("Lisbon", "Europe/Lisbon"),  # UTC+00:00 (DST: UTC+01:00)
-            ("Monrovia", "Africa/Monrovia"),  # UTC+00:00
-            ("Casablanca", "Africa/Casablanca"),  # UTC+00:00 (DST: UTC+01:00)
-            (
-                "Central European Time (Berlin, Rome, Paris)",
-                "Europe/Paris",
-            ),  # UTC+01:00 (DST: UTC+02:00)
-            ("West Central Africa", "Africa/Lagos"),  # UTC+01:00
-            ("Algiers", "Africa/Algiers"),  # UTC+01:00
-            ("Lagos", "Africa/Lagos"),  # UTC+01:00
-            ("Tunis", "Africa/Tunis"),  # UTC+01:00
-            (
-                "Eastern European Time (Cairo, Helsinki, Kyiv)",
-                "Europe/Kiev",
-            ),  # UTC+02:00 (DST: UTC+03:00)
-            ("Athens", "Europe/Athens"),  # UTC+02:00 (DST: UTC+03:00)
-            ("Jerusalem", "Asia/Jerusalem"),  # UTC+02:00 (DST: UTC+03:00)
-            ("Johannesburg", "Africa/Johannesburg"),  # UTC+02:00
-            ("Harare, Pretoria", "Africa/Harare"),  # UTC+02:00
-            ("Moscow Time", "Europe/Moscow"),  # UTC+03:00
-            ("Baghdad", "Asia/Baghdad"),  # UTC+03:00
-            ("Nairobi", "Africa/Nairobi"),  # UTC+03:00
-            ("Kuwait, Riyadh", "Asia/Riyadh"),  # UTC+03:00
-            ("Tehran", "Asia/Tehran"),  # UTC+03:30 (DST: UTC+04:30)
-            ("Abu Dhabi", "Asia/Dubai"),  # UTC+04:00
-            ("Baku", "Asia/Baku"),  # UTC+04:00 (DST: UTC+05:00)
-            ("Yerevan", "Asia/Yerevan"),  # UTC+04:00 (DST: UTC+05:00)
-            ("Astrakhan", "Europe/Astrakhan"),  # UTC+04:00
-            ("Tbilisi", "Asia/Tbilisi"),  # UTC+04:00
-            ("Mauritius", "Indian/Mauritius"),  # UTC+04:00
-            ("Islamabad", "Asia/Karachi"),  # UTC+05:00
-            ("Karachi", "Asia/Karachi"),  # UTC+05:00
-            ("Tashkent", "Asia/Tashkent"),  # UTC+05:00
-            ("Yekaterinburg", "Asia/Yekaterinburg"),  # UTC+05:00
-            ("Maldives", "Indian/Maldives"),  # UTC+05:00
-            ("Chagos", "Indian/Chagos"),  # UTC+05:00
-            ("Chennai", "Asia/Kolkata"),  # UTC+05:30
-            ("Kolkata", "Asia/Kolkata"),  # UTC+05:30
-            ("Mumbai", "Asia/Kolkata"),  # UTC+05:30
-            ("New Delhi", "Asia/Kolkata"),  # UTC+05:30
-            ("Sri Jayawardenepura", "Asia/Colombo"),  # UTC+05:30
-            ("Kathmandu", "Asia/Kathmandu"),  # UTC+05:45
-            ("Dhaka", "Asia/Dhaka"),  # UTC+06:00
-            ("Almaty", "Asia/Almaty"),  # UTC+06:00
-            ("Bishkek", "Asia/Bishkek"),  # UTC+06:00
-            ("Thimphu", "Asia/Thimphu"),  # UTC+06:00
-            ("Yangon (Rangoon)", "Asia/Yangon"),  # UTC+06:30
-            ("Cocos Islands", "Indian/Cocos"),  # UTC+06:30
-            ("Bangkok", "Asia/Bangkok"),  # UTC+07:00
-            ("Hanoi", "Asia/Ho_Chi_Minh"),  # UTC+07:00
-            ("Jakarta", "Asia/Jakarta"),  # UTC+07:00
-            ("Novosibirsk", "Asia/Novosibirsk"),  # UTC+07:00
-            ("Krasnoyarsk", "Asia/Krasnoyarsk"),  # UTC+07:00
-            ("Beijing", "Asia/Shanghai"),  # UTC+08:00
-            ("Singapore", "Asia/Singapore"),  # UTC+08:00
-            ("Perth", "Australia/Perth"),  # UTC+08:00
-            ("Hong Kong", "Asia/Hong_Kong"),  # UTC+08:00
-            ("Ulaanbaatar", "Asia/Ulaanbaatar"),  # UTC+08:00
-            ("Palau", "Pacific/Palau"),  # UTC+08:00
-            ("Eucla", "Australia/Eucla"),  # UTC+08:45
-            ("Tokyo", "Asia/Tokyo"),  # UTC+09:00
-            ("Seoul", "Asia/Seoul"),  # UTC+09:00
-            ("Yakutsk", "Asia/Yakutsk"),  # UTC+09:00
-            ("Adelaide", "Australia/Adelaide"),  # UTC+09:30 (DST: UTC+10:30)
-            ("Darwin", "Australia/Darwin"),  # UTC+09:30
-            ("Sydney", "Australia/Sydney"),  # UTC+10:00 (DST: UTC+11:00)
-            ("Brisbane", "Australia/Brisbane"),  # UTC+10:00
-            ("Guam", "Pacific/Guam"),  # UTC+10:00
-            ("Vladivostok", "Asia/Vladivostok"),  # UTC+10:00
-            ("Tahiti", "Pacific/Tahiti"),  # UTC+10:00
-            ("Lord Howe Island", "Australia/Lord_Howe"),  # UTC+10:30 (DST: UTC+11:00)
-            ("Solomon Islands", "Pacific/Guadalcanal"),  # UTC+11:00
-            ("Magadan", "Asia/Magadan"),  # UTC+11:00
-            ("Norfolk Island", "Pacific/Norfolk"),  # UTC+11:00
-            ("Bougainville Island", "Pacific/Bougainville"),  # UTC+11:00
-            ("Chokurdakh", "Asia/Srednekolymsk"),  # UTC+11:00
-            ("Auckland", "Pacific/Auckland"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Wellington", "Pacific/Auckland"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Fiji Islands", "Pacific/Fiji"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Anadyr", "Asia/Anadyr"),  # UTC+12:00
-            ("Chatham Islands", "Pacific/Chatham"),  # UTC+12:45 (DST: UTC+13:45)
-            ("Nuku'alofa", "Pacific/Tongatapu"),  # UTC+13:00
-            ("Samoa", "Pacific/Apia"),  # UTC+13:00 (DST: UTC+14:00)
-            ("Kiritimati Island", "Pacific/Kiritimati"),  # UTC+14:00
-        ]
+        timezone_mapping = {
+            "-1100": [
+                ("Midway Island", "Pacific/Midway"),
+                ("American Samoa", "Pacific/Pago_Pago"),
+            ],
+            "-1000": [
+                ("Hawaii", "Pacific/Honolulu"),
+                ("Aleutian Islands", "America/Adak"),
+            ],
+            "-0930": [("Marquesas Islands", "Pacific/Marquesas")],
+            "-0900": [
+                ("Alaska", "America/Anchorage"),
+                ("Gambier Islands", "Pacific/Gambier"),
+            ],
+            "-0800": [
+                ("Pacific Time (US and Canada)", "America/Los_Angeles"),
+                ("Baja California", "America/Tijuana"),
+            ],
+            "-0700": [
+                ("Mountain Time (US and Canada)", "America/Denver"),
+                ("Arizona", "America/Phoenix"),
+                ("Chihuahua, Mazatlan", "America/Chihuahua"),
+            ],
+            "-0600": [
+                ("Central Time (US and Canada)", "America/Chicago"),
+                ("Saskatchewan", "America/Regina"),
+                ("Guadalajara, Mexico City, Monterrey", "America/Mexico_City"),
+                ("Tegucigalpa, Honduras", "America/Tegucigalpa"),
+                ("Costa Rica", "America/Costa_Rica"),
+            ],
+            "-0500": [
+                ("Eastern Time (US and Canada)", "America/New_York"),
+                ("Lima", "America/Lima"),
+                ("Bogota", "America/Bogota"),
+                ("Quito", "America/Guayaquil"),
+                ("Chetumal", "America/Cancun"),
+            ],
+            "-0430": [("Caracas (Old Venezuela Time)", "America/Caracas")],
+            "-0400": [
+                ("Atlantic Time (Canada)", "America/Halifax"),
+                ("Caracas", "America/Caracas"),
+                ("Santiago", "America/Santiago"),
+                ("La Paz", "America/La_Paz"),
+                ("Manaus", "America/Manaus"),
+                ("Georgetown", "America/Guyana"),
+                ("Bermuda", "Atlantic/Bermuda"),
+            ],
+            "-0330": [("Newfoundland Time (Canada)", "America/St_Johns")],
+            "-0300": [
+                ("Buenos Aires", "America/Argentina/Buenos_Aires"),
+                ("Brasilia", "America/Sao_Paulo"),
+                ("Greenland", "America/Godthab"),
+                ("Montevideo", "America/Montevideo"),
+                ("Falkland Islands", "Atlantic/Stanley"),
+            ],
+            "-0200": [
+                (
+                    "South Georgia and the South Sandwich Islands",
+                    "Atlantic/South_Georgia",
+                )
+            ],
+            "-0100": [
+                ("Azores", "Atlantic/Azores"),
+                ("Cape Verde Islands", "Atlantic/Cape_Verde"),
+            ],
+            "+0000": [
+                ("Dublin", "Europe/Dublin"),
+                ("Reykjavik", "Atlantic/Reykjavik"),
+                ("Lisbon", "Europe/Lisbon"),
+                ("Monrovia", "Africa/Monrovia"),
+                ("Casablanca", "Africa/Casablanca"),
+            ],
+            "+0100": [
+                ("Central European Time (Berlin, Rome, Paris)", "Europe/Paris"),
+                ("West Central Africa", "Africa/Lagos"),
+                ("Algiers", "Africa/Algiers"),
+                ("Lagos", "Africa/Lagos"),
+                ("Tunis", "Africa/Tunis"),
+            ],
+            "+0200": [
+                ("Eastern European Time (Cairo, Helsinki, Kyiv)", "Europe/Kiev"),
+                ("Athens", "Europe/Athens"),
+                ("Jerusalem", "Asia/Jerusalem"),
+                ("Johannesburg", "Africa/Johannesburg"),
+                ("Harare, Pretoria", "Africa/Harare"),
+            ],
+            "+0300": [
+                ("Moscow Time", "Europe/Moscow"),
+                ("Baghdad", "Asia/Baghdad"),
+                ("Nairobi", "Africa/Nairobi"),
+                ("Kuwait, Riyadh", "Asia/Riyadh"),
+            ],
+            "+0330": [("Tehran", "Asia/Tehran")],
+            "+0400": [
+                ("Abu Dhabi", "Asia/Dubai"),
+                ("Baku", "Asia/Baku"),
+                ("Yerevan", "Asia/Yerevan"),
+                ("Astrakhan", "Europe/Astrakhan"),
+                ("Tbilisi", "Asia/Tbilisi"),
+                ("Mauritius", "Indian/Mauritius"),
+            ],
+            "+0500": [
+                ("Islamabad", "Asia/Karachi"),
+                ("Karachi", "Asia/Karachi"),
+                ("Tashkent", "Asia/Tashkent"),
+                ("Yekaterinburg", "Asia/Yekaterinburg"),
+                ("Maldives", "Indian/Maldives"),
+                ("Chagos", "Indian/Chagos"),
+            ],
+            "+0530": [
+                ("Chennai", "Asia/Kolkata"),
+                ("Kolkata", "Asia/Kolkata"),
+                ("Mumbai", "Asia/Kolkata"),
+                ("New Delhi", "Asia/Kolkata"),
+                ("Sri Jayawardenepura", "Asia/Colombo"),
+            ],
+            "+0545": [("Kathmandu", "Asia/Kathmandu")],
+            "+0600": [
+                ("Dhaka", "Asia/Dhaka"),
+                ("Almaty", "Asia/Almaty"),
+                ("Bishkek", "Asia/Bishkek"),
+                ("Thimphu", "Asia/Thimphu"),
+            ],
+            "+0630": [
+                ("Yangon (Rangoon)", "Asia/Yangon"),
+                ("Cocos Islands", "Indian/Cocos"),
+            ],
+            "+0700": [
+                ("Bangkok", "Asia/Bangkok"),
+                ("Hanoi", "Asia/Ho_Chi_Minh"),
+                ("Jakarta", "Asia/Jakarta"),
+                ("Novosibirsk", "Asia/Novosibirsk"),
+                ("Krasnoyarsk", "Asia/Krasnoyarsk"),
+            ],
+            "+0800": [
+                ("Beijing", "Asia/Shanghai"),
+                ("Singapore", "Asia/Singapore"),
+                ("Perth", "Australia/Perth"),
+                ("Hong Kong", "Asia/Hong_Kong"),
+                ("Ulaanbaatar", "Asia/Ulaanbaatar"),
+                ("Palau", "Pacific/Palau"),
+            ],
+            "+0845": [("Eucla", "Australia/Eucla")],
+            "+0900": [
+                ("Tokyo", "Asia/Tokyo"),
+                ("Seoul", "Asia/Seoul"),
+                ("Yakutsk", "Asia/Yakutsk"),
+            ],
+            "+0930": [
+                ("Adelaide", "Australia/Adelaide"),
+                ("Darwin", "Australia/Darwin"),
+            ],
+            "+1000": [
+                ("Sydney", "Australia/Sydney"),
+                ("Brisbane", "Australia/Brisbane"),
+                ("Guam", "Pacific/Guam"),
+                ("Vladivostok", "Asia/Vladivostok"),
+                ("Tahiti", "Pacific/Tahiti"),
+            ],
+            "+1030": [("Lord Howe Island", "Australia/Lord_Howe")],
+            "+1100": [
+                ("Solomon Islands", "Pacific/Guadalcanal"),
+                ("Magadan", "Asia/Magadan"),
+                ("Norfolk Island", "Pacific/Norfolk"),
+                ("Bougainville Island", "Pacific/Bougainville"),
+                ("Chokurdakh", "Asia/Srednekolymsk"),
+            ],
+            "+1200": [
+                ("Auckland", "Pacific/Auckland"),
+                ("Wellington", "Pacific/Auckland"),
+                ("Fiji Islands", "Pacific/Fiji"),
+                ("Anadyr", "Asia/Anadyr"),
+            ],
+            "+1245": [("Chatham Islands", "Pacific/Chatham")],
+            "+1300": [("Nuku'alofa", "Pacific/Tongatapu"), ("Samoa", "Pacific/Apia")],
+            "+1400": [("Kiritimati Island", "Pacific/Kiritimati")],
+        }

        timezone_list = []
        now = datetime.now()

        # Process timezone mapping
-        for friendly_name, tz_identifier in timezone_locations:
-            try:
-                tz = pytz.timezone(tz_identifier)
-                current_offset = now.astimezone(tz).strftime("%z")
+        for offset, locations in timezone_mapping.items():
+            sign = "-" if offset.startswith("-") else "+"
+            hours = offset[1:3]
+            minutes = offset[3:] if len(offset) > 3 else "00"

-                # converting and formatting UTC offset to GMT offset
-                current_utc_offset = now.astimezone(tz).utcoffset()
-                total_seconds = int(current_utc_offset.total_seconds())
-                hours_offset = total_seconds // 3600
-                minutes_offset = abs(total_seconds % 3600) // 60
-                offset = (
-                    f"{'+' if hours_offset >= 0 else '-'}"
-                    f"{abs(hours_offset):02}:{minutes_offset:02}"
-                )
+            for friendly_name, tz_identifier in locations:
+                try:
+                    tz = pytz.timezone(tz_identifier)
+                    current_offset = now.astimezone(tz).strftime("%z")

-                timezone_value = {
-                    "offset": int(current_offset),
-                    "utc_offset": f"UTC{offset}",
-                    "gmt_offset": f"GMT{offset}",
-                    "value": tz_identifier,
-                    "label": f"{friendly_name}",
-                }
+                    # converting and formatting UTC offset to GMT offset
+                    current_utc_offset = now.astimezone(tz).utcoffset()
+                    total_seconds = int(current_utc_offset.total_seconds())
+                    hours_offset = total_seconds // 3600
+                    minutes_offset = abs(total_seconds % 3600) // 60
+                    gmt_offset = (
+                        f"GMT{'+' if hours_offset >= 0 else '-'}"
+                        f"{abs(hours_offset):02}:{minutes_offset:02}"
+                    )

-                timezone_list.append(timezone_value)
-            except pytz.exceptions.UnknownTimeZoneError:
-                continue
+                    timezone_value = {
+                        "offset": int(current_offset),
+                        "utc_offset": f"UTC{sign}{hours}:{minutes}",
+                        "gmt_offset": gmt_offset,
+                        "value": tz_identifier,
+                        "label": f"{friendly_name}",
+                    }
+
+                    timezone_list.append(timezone_value)
+                except pytz.exceptions.UnknownTimeZoneError:
+                    continue

        # Sort by offset and then by label
        timezone_list.sort(key=lambda x: (x["offset"], x["label"]))
@@ -117,7 +117,7 @@ class WorkspaceViewViewSet(BaseViewSet):
        return Response(serializer.data, status=status.HTTP_200_OK)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN], level="WORKSPACE", creator=True, model=IssueView
+        allowed_roles=[], level="WORKSPACE", creator=True, model=IssueView
    )
    def destroy(self, request, slug, pk):
        workspace_view = IssueView.objects.get(pk=pk, workspace__slug=slug)
@@ -432,7 +432,7 @@ class IssueViewViewSet(BaseViewSet):
        ):
            return Response(
                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
+                status=status.HTTP_400_BAD_REQUEST,
            )

        serializer = IssueViewSerializer(issue_view)
@@ -29,7 +29,7 @@ class WebhookEndpoint(BaseAPIView):
            if "already exists" in str(e):
                return Response(
                    {"error": "URL already exists for the workspace"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )
            raise IntegrityError

@@ -3,7 +3,6 @@ import csv
 import io
 import os
 from datetime import date
-import uuid

 from dateutil.relativedelta import relativedelta
 from django.db import IntegrityError
@@ -36,7 +35,6 @@ from plane.db.models import (
    Workspace,
    WorkspaceMember,
    WorkspaceTheme,
-    Profile,
 )
 from plane.app.permissions import ROLE, allow_permission
 from django.utils.decorators import method_decorator
@@ -44,8 +42,6 @@ from django.views.decorators.cache import cache_control
 from django.views.decorators.vary import vary_on_cookie
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 from plane.license.utils.instance_value import get_configuration_value
-from plane.bgtasks.workspace_seed_task import workspace_seed
-from plane.utils.url import contains_url


 class WorkSpaceViewSet(BaseViewSet):
@@ -112,12 +108,6 @@ class WorkSpaceViewSet(BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            if contains_url(name):
-                return Response(
-                    {"error": "Name cannot contain a URL"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if serializer.is_valid(raise_exception=True):
                serializer.save(owner=request.user)
                # Create Workspace member
@@ -129,15 +119,11 @@ class WorkSpaceViewSet(BaseViewSet):
                )

                # Get total members and role
-                total_members = WorkspaceMember.objects.filter(
-                    workspace_id=serializer.data["id"]
-                ).count()
+                total_members=WorkspaceMember.objects.filter(workspace_id=serializer.data["id"]).count()
                data = serializer.data
                data["total_members"] = total_members
                data["role"] = 20

-                workspace_seed.delay(serializer.data["id"])
-
                return Response(data, status=status.HTTP_201_CREATED)
            return Response(
                [serializer.errors[error][0] for error in serializer.errors],
@@ -148,7 +134,7 @@ class WorkSpaceViewSet(BaseViewSet):
            if "already exists" in str(e):
                return Response(
                    {"slug": "The workspace with the slug already exists"},
-                    status=status.HTTP_409_CONFLICT,
+                    status=status.HTTP_410_GONE,
                )

    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
@@ -159,18 +145,8 @@ class WorkSpaceViewSet(BaseViewSet):
    def partial_update(self, request, *args, **kwargs):
        return super().partial_update(request, *args, **kwargs)

-    def remove_last_workspace_ids_from_user_settings(self, id: uuid.UUID) -> None:
-        """
-        Remove the last workspace id from the user settings
-        """
-        Profile.objects.filter(last_workspace_id=id).update(last_workspace_id=None)
-        return
-
    @allow_permission([ROLE.ADMIN], level="WORKSPACE")
    def destroy(self, request, *args, **kwargs):
-        # Get the workspace
-        workspace = self.get_object()
-        self.remove_last_workspace_ids_from_user_settings(workspace.id)
        return super().destroy(request, *args, **kwargs)


@@ -178,6 +154,8 @@ class UserWorkSpacesEndpoint(BaseAPIView):
    search_fields = ["name"]
    filterset_fields = ["owner"]

+    @method_decorator(cache_control(private=True, max_age=12))
+    @method_decorator(vary_on_cookie)
    def get(self, request):
        fields = [field for field in request.GET.get("fields", "").split(",") if field]
        member_count = (
@@ -189,9 +167,10 @@ class UserWorkSpacesEndpoint(BaseAPIView):
            .values("count")
        )

-        role = WorkspaceMember.objects.filter(
-            workspace=OuterRef("id"), member=request.user, is_active=True
-        ).values("role")
+        role = (
+            WorkspaceMember.objects.filter(workspace=OuterRef("id"), member=request.user, is_active=True)
+            .values("role")
+        )

        workspace = (
            Workspace.objects.prefetch_related(
@@ -12,7 +12,6 @@ from plane.app.permissions import WorkspaceViewerPermission
 from plane.app.serializers.cycle import CycleSerializer
 from plane.utils.timezone_converter import user_timezone_converter

-
 class WorkspaceCyclesEndpoint(BaseAPIView):
    permission_classes = [WorkspaceViewerPermission]

@@ -30,7 +29,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                        issue_cycle__issue__archived_at__isnull=True,
                        issue_cycle__issue__is_draft=False,
                        issue_cycle__deleted_at__isnull=True,
-                        issue_cycle__issue__deleted_at__isnull=True,
                    ),
                )
            )
@@ -36,7 +36,6 @@ from plane.db.models import (
 from .. import BaseViewSet
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_filters import issue_filters
-from plane.utils.host import base_host


 class WorkspaceDraftIssueViewSet(BaseViewSet):
@@ -242,7 +241,7 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                current_instance=None,
                epoch=int(timezone.now().timestamp()),
                notification=True,
-                origin=base_host(request=request, is_app=True),
+                origin=request.META.get("HTTP_ORIGIN"),
            )

            if request.data.get("cycle_id", None):
@@ -271,7 +270,7 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                    ),
                    epoch=int(timezone.now().timestamp()),
                    notification=True,
-                    origin=base_host(request=request, is_app=True),
+                    origin=request.META.get("HTTP_ORIGIN"),
                )

            if request.data.get("module_ids", []):
@@ -301,7 +300,7 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                        current_instance=None,
                        epoch=int(timezone.now().timestamp()),
                        notification=True,
-                        origin=base_host(request=request, is_app=True),
+                        origin=request.META.get("HTTP_ORIGIN"),
                    )
                    for module in request.data.get("module_ids", [])
                ]
@@ -34,22 +34,6 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):
    def post(self, request, slug):
        try:
            workspace = Workspace.objects.get(slug=slug)
-
-            # If the favorite exists return
-            if request.data.get("entity_identifier"):
-                user_favorites = UserFavorite.objects.filter(
-                    workspace=workspace,
-                    user_id=request.user.id,
-                    entity_type=request.data.get("entity_type"),
-                    entity_identifier=request.data.get("entity_identifier"),
-                ).first()
-
-                # If the favorite exists return
-                if user_favorites:
-                    serializer = UserFavoriteSerializer(user_favorites)
-                    return Response(serializer.data, status=status.HTTP_200_OK)
-
-            # else create a new favorite
            serializer = UserFavoriteSerializer(data=request.data)
            if serializer.is_valid():
                serializer.save(
@@ -7,6 +7,7 @@ import jwt
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
+from django.db.models import Count
 from django.utils import timezone

 # Third party modules
@@ -25,8 +26,7 @@ from plane.bgtasks.event_tracking_task import workspace_invite_event
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.db.models import User, Workspace, WorkspaceMember, WorkspaceMemberInvite
 from plane.utils.cache import invalidate_cache, invalidate_cache_directly
-from plane.utils.host import base_host
-from plane.utils.ip_address import get_client_ip
+
 from .. import BaseViewSet


@@ -122,7 +122,7 @@ class WorkspaceInvitationsViewset(BaseViewSet):
            workspace_invitations, batch_size=10, ignore_conflicts=True
        )

-        current_site = base_host(request=request, is_app=True)
+        current_site = request.META.get("HTTP_ORIGIN")

        # Send invitations
        for invitation in workspace_invitations:
@@ -213,7 +213,7 @@ class WorkspaceJoinEndpoint(BaseAPIView):
                    user=user.id if user is not None else None,
                    email=email,
                    user_agent=request.META.get("HTTP_USER_AGENT"),
-                    ip=get_client_ip(request=request),
+                    ip=request.META.get("REMOTE_ADDR"),
                    event_name="MEMBER_ACCEPTED",
                    accepted_from="EMAIL",
                )
@@ -1,6 +1,5 @@
 # Django imports
 from django.db.models import Count, Q, OuterRef, Subquery, IntegerField
-from django.utils import timezone
 from django.db.models.functions import Coalesce

 # Third party modules
@@ -69,11 +68,10 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        # If a user is moved to a guest role he can't have any other role in projects
-        if "role" in request.data and int(request.data.get("role")) == 5:
-            ProjectMember.objects.filter(
+        if workspace_member.role > int(request.data.get("role")):
+            _ = ProjectMember.objects.filter(
                workspace__slug=slug, member_id=workspace_member.member_id
-            ).update(role=5)
+            ).update(role=int(request.data.get("role")))

        serializer = WorkSpaceMemberSerializer(
            workspace_member, data=request.data, partial=True
@@ -134,7 +132,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        # Deactivate the users from the projects where the user is part of
        _ = ProjectMember.objects.filter(
            workspace__slug=slug, member_id=workspace_member.member_id, is_active=True
-        ).update(is_active=False, updated_at=timezone.now())
+        ).update(is_active=False)

        workspace_member.is_active = False
        workspace_member.save()
@@ -195,7 +193,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        # # Deactivate the users from the projects where the user is part of
        _ = ProjectMember.objects.filter(
            workspace__slug=slug, member_id=workspace_member.member_id, is_active=True
-        ).update(is_active=False, updated_at=timezone.now())
+        ).update(is_active=False)

        # # Deactivate the user
        workspace_member.is_active = False
@@ -8,7 +8,6 @@ from plane.app.views.base import BaseAPIView
 from plane.db.models import State
 from plane.app.permissions import WorkspaceEntityPermission
 from plane.utils.cache import cache_response
-from collections import defaultdict


 class WorkspaceStatesEndpoint(BaseAPIView):
@@ -23,16 +22,5 @@ class WorkspaceStatesEndpoint(BaseAPIView):
            project__archived_at__isnull=True,
            is_triage=False,
        )
-
-        grouped_states = defaultdict(list)
-        for state in states:
-            grouped_states[state.group].append(state)
-
-        for group, group_states in grouped_states.items():
-            count = len(group_states)
-
-            for index, state in enumerate(group_states, start=1):
-                state.order = index / count
-
        serializer = StateSerializer(states, many=True).data
        return Response(serializer, status=status.HTTP_200_OK)
@@ -27,7 +27,10 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):

        create_preference_keys = []

-        keys = [key for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices]
+        keys = [
+            key
+            for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices
+        ]

        for preference in keys:
            if preference not in get_preference.values_list("key", flat=True):
@@ -36,10 +39,7 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                preference = WorkspaceUserPreference.objects.bulk_create(
                    [
                        WorkspaceUserPreference(
-                            key=key,
-                            user=request.user,
-                            workspace=workspace,
-                            sort_order=(65535 + (i * 10000)),
+                            key=key, user=request.user, workspace=workspace, sort_order=(65535 + (i*10000))
                        )
                        for i, key in enumerate(create_preference_keys)
                    ],
@@ -47,13 +47,10 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                    ignore_conflicts=True,
                )

-        preferences = (
-            WorkspaceUserPreference.objects.filter(
-                user=request.user, workspace_id=workspace.id
-            )
-            .order_by("sort_order")
-            .values("key", "is_pinned", "sort_order")
-        )
+        preferences = WorkspaceUserPreference.objects.filter(
+            user=request.user, workspace_id=workspace.id
+        ).order_by("sort_order").values("key", "is_pinned", "sort_order")
+

        user_preferences = {}

@@ -61,7 +58,7 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
            user_preferences[(str(preference["key"]))] = {
                "is_pinned": preference["is_pinned"],
                "sort_order": preference["sort_order"],
-            }
+        }
        return Response(
            user_preferences,
            status=status.HTTP_200_OK,
@@ -15,8 +15,7 @@ from plane.db.models import Profile, User, WorkspaceMemberInvite
 from plane.license.utils.instance_value import get_configuration_value
 from .error import AuthenticationException, AUTHENTICATION_ERROR_CODES
 from plane.bgtasks.user_activation_email_task import user_activation_email
-from plane.utils.host import base_host
-from plane.utils.ip_address import get_client_ip
+from plane.authentication.utils.host import base_host


 class Adapter:
@@ -109,7 +108,7 @@ class Adapter:
        user.last_login_medium = self.provider
        user.last_active = timezone.now()
        user.last_login_time = timezone.now()
-        user.last_login_ip = get_client_ip(request=self.request)
+        user.last_login_ip = self.request.META.get("REMOTE_ADDR")
        user.last_login_uagent = self.request.META.get("HTTP_USER_AGENT")
        user.token_updated_at = timezone.now()
        # If user is not active, send the activation email and set the user as active
@@ -36,7 +36,6 @@ AUTHENTICATION_ERROR_CODES = {
    "OAUTH_NOT_CONFIGURED": 5104,
    "GOOGLE_NOT_CONFIGURED": 5105,
    "GITHUB_NOT_CONFIGURED": 5110,
-    "GITHUB_USER_NOT_IN_ORG": 5122,
    "GITLAB_NOT_CONFIGURED": 5111,
    "GOOGLE_OAUTH_PROVIDER_ERROR": 5115,
    "GITHUB_OAUTH_PROVIDER_ERROR": 5120,
@@ -18,31 +18,21 @@ from plane.authentication.adapter.error import (
 class GitHubOAuthProvider(OauthAdapter):
    token_url = "https://github.com/login/oauth/access_token"
    userinfo_url = "https://api.github.com/user"
-    org_membership_url = f"https://api.github.com/orgs"
-
    provider = "github"
    scope = "read:user user:email"

-    organization_scope = "read:org"
-
    def __init__(self, request, code=None, state=None, callback=None):
-        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, GITHUB_ORGANIZATION_ID = (
-            get_configuration_value(
-                [
-                    {
-                        "key": "GITHUB_CLIENT_ID",
-                        "default": os.environ.get("GITHUB_CLIENT_ID"),
-                    },
-                    {
-                        "key": "GITHUB_CLIENT_SECRET",
-                        "default": os.environ.get("GITHUB_CLIENT_SECRET"),
-                    },
-                    {
-                        "key": "GITHUB_ORGANIZATION_ID",
-                        "default": os.environ.get("GITHUB_ORGANIZATION_ID"),
-                    },
-                ]
-            )
+        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET = get_configuration_value(
+            [
+                {
+                    "key": "GITHUB_CLIENT_ID",
+                    "default": os.environ.get("GITHUB_CLIENT_ID"),
+                },
+                {
+                    "key": "GITHUB_CLIENT_SECRET",
+                    "default": os.environ.get("GITHUB_CLIENT_SECRET"),
+                },
+            ]
        )

        if not (GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET):
@@ -53,10 +43,6 @@ class GitHubOAuthProvider(OauthAdapter):

        client_id = GITHUB_CLIENT_ID
        client_secret = GITHUB_CLIENT_SECRET
-        self.organization_id = GITHUB_ORGANIZATION_ID
-
-        if self.organization_id:
-            self.scope += f" {self.organization_scope}"

        redirect_uri = f"""{"https" if request.is_secure() else "http"}://{request.get_host()}/auth/github/callback/"""
        url_params = {
@@ -127,28 +113,12 @@ class GitHubOAuthProvider(OauthAdapter):
                error_message="GITHUB_OAUTH_PROVIDER_ERROR",
            )

-    def is_user_in_organization(self, github_username):
-        headers = {"Authorization": f"Bearer {self.token_data.get('access_token')}"}
-        response = requests.get(
-            f"{self.org_membership_url}/{self.organization_id}/memberships/{github_username}",
-            headers=headers,
-        )
-        return response.status_code == 200  # 200 means the user is a member
-
    def set_user_data(self):
        user_info_response = self.get_user_response()
        headers = {
            "Authorization": f"Bearer {self.token_data.get('access_token')}",
            "Accept": "application/json",
        }
-
-        if self.organization_id:
-            if not self.is_user_in_organization(user_info_response.get("login")):
-                raise AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES["GITHUB_USER_NOT_IN_ORG"],
-                    error_message="GITHUB_USER_NOT_IN_ORG",
-                )
-
        email = self.__get_email(headers=headers)
        super().set_user_data(
            {
@@ -42,11 +42,11 @@ urlpatterns = [
    # credentials
    path("sign-in/", SignInAuthEndpoint.as_view(), name="sign-in"),
    path("sign-up/", SignUpAuthEndpoint.as_view(), name="sign-up"),
-    path("spaces/sign-in/", SignInAuthSpaceEndpoint.as_view(), name="space-sign-in"),
-    path("spaces/sign-up/", SignUpAuthSpaceEndpoint.as_view(), name="space-sign-up"),
+    path("spaces/sign-in/", SignInAuthSpaceEndpoint.as_view(), name="sign-in"),
+    path("spaces/sign-up/", SignUpAuthSpaceEndpoint.as_view(), name="sign-in"),
    # signout
    path("sign-out/", SignOutAuthEndpoint.as_view(), name="sign-out"),
-    path("spaces/sign-out/", SignOutAuthSpaceEndpoint.as_view(), name="space-sign-out"),
+    path("spaces/sign-out/", SignOutAuthSpaceEndpoint.as_view(), name="sign-out"),
    # csrf token
    path("get-csrf-token/", CSRFTokenEndpoint.as_view(), name="get_csrf_token"),
    # Magic sign in
@@ -56,17 +56,17 @@ urlpatterns = [
    path(
        "spaces/magic-generate/",
        MagicGenerateSpaceEndpoint.as_view(),
-        name="space-magic-generate",
+        name="magic-generate",
    ),
    path(
        "spaces/magic-sign-in/",
        MagicSignInSpaceEndpoint.as_view(),
-        name="space-magic-sign-in",
+        name="magic-sign-in",
    ),
    path(
        "spaces/magic-sign-up/",
        MagicSignUpSpaceEndpoint.as_view(),
-        name="space-magic-sign-up",
+        name="magic-sign-up",
    ),
    ## Google Oauth
    path("google/", GoogleOauthInitiateEndpoint.as_view(), name="google-initiate"),
@@ -74,12 +74,12 @@ urlpatterns = [
    path(
        "spaces/google/",
        GoogleOauthInitiateSpaceEndpoint.as_view(),
-        name="space-google-initiate",
+        name="google-initiate",
    ),
    path(
-        "spaces/google/callback/",
+        "google/callback/",
        GoogleCallbackSpaceEndpoint.as_view(),
-        name="space-google-callback",
+        name="google-callback",
    ),
    ## Github Oauth
    path("github/", GitHubOauthInitiateEndpoint.as_view(), name="github-initiate"),
@@ -87,12 +87,12 @@ urlpatterns = [
    path(
        "spaces/github/",
        GitHubOauthInitiateSpaceEndpoint.as_view(),
-        name="space-github-initiate",
+        name="github-initiate",
    ),
    path(
        "spaces/github/callback/",
        GitHubCallbackSpaceEndpoint.as_view(),
-        name="space-github-callback",
+        name="github-callback",
    ),
    ## Gitlab Oauth
    path("gitlab/", GitLabOauthInitiateEndpoint.as_view(), name="gitlab-initiate"),
@@ -100,12 +100,12 @@ urlpatterns = [
    path(
        "spaces/gitlab/",
        GitLabOauthInitiateSpaceEndpoint.as_view(),
-        name="space-gitlab-initiate",
+        name="gitlab-initiate",
    ),
    path(
        "spaces/gitlab/callback/",
        GitLabCallbackSpaceEndpoint.as_view(),
-        name="space-gitlab-callback",
+        name="gitlab-callback",
    ),
    # Email Check
    path("email-check/", EmailCheckEndpoint.as_view(), name="email-check"),
@@ -120,12 +120,12 @@ urlpatterns = [
    path(
        "spaces/forgot-password/",
        ForgotPasswordSpaceEndpoint.as_view(),
-        name="space-forgot-password",
+        name="forgot-password",
    ),
    path(
        "spaces/reset-password/<uidb64>/<token>/",
        ResetPasswordSpaceEndpoint.as_view(),
-        name="space-forgot-password",
+        name="forgot-password",
    ),
    path("change-password/", ChangePasswordEndpoint.as_view(), name="forgot-password"),
    path("set-password/", SetUserPasswordEndpoint.as_view(), name="set-password"),
@@ -1,53 +1,32 @@
+# Python imports
+from urllib.parse import urlsplit
+
 # Django imports
 from django.conf import settings
-from django.http import HttpRequest
-
-# Third party imports
-from rest_framework.request import Request
-
-# Module imports
-from plane.utils.ip_address import get_client_ip


-def base_host(
-    request: Request | HttpRequest,
-    is_admin: bool = False,
-    is_space: bool = False,
-    is_app: bool = False,
-) -> str:
+def base_host(request, is_admin=False, is_space=False, is_app=False):
    """Utility function to return host / origin from the request"""
    # Calculate the base origin from request
-    base_origin = settings.WEB_URL or settings.APP_BASE_URL
+    base_origin = str(
+        request.META.get("HTTP_ORIGIN")
+        or f"{urlsplit(request.META.get('HTTP_REFERER')).scheme}://{urlsplit(request.META.get('HTTP_REFERER')).netloc}"
+        or f"""{"https" if request.is_secure() else "http"}://{request.get_host()}"""
+    )

-    # Admin redirection
+    # Admin redirections
    if is_admin:
-        admin_base_path = getattr(settings, "ADMIN_BASE_PATH", None)
-        if not isinstance(admin_base_path, str):
-            admin_base_path = "/god-mode/"
-        if not admin_base_path.startswith("/"):
-            admin_base_path = "/" + admin_base_path
-        if not admin_base_path.endswith("/"):
-            admin_base_path += "/"
-
        if settings.ADMIN_BASE_URL:
-            return settings.ADMIN_BASE_URL + admin_base_path
+            return settings.ADMIN_BASE_URL
        else:
-            return base_origin + admin_base_path
+            return base_origin + "/god-mode/"

-    # Space redirection
+    # Space redirections
    if is_space:
-        space_base_path = getattr(settings, "SPACE_BASE_PATH", None)
-        if not isinstance(space_base_path, str):
-            space_base_path = "/spaces/"
-        if not space_base_path.startswith("/"):
-            space_base_path = "/" + space_base_path
-        if not space_base_path.endswith("/"):
-            space_base_path += "/"
-
        if settings.SPACE_BASE_URL:
-            return settings.SPACE_BASE_URL + space_base_path
+            return settings.SPACE_BASE_URL
        else:
-            return base_origin + space_base_path
+            return base_origin + "/spaces/"

    # App Redirection
    if is_app:
@@ -59,5 +38,5 @@ def base_host(
    return base_origin


-def user_ip(request: Request | HttpRequest) -> str:
-    return get_client_ip(request=request)
+def user_ip(request):
+    return str(request.META.get("REMOTE_ADDR"))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pablohashescobar	2fbf0d6eda	fix: uuid validation error	2025-02-19 16:36:58 +05:30
pablohashescobar	4e381c0943	fix: module activity	2025-02-18 21:16:20 +05:30
pablohashescobar	563ca2ff07	fix: meta endpoint to return correct error message	2025-02-18 21:04:31 +05:30
pablohashescobar	76c80ced14	fix: error handling for db based integrity errors	2025-02-18 18:51:13 +05:30