Problem/Motivation

Let's start to run the automatic conversion to SDC and UI Patterns 2.x, as provided by the new ui_patterns_legacy sub-module.

Proposed resolution

Run:

$ drush en ui_patterns_legacy
$ drush upm ui_suite_dsfr
$ drush upu ui_suite_dsfr

Remaining tasks

Only one issue found so far:

operator_logo slot in page.html.twig:

  {{ pattern('header', {
    'logo_text': page.logo,
    'operator_logo': page.header_operator_logo,
    'service_title': site_name,
    'service_tagline': site_slogan,
    'tools_links': page.header_tools_links,
    'tools_search': page.header_tools_search,
    'navbar': page.header_navbar,
  }) }}

trigger this: Error: Call to undefined method Drupal\Core\Url::render() in Drupal\Core\Template\Attribute->__toString()

but we don't know yet if it an issue from ui_suite_dsfr, ui_patterns_legacy, ui_patterns 2.x or SDC.

Issue fork ui_suite_dsfr-3419042

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

pdureau created an issue. See original summary.

pdureau opened merge request !55

mogtofu33’s picture

mogtofu33 commented

Some minor errors left (detected with ui_patterns_devel):

Component: ui_suite_dsfr:alert
[dismissible] Boolean value found, but a string, a number, an integer or an object is required
[dismissible] Does not have a value in the enumeration ["","core","custom"]
Component: ui_suite_dsfr:link
[icon] Does not have a value in the enumeration [...]
Component: ui_suite_dsfr:button
[icon] Does not have a value in the enumeration [...]
pdureau’s picture

pdureau commented

I have rebased from 1.0.x branch, and I don't reproduce the issue. Maybe it was fixed by the team.

stephj’s picture

stephj commented

Hello,
i am testing the current code in the MR and found a few minor isues :

- the composer.json requires ui_patterns 1.x
- in the translate component, "links.description" has value "null".

thank you

pdureau’s picture

pdureau commented
Title: Automatic conversion to SDC & UI Patterns 2.x » Conversion to SDC & UI Patterns 2.x

Let's use this MR as the first commit of new 1.1.x branch.

Postponed until #3455354: [2.0.0-beta4] Add a stories specific discovery is done and UIP2 beta4 is released.

