Skip to content

Commit

Permalink
Merge branch 'next-25679/add-aibadge-support-to-system-config-switch'…
Browse files Browse the repository at this point in the history
… into 'trunk'

NEXT-25679 - add AI badge support for system config switch

See merge request shopware/6/product/platform!10669
  • Loading branch information
dfrancos-hub committed Apr 26, 2023
2 parents 75fab02 + 591ed62 commit 2b71521
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: Add AI badge support to system config switch
issue: NEXT-25679

---
# Core
* Changed `src/Core/System/SystemConfig/Schema/config.xsd` to include aiBadge property for input fields.
___
# Administration
* Added conditional to display ai badge in `<sw-base-field>` component.
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ Component.register('sw-base-field', {
default: false,
},

aiBadge: {
type: Boolean,
required: false,
default: false,
},

error: {
type: [Object],
required: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<slot name="label">
{{ label }}
</slot>

<sw-ai-copilot-badge v-if="aiBadge" />

</label>

<sw-help-text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
width: 100%;
margin-bottom: 32px;

.sw-ai-copilot-badge {
height: 18px;
}

.sw-field__label {
display: flex;
line-height: 16px;
Expand Down
1 change: 1 addition & 0 deletions src/Core/System/SystemConfig/Schema/config.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<xs:element name="disabled" type="xs:boolean" minOccurs="0"/>
<xs:element name="copyable" type="xs:boolean" minOccurs="0"/>
<xs:element name="required" type="xs:boolean" minOccurs="0"/>
<xs:element name="aiBadge" type="xs:boolean" minOccurs="0"/>
<xs:element name="label" type="translatableString" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="placeholder" type="translatableString" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="helpText" type="translatableString" minOccurs="0" maxOccurs="unbounded"/>
Expand Down

0 comments on commit 2b71521

Please sign in to comment.