Merge branch 'master' of github.com:surveyjs/survey-library into feat…

…ure/layout
surveyjs · Jun 17, 2024 · ddc3427 · ddc3427
2 parents 355ea55 + 9cb2b14
commit ddc3427
Show file tree

Hide file tree

Showing 71 changed files with 1,333 additions and 719 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.11.2](https://github.com/surveyjs/survey-library/compare/v1.11.1...v1.11.2) (2024-06-11)
+
+## [1.11.1](https://github.com/surveyjs/survey-library/compare/v1.10.6...v1.11.1) (2024-06-06)
+
 ## [1.10.6](https://github.com/surveyjs/survey-library/compare/v1.10.5...v1.10.6) (2024-05-28)
 
 ## [1.10.5](https://github.com/surveyjs/survey-library/compare/v1.10.4...v1.10.5) (2024-05-21)

diff --git a/build-packages.yml b/build-packages.yml
@@ -779,3 +779,99 @@ jobs:
         PathtoPublish: "$(Build.ArtifactStagingDirectory)/SurveyJSLibraryBuild/"
         ArtifactName: "SurveyJSLibraryBuildVue3"
         publishLocation: "Container"
+
+- job: JqueryUI
+  dependsOn:
+    - NPMCache
+
+  steps:
+    - checkout: self
+    - checkout: EmptyRepo
+      persistCredentials: true
+      clean: true
+
+    - task: NodeTool@0
+      inputs:
+        versionSpec: "14.x"
+      displayName: "Install Node.js"
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: "$(Build.SourcesDirectory)/survey-library/"
+        Contents: "package.json"
+        TargetFolder: "$(Build.SourcesDirectory)/Temp/"
+        OverWrite: true
+      displayName: "Copy package.json for cache key"
+    - task: Cache@2
+      inputs:
+        key: 'npm-cache-library | $(Build.SourcesDirectory)/Temp/package.json'
+        path: $(Build.SourcesDirectory)/survey-library/node_modules
+        cacheHitVar: NPM_CACHE_RESTORED
+      displayName: Cache NPM
+
+    # setup next release version
+    - task: DownloadBuildArtifacts@0
+      inputs:
+        buildType: "specific"
+        project: "af2804d2-859a-4705-9ef5-cdf46d1d5d4f"
+        pipeline: "47"
+        buildVersionToDownload: "latest"
+        downloadType: "single"
+        artifactName: "ReleaseVersionFile"
+        downloadPath: "$(System.ArtifactsDirectory)"
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: "$(System.ArtifactsDirectory)/ReleaseVersionFile/"
+        Contents: "version.txt"
+        TargetFolder: "$(Build.SourcesDirectory)/"
+        OverWrite: true
+      displayName: "Copy Build Artifact - SurveyJSVersion File"
+
+    - powershell: |
+        $version = Get-Content $(Build.SourcesDirectory)/version.txt
+        Write-Host "##vso[task.setvariable variable=SurveyJSVersion;]$version"
+      displayName: "setup SurveyJSVersion variable from SurveyJSVersionFile"
+    ##########################################################################
+
+    - task: Npm@1
+      displayName: 'NPM install'
+      inputs:
+        command: install
+        verbose: false
+        workingDir: $(Build.SourcesDirectory)/survey-library
+      condition: ne(variables.NPM_CACHE_RESTORED, 'true')
+
+    - script: |
+        cd $(Build.SourcesDirectory)/survey-library
+        npm run release -- --release-as $(SurveyJSVersion)
+        git status
+      displayName: "npm run release"
+
+    - script: |
+        cd $(Build.SourcesDirectory)/survey-library
+        npm run build_core
+        npm run build_i18n
+        npm run build-plugins
+      displayName: "Build Core"
+
+    - script: |
+        cd $(Build.SourcesDirectory)/survey-library
+        npm run build_jquery_ui
+      displayName: "Build jquery-ui"
+
+    - script: |
+        cd $(Build.SourcesDirectory)/survey-library
+        npm run testcafe:jquery-ui:ci
+      displayName: "run functional tests"
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: "$(Build.SourcesDirectory)/survey-library/build/survey-jquery-ui"
+        TargetFolder: "$(Build.ArtifactStagingDirectory)/SurveyJSLibraryBuild/packages/survey-jquery-ui"
+
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: "$(Build.ArtifactStagingDirectory)/SurveyJSLibraryBuild/"
+        ArtifactName: "SurveyJSLibraryBuildJQueryUI"
+        publishLocation: "Container"
diff --git a/devops-pull-requests-parallel-jobs.yml b/devops-pull-requests-parallel-jobs.yml
@@ -303,66 +303,81 @@ jobs:
         npm run testcafe:ci:vue3
       displayName: "run functional tests"
 
-# - job: JqueryUIPreact
-#   steps:
-#     - checkout: self
-#       persistCredentials: true
-#       clean: true
-
-#     - task: NodeTool@0
-#       inputs:
-#         versionSpec: "14.x"
-#       displayName: "Install Node.js"
-
-#     - task: CopyFiles@2
-#       inputs:
-#         SourceFolder: "$(Build.SourcesDirectory)/"
-#         Contents: "package.json"
-#         TargetFolder: "$(Build.SourcesDirectory)/Temp/"
-#         OverWrite: true
-#       displayName: "Copy package.json for cache key"
-
-#     - task: Cache@2
-#       inputs:
-#         key: 'npm-cache-library | $(Build.SourcesDirectory)/Temp/package.json'
-#         path: $(Build.SourcesDirectory)/node_modules
-#         cacheHitVar: NPM_CACHE_RESTORED
-#       displayName: Cache NPMs
-
-#     - task: Npm@1
-#       displayName: 'NPM install'
-#       inputs:
-#         command: install
-#         verbose: false
-#       condition: ne(variables.NPM_CACHE_RESTORED, 'true')
-
-#     - script: |
-#         npm run build_core
-#         npm run build_i18n
-#         npm run build-plugins
-#       displayName: "Build Core"
-
-#     - script: |
-#         npm run build_jquery-ui_prod
-#       displayName: "Build jquery-ui_prod"
-
-#     - script: |
-#         npm run test:postcss
-#       displayName: "check postcss compatibility"
-
-#     - script: |
-#         npm run testsingle
-#       displayName: "run unit tests"
-
-#     - script: |
-#         npm run lint
-#       displayName: "eslint check"
+- job: JqueryUI
+  steps:
+    - checkout: self
+      persistCredentials: true
+      clean: true
+
+    - task: NodeTool@0
+      inputs:
+        versionSpec: "14.x"
+      displayName: "Install Node.js"
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: "$(Build.SourcesDirectory)/"
+        Contents: "package.json"
+        TargetFolder: "$(Build.SourcesDirectory)/Temp/"
+        OverWrite: true
+      displayName: "Copy package.json for cache key"
+    - task: Cache@2
+      inputs:
+        key: 'npm-cache-library | $(Build.SourcesDirectory)/Temp/package.json'
+        path: $(Build.SourcesDirectory)/node_modules
+        cacheHitVar: NPM_CACHE_RESTORED
+      displayName: Cache NPM
+
+    # setup next release version
+    - task: DownloadBuildArtifacts@0
+      inputs:
+        buildType: "specific"
+        project: "af2804d2-859a-4705-9ef5-cdf46d1d5d4f"
+        pipeline: "47"
+        buildVersionToDownload: "latest"
+        downloadType: "single"
+        artifactName: "ReleaseVersionFile"
+        downloadPath: "$(System.ArtifactsDirectory)"
+
+    - task: CopyFiles@2
+      inputs:
+        SourceFolder: "$(System.ArtifactsDirectory)/ReleaseVersionFile/"
+        Contents: "version.txt"
+        TargetFolder: "$(Build.SourcesDirectory)/"
+        OverWrite: true
+      displayName: "Copy Build Artifact - SurveyJSVersion File"
+
+    - powershell: |
+        $version = Get-Content $(Build.SourcesDirectory)/version.txt
+        Write-Host "##vso[task.setvariable variable=SurveyJSVersion;]$version"
+      displayName: "setup SurveyJSVersion variable from SurveyJSVersionFile"
+    ##########################################################################
+
+    - task: Npm@1
+      displayName: 'NPM install'
+      inputs:
+        command: install
+        verbose: false
+        workingDir: $(Build.SourcesDirectory)
+      condition: ne(variables.NPM_CACHE_RESTORED, 'true')
+
+    - script: |
+        cd $(Build.SourcesDirectory)
+        npm run release -- --release-as $(SurveyJSVersion)
+        git status
+      displayName: "npm run release"
+
+    - script: |
+        npm run build_core
+        npm run build_i18n
+        npm run build-plugins
+      displayName: "Build Core"
 
-    # - script: |
-    #     npm run test:jquery-ui:single
-    #   displayName: "run markup tests"
+    - script: |
+        npm run build_jquery_ui_prod
+      displayName: "Build jquery-ui"
 
-    # - script: |
-    #     npm run testcafe:jquery-ui
-    #   displayName: "run functional tests"
+    - script: |
+        npm run testcafe:jquery-ui:ci
+      displayName: "run functional tests"
 
diff --git a/devops-visual-regression-tests.yml b/devops-visual-regression-tests.yml
@@ -370,4 +370,71 @@ jobs:
         ArtifactName: 'Library_Vue3_VRT'
         publishLocation: 'Container'
       condition: always()
-      displayName: 'publish vrt artifacts'
+      displayName: 'publish vrt artifacts'
+
+- job: JqueryUI
+  steps:
+  - checkout: self
+
+  - task: PowerShell@2
+    displayName: 'update Google Chrome to latest'
+    inputs:
+      targetType: 'inline'
+      script: '$Path = $env:TEMP; $Installer = ''chrome_installer.exe''; Invoke-WebRequest -Uri ''http://dl.google.com/chrome/install/375.126/chrome_installer.exe'' -OutFile $Path\$Installer; Start-Process -FilePath $Path\$Installer -Args ''/silent /install'' -Verb RunAs -Wait; Remove-Item -Path $Path\$Installer'
+
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '14.x'
+    displayName: 'Install Node.js'
+
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: "$(Build.SourcesDirectory)/"
+      Contents: "package.json"
+      TargetFolder: "$(Build.SourcesDirectory)/Temp/"
+      OverWrite: true
+    displayName: "Copy package.json for cache key"
+  - task: Cache@2
+    inputs:
+      key: 'npm-cache-library | $(Build.SourcesDirectory)/Temp/package.json'
+      path: $(Build.SourcesDirectory)/node_modules
+      cacheHitVar: NPM_CACHE_RESTORED
+    displayName: Cache NPM
+
+  - task: Npm@1
+    displayName: 'NPM install'
+    inputs:
+      command: install
+      verbose: false
+    condition: ne(variables.NPM_CACHE_RESTORED, 'true')
+
+  - script: |
+      npm run build_core
+      npm run build_i18n
+      npm run build-plugins
+    displayName: "Build Core"
+
+  - script: |
+      npm run build_jquery_ui_prod
+    displayName: "Build jquery-ui"
+
+  - script: |
+      npm run vrt:jquery-ui:ci
+    displayName: "Visual Regression Tests"
+
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: '$(Build.SourcesDirectory)/visualRegressionTests'
+      Contents: '**'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/Library_JqueryUI_VRT'
+      OverWrite: true
+    condition: always()
+    displayName: 'copy vrt artifacts'
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/Library_JqueryUI_VRT/'
+      ArtifactName: 'Library_JqueryUI_VRT'
+      publishLocation: 'Container'
+    condition: always()
+    displayName: 'publish vrt artifacts'
diff --git a/docs/design-survey-conditional-logic.md b/docs/design-survey-conditional-logic.md
@@ -482,7 +482,7 @@ Returns the sum of numbers taken from a specified data field. This data field is
 
 The following code sums up values from a `"total"` matrix column but includes only the rows with a `"categoryId"` column equaling 1:
 
-*Example*: `"expression": "sumInArray({matrixdynamic}, 'total', '{categoryId} = 1')"`
+*Example*: `"expression": "sumInArray({matrixdynamic}, 'total', {categoryId} = 1)"`
 
 [View Source Code](https://github.com/surveyjs/survey-library/blob/68eb0054dc83d2f45a6daa1042bf7440c8faf007/src/functionsfactory.ts#L164-L171 (linkStyle))
 
@@ -496,7 +496,7 @@ Returns the maximum of numbers taken from a specified data field. This data fiel
 
 The following code finds a maximum value within a `"quantity"` matrix column, but the value should be under 100:
 
-*Example*: `"expression": "maxInArray({matrixdynamic}, 'quantity', '{quantity} < 100')"`
+*Example*: `"expression": "maxInArray({matrixdynamic}, 'quantity', {quantity} < 100)"`
 
 [View Source Code](https://github.com/surveyjs/survey-library/blob/68eb0054dc83d2f45a6daa1042bf7440c8faf007/src/functionsfactory.ts#L181-L187 (linkStyle))
 
@@ -510,7 +510,7 @@ Returns the minimum of numbers taken from a specified data field. This data fiel
 
 The following code finds a minimum value within a `"quantity"` matrix column but searches for it only in the rows with a `"categoryId"` column equaling 1 and includes only positive values:
 
-*Example*: `"expression": "minInArray({matrixdynamic}, 'quantity', '{quantity} > 0 and {categoryId} = 1')"`
+*Example*: `"expression": "minInArray({matrixdynamic}, 'quantity', {quantity} > 0 and {categoryId} = 1)"`
 
 [View Source Code](https://github.com/surveyjs/survey-library/blob/68eb0054dc83d2f45a6daa1042bf7440c8faf007/src/functionsfactory.ts#L173-L179 (linkStyle))
 
@@ -524,7 +524,7 @@ Returns the average of numbers taken from a specified data field. This data fiel
 
 The following code finds an average of values within a `"quantity"` matrix column, excluding zeroes:
 
-*Example*: `"expression": "avgInArray({matrixdynamic}, 'quantity', '{quantity} > 0')"`
+*Example*: `"expression": "avgInArray({matrixdynamic}, 'quantity', {quantity} > 0)"`
 
 [View Source Code](https://github.com/surveyjs/survey-library/blob/68eb0054dc83d2f45a6daa1042bf7440c8faf007/src/functionsfactory.ts#L198-L203 (linkStyle))  
 
@@ -538,7 +538,7 @@ Returns the total number of array items in which a specified data field has a va
 
 The following code finds the total number of matrix rows with a `"quantity"` column value greater than zero but includes only the rows with a `"categoryId"` column equaling 1:
 
-*Example*: `"expression": "countInArray({matrixdynamic}, 'quantity', '{quantity} > 0 and {categoryId} = 1')"`
+*Example*: `"expression": "countInArray({matrixdynamic}, 'quantity', {quantity} > 0 and {categoryId} = 1)"`
 
 [View Source Code](https://github.com/surveyjs/survey-library/blob/68eb0054dc83d2f45a6daa1042bf7440c8faf007/src/functionsfactory.ts#L189-L196 (linkStyle))
 

diff --git a/package.json b/package.json
@@ -102,7 +102,7 @@
     "prepare": "husky install",
     "test:postcss": "postcss build/survey-core/defaultV2.css --silent  -u postcss-calc -u autoprefixer -u postcss-fail-on-warn -o defaultV2.postcss.css && rimraf defaultV2.postcss.css"
   },
-  "version": "1.10.6",
+  "version": "1.11.2",
   "name": "survey-library",
   "private": true,
   "devDependencies": {
@@ -222,4 +222,4 @@
     "signature_pad": "^4.1.5",
     "vite": "^3.1.8"
   }
-}
+}
diff --git a/packages/survey-angular-ui/CHANGELOG.md b/packages/survey-angular-ui/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.11.2](https://github.com/surveyjs/surveyjs/compare/v1.11.1...v1.11.2) (2024-06-11)
+
+## [1.11.1](https://github.com/surveyjs/surveyjs/compare/v1.10.6...v1.11.1) (2024-06-06)
+
 ## [1.10.6](https://github.com/surveyjs/surveyjs/compare/v1.10.5...v1.10.6) (2024-05-28)
 
 ## [1.10.5](https://github.com/surveyjs/surveyjs/compare/v1.10.4...v1.10.5) (2024-05-21)