fix typo in ApiDocument.GetSelectedDrawings

.github/workflows/common_check.yml

@@ -12,80 +12,121 @@ jobs:
     steps:
       - name: check out repository
         uses: actions/checkout@v3
+
       - name: setup python
         uses: actions/setup-python@v4
         with:
           python-version: '3.9'
+
       - name: execute check styles
         run: python tests/code-style/check.py
   unit-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js 14
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libatk1.0-0 libcups2 libatk-bridge2.0-0 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libnss3 libgbm1 libasound2
+
+      - name: check out repository
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 18
         uses: actions/setup-node@v1
         with:
-            node-version: 14
+            node-version: 18
+
       - name: Run unit tests
         run: |
-          npm install -g grunt-cli node-qunit-puppeteer
+          npm install grunt-cli node-qunit-puppeteer
           npm install --prefix build
-          grunt --gruntfile build/Gruntfile.js develop
-          node-qunit-puppeteer tests/common/api/api.html
-          node-qunit-puppeteer tests/common/color-mods/color-mods.html
-          node-qunit-puppeteer tests/cell/shortcuts/shortcuts.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/PivotTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/CopyPasteTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/SheetStructureTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/autoFilterTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/UserProtectedRangesTest.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/FormulaTrace.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/GoalSeekTests.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/NumFormatParse.html
-          node-qunit-puppeteer tests/cell/spreadsheet-calculation/DataValidationTests.html
-          node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
-          node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
-          node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
-          node-qunit-puppeteer tests/word/content-control/inline-level/checkbox.html
-          node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
-          node-qunit-puppeteer tests/word/document-calculation/paragraph.html
-          node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
-          node-qunit-puppeteer tests/word/document-calculation/table/flowTablePosition.html
-          node-qunit-puppeteer tests/word/document-calculation/table/pageBreak.html
-          node-qunit-puppeteer tests/word/document-calculation/table/table-header.html
-          node-qunit-puppeteer tests/word/document-calculation/textShaper/textShaper.html
-          node-qunit-puppeteer tests/word/document-calculation/text-hyphenator/text-hyphenator.html
-          node-qunit-puppeteer tests/word/forms/forms.html
-          node-qunit-puppeteer tests/word/forms/complexForm.html
-          node-qunit-puppeteer tests/word/numbering/numberingApplicator.html
-          node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
-          node-qunit-puppeteer tests/word/numbering/numberingAutocorrect.html
-          node-qunit-puppeteer tests/word/api/api.html
-          node-qunit-puppeteer tests/word/api/textInput.html
-          node-qunit-puppeteer tests/word/styles/displayStyle.html
-          node-qunit-puppeteer tests/word/styles/paraPr.html
-          node-qunit-puppeteer tests/word/styles/styleApplicator.html
-          node-qunit-puppeteer tests/word/plugins/pluginsApi.html
-          node-qunit-puppeteer tests/word/revisions/paragraph.html
-          node-qunit-puppeteer tests/word/merge-documents/mergeDocuments.html
-          node-qunit-puppeteer tests/word/shortcuts/shortcuts.html
-          node-qunit-puppeteer tests/slide/shortcuts/shortcuts.html
+          node node_modules/grunt-cli/bin/grunt --gruntfile build/Gruntfile.js develop
+          node node_modules/node-qunit-puppeteer/cli.js tests/common/api/api.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/common/color-mods/color-mods.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/shortcuts/shortcuts.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/FormulaTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/PivotTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/CopyPasteTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/SheetStructureTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/autoFilterTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/UserProtectedRangesTest.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/FormulaTrace.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/GoalSeekTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/NumFormatParse.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/DataValidationTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/conditionalFormattingTests.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/ExternalReference.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/cell/spreadsheet-calculation/SheetMemoryTest.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/unit-tests/paragraphContentPos.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/unit-tests/deleted-text-recovery.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/block-level/cursorAndSelection.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/checkbox.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/cursorAndSelection.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/content-control/inline-level/date-time.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/floating-position/drawing.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/paragraph.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/table/correctBadTable.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/table/flowTablePosition.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/table/pageBreak.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/table/table-header.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/textShaper/textShaper.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/document-calculation/text-hyphenator/text-hyphenator.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/forms/forms.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/forms/complexForm.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/numbering/numberingApplicator.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/numbering/numberingCalculation.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/numbering/numberingAutocorrect.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/api/api.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/api/cross-ref.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/api/textInput.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/styles/displayStyle.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/styles/paraPr.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/styles/styleApplicator.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/text-autocorrection/as-you-type.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/plugins/pluginsApi.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/revisions/paragraph.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/merge-documents/mergeDocuments.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/word/shortcuts/shortcuts.html 30000 "--no-sandbox"
+          node node_modules/node-qunit-puppeteer/cli.js tests/slide/shortcuts/shortcuts.html 30000 "--no-sandbox"
   builder-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js 12
+      - name: check out repository
+        uses: actions/checkout@v4
+        with:
+          path: sdkjs
+
+      - name: check out repository sdkjs-forms current branch
+        id: sdkjs-forms
+        uses: actions/checkout@v4
+        continue-on-error: true
+        with:
+          repository: ONLYOFFICE/sdkjs-forms
+          token: ${{ secrets.READ_PAT }}
+          path: sdkjs-forms
+          ref: ${{ github.ref }}
+      - name: check out repository sdkjs-forms master branch
+        if: steps.sdkjs-forms.outcome != 'success'
+        uses: actions/checkout@v4
+        with:
+          repository: ONLYOFFICE/sdkjs-forms
+          token: ${{ secrets.READ_PAT }}
+          path: sdkjs-forms
+          ref: master
+
+      - name: Use Node.js 18
         uses: actions/setup-node@v1
         with:
-            node-version: 12
+          node-version: 18
+
       - name: Run builder tests
         run: |
-           npm install -g grunt-cli
-           npm install --prefix build
-           grunt --level=WHITESPACE_ONLY --base build --gruntfile build/Gruntfile.js
-           docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
-                      -v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
-                      -v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
-                      -v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
-                      onlyoffice/doc-builder-testing:next-release rake rspec_critical
+          cd sdkjs
+          npm install grunt-cli
+          npm install --prefix build
+          node node_modules/grunt-cli/bin/grunt --level=WHITESPACE_ONLY --addon=sdkjs-forms --base build --gruntfile build/Gruntfile.js
+          docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
+                     -v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
+                     -v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
+                     -v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
+                     onlyoffice/doc-builder-testing:next-release rake rspec_critical

.github/workflows/dev_check.yml

@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 14
+      - name: Use Node.js 20
         uses: actions/setup-node@v1
         with:
-            node-version: 14
+            node-version: 20
       - name: Run unit tests
         run: |
           npm install -g grunt-cli node-qunit-puppeteer
@@ -44,9 +44,14 @@ jobs:
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/GoalSeekTests.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/NumFormatParse.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/DataValidationTests.html
+          node-qunit-puppeteer tests/cell/spreadsheet-calculation/conditionalFormattingTests.html
+          node-qunit-puppeteer tests/cell/spreadsheet-calculation/ExternalReference.html
           node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
+          node-qunit-puppeteer tests/word/unit-tests/deleted-text-recovery.html
           node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/checkbox.html
           node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/date-time.html
           node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
           node-qunit-puppeteer tests/word/document-calculation/paragraph.html
           node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
@@ -60,30 +65,40 @@ jobs:
           node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
           node-qunit-puppeteer tests/word/numbering/numberingAutocorrect.html
           node-qunit-puppeteer tests/word/api/api.html
+          node-qunit-puppeteer tests/word/api/cross-ref.html
           node-qunit-puppeteer tests/word/api/textInput.html
           node-qunit-puppeteer tests/word/styles/displayStyle.html
           node-qunit-puppeteer tests/word/styles/paraPr.html
           node-qunit-puppeteer tests/word/styles/styleApplicator.html
+          node-qunit-puppeteer tests/word/text-autocorrection/as-you-type.html
           node-qunit-puppeteer tests/word/plugins/pluginsApi.html
+          node-qunit-puppeteer tests/word/revisions/document-content.html
           node-qunit-puppeteer tests/word/revisions/paragraph.html
           node-qunit-puppeteer tests/word/merge-documents/mergeDocuments.html
           node-qunit-puppeteer tests/word/shortcuts/shortcuts.html
           node-qunit-puppeteer tests/slide/shortcuts/shortcuts.html
   builder-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          path: sdkjs
