Merge branch 'master' into feature/multiselection

# Conflicts:
#	src/components/CurrentEntity/CurrentEntity.js
#	yarn.lock

.eslintrc.js

@@ -53,6 +53,13 @@ module.exports = {
       "SwitchCase": 1,
       "MemberExpression": 1,
     }],
+    "sort-imports": ["error", {
+      "ignoreCase": true,
+      "ignoreDeclarationSort": true,
+      "ignoreMemberSort": false,
+      "allowSeparatedGroups": false,
+      "memberSyntaxSortOrder": ["all", "single", "multiple", "none"],
+    }],
     "no-async-promise-executor": "off",
     "semi": [2, "always"],
     "comma-dangle": ["error", {

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: "/"
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: "daily"

dev-server.js

@@ -1,28 +1,19 @@
-const webpackDevServer = require("webpack-dev-server");
+const WebpackDevServer = require("webpack-dev-server");
 const webpack = require("webpack");
-const path = require("path");
 
 const config = require("./webpack.config-builder")({
-  withDevServer: false,
+  withDevServer: true,
 });
 
 const port = 3000;
 
-const options = {
-  compress: true,
-  hot: true,
-  inline: true,
-  public: `http://localhost:${port}`,
-  contentBase: path.join(__dirname, "public"),
-  historyApiFallback: {
-    index: "./public/index.html",
-  },
-};
-
-webpackDevServer.addDevServerEntrypoints(config, options);
+config.entry.main.unshift(
+  `webpack-dev-server/client?http://localhost:${port}/`,
+  `webpack/hot/dev-server`,
+);
 
 const compiler = webpack(config);
-const server = new webpackDevServer(compiler, options);
+const server = new WebpackDevServer(compiler, config.devServer);
 
 server.listen(port, "localhost", () => {
   console.log(`dev server listening on port ${port}`);

e2e/tests/ner.test.js

@@ -65,20 +65,21 @@ Scenario("NER labeling for HyperText", async function({ I }) {
   I.amOnPage("/");
   I.executeAsyncScript(initLabelStudio, params);
 
+  // create regions inside iframe
+  I.switchTo("iframe");
   I.pressKey("1");
   I.click("[data-testid=r1-start]");
   I.pressKeyDown("Shift");
   I.click("[data-testid=r1-end]");
   I.pressKeyUp("Shift");
 
   I.pressKey("2");
-  I.doubleClick(".lsf-main-view b:nth-child(2)");
+  I.doubleClick("b:nth-child(2)");
 
   I.click("[data-testid=r1-mid]");
-  // @todo this hotkey doesn't work. why?
-  // I.pressKey('r')
-  I.click("Create Relation");
-  I.click(".lsf-main-view b:nth-child(2)");
+  I.pressKey('r');
+  I.click("b:nth-child(2)");
+  I.switchTo();
 
   I.see("Relations (1)");
 

examples/audio_regions/config.xml

@@ -14,4 +14,10 @@
   </Choices>
   <Header value="Listen the audio:"></Header>
   <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Header>How many instruments in this audio?</Header>
+  <Number name="overall" toName="audio" defaultValue="2" />
+  <View visibleWhen="region-selected">
+    <Header>And in this fragment?</Header>
+    <Number name="fragment" toName="audio" perRegion="true" />
+  </View>
 </View>