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

Release catchup #12148

Merged
merged 11 commits into from
Dec 5, 2024
Merged

Release catchup #12148

merged 11 commits into from
Dec 5, 2024

Conversation

m4olivei and others added 11 commits December 4, 2024 16:51
…12132)

### Description

Cleanup task. CI has been [failing for awhile for the automerge-mastheadv2 job](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/actions/workflows/automerge-mastheadv2.yml). This job was responsible for merging `main` back to the `feat/masthead-v2-dev` whenever `main` was updated. This is no longer necessary as we don't use the `feat/masthead-v2` branch, and it's now quite behind. It fails b/c of merge conclicts there.

### Changelog

**Changed**

- Avoid running e2e-integration test suite on `feat/masthead-*` branches as they are no longer used.

**Removed**

- Removed the `automerge-mastheadv2` job

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
#12130)

… valid

### Related Ticket(s)

Closes # 
[/issues/12121](#12121)

### Description

The e2e-storybook tests have been failing for quite awhile. The tests do not appear to have been updated for v2. In many cases, the tests are using the old v1 prefixes.

The goal here is:

- Fix all skipped tests and align them with what we have in v2.

### Changelog

**New**

- Updated e2e-storybook for feature-card component so that all skipped tests are now running and correctly and doing the proper checkage
…th (#12139)

* fix(leadspace-breadcrumb): leadspace breadcrumb was missing a max-width

* fixing css issues pointed by our checks

---------

Co-authored-by: Andy Blum <[email protected]>
Co-authored-by: Matthew Oliveira <[email protected]>
### Related Ticket(s)
https://jsw.ibm.com/browse/ADCMS-7078

### Description

Removes problematic styles from v2 merge

### Changelog

**Changed**

- minor style fix
### Related Ticket(s)

[JIRA](https://jsw.ibm.com/browse/ADCMS-6840)

### Description

Adding min height to card-group component to ensure the elements have the correct height.

### Changelog

**New**
Adding min height to card-group component to ensure the elements have the correct height.
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
### Related Ticket(s)

[ADCMS-7088](https://jsw.ibm.com/browse/ADCMS-7088)

### Description

As it was, button elements that had no label would adopt any video name fetched by the `<c4d-video-cta-container>` component, which may have been triggered by a completely unrelated CTA. This change now guards against that by ignoring events when the button is not a `cta-type="video"` or does not have the same video id as the fetched video.

### Changelog

**Changed**

- Fixes an issue with buttons not using a label placed on a page with other unrelated video CTAs

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
### Related Ticket(s)

[Noitce & Choice w3 Publisher](https://w3.ibm.com/w3publisher/urx/notice-and-choice-v23)

### Description

Notice & Choice is a legally required component to create a form where IBM collects its customer information.
This section shows the specific product's legal links, terms, and conditions. Along with this, it collects users' consent regarding communication preferences.

### Changelog

**New**
- Combine Email and Phone into a single choice on forms

**Changed**

- Instead of pre-text followed by Email and Phone boxes, combine them into a single checkbox question.
Text planned for this is: "I'd like IBM to use my contact details to keep me informed about products, services and offers. More information on how IBM uses data and ways to opt-out can be found in the IBM Privacy Statement.". "Opt-out" and "IBM Privacy Statement would be linked as usual.

**Removed**

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
### Related Ticket(s)

No ticket. Just quick clean up that I couldn't unsee.

### Description

The use of the `theme.theme` mixin from the `@carbon/styles` package (which is forwarded from `@carbon/themes`) was incorrect. The [second argument is meant to be a map of component tokens](https://github.com/carbon-design-system/carbon/blob/main/packages/themes/scss/_theme.scss#L28). We [already add the set of component tokens we want as includes](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/blob/main/packages/web-components/.storybook/container.scss#L20-L22), and therefore don't need the second argument at all. As it was it produced a `--cds-true:;` CSS variable that was useless in the compiled CSS:

![image](https://github.com/user-attachments/assets/72f0342c-b10a-42f5-a183-019d6964a059)


### Changelog

**Changed**

- Fixed incorrect use of `theme.theme` mixin from `@carbon/styles` package

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
### Related Ticket(s)

[ADCMS-7171](https://jsw.ibm.com/browse/ADCMS-7171)

### Description

Removes the top and bottom implicit padding on the TOC contents in the shadow root.

### Changelog

**Changed**

- Removes the internal top and bottom padding from TOC contents to leave to adopter as in v1

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
### Related Ticket(s)

[ADCMS-7128](https://jsw.ibm.com/browse/ADCMS-7128)

### Description

Fixes some inverse styles for Feature card component. Also adds cta type knobs to the Storybook story and fixes support in `<c4d-feature-card>` component for `cta-type="video"`.

### Changelog

**New**

- Support for `cta-type="video"` in Feature card

**Changed**

- Fixed inverse styles for Feature card component

<!-- React and Web Component deploy previews are enabled by default. -->
<!-- To enable additional available deploy previews, apply the following -->
<!-- labels for the corresponding package: -->
<!-- *** "test: e2e": Codesandbox examples and e2e integration tests -->
<!-- *** "package: services": Services -->
<!-- *** "package: utilities": Utilities -->
<!-- *** "RTL": React / Web Components (RTL) -->
<!-- *** "feature flag": React / Web Components (experimental) -->
Copy link

netlify bot commented Dec 4, 2024

Deploy Preview for ibm-dotcom-web-components ready!

Name Link
🔨 Latest commit ec127c7
🔍 Latest deploy log https://app.netlify.com/sites/ibm-dotcom-web-components/deploys/6750cfcf74f5530008356e2e
😎 Deploy Preview https://deploy-preview-12148--ibm-dotcom-web-components.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

@m4olivei m4olivei left a comment

Choose a reason for hiding this comment

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

Looks good! Percy changes all look expected and familiar to changes we've made in this delta.

@andy-blum andy-blum added the Ready to merge Label for the pull requests that are ready to merge label Dec 4, 2024
@kodiakhq kodiakhq bot merged commit 9fd006f into release/v2.16.0 Dec 5, 2024
18 checks passed
@kodiakhq kodiakhq bot deleted the chore/release-catchup branch December 5, 2024 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready to merge Label for the pull requests that are ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants