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

Jump to bottom

FIX the logic to check if there is an accounting connection in the workspace #42613

Merged
merged 13 commits into from
May 31, 2024
Merged

FIX the logic to check if there is an accounting connection in the workspace #42613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5bd8959
fix: the logic to check if there is an accounting connection
May 24, 2024
f7281db
chore: use the util function to check if there is an accounting conne…
May 24, 2024
307a361
refactor: rename a boolean variable
May 24, 2024
92cb58f
fix: hide "Delete rate" button when there is an accounting connection
May 25, 2024
afe43f9
Merge branch 'main' into hayata-display-delete-button
May 28, 2024
15bfe46
Merge branch 'main' into hayata-display-delete-button
May 30, 2024
455d50a
chore: use an existing function to check if the object is empty or not
May 30, 2024
7418175
fix: the boolean logic
May 30, 2024
a229004
fix: hide add rate button
May 30, 2024
456003d
disable tax deletion if connected to accounting
s77rt May 30, 2024
f28ed6d
Merge pull request #42881 from s77rt/s77rt-display-delete-button
May 30, 2024
97be907
Merge branch 'main' into hayata-display-delete-button
May 31, 2024
69ae5cf
fix prettier
lakchote May 31, 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
2 changes: 1 addition & 1 deletion src/libs/PolicyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ function extractPolicyIDFromPath(path: string) {
* Whether the policy has active accounting integration connections
*/
function hasAccountingConnections(policy: OnyxEntry<Policy>) {
return Boolean(policy?.connections);
return !isEmptyObject(policy?.connections);
}

function getPathWithoutPolicyID(path: string) {
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/tags/WorkspaceTagsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
const isLoading = !isOffline && policyTags === undefined;

const getHeaderButtons = () => {
const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);

if (selectedTagsArray.length === 0) {
return (
<View style={[styles.w100, styles.flexRow, styles.gap2, isSmallScreenWidth && styles.mb3]}>
{!isThereAnyAccountingConnection && !isMultiLevelTags && (
{!hasAccountingConnections && !isMultiLevelTags && (
<Button
medium
success
Expand All @@ -204,7 +204,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {

const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.TAGS_BULK_ACTION_TYPES>>> = [];

if (!isThereAnyAccountingConnection) {
if (!hasAccountingConnections) {
options.push({
icon: Expensicons.Trashcan,
text: translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'),
Expand Down
22 changes: 13 additions & 9 deletions src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function WorkspaceEditTaxPage({
const {windowWidth} = useWindowDimensions();
const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
const canEdit = policy && PolicyUtils.canEditTaxRate(policy, taxID);
const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);

const toggleTaxRate = () => {
if (!currentTaxRate) {
Expand All @@ -58,14 +59,17 @@ function WorkspaceEditTaxPage({
};

const threeDotsMenuItems: ThreeDotsMenuItem[] = useMemo(
() => [
{
icon: Expensicons.Trashcan,
text: translate('common.delete'),
onSelected: () => setIsDeleteModalVisible(true),
},
],
[translate],
() =>
canEdit && !hasAccountingConnections
? [
{
icon: Expensicons.Trashcan,
text: translate('common.delete'),
onSelected: () => setIsDeleteModalVisible(true),
},
]
: [],
[translate, canEdit, hasAccountingConnections],
);

if (!currentTaxRate) {
Expand All @@ -86,7 +90,7 @@ function WorkspaceEditTaxPage({
<HeaderWithBackButton
title={currentTaxRate?.name}
threeDotsMenuItems={threeDotsMenuItems}
shouldShowThreeDotsButton={!!canEdit && !PolicyUtils.hasAccountingConnections(policy)}
shouldShowThreeDotsButton={threeDotsMenuItems.length > 0}
threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
/>
<OfflineWithFeedback
Expand Down
7 changes: 4 additions & 3 deletions src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function WorkspaceTaxesPage({
const defaultExternalID = policy?.taxRates?.defaultExternalID;
const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
const isFocused = useIsFocused();
const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);

const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
const isConnectedToQbo = Boolean(policy?.connections?.quickbooksOnline);
Expand Down Expand Up @@ -178,7 +179,7 @@ function WorkspaceTaxesPage({
const dropdownMenuOptions = useMemo(() => {
const isMultiple = selectedTaxesIDs.length > 1;
const options: Array<DropdownOption<WorkspaceTaxRatesBulkActionType>> = [];
if (!PolicyUtils.hasAccountingConnections(policy)) {
if (!hasAccountingConnections) {
options.push({
icon: Expensicons.Trashcan,
text: isMultiple ? translate('workspace.taxes.actions.deleteMultiple') : translate('workspace.taxes.actions.delete'),
Expand Down Expand Up @@ -207,11 +208,11 @@ function WorkspaceTaxesPage({
});
}
return options;
}, [policy, selectedTaxesIDs, toggleTaxes, translate]);
}, [hasAccountingConnections, policy?.taxRates?.taxes, selectedTaxesIDs, toggleTaxes, translate]);

const headerButtons = !selectedTaxesIDs.length ? (
<View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
{!PolicyUtils.hasAccountingConnections(policy) && (
{!hasAccountingConnections && (
<Button
medium
success
Expand Down
Loading