Problem/Motivation

This started as being just for comment but is expanded to the remaining uses of Claro.

$ git grep -i claro | grep -v core/assets | grep -v .phpstan-baseline.php |  grep -v core/themes/claro | grep -v core/themes/olivero | grep -v MAINTAINERS  | grep -v core/themes/default_admin | grep -v core/modules/search | grep -v baking-mishaps-our-troubleshooting-tips.html | grep -v core/modules/system/system.post_update.php

But some can't be made until Admin is stable.

Steps to reproduce

Proposed resolution

  • core/lib/Drupal/Component/Plugin/DependentPluginInterface.php
  • core/lib/Drupal/Core/Field/FieldItemInterface.php
  • core/lib/Drupal/Core/Render/theme.api.php
  • core/misc/dialog/off-canvas/css/form.css
  • core/misc/dialog/off-canvas/css/form.pcss.css
  • core/modules/block/tests/src/FunctionalJavascript/BlockDragTest.php
  • core/modules/help/tests/src/Functional/HelpTopicTranslatedTestBase.php
  • core/modules/search/modules/search_help/config/optional/block.block.default_admin_help_search.yml
  • core/modules/search/modules/search_help/tests/src/Functional/HelpTopicSearchTest.php
  • core/modules/system/tests/src/Functional/System/ThemeTest.php
  • core/modules/system/tests/src/Functional/Theme/ThemeUninstallConfirmTest.php
  • core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
  • core/tests/README.md
  • core/themes/claro/css/components/form.css
  • core/themes/claro/css/components/form.pcss.css
  • core/themes/olivero/templates/filter/filter-tips.html.twig
  • core/modules/workspaces_ui/css/workspaces.overview.css
  • core/modules/workspaces_ui/css/workspaces.overview.pcss.css
  • core/misc/dialog/off-canvas/css/throbber.css
  • core/misc/dialog/off-canvas/css/throbber.pcss.css
  • core/lib/Drupal/Core/Extension/Command/ExtensionInstallCommand.php
  • core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php
  • core/modules/system/tests/src/Functional/Entity/EntityComputedFieldTest.php
  • core/tests/Drupal/Tests/RequirementsPageTrait.php

Remaining tasks

  • core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php - this requires changing the dumps and is done in a separate issue

User interface changes

Introduced terminology

API changes

Data model changes

Release notes snippet

Issue fork drupal-3621198

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

quietone created an issue. See original summary.

quietone opened merge request !17017

quietone’s picture

quietone commented
Status: Active » Needs review
smustgrave’s picture

smustgrave commented

This one had a lot and no sure what tests have been addressed in other tickets. Example /RequirementsPageTrait.php

quietone’s picture

quietone commented
Issue summary: View changes

Added a grep command to the issue summary.

The example in the above, RequirementsPageTrait.php, is excluded because it is in a test path, /core/tests/Drupal/Tests.

quietone’s picture

quietone commented
Status: Needs review » Active

Setting to Active because I want to make another look at this.

quietone’s picture

quietone commented
Issue summary: View changes
quietone’s picture

quietone commented
Issue summary: View changes
Status: Active » Postponed
quietone’s picture

quietone commented
Title: Change Claro in comments » Change remaining usages of Claro
Issue summary: View changes

I found a test that didn't get updated.

smustgrave’s picture

smustgrave commented

Child issues landed using the grep command I get

core/misc/dialog/off-canvas/css/form.css:183: * Claro injects a "Loading" autocomplete message that affects the positioning
core/misc/dialog/off-canvas/css/form.pcss.css:176: * Claro injects a "Loading" autocomplete message that affects the positioning
core/misc/dialog/off-canvas/css/throbber.css:16: & .ajax-progress, /* This is the CSS class used in Claro. */
core/misc/dialog/off-canvas/css/throbber.pcss.css:9: & .ajax-progress, /* This is the CSS class used in Claro. */
core/modules/workspaces_ui/css/workspaces.overview.css:13:/** @todo Move to Claro theme before Workspaces is marked stable. */
core/modules/workspaces_ui/css/workspaces.overview.pcss.css:6:/** @todo Move to Claro theme before Workspaces is marked stable. */

Moved claro form.pcss.css into claro/components/form.pcss.cs

But the other two throbber.pcss and workspace.overview not 100% do we library-extend it?

quietone’s picture

quietone commented
Issue summary: View changes
quietone’s picture

quietone commented
Status: Postponed » Active
smustgrave’s picture

smustgrave commented

Addressed all but

core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php: 'claro',
core/tests/Drupal/Tests/RequirementsPageTrait.php: 'claro/css/theme/maintenance-page.css' => 'claro-details__wrapper',

Think we need to update the fixtures and that last one may need the same? Wasn't sure.

For the throbber.css and workspaces.overview I did library-overrides and extends.

smustgrave’s picture

smustgrave commented
Issue summary: View changes
smustgrave’s picture

smustgrave commented
Issue summary: View changes
Status: Active » Needs review

Nice removing RequirementsPageTrait broke nothing.

smustgrave’s picture

smustgrave commented

Opened #3624072: Update test fixtures to not use olivero or claro for the fixtures

gábor hojtsy made their first commit to this issue’s fork.

gábor hojtsy’s picture

gábor hojtsy
he/him
Primary language Hungarian
Location Hungary
commented

I think other than the 4 commits. made this looks good :)

jurgenhaas’s picture

jurgenhaas
he/him
Primary language German
Location Gottmadingen
commented
Status: Needs review » Needs work

I went through the MR and tested it locally, Found just one regression with the relocated autocomplete rule that no longer matches. Left a comment and suggestion in the MR. Everything else is looking good and could be RTBC after that fix.

quietone’s picture

quietone commented
Status: Needs work » Needs review

@jurgenhaas, thanks for reviewing this issue!

I make the suggested change and recompiled.

jurgenhaas’s picture

jurgenhaas
he/him
Primary language German
Location Gottmadingen
commented
Status: Needs review » Reviewed & tested by the community

@quietone LGTM, thank you.

  • catch committed 22f61831 on main 
    task: #3621198 Change remaining usages of Claro

By: quietone
By:...
catch’s picture

catch
he/him
Primary language English
commented
Version: main » 11.x-dev
Status: Reviewed & tested by the community » Patch (to be ported)

Committed/pushed to main, thanks!

In a couple of tests I wondered whether they really should use the admin theme or switch to stark, but we're not introducing any new coupling here just moving it around.

Will need a backport MR for 11.x

smustgrave opened merge request !17184

smustgrave’s picture

smustgrave commented
Status: Patch (to be ported) » Reviewed & tested by the community

Green backport

larowlan’s picture

larowlan
Location 🇦🇺🏝.au GMT+10
commented
Status: Reviewed & tested by the community » Fixed

Committed and pushed ac1a2e09279 to 11.x. Thanks!

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

  • larowlan committed ac1a2e09 on 11.x 
    task: #3621198 Change remaining usages of Claro

By: quietone
By:...