Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/libs/API/parameters/CreatePolicyTagsParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ type CreatePolicyTagsParams = {
* Array<{name: string;}>
*/
tags: string;

/** Optimistic action ID for the "Review your workspace settings" onboarding task the backend completes as a side effect */
completedTaskReportActionID?: string;
};

export default CreatePolicyTagsParams;
3 changes: 3 additions & 0 deletions src/libs/API/parameters/RenamePolicyTagListParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ type RenamePolicyTagListParams = {
oldName: string;
newName: string;
tagListIndex: number;

/** Optimistic action ID for the "Review your workspace settings" onboarding task the backend completes as a side effect */
completedTaskReportActionID?: string;
};

export default RenamePolicyTagListParams;
3 changes: 3 additions & 0 deletions src/libs/API/parameters/RenamePolicyTagsParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ type RenamePolicyTagsParams = {
oldName: string;
newName: string;
tagListIndex: number;

/** Optimistic action ID for the "Review your workspace settings" onboarding task the backend completes as a side effect */
completedTaskReportActionID?: string;
};

export default RenamePolicyTagsParams;
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
type SetPolicyAutoCategorizeNewExpensesParams = {
policyID: string;
enabled: boolean;

/** Optimistic action ID for the "Review your workspace settings" onboarding task the backend completes as a side effect */
completedTaskReportActionID?: string;
};

export default SetPolicyAutoCategorizeNewExpensesParams;
3 changes: 3 additions & 0 deletions src/libs/API/parameters/SetPolicyTagsEnabled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ type SetPolicyTagsEnabled = {
* most tag list item
*/
tagListIndex: number;

/** Optimistic action ID for the "Review your workspace settings" onboarding task the backend completes as a side effect */
completedTaskReportActionID?: string;
};

export default SetPolicyTagsEnabled;
8 changes: 5 additions & 3 deletions src/libs/actions/Policy/Category.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import type {
RemovePolicyCategoryItemizedReceiptsRequiredParams,
RemovePolicyCategoryReceiptsRequiredParams,
RenameWorkspaceCategoriesParams,
SetPolicyAutoCategorizeNewExpensesParams,
SetPolicyCategoryApproverParams,
SetPolicyCategoryAttendeesRequiredParams,
SetPolicyCategoryDescriptionRequiredParams,
Expand Down Expand Up @@ -1259,7 +1260,7 @@ function setWorkspaceRequiresCategory(
API.write(WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));
}