Once ready:

  • We run a last time the automatic conversion to SDC we are already doing every few days
  • + manual stuff:
    • remove templates/patterns folder
    • remove ui_suite_dsfr_preprocess_pager
    • remove ui_suite_dsfr_preprocess_breadcrumb
    • switch to new templates in templates/overrides/ui_patterns_library/
    • replace pattern() by component():
      components/france_connect/france_connect.twig:    {{ pattern('link',
components/nav_menu/nav_menu.twig:                  {{ pattern('link', {
components/consent_banner/consent_banner.twig:    pattern('button', {label: 'Accept all'|t,
components/consent_banner/consent_banner.twig:    pattern('button', {label: 'Refuse all'|t,
components/consent_banner/consent_banner.twig:    pattern('button', {label: 'Personalize'|t,
components/consent_banner/consent_banner.twig:  {{ pattern('button_group', {
components/consent_banner/consent_banner.twig:{{ pattern('modal', {
components/consent_banner/consent_banner.twig:  body: pattern('consent_manager', {
components/content_media/content_media.twig:    {{ pattern('transcription', {
components/consent_manager/consent_manager.twig:  {{ pattern('button_group', {
components/consent_manager/consent_manager.twig:    buttons: [pattern('button', {label: 'Confirm my choices'|t})]
</small>
pdureau’s picture

pdureau commented

We also need to get rid of those 3 preprocesses:

function ui_suite_dsfr_preprocess_pattern_footer_menu(array &$variables) {
  foreach ($variables['items'] as &$item) {
    /* Some stuff we can remove... */
    // It seems UrlHelper::setAllowedProtocols() doesn't support mailto.
    if (!str_starts_with(strtolower($item['url']), 'mailto:')
        && UrlHelper::isExternal($item['url'])
        && !UrlHelper::externalIsLocal($item['url'], \Drupal::request()->getSchemeAndHttpHost())) {
      $item['link_attributes']['target'] = '_blank';
    }
  }
}
function ui_suite_dsfr_preprocess_pattern_button(array &$variables) {
  if (empty($variables['url'])) {
    return;
  }
  if ($variables['url'] instanceof MarkupInterface) {
    $variables['url'] = (string) $variables['url'];
  }
  if ($variables['url'] instanceof Url) {
    $variables['url'] = $variables['url']->toString();
  }
  // It seems UrlHelper::setAllowedProtocols() doesn't support mailto.
  if (!str_starts_with(strtolower($variables['url']), 'mailto:')
    && UrlHelper::isExternal($variables['url'])
    && !UrlHelper::externalIsLocal($variables['url'], \Drupal::request()->getSchemeAndHttpHost())) {
    $variables['external'] = TRUE;
  }
}

function ui_suite_dsfr_preprocess_pattern_link(array &$variables) {
  if (empty($variables['url'])) {
    return;
  }
  if ($variables['url'] instanceof MarkupInterface) {
    $variables['url'] = (string) $variables['url'];
  }
  if ($variables['url'] instanceof Url) {
    $variables['url'] = $variables['url']->toString();
  }
  // It seems UrlHelper::setAllowedProtocols() doesn't support mailto.
  if (!str_starts_with(strtolower($variables['url']), 'mailto:')
    && UrlHelper::isExternal($variables['url'])
    && !UrlHelper::externalIsLocal($variables['url'], \Drupal::request()->getSchemeAndHttpHost())) {
    $variables['external'] = TRUE;
  }
}

I don't know how to replace them yet. Maybe I will just remove them and create a 1.x issue to restore their logic elsewhere.

pdureau’s picture

pdureau commented
Title: Conversion to SDC & UI Patterns 2.x » [1.1.x] Conversion to SDC & UI Patterns 2.x
pdureau’s picture

pdureau commented

DONE:

  • LinksSettingsType calls removed
  • UI Patterns 1.x preprocesses removed
  • Switch to new templates in templates/overrides/ui_patterns_library/

Next steps before merging as the first commit of 1.1.x:

Will be moved to dedicated 1.1.x issues (we don't do them now in order to be able to keep rebasing from 1.0.x as long as possible):

  • Remove templates/patterns/ folder and move templates/overrides/ to templates/
  • Restore the features lost by the preprocess removal
  • Replace pattern() Twig function by component()
  • Adopt the new Drupal Core Icon API & UI Icons

1.1.x branch will also benefits from:

pdureau’s picture

pdureau commented

DONE:

  • Intial drush upm ui_suite_dsfr executed
  • LinksSettingsType calls removed
  • UI Patterns 1.x preprocesses removed
  • Switch to new templates in templates/overrides/ui_patterns_library/
  • Update ui_examples
  • Remove Drupal 9 support: ^10.3.4 || ^11

Next steps before merging as the first commit of 1.1.x:

  1. Rebase 1.0.x and run drush upm ui_suite_dsfr after the release of 1.0.2
  2. Remove templates/patterns/ folder and move templates/overrides/ to templates/

Next issues (after this one):

pdureau’s picture

pdureau commented
Title: [1.1.x] Conversion to SDC & UI Patterns 2.x » [1.1.0] Conversion to SDC & UI Patterns 2.x
pdureau’s picture

pdureau commented
Status: Postponed » Needs work
pdureau’s picture

pdureau commented
Assigned: pdureau » Unassigned
Status: Needs work » Fixed

DONE:

  1. Intial drush upm ui_suite_dsfr executed
  2. LinksSettingsType calls removed
  3. UI Patterns 1.x preprocesses removed
  4. Switch to new templates in templates/overrides/ui_patterns_library/
  5. Update ui_examples
  6. Remove Drupal 9 support: ^10.3.4 || ^11. Abd remove ui_patterns_library dependency.
  7. Rebase 1.0.x and run drush upm ui_suite_dsfr after the release of 1.0.2
  8. Remove templates/patterns/ folder and move templates/overrides/ to templates/
  9. Run prettier a last time

Next issues (after this one):

pdureau’s picture

pdureau commented

  • pdureau committed 0b5ea525 on 1.1.x 
    Issue #3419042 by pdureau: Conversion to SDC & UI Patterns 2.x

pdureau opened merge request !122

pdureau closed merge request !122

pdureau’s picture

pdureau commented
Version: 1.0.x-dev » 1.1.x-dev

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.