Merge branch 'master' of github.com:formio/formio.js into FIO-7544-ht…

…ml-sanitization-issue

.circleci/config.yml

@@ -19,3 +19,15 @@ jobs:
           command: npm test
       - store_artifacts:
           path: test-results.xml
+
+#########################################################
+## Disables Config (Comment/Remove to re-enable CircleCI)
+#########################################################
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore: /.*/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Version/Branch**
+What release version or branch are you experiencing the behavior
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Create form...
+2. Add component...
+3. Use form...
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what problem would be solved with this suggestion/request.
+
+**Describe the solution you'd like**
+A clear and concise description of what the feature/functionality will accomplish and any acceptance criteria you would expect.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -6,22 +6,27 @@ https://formio.atlassian.net/browse/FIO-XXXX
 
 **What changed?**
 
-*Previously, formio.js ... This PR replaces this behavior by ...*
+*Use this section to provide a summary description of the changes you've made*
 
 **Why have you chosen this solution?**
 
-*Although there were many potential solutions such as ..., [my solution] was best because ...*
+*Use this section to justify your choices*
+
+## Breaking Changes / Backwards Compatibility
+
+*Use this section to describe any potentially breaking changes this PR introduces or any effects this PR might have on backwards compatibility*
 
 ## Dependencies
 
-*This PR depends on the following PRs from other Form.io modules: ...*
+*Use this section to list any dependent changes/PRs in other Form.io modules*
 
 ## How has this PR been tested?
 
-*I added automated tests to cover [all/the following] cases, including ...*
+*Use this section to describe how you tested your changes; if you haven't included automated tests, justify your reasoning*
 
 ## Checklist:
 
+- [ ] I have completed the above PR template
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation (if applicable)
 - [ ] My changes generate no new warnings

.github/workflows/config.yml

@@ -1,60 +1,12 @@
-# name: Build & Test
-
-# on: push
-
-# env:
-#   NODE_VERSION: 18.x
-
-# jobs:
-#   test:
-#     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: Set up Node.js ${{ env.NODE_VERSION }}
-#         uses: actions/setup-node@v3
-#         with:
-#           node-version: ${{ env.NODE_VERSION }}
-#           cache: 'npm'
-
-#       - name: Cache node modules
-#         uses: actions/cache@v3
-#         with:
-#           path: node_modules
-#           key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
-#           restore-keys: |
-#             ${{ runner.os }}-node-
-
-#       - name: Installing dependencies
-#         if: steps.cache.outputs.cache-hit != 'true'
-#         uses: borales/actions-yarn@v4
-#         with:
-#           cmd: install --frozen-lockfile
-
-#       - name: Lint
-#         uses: borales/actions-yarn@v4
-#         with:
-#           cmd: lint
-
-#       - name: Build
-#         uses: borales/actions-yarn@v4
-#         with:
-#           cmd: build
-
-#       - name: Test
-#         uses: borales/actions-yarn@v4
-#         with:
-#           cmd: test
-
 name: Build & Test
 
-on: push
+on:
+  push:
+    branches:
+      - '*' # This will make sure all push events on any branch triggers this workflow.
 
 env:
-  NODE_VERSION: 18.x
+  NODE_VERSION: 20.x
 
 jobs:
   setup:

.github/workflows/release.yml

@@ -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

Changelog.md

@@ -4,7 +4,50 @@ All notable changes to this project will be documented in this file
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased: 5.0.0-rc.27]
+## [Unreleased: 5.0.0-rc.40]
+### Fixed
+ - FIO-7525: fixed an issue where new conditional logic based on select boxes does not work
+ - Fix broken file exclusion patterns
+ - FIO-7146: disable circleci jobs
+ - Pass options to the deleteFile method for file components with URL storage
+ - Wizard: Keep current page after language is changed
+ - FIO-7580, FIO-6475: fixed error events issues and an issue where general server errors quickly disappear from ui
+ - Add conditional to check for new headers object
+ - FIO-7764: Fixes a typo in File component settings
+ - FIO-7773: Adding floating labels to Bootstrap 5 template
+ - FIO-7808: fixed an issue where conditional components inside conditional components lose their value after submission when they are on the same level with editGrid
+ - FIO-7245: Moved Resource component to the contrib library
+ - Fixed an issue with each component recursion.
+ - FIO-7823: fixed an issue where the submission of dataGrid with nested form returns server error
+ - FIO-7809: fixed pdf submission download error
+ - FIO-7786: Fixing Datagrid issue in Settings JSON
+ - FIO-4905: File upload (multi) - aborting upload always cancels the last one in the list
+ - FIO-7642: fixed issues where calculated value with allow override is not recalculated after form/component/row values are reset
+ - FIO-7632: Fixes an issue where HTML tags are added to the HTML5 Select metadata
+ - FIO-4871: fixed calculated value issues
+ - FIO 7603: fixed Edit Grid With Empty Rows Not Submitting Form
+ - FIO-7445: fixed an issue where the interpolated data does not show up on PDF
+ - FIO-7774: added validateWhenHidden option
+ - FIO-7421: Adds ReCaptcha error messages to the translations config
+ - FIO-7804: Added PKCE method for OIDC
+ - FIO-7675: Removed maps key from repo
+ - FIO-2453: Fixes an issue where custom disabled dates are not recalculated
+ - FIO-7395: Fixed the issue with loading nested form
+ - FIO-7996: refactor recaptcha validation
+ - FIO-7899: fixed an issue where saveDraft option does not work and added errors handling for the save draft and restore draft functionality
+ - FIO-7956: fixed an issue where simple condition based on stringified checkbox value is not executed correctly
+ - FIO-7933: added PDF Document Designer
+ - FIO-6632: update-formiojs-test-env-on-tag
+ - FIO-2453: Fixes an issue where custom disabled dates are bot recalculated after for valus is changed
+ - FIO-7395: Fixed the issue with loading nested form
+ - FIO-7807: added sanitizeConfig to global form settings
+ - FIO-7334: Fixes an issue where Radio values do not appear for Action Conditions settings
+ - FIO-8009: fixed display of the required asterisk
+ - FIO-8111: fixed saveDraft Trigger for nested forms
+ - FIO-8109: fixed save draft triggering for nested components
+ - FIO-8146 fixed saveDraft triggering for nested forms after submitting
+
+## 5.0.0-rc.37
 ### Fixed
  - FIO-5967: fixed issue with incorrect string representation for object type
  - FIO-7110: when 'use original revision' is enabled for nested form, submission still displays in current form revision pdfs
@@ -46,6 +89,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - FIO-7602: fixed submission data for Radio with 0s values
  - FIO-4235: fixed confirmation dialog popping up when the data is empty in EditGrid
  - FIO-7577: add skipInEmail comp property to recaptcha
+ - FIO-7514: fixed an isse where new simple conditionals do not work when condition is based on the value of resource select with object value
+ - FIO-7637: add catch block to subform submission loading
+ - FIO-7710: fixed the radio component check that causes an error
+ - FIO-7466: Make tooltips show non-rendered HTML
+ - FIO-7717: Adding license to the Formio types
+ - FIO-7631: fixes an issue where timezone is added to the date in PDF download for TextField with CalendarWidget
+ - FIO-4242: updated input mask for TextField
+ - FIO-7724: fixed metadata for multiple select
+ - FIO-4871: fixed calculated value for data grid component
+ - FIO-7591: error messages wrapping on letter instead of on word
+ - FIO-7548: fixed an issue where select dropdown does not overlap the datagrid and causes vertical scroll
 
 ### Changed
  - Add capability for adding sanitize profiles through sanitizeConfig in options