Skip to content

fix: filter list overflow fix #2741

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
sriramveeraghanta merged 1 commit into from
Nov 9, 2023
Merged

fix: filter list overflow fix #2741

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
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/date.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const AppliedDateFilters: React.FC<Props> = observer((props) => {
};

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((date) => (
<div key={date} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
<span className="normal-case">{getDateLabel(date)}</span>
Expand All @@ -49,6 +49,6 @@ export const AppliedDateFilters: React.FC<Props> = observer((props) => {
</button>
</div>
))}
</div>
</>
);
});
93 changes: 49 additions & 44 deletions web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,50 +50,55 @@ export const AppliedFiltersList: React.FC<Props> = observer((props) => {
className="capitalize py-1 px-2 border border-custom-border-200 rounded-md flex items-center gap-2 flex-wrap"
>
<span className="text-xs text-custom-text-300">{replaceUnderscoreIfSnakeCase(filterKey)}</span>
{membersFilters.includes(filterKey) && (
<AppliedMembersFilters
handleRemove={(val) => handleRemoveFilter(filterKey, val)}
members={members}
values={value}
/>
)}
{dateFilters.includes(filterKey) && (
<AppliedDateFilters handleRemove={(val) => handleRemoveFilter(filterKey, val)} values={value} />
)}
{filterKey === "labels" && (
<AppliedLabelsFilters
handleRemove={(val) => handleRemoveFilter("labels", val)}
labels={labels}
values={value}
/>
)}
{filterKey === "priority" && (
<AppliedPriorityFilters handleRemove={(val) => handleRemoveFilter("priority", val)} values={value} />
)}
{filterKey === "state" && states && (
<AppliedStateFilters
handleRemove={(val) => handleRemoveFilter("state", val)}
states={states}
values={value}
/>
)}
{filterKey === "state_group" && (
<AppliedStateGroupFilters handleRemove={(val) => handleRemoveFilter("state_group", val)} values={value} />
)}
{filterKey === "project" && (
<AppliedProjectFilters
handleRemove={(val) => handleRemoveFilter("project", val)}
projects={projects}
values={value}
/>
)}
<button
type="button"
className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
onClick={() => handleRemoveFilter(filterKey, null)}
>
<X size={12} strokeWidth={2} />
</button>
<div className="flex items-center gap-1 flex-wrap">
{membersFilters.includes(filterKey) && (
<AppliedMembersFilters
handleRemove={(val) => handleRemoveFilter(filterKey, val)}
members={members}
values={value}
/>
)}
{dateFilters.includes(filterKey) && (
<AppliedDateFilters handleRemove={(val) => handleRemoveFilter(filterKey, val)} values={value} />
)}
{filterKey === "labels" && (
<AppliedLabelsFilters
handleRemove={(val) => handleRemoveFilter("labels", val)}
labels={labels}
values={value}
/>
)}
{filterKey === "priority" && (
<AppliedPriorityFilters handleRemove={(val) => handleRemoveFilter("priority", val)} values={value} />
)}
{filterKey === "state" && states && (
<AppliedStateFilters
handleRemove={(val) => handleRemoveFilter("state", val)}
states={states}
values={value}
/>
)}
{filterKey === "state_group" && (
<AppliedStateGroupFilters
handleRemove={(val) => handleRemoveFilter("state_group", val)}
values={value}
/>
)}
{filterKey === "project" && (
<AppliedProjectFilters
handleRemove={(val) => handleRemoveFilter("project", val)}
projects={projects}
values={value}
/>
)}
<button
type="button"
className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
onClick={() => handleRemoveFilter(filterKey, null)}
>
<X size={12} strokeWidth={2} />
</button>
</div>
</div>
);
})}
Expand Down
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const AppliedLabelsFilters: React.FC<Props> = observer((props) => {
const { handleRemove, labels, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((labelId) => {
const labelDetails = labels?.find((l) => l.id === labelId);

Expand All @@ -40,6 +40,6 @@ export const AppliedLabelsFilters: React.FC<Props> = observer((props) => {
</div>
);
})}
</div>
</>
);
});
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/members.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const AppliedMembersFilters: React.FC<Props> = observer((props) => {
const { handleRemove, members, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((memberId) => {
const memberDetails = members?.find((m) => m.id === memberId);

Expand All @@ -35,6 +35,6 @@ export const AppliedMembersFilters: React.FC<Props> = observer((props) => {
</div>
);
})}
</div>
</>
);
});
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/priority.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const AppliedPriorityFilters: React.FC<Props> = observer((props) => {
const { handleRemove, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((priority) => (
<div key={priority} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
<PriorityIcon
Expand All @@ -42,6 +42,6 @@ export const AppliedPriorityFilters: React.FC<Props> = observer((props) => {
</button>
</div>
))}
</div>
</>
);
});
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const AppliedProjectFilters: React.FC<Props> = observer((props) => {
const { handleRemove, projects, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((projectId) => {
const projectDetails = projects?.find((p) => p.id === projectId);

Expand Down Expand Up @@ -44,6 +44,6 @@ export const AppliedProjectFilters: React.FC<Props> = observer((props) => {
</div>
);
})}
</div>
</>
);
});
8 changes: 5 additions & 3 deletions web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,11 @@ export const ProjectViewAppliedFiltersRoot: React.FC = observer(() => {
states={projectStateStore.states?.[projectId?.toString() ?? ""]}
/>
{storedFilters && viewDetails && areFiltersDifferent(storedFilters, viewDetails.query_data ?? {}) && (
<Button variant="primary" size="sm" onClick={handleUpdateView}>
Update view
</Button>
<div className="flex items-center justify-center flex-shrink-0">
<Button variant="primary" size="sm" onClick={handleUpdateView}>
Update view
</Button>
</div>
)}
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const AppliedStateGroupFilters: React.FC<Props> = observer((props) => {
const { handleRemove, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((stateGroup) => (
<div key={stateGroup} className="text-xs flex items-center gap-1 bg-custom-background-80 p-1 rounded">
<StateGroupIcon stateGroup={stateGroup as TStateGroups} height="12px" width="12px" />
Expand All @@ -28,6 +28,6 @@ export const AppliedStateGroupFilters: React.FC<Props> = observer((props) => {
</button>
</div>
))}
</div>
</>
);
});
4 changes: 2 additions & 2 deletions web/components/issues/issue-layouts/filters/applied-filters/state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const AppliedStateFilters: React.FC<Props> = observer((props) => {
const { handleRemove, states, values } = props;

return (
<div className="flex items-center gap-1 flex-wrap">
<>
{values.map((stateId) => {
const stateDetails = states?.find((s) => s.id === stateId);

Expand All @@ -36,6 +36,6 @@ export const AppliedStateFilters: React.FC<Props> = observer((props) => {
</div>
);
})}
</div>
</>
);
});