Skip to content
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

fix: QBO - Required remains enabled when all tags are disabled #43813

Merged
merged 3 commits into from
Jul 15, 2024
Merged

fix: QBO - Required remains enabled when all tags are disabled #43813

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd2d72c
fix: QBO - Required remains enabled when all tags are disabled
Krishna2323 Jun 16, 2024
9fdb099
Merge branch 'main' into krishna2323/issue/43666
Krishna2323 Jun 23, 2024
52035bc
minor update.
Krishna2323 Jun 23, 2024
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
39 changes: 23 additions & 16 deletions src/libs/actions/Policy/Tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
import * as ErrorUtils from '@libs/ErrorUtils';
import getIsNarrowLayout from '@libs/getIsNarrowLayout';
import Log from '@libs/Log';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import {navigateWhenEnableFeature} from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
Expand Down Expand Up @@ -181,29 +182,33 @@ function createPolicyTag(policyID: string, tagName: string) {
function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {name: string; enabled: boolean}>, tagListIndex: number) {
const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};

const optimisticPolicyTagsData = {
...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
acc[key] = {
...policyTag.tags[key],
...tagsToUpdate[key],
errors: null,
pendingFields: {
...policyTag.tags[key].pendingFields,
enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
};

return acc;
}, {}),
};
const shouldDisableRequiredTag = !OptionsListUtils.hasEnabledOptions({...policyTag.tags, ...optimisticPolicyTagsData});

const onyxData: OnyxData = {
optimisticData: [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
value: {
[policyTag.name]: {
tags: {
...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
acc[key] = {
...policyTag.tags[key],
...tagsToUpdate[key],
errors: null,
pendingFields: {
...policyTag.tags[key].pendingFields,
enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
},
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
};

return acc;
}, {}),
},
...(shouldDisableRequiredTag ? {required: false, pendingFields: {required: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}} : {}),
tags: optimisticPolicyTagsData,
},
},
},
Expand All @@ -214,6 +219,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
value: {
[policyTag.name]: {
...(shouldDisableRequiredTag ? {pendingFields: {required: null}} : {}),
tags: {
...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
acc[key] = {
Expand All @@ -240,6 +246,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
value: {
[policyTag.name]: {
...(shouldDisableRequiredTag ? {pendingFields: {required: null}, required: policyTag.required} : {}),
tags: {
...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
acc[key] = {
Expand Down
Loading