WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

syncing commit from monorepo. PR: 362, Title: FIO-10116: Submission Capabilities and Fix Form building #6245

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

Open
johnformio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

syncing commit from monorepo. PR: 362, Title: FIO-10116: Submission Capabilities and Fix Form building #6245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 25 additions & 30 deletions src/WebformBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ export default class WebformBuilder extends Component {
params: {
type: 'resource',
limit: 1000000,
select: '_id,title,name,components'
select: '_id,title,name,components',
'tags__ne': 'noBuilderResource'
}
};
if (this.options && this.options.resourceTag) {
Expand All @@ -263,7 +264,7 @@ export default class WebformBuilder extends Component {
}
}
}).catch((err) => {
console.warn(`Could not load project settings: ${err.message || err}`);
console.warn(`${this.t('loadingProjectSettingsError')}: ${err.message || err}`);
});

if (!formio.noProject && !isResourcesDisabled && formio.formsUrl) {
Expand Down Expand Up @@ -392,14 +393,14 @@ export default class WebformBuilder extends Component {
});

if (component.refs.copyComponent) {
this.attachTooltip(component.refs.copyComponent, this.t('Copy'));
this.attachTooltip(component.refs.copyComponent, this.t('copy'));

component.addEventListener(component.refs.copyComponent, 'click', () =>
this.copyComponent(component));
}

if (component.refs.pasteComponent) {
const pasteToolTip = this.attachTooltip(component.refs.pasteComponent, this.t('Paste below'));
const pasteToolTip = this.attachTooltip(component.refs.pasteComponent, this.t('pasteBelow'));

component.addEventListener(component.refs.pasteComponent, 'click', () => {
pasteToolTip.hide();
Expand All @@ -408,7 +409,7 @@ export default class WebformBuilder extends Component {
}

if (component.refs.moveComponent) {
this.attachTooltip(component.refs.moveComponent, this.t('Move'));
this.attachTooltip(component.refs.moveComponent, this.t('move'));
if (this.keyboardActionsEnabled) {
component.addEventListener(component.refs.moveComponent, 'click', () => {
this.moveComponent(component);
Expand All @@ -419,21 +420,21 @@ export default class WebformBuilder extends Component {
const parent = this.getParentElement(element);

if (component.refs.editComponent) {
this.attachTooltip(component.refs.editComponent, this.t('Edit'));
this.attachTooltip(component.refs.editComponent, this.t('edit'));

component.addEventListener(component.refs.editComponent, 'click', () =>
this.editComponent(component.schema, parent, false, false, component.component, { inDataGrid: component.isInDataGrid }));
}

if (component.refs.editJson) {
this.attachTooltip(component.refs.editJson, this.t('Edit JSON'));
this.attachTooltip(component.refs.editJson, this.t('editJson'));

component.addEventListener(component.refs.editJson, 'click', () =>
this.editComponent(component.schema, parent, false, true, component.component));
}

if (component.refs.removeComponent) {
this.attachTooltip(component.refs.removeComponent, this.t('Remove'));
this.attachTooltip(component.refs.removeComponent, this.t('remove'));

component.addEventListener(component.refs.removeComponent, 'click', () =>
this.removeComponent(component.schema, parent, component.component, component));
Expand Down Expand Up @@ -952,32 +953,20 @@ export default class WebformBuilder extends Component {
const compKey = (group === 'resource') ? `component-${key}` : key;
const draggableComponent = this.groups[group]?.components[compKey] || {};

if (draggableComponent.disableSiblings) {
if (draggableComponent.disableSiblings || draggableComponent.uniqueComponent) {
let isCompAlreadyExists = false;
eachComponent(this.webform.components, (component) => {
if (component.type === draggableComponent.schema.type) {
isCompAlreadyExists = true;
return;
}
}, true);
if (isCompAlreadyExists) {
this.webform.redraw();
this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.key} component to one page.`);
return;
}
}

if (draggableComponent.uniqueComponent) {
let isCompAlreadyExists = false;
eachComponent(this.webform.components, (component) => {
if (component.key === draggableComponent.schema.key) {
if (
(draggableComponent.disableSiblings && component.type === draggableComponent.schema.type) ||
(draggableComponent.uniqueComponent && component.component.key === draggableComponent.schema.key)
) {
isCompAlreadyExists = true;
return;
}
}, true);
if (isCompAlreadyExists) {
this.webform.redraw();
this.webform.setAlert('danger', `You cannot add more than one ${draggableComponent.title} component to one page.`);
this.webform.setAlert('danger', this.t('builderUniqueError', { componentKeyOrTitle: _.get(draggableComponent, draggableComponent.uniqueComponent ? 'title' : 'key') }));
return;
}
}
Expand Down Expand Up @@ -1352,12 +1341,19 @@ export default class WebformBuilder extends Component {
highlightInvalidComponents() {
const repeatablePathsComps = this.findComponentsWithRepeatablePaths();
let hasInvalidComponents = false;
// Matches anything expect letters and '_' at the beginning of the key and anything except of letters, numbers,
// '-', '.' and '_' in the rest of the key
const badCharacters = /^[^A-Za-z_]+|[^A-Za-z0-9\-._]+/g;

this.webform.everyComponent((comp) => {
if (repeatablePathsComps.includes(comp.component)) {
comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
hasInvalidComponents = true;
}
else if (comp.key.replace(badCharacters, '') === '') {
comp.setCustomValidity(this.t('apiKeyNotValid', { key: comp.key }));
hasInvalidComponents = true;
}
else {
comp.setCustomValidity();
}
Expand All @@ -1375,7 +1371,6 @@ export default class WebformBuilder extends Component {
* @returns {boolean} - If the component was saved.
*/
saveComponent(component, parent, isNew, original) {
this.editForm.detach();
const parentContainer = parent ? parent.formioContainer : this.container;
const parentComponent = parent ? parent.formioComponent : this;
this.dialog.close();
Expand All @@ -1389,7 +1384,6 @@ export default class WebformBuilder extends Component {
submissionData = submissionData.componentJson || submissionData;
if (submissionData.components && this.originalDefaultValue) {
submissionData.components = this.originalDefaultValue.components;
this.originalDefaultValue = null;
}
const fieldsToRemoveDoubleQuotes = ['label', 'tooltip'];

Expand Down Expand Up @@ -1441,6 +1435,7 @@ export default class WebformBuilder extends Component {
});
}

this.editForm.detach();
this.highlightInvalidComponents();
return Promise.resolve();
}
Expand Down Expand Up @@ -1857,7 +1852,7 @@ export default class WebformBuilder extends Component {
*/
copyComponent(component) {
if (!window.sessionStorage) {
return console.warn('Session storage is not supported in this browser.');
return console.warn(this.t('sessionStorageSupportError'));
}
this.addClass(this.refs.form, 'builder-paste-mode');
window.sessionStorage.setItem('formio.clipboard', JSON.stringify(component.schema));
Expand All @@ -1870,7 +1865,7 @@ export default class WebformBuilder extends Component {
*/
pasteComponent(component) {
if (!window.sessionStorage) {
return console.warn('Session storage is not supported in this browser.');
return console.warn(this.t('sessionStorageSupportError'));
}
this.removeClass(this.refs.form, 'builder-paste-mode');
if (window.sessionStorage) {
Expand Down
Loading