forked from github/plane
fix: bugs & improvements (#2998)
* fix: create more toggle in update issue modal * fix: spreadsheet estimate column hide * fix: flickering in all the layouts * fix: logs
This commit is contained in:
parent
11987994a1
commit
d6b23fe380
@ -602,6 +602,7 @@ export const IssueForm: FC<IssueFormProps> = observer((props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="-mx-5 mt-5 flex items-center justify-between gap-2 border-t border-custom-border-100 px-5 pt-5">
|
<div className="-mx-5 mt-5 flex items-center justify-between gap-2 border-t border-custom-border-100 px-5 pt-5">
|
||||||
|
{!status && (
|
||||||
<div
|
<div
|
||||||
className="flex cursor-default items-center gap-1.5"
|
className="flex cursor-default items-center gap-1.5"
|
||||||
onClick={() => setCreateMore((prevData) => !prevData)}
|
onClick={() => setCreateMore((prevData) => !prevData)}
|
||||||
@ -611,7 +612,8 @@ export const IssueForm: FC<IssueFormProps> = observer((props) => {
|
|||||||
</div>
|
</div>
|
||||||
<span className="text-xs">Create more</span>
|
<span className="text-xs">Create more</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2">
|
)}
|
||||||
|
<div className="flex items-center gap-2 ml-auto">
|
||||||
<Button
|
<Button
|
||||||
variant="neutral-primary"
|
variant="neutral-primary"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
@ -95,7 +95,7 @@ export const AllIssueLayoutRoot: React.FC<Props> = observer((props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
||||||
{currentView != currentIssueView && loader === "init-loader" ? (
|
{currentView != currentIssueView && (loader === "init-loader" || !getIssues) ? (
|
||||||
<div className="w-full h-full flex justify-center items-center">
|
<div className="w-full h-full flex justify-center items-center">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
</div>
|
</div>
|
||||||
@ -103,7 +103,7 @@ export const AllIssueLayoutRoot: React.FC<Props> = observer((props) => {
|
|||||||
<>
|
<>
|
||||||
<GlobalViewsAppliedFiltersRoot />
|
<GlobalViewsAppliedFiltersRoot />
|
||||||
|
|
||||||
{Object.keys(getIssues ?? {}).length == 0 && !loader ? (
|
{Object.keys(getIssues ?? {}).length == 0 ? (
|
||||||
<>{/* <GlobalViewEmptyState /> */}</>
|
<>{/* <GlobalViewEmptyState /> */}</>
|
||||||
) : (
|
) : (
|
||||||
<div className="w-full h-full relative overflow-auto">
|
<div className="w-full h-full relative overflow-auto">
|
||||||
|
@ -62,13 +62,13 @@ export const CycleLayoutRoot: React.FC = observer(() => {
|
|||||||
{cycleStatus === "completed" && <TransferIssues handleClick={() => setTransferIssuesModal(true)} />}
|
{cycleStatus === "completed" && <TransferIssues handleClick={() => setTransferIssuesModal(true)} />}
|
||||||
<CycleAppliedFiltersRoot />
|
<CycleAppliedFiltersRoot />
|
||||||
|
|
||||||
{loader === "init-loader" ? (
|
{loader === "init-loader" || !getIssues ? (
|
||||||
<div className="w-full h-full flex justify-center items-center">
|
<div className="w-full h-full flex justify-center items-center">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{Object.keys(getIssues ?? {}).length == 0 && !loader ? (
|
{Object.keys(getIssues ?? {}).length == 0 ? (
|
||||||
<CycleEmptyState workspaceSlug={workspaceSlug} projectId={projectId} cycleId={cycleId} />
|
<CycleEmptyState workspaceSlug={workspaceSlug} projectId={projectId} cycleId={cycleId} />
|
||||||
) : (
|
) : (
|
||||||
<div className="h-full w-full overflow-auto">
|
<div className="h-full w-full overflow-auto">
|
||||||
|
@ -47,13 +47,13 @@ export const ModuleLayoutRoot: React.FC = observer(() => {
|
|||||||
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
||||||
<ModuleAppliedFiltersRoot />
|
<ModuleAppliedFiltersRoot />
|
||||||
|
|
||||||
{loader === "init-loader" ? (
|
{loader === "init-loader" || !getIssues ? (
|
||||||
<div className="w-full h-full flex justify-center items-center">
|
<div className="w-full h-full flex justify-center items-center">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{Object.keys(getIssues ?? {}).length == 0 && !loader ? (
|
{Object.keys(getIssues ?? {}).length == 0 ? (
|
||||||
<ModuleEmptyState workspaceSlug={workspaceSlug} projectId={projectId} moduleId={moduleId} />
|
<ModuleEmptyState workspaceSlug={workspaceSlug} projectId={projectId} moduleId={moduleId} />
|
||||||
) : (
|
) : (
|
||||||
<div className="h-full w-full overflow-auto">
|
<div className="h-full w-full overflow-auto">
|
||||||
|
@ -39,13 +39,13 @@ export const ProjectLayoutRoot: React.FC = observer(() => {
|
|||||||
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
<div className="relative w-full h-full flex flex-col overflow-hidden">
|
||||||
<ProjectAppliedFiltersRoot />
|
<ProjectAppliedFiltersRoot />
|
||||||
|
|
||||||
{loader === "init-loader" ? (
|
{loader === "init-loader" || !getIssues ? (
|
||||||
<div className="w-full h-full flex justify-center items-center">
|
<div className="w-full h-full flex justify-center items-center">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{Object.keys(getIssues ?? {}).length == 0 && !loader ? (
|
{Object.keys(getIssues ?? {}).length == 0 ? (
|
||||||
<ProjectEmptyState />
|
<ProjectEmptyState />
|
||||||
) : (
|
) : (
|
||||||
<div className="w-full h-full relative overflow-auto">
|
<div className="w-full h-full relative overflow-auto">
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { observer } from "mobx-react-lite";
|
import { observer } from "mobx-react-lite";
|
||||||
|
import { useMobxStore } from "lib/mobx/store-provider";
|
||||||
// components
|
// components
|
||||||
import { SpreadsheetColumn } from "components/issues";
|
import { SpreadsheetColumn } from "components/issues";
|
||||||
// types
|
// types
|
||||||
@ -31,6 +32,12 @@ export const SpreadsheetColumnsList: React.FC<Props> = observer((props) => {
|
|||||||
states,
|
states,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
|
const {
|
||||||
|
project: { currentProjectDetails },
|
||||||
|
} = useMobxStore();
|
||||||
|
|
||||||
|
const isEstimateEnabled: boolean = currentProjectDetails?.estimate !== null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{displayProperties.state && (
|
{displayProperties.state && (
|
||||||
@ -102,7 +109,7 @@ export const SpreadsheetColumnsList: React.FC<Props> = observer((props) => {
|
|||||||
property="due_date"
|
property="due_date"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{displayProperties.estimate && (
|
{displayProperties.estimate && isEstimateEnabled && (
|
||||||
<SpreadsheetColumn
|
<SpreadsheetColumn
|
||||||
displayFilters={displayFilters}
|
displayFilters={displayFilters}
|
||||||
disableUserActions={disableUserActions}
|
disableUserActions={disableUserActions}
|
||||||
|
Loading…
Reference in New Issue
Block a user