Merge branch 'develop' of github.com:makeplane/plane-ee into develop

2026-07-13 14:01:45 +02:00 · 2024-07-03 20:23:59 +05:30
parent 3a5c7e71e3 75dc9ade3a
commit 78edd0b994
30 changed files with 165 additions and 76 deletions
--- a/.github/workflows/build-aio-base.yml
+++ b/.github/workflows/build-aio-base.yml
@@ -2,6 +2,11 @@ name: Build AIO Base Image

 on:
  workflow_dispatch:
+    inputs:
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: ''

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -22,27 +27,29 @@ jobs:
      - id: set_env_variables
        name: Set Environment Variables
        run: |
+          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
+
+          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+            echo "IMAGE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
+          elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
+          else
+            echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
+          fi
+
+
          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
-            echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
          else
            echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-
-            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
-              echo "TARGET_BRANCH=preview" >> $GITHUB_OUTPUT
-              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
-            else
-              echo "TARGET_BRANCH=develop" >> $GITHUB_OUTPUT
-              echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
-            fi
          fi

      - id: checkout_files
@@ -54,7 +61,6 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
-      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -96,7 +102,6 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
-      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
--- a/.github/workflows/build-aio-branch.yml
+++ b/.github/workflows/build-aio-branch.yml
@@ -13,6 +13,10 @@ on:
        type: boolean
        required: false
        default: false
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: ''
  release:
    types: [released, prereleased]

@@ -52,7 +56,9 @@ jobs:
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT

-            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+            if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+              echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+            elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
              echo "AIO_BASE_TAG=preview" >> $GITHUB_OUTPUT
            else
              echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
--- a/.github/workflows/feature-deployment.yml
+++ b/.github/workflows/feature-deployment.yml
@@ -2,6 +2,11 @@ name: Feature Preview

 on:
  workflow_dispatch:
+    inputs:
+      base_tag_name:
+        description: 'Base Tag Name'
+        required: false
+        default: 'preview'

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -29,7 +34,12 @@ jobs:
          echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
          echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
          echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-          echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
+
+          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
+            echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
+          else
+            echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
+          fi

          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT

--- a/web/app/[workspaceSlug]/(projects)/active-cycles/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/active-cycles/page.tsx
@@ -3,9 +3,10 @@
 import { observer } from "mobx-react";
 // components
 import { PageHead } from "@/components/core";
-import { WorkspaceActiveCyclesList } from "@/components/workspace";
 // hooks
 import { useWorkspace } from "@/hooks/store";
