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

Add back navigation feture on record modal #1448

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Add back navigation feture on record modal #1448

merged 1 commit into from
Oct 24, 2023

Conversation

kelanik8
Copy link
Contributor

The following changes are implemented

TODO: Summary

Changes in the user interface:

TODO: Add screenshots, recordings or remove this section

Checklist when submitting a final (!draft) PR

  • Commits are tidied up, squashed if needed and follow guidelines in CONTRIBUTING.md
  • Code builds
  • All existing tests pass
  • All new critical code is covered by tests
  • PR is linked to the relevant issue(s)
  • Rebased with the target branch

@kelanik8 kelanik8 requested a review from Fajfa September 18, 2023 14:15
@kelanik8 kelanik8 self-assigned this Sep 18, 2023
@kelanik8 kelanik8 linked an issue Sep 19, 2023 that may be closed by this pull request
Add proper toolbar navigation when in record modal flow #1388
Closed
@kelanik8 kelanik8 force-pushed the 2023.3.x-feature-back-navigation-on-record-modal branch from adc7557 to f59d90f Compare September 20, 2023 11:49
Fajfa
Fajfa requested changes Sep 20, 2023
View reviewed changes
client/web/compose/src/views/Public/Pages/Records/View.vue Outdated
@@ -270,6 +271,10 @@ export default {
const { recordID } = this.record || {}
return this.getNextAndPrevRecord(recordID)
},

viewHasBack () {
return this.previousPages.length > 0 || this.modalPreviousPages.length > 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If its in module then one is useful if no the other is, this way you can have false positives.

@kelanik8 kelanik8 force-pushed the 2023.3.x-feature-back-navigation-on-record-modal branch from 13d0cdf to 11b3714 Compare October 5, 2023 14:09
@katrinDY
Copy link
Contributor

katrinDY commented Oct 6, 2023 •
edited
Loading

Please, discuss issue and suggestion with Jože before you start making any changes

  • this behaves a bit awkwardly. Maybe replace the back button with close or remove it, since, in this case, there's no 'going back' because the modal should be closed. I think we should provide the back option only if there's a previous view to go to.
    1

  • open a record in a modal -> click on edit -> click on back btn -> I'm redirected to the prev view but the modal is closed
    2

Fajfa
Fajfa approved these changes Oct 16, 2023
View reviewed changes
Copy link
Member

@Fajfa Fajfa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job, if all works as it should looks good to me.

@kelanik8 kelanik8 changed the base branch from 2023.3.x to 2023.9.x October 19, 2023 11:14
@kelanik8 kelanik8 force-pushed the 2023.3.x-feature-back-navigation-on-record-modal branch from cb43d25 to 4b1c1c3 Compare October 19, 2023 11:14
@kelanik8 kelanik8 force-pushed the 2023.3.x-feature-back-navigation-on-record-modal branch from 4b1c1c3 to f2527ef Compare October 24, 2023 12:25
@kelanik8 kelanik8 merged commit f2527ef into 2023.9.x Oct 24, 2023
1 check passed
@kelanik8 kelanik8 deleted the 2023.3.x-feature-back-navigation-on-record-modal branch October 24, 2023 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fajfa Fajfa Fajfa approved these changes

Assignees

@kelanik8 kelanik8

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add proper toolbar navigation when in record modal flow
3 participants
@kelanik8 @katrinDY @Fajfa