function setPolicyAutoCategorizeNewExpenses(policyID: string, enabled: boolean) {
function setPolicyAutoCategorizeNewExpenses(policyID: string, enabled: boolean, reviewWorkspaceSettingsTaskData: OnboardingTaskCompletionOnyxData = {}) {
const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
optimisticData: [
{
Expand Down Expand Up @@ -1307,12 +1308,13 @@ function setPolicyAutoCategorizeNewExpenses(policyID: string, enabled: boolean)
],
};

const parameters = {
const parameters: SetPolicyAutoCategorizeNewExpensesParams = {
policyID,
enabled,
completedTaskReportActionID: reviewWorkspaceSettingsTaskData.completedTaskReportActionID,
};

API.write(WRITE_COMMANDS.SET_POLICY_AUTO_CATEGORIZE_NEW_EXPENSES, parameters, onyxData);
API.write(WRITE_COMMANDS.SET_POLICY_AUTO_CATEGORIZE_NEW_EXPENSES, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));
}

function setPolicyShowCategoryGLCodes(policyID: string | undefined, showCategoryGLCodes: boolean) {
Expand Down
11 changes: 9 additions & 2 deletions src/libs/actions/Policy/InlineEdit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ function renameCategoryInline(
renamePolicyCategory(policyData, {oldName: currentName, newName: sanitized}, isVendorMatchingBetaEnabled, reviewWorkspaceSettingsTaskData);
}

function renameTagInline(translate: LocalizedTranslate, policyData: PolicyData, oldName: string, newName: string, isVendorMatchingBetaEnabled: boolean | undefined): string | undefined {
function renameTagInline(
translate: LocalizedTranslate,
policyData: PolicyData,
oldName: string,
newName: string,
isVendorMatchingBetaEnabled: boolean | undefined,
reviewWorkspaceSettingsTaskData: OnboardingTaskCompletionOnyxData = {},
): string | undefined {
const sanitized = StringUtils.sanitizeName(newName);
const currentDisplayName = getCleanedTagName(oldName);
const {tags} = getTagList(policyData.tags, 0);
Expand All @@ -80,7 +87,7 @@ function renameTagInline(translate: LocalizedTranslate, policyData: PolicyData,
return getTagNameErrorMessage(translate, tagError, newName);
}

renamePolicyTag(policyData, {oldName, newName: sanitized}, 0, isVendorMatchingBetaEnabled);
renamePolicyTag(policyData, {oldName, newName: sanitized}, 0, isVendorMatchingBetaEnabled, reviewWorkspaceSettingsTaskData);
}

function renameCompanyCardInline(
Expand Down
34 changes: 27 additions & 7 deletions src/libs/actions/Policy/Tag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type PolicyData from '@hooks/usePolicyData/types';
import {getImportFailedFinalModal, getImportFinalModalID, getImportFinalModalOnyxData, waitForImportFinalModal} from '@libs/actions/ImportSpreadsheet';
import * as API from '@libs/API';
import type {
CreatePolicyTagsParams,
EnablePolicyTagsParams,
ImportMultiLevelTagsParams,
OpenPolicyTagsPageParams,
Expand Down Expand Up @@ -66,6 +67,7 @@ type CreatePolicyTagParams = {
policyHasCustomCategories: boolean;
pendingRequiresTagRestore?: boolean;
isVendorMatchingBetaEnabled: boolean | undefined;
reviewWorkspaceSettingsTaskData?: OnboardingTaskCompletionOnyxData;
};

function getEnabledPolicyTagsCount(policyTagList: PolicyTagList) {
Expand Down Expand Up @@ -185,6 +187,7 @@ function createPolicyTag({
policyHasCustomCategories,
pendingRequiresTagRestore,
isVendorMatchingBetaEnabled,
reviewWorkspaceSettingsTaskData = {},
}: CreatePolicyTagParams) {
const {policy, tags: policyTags} = policyData;
const policyID = policy?.id;
Expand Down Expand Up @@ -271,12 +274,13 @@ function createPolicyTag({
}

pushTransactionViolationsOnyxData(onyxData, policyData, isVendorMatchingBetaEnabled, policyRequiresTagOptimisticData, {}, tagListsOptimisticData);
const parameters = {
const parameters: CreatePolicyTagsParams = {
policyID,
tags: JSON.stringify([{name: newTagName}]),
completedTaskReportActionID: reviewWorkspaceSettingsTaskData.completedTaskReportActionID,
};

API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, onyxData);
API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));

const isTaskForCurrentWorkspace = (taskReport: OnyxEntry<Report>) => !taskReport?.policyID || taskReport.policyID === policyID;

Expand Down Expand Up @@ -336,6 +340,7 @@ function setWorkspaceTagEnabled(
tagsToUpdate: Record<string, {name: string; enabled: boolean}>,
tagListIndex: number,
isVendorMatchingBetaEnabled: boolean | undefined,
reviewWorkspaceSettingsTaskData: OnboardingTaskCompletionOnyxData = {},
) {
const policyTagListEntry = PolicyUtils.getTagListEntryByOrderWeight(policyData.tags, tagListIndex);

Expand Down Expand Up @@ -456,9 +461,10 @@ function setWorkspaceTagEnabled(
policyID,
tags: JSON.stringify(Object.keys(tagsToUpdate).map((key) => tagsToUpdate[key])),
tagListIndex,
completedTaskReportActionID: reviewWorkspaceSettingsTaskData.completedTaskReportActionID,
};

API.write(WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED, parameters, onyxData);
API.write(WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));
}

function deletePolicyTags(policyData: PolicyData, tagsToDelete: string[], isVendorMatchingBetaEnabled: boolean | undefined) {
Expand Down Expand Up @@ -622,7 +628,13 @@ function clearPolicyTagListErrors({policyID, tagListIndex, policyTags}: ClearPol
});
}

function renamePolicyTag(policyData: PolicyData, policyTag: {oldName: string; newName: string}, tagListIndex: number, isVendorMatchingBetaEnabled: boolean | undefined) {
function renamePolicyTag(
policyData: PolicyData,
policyTag: {oldName: string; newName: string},
tagListIndex: number,
isVendorMatchingBetaEnabled: boolean | undefined,
reviewWorkspaceSettingsTaskData: OnboardingTaskCompletionOnyxData = {},
) {
const policyID = policyData.policy?.id;
const tagListEntry = PolicyUtils.getTagListEntryByOrderWeight(policyData.tags, tagListIndex);
if (!tagListEntry) {
Expand Down Expand Up @@ -740,9 +752,10 @@ function renamePolicyTag(policyData: PolicyData, policyTag: {oldName: string; ne
oldName: oldTagName,
newName: newTagName,
tagListIndex,
completedTaskReportActionID: reviewWorkspaceSettingsTaskData.completedTaskReportActionID,
};

API.write(WRITE_COMMANDS.RENAME_POLICY_TAG, parameters, onyxData);
API.write(WRITE_COMMANDS.RENAME_POLICY_TAG, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));
}

// Builds a POLICY_TAGS update that sets every tag in the given lists to `enabled`.
Expand Down Expand Up @@ -977,7 +990,13 @@ function importMultiLevelTags(policyID: string, spreadsheet: ImportedSpreadsheet
});
}

function renamePolicyTagList(policyID: string, policyTagListName: {oldName: string; newName: string}, policyTags: OnyxEntry<PolicyTagLists>, tagListIndex: number) {
function renamePolicyTagList(
policyID: string,
policyTagListName: {oldName: string; newName: string},
policyTags: OnyxEntry<PolicyTagLists>,
tagListIndex: number,
reviewWorkspaceSettingsTaskData: OnboardingTaskCompletionOnyxData = {},
) {
const newName = policyTagListName.newName;
const oldName = policyTagListName.oldName;
// Tag list names can repeat, so find the list being renamed by its orderWeight and use its Onyx key, which can differ from its name
Expand Down Expand Up @@ -1027,9 +1046,10 @@ function renamePolicyTagList(policyID: string, policyTagListName: {oldName: stri
oldName,
newName,
tagListIndex,
completedTaskReportActionID: reviewWorkspaceSettingsTaskData.completedTaskReportActionID,
};

API.write(WRITE_COMMANDS.RENAME_POLICY_TAG_LIST, parameters, onyxData);
API.write(WRITE_COMMANDS.RENAME_POLICY_TAG_LIST, parameters, withReviewWorkspaceSettingsTaskData(onyxData, reviewWorkspaceSettingsTaskData));
}

/** extraPolicyUpdate folds a caller's same-save requiresCategory change into this action's single violation recompute. */
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
text: translate('workspace.categories.autoCategorizeNewExpenses'),
value: CONST.POLICY.SECONDARY_ACTIONS.SETTINGS,
shouldCloseModalOnSelect: false,
onSelected: () => setPolicyAutoCategorizeNewExpenses(policyId, !(policy?.autoCategorizeNewExpenses ?? true)),
onSelected: () => setPolicyAutoCategorizeNewExpenses(policyId, !(policy?.autoCategorizeNewExpenses ?? true), getReviewWorkspaceSettingsTaskCompletion()),
numberOfLinesTitle: 0,
shouldIgnoreCompactStyle: true,
innerContainerStyle: styles.alignItemsCenter,
Expand All @@ -374,7 +374,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
isOn: policy?.autoCategorizeNewExpenses ?? true,
accessibilityLabel: translate('workspace.categories.autoCategorizeNewExpenses'),
sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.CATEGORIES.AUTO_CATEGORIZE_SWITCH,
onToggle: (value: boolean) => setPolicyAutoCategorizeNewExpenses(policyId, value),
onToggle: (value: boolean) => setPolicyAutoCategorizeNewExpenses(policyId, value, getReviewWorkspaceSettingsTaskCompletion()),
disabled: !policy?.areCategoriesEnabled || !hasEnabledCategories,
},
});
Expand Down
4 changes: 3 additions & 1 deletion src/pages/workspace/tags/DynamicEditTagPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
import useLocalize from '@hooks/useLocalize';
import usePermissions from '@hooks/usePermissions';
import usePolicyData from '@hooks/usePolicyData';
import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
import useThemeStyles from '@hooks/useThemeStyles';

import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -50,6 +51,7 @@ function DynamicEditTagPage({route}: DynamicEditTagPageProps) {
const currentTagName = getCleanedTagName(route.params.tagName);
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT;
const backPath = useDynamicBackPath(isQuickSettingsFlow ? DYNAMIC_ROUTES.SETTINGS_TAG_EDIT.path : DYNAMIC_ROUTES.WORKSPACE_TAG_EDIT.path);
const getReviewWorkspaceSettingsTaskCompletion = useReviewWorkspaceSettingsTaskCompletion();

const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
Expand All @@ -67,7 +69,7 @@ function DynamicEditTagPage({route}: DynamicEditTagPageProps) {
const tagName = StringUtils.sanitizeName(values.tagName);
// Do not call the API if the edited tag name is the same as the current tag name
if (currentTagName !== tagName) {
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: tagName}, orderWeight, isVendorMatchingBetaEnabled);
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: tagName}, orderWeight, isVendorMatchingBetaEnabled, getReviewWorkspaceSettingsTaskCompletion());
}
Keyboard.dismiss();
Navigation.goBack(backPath);
Expand Down
10 changes: 9 additions & 1 deletion src/pages/workspace/tags/DynamicTagSettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import usePermissions from '@hooks/usePermissions';
import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
import usePolicyData from '@hooks/usePolicyData';
import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
import useScreenBoundDynamicRoute from '@hooks/useScreenBoundDynamicRoute';
import useThemeStyles from '@hooks/useThemeStyles';

Expand Down Expand Up @@ -67,6 +68,7 @@ function DynamicTagSettingsPage({route, navigation}: DynamicTagSettingsPageProps
const {isBetaEnabledOrUnknown} = usePermissions();
const isVendorMatchingBetaEnabled = isBetaEnabledOrUnknown(CONST.BETAS.VENDOR_MATCHING);
const {showConfirmModal} = useConfirmModal();
const getReviewWorkspaceSettingsTaskCompletion = useReviewWorkspaceSettingsTaskCompletion();
const policyData = usePolicyData(policyID);
const {policy, tags: policyTags} = policyData;
const {canWrite: canWriteTags, withReadOnlyFallback} = usePolicyFeatureWriteAccess(policy, CONST.POLICY.POLICY_FEATURE.TAGS);
Expand Down Expand Up @@ -108,7 +110,13 @@ function DynamicTagSettingsPage({route, navigation}: DynamicTagSettingsPageProps
});
return;
}
setWorkspaceTagEnabled(policyData, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}}, policyTag.orderWeight, isVendorMatchingBetaEnabled);
setWorkspaceTagEnabled(
policyData,
{[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}},
policyTag.orderWeight,
isVendorMatchingBetaEnabled,
getReviewWorkspaceSettingsTaskCompletion(),
);
};

