Modernize scaffold generator #41210

dhh · 2021-01-22T11:46:40Z

The default scaffold generator should be encouraging the use of partials. It also shouldn't try so hard to style things. We can do such styling as a build-on-top via CSS framework gems, like tailwindcss-rails.

Co-authored-by: Abhay Nikam nikam.abhay1@gmail.com

To prevent conflicts with utility frameworks that might also be resetting base elements.

Shows the usage of partials right from the start. Better compatibility with upgrading to Turbo frames/stream updates.

This should be handled in app stylesheets.

dhh · 2021-01-22T14:29:46Z

If anyone would like to help me wrap this up with correcting tests, I'd appreciate it!

Diogomartf · 2021-01-22T15:53:54Z

If anyone would like to help me wrap this up with correcting tests, I'd appreciate it!

I would like to help, but how do I know which tests I need to correct? All that are failing?
There are some that don't seem related.

Sorry if that might be obvious but it's my first time here ✌️

dhh · 2021-01-22T15:55:40Z

Thanks @Diogomartf! Yes, basically get this PR passing. There are some failing tests in the general suite that won't stop the overall build from passing. You can ignore that. Just all the ones focused on these changes ✌️❤️

railties/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt

railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt

@abhaynikam

Thanks @abhaynikam 🙏

railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt

railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

…youts/application.html.erb.tt Co-authored-by: Haroon Ahmed <haroon.ahmed25@gmail.com>

railties/test/generators/scaffold_controller_generator_test.rb

Co-authored-by: Haroon Ahmed <haroon.ahmed25@gmail.com>

…er as it is

…lesheet_media_default)` https://buildkite.com/rails/rails/builds/74429#3de35026-a6dc-4f4c-b885-9b59e0c89b96/979-1036

`return_only_media_type_on_content_type` will be introduced in Rails 6.2 so the changing of returning Content-Type will happen in a future version of Rails (probably 7.0).

This reverts commit 9d8ff32, reversing changes made to 9cde02e. Need to revert this so I can revert another PR.

…s-enabled" This reverts commit c97f1f1, reversing changes made to ac7851e. We haven't quite tracked down why yet, but this change caused our API to not use the query cache. Our API is Sinatra mixed with Rails. We install the Exectutor in our API so it was installed. However, (some?) production requests were showing 0 query cache hits. jhawthorn found that we likely need this check because if we don't the pools returned will be a different set. He'll send a test later today.

Before this commit, Rails test Rake tasks only load the test files, and the tests only run in an at_exit hook via minitest/autorun. This prevents conditionally running tasks only when tests pass, or even more simply in the right order. As a simple example, if you have: task default: [:test, :rubocop] The rubocop task will run after the test task loads the test files but before the tests actually run. This commit changes the test Rake tasks to shell out to the test runner as a new process. This diverges from previous behavior because now, any changes made in the Rakefile or other code loaded by Rake won't be available to the child process. However this brings the behavior of `rake test` closer to the behavior of `rails test`. Co-authored-by: Adrianna Chang <adrianna.chang@shopify.com>

…n the PR: rails#41210 [ci skip]

abhaynikam · 2021-02-04T12:26:13Z

activerecord/CHANGELOG.md

@@ -38,7 +38,6 @@

    ```ruby
    class User < ApplicationRecord
-      has_many :bookmarks


The association was used below to demonstrate usage of strict_loading on a Model. Is the removal intentional or removed by mistake while rebasing the PR?

mistake, adding back

Raised a PR for it: #41329. Please feel free to close it if you have added the change back 😊

yshmarov · 2021-03-01T18:14:13Z

can't wait to use the new scaffold!

dhh added 2 commits January 22, 2021 12:42

Slim down scaffold css

c696fd7

To prevent conflicts with utility frameworks that might also be resetting base elements.

Use a box-style partial rather than a table

22a8872

Shows the usage of partials right from the start. Better compatibility with upgrading to Turbo frames/stream updates.

dhh added this to the 7.0 milestone Jan 22, 2021

rails-bot bot added the railties label Jan 22, 2021

dhh added 5 commits January 22, 2021 12:47

Correct use of quotes

cb1b5ce

Use modern array-of-strings declaration

a59d64c

Use double quotes for everything

3d495b0

Fix syntax

fb4b549

Remove outdated viewport declaration

1ac2745

This should be handled in app stylesheets.

dhh added good first issue needs work labels Jan 22, 2021

Use double quotes everywhere

e99ec71

rafaelfranca reviewed Jan 22, 2021

View reviewed changes

railties/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt Outdated Show resolved Hide resolved

railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt Outdated Show resolved Hide resolved

abhaynikam mentioned this pull request Jan 23, 2021

Fixes scaffold generator specs #41219

Closed

