Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanformio committed Mar 22, 2024
2 parents 201e658 + 9430a58 commit eaae5a6
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [opened, synchronize]

env:
NODE_VERSION: 18.x
NODE_VERSION: 20.x

jobs:
setup:
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Release

on:
push:
tags:
- '*' # This will make sure tag creations also trigger the workflow.

env:
NODE_VERSION: 20.x
AWS_DEFAULT_REGION: us-west-2
AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

jobs:
deploy_to_test:
# if: false
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest

steps:
- run: echo "Triggered by ${{ github.event_name }} event."
- name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
uses: actions/checkout@v3

- name: Setup Ruby and Install Jekyll
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true

- name: Install Jekyll
run: gem install jekyll

- name: Restore node modules from cache
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install awscli
run: |
sudo apt-get update
sudo apt install -y awscli
- name: Release
uses: borales/actions-yarn@v4
with:
cmd: release
19 changes: 18 additions & 1 deletion src/WebformBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export default class WebformBuilder extends Component {
html,
disableBuilderActions: self?.component?.disableBuilderActions,
childComponent: component,
design: self?.options?.design
});
};

Expand Down Expand Up @@ -560,6 +561,7 @@ export default class WebformBuilder extends Component {
attach(element) {
this.on('change', (form) => {
this.populateRecaptchaSettings(form);
this.webform.setAlert(false);
});
return super.attach(element).then(() => {
this.loadRefs(element, {
Expand Down Expand Up @@ -945,6 +947,21 @@ export default class WebformBuilder extends Component {
}
}

if (draggableComponent.uniqueComponent) {
let isCompAlreadyExists = false;
eachComponent(this.webform.components, (component) => {
if (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.`);
return;
}
}

if (target !== source) {
// Ensure the key remains unique in its new container.
BuilderUtils.uniquify(this.findNamespaceRoot(target.formioComponent), info);
Expand Down Expand Up @@ -982,7 +999,7 @@ export default class WebformBuilder extends Component {

const componentInDataGrid = parent.type === 'datagrid';

if (isNew && !this.options.noNewEdit && !info.noNewEdit) {
if (isNew && !this.options.noNewEdit && !info.noNewEdit && !(this.options.design && info.type === 'reviewpage')) {
this.editComponent(info, target, isNew, null, null, { inDataGrid: componentInDataGrid });
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/datagrid/DataGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default class DataGridComponent extends NestedArrayComponent {
}

get canAddColumn() {
return this.builderMode;
return this.builderMode && !this.options.design;
}

render() {
Expand Down

0 comments on commit eaae5a6

Please sign in to comment.