Skip to content

Redesign: rename layouts#11126

Merged
alecslupu merged 39 commits intodevelopfrom
feature/redesign-rename-layouts
Jul 28, 2023
Merged

Redesign: rename layouts#11126
alecslupu merged 39 commits intodevelopfrom
feature/redesign-rename-layouts

Conversation

@entantoencuanto
Copy link
Copy Markdown
Contributor

@entantoencuanto entantoencuanto commented Jul 4, 2023 •
edited
Loading

🎩 What? Why?

This PR:

  • Removes the redesign concerns from controllers and views which enable the redesign to use redesigned versions of layout instead of the legacy ones.
  • Replaces all the legacy layouts with their redesigned versions.
  • Rename all the .erb files with "redesigned" in its name removing the prefix replacing existing files if necessary
  • Changes all explicit references to files with redesign removing the prefix
  • Removes some deprecated partials
  • This PR does not include the redesign changes in admin, so temporarily there is a concern disabling redesign there and some shared components like upload or timeout modal are divided in redesigned version (without the redesign prefix in their names) and the admin version (with admin prefix). In the future only the redesigned version will be used
  • The same redesign disabled concern is applied to system part
  • Refactors layouts in participatory spaces to use application layout in components inside participatory spaces instead of the specific layout of the space, which is specialized to provide the required layout to the views of the space
  • Deprecates the use of participatory_space_wrapper in all modules except consultations, which remains unredesigned
  • Skips consultations failing test because this module won't be redesigned
  • Adapts and fixes broken tests
  • Redesigns initiative signature views that had been left undone in previous PRs

📌 Related Issues

Link your PR to an issue

Testing

Describe the best way to test or validate your PR.

📷 Screenshots

Please add screenshots of the changes you are proposing
Description

♥️ Thank you!

@entantoencuanto entantoencuanto added the project: redesign Barcelona City Council contract label Jul 4, 2023
@entantoencuanto entantoencuanto changed the base branch from develop to feature/redesign-rename-redesigned-cells July 4, 2023 14:03
@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from b0a581a to 64ee957 Compare July 4, 2023 14:04
@entantoencuanto entantoencuanto changed the title Feature/redesign rename layouts Redesign: rename layouts Jul 4, 2023
@ferblape ferblape mentioned this pull request Jul 5, 2023
Merged
@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from b0e75d2 to ee2aa26 Compare July 5, 2023 11:16
@alecslupu
Copy link
Copy Markdown
Contributor

alecslupu commented Jul 6, 2023

@entantoencuanto could we split this PR in 2 smaller ones to make it easier to be reviewed ?

Base automatically changed from feature/redesign-rename-redesigned-cells to feature/redesign July 7, 2023 06:20
@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch 2 times, most recently from 9235585 to 14b192a Compare July 7, 2023 13:40
Base automatically changed from feature/redesign to develop July 10, 2023 09:13
@alecslupu
Copy link
Copy Markdown
Contributor

alecslupu commented Jul 10, 2023

The following commits needs to be cherry picked:

#11126
d32f27d
9efd6b6
f6b6ff1
9fb0717
3902ec2
e47ff9e
bc26866
68f456e
ef4bf18
1e06ef8
9b37b17
a90f04d
a90f04d
7c7295c
81516c6
422e8da
3a0f78c
1374b08
4dfcfb1
f54f904
3356fa8
4d30ca4
f0442c1
84b0104
6863857
d41649f
e7a965a
912c7b8
14b192a
4c0d31d
0c988d7
2136d8d
97c07b7
d2987b9
3e32af0
3f6ae91
8e38abd
e63c943

@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from e63c943 to 86efdfc Compare July 10, 2023 10:44
@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Jul 10, 2023 •
edited
Loading

I've created the branch again starting from develop and cherry-picking the commits of the old branch starting from the first commit of the original one after the feature/redesign-rename-redesigned-cells branch.

I don't know why the tests are not being executed

@alecslupu
Copy link
Copy Markdown
Contributor

alecslupu commented Jul 10, 2023

The tests are being queued . There was a 2000+ actions queued in github for some reasons ... and is still recovering.

@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch 2 times, most recently from d5236c7 to 6a96a0d Compare July 11, 2023 08:52
@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from 6a96a0d to ed9ec54 Compare July 20, 2023 18:42
@entantoencuanto entantoencuanto marked this pull request as ready for review July 21, 2023 10:51
@entantoencuanto entantoencuanto requested a review from ferblape July 21, 2023 10:52
ferblape
ferblape previously approved these changes Jul 21, 2023
View reviewed changes
@ferblape ferblape requested a review from a team July 21, 2023 12:26
@ferblape
Copy link
Copy Markdown
Contributor

ferblape commented Jul 21, 2023

@decidim/maintainers @alecslupu this is the second PR related with cleaning the redesign stuff.

There are still two other PRs pending to be completed, just for you to keep in mind when review this one:

  • remove the skips in the tests (the PR is already in progress and should be ready today or next week)
  • rename the redesigned assets and remove the old ones (JS and CSS)

@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from ed9ec54 to f06cb47 Compare July 25, 2023 10:26
@ferblape
Copy link
Copy Markdown
Contributor

ferblape commented Jul 25, 2023

Hi @alecslupu could you review this one?

alecslupu
alecslupu reviewed Jul 26, 2023
View reviewed changes
alecslupu
alecslupu suggested changes Jul 26, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@alecslupu alecslupu left a comment

Choose a reason for hiding this comment

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

I have analyzed the code and i have some questions and suggestions.

@entantoencuanto entantoencuanto force-pushed the feature/redesign-rename-layouts branch from bb1d101 to 32b5dc0 Compare July 27, 2023 09:29
@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Jul 27, 2023

I have reverted the suggested changes of redesign_enabled from

 !respond_to?(:redesign_enabled?) || redesign_enabled?

to

 respond_to?(:redesign_enabled?) && redesign_enabled?

The condition is temporary and the result is not the same. The first uses redesign by default if the method redesign_enabled? is not available. The parts of the application which respond to redesign_enabled? respond with false currently so the condition can be simplified but those pieces of code are going to dissappear soon so so it's not worth modifying them.

This was referenced Jul 28, 2023
Open
Closed
@alecslupu
Copy link
Copy Markdown
Contributor

alecslupu commented Jul 28, 2023

I could live with this for a small period of time. What needs to happen before si that we start to remove this?

@alecslupu alecslupu merged commit d8b006a into develop Jul 28, 2023
@alecslupu alecslupu deleted the feature/redesign-rename-layouts branch July 28, 2023 06:05
entantoencuanto added a commit that referenced this pull request Jul 28, 2023
@entantoencuanto
Merge branch 'develop' into feature/redesign-staging
85e414a 
* develop:
  Reorder and renumber the RELEASES_NOTES (#11379)
  Add videos services to CSP (youtube-nocookie.com, meet.jit.si, etc) (#11155)
  Alert from frontend errors in critical paths (#10937)
  Redesign: comments issues (#11363)
  Redesign: participatory process steps (#11226)
  Redesign: meetings map (#11383)
  Redesign: rename layouts (#11126)
@andreslucena andreslucena added the type: change PRs that implement a change for an existing feature label Nov 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

+2 more reviewers

@alecslupu alecslupu alecslupu approved these changes

@ferblape ferblape ferblape left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

project: redesign Barcelona City Council contract type: change PRs that implement a change for an existing feature

Projects

No open projects
PX Redesign
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@entantoencuanto @alecslupu @ferblape @furilo @andreslucena