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

fix(platform): form generator - fix form generator button group alignment #12700

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b5aeb7f
fix(platform): fix form generator radio button alignment
khotcholavaSuzy Nov 4, 2024
d0f9d56
fix(platform): fix form generator button group alignment
khotcholava Nov 7, 2024
6d46963
fix(platform): fix form generator button group alignment
khotcholava Nov 7, 2024
50d3ad0
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholavaSuzy Nov 13, 2024
c3fbfc9
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Nov 20, 2024
5786ac1
fix(platform): grid list click event
khotcholava Nov 20, 2024
69424bc
fix(platform): test trigger
khotcholava Nov 21, 2024
c62f99b
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Nov 21, 2024
07245d5
fix(platform): test trigger
khotcholava Nov 21, 2024
cf7d0bf
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Nov 25, 2024
5cdd432
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Nov 27, 2024
73b6dcc
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Dec 2, 2024
78f8cb9
fix e2e test
khotcholava Dec 2, 2024
17d8ba5
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Dec 4, 2024
4b7b6b9
fix(platform): form generator radio
khotcholava Dec 11, 2024
e9630e2
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
khotcholava Dec 20, 2024
ada6bc2
fix: merge conflicts
mikerodonnell89 Jan 8, 2025
44c3d61
Merge branch 'main' into 11003-form-generator-radio-alignment-fix
mikerodonnell89 Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/docs/platform/input-group/e2e/input-group.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ describe('Input Group should', () => {

await expect(await $$(withFormInputQuestionMark)).toBeTruthy();

await expect(await executeScriptAfterTagAttr(withFormInputAsterixMark, 'content')).toBe('"*"');
await expect(await executeScriptAfterTagAttr(withFormInputAsterixMark, 'content')).toBe('"*" / ""');
await expect((await getText(inputGroupPage.withFormInputErrorTooltip)).trim()).toEqual('Value is required');
});

Expand Down
Empty file.
5 changes: 1 addition & 4 deletions libs/docs/platform/textarea/e2e/textarea.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ describe('Verify Textarea component', () => {
});

it('should not be able enter text in the disabled textarea', async () => {
// Is not fully valid
await expect(await isEnabled(disabledTextArea)).toBe(false);
});

Expand All @@ -122,7 +121,7 @@ describe('Verify Textarea component', () => {

it('should have * if textarea is mandatory', async () => {
const labelAsterisk = await executeScriptAfterTagAttr(detailedTextAreaLabel, 'content');
await expect(labelAsterisk).toBe('"*"');
await expect(labelAsterisk).toBe('"*" / ""');
});

it('should see an error if trying to click empty mandatory textarea', async () => {
Expand Down Expand Up @@ -156,7 +155,6 @@ describe('Verify Textarea component', () => {
});

it('should show error if more than permitted characters were added', async () => {
// need to sendKeys because of the issue with characters counter
await addValue(detailedTextArea, 'test');
await mouseHoverElement(detailedTextArea);
const errorText = await getText(detailedTextAreaErrorMessage);
Expand Down Expand Up @@ -193,7 +191,6 @@ describe('Verify Textarea component', () => {
});

it('should grow if growing option is enabled and no maxLine or maxHeight are ser', async () => {
// TODO: Check if clearValue can be removed setValue clears bu default
await clearValue(withGrowingAndNoLimitsTextarea);
const textareaSize1 = await getElementSize(withGrowingAndNoLimitsTextarea);
await setValue(withGrowingAndNoLimitsTextarea, multiple_lines_text_8_lines);
Expand Down
10 changes: 5 additions & 5 deletions libs/platform/form/form-group/form-group.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
@for (fields of column | fieldGroupRowValue | keyvalue; track $index) {
<div class="fd-col fd-form-group" [class]="xlCol">
@if ($fieldGroup(column.value); as value) {
<div class="fd-row">
<div class="fd-col">
@if (value.label) {
@if (value.label) {
<div class="fd-row">
<div class="fd-col">
<div fdp-form-group-header [fieldGroup]="$index === 0 ? value : null"></div>
}
</div>
</div>
</div>
}
}
@for (field of fields.value; track trackByFieldName($index, field)) {
<div class="fd-row fd-form-item">
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@angular/platform-browser": "18.0.3",
"@angular/platform-browser-dynamic": "18.0.3",
"@angular/router": "18.0.3",
"@fundamental-styles/cx": "0.38.0",
"@fundamental-styles/cx": "0.39.0",
"@nx/angular": "19.2.3",
"@sap-theming/theming-base-content": "11.24.0",
"@stackblitz/sdk": "1.9.0",
Expand All @@ -58,7 +58,7 @@
"fast-deep-equal": "3.1.3",
"focus-trap": "7.1.0",
"focus-visible": "5.2.1",
"fundamental-styles": "0.38.0",
"fundamental-styles": "0.39.0",
"fuse.js": "7.0.0",
"highlight.js": "11.7.0",
"intl": "1.2.5",
Expand Down Expand Up @@ -92,7 +92,7 @@
"@nx/js": "19.2.3",
"@nx/plugin": "19.2.3",
"@nx/workspace": "19.2.3",
"@sap-ui/common-css": "0.38.0",
"@sap-ui/common-css": "0.39.0",
"@schematics/angular": "18.0.4",
"@swc-node/register": "1.9.2",
"@swc/cli": "0.3.12",
Expand Down
Loading
Loading