Skip to content

fix: handle undefined view props #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2023
Merged

fix: handle undefined view props #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions web/components/profile/profile-issues-view-options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const ProfileIssuesViewOptions: React.FC = () => {
<button
type="button"
className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
displayFilters.layout === option.type
displayFilters?.layout === option.type
? "bg-custom-sidebar-background-80"
: "text-custom-sidebar-text-200"
}`}
Expand Down Expand Up @@ -159,25 +159,25 @@ export const ProfileIssuesViewOptions: React.FC = () => {
<Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-200 bg-custom-background-90 p-3 shadow-lg">
<div className="relative divide-y-2 divide-custom-border-200">
<div className="space-y-4 pb-3 text-xs">
{displayFilters.layout !== "calendar" &&
displayFilters.layout !== "spreadsheet" && (
{displayFilters?.layout !== "calendar" &&
displayFilters?.layout !== "spreadsheet" && (
<>
<div className="flex items-center justify-between">
<h4 className="text-custom-text-200">Group by</h4>
<div className="w-28">
<CustomMenu
label={
displayFilters.group_by === "project"
displayFilters?.group_by === "project"
? "Project"
: GROUP_BY_OPTIONS.find(
(option) => option.key === displayFilters.group_by
(option) => option.key === displayFilters?.group_by
)?.name ?? "Select"
}
className="!w-full"
buttonClassName="w-full"
>
{GROUP_BY_OPTIONS.map((option) => {
if (displayFilters.layout === "kanban" && option.key === null)
if (displayFilters?.layout === "kanban" && option.key === null)
return null;
if (
option.key === "state" ||
Expand All @@ -204,15 +204,15 @@ export const ProfileIssuesViewOptions: React.FC = () => {
<CustomMenu
label={
ORDER_BY_OPTIONS.find(
(option) => option.key === displayFilters.order_by
(option) => option.key === displayFilters?.order_by
)?.name ?? "Select"
}
className="!w-full"
buttonClassName="w-full"
>
{ORDER_BY_OPTIONS.map((option) => {
if (
displayFilters.group_by === "priority" &&
displayFilters?.group_by === "priority" &&
option.key === "priority"
)
return null;
Expand Down Expand Up @@ -262,17 +262,17 @@ export const ProfileIssuesViewOptions: React.FC = () => {
</div>
</div>

{displayFilters.layout !== "calendar" &&
displayFilters.layout !== "spreadsheet" && (
{displayFilters?.layout !== "calendar" &&
displayFilters?.layout !== "spreadsheet" && (
<>
<div className="flex items-center justify-between">
<h4 className="text-custom-text-200">Show empty states</h4>
<div className="w-28">
<ToggleSwitch
value={displayFilters.show_empty_groups ?? true}
value={displayFilters?.show_empty_groups ?? true}
onChange={() =>
setDisplayFilters({
show_empty_groups: !displayFilters.show_empty_groups,
show_empty_groups: !displayFilters?.show_empty_groups,
})
}
/>
Expand All @@ -289,15 +289,15 @@ export const ProfileIssuesViewOptions: React.FC = () => {
if (key === "estimate" && !isEstimateActive) return null;

if (
displayFilters.layout === "spreadsheet" &&
displayFilters?.layout === "spreadsheet" &&
(key === "attachment_count" ||
key === "link" ||
key === "sub_issue_count")
)
return null;

if (
displayFilters.layout !== "spreadsheet" &&
displayFilters?.layout !== "spreadsheet" &&
(key === "created_on" || key === "updated_on")
)
return null;
Expand Down
12 changes: 6 additions & 6 deletions web/components/profile/profile-issues-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const ProfileIssuesView = () => {
!result.destination ||
!workspaceSlug ||
!groupedIssues ||
displayFilters.group_by !== "priority"
displayFilters?.group_by !== "priority"
)
return;

Expand Down Expand Up @@ -155,19 +155,19 @@ export const ProfileIssuesView = () => {

let preloadedValue: string | string[] = groupTitle;

if (displayFilters.group_by === "labels") {
if (displayFilters?.group_by === "labels") {
if (groupTitle === "None") preloadedValue = [];
else preloadedValue = [groupTitle];
}

if (displayFilters.group_by)
if (displayFilters?.group_by)
setPreloadedData({
[displayFilters.group_by]: preloadedValue,
[displayFilters?.group_by]: preloadedValue,
actionType: "createIssue",
});
else setPreloadedData({ actionType: "createIssue" });
},
[setCreateIssueModal, setPreloadedData, displayFilters.group_by]
[setCreateIssueModal, setPreloadedData, displayFilters?.group_by]
);

const addIssueToDate = useCallback(
Expand Down Expand Up @@ -286,7 +286,7 @@ export const ProfileIssuesView = () => {
addIssueToDate={addIssueToDate}
addIssueToGroup={addIssueToGroup}
disableUserActions={false}
dragDisabled={displayFilters.group_by !== "priority"}
dragDisabled={displayFilters?.group_by !== "priority"}
emptyState={{
title: router.pathname.includes("assigned")
? `Issues assigned to ${profileData?.user_data.display_name} will appear here`
Expand Down
1 change: 0 additions & 1 deletion web/contexts/issue-view.context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ export const IssueViewContextProvider: React.FC<{ children: React.ReactNode }> =
}, [projectId, workspaceSlug, myViewProps]);

useEffect(() => {
console.log("running");
dispatch({
type: "REHYDRATE_THEME",
payload: {
Expand Down
2 changes: 1 addition & 1 deletion web/contexts/profile-issues-context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const ProfileIssuesContextProvider: React.FC<{ children: React.ReactNode
if (
displayFilter.layout &&
displayFilter.layout === "kanban" &&
state.display_filters.group_by === null
state.display_filters?.group_by === null
) {
dispatch({
type: "SET_DISPLAY_FILTERS",
Expand Down
28 changes: 14 additions & 14 deletions web/hooks/my-issues/use-my-issues-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const useMyIssuesFilters = (workspaceSlug: string | undefined) => {
[myWorkspace, workspaceSlug]
);

const groupBy = (myWorkspace?.view_props ?? initialValues).display_filters.group_by;
const groupBy = (myWorkspace?.view_props ?? initialValues).display_filters?.group_by;
const filters = (myWorkspace?.view_props ?? initialValues).filters;

const setDisplayFilters = useCallback(
Expand Down Expand Up @@ -155,19 +155,19 @@ const useMyIssuesFilters = (workspaceSlug: string | undefined) => {
}, [myWorkspace, workspaceSlug]);

const newProperties: Properties = {
assignee: myWorkspace?.view_props.display_properties.assignee ?? true,
start_date: myWorkspace?.view_props.display_properties.start_date ?? true,
due_date: myWorkspace?.view_props.display_properties.due_date ?? true,
key: myWorkspace?.view_props.display_properties.key ?? true,
labels: myWorkspace?.view_props.display_properties.labels ?? true,
priority: myWorkspace?.view_props.display_properties.priority ?? true,
state: myWorkspace?.view_props.display_properties.state ?? true,
sub_issue_count: myWorkspace?.view_props.display_properties.sub_issue_count ?? true,
attachment_count: myWorkspace?.view_props.display_properties.attachment_count ?? true,
link: myWorkspace?.view_props.display_properties.link ?? true,
estimate: myWorkspace?.view_props.display_properties.estimate ?? true,
created_on: myWorkspace?.view_props.display_properties.created_on ?? true,
updated_on: myWorkspace?.view_props.display_properties.updated_on ?? true,
assignee: myWorkspace?.view_props.display_properties?.assignee ?? true,
start_date: myWorkspace?.view_props.display_properties?.start_date ?? true,
due_date: myWorkspace?.view_props.display_properties?.due_date ?? true,
key: myWorkspace?.view_props.display_properties?.key ?? true,
labels: myWorkspace?.view_props.display_properties?.labels ?? true,
priority: myWorkspace?.view_props.display_properties?.priority ?? true,
state: myWorkspace?.view_props.display_properties?.state ?? true,
sub_issue_count: myWorkspace?.view_props.display_properties?.sub_issue_count ?? true,
attachment_count: myWorkspace?.view_props.display_properties?.attachment_count ?? true,
link: myWorkspace?.view_props.display_properties?.link ?? true,
estimate: myWorkspace?.view_props.display_properties?.estimate ?? true,
created_on: myWorkspace?.view_props.display_properties?.created_on ?? true,
updated_on: myWorkspace?.view_props.display_properties?.updated_on ?? true,
};

return {
Expand Down
8 changes: 4 additions & 4 deletions web/hooks/use-profile-issues.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ const useProfileIssues = (workspaceSlug: string | undefined, userId: string | un
const params: any = {
assignees: filters?.assignees ? filters?.assignees.join(",") : undefined,
created_by: filters?.created_by ? filters?.created_by.join(",") : undefined,
group_by: displayFilters.group_by,
group_by: displayFilters?.group_by,
labels: filters?.labels ? filters?.labels.join(",") : undefined,
order_by: displayFilters.order_by,
order_by: displayFilters?.order_by,
priority: filters?.priority ? filters?.priority.join(",") : undefined,
state_group: filters?.state_group ? filters?.state_group.join(",") : undefined,
start_date: filters?.start_date ? filters?.start_date.join(",") : undefined,
Expand Down Expand Up @@ -63,7 +63,7 @@ const useProfileIssues = (workspaceSlug: string | undefined, userId: string | un
allIssues: userProfileIssues,
};

if (displayFilters.group_by === "state_detail.group") {
if (displayFilters?.group_by === "state_detail.group") {
return userProfileIssues
? Object.assign(
{
Expand All @@ -79,7 +79,7 @@ const useProfileIssues = (workspaceSlug: string | undefined, userId: string | un
}

return userProfileIssues;
}, [displayFilters.group_by, userProfileIssues]);
}, [displayFilters?.group_by, userProfileIssues]);

useEffect(() => {
if (!userId || !filters) return;
Expand Down
4 changes: 2 additions & 2 deletions web/types/view-props.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export interface IProjectViewProps {
}

export interface IWorkspaceViewProps {
display_filters: IIssueDisplayFilterOptions;
display_properties: Properties;
display_filters: IIssueDisplayFilterOptions | undefined;
display_properties: Properties | undefined;
filters: IIssueFilterOptions;
}