Merge remote-tracking branch 'origin/master' into docs/paragraphs-audio

HumanSignal · Nov 9, 2023 · a3567e3 · a3567e3
2 parents 17201c9 + 5b34c44
commit a3567e3
Show file tree

Hide file tree

Showing 70 changed files with 3,256 additions and 1,585 deletions.
diff --git a/.github/workflows/build_bundle.yml b/.github/workflows/build_bundle.yml
@@ -30,7 +30,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{ inputs.sha }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 

diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   run:
     name: "E2E Tests"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-4c-16gb
     # ci can be skipped with `[skip ci]` prefix in message
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     steps:
@@ -27,7 +27,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{ inputs.sha }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 
@@ -87,7 +87,7 @@ jobs:
           npm list --depth=1 || true
 
       - name: Run e2e test suite
-        timeout-minutes: 40
+        timeout-minutes: 45
         env:
           NODE_ENV: 'production'
           TEST_ENV: true

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -28,7 +28,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: "Setup NodeJS"
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 

diff --git a/.github/workflows/fun_tests.yml b/.github/workflows/fun_tests.yml
@@ -28,7 +28,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{ inputs.sha }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -29,14 +29,14 @@ jobs:
       - uses: hmarr/[email protected]
 
       - name: "Validate PR's title"
-        uses: thehanimo/[email protected].0
+        uses: thehanimo/[email protected].1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           pass_on_octokit_error: false
           configuration_path: ".github/pr-title-checker-config.json"
 
       - name: "Set PR's label based on title"
-        uses: release-drafter/release-drafter@v5.24.0
+        uses: release-drafter/release-drafter@v5.25.0
         with:
           disable-releaser: true
           config-name: autolabeler.yml

diff --git a/.github/workflows/release-set-version.yml b/.github/workflows/release-set-version.yml
@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 1
           path: ${{ env.LSF_DIR }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -28,7 +28,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: "Setup NodeJS"
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE }}"
 

diff --git a/e2e/fragments/AtImageView.js b/e2e/fragments/AtImageView.js
@@ -5,6 +5,7 @@ const Helpers = require('../tests/helpers');
 
 module.exports = {
   _stageSelector: '.konvajs-content',
+  _stageFrameSelector: '[class^="frame--"]',
   _stageBBox: null,
 
   _toolBarSelector: '.lsf-toolbar',
@@ -41,7 +42,7 @@ module.exports = {
   },
 
   async grabStageBBox() {
-    const bbox = await I.grabElementBoundingRect(this._stageSelector);
+    const bbox = await I.grabElementBoundingRect(this._stageFrameSelector);
 
     return bbox;
   },

diff --git a/e2e/package.json b/e2e/package.json
@@ -45,5 +45,9 @@
     "v8-to-istanbul": "^9.0.0",
     "xml2js": "^0.4.23",
     "xmlbuilder": "^15.1.1"
+  },
+  "resolutions": {
+    "debug": "^4.3.1",
+    "electron": "^22.3.25"
   }
 }
diff --git a/e2e/setup/feature-flags.js b/e2e/setup/feature-flags.js
@@ -12,4 +12,5 @@ module.exports = {
   fflag_fix_front_lsdv_4620_memory_leaks_100723_short: true,
   fflag_feat_front_lsdv_4620_outliner_optimization_310723_short: true,
   fflag_fix_front_lsdv_5248_double_click_delay_280823_short: true,
+  fflag_fix_front_leap_32_zoom_perf_190923_short: true,
 };
diff --git a/e2e/tests/helpers.js b/e2e/tests/helpers.js
@@ -532,11 +532,11 @@ async function generateImageUrl({ width, height }) {
 }
 
 const getCanvasSize = () => {
-  const stage = window.Konva.stages[0];
+  const imageObject = window.Htx.annotationStore.selected.objects.find(o => o.type === 'image');
 
   return {
-    width: stage.width(),
-    height: stage.height(),
+    width: imageObject.canvasSize.width,
+    height: imageObject.canvasSize.height,
   };
 };
 const getImageSize = () => {

diff --git a/e2e/tests/nested-choices.test.js b/e2e/tests/nested-choices.test.js
@@ -30,12 +30,6 @@ Scenario('Switching states at nested choices', async ({ I, LabelStudio })=>{
 
   I.amOnPage('/');
 
-  LabelStudio.setFeatureFlags({
-    ff_dev_2007_rework_choices_280322_short: true,
-    ff_dev_2100_preselected_choices_250422_short: true,
-    ff_front_dev_2244_nested_choices_des_107_160522_short: true,
-  });
-
   LabelStudio.init(params);
 
   {
@@ -100,12 +94,6 @@ Scenario('Nested choices states from the annotation', async ({ I, LabelStudio })
 
   I.amOnPage('/');
 
-  LabelStudio.setFeatureFlags({
-    ff_dev_2007_rework_choices_280322_short: true,
-    ff_dev_2100_preselected_choices_250422_short: true,
-    ff_front_dev_2244_nested_choices_des_107_160522_short: true,
-  });
-
   // Load annotation with each type of selection for branches (fully checked, fully unchecked, partly checked)
   LabelStudio.init({
     ...params,

diff --git a/e2e/tests/regression-tests/dynamic-choices.test.js b/e2e/tests/regression-tests/dynamic-choices.test.js
@@ -3,13 +3,6 @@ const assert = require('assert');
 Feature('Dynamic choices').tag('@regress');
 
 Scenario('Hotkeys for dynamic choices', async ({ I, LabelStudio })=>{
-  LabelStudio.setFeatureFlags({
-    ff_dev_2007_rework_choices_280322_short: true,
-    ff_dev_2007_dev_2008_dynamic_tag_children_250322_short: true,
-    ff_dev_2100_preselected_choices_250422_short: true,
-    ff_front_dev_2244_nested_choices_des_107_160522_short: true,
-  });
-
   const params = {
     config: `
 <View>

diff --git a/e2e/tests/regression-tests/preselected-choices.test.js b/e2e/tests/regression-tests/preselected-choices.test.js
@@ -33,9 +33,6 @@ Scenario('Make a duplicate of annotation with preselected choices', async ({ I,
   };
 
   I.amOnPage('/');
-  LabelStudio.setFeatureFlags({
-    ff_dev_2100_preselected_choices_250422_short: true,
-  });
   LabelStudio.init(params);
   // Try to create copy of current annotation
   AtTopbar.click('[aria-label="Copy Annotation"]');
@@ -75,9 +72,6 @@ Scenario('Make a duplicate of empty annotation with preselected choices', async
   };
 
   I.amOnPage('/');
-  LabelStudio.setFeatureFlags({
-    ff_dev_2100_preselected_choices_250422_short: true,
-  });
   LabelStudio.init(params);
   // Try to create copy of current annotation
   AtTopbar.click('[aria-label="Copy Annotation"]');

diff --git a/e2e/tests/taxonomy.test.js b/e2e/tests/taxonomy.test.js
@@ -6,7 +6,6 @@ Feature('Taxonomy');
 Before(({ LabelStudio }) => {
   LabelStudio.setFeatureFlags({
     fflag_feat_front_lsdv_5451_async_taxonomy_110823_short: false,
-    ff_dev_2007_dev_2008_dynamic_tag_children_250322_short: true,
     fflag_fix_front_dev_3617_taxonomy_memory_leaks_fix: true,
     ff_front_dev_1536_taxonomy_user_labels_150222_long: true,
     ff_front_1170_outliner_030222_short: true,