merge origin/dev into feature/job-builder/welcome-redux

.eslintrc.json

@@ -45,7 +45,11 @@
     ],
     "jsx-a11y/label-has-for": "off",
     "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn"
+    "react-hooks/exhaustive-deps": "warn",
+    "jsx-a11y/label-has-associated-control": [ 2, {
+      "assert": "either",
+      "depth": 3
+    }]
   },
   "settings": {
     "react": {

.scrutinizer.yml

@@ -1,15 +1,10 @@
 build:
-
-    dependencies:
-        before:
-            # composer install
-            # npm install
-
     environment:
         php:
             version: "7.2"
             ini:
                 memory_limit: "-1"
+        docker: true
         ruby: 2.5.1
         node: v10.14.2
 
@@ -18,12 +13,35 @@ build:
             - node_modules/
             - vendor/
 
+    nodes:
+        analysis:
+            tests:
+                before:
+                    - "sudo service postgresql stop"
+                    - "cp .env.example .env"
+                    - "make docker-start"
+                    - "make gen-certs"
+                    - "make build-db"
+                    - "make set-perms"
+                    - "npm run dev"
+                    - "make phpunit"
+                    - "make jest"
+
+                override:
+                    - php-scrutinizer-run
+                    - js-scrutinizer-run
+                    - phpcs-run --standard=ruleset.xml ./app ./routes ./database/factories ./database/seeds
+                    - eslint-run ./resources/assets/js/app.js
+
+                after:
+                    - "make docker-stop"
+
 filter:
     paths:
         - app/
         - database/factories/
         - database/seeds/
-        - resources/assets/js/app
+        - resources/assets/js/app.js
         - routes/
 
     dependency_paths:
@@ -36,22 +54,15 @@ filter:
         - database/db/
         - database/migrations/
         - etc/
-        - public/
         - node_modules/
+        - public/
         - report/
         - resources/
         - storage/
         - tests/
         - vendor/
 
-checks:
-    php: true
-
 tools:
     external_code_coverage:
         timeout: 777
         runs: 1
-    custom_commands:
-        -
-            scope: project
-            command: vendor/bin/slack --token=https://hooks.slack.com/services/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

.storybook/config.ts

@@ -1,10 +1,27 @@
-import { configure } from "@storybook/react";
+import { addParameters, configure, addDecorator } from "@storybook/react";
+import { themes } from "@storybook/theming";
 import { addLocaleData } from "react-intl";
+import { withInfo } from "@storybook/addon-info";
+import { withKnobs } from "@storybook/addon-knobs";
 import { setIntlConfig } from "storybook-addon-intl";
 import localeEn from "react-intl/locale-data/en";
 import localeFr from "react-intl/locale-data/fr";
 import messagesFr from "../resources/assets/js/translations/locales/fr.json";
 
+addDecorator(withInfo({
+  inline: true,
+  header: false,
+  source: false, // Source isn't displaying well with clone.
+}));
+addDecorator(withKnobs);
+
+// Option defaults.
+addParameters({
+  options: {
+    theme: themes.light,
+  },
+});
+
 // automatically import all files ending in *.stories.tsx
 const req = require.context(
   "../resources/assets/js/stories",
@@ -17,10 +34,12 @@ const req = require.context(
 // That node needs to exist before the story file runs.
 // See for explanation: https://github.com/storybookjs/storybook/issues/4604
 // TODO: find better workaround
-const modalRoot = document.createElement("div");
-modalRoot.setAttribute("id", "modal-root");
-modalRoot.setAttribute("data-clone", "");
-document.body.append(modalRoot);
+if (document.querySelector("#modal-root") === null) {
+  const modalRoot = document.createElement("div");
+  modalRoot.setAttribute("id", "modal-root");
+  modalRoot.setAttribute("data-clone", "");
+  document.body.append(modalRoot);
+}
 
 // Set up react-intl localization
 // Load the locale data for all your defined locales