From 400144a845d3b74dfbd5ff242f96a9f37e9199a8 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Tue, 14 May 2024 13:36:05 +0100 Subject: [PATCH 01/12] Add orderWeight to tag view and tag edit routes --- src/ROUTES.ts | 8 ++++---- src/libs/Navigation/linkingConfig/config.ts | 2 ++ src/libs/Navigation/types.ts | 3 ++- src/pages/workspace/tags/EditTagPage.tsx | 2 +- src/pages/workspace/tags/TagSettingsPage.tsx | 4 ++-- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +- src/pages/workspace/tags/WorkspaceViewTagsPage.tsx | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 0dff2992fe91..a5b8e69244ac 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -676,12 +676,12 @@ const ROUTES = { getRoute: (policyID: string, orderWeight: number) => `settings/workspaces/${policyID}/tags/${orderWeight}/edit` as const, }, WORKSPACE_TAG_EDIT: { - route: 'settings/workspace/:policyID/tag/:tagName/edit', - getRoute: (policyID: string, tagName: string) => `settings/workspace/${policyID}/tag/${encodeURIComponent(tagName)}/edit` as const, + route: 'settings/workspaces/:policyID/tag/:orderWeight/:tagName/edit', + getRoute: (policyID: string, orderWeight: number, tagName: string) => `settings/workspaces/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/edit` as const, }, WORKSPACE_TAG_SETTINGS: { - route: 'settings/workspaces/:policyID/tag/:tagName', - getRoute: (policyID: string, tagName: string) => `settings/workspaces/${policyID}/tag/${encodeURIComponent(tagName)}` as const, + route: 'settings/workspaces/:policyID/tag/:orderWeight/:tagName', + getRoute: (policyID: string, orderWeight: number, tagName: string) => `settings/workspaces/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}` as const, }, WORKSPACE_TAG_LIST_VIEW: { route: 'settings/workspaces/:policyID/tag-list/:orderWeight', diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 3b4bfca471ad..3e8f5f383253 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -438,12 +438,14 @@ const config: LinkingOptions['config'] = { [SCREENS.WORKSPACE.TAG_EDIT]: { path: ROUTES.WORKSPACE_TAG_EDIT.route, parse: { + orderWeight: Number, tagName: (tagName: string) => decodeURIComponent(tagName), }, }, [SCREENS.WORKSPACE.TAG_SETTINGS]: { path: ROUTES.WORKSPACE_TAG_SETTINGS.route, parse: { + orderWeight: Number, tagName: (tagName: string) => decodeURIComponent(tagName), }, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 071c2840a9cd..e33534f0f48a 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -216,6 +216,7 @@ type SettingsNavigatorParamList = { }; [SCREENS.WORKSPACE.TAG_SETTINGS]: { policyID: string; + orderWeight: number; tagName: string; }; [SCREENS.WORKSPACE.TAG_LIST_VIEW]: { @@ -228,6 +229,7 @@ type SettingsNavigatorParamList = { }; [SCREENS.WORKSPACE.TAG_EDIT]: { policyID: string; + orderWeight: number; tagName: string; }; [SCREENS.WORKSPACE.TAXES_SETTINGS]: { @@ -800,7 +802,6 @@ type WorkspacesCentralPaneNavigatorParamList = { }; [SCREENS.WORKSPACE.TAGS]: { policyID: string; - tagName: string; }; [SCREENS.WORKSPACE.TAXES]: { policyID: string; diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx index 663cbd4f37be..c2607122e0a1 100644 --- a/src/pages/workspace/tags/EditTagPage.tsx +++ b/src/pages/workspace/tags/EditTagPage.tsx @@ -41,7 +41,7 @@ function EditTagPage({route, policyTags}: EditTagPageProps) { (values: FormOnyxValues) => { const errors: FormInputErrors = {}; const tagName = values.tagName.trim(); - const {tags} = PolicyUtils.getTagList(policyTags, 0); + const {tags} = PolicyUtils.getTagList(policyTags, route.params.orderWeight); if (!ValidationUtils.isRequiredFulfilled(tagName)) { errors.tagName = 'workspace.tags.tagRequiredError'; } else if (tags?.[tagName] && currentTagName !== tagName) { diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx index 1f9d440108ae..a5d6ac194f15 100644 --- a/src/pages/workspace/tags/TagSettingsPage.tsx +++ b/src/pages/workspace/tags/TagSettingsPage.tsx @@ -38,7 +38,7 @@ type TagSettingsPageProps = TagSettingsPageOnyxProps & StackScreenProps PolicyUtils.getTagList(policyTags, 0), [policyTags]); + const policyTag = useMemo(() => PolicyUtils.getTagList(policyTags, route.params.orderWeight), [policyTags]); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`); const {windowWidth} = useWindowDimensions(); @@ -70,7 +70,7 @@ function TagSettingsPage({route, policyTags, navigation}: TagSettingsPageProps) }; const navigateToEditTag = () => { - Navigation.navigate(ROUTES.WORKSPACE_TAG_EDIT.getRoute(route.params.policyID, currentPolicyTag.name)); + Navigation.navigate(ROUTES.WORKSPACE_TAG_EDIT.getRoute(route.params.policyID, route.params.orderWeight, currentPolicyTag.name)); }; const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0; diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index a7636d40f876..ef4c408d4a3b 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -158,7 +158,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { Navigation.navigate(ROUTES.WORKSPACE_TAG_LIST_VIEW.getRoute(policyID, tag.orderWeight)); return; } - Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, tag.value)); + Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, 0, tag.value)); }; const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]); diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx index 5d7eaf79efa1..adf5c5bc63d8 100644 --- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx @@ -117,7 +117,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { ); const navigateToTagSettings = (tag: TagListItem) => { - Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, tag.value)); + Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, route.params.orderWeight, tag.value)); }; const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]); From bab0977996fe05424ba9d40701cafb179dfe8dab Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 16 May 2024 11:44:17 -0700 Subject: [PATCH 02/12] feat: add new parameter to API command --- src/libs/API/parameters/SetPolicyTagsEnabled.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libs/API/parameters/SetPolicyTagsEnabled.ts b/src/libs/API/parameters/SetPolicyTagsEnabled.ts index 86720b84bf8b..fad7229831fd 100644 --- a/src/libs/API/parameters/SetPolicyTagsEnabled.ts +++ b/src/libs/API/parameters/SetPolicyTagsEnabled.ts @@ -5,6 +5,11 @@ type SetPolicyTagsEnabled = { * Array<{name: string; enabled: boolean}> */ tags: string; + /** + * When the tags are imported as multi level tags, the index of the top + * most tag list item + */ + tagListIndex?: number; }; export default SetPolicyTagsEnabled; From 48457f29cb9b47c2e7d8c615163a88b83ddeeb14 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 16 May 2024 11:44:53 -0700 Subject: [PATCH 03/12] feat: pass new param to the API command --- src/libs/actions/Policy.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts index 3e09524e1dd1..e3bf6f3293d2 100644 --- a/src/libs/actions/Policy.ts +++ b/src/libs/actions/Policy.ts @@ -54,6 +54,7 @@ import type { UpdateWorkspaceGeneralSettingsParams, UpdateWorkspaceMembersRoleParams, } from '@libs/API/parameters'; +import type SetPolicyTagsEnabled from '@libs/API/parameters/SetPolicyTagsEnabled'; import type UpdatePolicyAddressParams from '@libs/API/parameters/UpdatePolicyAddressParams'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import DateUtils from '@libs/DateUtils'; @@ -3466,7 +3467,7 @@ function createPolicyTag(policyID: string, tagName: string) { API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, onyxData); } -function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record) { +function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record, tagListIndex?: number) { const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {}; const onyxData: OnyxData = { @@ -3547,9 +3548,10 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record tagsToUpdate[key])), + tagListIndex, }; API.write(WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED, parameters, onyxData); From 11960256712c950f558ca342c3e8593eb221980a Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 16 May 2024 11:45:34 -0700 Subject: [PATCH 04/12] feat: pass the index of the parent tag list item --- src/pages/workspace/tags/WorkspaceViewTagsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx index 09ba086e3a14..39485f45f0a8 100644 --- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx @@ -174,7 +174,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DISABLE, onSelected: () => { setSelectedTags({}); - Policy.setWorkspaceTagEnabled(policyID, tagsToDisable); + Policy.setWorkspaceTagEnabled(policyID, tagsToDisable, route.params.orderWeight); }, }); } @@ -186,7 +186,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.ENABLE, onSelected: () => { setSelectedTags({}); - Policy.setWorkspaceTagEnabled(policyID, tagsToEnable); + Policy.setWorkspaceTagEnabled(policyID, tagsToEnable, route.params.orderWeight); }, }); } From b438c327037216b0a38b4e70d43b499824a427ad Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 16 May 2024 13:19:08 -0700 Subject: [PATCH 05/12] fix: use index to get the correct list of tags --- src/libs/actions/Policy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts index e3bf6f3293d2..2acaf3de6d4b 100644 --- a/src/libs/actions/Policy.ts +++ b/src/libs/actions/Policy.ts @@ -3468,7 +3468,7 @@ function createPolicyTag(policyID: string, tagName: string) { } function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record, tagListIndex?: number) { - const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {}; + const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {}; const onyxData: OnyxData = { optimisticData: [ From 503ca7df825ed9a8f4b491f2af15e64d1c5ebe9c Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Fri, 17 May 2024 18:22:23 +0100 Subject: [PATCH 06/12] lint --- src/pages/workspace/tags/EditTagPage.tsx | 2 +- src/pages/workspace/tags/TagSettingsPage.tsx | 2 +- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx index c2607122e0a1..1f60e9eb6567 100644 --- a/src/pages/workspace/tags/EditTagPage.tsx +++ b/src/pages/workspace/tags/EditTagPage.tsx @@ -50,7 +50,7 @@ function EditTagPage({route, policyTags}: EditTagPageProps) { return errors; }, - [currentTagName, policyTags], + [route.params.orderWeight, currentTagName, policyTags], ); const editTag = useCallback( diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx index a5d6ac194f15..2b9f5d3d527b 100644 --- a/src/pages/workspace/tags/TagSettingsPage.tsx +++ b/src/pages/workspace/tags/TagSettingsPage.tsx @@ -38,7 +38,7 @@ type TagSettingsPageProps = TagSettingsPageOnyxProps & StackScreenProps PolicyUtils.getTagList(policyTags, route.params.orderWeight), [policyTags]); + const policyTag = useMemo(() => PolicyUtils.getTagList(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`); const {windowWidth} = useWindowDimensions(); diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index 07cb36cd2d93..1c2a2b345083 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -154,7 +154,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { }; const navigateToTagSettings = (tag: TagListItem) => { - if (tag.orderWeight != null) { + if (tag.orderWeight !== undefined) { Navigation.navigate(ROUTES.WORKSPACE_TAG_LIST_VIEW.getRoute(policyID, tag.orderWeight)); return; } From 611b3e57e17b3f24dfaff08145de92c959df8478 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Mon, 20 May 2024 17:30:06 -0700 Subject: [PATCH 07/12] chore: make a prop required --- src/libs/actions/Policy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts index 2acaf3de6d4b..08499edc7e5d 100644 --- a/src/libs/actions/Policy.ts +++ b/src/libs/actions/Policy.ts @@ -3467,7 +3467,7 @@ function createPolicyTag(policyID: string, tagName: string) { API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, onyxData); } -function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record, tagListIndex?: number) { +function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record, tagListIndex: number) { const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {}; const onyxData: OnyxData = { From a7064b4906a22b29b12c7f0f627c8c1738860420 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Mon, 20 May 2024 17:31:12 -0700 Subject: [PATCH 08/12] chore: make API parameter required --- src/libs/API/parameters/SetPolicyTagsEnabled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/API/parameters/SetPolicyTagsEnabled.ts b/src/libs/API/parameters/SetPolicyTagsEnabled.ts index fad7229831fd..67928a3227e3 100644 --- a/src/libs/API/parameters/SetPolicyTagsEnabled.ts +++ b/src/libs/API/parameters/SetPolicyTagsEnabled.ts @@ -9,7 +9,7 @@ type SetPolicyTagsEnabled = { * When the tags are imported as multi level tags, the index of the top * most tag list item */ - tagListIndex?: number; + tagListIndex: number; }; export default SetPolicyTagsEnabled; From 788f237443cc067001f5b89b5b71f6cebda43c71 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 22 May 2024 10:15:53 -0700 Subject: [PATCH 09/12] fix: pass missing arguments --- src/pages/workspace/tags/TagSettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx index 1f9d440108ae..abbccc321827 100644 --- a/src/pages/workspace/tags/TagSettingsPage.tsx +++ b/src/pages/workspace/tags/TagSettingsPage.tsx @@ -66,7 +66,7 @@ function TagSettingsPage({route, policyTags, navigation}: TagSettingsPageProps) }; const updateWorkspaceTagEnabled = (value: boolean) => { - setWorkspaceTagEnabled(route.params.policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}}); + setWorkspaceTagEnabled(route.params.policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}}, policyTag.orderWeight); }; const navigateToEditTag = () => { From e1ec259bae3cb582d81956d3e72bf9ced46c6917 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 22 May 2024 10:16:27 -0700 Subject: [PATCH 10/12] pass the default tag list index --- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index eca339be0fc4..a1299b6d4406 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -238,7 +238,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DISABLE, onSelected: () => { setSelectedTags({}); - Policy.setWorkspaceTagEnabled(policyID, tagsToDisable); + Policy.setWorkspaceTagEnabled(policyID, tagsToDisable, 0); }, }); } @@ -250,7 +250,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.ENABLE, onSelected: () => { setSelectedTags({}); - Policy.setWorkspaceTagEnabled(policyID, tagsToEnable); + Policy.setWorkspaceTagEnabled(policyID, tagsToEnable, 0); }, }); } From 8ebd1a9af8f465360a747d8df72e9b899fc4f8d2 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 22 May 2024 10:16:34 -0700 Subject: [PATCH 11/12] fix: test --- tests/actions/PolicyTagTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/actions/PolicyTagTest.ts b/tests/actions/PolicyTagTest.ts index 74ea13f3d139..bb2a56da488d 100644 --- a/tests/actions/PolicyTagTest.ts +++ b/tests/actions/PolicyTagTest.ts @@ -395,7 +395,7 @@ describe('actions/Policy', () => { Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags); }) .then(() => { - Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate); + Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, fakePolicyTags[0].orderWeight); return waitForBatchedUpdates(); }) .then( @@ -468,7 +468,7 @@ describe('actions/Policy', () => { .then(() => { mockFetch?.fail?.(); - Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate); + Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, fakePolicyTags[0].orderWeight); return waitForBatchedUpdates(); }) .then(mockFetch?.resume) From 555fd586457a161e1807467d3d535080b767225c Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 22 May 2024 13:31:43 -0700 Subject: [PATCH 12/12] pass default index manually --- tests/actions/PolicyTagTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/actions/PolicyTagTest.ts b/tests/actions/PolicyTagTest.ts index bb2a56da488d..a0982a78b70a 100644 --- a/tests/actions/PolicyTagTest.ts +++ b/tests/actions/PolicyTagTest.ts @@ -395,7 +395,7 @@ describe('actions/Policy', () => { Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags); }) .then(() => { - Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, fakePolicyTags[0].orderWeight); + Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, 0); return waitForBatchedUpdates(); }) .then( @@ -468,7 +468,7 @@ describe('actions/Policy', () => { .then(() => { mockFetch?.fail?.(); - Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, fakePolicyTags[0].orderWeight); + Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, 0); return waitForBatchedUpdates(); }) .then(mockFetch?.resume)