Skip to content

Commit

Permalink
fix: Tags - After deleting a Tag, the select button is not showing th…
Browse files Browse the repository at this point in the history
…e correct amount.

Signed-off-by: Krishna Gupta <[email protected]>
  • Loading branch information
Krishna2323 committed May 22, 2024
1 parent e8ae3c5 commit f94abce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/pages/workspace/tags/WorkspaceTagsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
};

const toggleAllTags = () => {
const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
const availableTags = tagList.filter((tag) => tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
const isAllSelected = availableTags.length === Object.keys(selectedTags).length;
setSelectedTags(isAllSelected ? {} : Object.fromEntries(availableTags.map((item) => [item.value, true])));
};

const getCustomListHeader = () => {
Expand Down
3 changes: 1 addition & 2 deletions src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,11 @@ function WorkspaceTaxesPage({
};

const toggleAllTaxes = () => {
const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID);
const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
setSelectedTaxesIDs((prev) => {
if (prev.length === taxesToSelect.length) {
return [];
}

return taxesToSelect.map((item) => (item.keyForList ? item.keyForList : ''));
});
};
Expand Down

0 comments on commit f94abce

Please sign in to comment.