const navigateToEditTag = () => {
Expand Down
10 changes: 9 additions & 1 deletion src/pages/workspace/tags/DynamicWorkspaceEditTagsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useDynamicBackPath from '@hooks/useDynamicBackPath';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
import useThemeStyles from '@hooks/useThemeStyles';

import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -43,6 +44,7 @@ function DynamicWorkspaceEditTagsPage({route}: DynamicWorkspaceEditTagsPageProps
const {inputCallbackRef} = useAutoFocusInput();
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT;
const backPath = useDynamicBackPath(isQuickSettingsFlow ? DYNAMIC_ROUTES.SETTINGS_TAGS_EDIT.path : DYNAMIC_ROUTES.WORKSPACE_EDIT_TAGS.path);
const getReviewWorkspaceSettingsTaskCompletion = useReviewWorkspaceSettingsTaskCompletion();

const validateTagName = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
const errors: FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM> = {};
Expand All @@ -66,7 +68,13 @@ function DynamicWorkspaceEditTagsPage({route}: DynamicWorkspaceEditTagsPageProps

const updateTagListName = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
if (values[INPUT_IDS.POLICY_TAGS_NAME] !== tagListName) {
renamePolicyTagList(route.params.policyID, {oldName: tagListName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags, orderWeight);
renamePolicyTagList(
route.params.policyID,
{oldName: tagListName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]},
policyTags,
orderWeight,
getReviewWorkspaceSettingsTaskCompletion(),
);
}
goBackToTagsSettings();
};
Expand Down
8 changes: 5 additions & 3 deletions src/pages/workspace/tags/DynamicWorkspaceViewTagsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import usePermissions from '@hooks/usePermissions';
import usePolicyData from '@hooks/usePolicyData';
import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
import useSearchBackPress from '@hooks/useSearchBackPress';
import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -76,6 +77,7 @@ function DynamicWorkspaceViewTagsPage({route}: DynamicWorkspaceViewTagsProps) {
const {isBetaEnabledOrUnknown} = usePermissions();
const isVendorMatchingBetaEnabled = isBetaEnabledOrUnknown(CONST.BETAS.VENDOR_MATCHING);
const {showConfirmModal} = useConfirmModal();
const getReviewWorkspaceSettingsTaskCompletion = useReviewWorkspaceSettingsTaskCompletion();
const dropdownButtonRef = useRef<ComponentRef<typeof View>>(null);
const isFocused = useIsFocused();
const policyData = usePolicyData(policyID);
Expand Down Expand Up @@ -121,7 +123,7 @@ function DynamicWorkspaceViewTagsPage({route}: DynamicWorkspaceViewTagsProps) {
return;
}

setWorkspaceTagEnabled(policyData, {[tagName]: {name: tagName, enabled: value}}, orderWeight, isVendorMatchingBetaEnabled);
setWorkspaceTagEnabled(policyData, {[tagName]: {name: tagName, enabled: value}}, orderWeight, isVendorMatchingBetaEnabled, getReviewWorkspaceSettingsTaskCompletion());
};

const navigateToTagSettings = (tag: PolicyTag) => {
Expand Down Expand Up @@ -256,7 +258,7 @@ function DynamicWorkspaceViewTagsPage({route}: DynamicWorkspaceViewTagsProps) {
return;
}
setSelectedTags([]);
setWorkspaceTagEnabled(policyData, tagsToDisable, orderWeight, isVendorMatchingBetaEnabled);
setWorkspaceTagEnabled(policyData, tagsToDisable, orderWeight, isVendorMatchingBetaEnabled, getReviewWorkspaceSettingsTaskCompletion());
},
});
}
Expand All @@ -268,7 +270,7 @@ function DynamicWorkspaceViewTagsPage({route}: DynamicWorkspaceViewTagsProps) {
value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
onSelected: () => {
setSelectedTags([]);
setWorkspaceTagEnabled(policyData, tagsToEnable, orderWeight, isVendorMatchingBetaEnabled);
setWorkspaceTagEnabled(policyData, tagsToEnable, orderWeight, isVendorMatchingBetaEnabled, getReviewWorkspaceSettingsTaskCompletion());
},
});
}
Expand Down
Loading
Loading