+// plane web components
+import { WorkspaceActiveCyclesRoot } from "@/plane-web/components/active-cycles";

 const WorkspaceActiveCyclesPage = observer(() => {
  const { currentWorkspace } = useWorkspace();
@@ -15,7 +16,7 @@ const WorkspaceActiveCyclesPage = observer(() => {
  return (
    <>
      <PageHead title={pageTitle} />
-      <WorkspaceActiveCyclesList />
+      <WorkspaceActiveCyclesRoot />
    </>
  );
 });
--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx
@@ -20,7 +20,7 @@ import {
  ISSUE_LAYOUTS,
 } from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel } from "@/hooks/store";

@@ -108,8 +108,6 @@ export const ProfileIssuesMobileHeader = observer(() => {
    [workspaceSlug, updateFilters, userId]
  );

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="flex justify-evenly border-b border-custom-border-200 py-2 md:hidden">
      <CustomMenu
@@ -146,7 +144,7 @@ export const ProfileIssuesMobileHeader = observer(() => {
              <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
            </span>
          }
-          isFiltersApplied={isFiltersApplied}
+          isFiltersApplied={isIssueFilterActive(issueFilters)}
        >
          <FilterSelection
            layoutDisplayFiltersOptions={
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
@@ -24,7 +24,7 @@ import {
 import { EUserProjectRoles } from "@/constants/project";
 // helpers
 import { cn } from "@/helpers/common.helper";
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { truncateText } from "@/helpers/string.helper";
 // hooks
 import {
@@ -152,7 +152,6 @@ export const CycleIssuesHeader: React.FC = observer(() => {
  const canUserCreateIssue =
    currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
  const issuesCount = getGroupIssueCount(undefined, undefined, false);

  return (
@@ -248,7 +247,11 @@ export const CycleIssuesHeader: React.FC = observer(() => {
              onChange={(layout) => handleLayoutChange(layout)}
              selectedLayout={activeLayout}
            />
-            <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+            <FiltersDropdown
+              title="Filters"
+              placement="bottom-end"
+              isFiltersApplied={isIssueFilterActive(issueFilters)}
+            >
              <FilterSelection
                filters={issueFilters?.filters ?? {}}
                handleFiltersUpdate={handleFiltersUpdate}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx
@@ -12,9 +12,15 @@ import { CustomMenu } from "@plane/ui";
 import { ProjectAnalyticsModal } from "@/components/analytics";
 import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";
 // constants
-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";
+import {
+  EIssueFilterType,
+  EIssueLayoutTypes,
+  EIssuesStoreType,
+  ISSUE_DISPLAY_FILTERS_BY_LAYOUT,
+  ISSUE_LAYOUTS,
+} from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useCycle, useProjectState, useLabel, useMember, useProject } from "@/hooks/store";

@@ -109,8 +115,6 @@ export const CycleIssuesMobileHeader = () => {
    [workspaceSlug, projectId, cycleId, updateFilters]
  );

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <>
      <ProjectAnalyticsModal
@@ -150,7 +154,7 @@ export const CycleIssuesMobileHeader = () => {
                <ChevronDown className="text-custom-text-200  h-4 w-4 ml-2" />
              </span>
            }
-            isFiltersApplied={isFiltersApplied}
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
          >
            <FilterSelection
              filters={issueFilters?.filters ?? {}}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
@@ -18,7 +18,7 @@ import {
  ISSUE_DISPLAY_FILTERS_BY_LAYOUT,
 } from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -90,8 +90,6 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
      : currentProjectDetails.draft_issues
    : undefined;

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">
      <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
@@ -140,7 +138,7 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
            onChange={(layout) => handleLayoutChange(layout)}
            selectedLayout={activeLayout}
          />
-          <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+          <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
            <FilterSelection
              filters={issueFilters?.filters ?? {}}
              handleFiltersUpdate={handleFiltersUpdate}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx
@@ -23,7 +23,7 @@ import {
 import { EUserProjectRoles } from "@/constants/project";
 // helpers
 import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@/helpers/common.helper";
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import {
  useEventTracker,
@@ -113,7 +113,6 @@ export const ProjectIssuesHeader = observer(() => {
  const canUserCreateIssue =
    currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
  const issuesCount = getGroupIssueCount(undefined, undefined, false);

  return (
@@ -193,7 +192,7 @@ export const ProjectIssuesHeader = observer(() => {
            onChange={(layout) => handleLayoutChange(layout)}
            selectedLayout={activeLayout}
          />
-          <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+          <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
            <FilterSelection
              filters={issueFilters?.filters ?? {}}
              handleFiltersUpdate={handleFiltersUpdate}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx
@@ -13,9 +13,15 @@ import { CustomMenu } from "@plane/ui";
 import { ProjectAnalyticsModal } from "@/components/analytics";
 import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts";
 // constants
-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";
+import {
+  EIssueFilterType,
+  EIssueLayoutTypes,
+  EIssuesStoreType,
+  ISSUE_DISPLAY_FILTERS_BY_LAYOUT,
+  ISSUE_LAYOUTS,
+} from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";

@@ -88,8 +94,6 @@ export const ProjectIssuesMobileHeader = observer(() => {
    [workspaceSlug, projectId, updateFilters]
  );

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <>
      <ProjectAnalyticsModal
@@ -129,7 +133,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
                <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
              </span>
            }
-            isFiltersApplied={isFiltersApplied}
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
          >
            <FilterSelection
              filters={issueFilters?.filters ?? {}}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
@@ -24,7 +24,7 @@ import {
 import { EUserProjectRoles } from "@/constants/project";
 // helpers
 import { cn } from "@/helpers/common.helper";
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { truncateText } from "@/helpers/string.helper";
 // hooks
 import {
@@ -152,7 +152,6 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
  const canUserCreateIssue =
    currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
  const issuesCount = getGroupIssueCount(undefined, undefined, false);

  return (
@@ -249,7 +248,11 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                onChange={(layout) => handleLayoutChange(layout)}
                selectedLayout={activeLayout}
              />
-              <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+              <FiltersDropdown
+                title="Filters"
+                placement="bottom-end"
+                isFiltersApplied={isIssueFilterActive(issueFilters)}
+              >
                <FilterSelection
                  filters={issueFilters?.filters ?? {}}
                  handleFiltersUpdate={handleFiltersUpdate}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx
@@ -13,9 +13,15 @@ import { CustomMenu } from "@plane/ui";
 import { ProjectAnalyticsModal } from "@/components/analytics";
 import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";
 // constants
-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";
+import {
+  EIssueFilterType,
+  EIssueLayoutTypes,
+  EIssuesStoreType,
+  ISSUE_DISPLAY_FILTERS_BY_LAYOUT,
+  ISSUE_LAYOUTS,
+} from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel, useMember, useModule, useProject, useProjectState } from "@/hooks/store";

@@ -90,8 +96,6 @@ export const ModuleIssuesMobileHeader = observer(() => {
    [workspaceSlug, projectId, moduleId, updateFilters]
  );

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="block md:hidden">
      <ProjectAnalyticsModal
@@ -131,7 +135,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
                <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
              </span>
            }
-            isFiltersApplied={isFiltersApplied}
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
          >
            <FilterSelection
              filters={issueFilters?.filters ?? {}}
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
@@ -22,7 +22,7 @@ import {
 import { EUserProjectRoles } from "@/constants/project";
 import { EViewAccess } from "@/constants/views";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 import { truncateText } from "@/helpers/string.helper";
 // hooks
 import {
@@ -133,8 +133,6 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
  const canUserCreateIssue =
    currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="relative z-[15] flex h-[3.75rem] w-full items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">
      <div className="flex items-center gap-2">
@@ -233,7 +231,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
              title="Filters"
              placement="bottom-end"
              disabled={!canUserCreateIssue}
-              isFiltersApplied={isFiltersApplied}
+              isFiltersApplied={isIssueFilterActive(issueFilters)}
            >
              <FilterSelection
                filters={issueFilters?.filters ?? {}}
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx
@@ -15,7 +15,7 @@ import { CreateUpdateWorkspaceViewModal } from "@/components/workspace";
 import { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";
 import { EUserWorkspaceRoles } from "@/constants/workspace";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useLabel, useMember, useUser, useIssues, useGlobalView } from "@/hooks/store";

@@ -98,7 +98,6 @@ export const GlobalIssuesHeader = observer(() => {

  const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
  const isLocked = viewDetails?.is_locked;

  return (
@@ -118,7 +117,11 @@ export const GlobalIssuesHeader = observer(() => {
        <div className="flex items-center gap-2">
          {!isLocked && (
            <>
-              <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+              <FiltersDropdown
+                title="Filters"
+                placement="bottom-end"
+                isFiltersApplied={isIssueFilterActive(issueFilters)}
+              >
                <FilterSelection
                  layoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}
                  filters={issueFilters?.filters ?? {}}
--- a/web/ce/components/active-cycles/index.ts
+++ b/web/ce/components/active-cycles/index.ts
@@ -0,0 +1,2 @@
+export * from "./root";
+export * from "./workspace-active-cycles-upgrade";
--- a/web/ce/components/active-cycles/root.tsx
+++ b/web/ce/components/active-cycles/root.tsx
@@ -0,0 +1,3 @@
+import { WorkspaceActiveCyclesUpgrade } from "@/plane-web/components/active-cycles";
+
+export const WorkspaceActiveCyclesRoot = () => <WorkspaceActiveCyclesUpgrade />;
--- a/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx
+++ b/web/ce/components/active-cycles/workspace-active-cycles-upgrade.tsx
--- a/web/core/components/dropdowns/estimate.tsx
+++ b/web/core/components/dropdowns/estimate.tsx
@@ -236,7 +236,14 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
                        <Combobox.Option key={option.value} value={option.value}>
                          {({ active, selected }) => (
                            <div
-                              className={`flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5 ${active ? `!hover:bg-custom-background-80` : ``} ${selected ? "text-custom-text-100" : "text-custom-text-200"}`}
+                              className={cn(
+                                "flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5",
+                                {
+                                  "bg-custom-background-80": active,
+                                  "text-custom-text-100": selected,
+                                  "text-custom-text-200": !selected,
+                                }
+                              )}
                            >
                              <span className="flex-grow truncate">{option.content}</span>
                              {selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}
--- a/web/core/components/issues/archived-issues-header.tsx
+++ b/web/core/components/issues/archived-issues-header.tsx
@@ -9,7 +9,7 @@ import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/com
 // constants
 import { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";

@@ -63,8 +63,6 @@ export const ArchivedIssuesHeader: FC = observer(() => {
    updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property);
  };

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="group relative flex border-b border-custom-border-200">
      <div className="flex w-full items-center overflow-x-auto px-4 gap-2 horizontal-scrollbar scrollbar-sm">
@@ -72,7 +70,7 @@ export const ArchivedIssuesHeader: FC = observer(() => {
      </div>
      {/* filter options */}
      <div className="flex items-center gap-2 px-8">
-        <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+        <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
          <FilterSelection
            filters={issueFilters?.filters || {}}
            handleFiltersUpdate={handleFiltersUpdate}
--- a/web/core/components/issues/issue-layouts/roots/project-view-layout-root.tsx
+++ b/web/core/components/issues/issue-layouts/roots/project-view-layout-root.tsx
@@ -4,6 +4,7 @@ import { useParams } from "next/navigation";
 import useSWR from "swr";
 // mobx store
 // components
+import { LogoSpinner } from "@/components/common";
 import {
  IssuePeekOverview,
  ProjectViewAppliedFiltersRoot,
@@ -42,7 +43,7 @@ export const ProjectViewLayoutRoot: React.FC = observer(() => {
  // hooks
  const { issuesFilter } = useIssues(EIssuesStoreType.PROJECT_VIEW);

-  useSWR(
+  const { isLoading } = useSWR(
    workspaceSlug && projectId && viewId ? `PROJECT_VIEW_ISSUES_${workspaceSlug}_${projectId}_${viewId}` : null,
    async () => {
      if (workspaceSlug && projectId && viewId) {
@@ -56,6 +57,14 @@ export const ProjectViewLayoutRoot: React.FC = observer(() => {

  if (!workspaceSlug || !projectId || !viewId) return <></>;

+  if (isLoading) {
+    return (
+      <div className="relative flex h-screen w-full items-center justify-center">
+        <LogoSpinner />
+      </div>
+    );
+  }
+
  return (
    <IssuesStoreContext.Provider value={EIssuesStoreType.PROJECT_VIEW}>
      <div className="relative flex h-full w-full flex-col overflow-hidden">
--- a/web/core/components/profile/profile-issues-filter.tsx
+++ b/web/core/components/profile/profile-issues-filter.tsx
@@ -6,9 +6,14 @@ import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOption
 // components
 import { DisplayFiltersSelection, FilterSelection, FiltersDropdown, LayoutSelection } from "@/components/issues";
 // constants
-import { EIssuesStoreType, EIssueFilterType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, EIssueLayoutTypes } from "@/constants/issue";
+import {
+  EIssuesStoreType,
+  EIssueFilterType,
+  ISSUE_DISPLAY_FILTERS_BY_LAYOUT,
+  EIssueLayoutTypes,
+} from "@/constants/issue";
 // helpers
-import { calculateTotalFilters } from "@/helpers/filter.helper";
+import { isIssueFilterActive } from "@/helpers/filter.helper";
 // hooks
 import { useIssues, useLabel } from "@/hooks/store";

@@ -95,8 +100,6 @@ export const ProfileIssuesFilter = observer(() => {
    [workspaceSlug, updateFilters, userId]
  );

-  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;
-
  return (
    <div className="relative flex items-center justify-end gap-2">
      <LayoutSelection
@@ -105,7 +108,7 @@ export const ProfileIssuesFilter = observer(() => {
        selectedLayout={activeLayout}
      />

-      <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>
+      <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}>
        <FilterSelection
          layoutDisplayFiltersOptions={
            activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.profile_issues[activeLayout] : undefined
--- a/web/core/components/workspace/index.ts
+++ b/web/core/components/workspace/index.ts
@@ -6,7 +6,3 @@ export * from "./create-workspace-form";
 export * from "./delete-workspace-modal";
 export * from "./logo";
 export * from "./send-workspace-invitation-modal";
-export * from "./workspace-active-cycles-upgrade";
-
-// ee imports
-export * from "./workspace-active-cycles-list";
--- a/web/core/components/workspace/sidebar/quick-actions.tsx
+++ b/web/core/components/workspace/sidebar/quick-actions.tsx
@@ -109,9 +109,7 @@ export const SidebarQuickActions = observer(() => {
                </button>
              )}
              {isDraftButtonOpen && (
-                <div
-                  className={`fixed left-4 mt-0 h-10 w-[203px] pt-2 ${isSidebarCollapsed ? "top-[5.5rem]" : "top-24"}`}
-                >
+                <div className="absolute  mt-0 h-10 w-[220px] pt-2 z-10 top-8 left-0">
                  <div className="h-full w-full">
                    <button
                      onClick={() => setIsDraftIssueModalOpen(true)}
--- a/web/core/store/project-view.store.ts
+++ b/web/core/store/project-view.store.ts
@@ -6,7 +6,7 @@ import { IProjectView, TViewFilters } from "@plane/types";
 // constants
 import { EViewAccess } from "@/constants/views";
 // helpers
-import { getViewName, orderViews, shouldFilterView } from "@/helpers/project-views.helpers";
+import { getValidatedViewFilters, getViewName, orderViews, shouldFilterView } from "@/helpers/project-views.helpers";
 // services
 import { ViewService } from "@/plane-web/services";
 // store
@@ -196,7 +196,7 @@ export class ProjectViewStore implements IProjectViewStore {
   * @returns Promise<IProjectView>
   */
  createView = async (workspaceSlug: string, projectId: string, data: Partial<IProjectView>): Promise<IProjectView> => {
-    const response = await this.viewService.createView(workspaceSlug, projectId, data);
+    const response = await this.viewService.createView(workspaceSlug, projectId, getValidatedViewFilters(data));

    runInAction(() => {
      set(this.viewMap, [response.id], response);
--- a/web/ee/components/active-cycles/index.ts
+++ b/web/ee/components/active-cycles/index.ts
@@ -1,3 +1,6 @@
+export * from "./root";
+export * from "./workspace-active-cycles-upgrade";
+export * from "./workspace-active-cycles-list";
 export * from "./header";
 export * from "./progress";
 export * from "./project-title";
--- a/web/ee/components/active-cycles/root.tsx
+++ b/web/ee/components/active-cycles/root.tsx
@@ -0,0 +1,4 @@
+// plane web components
+import { WorkspaceActiveCyclesList } from "@/plane-web/components/active-cycles";
+
+export const WorkspaceActiveCyclesRoot = () => <WorkspaceActiveCyclesList />;
--- a/web/ee/components/active-cycles/workspace-active-cycles-list.tsx
+++ b/web/ee/components/active-cycles/workspace-active-cycles-list.tsx
--- a/web/ee/components/active-cycles/workspace-active-cycles-upgrade.tsx
+++ b/web/ee/components/active-cycles/workspace-active-cycles-upgrade.tsx
@@ -0,0 +1 @@
+export * from "ce/components/active-cycles/workspace-active-cycles-upgrade";
--- a/web/helpers/filter.helper.ts
+++ b/web/helpers/filter.helper.ts
@@ -1,5 +1,6 @@
 import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
 // helpers
+import { IIssueFilters } from "@plane/types";
 import { getDate } from "./date-time.helper";
 // import { IIssueFilterOptions } from "@plane/types";

@@ -61,3 +62,17 @@ export const satisfiesDateFilter = (date: Date, filter: string): boolean => {

  return false;
 };
+
+/**
+ * @description checks if the issue filter is active
+ * @param {IIssueFilters} issueFilters
+ * @returns {boolean}
+ */
+export const isIssueFilterActive = (issueFilters: IIssueFilters | undefined): boolean => {
+  if (!issueFilters) return false;
+
+  const issueType = issueFilters?.displayFilters?.type;
+  const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0 || !!issueType;
+
+  return isFiltersApplied;
+};
--- a/web/helpers/project-views.helpers.ts
+++ b/web/helpers/project-views.helpers.ts
@@ -1,3 +1,4 @@
+import isNil from "lodash/isNil";
 import orderBy from "lodash/orderBy";
 import { IProjectView, TViewFilterProps, TViewFiltersSortBy, TViewFiltersSortKey } from "@plane/types";
 import { getDate } from "@/helpers/date-time.helper";
@@ -74,3 +75,16 @@ export const getViewName = (name: string | undefined) => {
  if (!name || name.trim() === "") return "Untitled";
  return name;
 };
+
+/**
+ * Adds validation for the view creation filters
+ * @param data
+ * @returns
+ */
+export const getValidatedViewFilters = (data: Partial<IProjectView>) => {
+  if (data?.display_filters && data?.display_filters?.layout === "kanban" && isNil(data.display_filters.group_by)) {
+    data.display_filters.group_by = "state";
+  }
+
+  return data;
+};
				`@@ -0,0 +1 @@`
				`export * from "ce/components/active-cycles/workspace-active-cycles-upgrade";`