+      - uses: actions/checkout@v4
+        with:
+          repository: ONLYOFFICE/sdkjs-forms
+          path: sdkjs-forms
       - name: Use Node.js 12
         uses: actions/setup-node@v1
         with:
-            node-version: 12
+          node-version: 12
       - name: Run builder tests
         run: |
-           npm install -g grunt-cli
-           npm install --prefix build
-           grunt --level=WHITESPACE_ONLY --base build --gruntfile build/Gruntfile.js
-           docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
-                      -v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
-                      -v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
-                      -v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
-                      onlyoffice/doc-builder-testing:develop-latest rake rspec_critical
+          cd sdkjs
+          npm install -g grunt-cli
+          npm install --prefix build
+          grunt --level=WHITESPACE_ONLY --addon=sdkjs-forms --base build --gruntfile build/Gruntfile.js
+          docker run -v $PWD/deploy/sdkjs/common:/opt/onlyoffice/documentbuilder/sdkjs/common \
+                     -v $PWD/deploy/sdkjs/word:/opt/onlyoffice/documentbuilder/sdkjs/word \
+                     -v $PWD/deploy/sdkjs/cell:/opt/onlyoffice/documentbuilder/sdkjs/cell \
+                     -v $PWD/deploy/sdkjs/slide:/opt/onlyoffice/documentbuilder/sdkjs/slide \
+                     onlyoffice/doc-builder-testing:next-release rake rspec_critical

.gitignore

@@ -17,3 +17,4 @@ package-lock.json
 */node_modules
 */package-lock.json
 connector
+tests/package*

build/Gruntfile.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2023
+ * (c) Copyright Ascensio System SIA 2010-2024
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -76,7 +76,13 @@ module.exports = function(grunt) {
 	function writeScripts(config, name) {
 		const develop = '../develop/sdkjs/';
 		const fileName = 'scripts.js';
-		const files = ['../vendor/polyfill.js', '../common/applyDocumentChanges.js', '../common/AllFonts.js'].concat(getFilesMin(config), getFilesAll(config));
+		let files = ['../vendor/polyfill.js', '../common/AllFonts.js'];
+		if (grunt.option('compiled')) {
+			//todo set window['AscNotLoadAllScript'] = false; (in applyDocumentChanges.js)
+			files.push(deploy + name + '/sdk-all-min.js');
+		} else {
+			files = files.concat(['../common/applyDocumentChanges.js'], getFilesMin(config), getFilesAll(config));
+		}
 		fixUrl(files, '../../../../sdkjs/build/');
 
 		grunt.file.write(path.join(develop, name, fileName), 'var sdk_scripts = [\n\t"' + files.join('",\n\t"') + '"\n];');

build/build-develop-addons-sdk-advanced.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+import sys
+sys.path.append('../../build_tools/scripts')
+import base
+import traceback
+
+try:
+    base.cmd_in_dir('.', "npm", ["install", "-g", "grunt-cli"])
+    base.cmd_in_dir('.', "npm", ["ci"])
+
+    base.cmd_in_dir('.', "grunt", ["--level=ADVANCED", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
+    base.cmd_in_dir('.', "grunt", ["develop", "--compiled", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
+
+    input("Press Enter to continue...")
+    exit(0)
+except SystemExit:
+    input("Ignoring SystemExit. Press Enter to continue...")
+    exit(0)
+except KeyboardInterrupt:
+    pass
+except:
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    exit(0)

build/build-develop-addons-sdk-whitespace.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+import sys
+sys.path.append('../../build_tools/scripts')
+import base
+import traceback
+
+try:
+    base.cmd_in_dir('.', "npm", ["install", "-g", "grunt-cli"])
+    base.cmd_in_dir('.', "npm", ["ci"])
+
+    base.cmd_in_dir('.', "grunt", ["--level=WHITESPACE_ONLY", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
+    base.cmd_in_dir('.', "grunt", ["develop", "--compiled", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
+
+    input("Press Enter to continue...")
+    exit(0)
+except SystemExit:
+    input("Ignoring SystemExit. Press Enter to continue...")
+    exit(0)
+except KeyboardInterrupt:
+    pass
+except:
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    exit(0)