diff --git a/apps/web/core/components/issues/issue-layouts/issue-layout-HOC.tsx b/apps/web/core/components/issues/issue-layouts/issue-layout-HOC.tsx
index 50a0323a9af..2c6cd65f494 100644
--- a/apps/web/core/components/issues/issue-layouts/issue-layout-HOC.tsx
+++ b/apps/web/core/components/issues/issue-layouts/issue-layout-HOC.tsx
@@ -8,6 +8,7 @@ import { observer } from "mobx-react";
// plane imports
import { EIssueLayoutTypes } from "@plane/types";
// components
+import { LayoutErrorBoundary } from "@/components/common/layout-error-boundary";
import { CalendarLayoutLoader } from "@/components/ui/loader/layouts/calendar-layout-loader";
import { GanttLayoutLoader } from "@/components/ui/loader/layouts/gantt-layout-loader";
import { KanbanLayoutLoader } from "@/components/ui/loader/layouts/kanban-layout-loader";
@@ -58,5 +59,5 @@ export const IssueLayoutHOC = observer(function IssueLayoutHOC(props: Props) {
return
;
}
- return <>{props.children}>;
+ return
{props.children};
});
diff --git a/apps/web/core/components/issues/issue-layouts/properties/all-properties.tsx b/apps/web/core/components/issues/issue-layouts/properties/all-properties.tsx
index 96def8e7c47..cd2ffbffc57 100644
--- a/apps/web/core/components/issues/issue-layouts/properties/all-properties.tsx
+++ b/apps/web/core/components/issues/issue-layouts/properties/all-properties.tsx
@@ -179,7 +179,11 @@ export const IssueProperties = observer(function IssueProperties(props: IIssuePr
issue.start_date && issue.target_date && displayProperties.start_date && displayProperties.due_date
);
- const defaultLabelOptions = issue?.label_ids?.map((id) => labelMap[id]) || [];
+ const defaultLabelOptions =
+ issue?.label_ids?.flatMap((id) => {
+ const label = labelMap[id];
+ return label ? [label] : [];
+ }) || [];
const minDate = getDate(issue.start_date);
const maxDate = getDate(issue.target_date);
diff --git a/apps/web/core/components/issues/issue-layouts/spreadsheet/columns/label-column.tsx b/apps/web/core/components/issues/issue-layouts/spreadsheet/columns/label-column.tsx
index 02ae8b669fc..7618b7ec318 100644
--- a/apps/web/core/components/issues/issue-layouts/spreadsheet/columns/label-column.tsx
+++ b/apps/web/core/components/issues/issue-layouts/spreadsheet/columns/label-column.tsx
@@ -25,7 +25,11 @@ export const SpreadsheetLabelColumn = observer(function SpreadsheetLabelColumn(p
// hooks
const { labelMap } = useLabel();
- const defaultLabelOptions = issue?.label_ids?.map((id) => labelMap[id]) || [];
+ const defaultLabelOptions =
+ issue?.label_ids?.flatMap((id) => {
+ const label = labelMap[id];
+ return label ? [label] : [];
+ }) || [];
return (
diff --git a/apps/web/core/components/issues/peek-overview/properties.tsx b/apps/web/core/components/issues/peek-overview/properties.tsx
index bf280c8088d..8f35cc1645a 100644
--- a/apps/web/core/components/issues/peek-overview/properties.tsx
+++ b/apps/web/core/components/issues/peek-overview/properties.tsx
@@ -131,10 +131,10 @@ export const PeekOverviewProperties = observer(function PeekOverviewProperties(p
>
- {createdByDetails?.display_name.includes("-intake") ? "Plane" : createdByDetails?.display_name}
+ {createdByDetails?.display_name?.includes("-intake") ? "Plane" : createdByDetails?.display_name}
)}
diff --git a/apps/web/core/components/issues/workspace-draft/draft-issue-properties.tsx b/apps/web/core/components/issues/workspace-draft/draft-issue-properties.tsx
index e526909abbf..123d59d7977 100644
--- a/apps/web/core/components/issues/workspace-draft/draft-issue-properties.tsx
+++ b/apps/web/core/components/issues/workspace-draft/draft-issue-properties.tsx
@@ -122,7 +122,11 @@ export const DraftIssueProperties = observer(function DraftIssueProperties(props
if (!issue.project_id) return null;
- const defaultLabelOptions = issue?.label_ids?.map((id) => labelMap[id]) || [];
+ const defaultLabelOptions =
+ issue?.label_ids?.flatMap((id) => {
+ const label = labelMap[id];
+ return label ? [label] : [];
+ }) || [];
const minDate = getDate(issue.start_date);
minDate?.setDate(minDate.getDate());
diff --git a/apps/web/core/components/profile/overview/activity.tsx b/apps/web/core/components/profile/overview/activity.tsx
index 0b089ba5ca5..95350412afe 100644
--- a/apps/web/core/components/profile/overview/activity.tsx
+++ b/apps/web/core/components/profile/overview/activity.tsx
@@ -45,41 +45,7 @@ export const ProfileActivity = observer(function ProfileActivity() {
{t("profile.stats.recent_activity.title")}
- {userProfileActivity ? (
- userProfileActivity.results.length > 0 ? (
-
- {userProfileActivity.results.map((activity) => (
-
-
-
-
-
- {currentUser?.id === activity.actor_detail?.id
- ? "You"
- : activity.actor_detail?.display_name}{" "}
-
- {activity.field ? (
-
- ) : (
-
- created
-
- )}
-
-
{calculateTimeAgo(activity.created_at)}
-
-
- ))}
-
- ) : (
-
- )
- ) : (
+ {!userProfileActivity ? (
@@ -87,6 +53,36 @@ export const ProfileActivity = observer(function ProfileActivity() {
+ ) : Array.isArray(userProfileActivity.results) && userProfileActivity.results.length > 0 ? (
+
+ {userProfileActivity.results.map((activity) => (
+
+
+
+
+
+ {currentUser?.id === activity.actor_detail?.id ? "You" : activity.actor_detail?.display_name}{" "}
+
+ {activity.field ? (
+
+ ) : (
+
+ created
+
+ )}
+
+
{calculateTimeAgo(activity.created_at)}
+
+
+ ))}
+
+ ) : (
+
)}
diff --git a/apps/web/core/store/issue/issue-details/sub_issues.store.ts b/apps/web/core/store/issue/issue-details/sub_issues.store.ts
index 7410ce30369..74ffad7aaee 100644
--- a/apps/web/core/store/issue/issue-details/sub_issues.store.ts
+++ b/apps/web/core/store/issue/issue-details/sub_issues.store.ts
@@ -166,8 +166,8 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {
sub_issue_ids: issueIds,
});
- const subIssuesStateDistribution = response?.state_distribution;
- const subIssues = response.sub_issues as TIssue[];
+ const subIssuesStateDistribution = response?.state_distribution ?? {};
+ const subIssues = Array.isArray(response?.sub_issues) ? response.sub_issues : [];
// fetch other issues states and members when sub-issues are from different project
if (subIssues && subIssues.length > 0) {