Skip to content

Fix for Not found page appearing for private notes list, view and edit pages in deep link #29636

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

Merged
merged 21 commits into from
Nov 6, 2023
Merged

Fix for Not found page appearing for private notes list, view and edit pages in deep link #29636

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
68c00b9
merge main
salonikumawat28 Oct 13, 2023
f0e9684
Merge branch 'main' of https://github.com/Expensify/App
salonikumawat28 Oct 13, 2023
0046065
Fix for private notes deep link showing not found view
salonikumawat28 Oct 14, 2023
f5921f1
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 18, 2023
ded201b
Moving default props outside HOC
salonikumawat28 Oct 18, 2023
10ef16f
Removing underscore omit func use
salonikumawat28 Oct 19, 2023
4c9185b
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 19, 2023
f4b515b
Fixing bug showing not found in empty notes case
salonikumawat28 Oct 19, 2023
f3608fc
Correcting forward ref
salonikumawat28 Oct 20, 2023
61edc03
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 25, 2023
713bdbb
Fixing private notes HOC based on review suggestions
salonikumawat28 Oct 25, 2023
f03f3e1
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 25, 2023
c4d713f
Removing isLoadingPrivateNote dep on userEffect
salonikumawat28 Oct 25, 2023
1668e8f
Fix default value of isLoadingPrivateNote
salonikumawat28 Oct 25, 2023
189e4b3
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 26, 2023
6fd24b1
Resolving merge issue
salonikumawat28 Oct 26, 2023
5da70bb
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Oct 26, 2023
ef41837
Fixing unnecessary server fetch for private notes
salonikumawat28 Oct 26, 2023
07508c7
renaming private notes undefined variable
salonikumawat28 Oct 26, 2023
4b96037
Merge branch 'main' of https://github.com/Expensify/App into issue_27704
salonikumawat28 Nov 6, 2023
b131ffb
Fixing new lint errors
salonikumawat28 Nov 6, 2023
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
138 changes: 55 additions & 83 deletions src/pages/PrivateNotes/PrivateNotesEditPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ import TextInput from '../../components/TextInput';
import CONST from '../../CONST';
import Text from '../../components/Text';
import Form from '../../components/Form';
import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
import reportPropTypes from '../reportPropTypes';
import personalDetailsPropType from '../personalDetailsPropType';
import * as Report from '../../libs/actions/Report';
import useLocalize from '../../hooks/useLocalize';
import OfflineWithFeedback from '../../components/OfflineWithFeedback';
import updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
import ROUTES from '../../ROUTES';
import * as ReportUtils from '../../libs/ReportUtils';
import withReportAndPrivateNotesOrNotFound from '../home/report/withReportAndPrivateNotesOrNotFound';

const propTypes = {
/** All of the personal details for everyone */
Expand All @@ -42,23 +41,14 @@ const propTypes = {
accountID: PropTypes.string,
}),
}).isRequired,

/** Session of currently logged in user */
session: PropTypes.shape({
/** Currently logged in user accountID */
accountID: PropTypes.number,
}),
};

const defaultProps = {
report: {},
session: {
accountID: null,
},
personalDetailsList: {},
};

function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
function PrivateNotesEditPage({route, personalDetailsList, report}) {
const {translate} = useLocalize();

// We need to edit the note in markdown format, but display it in HTML format
Expand All @@ -80,8 +70,6 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
[report.reportID],
);

const isCurrentUserNote = Number(session.accountID) === Number(route.params.accountID);

