diff --git a/web/components/issues/issue-layouts/filters/applied-filters/date.tsx b/web/components/issues/issue-layouts/filters/applied-filters/date.tsx index a94be20a6..cf3525838 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/date.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/date.tsx @@ -36,7 +36,7 @@ export const AppliedDateFilters: React.FC = observer((props) => { }; return ( -
+ <> {values.map((date) => (
{getDateLabel(date)} @@ -49,6 +49,6 @@ export const AppliedDateFilters: React.FC = observer((props) => {
))} -
+ ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx b/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx index e8bc9c372..f7672ac75 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx @@ -50,50 +50,55 @@ export const AppliedFiltersList: React.FC = observer((props) => { className="capitalize py-1 px-2 border border-custom-border-200 rounded-md flex items-center gap-2 flex-wrap" > {replaceUnderscoreIfSnakeCase(filterKey)} - {membersFilters.includes(filterKey) && ( - handleRemoveFilter(filterKey, val)} - members={members} - values={value} - /> - )} - {dateFilters.includes(filterKey) && ( - handleRemoveFilter(filterKey, val)} values={value} /> - )} - {filterKey === "labels" && ( - handleRemoveFilter("labels", val)} - labels={labels} - values={value} - /> - )} - {filterKey === "priority" && ( - handleRemoveFilter("priority", val)} values={value} /> - )} - {filterKey === "state" && states && ( - handleRemoveFilter("state", val)} - states={states} - values={value} - /> - )} - {filterKey === "state_group" && ( - handleRemoveFilter("state_group", val)} values={value} /> - )} - {filterKey === "project" && ( - handleRemoveFilter("project", val)} - projects={projects} - values={value} - /> - )} - +
+ {membersFilters.includes(filterKey) && ( + handleRemoveFilter(filterKey, val)} + members={members} + values={value} + /> + )} + {dateFilters.includes(filterKey) && ( + handleRemoveFilter(filterKey, val)} values={value} /> + )} + {filterKey === "labels" && ( + handleRemoveFilter("labels", val)} + labels={labels} + values={value} + /> + )} + {filterKey === "priority" && ( + handleRemoveFilter("priority", val)} values={value} /> + )} + {filterKey === "state" && states && ( + handleRemoveFilter("state", val)} + states={states} + values={value} + /> + )} + {filterKey === "state_group" && ( + handleRemoveFilter("state_group", val)} + values={value} + /> + )} + {filterKey === "project" && ( + handleRemoveFilter("project", val)} + projects={projects} + values={value} + /> + )} + +
); })} diff --git a/web/components/issues/issue-layouts/filters/applied-filters/label.tsx b/web/components/issues/issue-layouts/filters/applied-filters/label.tsx index abc5a8b2c..ee597575f 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/label.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/label.tsx @@ -15,7 +15,7 @@ export const AppliedLabelsFilters: React.FC = observer((props) => { const { handleRemove, labels, values } = props; return ( -
+ <> {values.map((labelId) => { const labelDetails = labels?.find((l) => l.id === labelId); @@ -40,6 +40,6 @@ export const AppliedLabelsFilters: React.FC = observer((props) => {
); })} - + ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/members.tsx b/web/components/issues/issue-layouts/filters/applied-filters/members.tsx index cef65882c..dc8ac397c 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/members.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/members.tsx @@ -15,7 +15,7 @@ export const AppliedMembersFilters: React.FC = observer((props) => { const { handleRemove, members, values } = props; return ( -
+ <> {values.map((memberId) => { const memberDetails = members?.find((m) => m.id === memberId); @@ -35,6 +35,6 @@ export const AppliedMembersFilters: React.FC = observer((props) => {
); })} - + ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx b/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx index 7b76f8b51..198589a26 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/priority.tsx @@ -15,7 +15,7 @@ export const AppliedPriorityFilters: React.FC = observer((props) => { const { handleRemove, values } = props; return ( -
+ <> {values.map((priority) => (
= observer((props) => {
))} -
+ ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/project.tsx b/web/components/issues/issue-layouts/filters/applied-filters/project.tsx index d8bc758ea..51b49fbff 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/project.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/project.tsx @@ -16,7 +16,7 @@ export const AppliedProjectFilters: React.FC = observer((props) => { const { handleRemove, projects, values } = props; return ( -
+ <> {values.map((projectId) => { const projectDetails = projects?.find((p) => p.id === projectId); @@ -44,6 +44,6 @@ export const AppliedProjectFilters: React.FC = observer((props) => {
); })} - + ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx index 96a2dab37..5f797a6ce 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/roots/project-view-root.tsx @@ -104,9 +104,11 @@ export const ProjectViewAppliedFiltersRoot: React.FC = observer(() => { states={projectStateStore.states?.[projectId?.toString() ?? ""]} /> {storedFilters && viewDetails && areFiltersDifferent(storedFilters, viewDetails.query_data ?? {}) && ( - +
+ +
)} ); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx b/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx index d0707efda..eadf34005 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/state-group.tsx @@ -14,7 +14,7 @@ export const AppliedStateGroupFilters: React.FC = observer((props) => { const { handleRemove, values } = props; return ( -
+ <> {values.map((stateGroup) => (
@@ -28,6 +28,6 @@ export const AppliedStateGroupFilters: React.FC = observer((props) => {
))} -
+ ); }); diff --git a/web/components/issues/issue-layouts/filters/applied-filters/state.tsx b/web/components/issues/issue-layouts/filters/applied-filters/state.tsx index eadcd88ad..c307d21c5 100644 --- a/web/components/issues/issue-layouts/filters/applied-filters/state.tsx +++ b/web/components/issues/issue-layouts/filters/applied-filters/state.tsx @@ -16,7 +16,7 @@ export const AppliedStateFilters: React.FC = observer((props) => { const { handleRemove, states, values } = props; return ( -
+ <> {values.map((stateId) => { const stateDetails = states?.find((s) => s.id === stateId); @@ -36,6 +36,6 @@ export const AppliedStateFilters: React.FC = observer((props) => {
); })} - + ); });