Merge remote-tracking branch 'origin/master' into fb-leap-218

HumanSignal · Oct 30, 2023 · d233eb8 · d233eb8
2 parents ee653a6 + cb560e3
commit d233eb8
Show file tree

Hide file tree

Showing 29 changed files with 1,736 additions and 1,306 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
@@ -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 }}"
 
@@ -94,7 +94,7 @@ jobs:
         run: |
           set -euo pipefail
           cd e2e
-          yarn run test:ci ${{ steps.cpu-info.outputs.cores-count }} --debug --verbose
+          yarn run test:ci ${{ steps.cpu-info.outputs.cores-count }}
 
       - name: "Upload e2e output" 
         uses: ./.github/actions/upload-artifact

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
@@ -36,7 +36,7 @@ jobs:
           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/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/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,