// To focus on the input field when the page loads
const privateNotesInput = useRef(null);
const focusTimeoutRef = useRef(null);
Expand Down Expand Up @@ -118,72 +106,61 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
includeSafeAreaPaddingBottom={false}
testID={PrivateNotesEditPage.displayName}
>
<FullPageNotFoundView
shouldShow={
_.isEmpty(report) ||
_.isEmpty(report.privateNotes) ||
!_.has(report, ['privateNotes', route.params.accountID, 'note']) ||
!isCurrentUserNote ||
ReportUtils.isArchivedRoom(report)
}
subtitleKey="privateNotes.notesUnavailable"
<HeaderWithBackButton
title={translate('privateNotes.title')}
subtitle={translate('privateNotes.myNote')}
onBackButtonPress={() => Navigation.goBack(ROUTES.PRIVATE_NOTES_VIEW.getRoute(report.repotID, route.params.accountID))}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<Form
formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
onSubmit={savePrivateNote}
style={[styles.flexGrow1, styles.ph5]}
submitButtonText={translate('common.save')}
enabledWhenOffline
>
<HeaderWithBackButton
title={translate('privateNotes.title')}
subtitle={translate('privateNotes.myNote')}
onBackButtonPress={() => Navigation.goBack(ROUTES.PRIVATE_NOTES_VIEW.getRoute(report.repotID, route.params.accountID))}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<Form
formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
onSubmit={savePrivateNote}
style={[styles.flexGrow1, styles.ph5]}
submitButtonText={translate('common.save')}
enabledWhenOffline
<Text style={[styles.mb5]}>
{translate(
Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
? 'privateNotes.sharedNoteMessage'
: 'privateNotes.personalNoteMessage',
)}
</Text>
<OfflineWithFeedback
errors={{
...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
}}
onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
style={[styles.mb3]}
>
<Text style={[styles.mb5]}>
{translate(
Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
? 'privateNotes.sharedNoteMessage'
: 'privateNotes.personalNoteMessage',
)}
</Text>
<OfflineWithFeedback
errors={{
...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
<TextInput
accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
inputID="privateNotes"
label={translate('privateNotes.composerLabel')}
accessibilityLabel={translate('privateNotes.title')}
autoCompleteType="off"
maxLength={CONST.MAX_COMMENT_LENGTH}
autoCorrect={false}
autoGrowHeight
textAlignVertical="top"
containerStyles={[styles.autoGrowHeightMultilineInput]}
defaultValue={privateNote}
value={privateNote}
onChangeText={(text) => {
debouncedSavePrivateNote(text);
setPrivateNote(text);
}}
onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
style={[styles.mb3]}
>
<TextInput
accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
inputID="privateNotes"
label={translate('privateNotes.composerLabel')}
accessibilityLabel={translate('privateNotes.title')}
autoCompleteType="off"
maxLength={CONST.MAX_COMMENT_LENGTH}
autoCorrect={false}
autoGrowHeight
textAlignVertical="top"
containerStyles={[styles.autoGrowHeightMultilineInput]}
defaultValue={privateNote}
value={privateNote}
onChangeText={(text) => {
debouncedSavePrivateNote(text);
setPrivateNote(text);
}}
ref={(el) => {
if (!el) {
return;
}
privateNotesInput.current = el;
updateMultilineInputRange(privateNotesInput.current);
}}
/>
</OfflineWithFeedback>
</Form>
</FullPageNotFoundView>
ref={(el) => {
if (!el) {
return;
}
privateNotesInput.current = el;
updateMultilineInputRange(privateNotesInput.current);
}}
/>
</OfflineWithFeedback>
</Form>
</ScreenWrapper>
);
}
Expand All @@ -194,13 +171,8 @@ PrivateNotesEditPage.defaultProps = defaultProps;

