Merge pull request #2037 from makeplane/sync/ce-ee

Sync: Community Changes

web/core/components/workspace/views/form.tsx

@@ -3,6 +3,8 @@
 import { useEffect } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
+// constant
+import { EIssueLayoutTypes } from "@plane/constants";
 // types
 import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptions, IWorkspaceView } from "@plane/types";
 // ui
@@ -30,7 +32,9 @@ const defaultValues: Partial<IWorkspaceView> = {
   description: "",
   access: EViewAccess.PUBLIC,
   display_properties: getComputedDisplayProperties(),
-  display_filters: getComputedDisplayFilters(),
+  display_filters: getComputedDisplayFilters({
+    layout: EIssueLayoutTypes.SPREADSHEET,
+  }),
 };
 
 export const WorkspaceViewForm: React.FC<Props> = observer((props) => {

web/core/store/issue/helpers/base-issues.store.ts

@@ -297,6 +297,7 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
     // Temporary code to fix no load order by
     if (
       this.rootIssueStore.rootStore.user.localDBEnabled &&
+      this.rootIssueStore.rootStore.router.projectId &&
       layout !== EIssueLayoutTypes.SPREADSHEET &&
       orderBy &&
       Object.keys(SPECIAL_ORDER_BY).includes(orderBy)