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.

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

Fix nested Flexible Layout direction problem #7637

Merged
merged 7 commits into from
Apr 18, 2024
Merged

Conversation

charlesh88
Copy link
Contributor

@charlesh88 charlesh88 commented Mar 21, 2024

Closes #7635

  • More specific approach to CSS class application for column vs. row layouts.
  • Added layout direction CSS classing to c-fl-container__frames-holder.
  • Switched toolbar icon and titling for better parity with 'toggle' approach used elsewhere.

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Is this a notable change that will require a special callout in the release notes? For example, will this break compatibility with existing APIs or projects that consume these plugins?

Author Checklist

  • Changes address original issue?
  • Tests included and/or updated with changes?
  • Has this been smoke tested?
  • Have you associated this PR with a type: label? Note: this is not necessarily the same as the original issue.
  • Have you associated a milestone with this PR? Note: leave blank if unsure.
  • Testing instructions included in associated issue OR is this a dependency/testcase change?

Reviewer Checklist

  • Changes appear to address issue?
  • Reviewer has tested changes by following the provided instructions?
  • Changes appear not to be breaking changes?
  • Appropriate automated tests included?
  • Code style and in-line documentation are appropriate?

- More specific approach to CSS class application for column vs. row layouts.
- Added layout direction CSS classing to `c-fl-container__frames-holder`.
- Switched toolbar icon and titling for better parity with
'toggle' approach used elsewhere.
- Cleaned up duped property def in mixin.
@charlesh88 charlesh88 added the bug:regression It used to work. Now it doesn't :( label Mar 21, 2024
@charlesh88 charlesh88 added this to the Target:4.0.0 milestone Mar 21, 2024
@charlesh88 charlesh88 requested review from akhenry and ozyx March 21, 2024 22:48
@akhenry akhenry modified the milestones: Target:4.0.0, Target:4.0.1 Mar 22, 2024
Copy link
Member

@ozyx ozyx left a comment

Choose a reason for hiding this comment

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

Looking good so far, have a few comments and suggestions

- Updated e2e test.
- New computed properties for layout direction.
- CSS code cleanup.
@charlesh88
Copy link
Contributor Author

All change requests addressed, changes pushed including an update to latest master.

@ozyx ozyx self-requested a review March 27, 2024 17:46
@ozyx ozyx added the type:bug label Mar 27, 2024
@codecov-commenter
Copy link

codecov-commenter commented Mar 27, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 56.40%. Comparing base (5a06b51) to head (8e823ab).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7637      +/-   ##
==========================================
- Coverage   56.68%   56.40%   -0.29%     
==========================================
  Files         672      672              
  Lines       27183    27182       -1     
  Branches     2634     2635       +1     
==========================================
- Hits        15409    15331      -78     
- Misses      11447    11521      +74     
- Partials      327      330       +3     
Flag Coverage Δ
e2e-full 23.55% <ø> (-17.98%) ⬇️
e2e-stable 59.99% <ø> (+0.05%) ⬆️
unit 49.20% <0.00%> (-0.03%) ⬇️
Files Coverage Δ
src/plugins/flexibleLayout/toolbarProvider.js 88.46% <ø> (ø)
...s/flexibleLayout/components/ContainerComponent.vue 10.63% <0.00%> (-0.24%) ⬇️
...ugins/flexibleLayout/components/FlexibleLayout.vue 8.05% <0.00%> (+0.10%) ⬆️

... and 11 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5a06b51...8e823ab. Read the comment docs.

Copy link
Member

@ozyx ozyx left a comment

Choose a reason for hiding this comment

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

Good stuff! Couple things remaining:

  • need to fix one failing test which looks to be due to changes in flexible layout behavior
  • this PR needs a quick regression test

@ozyx ozyx self-requested a review April 18, 2024 23:30
@ozyx ozyx added the pr:e2e:couchdb npm run test:e2e:couchdb label Apr 18, 2024
@ozyx ozyx enabled auto-merge (squash) April 18, 2024 23:31
@github-actions github-actions bot removed the pr:e2e:couchdb npm run test:e2e:couchdb label Apr 18, 2024
@ozyx ozyx merged commit a961d7e into master Apr 18, 2024
19 checks passed
@ozyx ozyx deleted the fix/nested-fl-7635 branch April 18, 2024 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug:regression It used to work. Now it doesn't :( type:bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nested Flexible Layouts don't display properly
6 participants