export default compose(
withLocalize,
withReportAndPrivateNotesOrNotFound,
withOnyx({
report: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
},
session: {
key: ONYXKEYS.SESSION,
},
personalDetailsList: {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
},
Expand Down
53 changes: 10 additions & 43 deletions src/pages/PrivateNotes/PrivateNotesListPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useMemo, useEffect} from 'react';
import React, {useMemo} from 'react';
import {withOnyx} from 'react-native-onyx';
import PropTypes from 'prop-types';
import _ from 'underscore';
Expand All @@ -12,19 +12,15 @@ import compose from '../../libs/compose';
import OfflineWithFeedback from '../../components/OfflineWithFeedback';
import MenuItem from '../../components/MenuItem';
import useLocalize from '../../hooks/useLocalize';
import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
import * as Report from '../../libs/actions/Report';
import personalDetailsPropType from '../personalDetailsPropType';
import * as UserUtils from '../../libs/UserUtils';
import reportPropTypes from '../reportPropTypes';
import ScreenWrapper from '../../components/ScreenWrapper';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
import HeaderWithBackButton from '../../components/HeaderWithBackButton';
import {withNetwork} from '../../components/OnyxProvider';
import networkPropTypes from '../../components/networkPropTypes';
import ROUTES from '../../ROUTES';
import * as ReportUtils from '../../libs/ReportUtils';
import withReportAndPrivateNotesOrNotFound from '../home/report/withReportAndPrivateNotesOrNotFound';

const propTypes = {
/** The report currently being looked at */
Expand All @@ -47,8 +43,6 @@ const propTypes = {
/** All of the personal details for everyone */
personalDetailsList: PropTypes.objectOf(personalDetailsPropType),

/** Information about the network */
network: networkPropTypes.isRequired,
...withLocalizePropTypes,
};

Expand All @@ -60,17 +54,9 @@ const defaultProps = {
personalDetailsList: {},
};

function PrivateNotesListPage({report, personalDetailsList, network, session}) {
function PrivateNotesListPage({report, personalDetailsList, session}) {
const {translate} = useLocalize();

useEffect(() => {
if (network.isOffline && report.isLoadingPrivateNotes) {
return;
}
Report.getReportPrivateNote(report.reportID);
// eslint-disable-next-line react-hooks/exhaustive-deps -- do not add isLoadingPrivateNotes to dependencies
}, [report.reportID, network.isOffline]);

/**
* Gets the menu item for each workspace
*
Expand Down Expand Up @@ -124,26 +110,12 @@ function PrivateNotesListPage({report, personalDetailsList, network, session}) {
includeSafeAreaPaddingBottom={false}
testID={PrivateNotesListPage.displayName}
>
<FullPageNotFoundView
shouldShow={
_.isEmpty(report.reportID) ||
(!report.isLoadingPrivateNotes && network.isOffline && _.isEmpty(lodashGet(report, 'privateNotes', {}))) ||
ReportUtils.isArchivedRoom(report)
}
>
<HeaderWithBackButton
title={translate('privateNotes.title')}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView contentContainerStyle={styles.flexGrow1}>
{report.isLoadingPrivateNotes && _.isEmpty(lodashGet(report, 'privateNotes', {})) ? (
<FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
) : (
_.map(privateNotes, (item, index) => getMenuItem(item, index))
)}
</ScrollView>
</FullPageNotFoundView>
<HeaderWithBackButton
title={translate('privateNotes.title')}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView contentContainerStyle={styles.flexGrow1}>{_.map(privateNotes, (item, index) => getMenuItem(item, index))}</ScrollView>
</ScreenWrapper>
);
}
Expand All @@ -154,13 +126,8 @@ PrivateNotesListPage.displayName = 'PrivateNotesListPage';

export default compose(
withLocalize,
withReportAndPrivateNotesOrNotFound,
withOnyx({
report: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
},
session: {
key: ONYXKEYS.SESSION,
},
personalDetailsList: {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
},
Expand Down
59 changes: 24 additions & 35 deletions src/pages/PrivateNotes/PrivateNotesViewPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ import styles from '../../styles/styles';
import compose from '../../libs/compose';
import ONYXKEYS from '../../ONYXKEYS';
import ROUTES from '../../ROUTES';
import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
import reportPropTypes from '../reportPropTypes';
import personalDetailsPropType from '../personalDetailsPropType';
import useLocalize from '../../hooks/useLocalize';
import OfflineWithFeedback from '../../components/OfflineWithFeedback';
import MenuItemWithTopDescription from '../../components/MenuItemWithTopDescription';
import CONST from '../../CONST';
import * as ReportUtils from '../../libs/ReportUtils';
import withReportAndPrivateNotesOrNotFound from '../home/report/withReportAndPrivateNotesOrNotFound';

const propTypes = {
/** All of the personal details for everyone */
Expand Down Expand Up @@ -71,33 +70,28 @@ function PrivateNotesViewPage({route, personalDetailsList, session, report}) {
includeSafeAreaPaddingBottom={false}
testID={PrivateNotesViewPage.displayName}
>
<FullPageNotFoundView
shouldShow={_.isEmpty(report) || _.isEmpty(report.privateNotes) || !_.has(report, ['privateNotes', route.params.accountID, 'note']) || ReportUtils.isArchivedRoom(report)}
subtitleKey="privateNotes.notesUnavailable"
>
<HeaderWithBackButton
title={translate('privateNotes.title')}
onBackButtonPress={() => Navigation.goBack(getFallbackRoute())}
subtitle={isCurrentUserNote ? translate('privateNotes.myNote') : `${lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')} note`}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView style={[styles.flexGrow1]}>
<OfflineWithFeedback pendingAction={lodashGet(report, ['privateNotes', route.params.accountID, 'pendingAction'], null)}>
<MenuItemWithTopDescription
description={translate('privateNotes.composerLabel')}
title={privateNote}
onPress={() => isCurrentUserNote && Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, route.params.accountID))}
shouldShowRightIcon={isCurrentUserNote}
numberOfLinesTitle={0}
shouldRenderAsHTML
brickRoadIndicator={!_.isEmpty(lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
disabled={!isCurrentUserNote}
shouldGreyOutWhenDisabled={false}
/>
</OfflineWithFeedback>
</ScrollView>
</FullPageNotFoundView>
<HeaderWithBackButton
title={translate('privateNotes.title')}
onBackButtonPress={() => Navigation.goBack(getFallbackRoute())}
subtitle={isCurrentUserNote ? translate('privateNotes.myNote') : `${lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')} note`}
shouldShowBackButton
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView style={[styles.flexGrow1]}>
<OfflineWithFeedback pendingAction={lodashGet(report, ['privateNotes', route.params.accountID, 'pendingAction'], null)}>
<MenuItemWithTopDescription
description={translate('privateNotes.composerLabel')}
title={privateNote}
onPress={() => isCurrentUserNote && Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, route.params.accountID))}
shouldShowRightIcon={isCurrentUserNote}
numberOfLinesTitle={0}
shouldRenderAsHTML
brickRoadIndicator={!_.isEmpty(lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
disabled={!isCurrentUserNote}
shouldGreyOutWhenDisabled={false}
/>
</OfflineWithFeedback>
</ScrollView>
</ScreenWrapper>
);
}
Expand All @@ -108,13 +102,8 @@ PrivateNotesViewPage.defaultProps = defaultProps;

export default compose(
withLocalize,
withReportAndPrivateNotesOrNotFound,
withOnyx({
report: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
},
session: {
key: ONYXKEYS.SESSION,
},
personalDetailsList: {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
},
Expand Down
Loading