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.

Sign up for GitHub

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

feat(forms): Horizontal layout #18354

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

feat(forms): Horizontal layout #18354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8c73f8
feat(forms): Horizontal layout
ccailly Dec 2, 2024
fc3a5f5
fix(forms): Twig Lint
ccailly Dec 5, 2024
7945be8
Apply suggestions from code review
ccailly Dec 23, 2024
bc7a3f2
fix(forms): Fix tests
ccailly Dec 23, 2024
368a936
fix(forms): Delay activation of new items to avoid rendering issues i…
ccailly Jan 2, 2025
e9afd1f
fix(forms): Fix height issue
ccailly Jan 6, 2025
2c12494
fix(forms): Fix flickering problem when clicking on a question alread…
ccailly Jan 6, 2025
50c9e86
fix(forms): Fix minor bugs
ccailly Jan 8, 2025
9ace9ff
fix(forms): Fixed 5 files with outdated header
ccailly Jan 8, 2025
0d1ede4
fix(forms): Fix E2E tests
ccailly Jan 8, 2025
491da30
fix(migrations): Update form table schema to include vertical and hor…
ccailly 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
Prev Previous commit
Next Next commit
fix(forms): Fix E2E tests
  • Loading branch information
@ccailly
ccailly committed Jan 13, 2025
commit 0d1ede43c0ec059418e5308af2350cc7bf01ed86
2 changes: 1 addition & 1 deletion js/modules/Forms/EditorController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ export class GlpiFormEditorController
$(this.#target)
.find(`[data-glpi-form-editor-active-${type}]`)
.filter((index, element) => {
if (type === 'form') {
if (type === 'form' || type === 'section') {
return true;
}

Expand Down
2 changes: 2 additions & 0 deletions tests/cypress/e2e/form/form_editor.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,8 @@ describe ('Form editor', () => {
cy.findByRole('textbox', {'name': 'Question name'}).should('have.value', question.name);
cy.findByRole('checkbox', {'name': 'Mandatory'}).should('be.checked');
cy.findByLabelText("Question description").awaitTinyMCE().should('have.text', question.description);

cy.findByRole('textbox', {'name': question.type}).scrollIntoView();
cy.getDropdownByLabelText("Question type").should('have.text', question.type);
});
});
Expand Down
Loading