dhh added 3 commits January 24, 2021 10:44

Use symbols not strings for before_action scoping

63b2ca2

Use human name to deal with double word records

74f3a28

Grab test fixes from #41219

52e5f15

Thanks @abhaynikam 🙏

abhaynikam reviewed Jan 24, 2021

View reviewed changes

railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt Show resolved Hide resolved

dhh added 3 commits January 24, 2021 11:20

Fix tests

d0f2b3f

Use locar var not ivar

46a36d7

Fix capitalization change

9482270

hahmed reviewed Jan 24, 2021

View reviewed changes

railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt Outdated Show resolved Hide resolved

Update railties/lib/rails/generators/rails/app/templates/app/views/la…

b9cca44

…youts/application.html.erb.tt Co-authored-by: Haroon Ahmed <haroon.ahmed25@gmail.com>

hahmed reviewed Jan 24, 2021

View reviewed changes

railties/test/generators/scaffold_controller_generator_test.rb Outdated Show resolved Hide resolved

railties/test/generators/scaffold_controller_generator_test.rb Outdated Show resolved Hide resolved

dhh and others added 3 commits January 24, 2021 13:07

Update railties/test/generators/scaffold_controller_generator_test.rb

91147ee

Co-authored-by: Haroon Ahmed <haroon.ahmed25@gmail.com>

Update railties/test/generators/scaffold_controller_generator_test.rb

651914e

Co-authored-by: Haroon Ahmed <haroon.ahmed25@gmail.com>

Fix test

900cba0

rafaelfranca and others added 12 commits January 28, 2021 15:08

ActionDispatch::Request#content_type now returned Content-Type head…

8fafc97

…er as it is

Disable rubocop suggestions

d90c714

Fix typo in the CHANGELOG

acc08f1

Add config.action_view.stylesheet_media_default to baseline config

e2b6679

Rename the config to make clear it is a boolean

af8c4ec

Add CHANGELOG entry for #41215

0bc559e

Fix CI failure due to `app.config.action_view.delete(:apply_apply_sty…

53fdc46

…lesheet_media_default)` https://buildkite.com/rails/rails/builds/74429#3de35026-a6dc-4f4c-b885-9b59e0c89b96/979-1036

Fix deprecation message s/Rails 6.1 will return/Rails 7.0 will return/

d6925af

`return_only_media_type_on_content_type` will be introduced in Rails 6.2 so the changing of returning Content-Type will happen in a future version of Rails (probably 7.0).

Revert "Merge pull request #41192 from kamipo/dont_return_pools"

7a19e97

This reverts commit 9d8ff32, reversing changes made to 9cde02e. Need to revert this so I can revert another PR.

Fix typo

f0bff35

rails-bot bot added actionmailer actionpack actiontext actionview rails-ujs labels Jan 28, 2021

Merge branch 'main' into modernize-scaffold

6c51242

rails-bot bot added the activerecord label Feb 4, 2021

dhh merged commit 164c2f6 into main Feb 4, 2021

dhh deleted the modernize-scaffold branch February 4, 2021 11:26

abhaynikam added a commit to abhaynikam/rails that referenced this pull request Feb 4, 2021

Fixes the changelog example for strict_loading. Example was updated i…

516c7d4

…n the PR: rails#41210 [ci skip]

abhaynikam reviewed Feb 4, 2021

View reviewed changes

alpaca-tc mentioned this pull request Oct 11, 2021

Fixed bug that occurred when scaffold generated a model with nested namespace. #43365

Merged

fig mentioned this pull request Dec 12, 2021

Self referential link in Scaffold Partial #43843

Closed

takmar mentioned this pull request Dec 12, 2023

[ci skip] Update outdated documentation for Engines #50335

Merged

4 tasks

zzak mentioned this pull request Jan 15, 2024

Downcase the model name in the system scaffolds #50722

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modernize scaffold generator #41210

Modernize scaffold generator #41210

dhh commented Jan 22, 2021 •

edited

dhh commented Jan 22, 2021

Diogomartf commented Jan 22, 2021

dhh commented Jan 22, 2021

abhaynikam Feb 4, 2021

dhh Feb 4, 2021

abhaynikam Feb 4, 2021

yshmarov commented Mar 1, 2021

Modernize scaffold generator #41210

Modernize scaffold generator #41210

Conversation

dhh commented Jan 22, 2021 • edited

dhh commented Jan 22, 2021

Diogomartf commented Jan 22, 2021

dhh commented Jan 22, 2021

abhaynikam Feb 4, 2021

Choose a reason for hiding this comment

dhh Feb 4, 2021

Choose a reason for hiding this comment

abhaynikam Feb 4, 2021

Choose a reason for hiding this comment

yshmarov commented Mar 1, 2021

dhh commented Jan 22, 2021 •

edited