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

FOUR-11744 / FOUR-11895 / FOUR-12198 #1488

Merged
merged 16 commits into from
Dec 11, 2023
Merged

FOUR-11744 / FOUR-11895 / FOUR-12198 #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
df4c301
FOUR-11744 / FOUR-11895 / FOUR-12198
pmoskrojas Nov 21, 2023
82e0e89
Fix Comments
pmoskrojas Nov 27, 2023
79fad4e
Fix Comments (Search icon color)
pmoskrojas Nov 27, 2023
5314011
FOUR-12201: Adding Accordion to Control Menu and fix some details on …
pmoskrojas Nov 28, 2023
c4059cb
Adding Balloon Popover and refactor code for optimizing performance
pmoskrojas Nov 30, 2023
1aaf3ce
Fix text color for Elements
pmoskrojas Nov 30, 2023
e9e3b99
add openAcordeon method and update tests
karlOS123testing Dec 1, 2023
61065e1
Fix draggable behavior
pmoskrojas Dec 1, 2023
6d6ab6e
Test XSS attack prevent
pmoskrojas Dec 5, 2023
d0acd54
Fix v-html
pmoskrojas Dec 5, 2023
7e30f16
Merge pull request #1490 from ProcessMaker/fix_openAcordeon
pmoskrojas Dec 5, 2023
5d75df7
Fix main svg icon
pmoskrojas Dec 5, 2023
9b267b2
Merge branch 'epic/FOUR-11574' of https://github.com/ProcessMaker/scr…
pmoskrojas Dec 5, 2023
26f24fd
Merge branch 'next' into epic/FOUR-11574
nolanpro Dec 5, 2023
87d5e7c
Fix test cases
karlOS123testing Dec 6, 2023
150d754
Merge pull request #1492 from ProcessMaker/fix_testCases
pmoskrojas Dec 8, 2023
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
352 changes: 278 additions & 74 deletions src/components/vue-form-builder.vue
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/e2e/specs/Builder.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
describe('Screen Builder', () => {
beforeEach(() => {
cy.visit('/');
cy.openAllAcordeon();
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
});
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/specs/ComputedFields.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ describe('Computed fields', () => {
});
it('Create a javascript computed field', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
// Add an input field
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
// Add a second input field
Expand Down Expand Up @@ -118,6 +119,7 @@ describe('Computed fields', () => {

it('Create a computed field with formula', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
// Add an input field
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
// Add a second input field
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/specs/ComputedFieldsReadOnly.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ describe('Computed fields', () => {

it.only('The user should not be able to change a FormDatePicker assigned to a computed property', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
// Add an input field
cy.get('[data-cy=controls-FormDatePicker]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
Expand Down
6 changes: 6 additions & 0 deletions tests/e2e/specs/CustomCss.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
describe('Custom CSS', () => {
it('Shows Modal', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -11,6 +12,7 @@ describe('Custom CSS', () => {

it('Closes Modal', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -24,6 +26,7 @@ describe('Custom CSS', () => {

it('Does Not Save Custom CSS', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -39,6 +42,7 @@ describe('Custom CSS', () => {

it('Saves Custom CSS', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -55,6 +59,7 @@ describe('Custom CSS', () => {

it('Does not add styling to element in design mode', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -70,6 +75,7 @@ describe('Custom CSS', () => {

it('Adds styling to element in preview mode', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand Down
6 changes: 2 additions & 4 deletions tests/e2e/specs/DatePicker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ moment.tz.setDefault('UTC');
describe('Date Picker', () => {
beforeEach(() => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.window().then((win) => {
win.ProcessMaker.user.timezone = 'UTC';
});
Expand Down Expand Up @@ -341,17 +342,14 @@ describe('Date Picker', () => {
});
it("Date picker with Required validation shouldn't allow the user to submit the date if empty", () => {
const date = moment(new Date()).format('MM/DD/YYYY');


cy.showValidationOnLoad();

cy.get('[data-cy=controls-FormDatePicker]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.setMultiselect('[data-cy=inspector-dataFormat]', 'Date');
cy.get('[data-cy=add-rule]').click();
cy.setMultiselect('[data-cy=select-rule]', 'Required');
cy.get('[data-cy=save-rule]').click();
cy.get('[data-cy=controls-FormButton]').last().drag('[data-cy=screen-element-container]', 'bottom');
cy.get('[data-cy=controls-FormButton]').first().drag('[data-cy=screen-element-container]', 'bottom');

cy.get('[data-cy=mode-preview]').click();
cy.get('.invalid-feedback').contains('Field is required');
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/specs/DatePickerTimezone.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ moment.tz.setDefault(timezoneTest);
describe("Date Picker", () => {
beforeEach(() => {
cy.visit("/");
cy.openAcordeon("collapse-1");
cy.window().then((win) => {
win.ProcessMaker.user.timezone = timezoneTest;
});
Expand Down
7 changes: 7 additions & 0 deletions tests/e2e/specs/DefaultValues.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
describe('Default values', () => {
it('Basic default value', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -14,6 +15,7 @@ describe('Default values', () => {

it('Text Input Default value if the variable has the next format "people.firstName"', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=inspector-name]').clear().type('people.firstName');
Expand All @@ -30,6 +32,7 @@ describe('Default values', () => {

it('Select List- Default if the variable has the next format "numbers.int"', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormSelectList]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=inspector-name]').clear().type('number.int');
Expand Down Expand Up @@ -63,6 +66,7 @@ describe('Default values', () => {

it('Javascript default value', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.setPreviewDataInput({name: 'world'});
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
Expand All @@ -78,6 +82,7 @@ describe('Default values', () => {
});
it('Initially checked checkbox', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormCheckbox]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=inspector-initiallyChecked]').click();
Expand All @@ -89,6 +94,7 @@ describe('Default values', () => {
});
it('Dynamic Basic default value', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
// Add an input field
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
// Add a second input field
Expand All @@ -110,6 +116,7 @@ describe('Default values', () => {
});
it('Dynamic Javascript default value', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
// Add an input field
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
// Add a second input field
Expand Down
22 changes: 20 additions & 2 deletions tests/e2e/specs/DeviceVisivilityInspector.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {nodeControls} from '../support/constants.js'
describe('Device Visiblility Inspector', () => {
it('Verify if an input has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -24,6 +25,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a checkbox has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormCheckbox]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -37,6 +39,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a datePicker has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormDatePicker]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -50,6 +53,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FileDownload has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-4");
cy.get('[data-cy=controls-FileDownload]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -63,6 +67,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FileUpload has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-4");
cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -76,6 +81,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormImage has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormImage]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -89,6 +95,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormLoop has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormLoop]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -102,6 +109,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormMultiColumn has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormMultiColumn]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -115,6 +123,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormNestedScreen has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormNestedScreen]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -128,6 +137,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormButton has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormButton]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -141,6 +151,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormRecordList has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormRecordList]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -154,6 +165,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormHtmlViewer has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.get('[data-cy=controls-FormHtmlViewer]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -167,6 +179,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormSelectList has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormSelectList]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -180,6 +193,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Verify if a FormTextArea has device visiblility settings', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormTextArea]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand All @@ -193,6 +207,7 @@ describe('Device Visiblility Inspector', () => {
});
it('Enabled device visiblility', () => {
cy.visit('/');
cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();
cy.get('[data-cy=accordion-Advanced]').click();
Expand Down Expand Up @@ -253,6 +268,7 @@ describe('Device Visiblility Inspector', () => {
cy.visit('/');
//Step 1: Add Loop
addControl('Loop');
cy.openAcordeon("collapse-1");

//Step 2: Add Line input inside the loop
addControlInsideLoop(1,nodeControls.formInput);
Expand Down Expand Up @@ -313,6 +329,8 @@ describe('Device Visiblility Inspector', () => {

it('Verify Device Visibility of controls inside a table', () => {
cy.visit('/');
cy.openAcordeon("collapse-2");
cy.openAcordeon("collapse-1");
//Step 1: Add Loop
addControl('Multicolumn / Table');

Expand Down Expand Up @@ -340,7 +358,8 @@ describe('Device Visiblility Inspector', () => {

it('Verify Device Visibility of controls inside a table mobile', () => {
cy.visit('/');

cy.openAcordeon("collapse-2");
cy.openAcordeon("collapse-1");
//Step 1: Add Table
addControl('Multicolumn / Table');

Expand Down Expand Up @@ -368,7 +387,6 @@ describe('Device Visiblility Inspector', () => {

it('Verify Device Visibility of a control and Visibility Rule', () => {
cy.visit("/");

//Step 1: Add line input control
addControl('Line Input');

Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/specs/FileUpload.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
describe('File Upload', () => {
it('Automatically sets a variable name', () => {
cy.visit('/');
cy.openAcordeon("collapse-4");
//cy.openAcordeon("collapse-1");
cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
cy.get('[data-cy=screen-element-container]').click();

Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/specs/FormImage.spec.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading